Add gtk13 after repo-copy from gtk12.

Warning: it is unstable development version, so you do not have to upgrade your
gtk12 LIB_DEPENDS!

6 files changed, 60 insertions, 87 deletions

diff --git a/x11-toolkits/gtk30/files/patch-ad b/x11-toolkits/gtk30/files/patch-ad
index 56123b2..1a33f49 100644
--- a/x11-toolkits/gtk30/files/patch-ad
+++ b/x11-toolkits/gtk30/files/patch-ad
@@ -1,32 +1,11 @@
---- gtk/gtkrc.c.orig	Sat Sep  4 02:56:58 1999
-+++ gtk/gtkrc.c	Sun Oct 10 05:01:48 1999
-@@ -260,9 +260,9 @@
- 
-   var = getenv("GTK_DATA_PREFIX");
-   if (var)
--    path = g_strdup_printf("%s%s", var, "/share/gtk/themes");
-+    path = g_strdup_printf("%s%s", var, "/share/themes");
-   else
--    path = g_strdup_printf("%s%s", GTK_DATA_PREFIX, "/share/gtk/themes");
-+    path = g_strdup_printf("%s%s", GTK_DATA_PREFIX, "/share/themes");
-   
-   for (n = 0; pixmap_path[n]; n++) ;
-   if (n >= GTK_RC_MAX_PIXMAP_PATHS - 1)
-@@ -292,7 +292,7 @@
- 
-   var = g_get_home_dir ();
-   if (var)
--    path = g_strdup_printf("%s%s", var, "/.gtk/lib/themes/engines");
-+    path = g_strdup_printf("%s%s", var, "/.gtk/themes/engines");
-   module_path[n++] = g_strdup(path);
-   module_path[n] = NULL;
-   g_free(path);
-@@ -326,7 +326,7 @@
-     }
+--- gtk/gtkrc.c.orig	Fri Jul 14 23:18:03 2000
++++ gtk/gtkrc.c	Tue Jul 18 13:41:40 2000
+@@ -392,7 +392,7 @@
    else
      {
--      str = g_strdup_printf ("%s%s", GTK_SYSCONFDIR, "/gtk/gtkrc");
-+      str = g_strdup_printf ("%s%s", GTK_SYSCONFDIR, "/gtkrc");
-       gtk_rc_add_default_file (str);
-       g_free (str);
- 
+ #ifndef G_OS_WIN32
+-      str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtkrc");
++      str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtkrc");
+ #else
+       str = g_strdup_printf ("%s\\gtkrc", get_gtk_sysconf_directory ());
+ #endif
diff --git a/x11-toolkits/gtk30/files/patch-ae b/x11-toolkits/gtk30/files/patch-ae
index c241c2e..1626198 100644
--- a/x11-toolkits/gtk30/files/patch-ae
+++ b/x11-toolkits/gtk30/files/patch-ae
@@ -1,21 +1,6 @@
---- configure.orig	Tue May 11 05:42:09 1999
-+++ configure	Mon May 17 22:59:13 1999
-@@ -606,10 +606,10 @@
- 
- 
- # libtool versioning
--LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION
--LT_CURRENT=`expr $GTK_MICRO_VERSION - $GTK_INTERFACE_AGE`
--LT_REVISION=$GTK_INTERFACE_AGE
--LT_AGE=`expr $GTK_BINARY_AGE - $GTK_INTERFACE_AGE`
-+LT_RELEASE=12
-+LT_CURRENT=2
-+LT_REVISION=0
-+LT_AGE=0
- 
- 
- 
-@@ -3689,7 +3689,7 @@
+--- configure.orig	Tue Jul 18 13:28:55 2000
++++ configure	Tue Jul 18 13:31:30 2000
+@@ -3821,7 +3821,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -24,7 +9,7 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -3699,7 +3699,7 @@
+@@ -3831,7 +3831,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
@@ -33,9 +18,9 @@
  	       LIBS=`echo $LIBS | sed -e 's/-lintl//'`
  	    fi
  	
-@@ -4446,6 +4446,7 @@
+@@ -4598,6 +4598,7 @@
    glib_thread_cflags="$GLIB_CFLAGS"
-   glib_libs=`$GLIB_CONFIG glib gmodule --libs`
+   glib_libs=`$GLIB_CONFIG_2_0 glib gobject gmodule --libs`
    glib_thread_libs="$GLIB_LIBS"
 +  GLIB_CFLAGS="$glib_cflags"
    GLIB_LIBS="$glib_libs"
diff --git a/x11-toolkits/gtk30/files/patch-af b/x11-toolkits/gtk30/files/patch-af
index e0750ce..355c562 100644
--- a/x11-toolkits/gtk30/files/patch-af
+++ b/x11-toolkits/gtk30/files/patch-af
@@ -1,11 +1,11 @@
---- gtk/gtkrc.ru.orig	Fri May 19 08:18:08 2000
-+++ gtk/gtkrc.ru	Thu May 25 13:55:53 2000
-@@ -1,7 +1,7 @@
+--- 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,*-r-*"
+                   -*-arial-medium-r-normal--12-*-*-*-*-*-koi8-r"
  }
  class "GtkWidget" style "gtk-default-ru"
