Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory vz-cvs-3.sog:/tmp/cvs-serv15987
Modified Files:
glib.info glib.patch
Log Message:
import clang fix from pkgconfig's own copy of this lib
Index: glib.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/glib.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- glib.info 14 Jul 2008 22:36:55 -0000 1.4
+++ glib.info 15 May 2011 18:30:18 -0000 1.5
@@ -1,13 +1,8 @@
Package: glib
Version: 1.2.10
-Revision: 51
+Revision: 52
BuildDepends: fink (>= 0.24.12-1)
BuildDependsOnly: True
-DescPackaging: <<
- Uses pkgconfig, but there are no pkgconfig-related dependencies.
-
- Originally packaged by Masanori Sekino.
-<<
Depends: glib-shlibs (= %v-%r)
Source: mirror:gnome:sources/%n/1.2/%n-%v.tar.gz
Source-MD5: 6fe30dad87c77b91b632def29dd69ef9
@@ -17,7 +12,7 @@
perl -pi -e 's/(AC_DEFUN\()([^[]+)(,)/\1\[\2]\3/' glib.m4
<<
PatchFile: %n.patch
-PatchFile-MD5: 7c5c0917d98a72264c1c07d590a314cf
+PatchFile-MD5: 8daa9ac0328fd4dc98abd030ba53fcde
UpdateConfigGuess: true
UpdateLibtool: true
ConfigureParams: --infodir=%p/share/info --mandir=%p/share/man --disable-static
@@ -43,10 +38,17 @@
<<
InfoDocs: glib.info
Description: Common C routines used by Gtk+ and other libs
+DescPackaging: <<
+ Originally packaged by Masanori Sekino.
+<<
DescPort: <<
Uses autoconf. Checks the host type - the usual fix. Thread safety to
be checked. Needs dlcompat to enable module loading.
+
+ Make sure we get correct inline function semantics (platform
+ logic in this old codebase doesn't seem to work for some
+ modern compiler toolchains)
<<
License: LGPL
Homepage: http://www.gtk.org/
-Maintainer: None <fink-de...@lists.sourceforge.net>
+Maintainer: The Gnome Core Team <fink-gnome-c...@lists.sourceforge.net>
Index: glib.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/glib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- glib.patch 20 Jan 2006 20:25:02 -0000 1.1
+++ glib.patch 15 May 2011 18:30:18 -0000 1.2
@@ -13,6 +13,24 @@
*) glib_vacopy=''
esac
+diff -Nurd -x'*~' glib-1.2.10.orig/glib.h glib-1.2.10/glib.h
+--- glib-1.2.10.orig/glib.h 2001-02-26 22:44:38.000000000 -0500
++++ glib-1.2.10/glib.h 2011-05-15 14:24:25.000000000 -0400
+@@ -182,10 +182,14 @@
+ # define G_CAN_INLINE 1
+ #endif
+ #ifdef G_HAVE_INLINE
++#if defined(__APPLE_CC__) && (__APPLE_CC__ >= 5400)
++# define G_INLINE_FUNC static inline
++#else
+ # if defined (__GNUC__) && defined (__STRICT_ANSI__)
+ # undef inline
+ # define inline __inline__
+ # endif
++#endif
+ #else /* !G_HAVE_INLINE */
+ # undef inline
+ # if defined (G_HAVE___INLINE__)
--- glib-1.2.10/gstrfuncs.c.orig 2005-02-14 21:59:58.000000000 +0100
+++ glib-1.2.10/gstrfuncs.c 2005-02-14 22:05:56.000000000 +0100
@@ -867,8 +867,7 @@
@@ -56,4 +74,4 @@
+ G_GNUC_PRETTY_FUNCTION, c);
break;
}
- conv_done |= conv_len > 0;
\ No newline at end of file
+ conv_done |= conv_len > 0;
------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
