diff options
Diffstat (limited to 'x11-libs/gtk+/files/gtk+-1.2.10-automake.diff')
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-1.2.10-automake.diff | 293 |
1 files changed, 0 insertions, 293 deletions
diff --git a/x11-libs/gtk+/files/gtk+-1.2.10-automake.diff b/x11-libs/gtk+/files/gtk+-1.2.10-automake.diff deleted file mode 100644 index e089f56..0000000 --- a/x11-libs/gtk+/files/gtk+-1.2.10-automake.diff +++ /dev/null @@ -1,293 +0,0 @@ -diff -dPNur gtk+-1.2.10/docs/Makefile.am gtk+-1.2.10-ds/docs/Makefile.am ---- gtk+-1.2.10/docs/Makefile.am 2014-10-01 19:39:24.369668923 +0200 -+++ gtk+-1.2.10-ds/docs/Makefile.am 2014-10-01 19:42:46.667975511 +0200 -@@ -166,7 +166,7 @@ - echo $$p; \ - done - --EXTRA_DIST += \ -+EXTRA_DIST = \ - Changes-1.2.txt \ - debugging.txt \ - developers.txt \ -diff -dPNur gtk+-1.2.10/gdk/Makefile.am gtk+-1.2.10-ds/gdk/Makefile.am ---- gtk+-1.2.10/gdk/Makefile.am 2014-10-01 19:39:24.364668816 +0200 -+++ gtk+-1.2.10-ds/gdk/Makefile.am 2014-10-01 19:44:27.190115302 +0200 -@@ -1,14 +1,13 @@ - ## Makefile.am for gtk+/gdk - --INCLUDES = @STRIP_BEGIN@ \ -+INCLUDES = \ - -DG_LOG_DOMAIN=\"Gdk\" \ - -I$(top_srcdir) \ - @GTK_DEBUG_FLAGS@ \ - @GTK_XIM_FLAGS@ \ - @GTK_LOCALE_FLAGS@ \ - @GLIB_CFLAGS@ \ -- @x_cflags@ \ --@STRIP_END@ -+ @x_cflags@ - - # - # libraries to compile and install -@@ -17,12 +16,11 @@ - - # libtool stuff: set version and export symbols for resolving - libgdkincludedir = $(includedir)/gtk-1.2/gdk --libgdk_la_LDFLAGS = @STRIP_BEGIN@ \ -+libgdk_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) \ - -export-dynamic \ -- @x_ldflags@ \ --@STRIP_END@ -+ @x_ldflags@ - - libgdk_la_LIBADD = @GLIB_DEPLIBS@ @x_libs@ -lm - -@@ -30,7 +28,7 @@ - # setup source file variables - # - # GDK header files for public installation (non-generated) --gdk_public_h_sources = @STRIP_BEGIN@ \ -+gdk_public_h_sources = \ - gdk.h \ - gdkcursors.h \ - gdkrgb.h \ -@@ -38,9 +36,9 @@ - gdkkeysyms.h \ - gdkprivate.h \ - gdktypes.h \ -- gdkx.h \ --@STRIP_END@ --gdk_c_sources = @STRIP_BEGIN@ \ -+ gdkx.h -+ -+gdk_c_sources = \ - gdk.c \ - gdkcc.c \ - gdkcolor.c \ -@@ -71,17 +69,16 @@ - MwmUtil.h \ - gxid_lib.h \ - gxid_proto.h \ -- gxid_lib.c \ --@STRIP_END@ -+ gxid_lib.c - - # - # setup GDK sources and their dependancies - # - libgdkinclude_HEADERS = $(gdk_public_h_sources) - libgdk_la_SOURCES = $(gdk_c_sources) --MAINTAINERCLEANFILES += --EXTRA_HEADERS += --EXTRA_DIST += -+MAINTAINERCLEANFILES = -+EXTRA_HEADERS = -+EXTRA_DIST = - EXTRA_DIST += - - # -@@ -102,11 +99,10 @@ - # - EXTRA_PROGRAMS = gxid - bin_PROGRAMS = @xinput_progs@ --LDADDS = @STRIP_BEGIN@ \ -+LDADDS = \ - @x_libs@ \ - @GLIB_LIBS@ \ -- -lm \ --@STRIP_END@ -+ -lm - gxid_SOURCES = gxid.c - gxid_LDADD = $(LDADDS) - gxid_LDFLAGS = @x_ldflags@ -diff -dPNur gtk+-1.2.10/gtk/Makefile.am gtk+-1.2.10-ds/gtk/Makefile.am ---- gtk+-1.2.10/gtk/Makefile.am 2014-10-01 19:39:24.394669455 +0200 -+++ gtk+-1.2.10-ds/gtk/Makefile.am 2014-10-01 19:45:06.767957759 +0200 -@@ -1,6 +1,6 @@ - ## Makefile.am for gtk+/gtk - --INCLUDES = @STRIP_BEGIN@ \ -+INCLUDES = \ - -DG_LOG_DOMAIN=\"Gtk\" \ - -DGTK_DISABLE_COMPAT_H \ - -DGTK_LIBDIR=\"$(libdir)\" \ -@@ -12,8 +12,7 @@ - @GTK_XIM_FLAGS@ \ - @GTK_LOCALE_FLAGS@ \ - @GLIB_CFLAGS@ \ -- @x_cflags@ \ --@STRIP_END@ -+ @x_cflags@ - - - # -@@ -23,25 +22,23 @@ - - # libtool stuff: set version and export symbols for resolving - libgtkincludedir = $(includedir)/gtk-1.2/gtk --libgtk_la_LDFLAGS = @STRIP_BEGIN@ \ -+libgtk_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) \ - -export-dynamic \ -- @x_ldflags@ \ --@STRIP_END@ --libgtk_la_LIBADD = @STRIP_BEGIN@ \ -+ @x_ldflags@ -+libgtk_la_LIBADD = \ - $(top_builddir)/gdk/libgdk.la \ - @x_libs@ \ - @GDK_WLIBS@ \ - @GLIB_LIBS@ \ -- -lm \ -- @STRIP_END@ -+ -lm - - # - # setup source file variables - # - # GTK+ header files for public installation (non-generated) --gtk_public_h_sources = @STRIP_BEGIN@ \ -+gtk_public_h_sources = \ - gtk.h \ - gtkaccelgroup.h \ - gtkaccellabel.h \ -@@ -150,13 +147,13 @@ - gtkvscrollbar.h \ - gtkvseparator.h \ - gtkwidget.h \ -- gtkwindow.h \ --@STRIP_END@ -+ gtkwindow.h -+ - # GTK+ header files that don't get installed --gtk_private_h_sources = @STRIP_BEGIN@ \ --@STRIP_END@ -+gtk_private_h_sources = -+ - # GTK+ C sources to build the library from --gtk_c_sources = @STRIP_BEGIN@ \ -+gtk_c_sources = \ - gtkaccelgroup.c \ - gtkaccellabel.c \ - gtkadjustment.c \ -@@ -264,8 +261,8 @@ - gtkwidget.c \ - gtkwindow.c \ - fnmatch.c \ -- fnmatch.h \ --@STRIP_END@ -+ fnmatch.h -+ - # we use our own built_sources variable rules to avoid automake's - # BUILT_SOURCES oddities - # we generate frequently rebuild files piggyback on a stamp file, so sources -@@ -273,7 +270,7 @@ - # content - # - # built sources that don't get installed --gtk_built_sources = @STRIP_BEGIN@ \ -+gtk_built_sources = \ - stamp-gtk.defs \ - stamp-gtktypebuiltins.h \ - stamp-gtkmarshal.h \ -@@ -281,17 +278,17 @@ - gtktypebuiltins_ids.c \ - gtktypebuiltins_evals.c \ - gtkmarshal.c \ -- gtk.defs \ --@STRIP_END@ -+ gtk.defs -+ - # built sources that get installed with the header files --gtk_built_public_sources = @STRIP_BEGIN@ \ -+gtk_built_public_sources = \ - gtkmarshal.h \ -- gtktypebuiltins.h \ --@STRIP_END@ -+ gtktypebuiltins.h -+ - # non-header sources (headers should be specified in the above variables) - # that don't serve as direct make target sources, i.e. they don't have - # their own .lo rules and don't get publically installed --gtk_extra_sources = @STRIP_BEGIN@ \ -+gtk_extra_sources = \ - gtkfeatures.h.in \ - makeenums.pl \ - makeenums.awk \ -@@ -300,22 +297,21 @@ - gtkargcollector.c \ - gtk-boxed.defs \ - genmarshal.pl \ -- gtkmarshal.list \ --@STRIP_END@ -+ gtkmarshal.list -+ - # Extra headers that are used for enum type array/id generation --gdk_headers = @STRIP_BEGIN@ \ -+gdk_headers = \ - ../gdk/gdktypes.h \ -- ../gdk/gdkrgb.h \ --@STRIP_END@ -+ ../gdk/gdkrgb.h - - # - # setup GTK+ sources and their dependancies - # - libgtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_built_public_sources) gtkfeatures.h - libgtk_la_SOURCES = $(gtk_c_sources) --MAINTAINERCLEANFILES += $(gtk_built_public_sources) $(gtk_built_sources) --EXTRA_HEADERS += --EXTRA_DIST += $(gtk_private_h_sources) -+MAINTAINERCLEANFILES = $(gtk_built_public_sources) $(gtk_built_sources) -+EXTRA_HEADERS = -+EXTRA_DIST = $(gtk_private_h_sources) - EXTRA_DIST += $(gtk_built_sources) $(gtk_built_public_sources) $(gtk_extra_sources) - - # -@@ -323,7 +319,7 @@ - # - # setup autogeneration dependancies - gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc --CLEANFILES += $(gen_sources) -+CLEANFILES = $(gen_sources) - COPYING: $(gtk_built_public_sources) $(gtk_built_sources) - $(OBJECTS): COPYING # this is our oldest-source-stamp - # initial creation of the real stamp-* files -@@ -430,14 +426,14 @@ - # - noinst_PROGRAMS = testgtk testinput testselection testrgb testdnd simple # testthreads - DEPS = libgtk.la $(top_builddir)/gdk/libgdk.la --LDADDS = @STRIP_BEGIN@ \ -+LDADDS = \ - libgtk.la \ - $(top_builddir)/gdk/libgdk.la \ - @x_libs@ \ - @GDK_WLIBS@ \ - @GLIB_LIBS@ \ -- -lm \ --@STRIP_END@ -+ -lm -+ - testgtk_DEPENDENCIES = $(DEPS) - testinput_DEPENDENCIES = $(DEPS) - testselection_DEPENDENCIES = $(DEPS) -@@ -478,7 +474,7 @@ - cd $$builddir; cd $(srcdir); \ - $(SHELL) $$top_builddir/libtool --mode=execute gdb $$builddir/testgtk - --EXTRA_DIST += @STRIP_BEGIN@ \ -+EXTRA_DIST += \ - testgtk.1 \ - testgtkrc \ - testgtkrc2 \ -@@ -499,5 +495,4 @@ - check-y.xpm \ - check-n.xpm \ - test.xpm \ -- $(gtkconf_DATA) \ --@STRIP_END@ -+ $(gtkconf_DATA) |