summaryrefslogtreecommitdiffstats
path: root/x11-fm/nautilus/files
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2002-11-27 04:58:08 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2002-11-27 04:58:08 +0800
commit4a0c1d33985805138aa0cad1ed5de44d6ae2dfdf (patch)
treea39e70a6afdf6aa311d1440e492f95b4e2082a29 /x11-fm/nautilus/files
parent360d8d0b960247512983986f229eaf7451724fcd (diff)
downloadmarcuscom-ports-4a0c1d33985805138aa0cad1ed5de44d6ae2dfdf.tar
marcuscom-ports-4a0c1d33985805138aa0cad1ed5de44d6ae2dfdf.tar.gz
marcuscom-ports-4a0c1d33985805138aa0cad1ed5de44d6ae2dfdf.tar.bz2
marcuscom-ports-4a0c1d33985805138aa0cad1ed5de44d6ae2dfdf.tar.lz
marcuscom-ports-4a0c1d33985805138aa0cad1ed5de44d6ae2dfdf.tar.xz
marcuscom-ports-4a0c1d33985805138aa0cad1ed5de44d6ae2dfdf.tar.zst
marcuscom-ports-4a0c1d33985805138aa0cad1ed5de44d6ae2dfdf.zip
Update to 2.1.3.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@174 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-fm/nautilus/files')
-rw-r--r--x11-fm/nautilus/files/patch-aa20
1 files changed, 10 insertions, 10 deletions
diff --git a/x11-fm/nautilus/files/patch-aa b/x11-fm/nautilus/files/patch-aa
index fa83e8348..3b98f9aff 100644
--- a/x11-fm/nautilus/files/patch-aa
+++ b/x11-fm/nautilus/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig Thu Oct 31 20:39:00 2002
-+++ configure Mon Nov 11 01:22:48 2002
-@@ -8619,6 +8619,7 @@
+--- configure.orig Mon Nov 25 21:42:34 2002
++++ configure Tue Nov 26 15:25:56 2002
+@@ -8313,6 +8313,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,26 +8,25 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -13582,16 +13583,14 @@
+@@ -13276,7 +13277,7 @@
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"
- CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags"
+@@ -13284,7 +13285,7 @@
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`"
-@@ -14546,9 +14545,9 @@
+@@ -14176,9 +14177,9 @@
s,@ORBIT_CONFIG@,$ORBIT_CONFIG,;t t
s,@ORBIT_IDL@,$ORBIT_IDL,;t t
s,@ORBIT_CFLAGS@,$ORBIT_CFLAGS,;t t
@@ -39,7 +38,7 @@
s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
s,@ALLOCA@,$ALLOCA,;t t
s,@USE_NLS@,$USE_NLS,;t t
-@@ -14597,24 +14596,24 @@
+@@ -14227,25 +14228,25 @@
s,@HAVE_JW_FALSE@,$HAVE_JW_FALSE,;t t
s,@HAVE_JW@,$HAVE_JW,;t t
s,@MEDUSA_CFLAGS@,$MEDUSA_CFLAGS,;t t
@@ -47,6 +46,7 @@
+s~@MEDUSA_LIBS@~$MEDUSA_LIBS~;t t
s,@LIBJPEG@,$LIBJPEG,;t t
s,@GIMPHWRAPBOX_CFLAGS@,$GIMPHWRAPBOX_CFLAGS,;t t
+ s,@LIBEGG_CFLAGS@,$LIBEGG_CFLAGS,;t t
s,@LIBNAUTILUS_CFLAGS@,$LIBNAUTILUS_CFLAGS,;t t
-s,@LIBNAUTILUS_LIBS@,$LIBNAUTILUS_LIBS,;t t
+s~@LIBNAUTILUS_LIBS@~$LIBNAUTILUS_LIBS~;t t