diff options
| author | root <root@rshg054.dnsready.net> | 2013-08-19 01:35:50 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-08-19 01:35:50 -0700 |
| commit | 26606f981048ee9efcda690b619d3c53501a7a58 (patch) | |
| tree | bce53168e8c9b4bb94183682d91440e716d615a5 /core | |
| parent | b35ab776341c79068977be153a2ad8340eb9498c (diff) | |
Mon Aug 19 01:34:37 PDT 2013
Diffstat (limited to 'core')
| -rw-r--r-- | core/glib2/PKGBUILD | 12 | ||||
| -rw-r--r-- | core/glib2/bug701560.patch | 37 |
2 files changed, 4 insertions, 45 deletions
diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD index ae81b895e..70ebe648f 100644 --- a/core/glib2/PKGBUILD +++ b/core/glib2/PKGBUILD @@ -1,26 +1,22 @@ -# $Id: PKGBUILD 191338 2013-07-23 17:13:19Z jgc $ +# $Id: PKGBUILD 193184 2013-08-18 08:13:38Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> 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 } diff --git a/core/glib2/bug701560.patch b/core/glib2/bug701560.patch deleted file mode 100644 index 041419791..000000000 --- a/core/glib2/bug701560.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 05d430065da918051a97e3384c4b2252af47503d Mon Sep 17 00:00:00 2001 -From: Colin Walters <walters@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 |