Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6475/10.3/unstable/main/finkinfo/gnome
Modified Files:
glib2.info glib2.patch
Log Message:
New version. Now using xdg-base to set XDG_* env vars correctly.
Index: glib2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/glib2.info,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- glib2.info 18 Aug 2005 00:39:56 -0000 1.21
+++ glib2.info 19 Oct 2005 19:41:23 -0000 1.22
@@ -1,20 +1,20 @@
Package: glib2
-Version: 2.8.0
+Version: 2.8.3
### This .info has OS-specific features...don't blindly copy 10.3<->10.4!
-Revision: 2
+Revision: 1
Depends: %N-shlibs (>= %v-%r)
BuildDepends: pkgconfig (>= 0.15.0-2), libgettext3-dev, gettext-bin,
gettext-tools, libiconv-dev
Replaces: %N-common
Conflicts: %N-common
Source: mirror:gnome:sources/glib/2.8/glib-%v.tar.bz2
-Source-MD5: 803305bfd59cf7421d90983bf63e5227
+Source-MD5: 58177fe64c189b86bac1625350512159
Patch: %n.patch
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
SetLIBS: -L%p/lib
-SetCPPFLAGS: -no-cpp-precomp -isystem %p/include
+SetCPPFLAGS: -no-cpp-precomp -isystem %p/include -DHAVE__NSGETENVIRON
SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing
SetLIBRARY_PATH: %p/lib
ConfigureParams: --mandir=%p/share/man --disable-gtk-doc
--disable-dependency-tracking --enable-static
@@ -26,7 +26,7 @@
InstallScript: make install DESTDIR=%d
SplitOff: <<
Package: %N-shlibs
- Depends: libgettext3-shlibs, libiconv
+ Depends: libgettext3-shlibs, libiconv, xdg-base
Files: lib/lib*-2.0.*.dylib
Shlibs: <<
%p/lib/libglib-2.0.0.dylib 801.0.0 %n (>= 2.8.0-1)
@@ -34,7 +34,18 @@
%p/lib/libgobject-2.0.0.dylib 801.0.0 %n (>= 2.8.0-1)
%p/lib/libgthread-2.0.0.dylib 801.0.0 %n (>= 2.8.0-1)
<<
- DocFiles: AUTHORS COPYING ChangeLog NEWS README
+ DocFiles: <<
+ AUTHORS
+ docs/reference/AUTHORS:AUTHORS.docs.reference
+ gmodule/AUTHORS:AUTHORS.gmodule
+ ChangeLog*
+ docs/reference/ChangeLog:ChangeLog.docs.reference
+ gmodule/ChangeLog:ChangeLog.gmodule
+ gobject/ChangeLog:ChangeLog.gobject
+ gthread/ChangeLog:ChangeLog.gthread
+ po/ChangeLog:ChangeLog.po
+ COPYING NEWS README
+ <<
<<
SplitOff2: <<
Package: %N-dev
@@ -60,9 +71,31 @@
share/gtk-doc
share/man
<<
- DocFiles: AUTHORS COPYING ChangeLog NEWS README
+ DocFiles: <<
+ AUTHORS
+ docs/reference/AUTHORS:AUTHORS.docs.reference
+ gmodule/AUTHORS:AUTHORS.gmodule
+ ChangeLog*
+ docs/reference/ChangeLog:ChangeLog.docs.reference
+ gmodule/ChangeLog:ChangeLog.gmodule
+ gobject/ChangeLog:ChangeLog.gobject
+ gthread/ChangeLog:ChangeLog.gthread
+ po/ChangeLog:ChangeLog.po
+ COPYING NEWS README
+ <<
+<<
+DocFiles: <<
+ AUTHORS
+ docs/reference/AUTHORS:AUTHORS.docs.reference
+ gmodule/AUTHORS:AUTHORS.gmodule
+ ChangeLog*
+ docs/reference/ChangeLog:ChangeLog.docs.reference
+ gmodule/ChangeLog:ChangeLog.gmodule
+ gobject/ChangeLog:ChangeLog.gobject
+ gthread/ChangeLog:ChangeLog.gthread
+ po/ChangeLog:ChangeLog.po
+ COPYING NEWS README
<<
-DocFiles: AUTHORS COPYING ChangeLog NEWS README
Description: Handy library of utility functions
DescPort: <<
glib2 provides etc/glib-2.0/charset.alias for darwin because there's
@@ -83,9 +116,7 @@
Need to figure out how to patch tests/Makefile to use the nascent
gettext dictionaries in preference to installed ones.
- OS X doesn't have environ()...no problem compiling glib2, but causes
- linker error when linking against glib2 in a way that force all
- symbols to be defined. Patch to use NSGetEnviron() instead.
+ Patch bug in detection of environ symbols.
See: http://bugzilla.gnome.org/show_bug.cgi?id=313731
<<
DescPackaging: <<
Index: glib2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/glib2.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- glib2.patch 23 Aug 2005 20:22:24 -0000 1.17
+++ glib2.patch 19 Oct 2005 19:41:23 -0000 1.18
@@ -86,32 +86,6 @@
typedef enum
{
READ_FAILED = 0, /* FALSE */
-diff -uNr glib-2.8.0/glib/gutils.c glib-2.8.0-new/glib/gutils.c
---- glib-2.8.0/glib/gutils.c 2005-08-10 17:13:29.000000000 -0400
-+++ glib-2.8.0-new/glib/gutils.c 2005-08-17 09:42:32.000000000 -0400
-@@ -116,6 +116,10 @@
-
- #endif
-
-+#ifdef __APPLE__
-+#include <crt_externs.h>
-+#endif
-+
- /**
- * glib_check_version:
- * @required_major: the required major version.
-@@ -1234,7 +1238,11 @@
- /* According to the Single Unix Specification, environ is not in
- * any system header, although unistd.h often declares it.
- */
-+#ifdef __APPLE__
-+#define environ (*_NSGetEnviron())
-+#else
- extern char **environ;
-+#endif
-
- #endif
-
diff -uNr glib-2.8.0/glib/libcharset/Makefile.in
glib-2.8.0-new/glib/libcharset/Makefile.in
--- glib-2.8.0/glib/libcharset/Makefile.in 2005-08-12 12:24:04.000000000
-0400
+++ glib-2.8.0-new/glib/libcharset/Makefile.in 2005-08-17 09:37:28.000000000
-0400
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
