OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Apr-2004 10:29:04
Branch: HEAD Handle: 2004042809290400
Added files:
openpkg-src/glib glib.patch
Modified files:
openpkg-src/glib glib.spec
Log:
Fix building under GCC 3.4
Discovered by: Karl Vogel <[EMAIL PROTECTED]>
Summary:
Revision Changes Path
1.1 +17 -0 openpkg-src/glib/glib.patch
1.32 +3 -1 openpkg-src/glib/glib.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/glib/glib.patch
============================================================================
$ cvs diff -u -r0 -r1.1 glib.patch
--- /dev/null 2004-04-28 10:29:04.000000000 +0200
+++ glib.patch 2004-04-28 10:29:04.000000000 +0200
@@ -0,0 +1,17 @@
+GCC 3.4 and higher treats __FUNCTION__ and similar special compiler
+symbols as variables instead of macros. This means they no longer can
+be concatenated directly with string literals. Unfortunately, GLIB uses
+them in this way, so we have to disable this use with GCC 3.4 or higher.
+
+Index: glib.h
+--- glib.h.orig 2001-02-27 04:44:38.000000000 +0100
++++ glib.h 2004-04-28 10:24:56.000000000 +0200
+@@ -272,7 +272,7 @@
+ /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
+ * macros, so we can refer to them as strings unconditionally.
+ */
+-#ifdef __GNUC__
++#if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
+ #define G_GNUC_FUNCTION __FUNCTION__
+ #define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__
+ #else /* !__GNUC__ */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/glib/glib.spec
============================================================================
$ cvs diff -u -r1.31 -r1.32 glib.spec
--- openpkg-src/glib/glib.spec 7 Feb 2004 17:55:08 -0000 1.31
+++ openpkg-src/glib/glib.spec 28 Apr 2004 08:29:04 -0000 1.32
@@ -38,13 +38,14 @@
Group: Algorithm
License: GPL
Version: %{V_glib_major}.%{V_glib_minor}
-Release: 20040207
+Release: 20040428
# package options
%option with_threads no
# list of sources
Source0: ftp://ftp.gtk.org/pub/gtk/v1.2/glib-%{version}.tar.gz
+Patch0: glib.patch
# build information
Prefix: %{l_prefix}
@@ -69,6 +70,7 @@
%prep
%setup -q
+ %patch -p0
%{l_shtool} subst \
-e 's;glib-%{V_glib_major};glib;g' \
Makefile.in glib-config.in glib.pc.in \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
