summaryrefslogtreecommitdiff
path: root/devel/glib20/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/glib20/files')
-rw-r--r--devel/glib20/files/extra-patch-glib_gunicollate.c33
-rw-r--r--devel/glib20/files/patch-ae28
-rw-r--r--devel/glib20/files/patch-ag18
-rw-r--r--devel/glib20/files/patch-gio_tests_gdbus-peer.c11
-rw-r--r--devel/glib20/files/patch-glib::libcharset::Makefile.in16
-rw-r--r--devel/glib20/files/patch-glib_Makefile.in25
-rw-r--r--devel/glib20/files/patch-gobject_Makefile.in12
7 files changed, 89 insertions, 54 deletions
diff --git a/devel/glib20/files/extra-patch-glib_gunicollate.c b/devel/glib20/files/extra-patch-glib_gunicollate.c
index dfcb99209ea8..e2edc6938273 100644
--- a/devel/glib20/files/extra-patch-glib_gunicollate.c
+++ b/devel/glib20/files/extra-patch-glib_gunicollate.c
@@ -1,6 +1,6 @@
---- glib/gunicollate.c.orig Thu Jun 8 17:24:10 2006
-+++ glib/gunicollate.c Thu Oct 19 20:12:50 2006
-@@ -26,10 +26,57 @@
+--- glib/gunicollate.c.orig
++++ glib/gunicollate.c
+@@ -26,6 +26,10 @@
#include <wchar.h>
#endif
@@ -8,9 +8,17 @@
+#include <unicode/ustring.h>
+#include <unicode/ucol.h>
+
- #include "glib.h"
- #include "gunicodeprivate.h"
- #include "galias.h"
+ #ifdef HAVE_CARBON
+ #include <CoreServices/CoreServices.h>
+ #endif
+@@ -36,10 +40,53 @@
+ #include "gstring.h"
+ #include "gstrfuncs.h"
+ #include "gtestutils.h"
++#include "gthread.h"
+ #ifndef __STDC_ISO_10646__
+ #include "gconvert.h"
+ #endif
+static gboolean icu_collator_initialized = FALSE;
+static UCollator *icu_collator = NULL;
@@ -54,11 +62,10 @@
+
+ return result;
+}
-+
+
#ifdef _MSC_VER
/* Workaround for bug in MSVCR80.DLL */
- static size_t
-@@ -94,6 +141,28 @@
+@@ -127,6 +174,28 @@
g_return_val_if_fail (str1 != NULL, 0);
g_return_val_if_fail (str2 != NULL, 0);
@@ -87,11 +94,10 @@
str1_norm = g_utf8_normalize (str1, -1, G_NORMALIZE_ALL_COMPOSE);
str2_norm = g_utf8_normalize (str2, -1, G_NORMALIZE_ALL_COMPOSE);
-@@ -235,6 +304,26 @@
- gchar *str_norm;
+@@ -419,6 +488,26 @@
g_return_val_if_fail (str != NULL, NULL);
-+
+
+ init_icu_collator();
+ if (icu_collator != NULL)
+ {
@@ -111,6 +117,7 @@
+ return result;
+ }
+ }
-
++
str_norm = g_utf8_normalize (str, len, G_NORMALIZE_ALL_COMPOSE);
+ result = NULL;
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index a6d6851b09cf..80fcb92b20d5 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,6 +1,6 @@
---- configure.orig 2010-03-03 21:31:46.000000000 -0500
-+++ configure 2010-03-03 21:47:47.000000000 -0500
-@@ -714,6 +714,9 @@ ac_includes_default="\
+--- configure.orig 2010-09-09 12:18:43.000000000 +0200
++++ configure 2010-09-09 12:20:56.000000000 +0200
+@@ -575,6 +575,9 @@
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
@@ -10,7 +10,16 @@
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
-@@ -23020,7 +23023,7 @@ _ACEOF
+@@ -5187,7 +5190,7 @@
+ fi
+
+ GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
+-ABS_GLIB_RUNTIME_LIBDIR="`readlink -f $libdir/$with_runtime_libdir`"
++ABS_GLIB_RUNTIME_LIBDIR="`readlink $libdir/$with_runtime_libdir`"
+
+
+ if test "x$with_runtime_libdir" != "x"; then
+@@ -22212,7 +22215,7 @@
fi
done
@@ -19,7 +28,7 @@
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"
-@@ -25631,6 +25634,8 @@ fi
+@@ -24815,6 +24818,8 @@
;;
esac
fi
@@ -28,3 +37,12 @@
if test x"$G_THREAD_CFLAGS" = x; then
+@@ -27415,7 +27420,7 @@
+ fi
+
+
+-if test "x${enable_Bsymbolic}" == "xyes"; then
++if test "x${enable_Bsymbolic}" = "xyes"; then
+ GLIB_LINK_FLAGS=-Wl,-Bsymbolic-functions
+ fi
+
diff --git a/devel/glib20/files/patch-ag b/devel/glib20/files/patch-ag
index 5ee7fe3d539f..289bc3381903 100644
--- a/devel/glib20/files/patch-ag
+++ b/devel/glib20/files/patch-ag
@@ -1,21 +1,11 @@
---- Makefile.in.orig 2008-02-12 00:16:23.000000000 +0100
-+++ Makefile.in 2008-02-12 00:16:23.000000000 +0100
-@@ -338,7 +338,7 @@ EXTRA_DIST = ChangeLog.pre-2-14 ChangeLo
+--- Makefile.in.orig 2010-08-08 12:14:27.000000000 +0200
++++ Makefile.in 2010-08-08 12:15:40.000000000 +0200
+@@ -418,7 +418,7 @@
gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in
TEST_PROGS =
- AUTOMAKE_OPTIONS = 1.7
+ ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
-SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
+SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
DIST_SUBDIRS = $(SUBDIRS) build
bin_SCRIPTS = glib-gettextize
AM_CPPFLAGS = \
-@@ -356,7 +356,8 @@ BUILT_EXTRA_DIST = \
- config.h.win32 \
- gtk-doc.make
-
--configexecincludedir = $(libdir)/glib-2.0/include
-+glibincludedir = $(includedir)/glib-2.0
-+configexecincludedir = $(glibincludedir)
- configexecinclude_DATA = glibconfig.h
- CONFIGURE_DEPENDENCIES = acglib.m4
- BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
diff --git a/devel/glib20/files/patch-gio_tests_gdbus-peer.c b/devel/glib20/files/patch-gio_tests_gdbus-peer.c
new file mode 100644
index 000000000000..1ab76dc8c704
--- /dev/null
+++ b/devel/glib20/files/patch-gio_tests_gdbus-peer.c
@@ -0,0 +1,11 @@
+--- gio/tests/gdbus-peer.c.orig 2010-08-16 21:30:03.000000000 +0200
++++ gio/tests/gdbus-peer.c 2010-08-16 23:13:32.000000000 +0200
+@@ -42,6 +42,8 @@
+ #include <sys/socket.h>
+ #endif
+
++#include <sys/socket.h>
++
+ /* used in test_overflow */
+ #ifdef G_OS_UNIX
+ #include <gio/gunixconnection.h>
diff --git a/devel/glib20/files/patch-glib::libcharset::Makefile.in b/devel/glib20/files/patch-glib::libcharset::Makefile.in
index 352c0cf6031c..7175b8581c93 100644
--- a/devel/glib20/files/patch-glib::libcharset::Makefile.in
+++ b/devel/glib20/files/patch-glib::libcharset::Makefile.in
@@ -1,15 +1,15 @@
---- glib/libcharset/Makefile.in.orig 2008-06-04 00:03:14.000000000 +0200
-+++ glib/libcharset/Makefile.in 2008-06-04 00:05:58.000000000 +0200
-@@ -278,7 +278,7 @@ EXTRA_DIST = README config.charset ref-a
+--- glib/libcharset/Makefile.in.orig 2010-08-08 12:46:01.000000000 +0200
++++ glib/libcharset/Makefile.in 2010-08-08 12:46:01.000000000 +0200
+@@ -328,7 +328,7 @@ EXTRA_DIST = README config.charset ref-a
codeset.m4 update.sh make-patch.sh libcharset-glib.patch
TEST_PROGS =
INCLUDES = \
-- -DLIBDIR=\"$(libdir)\" -I$(top_srcdir)
-+ -DLIBDIR=\"$(prefix)/libdata\" -I$(top_srcdir)
+- -DLIBDIR=\"$(libdir)\" $(config_h_INCLUDES)
++ -DLIBDIR=\"$(prefix)/libdata\" $(config_h_INCLUDES)
noinst_LTLIBRARIES = libcharset.la
libcharset_la_SOURCES = \
-@@ -286,8 +286,8 @@ libcharset_la_SOURCES = \
+@@ -336,8 +336,8 @@ libcharset_la_SOURCES = \
localcharset.h \
localcharset.c
@@ -20,9 +20,9 @@
SUFFIXES = .sed .sin
CLEANFILES = charset.alias ref-add.sed ref-del.sed
all: all-am
-@@ -498,7 +498,7 @@ install-data-am:
+@@ -566,7 +566,7 @@ install-dvi: install-dvi-am
- install-dvi: install-dvi-am
+ install-dvi-am:
-install-exec-am: install-exec-local
+install-exec-am: # install-exec-local
diff --git a/devel/glib20/files/patch-glib_Makefile.in b/devel/glib20/files/patch-glib_Makefile.in
index 8dd7ae74bb82..d58efb723f81 100644
--- a/devel/glib20/files/patch-glib_Makefile.in
+++ b/devel/glib20/files/patch-glib_Makefile.in
@@ -1,17 +1,26 @@
---- glib/Makefile.in.orig 2009-09-30 09:37:39.000000000 +0200
-+++ glib/Makefile.in 2009-09-30 09:38:48.000000000 +0200
-@@ -1396,7 +1396,7 @@
+--- glib/Makefile.in.orig 2010-08-08 12:46:01.000000000 +0200
++++ glib/Makefile.in 2010-08-08 12:46:01.000000000 +0200
+@@ -529,7 +529,7 @@ BUILT_SOURCES = glibconfig-stamp $(am__a
+ #
+ DISTCLEANFILES = glibconfig-stamp glibconfig.h
+ CLEANFILES = $(am__append_2)
+-configexecincludedir = $(libdir)/glib-2.0/include
++configexecincludedir = $(includedir)/glib-2.0
+ nodist_configexecinclude_HEADERS = glibconfig.h
+ @HAVE_GOOD_PRINTF_FALSE@PRINTF_SUBDIR = gnulib
+ @HAVE_GOOD_PRINTF_FALSE@printf_la = gnulib/libgnulib.la
+@@ -1530,7 +1530,7 @@ info: info-recursive
info-am:
-install-data-am: install-data-local install-dist_gdbSCRIPTS \
+install-data-am: install-data-local \
- install-glibincludeHEADERS install-glibsubincludeHEADERS
+ install-glibincludeHEADERS install-glibsubincludeHEADERS \
+ install-tapsetDATA
@$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-data-hook
-@@ -1603,9 +1603,7 @@
+@@ -1786,9 +1786,7 @@ distclean-local:
libglib-gdb.py: libglib-gdb.py.in
- sed -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > libglib-gdb.py
+ $(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > libglib-gdb.py
-install-data-hook: libglib-gdb.py
- mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)
@@ -19,4 +28,4 @@
+install-data-hook:
@HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
@HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libglib-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
- @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libglib-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
diff --git a/devel/glib20/files/patch-gobject_Makefile.in b/devel/glib20/files/patch-gobject_Makefile.in
index b8842a6f46e4..12a20215a0bb 100644
--- a/devel/glib20/files/patch-gobject_Makefile.in
+++ b/devel/glib20/files/patch-gobject_Makefile.in
@@ -1,15 +1,15 @@
---- gobject/Makefile.in.orig 2009-09-30 09:39:51.000000000 +0200
-+++ gobject/Makefile.in 2009-09-30 09:40:17.000000000 +0200
-@@ -1186,7 +1186,7 @@ info: info-recursive
+--- gobject/Makefile.in.orig 2010-06-08 09:19:51.000000000 +0200
++++ gobject/Makefile.in 2010-06-08 09:20:41.000000000 +0200
+@@ -1236,7 +1236,7 @@ info: info-recursive
info-am:
-install-data-am: install-data-local install-dist_gdbSCRIPTS \
+install-data-am: install-data-local \
- install-libgobjectincludeHEADERS
+ install-libgobjectincludeHEADERS install-tapsetDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-@@ -1393,9 +1393,7 @@ libgobject-gdb.py: libgobject-gdb.py.in
+@@ -1460,9 +1460,7 @@ libgobject-gdb.py: libgobject-gdb.py.in
uninstall-gdb:
-rm -r $(DESTDIR)$(datadir)/gdb
@@ -19,4 +19,4 @@
+install-data-hook:
@HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
@HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
- @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 05:43:31 +0000