diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-10-25 06:25:58 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-10-25 06:25:58 +0800 |
commit | c2f5ab42f09b9521429da8ae473a60a63793bf24 (patch) | |
tree | 2e2bad022bb2177a84891b61739e65ef56261479 /devel/glib20/files | |
parent | f2007b00ee65f6004ba6637d31120c01f6c7fe6d (diff) | |
download | marcuscom-ports-c2f5ab42f09b9521429da8ae473a60a63793bf24.tar marcuscom-ports-c2f5ab42f09b9521429da8ae473a60a63793bf24.tar.gz marcuscom-ports-c2f5ab42f09b9521429da8ae473a60a63793bf24.tar.bz2 marcuscom-ports-c2f5ab42f09b9521429da8ae473a60a63793bf24.tar.lz marcuscom-ports-c2f5ab42f09b9521429da8ae473a60a63793bf24.tar.xz marcuscom-ports-c2f5ab42f09b9521429da8ae473a60a63793bf24.tar.zst marcuscom-ports-c2f5ab42f09b9521429da8ae473a60a63793bf24.zip |
Update to 2.3.0.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1293 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/glib20/files')
-rw-r--r-- | devel/glib20/files/patch-ae | 19 | ||||
-rw-r--r-- | devel/glib20/files/patch-ag | 14 | ||||
-rw-r--r-- | devel/glib20/files/patch-ah | 11 | ||||
-rw-r--r-- | devel/glib20/files/patch-glib::libcharset::Makefile.in | 31 | ||||
-rw-r--r-- | devel/glib20/files/patch-gmodule::gmodule-dl.c | 23 |
5 files changed, 98 insertions, 0 deletions
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae new file mode 100644 index 000000000..0a7c2987d --- /dev/null +++ b/devel/glib20/files/patch-ae @@ -0,0 +1,19 @@ +--- configure.orig Mon Dec 2 16:34:49 2002 ++++ configure Tue Dec 3 18:21:22 2002 +@@ -10176,6 +10176,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' +@@ -17057,6 +17058,8 @@ + fi + done + fi ++ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}" ++ G_THREAD_LIBS="${PTHREAD_LIBS}" + + if test x"$G_THREAD_CFLAGS" = x; then + diff --git a/devel/glib20/files/patch-ag b/devel/glib20/files/patch-ag new file mode 100644 index 000000000..3e8fbfbf4 --- /dev/null +++ b/devel/glib20/files/patch-ag @@ -0,0 +1,14 @@ +--- Makefile.in.orig Sun Dec 23 16:53:53 2001 ++++ Makefile.in Fri Feb 8 12:44:30 2002 +@@ -151,3 +151,3 @@ + +-SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs ++SUBDIRS = . m4macros glib gobject gmodule gthread build po docs + +@@ -192,4 +192,4 @@ + +- +-configexecincludedir = $(libdir)/glib-2.0/include ++glibincludedir = $(includedir)/glib-2.0 ++configexecincludedir = $(glibincludedir) + diff --git a/devel/glib20/files/patch-ah b/devel/glib20/files/patch-ah new file mode 100644 index 000000000..c339b76e2 --- /dev/null +++ b/devel/glib20/files/patch-ah @@ -0,0 +1,11 @@ +--- docs/reference/Makefile.in.orig Fri Oct 24 18:05:32 2003 ++++ docs/reference/Makefile.in Fri Oct 24 18:06:00 2003 +@@ -226,7 +226,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-SUBDIRS = glib gobject ++SUBDIRS = #glib gobject + subdir = docs/reference + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h diff --git a/devel/glib20/files/patch-glib::libcharset::Makefile.in b/devel/glib20/files/patch-glib::libcharset::Makefile.in new file mode 100644 index 000000000..2d0f82ab2 --- /dev/null +++ b/devel/glib20/files/patch-glib::libcharset::Makefile.in @@ -0,0 +1,31 @@ +--- glib/libcharset/Makefile.in.orig Fri Oct 24 18:07:07 2003 ++++ glib/libcharset/Makefile.in Fri Oct 24 18:09:20 2003 +@@ -228,7 +228,7 @@ + target_alias = @target_alias@ + + INCLUDES = \ +- -DLIBDIR=\"$(libdir)\" ++ -DLIBDIR=\"$(prefix)/libdata\" + + + noinst_LTLIBRARIES = libcharset.la +@@ -249,8 +249,8 @@ + make-patch.sh + + +-charset_alias = $(DESTDIR)$(libdir)/charset.alias +-charset_tmp = $(DESTDIR)$(libdir)/charset.tmp ++charset_alias = $(DESTDIR)$(prefix)/libdata/charset.alias ++charset_tmp = $(DESTDIR)$(prefix)/libdata/charset.tmp + + SUFFIXES = .sed .sin + +@@ -492,7 +492,7 @@ + + install-data-am: + +-install-exec-am: install-exec-local ++install-exec-am: # install-exec-local + + install-info: install-info-am + diff --git a/devel/glib20/files/patch-gmodule::gmodule-dl.c b/devel/glib20/files/patch-gmodule::gmodule-dl.c new file mode 100644 index 000000000..acbefc406 --- /dev/null +++ b/devel/glib20/files/patch-gmodule::gmodule-dl.c @@ -0,0 +1,23 @@ + +$FreeBSD: ports/devel/glib20/files/patch-gmodule::gmodule-dl.c,v 1.2 2003/02/07 18:42:03 marcus Exp $ + +--- gmodule/gmodule-dl.c.orig Sat Feb 17 08:28:07 2001 ++++ gmodule/gmodule-dl.c Fri Jan 18 09:48:45 2002 +@@ -104,6 +104,7 @@ + static gpointer + _g_module_self (void) + { ++#ifndef __FreeBSD__ + gpointer handle; + + /* to query symbols from the program itself, special link options +@@ -115,6 +116,9 @@ + g_module_set_error (fetch_dlerror (TRUE)); + + return handle; ++#else ++ return RTLD_DEFAULT; ++#endif + } + + static void |