Update to 1.3.2.

6 files changed, 39 insertions, 46 deletions

diff --git a/x11-toolkits/gtk20/files/patch-af b/x11-toolkits/gtk20/files/patch-af
deleted file mode 100644
index 355c562..0000000
--- a/x11-toolkits/gtk20/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk/gtkrc.ru.orig	Tue Mar 14 21:57:24 2000
-+++ gtk/gtkrc.ru	Tue Jul 18 13:32:44 2000
-@@ -12,7 +12,7 @@
- style "gtk-default-ru" {
-        fontset = "-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-*,\
-                   -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
--                  -cronyx-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\
-+                  -*-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\
-                   -*-arial-medium-r-normal--12-*-*-*-*-*-koi8-r"
- }
- class "GtkWidget" style "gtk-default-ru"
diff --git a/x11-toolkits/gtk20/files/patch-ag b/x11-toolkits/gtk20/files/patch-ag
index 7f4332a..5ad8703 100644
--- a/x11-toolkits/gtk20/files/patch-ag
+++ b/x11-toolkits/gtk20/files/patch-ag
@@ -1,29 +1,11 @@
---- gtk/Makefile.in.orig	Sat Jul 15 03:51:11 2000
-+++ gtk/Makefile.in	Tue Jul 18 13:38:00 2000
-@@ -156,7 +156,7 @@
- x_libs = @x_libs@
- xinput_progs = @xinput_progs@
+--- 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 @@
  
--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_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=\"$(gtkconfdir)\"			-DGTK_LOCALEDIR=\"$(gtklocaledir)\"			-DGTK_VERSION=\"@GTK_VERSION@\"				-DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\"		-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@
+ 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@
  
- gtarget = @gdktarget@
-@@ -253,7 +253,7 @@
- gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc
- CLEANFILES =  $(gen_sources)
- 
--gtkconfdir = $(sysconfdir)/gtk-2.0
-+gtkconfdir = $(datadir)/themes/Default/gtk-2.0
- gtkconf_DATA = gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja 	gtkrc.ko gtkrc.ru gtkrc.tr gtkrc.th gtkrc.uk gtkrc.iso-8859-2 	gtkrc.iso-8859-5 gtkrc.iso-8859-13 gtkrc.iso-8859-14 	gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.Big5 	gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps 	gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii 	gtkrc.cp1251
  
- 
-@@ -2900,7 +2900,7 @@
- 		uninstall-libgtk_nanox_includeHEADERS \
- 		uninstall-libgtk_x11_includeHEADERS uninstall-local
- uninstall: uninstall-am
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
-+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
- all-redirect: all-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+ gtarget = @gdktarget@
diff --git a/x11-toolkits/gtk20/files/patch-ah b/x11-toolkits/gtk20/files/patch-ah
index 8686c43..c1c1d5f 100644
--- a/x11-toolkits/gtk20/files/patch-ah
+++ b/x11-toolkits/gtk20/files/patch-ah
@@ -1,6 +1,6 @@
---- docs/Makefile.in.orig	Sat Jul 15 03:51:14 2000
-+++ docs/Makefile.in	Tue Jul 18 13:45:44 2000
-@@ -116,7 +116,7 @@
+--- 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 @@
  LT_RELEASE = @LT_RELEASE@
  LT_REVISION = @LT_REVISION@
  MAINT = @MAINT@
@@ -9,14 +9,14 @@
  MATH_LIB = @MATH_LIB@
  MKINSTALLDIRS = @MKINSTALLDIRS@
  OBJDUMP = @OBJDUMP@
-@@ -158,13 +158,13 @@
+@@ -162,13 +162,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				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			        gtk-config.txt  	        	gtk-config.1.in				gtkdocs_fix
  
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../config.h
@@ -25,7 +25,7 @@
  man1dir = $(mandir)/man1
  MANS = $(man_MANS)
  
-@@ -187,6 +187,9 @@
+@@ -191,6 +191,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-ai b/x11-toolkits/gtk20/files/patch-ai
index c2e095e..a128c58 100644
--- a/x11-toolkits/gtk20/files/patch-ai
+++ b/x11-toolkits/gtk20/files/patch-ai
@@ -1,10 +1,10 @@
---- docs/reference/Makefile.in.orig	Tue Jul 18 18:03:38 2000
-+++ docs/reference/Makefile.in	Tue Jul 18 18:03:52 2000
-@@ -156,7 +156,7 @@
+--- docs/reference/Makefile.in.orig	Sat Nov 18 03:17:56 2000
++++ docs/reference/Makefile.in	Mon Nov 20 15:33:25 2000
+@@ -160,7 +160,7 @@
  x_libs = @x_libs@
  xinput_progs = @xinput_progs@
  
--SUBDIRS = gdk-pixbuf
+-SUBDIRS = gdk-pixbuf gdk gtk
 +SUBDIRS = 
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../config.h
diff --git a/x11-toolkits/gtk20/files/patch-aj b/x11-toolkits/gtk20/files/patch-aj
new file mode 100644
index 0000000..d28f0b8
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-aj
@@ -0,0 +1,11 @@
+--- 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
diff --git a/x11-toolkits/gtk20/files/patch-ak b/x11-toolkits/gtk20/files/patch-ak
new file mode 100644
index 0000000..52ac937
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ak
@@ -0,0 +1,11 @@
+--- gdk/Makefile.in	2000/11/20 14:59:03	1.1
++++ gdk/Makefile.in	2000/11/20 15:01:41
+@@ -228,7 +228,7 @@
+ #
+ # Rule to install gdkconfig.h header file
+ #
+-configexecincludedir = $(libdir)/gtk-2.0/include
++configexecincludedir = $(prefix)/include/gtk-2.0/gtk
+ 
+ BUILT_SOURCES = stamp-gc-h #note: not gdkconfig.h
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs