diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2002-11-11 14:58:47 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2002-11-11 14:58:47 +0800 |
| commit | d8caaf7acd0b3e39012f474a8c2386cbb4a09a1a (patch) | |
| tree | 6bb8358fb83b194eb64dfc17b11b0bb3d7ebe4d3 /x11-fm/nautilus2/files/patch-aa | |
| parent | 2ac8476662ac856e24768897a169bf18ab76f1f4 (diff) | |
| download | marcuscom-ports-d8caaf7acd0b3e39012f474a8c2386cbb4a09a1a.tar marcuscom-ports-d8caaf7acd0b3e39012f474a8c2386cbb4a09a1a.tar.gz marcuscom-ports-d8caaf7acd0b3e39012f474a8c2386cbb4a09a1a.tar.bz2 marcuscom-ports-d8caaf7acd0b3e39012f474a8c2386cbb4a09a1a.tar.lz marcuscom-ports-d8caaf7acd0b3e39012f474a8c2386cbb4a09a1a.tar.xz marcuscom-ports-d8caaf7acd0b3e39012f474a8c2386cbb4a09a1a.tar.zst marcuscom-ports-d8caaf7acd0b3e39012f474a8c2386cbb4a09a1a.zip | |
Update to 2.1.2.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@142 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-fm/nautilus2/files/patch-aa')
| -rw-r--r-- | x11-fm/nautilus2/files/patch-aa | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus2/files/patch-aa index 194bf8905..fa83e8348 100644 --- a/x11-fm/nautilus2/files/patch-aa +++ b/x11-fm/nautilus2/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Mon Oct 14 06:41:32 2002 -+++ configure Mon Oct 14 22:12:45 2002 -@@ -7484,6 +7484,7 @@ +--- configure.orig Thu Oct 31 20:39:00 2002 ++++ configure Mon Nov 11 01:22:48 2002 +@@ -8619,6 +8619,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,11 +8,12 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -11841,14 +11842,14 @@ +@@ -13582,16 +13583,14 @@ LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`" -LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | $srcdir/add-include-prefix`" +- +LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | xargs -n1 echo -n ' -I '`" CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 libbonoboui-2.0 esound gnome-desktop-2.0 $EXTRA_CORE_MODULES" @@ -21,11 +22,12 @@ CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs" -CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | $srcdir/add-include-prefix`" +- +CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | xargs -n1 echo -n ' -I '`" COMPONENT_MODULES="eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0 gnome-desktop-2.0" COMPONENT_CFLAGS="`$PKG_CONFIG --cflags $COMPONENT_MODULES`" -@@ -12579,9 +12580,9 @@ +@@ -14546,9 +14545,9 @@ s,@ORBIT_CONFIG@,$ORBIT_CONFIG,;t t s,@ORBIT_IDL@,$ORBIT_IDL,;t t s,@ORBIT_CFLAGS@,$ORBIT_CFLAGS,;t t @@ -37,7 +39,7 @@ s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t s,@ALLOCA@,$ALLOCA,;t t s,@USE_NLS@,$USE_NLS,;t t -@@ -12633,26 +12634,26 @@ +@@ -14597,24 +14596,24 @@ s,@HAVE_JW_FALSE@,$HAVE_JW_FALSE,;t t s,@HAVE_JW@,$HAVE_JW,;t t s,@MEDUSA_CFLAGS@,$MEDUSA_CFLAGS,;t t @@ -56,9 +58,6 @@ s,@COMPONENT_CFLAGS@,$COMPONENT_CFLAGS,;t t -s,@COMPONENT_LIBS@,$COMPONENT_LIBS,;t t +s~@COMPONENT_LIBS@~$COMPONENT_LIBS~;t t - s,@MUSIC_COMPONENT_CFLAGS@,$MUSIC_COMPONENT_CFLAGS,;t t --s,@MUSIC_COMPONENT_LIBS@,$MUSIC_COMPONENT_LIBS,;t t -+s~@MUSIC_COMPONENT_LIBS@~$MUSIC_COMPONENT_LIBS~;t t s,@EMBLEM_COMPONENT_CFLAGS@,$EMBLEM_COMPONENT_CFLAGS,;t t s,@EMBLEM_COMPONENT_LIBS@,$EMBLEM_COMPONENT_LIBS,;t t s,@DISABLE_DEPRECATED_CFLAGS@,$DISABLE_DEPRECATED_CFLAGS,;t t |