Upgrade to 1.1.1.

2 files changed, 156 insertions, 86 deletions

diff --git a/x11-toolkits/gtk12/files/patch-aa b/x11-toolkits/gtk12/files/patch-aa
index cf52bd2..f9811e5 100644
--- a/x11-toolkits/gtk12/files/patch-aa
+++ b/x11-toolkits/gtk12/files/patch-aa
@@ -1,96 +1,58 @@
---- docs/Makefile.in.orig	Sat May 16 13:15:18 1998
-+++ docs/Makefile.in	Sun May 17 02:25:40 1998
-@@ -121,7 +121,7 @@
+--- Makefile.in.orig	Wed Aug  5 13:06:11 1998
++++ Makefile.in	Wed Aug 12 17:58:02 1998
+@@ -91,9 +91,9 @@
+ xinput_progs = @xinput_progs@
  
- TAR = tar
- GZIP = --best
--all: Makefile $(INFO_DEPS) $(MANS)
-+all: Makefile clean $(INFO_DEPS) $(MANS)
+ SRC_SUBDIRS = gdk gtk
+-SUBDIRS = $(SRC_SUBDIRS) docs
++SUBDIRS = $(SRC_SUBDIRS)
  
- .SUFFIXES:
- .SUFFIXES: .dvi .info .ps .texi .texinfo .txi
-@@ -150,7 +150,7 @@
- .texi.info:
- 	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
- 	cd $(srcdir) \
--	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-+	  && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'`
- 
- .texi.dvi:
- 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
-@@ -349,7 +349,7 @@
- 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
- mostlyclean:  mostlyclean-aminfo mostlyclean-generic
+-bin_SCRIPTS = gtk-config
++bin_SCRIPTS = gtk11-config
  
--clean:  clean-aminfo clean-generic mostlyclean
-+clean:  clean-aminfo clean-generic mostlyclean maintainer-clean-aminfo
+ EXTRA_DIST =	\
+ 	HACKING		\
+@@ -169,12 +169,12 @@
+ 	examples/wheelbarrow/wheelbarrow.c  \
+ 	examples/find-examples.sh
  
