From bcd1808193a8a889c2442b8347c5405ac0d979b4 Mon Sep 17 00:00:00 2001 From: marcus Date: Thu, 13 Nov 2003 08:48:23 +0000 Subject: Update to 2.5.1.1. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1319 df743ca5-7f9a-e211-a948-0013205c9059 --- x11-fm/nautilus/files/patch-Makefile.in | 10 +++ x11-fm/nautilus/files/patch-aa | 29 ++++++++ .../nautilus/files/patch-data_static_bookmarks.xml | 84 ++++++++++++++++++++++ .../nautilus/files/patch-libbackground_Makefile.in | 11 +++ ...bnautilus-extensions::nautilus-medusa-support.c | 14 ++++ ...h-libnautilus-private_filesystem-attributes.xml | 31 ++++++++ ...tch-libnautilus-private_nautilus-emblem-utils.c | 10 +++ x11-fm/nautilus/files/patch-ltmain.sh | 51 +++++++++++++ .../patch-src_file-manager_fm-directory-view.c | 31 ++++++++ 9 files changed, 271 insertions(+) create mode 100644 x11-fm/nautilus/files/patch-Makefile.in create mode 100644 x11-fm/nautilus/files/patch-aa create mode 100644 x11-fm/nautilus/files/patch-data_static_bookmarks.xml create mode 100644 x11-fm/nautilus/files/patch-libbackground_Makefile.in create mode 100644 x11-fm/nautilus/files/patch-libnautilus-extensions::nautilus-medusa-support.c create mode 100644 x11-fm/nautilus/files/patch-libnautilus-private_filesystem-attributes.xml create mode 100644 x11-fm/nautilus/files/patch-libnautilus-private_nautilus-emblem-utils.c create mode 100644 x11-fm/nautilus/files/patch-ltmain.sh create mode 100644 x11-fm/nautilus/files/patch-src_file-manager_fm-directory-view.c (limited to 'x11-fm/nautilus/files') diff --git a/x11-fm/nautilus/files/patch-Makefile.in b/x11-fm/nautilus/files/patch-Makefile.in new file mode 100644 index 000000000..7fe0bcd6e --- /dev/null +++ b/x11-fm/nautilus/files/patch-Makefile.in @@ -0,0 +1,10 @@ +--- Makefile.in.orig Tue Jan 7 12:28:34 2003 ++++ Makefile.in Tue Jan 7 12:29:48 2003 +@@ -153,7 +153,6 @@ + libnautilus-private \ + libnautilus-adapter \ + src \ +- test \ + components \ + po \ + data \ diff --git a/x11-fm/nautilus/files/patch-aa b/x11-fm/nautilus/files/patch-aa new file mode 100644 index 000000000..d4741108d --- /dev/null +++ b/x11-fm/nautilus/files/patch-aa @@ -0,0 +1,29 @@ +--- configure.orig Mon Nov 10 22:08:05 2003 ++++ configure Mon Nov 10 22:08:05 2003 +@@ -12971,7 +12971,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" +@@ -12979,7 +12979,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" +@@ -13959,7 +13959,7 @@ + s,@PKG_CONFIG@,$PKG_CONFIG,;t t + s,@STARTUP_NOTIFICATION_PACKAGE@,$STARTUP_NOTIFICATION_PACKAGE,;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,@USE_NLS@,$USE_NLS,;t t + s,@MSGFMT@,$MSGFMT,;t t diff --git a/x11-fm/nautilus/files/patch-data_static_bookmarks.xml b/x11-fm/nautilus/files/patch-data_static_bookmarks.xml new file mode 100644 index 000000000..54ea8ae37 --- /dev/null +++ b/x11-fm/nautilus/files/patch-data_static_bookmarks.xml @@ -0,0 +1,84 @@ +--- data/static_bookmarks.xml.orig Wed Jun 5 22:58:43 2002 ++++ data/static_bookmarks.xml Wed Jun 5 23:30:11 2002 +@@ -1,54 +1,44 @@ + + + +- +- +- +- +- +- ++ ++ ++ ++ + + +- + + +- +- +- +- +- ++ ++ ++ ++ ++ ++ + + +- +- +- +- ++ ++ ++ + +- +- + + +- +- +- +- ++ ++ + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + diff --git a/x11-fm/nautilus/files/patch-libbackground_Makefile.in b/x11-fm/nautilus/files/patch-libbackground_Makefile.in new file mode 100644 index 000000000..835db3474 --- /dev/null +++ b/x11-fm/nautilus/files/patch-libbackground_Makefile.in @@ -0,0 +1,11 @@ +--- libbackground/Makefile.in.orig Tue Jan 7 12:30:18 2003 ++++ libbackground/Makefile.in Tue Jan 7 12:30:58 2003 +@@ -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@ diff --git a/x11-fm/nautilus/files/patch-libnautilus-extensions::nautilus-medusa-support.c b/x11-fm/nautilus/files/patch-libnautilus-extensions::nautilus-medusa-support.c new file mode 100644 index 000000000..b0fb5eb6e --- /dev/null +++ b/x11-fm/nautilus/files/patch-libnautilus-extensions::nautilus-medusa-support.c @@ -0,0 +1,14 @@ + +$FreeBSD: ports/x11-fm/nautilus2/files/patch-libnautilus-extensions::nautilus-medusa-support.c,v 1.5 2003/09/18 06:49:35 marcus Exp $ + +--- libnautilus-private/nautilus-medusa-support.c.orig Wed Apr 11 21:36:16 2001 ++++ libnautilus-private/nautilus-medusa-support.c Mon May 14 17:45:24 2001 +@@ -84,7 +84,7 @@ + */ + status = NAUTILUS_CRON_STATUS_OFF; + +- stat_file_name = g_strdup_printf ("/proc/%d/stat", process_number); ++ stat_file_name = g_strdup_printf ("/proc/%d/status", process_number); + stat_file = fopen (stat_file_name, "r"); + g_free (stat_file_name); + diff --git a/x11-fm/nautilus/files/patch-libnautilus-private_filesystem-attributes.xml b/x11-fm/nautilus/files/patch-libnautilus-private_filesystem-attributes.xml new file mode 100644 index 000000000..81e3a2a71 --- /dev/null +++ b/x11-fm/nautilus/files/patch-libnautilus-private_filesystem-attributes.xml @@ -0,0 +1,31 @@ +--- libnautilus-private/filesystem-attributes.xml.orig Sat Sep 14 16:56:38 2002 ++++ libnautilus-private/filesystem-attributes.xml Sat Sep 14 17:01:31 2002 +@@ -3,10 +3,12 @@ + + + ++ + + + + ++ + + + +@@ -15,10 +17,15 @@ + + + ++ ++ + + + ++ ++ + ++ + + + diff --git a/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-emblem-utils.c b/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-emblem-utils.c new file mode 100644 index 000000000..2d67d65e7 --- /dev/null +++ b/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-emblem-utils.c @@ -0,0 +1,10 @@ +--- libnautilus-private/nautilus-emblem-utils.c.orig Mon Oct 14 22:20:28 2002 ++++ libnautilus-private/nautilus-emblem-utils.c Mon Oct 14 22:20:56 2002 +@@ -24,6 +24,7 @@ + + #include + ++#include + #include + #include + #include diff --git a/x11-fm/nautilus/files/patch-ltmain.sh b/x11-fm/nautilus/files/patch-ltmain.sh new file mode 100644 index 000000000..854b2a10a --- /dev/null +++ b/x11-fm/nautilus/files/patch-ltmain.sh @@ -0,0 +1,51 @@ +--- ltmain.sh.orig Sat Feb 8 09:47:44 2003 ++++ ltmain.sh Mon Jun 30 18:31:09 2003 +@@ -1075,7 +1075,7 @@ + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd* | *-*-freebsd4*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1085,8 +1085,16 @@ + continue + ;; + ++ -pthread) ++ compile_command="$compile_command -pthread" ++ finalize_command="$finalize_command -pthread" ++ compiler_flags="$compiler_flags -pthread" ++ continue ++ ;; ++ + -module) + module=yes ++ build_old_libs=no + continue + ;; + +@@ -2503,6 +2511,9 @@ + *-*-openbsd* | *-*-freebsd*) + # Do not include libc due to us having libc/libc_r. + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test $build_libtool_need_lc = "yes"; then +@@ -4330,10 +4341,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/x11-fm/nautilus/files/patch-src_file-manager_fm-directory-view.c b/x11-fm/nautilus/files/patch-src_file-manager_fm-directory-view.c new file mode 100644 index 000000000..5f84cfbe5 --- /dev/null +++ b/x11-fm/nautilus/files/patch-src_file-manager_fm-directory-view.c @@ -0,0 +1,31 @@ +--- src/file-manager/fm-directory-view.c.orig Thu Oct 2 23:30:40 2003 ++++ src/file-manager/fm-directory-view.c Thu Oct 2 23:52:04 2003 +@@ -4314,19 +4314,25 @@ + + nautilus_bonobo_set_hidden (view->details->ui, + FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS, +- !any_scripts); ++ FALSE); + nautilus_bonobo_set_hidden (view->details->ui, + FM_DIRECTORY_VIEW_POPUP_PATH_SCRIPTS, ++ FALSE); ++ nautilus_bonobo_set_hidden (view->details->ui, ++ FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS_PLACEHOLDER, ++ !any_scripts); ++ nautilus_bonobo_set_hidden (view->details->ui, ++ FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_SCRIPTS_PLACEHOLDER, + !any_scripts); + nautilus_bonobo_set_hidden (view->details->ui, + FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_SCRIPTS, +- !any_scripts); ++ FALSE); + nautilus_bonobo_set_hidden (view->details->ui, + FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS_SEPARATOR, + !any_scripts); + nautilus_bonobo_set_hidden (view->details->ui, + FM_DIRECTORY_VIEW_POPUP_PATH_SCRIPTS_SEPARATOR, +- !any_scripts); ++ FALSE); + nautilus_bonobo_set_hidden (view->details->ui, + FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_SCRIPTS_SEPARATOR, + !any_scripts); -- cgit v1.2.3