rpms/shared-mime-info
7
0
Fork 0
Code Issues Pull Requests Releases Activity

rebase patch

Browse Source
This commit is contained in:
Rex Dieter 2014-05-21 12:35:58 -05:00
parent be619fa497
commit 1e15fb1a3e
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
shared-mime-info-1.2-PKGSYSTEM_FSYNC.patch
View File

@ -1,19 +0,0 @@
diff -up shared-mime-info-1.2/update-mime-database.c.PKGSYSTEM_FSYNC shared-mime-info-1.2/update-mime-database.c
--- shared-mime-info-1.2/update-mime-database.c.PKGSYSTEM_FSYNC 2013-07-09 17:10:53.000000000 -0500
+++ shared-mime-info-1.2/update-mime-database.c 2014-05-21 10:06:54.195566088 -0500
@@ -951,6 +951,7 @@ static gboolean atomic_update(const gcha
new_name = g_strndup(pathname, len - 4);
#ifdef HAVE_FDATASYNC
+ if (g_getenv ("PKGSYSTEM_ENABLE_FSYNC")) {
fd = open(pathname, O_RDONLY);
if (fd == -1)
{
@@ -967,6 +968,7 @@ static gboolean atomic_update(const gcha
set_error_from_errno(error);
goto out;
}
+ }
#endif
#ifdef _WIN32

19
shared-mime-info-1.3-PKGSYSTEM_FSYNC.patch Normal file
View File

@ -0,0 +1,19 @@
diff -up shared-mime-info-1.3/update-mime-database.c.PKGSYSTEM_FSYNC shared-mime-info-1.3/update-mime-database.c
--- shared-mime-info-1.3/update-mime-database.c.PKGSYSTEM_FSYNC 2014-03-31 09:24:23.000000000 -0500
+++ shared-mime-info-1.3/update-mime-database.c 2014-05-21 12:35:10.695476575 -0500
@@ -951,6 +951,7 @@ static gboolean atomic_update(const gcha
new_name = g_strndup(pathname, len - 4);
#ifdef HAVE_FDATASYNC
+ if (g_getenv ("PKGSYSTEM_ENABLE_FSYNC")) {
fd = open(pathname, O_RDWR);
if (fd == -1)
{
@@ -967,6 +968,7 @@ static gboolean atomic_update(const gcha
set_error_from_errno(error);
goto out;
}
+ }
#endif
#ifdef _WIN32

2
shared-mime-info.spec
View File

@ -22,7 +22,7 @@ Patch0: 0001-Remove-sub-classing-from-OO.o-mime-types.patch
# support PKGSYSTEM_ENABLE_FSYNC # support PKGSYSTEM_ENABLE_FSYNC
# https://bugs.freedesktop.org/show_bug.cgi?id=70366#c19 # https://bugs.freedesktop.org/show_bug.cgi?id=70366#c19
Patch1: shared-mime-info-1.2-PKGSYSTEM_FSYNC.patch Patch1: shared-mime-info-1.3-PKGSYSTEM_FSYNC.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libxml2-devel BuildRequires: libxml2-devel