summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2009-05-11 02:34:41 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2009-05-11 02:34:41 +0800
commitefc8063cd04da2518270c534caec30e31dc7d27c (patch)
tree31dcd4286b4a2133b56b341a29532c3805993fe3
parent1e91a71878f28fb634718941807176a761b3b3ca (diff)
downloadmarcuscom-ports-efc8063cd04da2518270c534caec30e31dc7d27c.tar
marcuscom-ports-efc8063cd04da2518270c534caec30e31dc7d27c.tar.gz
marcuscom-ports-efc8063cd04da2518270c534caec30e31dc7d27c.tar.bz2
marcuscom-ports-efc8063cd04da2518270c534caec30e31dc7d27c.tar.lz
marcuscom-ports-efc8063cd04da2518270c534caec30e31dc7d27c.tar.xz
marcuscom-ports-efc8063cd04da2518270c534caec30e31dc7d27c.tar.zst
marcuscom-ports-efc8063cd04da2518270c534caec30e31dc7d27c.zip
Re-add the patches which were left out in the 2.17.0 update.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12296 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--x11-toolkits/gtk20/Makefile4
-rw-r--r--x11-toolkits/gtk20/files/patch-Makefile.in11
-rw-r--r--x11-toolkits/gtk20/files/patch-ah11
-rw-r--r--x11-toolkits/gtk20/files/patch-ai11
-rw-r--r--x11-toolkits/gtk20/files/patch-ak11
-rw-r--r--x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in15
-rw-r--r--x11-toolkits/gtk20/files/patch-gtk_Makefile.in16
-rw-r--r--x11-toolkits/gtk20/files/patch-gtk_gtksignal.h13
-rw-r--r--x11-toolkits/gtk20/files/patch-gtk_updateiconcache.c11
9 files changed, 101 insertions, 2 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 4576819f1..85274e760 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -3,12 +3,12 @@
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.154 2009/05/06 13:33:01 kwm Exp $
#
PORTNAME= gtk
PORTVERSION= 2.17.0
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \
diff --git a/x11-toolkits/gtk20/files/patch-Makefile.in b/x11-toolkits/gtk20/files/patch-Makefile.in
new file mode 100644
index 000000000..307fd6fc2
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig Wed Aug 3 18:09:32 2005
++++ Makefile.in Wed Aug 3 18:10:01 2005
+@@ -288,7 +288,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+
+-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos perf contrib
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
+
+ # require automake 1.4
diff --git a/x11-toolkits/gtk20/files/patch-ah b/x11-toolkits/gtk20/files/patch-ah
new file mode 100644
index 000000000..88bfe209d
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ah
@@ -0,0 +1,11 @@
+--- docs/Makefile.in.orig Fri Oct 24 21:47:52 2003
++++ docs/Makefile.in Fri Oct 24 23:35:09 2003
+@@ -179,7 +179,7 @@
+ MAINT = @MAINT@
+ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = @MAKEINFO@ --no-split
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@
diff --git a/x11-toolkits/gtk20/files/patch-ai b/x11-toolkits/gtk20/files/patch-ai
new file mode 100644
index 000000000..a7c07057c
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ai
@@ -0,0 +1,11 @@
+--- docs/reference/Makefile.in.orig 2008-02-23 10:25:17.000000000 -0500
++++ docs/reference/Makefile.in 2008-02-23 10:26:36.000000000 -0500
+@@ -372,7 +372,7 @@
+ && DISPLAY=:$$XID && export DISPLAY
+
+
+-SUBDIRS = gdk-pixbuf gdk gtk libgail-util
++SUBDIRS = # gdk-pixbuf gdk gtk libgail-util
+ subdir = docs/reference
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/x11-toolkits/gtk20/files/patch-ak b/x11-toolkits/gtk20/files/patch-ak
new file mode 100644
index 000000000..7f8e0eb0c
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ak
@@ -0,0 +1,11 @@
+--- gdk/Makefile.in.orig Thu Feb 14 12:38:26 2002
++++ gdk/Makefile.in Thu Feb 14 12:45:37 2002
+@@ -315,7 +315,7 @@
+ #
+ # Rule to install gdkconfig.h header file
+ #
+-configexecincludedir = $(libdir)/gtk-2.0/include
++configexecincludedir = $(prefix)/include/gtk-2.0
+
+ #note: not gdkconfig.h
+ BUILT_SOURCES = stamp-gc-h @REBUILD@ gdkenumtypes.c gdkenumtypes.h
diff --git a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
new file mode 100644
index 000000000..1bedfdf55
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
@@ -0,0 +1,15 @@
+--- gdk-pixbuf/Makefile.in.orig Wed Mar 2 15:56:36 2005
++++ gdk-pixbuf/Makefile.in Wed Mar 2 15:57:08 2005
+@@ -519,10 +519,10 @@
+
+ bin_PROGRAMS = gdk-pixbuf-csource gdk-pixbuf-query-loaders
+ gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
+-gdk_pixbuf_csource_LDADD = $(LDADDS)
++gdk_pixbuf_csource_LDADD = $(LDADDS) $(GLIB_LIBS)
+
+ gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS)
+-gdk_pixbuf_query_loaders_LDADD = $(LDADDS)
++gdk_pixbuf_query_loaders_LDADD = $(LDADDS) $(GLIB_LIBS)
+
+ gdk_pixbuf_query_loaders_SOURCES = queryloaders.c
+
diff --git a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
new file mode 100644
index 000000000..610ece8f3
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
@@ -0,0 +1,16 @@
+--- gtk/Makefile.in.orig Sat May 6 04:47:11 2006
++++ gtk/Makefile.in Sat May 6 04:48:06 2006
+@@ -1009,11 +1009,11 @@ LDADDS = \
+ bin_PROGRAMS = gtk-query-immodules-2.0 gtk-update-icon-cache
+
+ gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
+-gtk_query_immodules_2_0_LDADD = $(LDADDS)
++gtk_query_immodules_2_0_LDADD = $(LDADDS) $(GLIB_LIBS)
+
+ gtk_query_immodules_2_0_SOURCES = queryimmodules.c
+
+-gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
++gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(GLIB_LIBS)
+
+ gtk_update_icon_cache_SOURCES = updateiconcache.c
+
diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtksignal.h b/x11-toolkits/gtk20/files/patch-gtk_gtksignal.h
new file mode 100644
index 000000000..c687dec40
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_gtksignal.h
@@ -0,0 +1,13 @@
+--- gtk/gtksignal.h.orig 2008-06-12 01:40:59.000000000 -0400
++++ gtk/gtksignal.h 2008-06-11 18:21:47.000000000 -0400
+@@ -29,7 +29,9 @@
+ #ifndef __GTK_SIGNAL_H__
+ #define __GTK_SIGNAL_H__
+
+-#include <gtk/gtk.h>
++#include <gtk/gtkenums.h>
++#include <gtk/gtktypeutils.h>
++#include <gtk/gtkobject.h>
+ #include <gtk/gtkmarshal.h>
+
+ G_BEGIN_DECLS
diff --git a/x11-toolkits/gtk20/files/patch-gtk_updateiconcache.c b/x11-toolkits/gtk20/files/patch-gtk_updateiconcache.c
new file mode 100644
index 000000000..354837da5
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_updateiconcache.c
@@ -0,0 +1,11 @@
+--- gtk/updateiconcache.c.orig 2008-02-16 11:33:25.000000000 -0500
++++ gtk/updateiconcache.c 2008-02-16 11:33:33.000000000 -0500
+@@ -1477,7 +1477,7 @@ build_cache (const gchar *path)
+ if (!validate_file (tmp_cache_path))
+ {
+ g_printerr (_("The generated cache was invalid.\n"));
+- //g_unlink (tmp_cache_path);
++ g_unlink (tmp_cache_path);
+ exit (1);
+ }
+