summaryrefslogtreecommitdiffstats
path: root/x11-fm/nautilus/files
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2002-10-10 13:18:10 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2002-10-10 13:18:10 +0800
commitf6f4649fb5ab0f2321d3b1debf167638d2386caf (patch)
tree1700f9b0a2d187cf3d34035e57c2768edaa86f8f /x11-fm/nautilus/files
parent286b7d8e05f162c741c0afe77fd23d95746f909c (diff)
downloadmarcuscom-ports-f6f4649fb5ab0f2321d3b1debf167638d2386caf.tar
marcuscom-ports-f6f4649fb5ab0f2321d3b1debf167638d2386caf.tar.gz
marcuscom-ports-f6f4649fb5ab0f2321d3b1debf167638d2386caf.tar.bz2
marcuscom-ports-f6f4649fb5ab0f2321d3b1debf167638d2386caf.tar.lz
marcuscom-ports-f6f4649fb5ab0f2321d3b1debf167638d2386caf.tar.xz
marcuscom-ports-f6f4649fb5ab0f2321d3b1debf167638d2386caf.tar.zst
marcuscom-ports-f6f4649fb5ab0f2321d3b1debf167638d2386caf.zip
Remove .orig files.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@44 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-fm/nautilus/files')
-rw-r--r--x11-fm/nautilus/files/patch-aa.orig68
-rw-r--r--x11-fm/nautilus/files/patch-libnautilus-private::nautilus-monitor.c.orig25
2 files changed, 0 insertions, 93 deletions
diff --git a/x11-fm/nautilus/files/patch-aa.orig b/x11-fm/nautilus/files/patch-aa.orig
deleted file mode 100644
index 1352642e2..000000000
--- a/x11-fm/nautilus/files/patch-aa.orig
+++ /dev/null
@@ -1,68 +0,0 @@
---- configure.orig Tue May 28 00:57:18 2002
-+++ configure Tue May 28 01:00:25 2002
-@@ -7495,6 +7495,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -12398,14 +12399,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"
- CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags"
-
- CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $FAM_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"
- COMPONENT_CFLAGS="`$PKG_CONFIG --cflags $COMPONENT_MODULES`"
-@@ -13114,9 +13115,9 @@
- s,@ORBIT_CONFIG@,$ORBIT_CONFIG,;t t
- s,@ORBIT_IDL@,$ORBIT_IDL,;t t
- s,@ORBIT_CFLAGS@,$ORBIT_CFLAGS,;t t
--s,@ORBIT_LIBS@,$ORBIT_LIBS,;t t
-+s~@ORBIT_LIBS@~$ORBIT_LIBS~;t t
- s,@ALL_CFLAGS@,$ALL_CFLAGS,;t t
--s,@ALL_LIBS@,$ALL_LIBS,;t t
-+s~@ALL_LIBS@~$ALL_LIBS~;t t
- s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
- s,@ALLOCA@,$ALLOCA,;t t
- s,@USE_NLS@,$USE_NLS,;t t
-@@ -13171,22 +13172,22 @@
- s,@HAVE_JW_FALSE@,$HAVE_JW_FALSE,;t t
- s,@HAVE_JW@,$HAVE_JW,;t t
- s,@MEDUSA_CFLAGS@,$MEDUSA_CFLAGS,;t t
--s,@MEDUSA_LIBS@,$MEDUSA_LIBS,;t t
-+s~@MEDUSA_LIBS@~$MEDUSA_LIBS~;t t
- s,@LIBJPEG@,$LIBJPEG,;t t
- s,@GIMPHWRAPBOX_CFLAGS@,$GIMPHWRAPBOX_CFLAGS,;t t
- s,@LIBNAUTILUS_CFLAGS@,$LIBNAUTILUS_CFLAGS,;t t
--s,@LIBNAUTILUS_LIBS@,$LIBNAUTILUS_LIBS,;t t
-+s~@LIBNAUTILUS_LIBS@~$LIBNAUTILUS_LIBS~;t t
- s,@LIBNAUTILUS_IDL_INCLUDES@,$LIBNAUTILUS_IDL_INCLUDES,;t t
- s,@CORE_CFLAGS@,$CORE_CFLAGS,;t t
--s,@CORE_LIBS@,$CORE_LIBS,;t t
-+s~@CORE_LIBS@~$CORE_LIBS~;t t
- s,@CORE_IDL_INCLUDES@,$CORE_IDL_INCLUDES,;t t
- 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,@DISABLE_DEPRECATED_CFLAGS@,$DISABLE_DEPRECATED_CFLAGS,;t t
- s,@CAPPLET_CFLAGS@,$CAPPLET_CFLAGS,;t t
--s,@CAPPLET_LIBS@,$CAPPLET_LIBS,;t t
-+s~@CAPPLET_LIBS@~$CAPPLET_LIBS~;t t
- s,@GCONFTOOL@,$GCONFTOOL,;t t
- s,@GCONF_SCHEMA_CONFIG_SOURCE@,$GCONF_SCHEMA_CONFIG_SOURCE,;t t
- s,@GCONF_SCHEMA_FILE_DIR@,$GCONF_SCHEMA_FILE_DIR,;t t
diff --git a/x11-fm/nautilus/files/patch-libnautilus-private::nautilus-monitor.c.orig b/x11-fm/nautilus/files/patch-libnautilus-private::nautilus-monitor.c.orig
deleted file mode 100644
index cc13fe51a..000000000
--- a/x11-fm/nautilus/files/patch-libnautilus-private::nautilus-monitor.c.orig
+++ /dev/null
@@ -1,25 +0,0 @@
-
-$FreeBSD: ports/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-monitor.c,v 1.2 2002/05/20 18:03:39 sobomax Exp $
-
---- libnautilus-private/nautilus-monitor.c 2001/12/07 22:54:34 1.1
-+++ libnautilus-private/nautilus-monitor.c 2001/12/07 23:10:06
-@@ -274,7 +274,8 @@
- }
-
- monitor = g_new0 (NautilusMonitor, 1);
-- FAMMonitorFile (connection, path, &monitor->request, NULL);
-+ if (FAMMonitorFile (connection, path, &monitor->request, NULL) == -1)
-+ return NULL;
-
- g_free (path);
-
-@@ -314,7 +315,8 @@
- }
-
- monitor = g_new0 (NautilusMonitor, 1);
-- FAMMonitorDirectory (connection, path, &monitor->request, NULL);
-+ if (FAMMonitorDirectory (connection, path, &monitor->request, NULL) == -1)
-+ return NULL;
-
- g_assert (g_hash_table_lookup (get_request_hash_table (),
- GINT_TO_POINTER (FAMREQUEST_GETREQNUM (&monitor->request))) == NULL);