Initial import

1 files changed, 85 insertions, 0 deletions

diff --git a/x11-libs/gtk+/files/gtk+-1.2.10-alt-linkage.patch b/x11-libs/gtk+/files/gtk+-1.2.10-alt-linkage.patch
new file mode 100644
index 0000000..04a967c
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-1.2.10-alt-linkage.patch
@@ -0,0 +1,85 @@
+diff -uprk.orig gtk+-1.2.10.orig/gdk.pc.in gtk+-1.2.10/gdk.pc.in
+--- gtk+-1.2.10.orig/gdk.pc.in	2000-11-30 04:18:35 +0300
++++ gtk+-1.2.10/gdk.pc.in	2004-08-26 18:05:20 +0400
+@@ -7,5 +7,5 @@ Name: GDK
+ Description: GIMP Drawing Kit
+ Version: @VERSION@
+ Requires: glib
+-Libs: -L${libdir} @x_ldflags@ -lgdk @INTLLIBS@ @GDK_WLIBS@ @x_libs@ -lm
++Libs: -L${libdir} @x_ldflags@ -lgdk
+ Cflags: -I${includedir}/gtk-1.2 @x_cflags@
+diff -uprk.orig gtk+-1.2.10.orig/gtk/Makefile.am gtk+-1.2.10/gtk/Makefile.am
+--- gtk+-1.2.10.orig/gtk/Makefile.am	2004-08-26 17:09:34 +0400
++++ gtk+-1.2.10/gtk/Makefile.am	2004-08-26 18:05:20 +0400
+@@ -32,7 +32,7 @@ libgtk_la_LDFLAGS = @STRIP_BEGIN@ \
+ 	@x_libs@ 						\
+ 	-lm							\
+ @STRIP_END@
+-#	$(top_builddir)/gdk/libgdk.la
++libgtk_la_LIBADD = $(top_builddir)/gdk/libgdk.la
+ 
+ 
+ #
+@@ -424,10 +424,9 @@ uninstall-local:
+ # test programs, not to be installed
+ #
+ noinst_PROGRAMS = testgtk testinput testselection testrgb testdnd simple # testthreads
+-DEPS = libgtk.la $(top_builddir)/gdk/libgdk.la
++DEPS = libgtk.la
+ LDADDS = @STRIP_BEGIN@ \
+ 	libgtk.la			\
+-	$(top_builddir)/gdk/libgdk.la	\
+ 	@x_ldflags@			\
+ 	@x_libs@			\
+ 	@GDK_WLIBS@			\
+diff -uprk.orig gtk+-1.2.10.orig/gtk/Makefile.in gtk+-1.2.10/gtk/Makefile.in
+--- gtk+-1.2.10.orig/gtk/Makefile.in	2004-08-26 17:09:34 +0400
++++ gtk+-1.2.10/gtk/Makefile.in	2004-08-26 18:10:32 +0400
+@@ -137,7 +137,6 @@ lib_LTLIBRARIES = libgtk.la
+ libgtkincludedir = $(includedir)/gtk-1.2/gtk
+ libgtk_la_LDFLAGS = @STRIP_BEGIN@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)		-release $(LT_RELEASE) 						-export-dynamic							@GLIB_DEPLIBS@ 							@x_ldflags@							@x_libs@ 							-lm							@STRIP_END@
+ 
+-#	$(top_builddir)/gdk/libgdk.la
+ 
+ #
+ # setup source file variables
+@@ -198,8 +197,8 @@ gtkconf_DATA = gtkrc.az gtkrc.be gtkrc.e
+ # test programs, not to be installed
+ #
+ noinst_PROGRAMS = testgtk testinput testselection testrgb testdnd simple # testthreads
+-DEPS = libgtk.la $(top_builddir)/gdk/libgdk.la
+-LDADDS = @STRIP_BEGIN@ 	libgtk.la				$(top_builddir)/gdk/libgdk.la		@x_ldflags@				@x_libs@				@GDK_WLIBS@				@GLIB_LIBS@				-lm				@STRIP_END@
++DEPS = libgtk.la
++LDADDS = @STRIP_BEGIN@ 	libgtk.la		@x_ldflags@				@x_libs@				@GDK_WLIBS@				@GLIB_LIBS@				-lm				@STRIP_END@
+ 
+ testgtk_DEPENDENCIES = $(DEPS)
+ testinput_DEPENDENCIES = $(DEPS)
+@@ -228,7 +227,8 @@ X_CFLAGS = @X_CFLAGS@
+ X_LIBS = @X_LIBS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-libgtk_la_LIBADD = 
++libgtk_la_LIBADD = $(top_builddir)/gdk/libgdk.la
++libgtk_la_DEPENDENCIES = $(top_builddir)/gdk/libgdk.la
+ libgtk_la_OBJECTS =  gtkaccelgroup.lo gtkaccellabel.lo gtkadjustment.lo \
+ gtkalignment.lo gtkarg.lo gtkarrow.lo gtkaspectframe.lo gtkbin.lo \
+ gtkbindings.lo gtkbbox.lo gtkbox.lo gtkbutton.lo gtkcalendar.lo \
+diff -uprk.orig gtk+-1.2.10.orig/gtk-config.in gtk+-1.2.10/gtk-config.in
+--- gtk+-1.2.10.orig/gtk-config.in	2000-10-21 22:20:40 +0400
++++ gtk+-1.2.10/gtk-config.in	2004-08-26 18:18:31 +0400
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-glib_libs="@glib_libs@"
++glib_libs=
+ glib_cflags="@glib_cflags@"
+ glib_thread_libs="@glib_thread_libs@"
+ glib_thread_cflags="@glib_thread_cflags@"
+@@ -107,6 +107,6 @@ if test "$echo_libs" = "yes"; then
+         fi
+       done
+ 
+-      echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
++      echo $libdirs @x_ldflags@ -lgtk $my_glib_libs
+ fi      
+