[arch-commits] Commit in glib2/trunk (PKGBUILD gkeyfile-bool-nocase.patch)

[Jan de Groot]

    Date: Saturday, September 6, 2008 @ 06:25:57
  Author: jgc
Revision: 11909

Merge gnome-i686 back into trunk

Modified:
  glib2/trunk/PKGBUILD
Deleted:
  glib2/trunk/gkeyfile-bool-nocase.patch

----------------------------+
 PKGBUILD                   |   11 ++++-------
 gkeyfile-bool-nocase.patch |   16 ----------------
 2 files changed, 4 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-09-06 09:01:42 UTC (rev 11908)
+++ PKGBUILD	2008-09-06 10:25:57 UTC (rev 11909)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=glib2
-pkgver=2.16.5
+pkgver=2.18.0
 pkgrel=1
 pkgdesc="Common C routines used by GTK+ 2.4 and other libs"
 url="http://www.gtk.org/"
@@ -10,19 +10,16 @@
 license=('LGPL')
 depends=('pcre>=7.7')
 makedepends=('pkgconfig')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${pkgver}.tar.bz2
-	gkeyfile-bool-nocase.patch
+options=('!libtool' '!docs')
+source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-${pkgver}.tar.bz2
 	glib2.sh
 	glib2.csh)
-md5sums=('039f02d47d4071322a3f00abf031e5d9'
-         '5ca65611e824662146369e814d49ad06'
+md5sums=('06e5afe4ce055085dc5fd9fdab527bf7'
          '803017b365bd35dc20b092ce43b8c8c5'
          '90c7b830bef4baf225c2eb8b7ead0cab')
 
 build() {
   cd ${startdir}/src/glib-${pkgver}
-  patch -Np0 -i ${startdir}/src/gkeyfile-bool-nocase.patch || return 1
   ./configure --prefix=/usr --enable-static --enable-shared --with-pcre=system --disable-fam || return 1
   make || return 1
   make DESTDIR=${startdir}/pkg install || return 1

Deleted: gkeyfile-bool-nocase.patch
===================================================================
--- gkeyfile-bool-nocase.patch	2008-09-06 09:01:42 UTC (rev 11908)
+++ gkeyfile-bool-nocase.patch	2008-09-06 10:25:57 UTC (rev 11909)
@@ -1,16 +0,0 @@
-Index: glib/gkeyfile.c
-===================================================================
---- glib/gkeyfile.c	(revision 5714)
-+++ glib/gkeyfile.c	(working copy)
-@@ -3639,9 +3639,9 @@
- {
-   gchar *value_utf8;
- 
--  if (strcmp (value, "true") == 0 || strcmp (value, "1") == 0)
-+  if (g_ascii_strcasecmp (value, "true") == 0 || strcmp (value, "1") == 0)
-     return TRUE;
--  else if (strcmp (value, "false") == 0 || strcmp (value, "0") == 0)
-+  else if (g_ascii_strcasecmp (value, "false") == 0 || strcmp (value, "0") == 0)
-     return FALSE;
- 
-   value_utf8 = _g_utf8_make_valid (value);