Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13281
Modified Files:
pkgconfig.info pkgconfig.patch
Log Message:
Switch to internal glib1
Index: pkgconfig.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/pkgconfig.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pkgconfig.patch 25 Sep 2008 05:37:06 -0000 1.6
+++ pkgconfig.patch 19 Mar 2009 18:29:51 -0000 1.7
@@ -10,22 +10,6 @@
EXTRA_DIST = $(TESTS) common simple.pc requires-test.pc public-dep.pc \
-diff -Nurd -x'*~' pkg-config-0.23.orig/configure pkg-config-0.23/configure
---- pkg-config-0.23.orig/configure 2008-01-16 17:52:31.000000000 -0500
-+++ pkg-config-0.23/configure 2008-09-25 01:25:18.000000000 -0400
-@@ -20225,7 +20225,11 @@
- # Check whether --with-installed-glib was given.
- if test "${with_installed_glib+set}" = set; then
- withval=$with_installed_glib;
-- if test x$withval = xyes; then
-+ if test x$withval = xglib1; then
-+ GLIB_CFLAGS='`${bindir}/glib-config --cflags`'
-+ GLIB_LIBS='`${bindir}/glib-config --libs`'
-+ use_installed_glib=yes
-+ elif test x$withval = xglib2; then
- # Not on Win32, but the user requested to use the installed Glib-2.x,
- # therefore we may assume that (some older version of) pkg-config can
- # be found in the users PATH (otherwise we simply ignore the request).
diff -Nurd -x'*~' pkg-config-0.23.orig/pc-resort pkg-config-0.23/pc-resort
--- pkg-config-0.23.orig/pc-resort 1969-12-31 19:00:00.000000000 -0500
+++ pkg-config-0.23/pc-resort 2008-09-25 01:25:18.000000000 -0400
Index: pkgconfig.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/pkgconfig.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- pkgconfig.info 25 Sep 2008 05:37:06 -0000 1.11
+++ pkgconfig.info 19 Mar 2009 18:29:51 -0000 1.12
@@ -1,19 +1,18 @@
Package: pkgconfig
Version: 0.23
-Revision: 1
+Revision: 2
#Source: mirror:gnome:sources/%n/0.18/%n-%v.tar.bz2
Source: http://pkgconfig.freedesktop.org/releases/pkg-config-%v.tar.gz
Source-MD5: d922a88782b64441d06547632fd85744
SourceDirectory: pkg-config-%v
-Depends: glib-shlibs (>= 1.2.8)
-BuildDepends: glib (>= 1.2.8), fink (>= 0.24.12-1)
+BuildDepends: fink (>= 0.24.12-1)
PatchFile: %n.patch
-PatchFile-MD5: 9b286ed4123b32962f8dcbf8e008ba7a
+PatchFile-MD5: 2b930cc72fd126aa5218c3222f56fd4a
PatchScript: <<
sed 's,@PREFIX@,%p,' < %{PatchFile} | patch -p1
<<
SetCFLAGS: -Os
-ConfigureParams: --mandir=%p/share/man
--with-pc-path=%p/lib/pkgconfig:%p/share/pkgconfig:/usr/X11/lib/pkgconfig:/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
--disable-dependency-tracking --with-installed-glib=glib1
+ConfigureParams: --mandir=%p/share/man
--with-pc-path=%p/lib/pkgconfig:%p/share/pkgconfig:/usr/X11/lib/pkgconfig:/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
--disable-dependency-tracking --disable-shared
# --enable-indirect-deps
CompileScript: <<
./configure %c
@@ -56,9 +55,11 @@
always over-rides system-supplied paths).
<<
DescPort: <<
- Starting with 0.17.2, Link to Fink's glib pkg instead of static-link
- to included glib-1.2.8 since we have newer and better-OSX-tweaked
- glib than that now.
+# Starting with 0.17.2, Link to Fink's glib pkg instead of static-link
+# to included glib-1.2.8 since we have newer and better-OSX-tweaked
+# glib than that now.
+^-As of 0.23-2, go back to included static glib1, since glib1 is no
+ longer being developed and not many other pkgs share the dep.
Omitting --enable-indirect-deps gives a binary that gives identical
results for --libs and --cflags for the fink-supplied pkgconfig/*.pc
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
