1 |
commit: a516d1388b6ac81daac0efdb6277c038eefe3aac |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 26 14:53:36 2015 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 26 15:28:41 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a516d138 |
7 |
|
8 |
gnome-extra/gnome-shell-extensions: Revert upstream commit that causes lots of menu entries to be hidden (#567126 by Juergen Rose) |
9 |
|
10 |
Package-Manager: portage-2.2.26 |
11 |
|
12 |
...-shell-extensions-3.18.2-revert-encodings.patch | 35 +++++++++ |
13 |
.../gnome-shell-extensions-3.18.2-r1.ebuild | 85 ++++++++++++++++++++++ |
14 |
2 files changed, 120 insertions(+) |
15 |
|
16 |
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 |
17 |
new file mode 100644 |
18 |
index 0000000..8764998 |
19 |
--- /dev/null |
20 |
+++ b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.18.2-revert-encodings.patch |
21 |
@@ -0,0 +1,35 @@ |
22 |
+From d1bf592539095ed6a1fd5f0f9ff0351e56bfa156 Mon Sep 17 00:00:00 2001 |
23 |
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@×××××.org> |
24 |
+Date: Fri, 31 Jul 2015 02:14:58 +0200 |
25 |
+Subject: apps-menu: Handle non-UTF8 filename encodings more gracefully |
26 |
+ |
27 |
+Instead of failing completely if any .desktop file uses a filename |
28 |
+encoding other than UTF-8, just filter out the offending apps. |
29 |
+ |
30 |
+https://bugzilla.gnome.org/show_bug.cgi?id=651503 |
31 |
+--- |
32 |
+ extensions/apps-menu/extension.js | 8 +++++++- |
33 |
+ 1 file changed, 7 insertions(+), 1 deletion(-) |
34 |
+ |
35 |
+diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js |
36 |
+index 0c7e6c6..ddd8458 100644 |
37 |
+--- a/extensions/apps-menu/extension.js |
38 |
++++ b/extensions/apps-menu/extension.js |
39 |
+@@ -393,7 +393,13 @@ const ApplicationsButton = new Lang.Class({ |
40 |
+ if (nextType == GMenu.TreeItemType.ENTRY) { |
41 |
+ let entry = iter.get_entry(); |
42 |
+ let appInfo = entry.get_app_info(); |
43 |
+- let app = appSys.lookup_app(entry.get_desktop_file_id()); |
44 |
++ let id; |
45 |
++ try { |
46 |
++ id = appInfo.get_id(); // catch non-UTF8 filenames |
47 |
++ } catch(e) { |
48 |
++ continue; |
49 |
++ } |
50 |
++ let app = appSys.lookup_app(id); |
51 |
+ if (appInfo.should_show()) { |
52 |
+ let menu_id = dir.get_menu_id(); |
53 |
+ this.applicationsByCategory[categoryId].push(app); |
54 |
+-- |
55 |
+cgit v0.11.2 |
56 |
+ |
57 |
|
58 |
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 |
59 |
new file mode 100644 |
60 |
index 0000000..720f548 |
61 |
--- /dev/null |
62 |
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.2-r1.ebuild |
63 |
@@ -0,0 +1,85 @@ |
64 |
+# Copyright 1999-2015 Gentoo Foundation |
65 |
+# Distributed under the terms of the GNU General Public License v2 |
66 |
+# $Id$ |
67 |
+ |
68 |
+EAPI="5" |
69 |
+GCONF_DEBUG="no" |
70 |
+ |
71 |
+inherit eutils gnome2 readme.gentoo |
72 |
+ |
73 |
+DESCRIPTION="JavaScript extensions for GNOME Shell" |
74 |
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions" |
75 |
+ |
76 |
+LICENSE="GPL-2" |
77 |
+SLOT="0" |
78 |
+IUSE="examples" |
79 |
+KEYWORDS="~amd64 ~x86" |
80 |
+ |
81 |
+COMMON_DEPEND=" |
82 |
+ >=dev-libs/glib-2.26:2 |
83 |
+ >=gnome-base/libgtop-2.28.3[introspection] |
84 |
+ >=app-eselect/eselect-gnome-shell-extensions-20111211 |
85 |
+" |
86 |
+RDEPEND="${COMMON_DEPEND} |
87 |
+ >=dev-libs/gjs-1.29 |
88 |
+ dev-libs/gobject-introspection:= |
89 |
+ dev-libs/atk[introspection] |
90 |
+ gnome-base/gnome-menus:3[introspection] |
91 |
+ >=gnome-base/gnome-shell-3.14.2 |
92 |
+ media-libs/clutter:1.0[introspection] |
93 |
+ net-libs/telepathy-glib[introspection] |
94 |
+ x11-libs/gdk-pixbuf:2[introspection] |
95 |
+ x11-libs/gtk+:3[introspection] |
96 |
+ x11-libs/pango[introspection] |
97 |
+ x11-themes/gnome-icon-theme-symbolic |
98 |
+" |
99 |
+DEPEND="${COMMON_DEPEND} |
100 |
+ >=dev-util/intltool-0.50 |
101 |
+ sys-devel/gettext |
102 |
+ virtual/pkgconfig |
103 |
+" |
104 |
+# eautoreconf needs gnome-base/gnome-common |
105 |
+ |
106 |
+DISABLE_AUTOFORMATTING="yes" |
107 |
+DOC_CONTENTS="Installed extensions installed are initially disabled by default. |
108 |
+To change the system default and enable some extensions, you can use |
109 |
+# eselect gnome-shell-extensions |
110 |
+ |
111 |
+Alternatively, to enable/disable extensions on a per-user basis, |
112 |
+you can use the https://extensions.gnome.org/ web interface, the |
113 |
+gnome-extra/gnome-tweak-tool GUI, or modify the org.gnome.shell |
114 |
+enabled-extensions gsettings key from the command line or a script." |
115 |
+ |
116 |
+src_prepare() { |
117 |
+ # Revert commit because of https://bugs.gentoo.org/show_bug.cgi?id=567126 |
118 |
+ epatch -R "${FILESDIR}"/${PN}-3.18.2-revert-encodings.patch |
119 |
+ gnome2_src_prepare |
120 |
+} |
121 |
+ |
122 |
+src_configure() { |
123 |
+ gnome2_src_configure --enable-extensions=all |
124 |
+} |
125 |
+ |
126 |
+src_install() { |
127 |
+ gnome2_src_install |
128 |
+ |
129 |
+ local example="example@×××××××××××××××××××××××××××××××××××××.com" |
130 |
+ if use examples; then |
131 |
+ mv "${ED}usr/share/gnome-shell/extensions/${example}" \ |
132 |
+ "${ED}usr/share/doc/${PF}/" || die |
133 |
+ else |
134 |
+ rm -r "${ED}usr/share/gnome-shell/extensions/${example}" || die |
135 |
+ fi |
136 |
+ |
137 |
+ readme.gentoo_create_doc |
138 |
+} |
139 |
+ |
140 |
+pkg_postinst() { |
141 |
+ gnome2_pkg_postinst |
142 |
+ |
143 |
+ ebegin "Updating list of installed extensions" |
144 |
+ eselect gnome-shell-extensions update |
145 |
+ eend $? |
146 |
+ |
147 |
+ readme.gentoo_print_elog |
148 |
+} |