Update of /cvsroot/fink/experimental/dmacks/finkinfo/gnome
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11530
Modified Files:
glib2-shlibs.info glib2-shlibs.patch
Log Message:
new version, still same breakage
Index: glib2-shlibs.info
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/gnome/glib2-shlibs.info,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- glib2-shlibs.info 11 May 2013 15:33:11 -0000 1.18
+++ glib2-shlibs.info 4 Jun 2013 13:00:24 -0000 1.19
@@ -1,12 +1,18 @@
Package: glib2-shlibs
#fails self-tests:(
-Version: 2.36.1
+Version: 2.36.2
# some code requires python >= 2.5; 10.5 comes with 2.3 and not yet
# ready to push a Depends:pythonXX into the glib dep tree
Distribution: 10.6, 10.7, 10.8
+# fails some tests on 32-bit
+Architecture: x86_64
+# so for sanity and ease of maintenance of other pkgs we restrict
+# to dists and the dists/ subdir that only have that arch
+#Distribution: 10.7 10.8
+
Revision: 1
BuildDepends: <<
coreutils,
@@ -33,15 +39,19 @@
<<
Replaces: glib2 (<< 2.12.0-1)
Source: mirror:gnome:sources/glib/2.36/glib-%v.tar.xz
-Source-MD5: a3bbee44a13facb5a3cab18be5ece14c
+Source-MD5: d791774ac49eaf8ba59792427bb74af7
PatchFile: %n.patch
-PatchFile-MD5: f8c1afd8dd58b764e0275e36517a1d4d
+PatchFile-MD5: 827cf599eda32c47334c7aa932ede40c
PatchScript: <<
sed 's,@PREFIX@,%p,g' < %{PatchFile} | patch -p1
perl -pi -e 's,/usr/share/gtk-doc/html,%p/share/gtk-doc/html,g'
docs/reference/*/html/*.html
perl -pi -e 's/-version-info/-no-undefined -version-info/' */Makefile.in
# perl -pi -e 's/-version-info/-no-undefined -version-info/' */Makefile.am
+
+ # gtk-doc.make has bad datestamp. See:
+ # https://bugzilla.gnome.org/show_bug.cgi?id=700350
+ touch -t 197001010000 gtk-doc.make
<<
SetCFLAGS: -Os
ConfigureParams: <<
@@ -285,8 +295,6 @@
Regenerating gtk-doc files The Right Way (--enable-gtk-doc) is
very slow, so just patch the prefix in the bad URLs in the
existing generated files.
-# 2.22.4 generated docs include leakage from overly-public
-# entries in libcamel, so have to regenerate:/
Don't install gdb files. They aren't named correctly and it's
not clear they are usable on darwin. See:
@@ -322,8 +330,8 @@
because darwin doesn't seem to have vfs.usermount anyway. See:
https://bugzilla.gnome.org/show_bug.cgi?id=689324
- Fails g_inet_socket_address_get_scope_id self-test. See:
- https://bugzilla.gnome.org/show_bug.cgi?id=700123
+ Upstream fix for g_inet_socket_address_get_scope_id self-test.
+ See: https://bugzilla.gnome.org/show_bug.cgi?id=700123
<<
License: LGPL
Maintainer: The Gnome Core Team <fink-gnome-c...@lists.sourceforge.net>
Index: glib2-shlibs.patch
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/gnome/glib2-shlibs.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- glib2-shlibs.patch 11 May 2013 15:33:11 -0000 1.12
+++ glib2-shlibs.patch 4 Jun 2013 13:00:24 -0000 1.13
@@ -1,7 +1,20 @@
-diff -Nurd -x'*~' glib-2.36.1.orig/configure glib-2.36.1/configure
---- glib-2.36.1.orig/configure 2013-04-15 17:32:43.000000000 -0400
-+++ glib-2.36.1/configure 2013-05-11 10:15:28.000000000 -0400
-@@ -5699,7 +5699,7 @@
+diff -Nurd -x'*~' glib-2.36.2.orig/config.h.in glib-2.36.2/config.h.in
+--- glib-2.36.2.orig/config.h.in 2013-05-13 08:28:35.000000000 -0400
++++ glib-2.36.2/config.h.in 2013-06-04 07:55:42.000000000 -0400
+@@ -216,6 +216,9 @@
+ /* Define to 1 if you have the `if_nametoindex' function. */
+ #undef HAVE_IF_NAMETOINDEX
+
++/* Define to 1 if you have the `if_indextoname' function. */
++#undef HAVE_IF_INDEXTONAME
++
+ /* Define to 1 if you have the `inotify_init1' function. */
+ #undef HAVE_INOTIFY_INIT1
+
+diff -Nurd -x'*~' glib-2.36.2.orig/configure glib-2.36.2/configure
+--- glib-2.36.2.orig/configure 2013-05-13 08:28:34.000000000 -0400
++++ glib-2.36.2/configure 2013-06-04 07:55:42.000000000 -0400
+@@ -5738,7 +5738,7 @@
fi
GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
@@ -10,7 +23,16 @@
if test "x$with_runtime_libdir" != "x"; then
-@@ -26162,6 +26162,9 @@
+@@ -23537,7 +23537,7 @@
+ as_fn_error $? "Could not determine values for MSG_* constants" "$LINENO" 5
+ fi
+
+-for ac_func in getprotobyname_r endservent if_nametoindex
++for ac_func in getprotobyname_r endservent if_nametoindex if_indextoname
+ do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+@@ -26234,6 +26234,9 @@
# No flag needed when using MSVCRT.DLL
G_THREAD_CFLAGS=""
;;
@@ -20,9 +42,9 @@
*)
G_THREAD_CFLAGS="-D_REENTRANT" # good default guess otherwise
;;
-diff -Nurd -x'*~' glib-2.36.1.orig/gio/gdbusaddress.c
glib-2.36.1/gio/gdbusaddress.c
---- glib-2.36.1.orig/gio/gdbusaddress.c 2013-04-15 17:22:13.000000000
-0400
-+++ glib-2.36.1/gio/gdbusaddress.c 2013-05-11 10:15:28.000000000 -0400
+diff -Nurd -x'*~' glib-2.36.2.orig/gio/gdbusaddress.c
glib-2.36.2/gio/gdbusaddress.c
+--- glib-2.36.2.orig/gio/gdbusaddress.c 2013-02-24 16:02:01.000000000
-0500
++++ glib-2.36.2/gio/gdbusaddress.c 2013-06-04 07:55:42.000000000 -0400
@@ -1507,7 +1507,7 @@
ret = g_strdup (g_getenv ("DBUS_SYSTEM_BUS_ADDRESS"));
if (ret == NULL)
@@ -32,9 +54,9 @@
}
break;
-diff -Nurd -x'*~' glib-2.36.1.orig/gio/gdbusprivate.c
glib-2.36.1/gio/gdbusprivate.c
---- glib-2.36.1.orig/gio/gdbusprivate.c 2013-04-15 17:22:13.000000000
-0400
-+++ glib-2.36.1/gio/gdbusprivate.c 2013-05-11 10:15:28.000000000 -0400
+diff -Nurd -x'*~' glib-2.36.2.orig/gio/gdbusprivate.c
glib-2.36.2/gio/gdbusprivate.c
+--- glib-2.36.2.orig/gio/gdbusprivate.c 2013-01-30 19:00:25.000000000
-0500
++++ glib-2.36.2/gio/gdbusprivate.c 2013-06-04 07:55:42.000000000 -0400
@@ -2101,7 +2101,7 @@
/* TODO: use PACKAGE_LOCALSTATEDIR ? */
ret = NULL;
@@ -53,9 +75,9 @@
}
else
{
-diff -Nurd -x'*~' glib-2.36.1.orig/gio/gdesktopappinfo.c
glib-2.36.1/gio/gdesktopappinfo.c
---- glib-2.36.1.orig/gio/gdesktopappinfo.c 2013-04-15 17:22:13.000000000
-0400
-+++ glib-2.36.1/gio/gdesktopappinfo.c 2013-05-11 10:15:28.000000000 -0400
+diff -Nurd -x'*~' glib-2.36.2.orig/gio/gdesktopappinfo.c
glib-2.36.2/gio/gdesktopappinfo.c
+--- glib-2.36.2.orig/gio/gdesktopappinfo.c 2013-05-09 16:05:04.000000000
-0400
++++ glib-2.36.2/gio/gdesktopappinfo.c 2013-06-04 07:55:42.000000000 -0400
@@ -1992,7 +1992,7 @@
g_file_set_contents (filename, contents, -1, NULL);
g_free (contents);
@@ -74,9 +96,9 @@
return TRUE;
}
-diff -Nurd -x'*~' glib-2.36.1.orig/gio/gunixmounts.c
glib-2.36.1/gio/gunixmounts.c
---- glib-2.36.1.orig/gio/gunixmounts.c 2013-04-15 17:22:13.000000000 -0400
-+++ glib-2.36.1/gio/gunixmounts.c 2013-05-11 10:15:28.000000000 -0400
+diff -Nurd -x'*~' glib-2.36.2.orig/gio/gunixmounts.c
glib-2.36.2/gio/gunixmounts.c
+--- glib-2.36.2.orig/gio/gunixmounts.c 2013-05-09 16:05:04.000000000 -0400
++++ glib-2.36.2/gio/gunixmounts.c 2013-06-04 07:55:42.000000000 -0400
@@ -271,6 +271,7 @@
"/sbin",
"/net",
@@ -85,10 +107,10 @@
NULL
};
-diff -Nurd -x'*~' glib-2.36.1.orig/gio/tests/Makefile.in
glib-2.36.1/gio/tests/Makefile.in
---- glib-2.36.1.orig/gio/tests/Makefile.in 2013-04-15 17:32:47.000000000
-0400
-+++ glib-2.36.1/gio/tests/Makefile.in 2013-05-11 10:15:28.000000000 -0400
-@@ -1492,7 +1492,7 @@
+diff -Nurd -x'*~' glib-2.36.2.orig/gio/tests/Makefile.in
glib-2.36.2/gio/tests/Makefile.in
+--- glib-2.36.2.orig/gio/tests/Makefile.in 2013-05-13 08:28:38.000000000
-0400
++++ glib-2.36.2/gio/tests/Makefile.in 2013-06-04 07:55:42.000000000 -0400
+@@ -1513,7 +1513,7 @@
readwrite g-file g-file-info converter-stream \
data-input-stream data-output-stream g-icon \
buffered-input-stream buffered-output-stream sleepy-stream \
@@ -97,9 +119,69 @@
contexts gsettings gschema-compile async-close-output-stream \
gdbus-addresses network-address gdbus-message socket pollable \
tls-certificate tls-interaction cancellable vfs \
-diff -Nurd -x'*~' glib-2.36.1.orig/gio/tests/pollable.c
glib-2.36.1/gio/tests/pollable.c
---- glib-2.36.1.orig/gio/tests/pollable.c 2013-04-15 17:22:13.000000000
-0400
-+++ glib-2.36.1/gio/tests/pollable.c 2013-05-11 10:15:28.000000000 -0400
+diff -Nurd -x'*~' glib-2.36.2.orig/gio/tests/inet-address.c
glib-2.36.2/gio/tests/inet-address.c
+--- glib-2.36.2.orig/gio/tests/inet-address.c 2013-02-24 16:02:01.000000000
-0500
++++ glib-2.36.2/gio/tests/inet-address.c 2013-06-04 07:55:42.000000000
-0400
+@@ -20,7 +20,10 @@
+ * if advised of the possibility of such damage.
+ */
+
++#include "config.h"
++
+ #include <gio/gio.h>
++#include <gio/gnetworking.h>
+
+ static void
+ test_parse (void)
+@@ -230,10 +233,26 @@
+ GSocketAddress *saddr;
+ GInetSocketAddress *isaddr;
+ GInetAddress *iaddr;
+- char *tostring;
++ char *str, *tostring;
+ GError *error = NULL;
++ int index;
++#ifdef HAVE_IF_INDEXTONAME
++ char ifname[IF_NAMESIZE] = { 0 };
++#endif
+
+- addr = g_network_address_new ("fe80::42%1", 99);
++#ifdef HAVE_IF_INDEXTONAME
++ for (index = 1; index < 255; index++) {
++ if (if_indextoname (1, ifname))
++ break;
++ }
++ g_assert_cmpstr (ifname, !=, "");
++ str = g_strdup_printf ("fe80::42%%%s", ifname);
++#else
++ index = 1;
++ str = g_strdup ("fe80::42%1");
++#endif
++
++ addr = g_network_address_new (str, 99);
+ addr_enum = g_socket_connectable_enumerate (addr);
+ saddr = g_socket_address_enumerator_next (addr_enum, NULL, &error);
+ g_assert_no_error (error);
+@@ -242,7 +261,7 @@
+ g_assert (G_IS_INET_SOCKET_ADDRESS (saddr));
+
+ isaddr = G_INET_SOCKET_ADDRESS (saddr);
+- g_assert_cmpint (g_inet_socket_address_get_scope_id (isaddr), ==, 1);
++ g_assert_cmpint (g_inet_socket_address_get_scope_id (isaddr), ==, index);
+ g_assert_cmpint (g_inet_socket_address_get_port (isaddr), ==, 99);
+
+ iaddr = g_inet_socket_address_get_address (isaddr);
+@@ -257,6 +276,7 @@
+
+ g_object_unref (addr_enum);
+ g_object_unref (addr);
++ g_free (str);
+ }
+
+ static void
+diff -Nurd -x'*~' glib-2.36.2.orig/gio/tests/pollable.c
glib-2.36.2/gio/tests/pollable.c
+--- glib-2.36.2.orig/gio/tests/pollable.c 2012-11-09 23:07:43.000000000
-0500
++++ glib-2.36.2/gio/tests/pollable.c 2013-06-04 07:55:42.000000000 -0400
@@ -26,6 +26,7 @@
#include <gio/gunixinputstream.h>
#include <gio/gunixoutputstream.h>
@@ -136,9 +218,9 @@
GConverter *converter;
GError *error = NULL;
GInputStream *ibase;
-diff -Nurd -x'*~' glib-2.36.1.orig/gio/xdgmime/xdgmime.c
glib-2.36.1/gio/xdgmime/xdgmime.c
---- glib-2.36.1.orig/gio/xdgmime/xdgmime.c 2013-02-13 09:45:36.000000000
-0500
-+++ glib-2.36.1/gio/xdgmime/xdgmime.c 2013-05-11 10:15:28.000000000 -0400
+diff -Nurd -x'*~' glib-2.36.2.orig/gio/xdgmime/xdgmime.c
glib-2.36.2/gio/xdgmime/xdgmime.c
+--- glib-2.36.2.orig/gio/xdgmime/xdgmime.c 2011-08-15 20:51:30.000000000
-0400
++++ glib-2.36.2/gio/xdgmime/xdgmime.c 2013-06-04 07:55:42.000000000 -0400
@@ -257,7 +257,7 @@
xdg_data_dirs = getenv ("XDG_DATA_DIRS");
@@ -148,9 +230,9 @@
ptr = xdg_data_dirs;
-diff -Nurd -x'*~' glib-2.36.1.orig/glib/gslice.c glib-2.36.1/glib/gslice.c
---- glib-2.36.1.orig/glib/gslice.c 2013-04-13 11:14:42.000000000 -0400
-+++ glib-2.36.1/glib/gslice.c 2013-05-11 10:15:28.000000000 -0400
+diff -Nurd -x'*~' glib-2.36.2.orig/glib/gslice.c glib-2.36.2/glib/gslice.c
+--- glib-2.36.2.orig/glib/gslice.c 2013-05-09 16:05:04.000000000 -0400
++++ glib-2.36.2/glib/gslice.c 2013-06-04 07:55:42.000000000 -0400
@@ -1376,19 +1376,18 @@
gsize memsize)
{
@@ -186,9 +268,9 @@
return aligned_memory;
}
-diff -Nurd -x'*~' glib-2.36.1.orig/glib/gutils.c glib-2.36.1/glib/gutils.c
---- glib-2.36.1.orig/glib/gutils.c 2013-04-15 17:27:24.000000000 -0400
-+++ glib-2.36.1/glib/gutils.c 2013-05-11 10:15:28.000000000 -0400
+diff -Nurd -x'*~' glib-2.36.2.orig/glib/gutils.c glib-2.36.2/glib/gutils.c
+--- glib-2.36.2.orig/glib/gutils.c 2013-05-09 16:05:04.000000000 -0400
++++ glib-2.36.2/glib/gutils.c 2013-06-04 07:55:42.000000000 -0400
@@ -2008,7 +2008,7 @@
gchar *data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
@@ -207,9 +289,9 @@
conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
#endif
-diff -Nurd -x'*~' glib-2.36.1.orig/glib/gutils.h glib-2.36.1/glib/gutils.h
---- glib-2.36.1.orig/glib/gutils.h 2013-04-15 17:22:13.000000000 -0400
-+++ glib-2.36.1/glib/gutils.h 2013-05-11 10:15:28.000000000 -0400
+diff -Nurd -x'*~' glib-2.36.2.orig/glib/gutils.h glib-2.36.2/glib/gutils.h
+--- glib-2.36.2.orig/glib/gutils.h 2013-02-24 16:02:01.000000000 -0500
++++ glib-2.36.2/glib/gutils.h 2013-06-04 07:55:42.000000000 -0400
@@ -77,7 +77,11 @@
# define G_INLINE_FUNC _GLIB_EXTERN
# undef G_CAN_INLINE
@@ -222,10 +304,10 @@
#elif defined (G_CAN_INLINE)
# define G_INLINE_FUNC static inline
#else /* can't inline */
-diff -Nurd -x'*~' glib-2.36.1.orig/glib/libcharset/Makefile.in
glib-2.36.1/glib/libcharset/Makefile.in
---- glib-2.36.1.orig/glib/libcharset/Makefile.in 2013-04-15
17:32:47.000000000 -0400
-+++ glib-2.36.1/glib/libcharset/Makefile.in 2013-05-11 10:19:50.000000000
-0400
-@@ -379,7 +379,7 @@
+diff -Nurd -x'*~' glib-2.36.2.orig/glib/libcharset/Makefile.in
glib-2.36.2/glib/libcharset/Makefile.in
+--- glib-2.36.2.orig/glib/libcharset/Makefile.in 2013-05-13
08:28:39.000000000 -0400
++++ glib-2.36.2/glib/libcharset/Makefile.in 2013-06-04 07:55:42.000000000
-0400
+@@ -396,7 +396,7 @@
codeset.m4 update.sh make-patch.sh libcharset-glib.patch
TEST_PROGS =
AM_CPPFLAGS = \
@@ -234,7 +316,7 @@
$(config_h_INCLUDES)
noinst_LTLIBRARIES = libcharset.la
-@@ -389,8 +389,8 @@
+@@ -406,8 +406,8 @@
localcharset.h \
localcharset.c
@@ -245,7 +327,7 @@
SUFFIXES = .sed .sin
CLEANFILES = charset.alias ref-add.sed ref-del.sed
all: all-am
-@@ -790,7 +790,7 @@
+@@ -793,7 +793,7 @@
# run tests in cwd as part of make check
check-local: test-nonrecursive
install-exec-local: all-local
@@ -254,9 +336,9 @@
if test -f $(charset_alias); then \
sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
$(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
-diff -Nurd -x'*~' glib-2.36.1.orig/glib/libcharset/charset.alias
glib-2.36.1/glib/libcharset/charset.alias
---- glib-2.36.1.orig/glib/libcharset/charset.alias 1969-12-31
19:00:00.000000000 -0500
-+++ glib-2.36.1/glib/libcharset/charset.alias 2013-05-11 10:15:28.000000000
-0400
+diff -Nurd -x'*~' glib-2.36.2.orig/glib/libcharset/charset.alias
glib-2.36.2/glib/libcharset/charset.alias
+--- glib-2.36.2.orig/glib/libcharset/charset.alias 1969-12-31
19:00:00.000000000 -0500
++++ glib-2.36.2/glib/libcharset/charset.alias 2013-06-04 07:55:42.000000000
-0400
@@ -0,0 +1,111 @@
+# This file contains a table of character encoding aliases,
+# suitable for operating system 'darwin'.
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
