glib2 update to 2.59.0 with pkgconf build for arm support

10.9-libcxx/stable/main/finkinfo/gnome/glib2-shlibs.info

@@ -1,16 +1,23 @@
 Package: glib2-shlibs
 
 #2.22.5 fails self-test; do not update. See:
-#https://bugzilla.gnome.org/show_bug.cgi?id=613060
-Version: 2.22.4
+#https://bugzilla.gnome.org/show_bug.cgi?id=613060 - resolved fixed in 2.23
+# Last version to build without meson (circular BDep through Python)
+Version: 2.59.0
 
-Revision: 9
+Revision: 1
 BuildDepends: <<
+	fink (>= 0.32),
+	autoconf2.6,
+	automake1.15,
+	docbook-dtd,
+	docbook-xsl,
 	gettext-bin,
 	gettext-tools,
 	libgettext8-dev,
 	libiconv-dev,
-	ppkg-config
+	libpcre1,
+	pkgconf
 <<
 Depends: <<
 	libgettext8-shlibs,
@@ -22,30 +29,33 @@ Recommends: <<
 	shared-mime-info (>= 1.3-1)
 <<
 Replaces: glib2 (<< 2.12.0-1)
-Source: mirror:gnome:sources/glib/2.22/glib-%v.tar.bz2
-Source-Checksum: SHA256(0d1f6bf8aaeab772f2370229eefda45bef434e3f29a7d1d8e5dfafeaa1d8ad14)
+Source: mirror:gnome:sources/glib/2.59/glib-%v.tar.xz
+Source-MD5: 81d599e91f106023cc2120469aba2931
 PatchFile: %n.patch
-PatchFile-MD5: d24962ccbe831bb0ce4a4389a1303a84
+PatchFile-MD5: dc9a49d6b463bd48c7da6986cce89e74
 PatchScript: <<
 	sed 's,@PREFIX@,%p,g' < %{PatchFile} | patch -p1
 
 	# 2.22.4 tarball contains generated docs that include leakage
 	# from overly-public entries in libcamel
-	perl -pi -e 's,<a href="/usr/share/gtk-doc/html/camel/camel-camel-i18n.html#gettext">(<code class="function">gettext\(\)</code>)</a>,\1,g' docs/reference/*/html/*.html
+	#perl -pi -e 's,<a href="/usr/share/gtk-doc/html/camel/camel-camel-i18n.html#gettext">(<code class="function">gettext\(\)</code>)</a>,\1,g' docs/reference/*/html/*.html
 	# Regenerating gtk-doc files The Right Way (--enable-gtk-doc)
-	# is very slow, so just patch the prefix in the bad URLs in
+	# is very slow, but generated html is no longer included.
+	# # so just patch the prefix in the bad URLs in
 	# the existing generated files. (and other manual fixes)
-	perl -pi -e 's,/usr/share/gtk-doc/html,%p/share/gtk-doc/html,g' docs/reference/*/html/*.html
+	#perl -pi -e 's,/usr/share/gtk-doc/html,%p/share/gtk-doc/html,g' docs/reference/*/html/*.html
 	# Work hard to avoid using gtk-doc even if present because
 	# it would cause a (Build)Depends cycle
-	perl -pi -e 's/-version-info/-no-undefined -version-info/' */Makefile.in
+	#perl -pi -e 's/-version-info/-no-undefined -version-info/' */Makefile.in
 	# Patch configure to not link like Puma on Yosemite
-	perl -pi.bak -e 's|10\.\[012\]\*|10.[012][,.]*|g' configure
+	#perl -pi.bak -e 's|10\.\[012\]\*|10.[012][,.]*|g' configure
 <<
 SetCFLAGS: -Os
-ConfigureParams: --mandir=%p/share/man --disable-gtk-doc ac_cv_path_GTKDOC_REBASE=true --disable-dependency-tracking --disable-fam --disable-visibility PKG_CONFIG=%p/bin/ppkg-config
+ConfigureParams: --mandir=%p/share/man --disable-gtk-doc ac_cv_path_GTKDOC_REBASE=true --disable-dependency-tracking --disable-fam --disable-visibility --enable-gtk-doc --enable-man --with-xml-catalog=%p/etc/xml/catalog PKG_CONFIG=%p/bin/pkgconf
 CompileScript: <<
