[arch-commits] Commit in glib2/trunk (PKGBUILD bug701560.patch)

[Jan Steffens]

    Date: Wednesday, August 7, 2013 @ 18:16:04
  Author: heftig
Revision: 192206

2.36.4

Modified:
  glib2/trunk/PKGBUILD
Deleted:
  glib2/trunk/bug701560.patch

-----------------+
 PKGBUILD        |   10 +++-------
 bug701560.patch |   37 -------------------------------------
 2 files changed, 3 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-07 15:15:12 UTC (rev 192205)
+++ PKGBUILD	2013-08-07 16:16:04 UTC (rev 192206)
@@ -3,24 +3,20 @@
 
 pkgbase=glib2
 pkgname=(glib2 glib2-docs)
-pkgver=2.36.3
-pkgrel=3
+pkgver=2.36.4
+pkgrel=1
 pkgdesc="Common C routines used by GTK+ and other libs"
 url="http://www.gtk.org/"
 arch=(i686 x86_64)
 makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'elfutils')
 source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
-        bug701560.patch
         revert-warn-glib-compile-schemas.patch)
-sha256sums=('5ec433bf6ce02e4c436619c3d0b9cecdd1898469398a636bad27c1f5804c761e'
-            '5e71f9a59f434f8850fb2474d3f8022ea36c7e254283db3437ae72f52b0690bd'
+sha256sums=('f654d2542329012d8475736a165dfbf82fadf3ee940c2e0e6ddd4b2fde5cad7e'
             '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
 
 prepare() {
   cd glib-$pkgver
   patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
-  patch -Np1 -i ../bug701560.patch
-
   touch -r NEWS gtk-doc.make
 }
   

Deleted: bug701560.patch
===================================================================
--- bug701560.patch	2013-08-07 15:15:12 UTC (rev 192205)
+++ bug701560.patch	2013-08-07 16:16:04 UTC (rev 192206)
@@ -1,37 +0,0 @@
-From 05d430065da918051a97e3384c4b2252af47503d Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters at verbum.org>
-Date: Thu, 20 Jun 2013 17:13:29 +0000
-Subject: Revert "g_file_set_contents(): don't fsync on ext3/4"
-
-We didn't actually do any real-world testing of this, and
-unsurprisingly it turns out to break in at least one widely-used
-configuration (Fedora 19 x86_64, ext4 on LVM).
-
-This reverts commit 9d0c17b50102267a5029b58b1f44efbad82d8f03.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=701560
----
-diff --git a/glib/gfileutils.c b/glib/gfileutils.c
-index b6ca3bb..2980098 100644
---- a/glib/gfileutils.c
-+++ b/glib/gfileutils.c
-@@ -1088,16 +1088,9 @@ write_to_temp_file (const gchar  *contents,
-     /* On Linux, on btrfs, skip the fsync since rename-over-existing is
-      * guaranteed to be atomic and this is the only case in which we
-      * would fsync() anyway.
--     *
--     * ext3 and ext4 are also safe in this respect under the default
--     * mount options (and if someone picks non-default options to
--     * improve their performance at the cost of reliability, who are we
--     * to argue?)
--     *
--     * Note: EXT[234]_SUPER_MAGIC are equal.
-      */
- 
--    if (fstatfs (fd, &buf) == 0 && (buf.f_type == BTRFS_SUPER_MAGIC || buf.f_type == EXT3_SUPER_MAGIC))
-+    if (fstatfs (fd, &buf) == 0 && buf.f_type == BTRFS_SUPER_MAGIC)
-       goto no_fsync;
-   }
- #endif
---
-cgit v0.9.2