From 37b5e227988785a14c3d87d73e5727147424c6b5 Mon Sep 17 00:00:00 2001 From: Steve Price Date: Sat, 29 May 1999 04:17:00 +0000 Subject: Update to version 1.1.5. PR: 11845 Submitted by: Jeremy Lea --- graphics/gimpshop/files/patch-ac | 16 +++++-------- graphics/gimpshop/files/patch-ae | 9 ++++---- graphics/gimpshop/files/patch-ah | 49 ++++++++++++++++++++-------------------- graphics/gimpshop/files/patch-ak | 17 ++++++++++++++ 4 files changed, 52 insertions(+), 39 deletions(-) create mode 100644 graphics/gimpshop/files/patch-ak (limited to 'graphics/gimpshop/files') diff --git a/graphics/gimpshop/files/patch-ac b/graphics/gimpshop/files/patch-ac index dc9c1c3a3fb4..de1f74a33182 100644 --- a/graphics/gimpshop/files/patch-ac +++ b/graphics/gimpshop/files/patch-ac @@ -16,8 +16,8 @@ gpc.h INCLUDES = \ ---- plug-ins/gpc/Makefile.in.orig Thu Feb 4 11:21:25 1999 -+++ plug-ins/gpc/Makefile.in Sat Feb 20 17:33:30 1999 +--- plug-ins/gpc/Makefile.in.orig Tue Mar 9 02:58:46 1999 ++++ plug-ins/gpc/Makefile.in Mon May 10 10:17:48 1999 @@ -162,10 +162,14 @@ prefix = @prefix@ @@ -117,13 +117,9 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ -@@ -380,10 +401,38 @@ - || cp -p $$d/$$file $(distdir)/$$file || :; \ +@@ -381,6 +402,37 @@ fi; \ done --gpc.o: gpc.c ../../libgimp/gimp.h ../../libgimp/gimpenums.h \ -- ../../libgimp/gimpfeatures.h ../../libgimp/parasite.h \ -- ../../libgimp/parasiteF.h ../../libgimp/parasiteP.h +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + @@ -159,7 +155,7 @@ info-am: info: info-am dvi-am: -@@ -395,20 +444,23 @@ +@@ -392,20 +444,23 @@ install-exec-am: install-exec: install-exec-am @@ -187,7 +183,7 @@ mostlyclean-generic: -@@ -421,27 +473,27 @@ +@@ -418,27 +473,27 @@ maintainer-clean-generic: mostlyclean-am: mostlyclean-pluginlibLIBRARIES mostlyclean-compile \ @@ -221,7 +217,7 @@ @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -@@ -453,13 +505,15 @@ +@@ -450,13 +505,15 @@ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool install-man3 uninstall-man3 \ diff --git a/graphics/gimpshop/files/patch-ae b/graphics/gimpshop/files/patch-ae index bc633c2f961b..ca2fa369a359 100644 --- a/graphics/gimpshop/files/patch-ae +++ b/graphics/gimpshop/files/patch-ae @@ -1,11 +1,10 @@ ---- plug-ins/plugindetails/plugindetails.c.orig Sat Feb 20 18:47:03 1999 -+++ plug-ins/plugindetails/plugindetails.c Sat Feb 20 18:47:11 1999 -@@ -25,7 +25,7 @@ +--- plug-ins/plugindetails/plugindetails.c.orig Sat Mar 27 07:53:38 1999 ++++ plug-ins/plugindetails/plugindetails.c Sat May 22 21:24:31 1999 +@@ -25,6 +25,7 @@ #include #include #include --#include -+#include ++#include #include "gtk/gtk.h" #include "libgimp/gimp.h" diff --git a/graphics/gimpshop/files/patch-ah b/graphics/gimpshop/files/patch-ah index 190924fc41a0..f178ae078a0d 100644 --- a/graphics/gimpshop/files/patch-ah +++ b/graphics/gimpshop/files/patch-ah @@ -1,33 +1,34 @@ ---- configure.in.orig Thu Feb 4 08:37:10 1999 -+++ configure.in Sun Feb 21 00:11:35 1999 -@@ -441,7 +441,7 @@ +--- configure.orig Tue May 4 06:06:39 1999 ++++ configure Sat May 22 21:39:37 1999 +@@ -3538,7 +3538,10 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + CATOBJEXT=.mo +- DATADIRNAME=lib ++ DATADIRNAME=share ++ INTLDEPS='-lintl' ++ INTLLIBS=$INTLDEPS ++ LIBS=`echo $LIBS | sed -e 's/-lintl//'` fi - - gimpdatadir=$datadir/gimp --gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION -+gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION - localedir=$datadir/locale - - brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile` ---- configure.orig Thu Feb 4 08:38:47 1999 -+++ configure Sun Feb 21 00:11:46 1999 -@@ -7254,7 +7254,7 @@ + rm -f conftest* + INSTOBJEXT=.mo +@@ -7165,7 +7168,7 @@ fi gimpdatadir=$datadir/gimp -gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION +gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION - localedir=$datadir/locale + localedir='${prefix}/${DATADIRNAME}/locale' brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile` ---- Makefile.in.orig Sat Feb 20 23:45:16 1999 -+++ Makefile.in Sun Feb 21 00:12:00 1999 -@@ -530,7 +530,7 @@ - install-exec: install-exec-recursive - - install-data-am: install-gimpdataSCRIPTS install-man \ -- install-gimpdataDATA install-m4dataDATA -+ install-gimpdataDATA - install-data: install-data-recursive +@@ -8746,10 +8749,6 @@ + *) # Relative path. + ac_sub_cache_file="$ac_dots$cache_file" ;; + esac +- case "$ac_given_INSTALL" in +- [/$]*) INSTALL="$ac_given_INSTALL" ;; +- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; +- esac - install-am: all-am + echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" + # The eval makes quoting arguments work. diff --git a/graphics/gimpshop/files/patch-ak b/graphics/gimpshop/files/patch-ak new file mode 100644 index 000000000000..0d660de2f208 --- /dev/null +++ b/graphics/gimpshop/files/patch-ak @@ -0,0 +1,17 @@ +--- libgimp/Makefile.in.orig Tue Mar 9 02:58:39 1999 ++++ libgimp/Makefile.in Tue May 18 09:42:40 1999 +@@ -188,11 +188,11 @@ + gimpinclude_HEADERS = color_selector.h gimp.h gimpchainbutton.h gimpenums.h gimpenv.h gimpfeatures.h gimpmatrix.h gimpmenu.h gimpmodule.h gimpsizeentry.h gimpui.h gimpunit.h gimpunitmenu.h gimpintl.h gserialize.h parasite.h parasiteF.h parasiteP.h + + +-libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) ++libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + +-libgimp_la_LIBADD = $(GLIB_LIBS) -lm ++libgimp_la_LIBADD = $(GTK_LIBS) -lm + +-libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) ++libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + + libgimpui_la_LIBADD = $(GTK_LIBS) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -- cgit v1.2.3