diff options
Diffstat (limited to 'devel/glib20/files')
| -rw-r--r-- | devel/glib20/files/extra-patch-glib_Makefile.in | 8 | ||||
| -rw-r--r-- | devel/glib20/files/patch-ae | 14 | ||||
| -rw-r--r-- | devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h | 20 | ||||
| -rw-r--r-- | devel/glib20/files/patch-glib::libcharset::Makefile.in | 11 |
4 files changed, 27 insertions, 26 deletions
diff --git a/devel/glib20/files/extra-patch-glib_Makefile.in b/devel/glib20/files/extra-patch-glib_Makefile.in index 3c5676d2eb1e..4791780e29cc 100644 --- a/devel/glib20/files/extra-patch-glib_Makefile.in +++ b/devel/glib20/files/extra-patch-glib_Makefile.in @@ -1,9 +1,9 @@ ---- glib/Makefile.in.orig Wed Jul 19 01:08:13 2006 -+++ glib/Makefile.in Wed Jul 19 01:09:10 2006 -@@ -130,7 +130,7 @@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +--- glib/Makefile.in.orig 2008-12-01 16:15:34.000000000 -0500 ++++ glib/Makefile.in 2008-12-01 16:16:03.000000000 -0500 +@@ -272,7 +272,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ + LD = @LD@ -LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@ -licui18n LIBOBJS = @LIBOBJS@ diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae index 2ba6ab189dda..0345b8acd046 100644 --- a/devel/glib20/files/patch-ae +++ b/devel/glib20/files/patch-ae @@ -1,6 +1,6 @@ ---- configure.orig 2008-03-17 23:32:05.000000000 -0400 -+++ configure 2008-03-18 17:55:42.000000000 -0400 -@@ -32748,6 +32748,12 @@ cat confdefs.h >>conftest.$ac_ext +--- configure.orig 2008-11-24 13:44:42.000000000 -0600 ++++ configure 2008-11-24 13:50:51.000000000 -0600 +@@ -29576,6 +29576,12 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default @@ -13,16 +13,16 @@ int main () { -@@ -34051,7 +34057,7 @@ done +@@ -31407,7 +31413,7 @@ -for ac_func in chown lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid +for ac_func in chown lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid sysctlbyname do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` - { echo "$as_me:$LINENO: checking for $ac_func" >&5 -@@ -39139,6 +39145,8 @@ fi + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +@@ -36810,6 +36816,8 @@ ;; esac fi diff --git a/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h b/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h index 58aa93037507..039571d8b496 100644 --- a/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h +++ b/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h @@ -1,12 +1,12 @@ ---- gio/xdgmime/xdgmimecache.h.orig 2007-09-13 16:35:37.000000000 -0400 -+++ gio/xdgmime/xdgmimecache.h 2007-09-14 00:59:43.000000000 -0400 -@@ -42,6 +42,9 @@ typedef struct _XdgMimeCache XdgMimeCach - #define _xdg_mime_cache_list_mime_parents XDG_ENTRY(cache_list_mime_parents) - #define _xdg_mime_cache_mime_type_subclass XDG_ENTRY(cache_mime_type_subclass) - #define _xdg_mime_cache_unalias_mime_type XDG_ENTRY(cache_unalias_mime_type) -+#define _xdg_mime_cache_is_valid_mime_type XDG_ENTRY(cache_is_valid_mime_type) -+#define _xdg_mime_cache_mime_type_equal XDG_ENTRY(cache_mime_type_equal) -+#define _xdg_mime_cache_media_type_equal XDG_ENTRY(cache_media_type_equal) - +--- gio/xdgmime/xdgmimecache.h.orig 2008-06-12 10:25:40.000000000 -0400 ++++ gio/xdgmime/xdgmimecache.h 2008-06-14 00:49:59.000000000 -0400 +@@ -46,6 +46,9 @@ typedef struct _XdgMimeCache XdgMimeCach + #define _xdg_mime_cache_get_icon XDG_RESERVED_ENTRY(cache_get_icon) + #define _xdg_mime_cache_get_generic_icon XDG_RESERVED_ENTRY(cache_get_generic_icon) + #define _xdg_mime_cache_glob_dump XDG_RESERVED_ENTRY(cache_glob_dump) ++#define _xdg_mime_cache_is_valid_mime_type XDG_RESERVED_ENTRY(cache_is_valid_mime_type) ++#define _xdg_mime_cache_mime_type_equal XDG_RESERVED_ENTRY(cache_mime_type_equal) ++#define _xdg_mime_cache_media_type_equal XDG_RESERVED_ENTRY(cache_media_type_equal) #endif + extern XdgMimeCache **_caches; diff --git a/devel/glib20/files/patch-glib::libcharset::Makefile.in b/devel/glib20/files/patch-glib::libcharset::Makefile.in index 9cec8906fb28..352c0cf6031c 100644 --- a/devel/glib20/files/patch-glib::libcharset::Makefile.in +++ b/devel/glib20/files/patch-glib::libcharset::Makefile.in @@ -1,6 +1,6 @@ ---- glib/libcharset/Makefile.in.orig 2007-12-21 16:55:09.000000000 -0500 -+++ glib/libcharset/Makefile.in 2007-12-21 16:56:04.000000000 -0500 -@@ -277,15 +277,15 @@ EXTRA_DIST = README config.charset ref-a +--- 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 codeset.m4 update.sh make-patch.sh libcharset-glib.patch TEST_PROGS = INCLUDES = \ @@ -9,7 +9,8 @@ noinst_LTLIBRARIES = libcharset.la libcharset_la_SOURCES = \ - libcharset.h \ +@@ -286,8 +286,8 @@ libcharset_la_SOURCES = \ + localcharset.h \ localcharset.c -charset_alias = $(DESTDIR)$(libdir)/charset.alias @@ -19,7 +20,7 @@ SUFFIXES = .sed .sin CLEANFILES = charset.alias ref-add.sed ref-del.sed all: all-am -@@ -497,7 +497,7 @@ install-data-am: +@@ -498,7 +498,7 @@ install-data-am: install-dvi: install-dvi-am |