commit: 73a3251a56739878beb43510f2b26e360ea244cc Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Sun Jan 10 18:08:13 2016 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sun Jan 10 18:08:13 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73a3251a
gnome-extra/gnome-shell-extensions: Drop old Package-Manager: portage-2.2.26 gnome-extra/gnome-shell-extensions/Manifest | 1 - .../gnome-shell-extensions-3.18.2-apps-menu.patch | 29 -------- .../gnome-shell-extensions-3.18.2-apps-menu2.patch | 44 ----------- ...-shell-extensions-3.18.2-revert-encodings.patch | 35 --------- .../gnome-shell-extensions-3.18.2-r1.ebuild | 86 ---------------------- .../gnome-shell-extensions-3.18.2-r2.ebuild | 86 ---------------------- .../gnome-shell-extensions-3.18.2.ebuild | 79 -------------------- 7 files changed, 360 deletions(-) diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest index ad9403b..3edc00a 100644 --- a/gnome-extra/gnome-shell-extensions/Manifest +++ b/gnome-extra/gnome-shell-extensions/Manifest @@ -1,3 +1,2 @@ DIST gnome-shell-extensions-3.16.2.tar.xz 231292 SHA256 0dca1677ec9401dd7c1a7261164b7f4cc94d52207637cf9e8e350bb9f6d0e9bf SHA512 f7f2bd9fe0ea2e9e14b7163c30fcf2cd93698f43de6ebc4daf3a655293db438c24d12972ceda2bf95def5ed15891c9f347c8bca404357e1e0ad131ab00cf50dd WHIRLPOOL 216d35ec3a200e9c3ed67ff0912b844394b12e764a1170beaf21162feeec7b7bb4cc1ddfe9efcd3ddff9bd4fc4224ff408bdeaf262b700323507fff08fa47a31 -DIST gnome-shell-extensions-3.18.2.tar.xz 233440 SHA256 cc514ffc896ed8c04853a89cb8e97058f9d5518313becf7c92aea5210b8adf61 SHA512 c24438495f8d79d21684b9c2d0d1eb753ed8d9ca99da34d6eb07007fe599aedfb1e0c54f55bddb9a76aa4eebfe7ee9017fdf4bcd97394a64eb68c68257ba7a2d WHIRLPOOL 544a70e24060c9601d465df53ce12ca0a0dadad95b351a59b38d3192628861b83f073aceb2ca1b6b669ca4f803aa6cc9dd5bab8988413cad05a381e783d4916c DIST gnome-shell-extensions-3.18.3.tar.xz 233480 SHA256 2bb3726decf14a31ae35755c049d8f03425231857c42ed27f01854af755ec035 SHA512 186ec469187b53a4eea0a5f29555265a2080c85405c83af8d10dd6be21f41c260e276f0c7579af48cb6cec86fc8deab6e44cf3861dcc24beb3efc5a44d7f3fa7 WHIRLPOOL 6be33c7bea752079d8c991ed716bd2323ee87fdc66811c45d757cd20cab4e133f61036226018439bd719fdf46f457fac0b53ab24d205c321b215ab1ae88c188b diff --git a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.18.2-apps-menu.patch b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.18.2-apps-menu.patch deleted file mode 100644 index 5c8ca71..0000000 --- a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.18.2-apps-menu.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1958ce779467f03672e8d72afa45e2ab14bee5f5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= <[email protected]> -Date: Wed, 16 Dec 2015 22:32:59 +0100 -Subject: apps-menu: Remove unused variable - -https://bugzilla.gnome.org/show_bug.cgi?id=759004 ---- - extensions/apps-menu/extension.js | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js -index 3180f3a..925d344 100644 ---- a/extensions/apps-menu/extension.js -+++ b/extensions/apps-menu/extension.js -@@ -405,10 +405,8 @@ const ApplicationsButton = new Lang.Class({ - continue; - } - let app = appSys.lookup_app(id); -- if (appInfo.should_show()) { -- let menu_id = dir.get_menu_id(); -+ if (appInfo.should_show()) - this.applicationsByCategory[categoryId].push(app); -- } - } else if (nextType == GMenu.TreeItemType.DIRECTORY) { - let subdir = iter.get_directory(); - if (!subdir.get_is_nodisplay()) --- -cgit v0.11.2 - diff --git a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.18.2-apps-menu2.patch b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.18.2-apps-menu2.patch deleted file mode 100644 index 31dbaf2..0000000 --- a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.18.2-apps-menu2.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 79c76a87e29e5ca70e74f3d62857c341a4ecae6c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= <[email protected]> -Date: Wed, 16 Dec 2015 18:46:42 +0100 -Subject: apps-menu: Fix .desktop entries in subdirectories - -GMenu's TreeEntries return an AppInfo that is created from the -.desktop filename, not from a desktop ID as expected by the -AppSystem. As a result, g_app_info_get_id() will simply return -the file's basename, which only matches the desktop ID if no -prefix-to-subdirectory mapping as described in the menu spec -is involved. -Fix this by basing the app lookup on the entry's desktop ID instead -of the AppInfo. - -https://bugzilla.gnome.org/show_bug.cgi?id=759004 ---- - extensions/apps-menu/extension.js | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js -index 925d344..796d235 100644 ---- a/extensions/apps-menu/extension.js -+++ b/extensions/apps-menu/extension.js -@@ -397,15 +397,14 @@ const ApplicationsButton = new Lang.Class({ - while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) { - if (nextType == GMenu.TreeItemType.ENTRY) { - let entry = iter.get_entry(); -- let appInfo = entry.get_app_info(); - let id; - try { -- id = appInfo.get_id(); // catch non-UTF8 filenames -+ id = entry.get_desktop_file_id(); // catch non-UTF8 filenames - } catch(e) { - continue; - } - let app = appSys.lookup_app(id); -- if (appInfo.should_show()) -+ if (app.get_app_info().should_show()) - this.applicationsByCategory[categoryId].push(app); - } else if (nextType == GMenu.TreeItemType.DIRECTORY) { - let subdir = iter.get_directory(); --- -cgit v0.11.2 - 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 deleted file mode 100644 index 8764998..0000000 --- a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.18.2-revert-encodings.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d1bf592539095ed6a1fd5f0f9ff0351e56bfa156 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= <[email protected]> -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 deleted file mode 100644 index 5a13435..0000000 --- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.2-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# 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 - # https://bugzilla.gnome.org/show_bug.cgi?id=759879 - 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="[email protected]" - 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 -} diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.2-r2.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.2-r2.ebuild deleted file mode 100644 index 5601a69..0000000 --- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.2-r2.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" - -inherit 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() { - # Fix https://bugzilla.gnome.org/show_bug.cgi?id=759004 (from - # 'master') - epatch "${FILESDIR}"/${PN}-3.18.2-apps-menu{,2}.patch - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure --enable-extensions=all -} - -src_install() { - gnome2_src_install - - local example="[email protected]" - 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 -} diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.2.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.2.ebuild deleted file mode 100644 index abbf7b8..0000000 --- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.2.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" - -inherit 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_configure() { - gnome2_src_configure --enable-extensions=all -} - -src_install() { - gnome2_src_install - - local example="[email protected]" - 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 -}
