diff options
Diffstat (limited to 'x11-toolkits/gtk20/files')
-rw-r--r-- | x11-toolkits/gtk20/files/patch-Makefile.in | 11 | ||||
-rw-r--r-- | x11-toolkits/gtk20/files/patch-ad | 23 | ||||
-rw-r--r-- | x11-toolkits/gtk20/files/patch-ag | 19 | ||||
-rw-r--r-- | x11-toolkits/gtk20/files/patch-ah | 11 | ||||
-rw-r--r-- | x11-toolkits/gtk20/files/patch-ai | 11 | ||||
-rw-r--r-- | x11-toolkits/gtk20/files/patch-ak | 14 | ||||
-rw-r--r-- | x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in | 13 | ||||
-rw-r--r-- | x11-toolkits/gtk20/files/patch-gtk_gtkfilechooserdefault.c | 16 | ||||
-rw-r--r-- | x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c | 26 | ||||
-rw-r--r-- | x11-toolkits/gtk20/files/patch-ltmain.sh | 51 |
10 files changed, 0 insertions, 195 deletions
diff --git a/x11-toolkits/gtk20/files/patch-Makefile.in b/x11-toolkits/gtk20/files/patch-Makefile.in deleted file mode 100644 index c47baaab5..000000000 --- a/x11-toolkits/gtk20/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Thu Jan 22 19:40:10 2004 -+++ Makefile.in Thu Jan 22 19:40:52 2004 -@@ -286,7 +286,7 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros - - # require automake 1.4 diff --git a/x11-toolkits/gtk20/files/patch-ad b/x11-toolkits/gtk20/files/patch-ad deleted file mode 100644 index 856950d64..000000000 --- a/x11-toolkits/gtk20/files/patch-ad +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD: ports/x11-toolkits/gtk20/files/patch-ad,v 1.12 2003/02/07 18:42:22 marcus Exp $ - ---- gtk/gtkrc.c.orig Thu Dec 13 21:51:18 2001 -+++ gtk/gtkrc.c Fri Jan 18 11:14:14 2002 -@@ -336,7 +336,7 @@ - if (im_module_file) - result = g_strdup (im_module_file); - else -- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); -+ result = g_build_filename (GTK_DATA_PREFIX, "etc", "gtk-2.0", "gtk.immodules", NULL); - } - - return result; -@@ -418,7 +418,7 @@ - } - else - { -- str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL); -+ str = g_build_filename (GTK_SYSCONFDIR, "gtk", NULL); - - gtk_rc_add_default_file (str); - g_free (str); diff --git a/x11-toolkits/gtk20/files/patch-ag b/x11-toolkits/gtk20/files/patch-ag deleted file mode 100644 index b34d2b3f2..000000000 --- a/x11-toolkits/gtk20/files/patch-ag +++ /dev/null @@ -1,19 +0,0 @@ ---- gtk/Makefile.in.orig Fri Oct 24 21:45:12 2003 -+++ gtk/Makefile.in Fri Oct 24 21:46:49 2003 -@@ -301,7 +301,7 @@ - -DGTK_LIBDIR=\"$(libdir)\" \ - -DGTK_DATADIR=\"$(datadir)\" \ - -DGTK_DATA_PREFIX=\"$(prefix)\" \ -- -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ -+ -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" \ - -DGTK_VERSION=\"$(GTK_VERSION)\" \ - -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ - -DGTK_HOST=\"$(host)\" \ -@@ -856,6 +856,7 @@ - TEST_DEPS = $(DEPS) gtk.immodules - - LDADDS = \ -+ $(GLIB_LIBS) \ - $(gtktargetlib) \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/$(gdktargetlib) diff --git a/x11-toolkits/gtk20/files/patch-ah b/x11-toolkits/gtk20/files/patch-ah deleted file mode 100644 index 88bfe209d..000000000 --- a/x11-toolkits/gtk20/files/patch-ah +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index a04d08ef5..000000000 --- a/x11-toolkits/gtk20/files/patch-ai +++ /dev/null @@ -1,11 +0,0 @@ ---- docs/reference/Makefile.in.orig Fri Oct 24 23:38:06 2003 -+++ docs/reference/Makefile.in Fri Oct 24 23:48:00 2003 -@@ -286,7 +286,7 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - --SUBDIRS = gdk-pixbuf gdk gtk -+SUBDIRS = #gdk-pixbuf gdk gtk - subdir = docs/reference - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h diff --git a/x11-toolkits/gtk20/files/patch-ak b/x11-toolkits/gtk20/files/patch-ak deleted file mode 100644 index a682acb21..000000000 --- a/x11-toolkits/gtk20/files/patch-ak +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD: ports/x11-toolkits/gtk20/files/patch-ak,v 1.4 2003/02/07 18:42:22 marcus Exp $ - ---- 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 deleted file mode 100644 index c2cb10b54..000000000 --- a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ ---- gdk-pixbuf/Makefile.in.orig Thu Nov 20 15:39:55 2003 -+++ gdk-pixbuf/Makefile.in Thu Nov 20 15:40:17 2003 -@@ -517,7 +517,9 @@ - - - AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" --LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la -+LDADDS = \ -+ $(GLIB_LIBS) \ -+ libgdk_pixbuf-$(GTK_API_VERSION).la - - noinst_PROGRAMS = test-gdk-pixbuf - test_gdk_pixbuf_LDADD = $(LDADDS) diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkfilechooserdefault.c b/x11-toolkits/gtk20/files/patch-gtk_gtkfilechooserdefault.c deleted file mode 100644 index a2a281fe2..000000000 --- a/x11-toolkits/gtk20/files/patch-gtk_gtkfilechooserdefault.c +++ /dev/null @@ -1,16 +0,0 @@ ---- gtk/gtkfilechooserdefault.c.orig Wed Mar 10 16:11:22 2004 -+++ gtk/gtkfilechooserdefault.c Wed Mar 10 16:12:05 2004 -@@ -757,10 +757,12 @@ - GtkFileFolder *parent_folder; - GtkFileInfo *info; - -+ info = NULL; -+ - if (!gtk_file_system_get_parent (file_system, path, &parent_path, error)) - return NULL; - -- parent_folder = gtk_file_system_get_folder (file_system, parent_path, -+ parent_folder = gtk_file_system_get_folder (file_system, parent_path ? parent_path : path, - GTK_FILE_INFO_DISPLAY_NAME - #if 0 - | GTK_FILE_INFO_ICON diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c b/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c deleted file mode 100644 index 07bb57a6d..000000000 --- a/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c +++ /dev/null @@ -1,26 +0,0 @@ ---- gtk/gtkicontheme.c.orig Thu Jan 29 16:53:42 2004 -+++ gtk/gtkicontheme.c Thu Jan 29 16:54:56 2004 -@@ -526,7 +526,7 @@ - - priv->custom_theme = FALSE; - priv->current_theme = g_strdup (DEFAULT_THEME_NAME); -- priv->search_path = g_new (char *, 5); -+ priv->search_path = g_new (char *, 7); - - - priv->search_path[0] = g_build_filename (g_get_home_dir (), -@@ -534,9 +534,11 @@ - NULL); - priv->search_path[1] = g_build_filename (GTK_DATADIR, "pixmaps", NULL); - priv->search_path[2] = g_build_filename (GTK_DATADIR, "icons", NULL); -- priv->search_path[3] = g_strdup ("/usr/share/icons"); -- priv->search_path[4] = g_strdup ("/usr/share/pixmaps"); -- priv->search_path_len = 5; -+ priv->search_path[3] = g_build_filename (GTK_DATADIR, "gnome", "pixmaps", NULL); -+ priv->search_path[4] = g_build_filename (GTK_DATADIR, "gnome", "icons", NULL); -+ priv->search_path[5] = g_strdup ("/usr/share/icons"); -+ priv->search_path[6] = g_strdup ("/usr/share/pixmaps"); -+ priv->search_path_len = 7; - - priv->themes_valid = FALSE; - priv->themes = NULL; diff --git a/x11-toolkits/gtk20/files/patch-ltmain.sh b/x11-toolkits/gtk20/files/patch-ltmain.sh deleted file mode 100644 index 58384ee38..000000000 --- a/x11-toolkits/gtk20/files/patch-ltmain.sh +++ /dev/null @@ -1,51 +0,0 @@ ---- ltmain.sh.orig Sat Dec 6 14:47:45 2003 -+++ ltmain.sh Tue Dec 9 14:09:01 2003 -@@ -1280,7 +1280,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1290,8 +1290,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -3000,6 +3008,9 @@ - # problems, so we reset it completely - verstring= - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - verstring="0.0" - ;; -@@ -5428,10 +5439,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" |