diff options
author | Pacho Ramos <pacho@gentoo.org> | 2015-12-26 15:53:36 +0100 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2015-12-26 16:28:41 +0100 |
commit | a516d1388b6ac81daac0efdb6277c038eefe3aac (patch) | |
tree | 2dc3976d473fe445ae00526ea8180a26ef0300b7 /gnome-extra/gnome-shell-extensions | |
parent | gnome-base/gnome-menus: Upstream patch for handling of multiple desktops in X... (diff) | |
download | gentoo-a516d1388b6ac81daac0efdb6277c038eefe3aac.tar.gz gentoo-a516d1388b6ac81daac0efdb6277c038eefe3aac.tar.bz2 gentoo-a516d1388b6ac81daac0efdb6277c038eefe3aac.zip |
gnome-extra/gnome-shell-extensions: Revert upstream commit that causes lots of menu entries to be hidden (#567126 by Juergen Rose)
Package-Manager: portage-2.2.26
Diffstat (limited to 'gnome-extra/gnome-shell-extensions')
-rw-r--r-- | gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.18.2-revert-encodings.patch | 35 | ||||
-rw-r--r-- | gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.2-r1.ebuild | 85 |
2 files changed, 120 insertions, 0 deletions
diff --git a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.18.2-revert-encodings.patch b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.18.2-revert-encodings.patch new file mode 100644 index 000000000000..8764998aac61 --- /dev/null +++ b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.18.2-revert-encodings.patch @@ -0,0 +1,35 @@ +From d1bf592539095ed6a1fd5f0f9ff0351e56bfa156 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org> +Date: Fri, 31 Jul 2015 02:14:58 +0200 +Subject: apps-menu: Handle non-UTF8 filename encodings more gracefully + +Instead of failing completely if any .desktop file uses a filename +encoding other than UTF-8, just filter out the offending apps. + +https://bugzilla.gnome.org/show_bug.cgi?id=651503 +--- + extensions/apps-menu/extension.js | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js +index 0c7e6c6..ddd8458 100644 +--- a/extensions/apps-menu/extension.js ++++ b/extensions/apps-menu/extension.js +@@ -393,7 +393,13 @@ const ApplicationsButton = new Lang.Class({ + if (nextType == GMenu.TreeItemType.ENTRY) { + let entry = iter.get_entry(); + let appInfo = entry.get_app_info(); +- let app = appSys.lookup_app(entry.get_desktop_file_id()); ++ let id; ++ try { ++ id = appInfo.get_id(); // catch non-UTF8 filenames ++ } catch(e) { ++ continue; ++ } ++ let app = appSys.lookup_app(id); + if (appInfo.should_show()) { + let menu_id = dir.get_menu_id(); + this.applicationsByCategory[categoryId].push(app); +-- +cgit v0.11.2 + diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.2-r1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.2-r1.ebuild new file mode 100644 index 000000000000..720f5480ba78 --- /dev/null +++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.2-r1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GCONF_DEBUG="no" + +inherit eutils gnome2 readme.gentoo + +DESCRIPTION="JavaScript extensions for GNOME Shell" +HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions" + +LICENSE="GPL-2" +SLOT="0" +IUSE="examples" +KEYWORDS="~amd64 ~x86" + +COMMON_DEPEND=" + >=dev-libs/glib-2.26:2 + >=gnome-base/libgtop-2.28.3[introspection] + >=app-eselect/eselect-gnome-shell-extensions-20111211 +" +RDEPEND="${COMMON_DEPEND} + >=dev-libs/gjs-1.29 + dev-libs/gobject-introspection:= + dev-libs/atk[introspection] + gnome-base/gnome-menus:3[introspection] + >=gnome-base/gnome-shell-3.14.2 + media-libs/clutter:1.0[introspection] + net-libs/telepathy-glib[introspection] + x11-libs/gdk-pixbuf:2[introspection] + x11-libs/gtk+:3[introspection] + x11-libs/pango[introspection] + x11-themes/gnome-icon-theme-symbolic +" +DEPEND="${COMMON_DEPEND} + >=dev-util/intltool-0.50 + sys-devel/gettext + virtual/pkgconfig +" +# eautoreconf needs gnome-base/gnome-common + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS="Installed extensions installed are initially disabled by default. +To change the system default and enable some extensions, you can use +# eselect gnome-shell-extensions + +Alternatively, to enable/disable extensions on a per-user basis, +you can use the https://extensions.gnome.org/ web interface, the +gnome-extra/gnome-tweak-tool GUI, or modify the org.gnome.shell +enabled-extensions gsettings key from the command line or a script." + +src_prepare() { + # Revert commit because of https://bugs.gentoo.org/show_bug.cgi?id=567126 + epatch -R "${FILESDIR}"/${PN}-3.18.2-revert-encodings.patch + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure --enable-extensions=all +} + +src_install() { + gnome2_src_install + + local example="example@gnome-shell-extensions.gcampax.github.com" + if use examples; then + mv "${ED}usr/share/gnome-shell/extensions/${example}" \ + "${ED}usr/share/doc/${PF}/" || die + else + rm -r "${ED}usr/share/gnome-shell/extensions/${example}" || die + fi + + readme.gentoo_create_doc +} + +pkg_postinst() { + gnome2_pkg_postinst + + ebegin "Updating list of installed extensions" + eselect gnome-shell-extensions update + eend $? + + readme.gentoo_print_elog +} |