-	PERL_PATH=/usr/bin/perl PERL=/usr/bin/perl ./configure %c PYTHON=/usr/bin/python
+	#!/bin/sh -ev
+	[ -x /usr/bin/python ] || pyversion=3
+	PERL_PATH=/usr/bin/perl PERL=/usr/bin/perl PYTHON=/usr/bin/python$pyversion ./autogen.sh %c
 	perl -pi -e '$_="#define BROKEN_POLL 1\n" if /BROKEN_POLL/' config.h
 	make
 <<
@@ -59,31 +69,27 @@ InfoTest: <<
 InstallScript: <<
 	make install DESTDIR=%d
 	rm -rf %i/share/gdb %i/share/glib-2.0/gdb
+	# Remove file conflicting with "libgettextN".
+	rm %i/lib/charset.alias
 
 	perl -ni -e 'print unless /Libs.private:/' %i/lib/pkgconfig/*.pc
+	perl -pi -e 's/(-framework)( -Wl)(,C)/${1}${3}/;' %i/lib/pkgconfig/*.pc
 
 	mkdir -p %i/lib/glib-2.0/pkgconfig-strict
 	perl -p -e 's/-lintl//g' %i/lib/pkgconfig/glib-2.0.pc > %i/lib/glib-2.0/pkgconfig-strict/glib-2.0.pc
 <<
 Shlibs: <<
-	%p/lib/libgio-2.0.0.dylib 2201.0.0 %n (>= 2.22.4-1)
-	%p/lib/libglib-2.0.0.dylib 2201.0.0 %n (>= 2.22.4-1)
-	%p/lib/libgmodule-2.0.0.dylib 2201.0.0 %n (>= 2.22.4-1)
-	%p/lib/libgobject-2.0.0.dylib 2201.0.0 %n (>= 2.22.4-1)
-	%p/lib/libgthread-2.0.0.dylib 2201.0.0 %n (>= 2.22.4-1)
+	%p/lib/libgio-2.0.0.dylib 5901.0.0 %n (>= 2.59.0-1)
+	%p/lib/libglib-2.0.0.dylib 5901.0.0 %n (>= 2.59.0-1)
+	%p/lib/libgmodule-2.0.0.dylib 5901.0.0 %n (>= 2.59.0-1)
+	%p/lib/libgobject-2.0.0.dylib 5901.0.0 %n (>= 2.59.0-1)
+	%p/lib/libgthread-2.0.0.dylib 5901.0.0 %n (>= 2.59.0-1)
 <<
 DocFiles: <<
 	AUTHORS
 	docs/reference/AUTHORS:AUTHORS.docs.reference
 	gmodule/AUTHORS:AUTHORS.gmodule
-	ChangeLog*
-	docs/reference/ChangeLog:ChangeLog.docs.reference
-	gio/ChangeLog:ChangeLog.gio
-	gmodule/ChangeLog:ChangeLog.gmodule
-	gobject/ChangeLog:ChangeLog.gobject
-	gthread/ChangeLog:ChangeLog.gthread
-	po/ChangeLog:ChangeLog.po
-	COPYING NEWS README
+	CONTRIBUTING.md COPYING HACKING NEWS README.[mr]*
 <<
 SplitOff: <<
 	Package: glib2-dev
@@ -104,21 +110,13 @@ SplitOff: <<
 		lib/pkgconfig
 		share/aclocal
 		share/glib-2.0
-		share/gtk-doc
 		share/man
 	<<
 	DocFiles: <<
 		AUTHORS
 		docs/reference/AUTHORS:AUTHORS.docs.reference
 		gmodule/AUTHORS:AUTHORS.gmodule
-		ChangeLog*
-		docs/reference/ChangeLog:ChangeLog.docs.reference
-		gio/ChangeLog:ChangeLog.gio
-		gmodule/ChangeLog:ChangeLog.gmodule
-		gobject/ChangeLog:ChangeLog.gobject
-		gthread/ChangeLog:ChangeLog.gthread
-		po/ChangeLog:ChangeLog.po
-		COPYING NEWS README
+		COPYING NEWS README.md
 	<<
 	DescUsage: <<
 Other packages may need to pass explicit -lintl when linking. glib2
@@ -276,7 +274,7 @@ DescPackaging: <<
 	newer gtk-doc.
 	https://git.gnome.org/browse/glib/commit/glib/gconvert.c?id=b5fb6b4bbfe5903be06a515449a07cf1f1119c26
 
-	Using ppkg-config instead of pkg-config at build-time to break
+	Using pkgconf instead of pkg-config at build-time to break
 	dependency loop. The compiled pkg-config program uses glib, so
 	it's better to have it use fink's actual (patched, tested,
 	etc.) one than embedding its own cloned code fragments from