From adb746ad6886253babd2eb48820733b37f9e737b Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Thu, 14 May 2009 11:15:29 +0000 Subject: Add patch to prevent nautilus from flipping out when not managing the desktop. Fixes bug 266398 (Portage version: 2.2_rc33/cvs/Linux i686) --- gnome-base/nautilus/ChangeLog | 10 ++- ...2-change-reg-desktop-file-with-no-desktop.patch | 33 ++++++++ gnome-base/nautilus/nautilus-2.26.2-r1.ebuild | 90 ++++++++++++++++++++++ gnome-base/nautilus/nautilus-2.26.2.ebuild | 88 --------------------- 4 files changed, 132 insertions(+), 89 deletions(-) create mode 100644 gnome-base/nautilus/files/nautilus-2.26.2-change-reg-desktop-file-with-no-desktop.patch create mode 100644 gnome-base/nautilus/nautilus-2.26.2-r1.ebuild delete mode 100644 gnome-base/nautilus/nautilus-2.26.2.ebuild diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog index df88c9133431..f387fb4f8352 100644 --- a/gnome-base/nautilus/ChangeLog +++ b/gnome-base/nautilus/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for gnome-base/nautilus # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.307 2009/05/11 17:29:15 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.308 2009/05/14 11:15:29 nirbheek Exp $ + +*nautilus-2.26.2-r1 (14 May 2009) + + 14 May 2009; Nirbheek Chauhan + -nautilus-2.26.2.ebuild, +nautilus-2.26.2-r1.ebuild, + +files/nautilus-2.26.2-change-reg-desktop-file-with-no-desktop.patch: + Add patch to prevent nautilus from flipping out when not managing the + desktop. Fixes bug 266398 11 May 2009; Brent Baude nautilus-2.24.2-r3.ebuild: stable ppc64, bug 269186 diff --git a/gnome-base/nautilus/files/nautilus-2.26.2-change-reg-desktop-file-with-no-desktop.patch b/gnome-base/nautilus/files/nautilus-2.26.2-change-reg-desktop-file-with-no-desktop.patch new file mode 100644 index 000000000000..d6ca6eb97227 --- /dev/null +++ b/gnome-base/nautilus/files/nautilus-2.26.2-change-reg-desktop-file-with-no-desktop.patch @@ -0,0 +1,33 @@ +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[]) + browser_window = FALSE; + + 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/nautilus-2.26.2-r1.ebuild b/gnome-base/nautilus/nautilus-2.26.2-r1.ebuild new file mode 100644 index 000000000000..dfafc81ba11a --- /dev/null +++ b/gnome-base/nautilus/nautilus-2.26.2-r1.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.26.2-r1.ebuild,v 1.1 2009/05/14 11:15:29 nirbheek Exp $ + +EAPI="2" + +inherit gnome2 eutils virtualx + +DESCRIPTION="A file manager for the GNOME desktop" +HOMEPAGE="http://www.gnome.org/projects/nautilus/" + +LICENSE="GPL-2 LGPL-2 FDL-1.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="beagle doc gnome tracker xmp" + +# not adding gnome-base/gail because it is in gtk+ +RDEPEND=">=dev-libs/glib-2.19.0 + >=gnome-base/gnome-desktop-2.25.5 + >=x11-libs/pango-1.1.2 + >=x11-libs/gtk+-2.16.0 + >=dev-libs/libxml2-2.4.7 + >=media-libs/libexif-0.5.12 + >=gnome-base/gconf-2.0 + >=gnome-base/gvfs-0.1.2 + dev-libs/libunique + dev-libs/dbus-glib + x11-libs/libXft + x11-libs/libXrender + beagle? ( || ( + dev-libs/libbeagle + =app-misc/beagle-0.2* ) ) + tracker? ( >=app-misc/tracker-0.6.4 ) + xmp? ( >=media-libs/exempi-2 )" + +DEPEND="${RDEPEND} + >=dev-lang/perl-5 + sys-devel/gettext + >=dev-util/pkgconfig-0.9 + >=dev-util/intltool-0.40.1 + doc? ( >=dev-util/gtk-doc-1.4 ) + gnome-base/gnome-common + dev-util/gtk-doc-am" + +PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )" + +DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO" + +pkg_setup() { + G2CONF="${G2CONF} + --disable-update-mimedb + --disable-packagekit + $(use_enable beagle) + $(use_enable tracker) + $(use_enable xmp)" +} + +src_prepare() { + gnome2_src_prepare + + # FIXME: tarball generated with broken gtk-doc, revisit me. + if use doc; then + sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \ + -i gtk-doc.make || die "sed 1 failed" + else + sed "/^TARGET_DIR/i \GTKDOC_REBASE=/bin/true" \ + -i gtk-doc.make || die "sed 2 failed" + fi + + # gtk-doc-am and gnome-common needed for this + + # Fix intltoolize broken file, see upstream #577133 + sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed" + + epatch "${FILESDIR}/${P}-change-reg-desktop-file-with-no-desktop.patch" +} + +src_test() { + addwrite "/root/.gnome2_private" + unset SESSION_MANAGER + Xemake check || die "Test phase failed" +} + +pkg_postinst() { + gnome2_pkg_postinst + + elog "nautilus can use gstreamer to preview audio files. Just make sure" + elog "to have the necessary plugins available to play the media type you" + elog "want to preview" +} diff --git a/gnome-base/nautilus/nautilus-2.26.2.ebuild b/gnome-base/nautilus/nautilus-2.26.2.ebuild deleted file mode 100644 index b72c02ef3c55..000000000000 --- a/gnome-base/nautilus/nautilus-2.26.2.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.26.2.ebuild,v 1.1 2009/05/10 20:49:48 eva Exp $ - -EAPI="2" - -inherit gnome2 eutils virtualx - -DESCRIPTION="A file manager for the GNOME desktop" -HOMEPAGE="http://www.gnome.org/projects/nautilus/" - -LICENSE="GPL-2 LGPL-2 FDL-1.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="beagle doc gnome tracker xmp" - -# not adding gnome-base/gail because it is in gtk+ -RDEPEND=">=dev-libs/glib-2.19.0 - >=gnome-base/gnome-desktop-2.25.5 - >=x11-libs/pango-1.1.2 - >=x11-libs/gtk+-2.16.0 - >=dev-libs/libxml2-2.4.7 - >=media-libs/libexif-0.5.12 - >=gnome-base/gconf-2.0 - >=gnome-base/gvfs-0.1.2 - dev-libs/libunique - dev-libs/dbus-glib - x11-libs/libXft - x11-libs/libXrender - beagle? ( || ( - dev-libs/libbeagle - =app-misc/beagle-0.2* ) ) - tracker? ( >=app-misc/tracker-0.6.4 ) - xmp? ( >=media-libs/exempi-2 )" - -DEPEND="${RDEPEND} - >=dev-lang/perl-5 - sys-devel/gettext - >=dev-util/pkgconfig-0.9 - >=dev-util/intltool-0.40.1 - doc? ( >=dev-util/gtk-doc-1.4 ) - gnome-base/gnome-common - dev-util/gtk-doc-am" - -PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )" - -DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO" - -pkg_setup() { - G2CONF="${G2CONF} - --disable-update-mimedb - --disable-packagekit - $(use_enable beagle) - $(use_enable tracker) - $(use_enable xmp)" -} - -src_prepare() { - gnome2_src_prepare - - # FIXME: tarball generated with broken gtk-doc, revisit me. - if use doc; then - sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \ - -i gtk-doc.make || die "sed 1 failed" - else - sed "/^TARGET_DIR/i \GTKDOC_REBASE=/bin/true" \ - -i gtk-doc.make || die "sed 2 failed" - fi - - # gtk-doc-am and gnome-common needed for this - - # Fix intltoolize broken file, see upstream #577133 - sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed" -} - -src_test() { - addwrite "/root/.gnome2_private" - unset SESSION_MANAGER - Xemake check || die "Test phase failed" -} - -pkg_postinst() { - gnome2_pkg_postinst - - elog "nautilus can use gstreamer to preview audio files. Just make sure" - elog "to have the necessary plugins available to play the media type you" - elog "want to preview" -} -- cgit v1.2.3-65-gdbad