diff options
Diffstat (limited to 'x11-fm/nautilus2/files')
| -rw-r--r-- | x11-fm/nautilus2/files/patch-Makefile.in | 21 | ||||
| -rw-r--r-- | x11-fm/nautilus2/files/patch-aa | 19 | ||||
| -rw-r--r-- | x11-fm/nautilus2/files/patch-libbackground_Makefile.in | 18 |
3 files changed, 30 insertions, 28 deletions
diff --git a/x11-fm/nautilus2/files/patch-Makefile.in b/x11-fm/nautilus2/files/patch-Makefile.in index e09fa7ef2..334665c47 100644 --- a/x11-fm/nautilus2/files/patch-Makefile.in +++ b/x11-fm/nautilus2/files/patch-Makefile.in @@ -1,10 +1,11 @@ ---- Makefile.in.orig Sat Sep 14 16:54:42 2002 -+++ Makefile.in Sat Sep 14 16:55:17 2002 -@@ -161,7 +161,6 @@ - libnautilus-private \ - libnautilus-adapter \ - src \ -- test \ - components \ - po \ - data \ +--- Makefile.in.orig Mon Oct 14 22:08:24 2002 ++++ Makefile.in Mon Oct 14 22:08:53 2002 +@@ -145,7 +145,7 @@ + DESKTOP_IN_FILES = nautilus.desktop.in + DESKTOP_FILES = $(DESKTOP_IN_FILES:.desktop.in=.desktop) + +-SUBDIRS = libnautilus cut-n-paste-code libbackground libnautilus-private libnautilus-adapter src test components po data icons docs $(NULL) ++SUBDIRS = libnautilus cut-n-paste-code libbackground libnautilus-private libnautilus-adapter src components po data icons docs $(NULL) + + + EXTRA_DIST = COPYING.LIB COPYING-DOCS HACKING MAINTAINERS nautilus.spec.in nautilus.desktop nautilus.desktop.in gnome-starthere-96.png gnome-starthere.png ChangeLog-20000414 ChangeLog-20000625 ChangeLog-20000831 ChangeLog-20001018 intltool-extract.in intltool-merge.in intltool-update.in Makefile.shared add-include-prefix $(DESKTOP_IN_FILES) $(DESKTOP_FILES) $(NULL) diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus2/files/patch-aa index e3791b933..194bf8905 100644 --- a/x11-fm/nautilus2/files/patch-aa +++ b/x11-fm/nautilus2/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Tue Jul 23 21:46:17 2002 -+++ configure Tue Jul 23 21:49:20 2002 -@@ -8311,6 +8311,7 @@ +--- configure.orig Mon Oct 14 06:41:32 2002 ++++ configure Mon Oct 14 22:12:45 2002 +@@ -7484,6 +7484,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,25 +8,24 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -13383,7 +13384,7 @@ +@@ -11841,14 +11842,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" -@@ -13391,7 +13392,7 @@ + CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags" 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" -@@ -14291,9 +14292,9 @@ + COMPONENT_CFLAGS="`$PKG_CONFIG --cflags $COMPONENT_MODULES`" +@@ -12579,9 +12580,9 @@ s,@ORBIT_CONFIG@,$ORBIT_CONFIG,;t t s,@ORBIT_IDL@,$ORBIT_IDL,;t t s,@ORBIT_CFLAGS@,$ORBIT_CFLAGS,;t t @@ -38,7 +37,7 @@ s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t s,@ALLOCA@,$ALLOCA,;t t s,@USE_NLS@,$USE_NLS,;t t -@@ -14345,24 +14346,24 @@ +@@ -12633,26 +12634,26 @@ s,@HAVE_JW_FALSE@,$HAVE_JW_FALSE,;t t s,@HAVE_JW@,$HAVE_JW,;t t s,@MEDUSA_CFLAGS@,$MEDUSA_CFLAGS,;t t @@ -60,6 +59,8 @@ 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 s,@ENABLE_HARDWARE_VIEW_TRUE@,$ENABLE_HARDWARE_VIEW_TRUE,;t t s,@ENABLE_HARDWARE_VIEW_FALSE@,$ENABLE_HARDWARE_VIEW_FALSE,;t t diff --git a/x11-fm/nautilus2/files/patch-libbackground_Makefile.in b/x11-fm/nautilus2/files/patch-libbackground_Makefile.in index 946b61916..eb7927b81 100644 --- a/x11-fm/nautilus2/files/patch-libbackground_Makefile.in +++ b/x11-fm/nautilus2/files/patch-libbackground_Makefile.in @@ -1,11 +1,11 @@ ---- libbackground/Makefile.in.orig Thu Oct 10 12:36:27 2002 -+++ libbackground/Makefile.in Thu Oct 10 12:37:27 2002 +--- libbackground/Makefile.in.orig Mon Oct 14 22:13:17 2002 ++++ libbackground/Makefile.in Mon Oct 14 22:14:31 2002 @@ -141,7 +141,7 @@ - INCLUDES = \ - -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -- -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ -+ -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" \ - -DG_LOG_DOMAIN=\"capplet-common\" \ - -I$(top_srcdir)/ \ - @CAPPLET_CFLAGS@ + EXTRA_DIST = ChangeLog + +-INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" -DG_LOG_DOMAIN=\"capplet-common\" -I$(top_srcdir)/ @CAPPLET_CFLAGS@ ++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" -DG_LOG_DOMAIN=\"capplet-common\" -I$(top_srcdir)/ @CAPPLET_CFLAGS@ + + + noinst_LTLIBRARIES = libbackground.la |