diff options
| author |   Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2011-01-31 23:14:31 +0100 |
|---|---|---|
| committer | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2011-01-31 23:14:45 +0100 |
| commit | f433f62249b4138cc69f9d36c8f01fdb50f0a62a (patch) | |
| tree | 68a66638a4595789c775c047f44c0d6d3cd85415 /gnome-base | |
| parent | fix vala dep (diff) | |
| download | keruspe-f433f62249b4138cc69f9d36c8f01fdb50f0a62a.tar.gz keruspe-f433f62249b4138cc69f9d36c8f01fdb50f0a62a.tar.bz2 keruspe-f433f62249b4138cc69f9d36c8f01fdb50f0a62a.zip | |
fix nautilus
Diffstat (limited to 'gnome-base')
4 files changed, 1 insertions, 60 deletions
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest index 4d249200..d463cdf6 100644 --- a/gnome-base/nautilus/Manifest +++ b/gnome-base/nautilus/Manifest @@ -1,4 +1,2 @@ -AUX nautilus-2.27.4-change-reg-desktop-file-with-no-desktop.patch 1396 RMD160 7efbc47c5f4ac647a15a56a26f80898e8ec896d0 SHA1 24f5281406066fc7fd5ffda23a061144c3667fe1 SHA256 ae9f91dddbbe2d562f5f21786daec6468b8788ece48419cce438d13201eef251 -AUX nautilus-2.91.7-missing-conditional.patch 755 RMD160 22789d46addcb314e81d38c85ac7e228632faed7 SHA1 0847d06f934ea4d1ffb1fb555cea1d17dda5abb2 SHA256 a8221adfd95d464c82b64738b6f8c48a4e9b1a88d5c6492207f127f06b57ab2e -EBUILD nautilus-2.91.8.ebuild 2368 RMD160 45892c202fef1d6c9838566a5dbfaf4cde1a0f14 SHA1 207e81d175cbc8b289aaa2c7407c070ecdf28286 SHA256 2ac313cc3357c66320cbb153109267746455c690c375293887755daa41be3741 +EBUILD nautilus-2.91.8.ebuild 2315 RMD160 69a5eb1680f0326f0ed50318cc680f4612a5d882 SHA1 0c21d7e1b7a6b63845008480d335e3b4785cdac3 SHA256 e8c1b6545593ed3380e1e02d4ffec2d23eb3e5e8789ad24a1f574975622d8bf0 DIST nautilus-2.91.8.tar.bz2 5690986 RMD160 41bf476f56387d2c8ccd400b11dabf1b40dbd3f4 SHA1 c406808da8c49cb6e10b4858eb51d7ac663e089e SHA256 197ca86fdb5d7d87e732ec77ac6d0e862d0cf1924034adcedc93dab88293f44d diff --git a/gnome-base/nautilus/files/nautilus-2.27.4-change-reg-desktop-file-with-no-desktop.patch b/gnome-base/nautilus/files/nautilus-2.27.4-change-reg-desktop-file-with-no-desktop.patch deleted file mode 100644 index 6bd3dee4..00000000 --- a/gnome-base/nautilus/files/nautilus-2.27.4-change-reg-desktop-file-with-no-desktop.patch +++ /dev/null @@ -1,33 +0,0 @@ -Gentoo bug 266398 -GNOME #580793 and #571417 - -Index: nautilus-2.26.2/src/nautilus-main.c -=================================================================== ---- nautilus-2.26.2.orig/src/nautilus-main.c 2009-04-29 17:02:32.709364982 +0200 -+++ nautilus-2.26.2/src/nautilus-main.c 2009-04-29 17:39:36.529860872 +0200 -@@ -391,9 +391,6 @@ main (int argc, char *argv[]) - - g_set_prgname ("nautilus"); - -- if (g_file_test (DATADIR "/applications/nautilus.desktop", G_FILE_TEST_EXISTS)) { -- egg_set_desktop_file (DATADIR "/applications/nautilus.desktop"); -- } - - context = g_option_context_new (_("\n\nBrowse the file system with the file manager")); - g_option_context_add_main_entries (context, options, NULL); -@@ -464,6 +461,15 @@ main (int argc, char *argv[]) - (NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR, TRUE); - } - -+ /* Which .desktop file contains the relevant session management -+ information? */ -+ if ((no_desktop || !eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_DESKTOP)) -+ && g_file_test (DATADIR "/applications/nautilus-home.desktop", G_FILE_TEST_EXISTS)) { -+ egg_set_desktop_file (DATADIR "/applications/nautilus-home.desktop"); -+ } else if (g_file_test (DATADIR "/applications/nautilus.desktop", G_FILE_TEST_EXISTS)) { -+ egg_set_desktop_file (DATADIR "/applications/nautilus.desktop"); -+ } -+ - application = NULL; - - /* Do either the self-check or the real work. */ diff --git a/gnome-base/nautilus/files/nautilus-2.91.7-missing-conditional.patch b/gnome-base/nautilus/files/nautilus-2.91.7-missing-conditional.patch deleted file mode 100644 index 0fe0a71f..00000000 --- a/gnome-base/nautilus/files/nautilus-2.91.7-missing-conditional.patch +++ /dev/null @@ -1,23 +0,0 @@ -From f2533adf30822d3839b67c5f81e410b5e212f7a7 Mon Sep 17 00:00:00 2001 -From: Maciej Piechotka <uzytkownik2@gmail.com> -Date: Tue, 11 Jan 2011 17:13:29 +0000 -Subject: Fix handling of AM_CONDITIONAL - ---- -diff --git a/configure.in b/configure.in -index 2a51405..6167a92 100644 ---- a/configure.in -+++ b/configure.in -@@ -116,9 +116,9 @@ AC_ARG_ENABLE(nst_extension, - AC_HELP_STRING([--disable-nst-extension], - [build without nautilus-sendto extension])) - if test "x$enable_nst_extension" != "xno"; then -- AM_CONDITIONAL(ENABLE_NST_EXTENSION, true) - enable_nst_extension=yes - fi -+AM_CONDITIONAL(ENABLE_NST_EXTENSION, test "x$enable_nst_extension" != "xno") - - dnl ========================================================================== - --- -cgit v0.8.3.1 diff --git a/gnome-base/nautilus/nautilus-2.91.8.ebuild b/gnome-base/nautilus/nautilus-2.91.8.ebuild index 0f3930b8..251fe760 100644 --- a/gnome-base/nautilus/nautilus-2.91.8.ebuild +++ b/gnome-base/nautilus/nautilus-2.91.8.ebuild @@ -63,7 +63,6 @@ src_prepare() { fi sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \ || die "sed 4 failed" - epatch "${FILESDIR}/${P}-missing-conditional.patch" eautoreconf } |