[arch-commits] Commit in glib2/trunk (PKGBUILD revert-redundant-headers.patch)

[Ionut Biru]

    Date: Saturday, September 18, 2010 @ 12:47:48
  Author: ibiru
Revision: 90868

upgpkg: glib2 2.25.16-1
update to 2.25.16

Added:
  glib2/trunk/revert-redundant-headers.patch
Modified:
  glib2/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |   12 +++++++-----
 revert-redundant-headers.patch |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-09-18 15:06:55 UTC (rev 90867)
+++ PKGBUILD	2010-09-18 16:47:48 UTC (rev 90868)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=glib2
-pkgver=2.24.2
+pkgver=2.25.16
 pkgrel=1
 pkgdesc="Common C routines used by GTK+ 2.4 and other libs"
 url="http://www.gtk.org/"
@@ -11,15 +11,17 @@
 depends=('pcre>=8.02')
 makedepends=('pkgconfig')
 options=('!libtool' '!docs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.24/glib-${pkgver}.tar.bz2
+source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.25/glib-${pkgver}.tar.bz2
         glib2.sh
-        glib2.csh)
-sha256sums=('3aeb521abd3642dd1224379f0e54915957e5010f888a4ae74afa0ad54da0160c'
+        glib2.csh revert-redundant-headers.patch)
+sha256sums=('dd7243298504792ab717cea138554ab7edb8ec4145f6b9b0839ffe3ae0ad39f2'
             '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a'
-            '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3')
+            '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3'
+            '4a40619f3d3eef6accf22c0da67b73632688c7a8e8b350be1acce8a10d1befe4')
 
 build() {
   cd "${srcdir}/glib-${pkgver}"
+  patch -NRp1 -i "${srcdir}/revert-redundant-headers.patch"
   ./configure --prefix=/usr \
       --sysconfdir=/etc \
       --with-pcre=system \

Added: revert-redundant-headers.patch
===================================================================
--- revert-redundant-headers.patch	                        (rev 0)
+++ revert-redundant-headers.patch	2010-09-18 16:47:48 UTC (rev 90868)
@@ -0,0 +1,33 @@
+From 96d87da379879f20e2c162b468525aaa1a0a82dd Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Sat, 04 Sep 2010 00:30:54 +0000
+Subject: Remove redundant header inclusions
+
+---
+diff --git a/glib/gregex.c b/glib/gregex.c
+index 576632d..f21fbe8 100644
+--- a/glib/gregex.c
++++ b/glib/gregex.c
+@@ -23,16 +23,16 @@
+ 
+ #include <string.h>
+ 
+-#include "glib.h"
+-#include "glibintl.h"
+-#include "gregex.h"
+-
+ #ifdef USE_SYSTEM_PCRE
+ #include <pcre.h>
+ #else
+ #include "pcre/pcre.h"
+ #endif
+ 
++#include "gtypes.h"
++#include "gregex.h"
++#include "glibintl.h"
++
+ /**
+  * SECTION:gregex
+  * @title: Perl-compatible regular expressions
+--
+cgit v0.8.3.1