diff options
Diffstat (limited to 'graphics/gdk-pixbuf/files')
| -rw-r--r-- | graphics/gdk-pixbuf/files/patch-aa | 39 | ||||
| -rw-r--r-- | graphics/gdk-pixbuf/files/patch-ab | 21 |
2 files changed, 52 insertions, 8 deletions
diff --git a/graphics/gdk-pixbuf/files/patch-aa b/graphics/gdk-pixbuf/files/patch-aa index be2a0e43badc..3d4deac8637d 100644 --- a/graphics/gdk-pixbuf/files/patch-aa +++ b/graphics/gdk-pixbuf/files/patch-aa @@ -1,14 +1,45 @@ ---- configure.orig Thu Apr 26 18:41:47 2001 -+++ configure Fri Apr 27 16:39:52 2001 -@@ -3593,4 +3593,4 @@ + +$FreeBSD$ + +--- configure.orig Fri Apr 27 02:41:47 2001 ++++ configure Fri May 18 16:03:47 2001 +@@ -3443,6 +3443,8 @@ + INSIDE_GNOME=yes + BUILD_CANVAS=yes + else ++ ++if [ x"$BUILD_CANVAS" != x"no" ]; then + + # Extract the first word of "gnome-config", so it can be a program name with args. + set dummy gnome-config; ac_word=$2 +@@ -3474,6 +3476,10 @@ + esac + fi + GNOME_CONFIG="$ac_cv_path_GNOME_CONFIG" ++else ++GNOME_CONFIG="no" ++fi ++ + if test -n "$GNOME_CONFIG"; then + echo "$ac_t""$GNOME_CONFIG" 1>&6 + else +@@ -3591,8 +3597,8 @@ + #define USE_GMODULE 1 + EOF - GMODULE_LIBS="`glib-config --libs gmodule`" - GMODULE_FLAGS="`glib-config --cflags gmodule`" + GMODULE_LIBS="`$GLIB_CONFIG --libs gmodule`" + GMODULE_FLAGS="`$GLIB_CONFIG --cflags gmodule`" -@@ -4470,3 +4470,3 @@ + + echo "$ac_t""yes" 1>&6 +@@ -4468,7 +4474,7 @@ + + if test "x$with_html_dir" = "x" ; then - HTML_DIR='${datadir}/gnome/html' + HTML_DIR='${datadir}/html' else + HTML_DIR=$with_html_dir + fi diff --git a/graphics/gdk-pixbuf/files/patch-ab b/graphics/gdk-pixbuf/files/patch-ab index 86f79f8be981..e0f301e0928b 100644 --- a/graphics/gdk-pixbuf/files/patch-ab +++ b/graphics/gdk-pixbuf/files/patch-ab @@ -1,7 +1,20 @@ ---- Makefile.in.orig Sun Aug 27 18:48:23 2000 -+++ Makefile.in Mon Aug 28 10:14:58 2000 -@@ -109,3 +109,3 @@ + +$FreeBSD$ + +--- Makefile.in.orig Fri May 18 16:16:44 2001 ++++ Makefile.in Fri May 18 16:20:28 2001 +@@ -111,11 +111,11 @@ + + bin_SCRIPTS = gdk-pixbuf-config -confexecdir = $(libdir) +-confexec_DATA = gdk_pixbufConf.sh gdk_pixbuf_xlibConf.sh gnomecanvaspixbufConf.sh +confexecdir = $(sysconfdir) - confexec_DATA = gdk_pixbufConf.sh gdk_pixbuf_xlibConf.sh gnomecanvaspixbufConf.sh ++confexec_DATA = gdk_pixbufConf.sh gdk_pixbuf_xlibConf.sh @BUILD_CANVAS_ITEM_TRUE@gnomecanvaspixbufConf.sh + + +-EXTRA_DIST = gdk_pixbufConf.sh.in gdk_pixbuf_xlibConf.sh.in gnomecanvaspixbufConf.sh.in gdk-pixbuf-config.in gdk-pixbuf.m4 gdk-pixbuf.spec gdk-pixbuf.spec.in ++EXTRA_DIST = gdk_pixbufConf.sh.in gdk_pixbuf_xlibConf.sh.in gdk-pixbuf-config.in gdk-pixbuf.m4 gdk-pixbuf.spec gdk-pixbuf.spec.in @BUILD_CANVAS_ITEM_TRUE@gnomecanvaspixbufConf.sh.in + + + m4datadir = $(prefix)/share/aclocal |