summaryrefslogtreecommitdiff
path: root/x11-toolkits/gtk20/files
diff options
context:
space:
mode:
Diffstat (limited to 'x11-toolkits/gtk20/files')
-rw-r--r--x11-toolkits/gtk20/files/patch-ae19
-rw-r--r--x11-toolkits/gtk20/files/patch-ag13
-rw-r--r--x11-toolkits/gtk20/files/patch-ah15
-rw-r--r--x11-toolkits/gtk20/files/patch-aj11
4 files changed, 24 insertions, 34 deletions
diff --git a/x11-toolkits/gtk20/files/patch-ae b/x11-toolkits/gtk20/files/patch-ae
index 162619848409..cd62bea5ac85 100644
--- a/x11-toolkits/gtk20/files/patch-ae
+++ b/x11-toolkits/gtk20/files/patch-ae
@@ -1,6 +1,9 @@
---- configure.orig Tue Jul 18 13:28:55 2000
-+++ configure Tue Jul 18 13:31:30 2000
-@@ -3821,7 +3821,7 @@
+
+$FreeBSD$
+
+--- configure.orig Tue Apr 17 23:13:16 2001
++++ configure Sun Apr 29 14:55:08 2001
+@@ -3842,7 +3842,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
@@ -9,7 +12,7 @@
fi
rm -f conftest*
INSTOBJEXT=.mo
-@@ -3831,7 +3831,7 @@
+@@ -3852,7 +3852,7 @@
# Added by Martin Baulig 12/15/98 for libc5 systems
if test "$gt_cv_func_dgettext_libc" != "yes" \
&& test "$gt_cv_func_dgettext_libintl" = "yes"; then
@@ -18,11 +21,3 @@
LIBS=`echo $LIBS | sed -e 's/-lintl//'`
fi
-@@ -4598,6 +4598,7 @@
- glib_thread_cflags="$GLIB_CFLAGS"
- glib_libs=`$GLIB_CONFIG_2_0 glib gobject gmodule --libs`
- glib_thread_libs="$GLIB_LIBS"
-+ GLIB_CFLAGS="$glib_cflags"
- GLIB_LIBS="$glib_libs"
- GLIB_DEPLIBS="$glib_libs"
- else
diff --git a/x11-toolkits/gtk20/files/patch-ag b/x11-toolkits/gtk20/files/patch-ag
index 5ad8703ea846..5ebe46b50b9a 100644
--- a/x11-toolkits/gtk20/files/patch-ag
+++ b/x11-toolkits/gtk20/files/patch-ag
@@ -1,11 +1,14 @@
---- gtk/Makefile.in.orig Sat Nov 18 03:17:08 2000
-+++ gtk/Makefile.in Mon Nov 20 15:30:40 2000
-@@ -164,7 +164,7 @@
+
+$FreeBSD$
+
+--- gtk/Makefile.in.orig Sun Apr 29 14:57:36 2001
++++ gtk/Makefile.in Sun Apr 29 14:59:46 2001
+@@ -166,7 +166,7 @@
SUBDIRS = stock-icons
--INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_EXE_PREFIX=\"$(exec_prefix)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @PANGO_CFLAGS@ @GLIB_CFLAGS@ @more_cflags@ @STRIP_END@
-+INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_EXE_PREFIX=\"$(exec_prefix)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @PANGO_CFLAGS@ @GLIB_CFLAGS@ @more_cflags@ @STRIP_END@
+-INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @PANGO_CFLAGS@ @GLIB_CFLAGS@ @more_cflags@ @STRIP_END@
++INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @PANGO_CFLAGS@ @GLIB_CFLAGS@ @more_cflags@ @STRIP_END@
gtarget = @gdktarget@
diff --git a/x11-toolkits/gtk20/files/patch-ah b/x11-toolkits/gtk20/files/patch-ah
index c1c1d5f4c4ab..ff8d93004b4a 100644
--- a/x11-toolkits/gtk20/files/patch-ah
+++ b/x11-toolkits/gtk20/files/patch-ah
@@ -1,6 +1,9 @@
---- docs/Makefile.in.orig Sat Nov 18 03:17:12 2000
-+++ docs/Makefile.in Mon Nov 20 15:32:30 2000
-@@ -120,7 +120,7 @@
+
+$FreeBSD$
+
+--- docs/Makefile.in.orig Sun Apr 29 15:00:49 2001
++++ docs/Makefile.in Sun Apr 29 15:01:48 2001
+@@ -124,7 +124,7 @@
LT_RELEASE = @LT_RELEASE@
LT_REVISION = @LT_REVISION@
MAINT = @MAINT@
@@ -9,14 +12,14 @@
MATH_LIB = @MATH_LIB@
MKINSTALLDIRS = @MKINSTALLDIRS@
OBJDUMP = @OBJDUMP@
-@@ -162,13 +162,13 @@
+@@ -164,13 +164,13 @@
SUBDIRS = tutorial faq reference
-man_MANS = gtk-config.1
+man_MANS = gtk-config-2.0.1
- EXTRA_DIST = Changes-1.2.txt Changes-2.0.txt debugging.txt defsformat.txt developers.txt dnd_internals.txt make-todo refcounting.txt styles.txt text_widget.txt widget_system.txt generation.txt gtk-config.txt gtk-config.1.in gtkdocs_fix
+ EXTRA_DIST = Changes-1.2.txt Changes-2.0.txt debugging.txt defsformat.txt developers.txt dnd_internals.txt make-todo refcounting.txt styles.txt text_widget.txt widget_system.txt generation.txt README.linux-fb gtk-config.txt gtk-config.1.in gtkdocs_fix
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
@@ -25,7 +28,7 @@
man1dir = $(mandir)/man1
MANS = $(man_MANS)
-@@ -191,6 +191,9 @@
+@@ -193,6 +193,9 @@
gtk-config.1: $(top_builddir)/config.status gtk-config.1.in
cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/x11-toolkits/gtk20/files/patch-aj b/x11-toolkits/gtk20/files/patch-aj
deleted file mode 100644
index d28f0b867d39..000000000000
--- a/x11-toolkits/gtk20/files/patch-aj
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in 2000/11/20 14:46:22 1.1
-+++ Makefile.in 2000/11/20 14:46:25
-@@ -493,7 +493,7 @@
- install-exec-am: install-binSCRIPTS
- install-exec: install-exec-recursive
-
--install-data-am: install-m4dataDATA install-pkgconfigDATA
-+install-data-am: install-m4dataDATA
- install-data: install-data-recursive
-
- install-am: all-am