- distclean:  distclean-aminfo distclean-generic clean
- 	-rm -f config.status
---- gtk/Makefile.in.orig	Tue Apr 14 11:22:14 1998
-+++ gtk/Makefile.in	Fri Apr 24 03:59:06 1998
-@@ -397,7 +397,7 @@
- SOURCES = $(libgtk_la_SOURCES) testgtk.c testinput.c testselection.c simple.c
- OBJECTS = $(libgtk_la_OBJECTS) testgtk.o testinput.o testselection.o simple.o
+-m4datadir = $(datadir)/aclocal
+-m4data_DATA = gtk.m4
++m4datadir = $(PREFIX)/share/aclocal
++m4data_DATA = gtk11.m4
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
+-CONFIG_CLEAN_FILES =  gtk-config
++CONFIG_CLEAN_FILES =  gtk11-config
+ SCRIPTS =  $(bin_SCRIPTS)
+ 
+ DATA =  $(m4data_DATA)
+@@ -227,8 +227,14 @@
+ 	-rm -f config.h
+ 
+ maintainer-clean-hdr:
+-gtk-config: $(top_builddir)/config.status gtk-config.in
+-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
++gtk11.m4: gtk.m4
++	cp gtk.m4 gtk11.m4
++
++gtk11-config.in: gtk-config.in
++	cp gtk-config.in gtk11-config.in
++
++gtk11-config: $(top_builddir)/config.status gtk11-config.in
++	cd $(top_builddir) && CONFIG_FILES=gtk11-config CONFIG_HEADERS= ./config.status
+ 
+ install-binSCRIPTS: $(bin_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+--- gtk/Makefile.in.orig	Wed Aug  5 13:06:16 1998
++++ gtk/Makefile.in	Wed Aug 12 17:47:57 1998
+@@ -433,7 +433,7 @@
+ SOURCES = $(libgtk_1_1_la_SOURCES) testgtk.c testinput.c testselection.c testthreads.c simple.c
+ OBJECTS = $(libgtk_1_1_la_OBJECTS) testgtk.o testinput.o testselection.o testthreads.o simple.o
  
 -all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
 +all: Makefile $(LTLIBRARIES) $(HEADERS)
  
  .SUFFIXES:
  .SUFFIXES: .S .c .lo .o .s
---- glib/Makefile.am.orig	Sat Mar 28 00:50:30 1998
-+++ glib/Makefile.am	Sat Apr  4 16:18:47 1998
-@@ -1,7 +1,5 @@
- ## Process this file with automake to produce Makefile.in
- 
--configincludedir = $(pkglibdir)/include
--
- lib_LTLIBRARIES = libglib.la
- 
- libglib_la_SOURCES = \
-@@ -20,10 +18,7 @@
- 		gutils.c
- 
- include_HEADERS = \
--		glib.h
--
--configinclude_DATA = \
--		glibconfig.h
-+		glib.h glibconfig.h
- 
- libglib_la_LDFLAGS = -version-info 1:0:0
- 
---- glib/Makefile.in.orig	Sat Mar 28 09:02:29 1998
-+++ glib/Makefile.in	Sat Apr  4 16:19:26 1998
-@@ -68,8 +68,6 @@
- RANLIB = @RANLIB@
- VERSION = @VERSION@
- 
--configincludedir = $(pkglibdir)/include
--
- lib_LTLIBRARIES = libglib.la
- 
- libglib_la_SOURCES = \
-@@ -88,10 +86,7 @@
- 		gutils.c
- 
- include_HEADERS = \
--		glib.h
--
--configinclude_DATA = \
--		glibconfig.h
-+		glib.h glibconfig.h
- 
- libglib_la_LDFLAGS = -version-info 1:0:0
- 
---- Makefile.in.orig	Sun May 17 04:54:59 1998
-+++ Makefile.in	Sun May 17 04:56:17 1998
-@@ -149,7 +149,7 @@
- 	examples/wheelbarrow/wheelbarrow.c  \
- 	examples/find-examples.sh
- 
--m4datadir = $(datadir)/aclocal
-+m4datadir = $(LOCALBASE)/share/aclocal
- m4data_DATA = gtk.m4
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/x11-toolkits/gtk12/files/patch-ab b/x11-toolkits/gtk12/files/patch-ab
new file mode 100644
index 0000000..2f9f3de
--- /dev/null
+++ b/x11-toolkits/gtk12/files/patch-ab
@@ -0,0 +1,108 @@
+--- gtk-config.in.orig	Wed Aug 12 18:24:01 1998
++++ gtk-config.in	Wed Aug 12 18:24:15 1998
+@@ -8,7 +8,7 @@
+ exec_prefix_set=no
+ 
+ usage="\
+-Usage: gtk-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
++Usage: gtk11-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
+ 
+ if test $# -eq 0; then
+       echo "${usage}" 1>&2
+--- gtk.m4.orig	Wed Aug 12 18:24:19 1998
++++ gtk.m4	Wed Aug 12 18:24:59 1998
+@@ -6,7 +6,7 @@
+ dnl
+ AC_DEFUN(AM_PATH_GTK,
+ [dnl 
+-dnl Get the cflags and libraries from the gtk-config script
++dnl Get the cflags and libraries from the gtk11-config script
+ dnl
+ AC_ARG_WITH(gtk-prefix,[  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)],
+             gtk_config_prefix="$withval", gtk_config_prefix="")
+@@ -18,17 +18,17 @@
+   if test x$gtk_config_exec_prefix != x ; then
+      gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
+      if test x${GTK_CONFIG+set} != xset ; then
+-        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
++        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk11-config
+      fi
+   fi
+   if test x$gtk_config_prefix != x ; then
+      gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
+      if test x${GTK_CONFIG+set} != xset ; then
+-        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
++        GTK_CONFIG=$gtk_config_prefix/bin/gtk11-config
+      fi
+   fi
+ 
+-  AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
++  AC_PATH_PROG(GTK_CONFIG, gtk11-config, no)
+   min_gtk_version=ifelse([$1], ,0.99.7,$1)
+   AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
+   no_gtk=""
+@@ -50,7 +50,7 @@
+       LIBS="$LIBS $GTK_LIBS"
+ dnl
+ dnl Now check if the installed GTK is sufficiently new. (Also sanity
+-dnl checks the results of gtk-config to some extent
++dnl checks the results of gtk11-config to some extent
+ dnl
+       rm -f conf.gtktest
+       AC_TRY_RUN([
+@@ -77,16 +77,16 @@
+       (gtk_minor_version != $gtk_config_minor_version) ||
+       (gtk_micro_version != $gtk_config_micro_version))
+     {
+-      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
++      printf("\n*** 'gtk11-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
+              $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
+              gtk_major_version, gtk_minor_version, gtk_micro_version);
+-      printf ("*** was found! If gtk-config was correct, then it is best\n");
++      printf ("*** was found! If gtk11-config was correct, then it is best\n");
+       printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
+       printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+       printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+       printf("*** required on your system.\n");
+-      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
+-      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
++      printf("*** If gtk11-config was wrong, set the environment variable GTK_CONFIG\n");
++      printf("*** to point to the correct copy of gtk11-config, and remove the file config.cache\n");
+       printf("*** before re-running configure\n");
+     } 
+   else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+@@ -115,10 +115,10 @@
+         printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
+         printf("***\n");
+         printf("*** If you have already installed a sufficiently new version, this error\n");
+-        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
++        printf("*** probably means that the wrong copy of the gtk11-config shell script is\n");
+         printf("*** being found. The easiest way to fix this is to remove the old version\n");
+         printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
+-        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
++        printf("*** correct copy of gtk11-config. (In this case, you will have to\n");
+         printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+         printf("*** so that the correct libraries are found at run-time))\n");
+       }
+@@ -136,10 +136,10 @@
+   else
+      AC_MSG_RESULT(no)
+      if test "$GTK_CONFIG" = "no" ; then
+-       echo "*** The gtk-config script installed by GTK could not be found"
++       echo "*** The gtk11-config script installed by GTK could not be found"
+        echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
+        echo "*** your path, or set the GTK_CONFIG environment variable to the"
+-       echo "*** full path to gtk-config."
++       echo "*** full path to gtk11-config."
+      else
+        if test -f conf.gtktest ; then
+         :
+@@ -168,7 +168,7 @@
+         [ echo "*** The test program failed to compile or link. See the file config.log for the"
+           echo "*** exact error that occured. This usually means GTK was incorrectly installed"
+           echo "*** or that you have moved GTK since it was installed. In the latter case, you"
+-          echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
++          echo "*** may want to edit the gtk11-config script: $GTK_CONFIG" ])
+           CFLAGS="$ac_save_CFLAGS"
+           LIBS="$ac_save_LIBS"
+        fi