From 5bceb4d6d199d71cc04e1787dc9e0b7147cd5b1ad92edfdf8b673cdc97566a6f Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sat, 18 Sep 2010 18:05:42 +0000 Subject: [PATCH] Accepting request 48437 from home:vuntz:branches:GNOME:Factory OBS-URL: https://build.opensuse.org/request/show/48437 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=96 --- glib2-fix-build-system-pcre.patch | 39 +++++++++++++------------------ glib2.changes | 2 +- glib2.spec | 4 ++-- 3 files changed, 19 insertions(+), 26 deletions(-) diff --git a/glib2-fix-build-system-pcre.patch b/glib2-fix-build-system-pcre.patch index 9a65d27..88a4532 100644 --- a/glib2-fix-build-system-pcre.patch +++ b/glib2-fix-build-system-pcre.patch @@ -1,33 +1,26 @@ -From 96d87da379879f20e2c162b468525aaa1a0a82dd Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Sat, 04 Sep 2010 00:30:54 +0000 -Subject: Remove redundant header inclusions +From 2ae579d1b5e215ec57c602358cd3fd3ffe9b314d Mon Sep 17 00:00:00 2001 +From: Ryan Lortie +Date: Sat, 18 Sep 2010 16:52:58 +0000 +Subject: Fix header cleaup fallout when using system pcre +Using the internal pcre has the side effect of exposing gregex.c to +glib.h. When we use the system one, we lose that, so we need to +explicitly include the things we use (glist, gatomic, etc..) --- diff --git a/glib/gregex.c b/glib/gregex.c -index 576632d..f21fbe8 100644 +index f21fbe8..b62bda7 100644 --- a/glib/gregex.c +++ b/glib/gregex.c -@@ -23,16 +23,16 @@ +@@ -32,6 +32,10 @@ + #include "gtypes.h" + #include "gregex.h" + #include "glibintl.h" ++#include "glist.h" ++#include "gmessages.h" ++#include "gstrfuncs.h" ++#include "gatomic.h" - #include - --#include "glib.h" --#include "glibintl.h" --#include "gregex.h" -- - #ifdef USE_SYSTEM_PCRE - #include - #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 diff --git a/glib2.changes b/glib2.changes index ee9e7ff..be20b43 100644 --- a/glib2.changes +++ b/glib2.changes @@ -63,7 +63,7 @@ Sat Sep 18 10:33:58 CEST 2010 - vuntz@opensuse.org bgo#629698 + Updated translations. - Add glib2-fix-build-system-pcre.patch to fix build with the - system pcre: this is the commit that we revert to fix the build. + system pcre. ------------------------------------------------------------------- Fri Sep 3 15:38:17 CEST 2010 - vuntz@opensuse.org diff --git a/glib2.spec b/glib2.spec index bab0b58..f44d0fd 100644 --- a/glib2.spec +++ b/glib2.spec @@ -40,7 +40,7 @@ Source5: macros.glib2 # Please update this file from the latest gtk-doc package: Source6: gtk-doc.m4 Source99: baselibs.conf -# PATCH-FIX-UPSTREAM glib2-fix-build-system-pcre.patch bgo#629971 vuntz@opensuse.org -- Revert commit that breaks build with system pcre +# PATCH-FIX-UPSTREAM glib2-fix-build-system-pcre.patch bgo#629971 vuntz@opensuse.org -- Taken from git Patch0: glib2-fix-build-system-pcre.patch # PATCH-FIX-OPENSUSE glib2-bnc379332-desktop-su.patch bnc379332 vuntz@novell.com -- Use X-KDE-SubstituteUID Patch8: glib2-bnc379332-desktop-su.patch @@ -223,7 +223,7 @@ to a C programmer and is used by Gtk+ and GNOME. %prep %setup -q -n %{_name}-%{version} translation-update-upstream -%patch0 -p1 -R +%patch0 -p1 %patch8 %patch10 -p1 %patch11 -p1