Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs17:/tmp/cvs-serv19040
Modified Files:
glib2-10.5.info glib2-10.5.patch
Log Message:
another try at Leopard's gcc's inline
Index: glib2-10.5.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/glib2-10.5.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- glib2-10.5.info 2 Nov 2007 13:36:23 -0000 1.14
+++ glib2-10.5.info 6 Nov 2007 18:06:33 -0000 1.15
@@ -1,6 +1,6 @@
Package: glib2
Version: 2.12.12
-Revision: 12
+Revision: 14
Distribution: 10.5
Depends: %N-shlibs (>= %v-%r), fink-obsolete-packages
BuildDepends: <<
@@ -15,8 +15,8 @@
Conflicts: %N-common
Source: mirror:gnome:sources/glib/2.12/glib-%v.tar.bz2
Source-MD5: 0b3a42098243d054475ff6eb51ed2be1
-PatchFile: %n.patch
-PatchFile-MD5: 673df33123ec5c5772024c3d8418e5e2
+PatchFile: %n-10.5.patch
+PatchFile-MD5: 71c02c56bda536d751ea83f538524ea1
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
SetLIBS: -L%p/lib
@@ -140,7 +140,8 @@
Will need to patch gutils.h for inline semantics of newer-gcc. See:
http://bugzilla.gnome.org/show_bug.cgi?id=315437 (patch #96366 does
- not work...not __GNUC_PREREQ)
+ not work...not __GNUC_PREREQ). No idea a portable solution, but
+ msachs says "static inline" is right for this case, so hardcode it.
<<
DescPackaging: <<
Sometimes not all .pc files get created. I suspect this is due to a
Index: glib2-10.5.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/glib2-10.5.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- glib2-10.5.patch 2 Nov 2007 12:34:00 -0000 1.2
+++ glib2-10.5.patch 6 Nov 2007 18:06:33 -0000 1.3
@@ -72,24 +72,16 @@
diff -Nurd -x'*~' glib-2.12.12.orig/glib/gutils.h glib-2.12.12/glib/gutils.h
--- glib-2.12.12.orig/glib/gutils.h 2007-05-01 19:12:44.000000000 -0400
-+++ glib-2.12.12/glib/gutils.h 2007-11-02 01:23:41.000000000 -0400
-@@ -96,9 +96,13 @@
- #ifdef G_IMPLEMENT_INLINES
++++ glib-2.12.12/glib/gutils.h 2007-11-04 14:12:33.000000000 -0500
+@@ -97,7 +97,7 @@
# define G_INLINE_FUNC
# undef G_CAN_INLINE
--#elif defined (__GNUC__)
+ #elif defined (__GNUC__)
-# define G_INLINE_FUNC extern inline
--#elif defined (G_CAN_INLINE)
-+#elif defined (__GNUC__)
-+# if __GNUC_PREREQ (4,2) && defined (__STDC_VERSION__) && __STDC_VERSION__
>= 199901L
-+# define G_INLINE_FUNC extern __inline __attribute__ ((__gnu_inline__))
-+# else
-+# define G_INLINE_FUNC extern __inline
-+# endif
-+#elif defined (G_CAN_INLINE)
++# define G_INLINE_FUNC static inline
+ #elif defined (G_CAN_INLINE)
# define G_INLINE_FUNC static inline
#else /* can't inline */
- # define G_INLINE_FUNC
diff -Nurd -x'*~' glib-2.12.0.orig/glib/libcharset/Makefile.in
glib-2.12.0/glib/libcharset/Makefile.in
--- glib-2.12.0.orig/glib/libcharset/Makefile.in 2006-07-02
14:48:02.000000000 -0400
+++ glib-2.12.0/glib/libcharset/Makefile.in 2006-07-06 20:56:51.000000000
-0400
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
