diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-12-26 05:39:39 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-12-26 05:39:39 +0800 |
| commit | 04dfc9d5cfb24a62735c48d4aff7892351a05e7c (patch) | |
| tree | 4e8c5d1e4134b5071662c13785de091f79ed4969 /x11-toolkits/gtk30/files | |
| parent | 93fd98aa524fe94e8d24a05a5ec78b83abe9e8b5 (diff) | |
| download | marcuscom-ports-04dfc9d5cfb24a62735c48d4aff7892351a05e7c.tar marcuscom-ports-04dfc9d5cfb24a62735c48d4aff7892351a05e7c.tar.gz marcuscom-ports-04dfc9d5cfb24a62735c48d4aff7892351a05e7c.tar.bz2 marcuscom-ports-04dfc9d5cfb24a62735c48d4aff7892351a05e7c.tar.lz marcuscom-ports-04dfc9d5cfb24a62735c48d4aff7892351a05e7c.tar.xz marcuscom-ports-04dfc9d5cfb24a62735c48d4aff7892351a05e7c.tar.zst marcuscom-ports-04dfc9d5cfb24a62735c48d4aff7892351a05e7c.zip | |
Update to 2.91.7.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14945 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-toolkits/gtk30/files')
| -rw-r--r-- | x11-toolkits/gtk30/files/patch-Makefile.in | 15 | ||||
| -rw-r--r-- | x11-toolkits/gtk30/files/patch-configure | 31 | ||||
| -rw-r--r-- | x11-toolkits/gtk30/files/patch-docs_Makefile.in | 8 | ||||
| -rw-r--r-- | x11-toolkits/gtk30/files/patch-gdk_Makefile.in | 18 |
4 files changed, 53 insertions, 19 deletions
diff --git a/x11-toolkits/gtk30/files/patch-Makefile.in b/x11-toolkits/gtk30/files/patch-Makefile.in index c5e567012..484e0dd9c 100644 --- a/x11-toolkits/gtk30/files/patch-Makefile.in +++ b/x11-toolkits/gtk30/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2010-12-01 00:07:00.000000000 +0100 -+++ Makefile.in 2010-12-01 00:07:21.000000000 +0100 -@@ -416,7 +416,7 @@ +--- Makefile.in.orig 2010-12-25 22:08:00.000000000 +0100 ++++ Makefile.in 2010-12-25 22:24:02.000000000 +0100 +@@ -415,7 +415,7 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -9,3 +9,12 @@ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} MAINTAINERCLEANFILES = \ +@@ -441,7 +441,7 @@ + + pkgconfigdir = $(prefix)/libdata/pkgconfig + pkgconfig_DATA = gdk-3.0.pc gtk+-3.0.pc gail-3.0.pc $(patsubst \ +- %,gtk+-%-3.0.pc,@gdktarget@) $(am__append_1) ++ %,gtk+-%-3.0.pc,@gdktarget@) $(patsubst %,gdk-%-3.0.pc,@gdktarget@) $(am__append_1) + DISTCLEANFILES = \ + gtk+-unix-print-3.0.pc \ + gtk+-3.0.pc \ diff --git a/x11-toolkits/gtk30/files/patch-configure b/x11-toolkits/gtk30/files/patch-configure index 06a6f7b9f..84549a3ef 100644 --- a/x11-toolkits/gtk30/files/patch-configure +++ b/x11-toolkits/gtk30/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2009-12-26 21:41:27.000000000 +0100 -+++ configure 2009-12-26 21:51:04.000000000 +0100 -@@ -33884,9 +33884,9 @@ +--- configure.orig 2010-12-25 21:43:58.000000000 +0100 ++++ configure 2010-12-25 21:51:36.000000000 +0100 +@@ -23978,9 +23978,9 @@ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` @@ -12,3 +12,28 @@ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection +@@ -24530,7 +24530,7 @@ + fi + + +-if test "x${enable_Bsymbolic}" == "xyes"; then ++if test "x${enable_Bsymbolic}" = "xyes"; then + GTK_LINK_FLAGS=-Wl,-Bsymbolic-functions + fi + +@@ -25859,11 +25859,13 @@ + + gdk_windowing='' + if expr "$gdktarget" : ".*x11.*" > /dev/null ; then +- gdk_windowing+=' ++ gdk_windowing=' ++$gdk_windowing + #define GDK_WINDOWING_X11' + fi + if expr "$gdktarget" : ".*win32.*" > /dev/null ; then +- gdk_windowing+=' ++ gdk_windowing=' ++$gdk_windowing + #define GDK_NATIVE_WINDOW_POINTER + #define GDK_WINDOWING_WIN32' + fi diff --git a/x11-toolkits/gtk30/files/patch-docs_Makefile.in b/x11-toolkits/gtk30/files/patch-docs_Makefile.in index b6a6a7172..cc9e4c46a 100644 --- a/x11-toolkits/gtk30/files/patch-docs_Makefile.in +++ b/x11-toolkits/gtk30/files/patch-docs_Makefile.in @@ -1,11 +1,11 @@ ---- docs/Makefile.in.orig 2009-12-25 20:26:59.000000000 +0100 -+++ docs/Makefile.in 2009-12-25 20:27:35.000000000 +0100 -@@ -241,7 +241,7 @@ +--- docs/Makefile.in.orig 2010-12-24 00:14:51.000000000 +0100 ++++ docs/Makefile.in 2010-12-24 00:15:52.000000000 +0100 +@@ -220,7 +220,7 @@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ +MAKEINFO = @MAKEINFO@ --no-split + MANIFEST_TOOL = @MANIFEST_TOOL@ MATH_LIB = @MATH_LIB@ MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ diff --git a/x11-toolkits/gtk30/files/patch-gdk_Makefile.in b/x11-toolkits/gtk30/files/patch-gdk_Makefile.in index f91f26441..cc9daac87 100644 --- a/x11-toolkits/gtk30/files/patch-gdk_Makefile.in +++ b/x11-toolkits/gtk30/files/patch-gdk_Makefile.in @@ -1,11 +1,11 @@ ---- gdk/Makefile.in.orig 2010-12-01 00:07:46.000000000 +0100 -+++ gdk/Makefile.in 2010-12-01 00:08:24.000000000 +0100 -@@ -698,7 +698,7 @@ +--- gdk/Makefile.in.orig 2010-12-24 00:25:23.000000000 +0100 ++++ gdk/Makefile.in 2010-12-24 00:27:00.000000000 +0100 +@@ -562,7 +562,7 @@ # - # Rule to install gdkconfig.h header file + # setup GDK sources and their dependencies # --configexecincludedir = $(libdir)/gtk-3.0/include -+configexecincludedir = $(prefix)/include/gtk-3.0 - - #note: not gdkconfig.h - BUILT_SOURCES = \ +-gdkincludedir = $(includedir)/gtk-3.0/gdk ++gdkincludedir = $(prefix)/include/gtk-3.0 + gdkinclude_HEADERS = $(gdk_public_h_sources) $(gdk_built_public_sources) + common_sources = \ + $(gdk_private_headers) \ |