diff --git a/x11-toolkits/gtk30/files/patch-ag b/x11-toolkits/gtk30/files/patch-ag
index d7f31e5..7f4332a 100644
--- a/x11-toolkits/gtk30/files/patch-ag
+++ b/x11-toolkits/gtk30/files/patch-ag
@@ -1,26 +1,26 @@
---- gtk/Makefile.in.orig	Thu May 25 04:11:04 2000
-+++ gtk/Makefile.in	Thu May 25 13:49:05 2000
-@@ -125,7 +125,7 @@
+--- 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@
  
--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)\"			-I$(top_srcdir)						@GTK_DEBUG_FLAGS@					@GTK_XIM_FLAGS@						@GTK_LOCALE_FLAGS@					@GLIB_CFLAGS@						@x_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)\"			-I$(top_srcdir)						@GTK_DEBUG_FLAGS@					@GTK_XIM_FLAGS@						@GTK_LOCALE_FLAGS@					@GLIB_CFLAGS@						@x_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=\"$(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@
  
  
- #
-@@ -190,7 +190,7 @@
+ 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
-+gtkconfdir = $(datadir)/themes/Default/gtk
- gtkconf_DATA = gtkrc.bg 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.cp1255
+-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
  
  
-@@ -503,7 +503,7 @@
- uninstall-am: uninstall-libLTLIBRARIES uninstall-gtkconfDATA \
- 		uninstall-libgtkincludeHEADERS uninstall-local
+@@ -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)
diff --git a/x11-toolkits/gtk30/files/patch-ah b/x11-toolkits/gtk30/files/patch-ah
index b0b87b7..8686c43 100644
--- a/x11-toolkits/gtk30/files/patch-ah
+++ b/x11-toolkits/gtk30/files/patch-ah
@@ -1,39 +1,37 @@
---- docs/Makefile.in.orig	Fri Sep 24 09:13:34 1999
-+++ docs/Makefile.in	Sat Oct  9 22:15:26 1999
-@@ -99,7 +99,7 @@
+--- 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 @@
  LT_RELEASE = @LT_RELEASE@
  LT_REVISION = @LT_REVISION@
  MAINT = @MAINT@
 -MAKEINFO = @MAKEINFO@
 +MAKEINFO = @MAKEINFO@ --no-split
+ MATH_LIB = @MATH_LIB@
  MKINSTALLDIRS = @MKINSTALLDIRS@
- NM = @NM@
  OBJDUMP = @OBJDUMP@
-@@ -128,7 +128,7 @@
+@@ -158,13 +158,13 @@
  
- info_TEXINFOS = gdk.texi gtk.texi 
+ SUBDIRS = tutorial faq reference
  
 -man_MANS = gtk-config.1
-+man_MANS = gtk@LT_RELEASE@-config.1
++man_MANS = gtk-config-2.0.1
  
- TUTORIAL_FR_FILES = html/gtk_tut_fr-1.html   	html/gtk_tut_fr-2.html   	html/gtk_tut_fr-3.html   	html/gtk_tut_fr-4.html   	html/gtk_tut_fr-5.html   	html/gtk_tut_fr-6.html   	html/gtk_tut_fr-7.html   	html/gtk_tut_fr-8.html   	html/gtk_tut_fr-9.html   	html/gtk_tut_fr-10.html  	html/gtk_tut_fr-11.html  	html/gtk_tut_fr-12.html  	html/gtk_tut_fr-13.html  	html/gtk_tut_fr-14.html  	html/gtk_tut_fr-15.html  	html/gtk_tut_fr-16.html  	html/gtk_tut_fr-17.html  	html/gtk_tut_fr-18.html  	html/gtk_tut_fr-19.html  	html/gtk_tut_fr-20.html  	html/gtk_tut_fr-21.html  	html/gtk_tut_fr-22.html  	html/gtk_tut_fr-23.html  	html/gtk_tut_fr-24.html  	html/gtk_tut_fr.html text/gtk_tut_fr.txt
- 
-@@ -146,7 +146,7 @@
+ 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
  
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../config.h
 -CONFIG_CLEAN_FILES =  gtk-config.1
-+CONFIG_CLEAN_FILES =  gtk@LT_RELEASE@-config.1
- TEXI2DVI = texi2dvi
- INFO_DEPS = gdk.info gtk.info
- DVIS = gdk.dvi gtk.dvi
-@@ -174,6 +174,9 @@
++CONFIG_CLEAN_FILES =  gtk-config-2.0.1
+ man1dir = $(mandir)/man1
+ MANS = $(man_MANS)
+ 
+@@ -187,6 +187,9 @@
  
  gtk-config.1: $(top_builddir)/config.status gtk-config.1.in
  	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 +
-+gtk@LT_RELEASE@-config.1: gtk-config.1
-+	cp gtk-config.1 gtk@LT_RELEASE@-config.1
++gtk-config-2.0.1: gtk-config.1
++	cp gtk-config.1 gtk-config-2.0.1
  
- gdk.info: gdk.texi
- gdk.dvi: gdk.texi
+ install-man1:
+ 	$(mkinstalldirs) $(DESTDIR)$(man1dir)
diff --git a/x11-toolkits/gtk30/files/patch-ai b/x11-toolkits/gtk30/files/patch-ai
new file mode 100644
index 0000000..c2e095e
--- /dev/null
+++ b/x11-toolkits/gtk30/files/patch-ai
@@ -0,0 +1,11 @@
+--- 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 @@
+ x_libs = @x_libs@
+ xinput_progs = @xinput_progs@
+ 
+-SUBDIRS = gdk-pixbuf
++SUBDIRS = 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../config.h
+ CONFIG_CLEAN_FILES =