pool/glib2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 48437 from home:vuntz:branches:GNOME:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/48437
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=96
This commit is contained in:
Vincent Untz 2010-09-18 18:05:42 +00:00 committed by Git OBS Bridge
parent f226e4617d
commit 5bceb4d6d1
3 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
glib2-fix-build-system-pcre.patch
View File

@ -1,33 +1,26 @@
From 96d87da379879f20e2c162b468525aaa1a0a82dd Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
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 <desrt@desrt.ca>
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 <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

2
glib2.changes
View File

@ -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

4
glib2.spec
View File

@ -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