* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-shell-extensions/, gnome-extra/gnome-shell-extensions/files/
@ 2015-12-26 15:28 Pacho Ramos
0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2015-12-26 15:28 UTC (permalink / raw
To: gentoo-commits
commit: 2fdec44028f9ca59ffb10018be9b0b6af79d3ceb
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 26 15:28:17 2015 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Dec 26 15:28:50 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fdec440
gnome-extra/gnome-shell-extensions: Upstream finally solved the bug with missing entries, use the patches from 'master' then
Package-Manager: portage-2.2.26
| 29 ++++++++
| 44 +++++++++++
.../gnome-shell-extensions-3.18.2-r2.ebuild | 86 ++++++++++++++++++++++
3 files changed, 159 insertions(+)
--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
new file mode 100644
index 0000000..5c8ca71
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.18.2-apps-menu.patch
@@ -0,0 +1,29 @@
+From 1958ce779467f03672e8d72afa45e2ab14bee5f5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+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
+
--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
new file mode 100644
index 0000000..31dbaf2
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.18.2-apps-menu2.patch
@@ -0,0 +1,44 @@
+From 79c76a87e29e5ca70e74f3d62857c341a4ecae6c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+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/gnome-shell-extensions-3.18.2-r2.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.2-r2.ebuild
new file mode 100644
index 0000000..5601a69
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.2-r2.ebuild
@@ -0,0 +1,86 @@
+# 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="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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-shell-extensions/, gnome-extra/gnome-shell-extensions/files/
@ 2021-12-14 17:07 Mart Raudsepp
0 siblings, 0 replies; 2+ messages in thread
From: Mart Raudsepp @ 2021-12-14 17:07 UTC (permalink / raw
To: gentoo-commits
commit: 86b43f865937de29a36c3d6b2a8cebc8d773d707
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 13 22:52:22 2021 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Dec 14 17:03:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86b43f86
gnome-extra/gnome-shell-extensions: remove old
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
| 1 -
| 43 -------------
| 32 ----------
.../gnome-shell-extensions-40.3-r1.ebuild | 72 ----------------------
4 files changed, 148 deletions(-)
--git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index 47f82a826ef4..9dc8b9fe8530 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,4 +1,3 @@
-DIST gnome-shell-extensions-40.3.tar.xz 218108 BLAKE2B 33174ef4c80caf375d48f11b7678ec78bfbe60a9d4456e21856b09a0a83e99ee7b68598c719a6913a29d9686317015fbc8d8bfae856e433414889e59e82e5ca3 SHA512 3773b0a5ec81b6663a3b2c5f5d1f8e7619fdba49ce67b25ee0f5555d17ea7c9740c3698b7a4e4f7fa78241c8738663c602cb5ed1ff9874b8ad2321fec0dbc737
DIST gnome-shell-extensions-40.4.tar.xz 218088 BLAKE2B f992c98fa5ceec84c774881468e0c9736d24f1834b9d6976f7cddc2dce455393fad0ad055c1e02b308135914029874c4d87d3a09733a7b4686308e9052cef21a SHA512 79f087c9fbc7764241751441190819b3e768530257ffe3a7b39b1004f8997de9c8ea381338ec0544a39b8cc6866137d315e56f3f058c9b66a9ed566ec40712ef
DIST gnome-shell-extensions-41.0.tar.xz 219664 BLAKE2B 1d73d9f1255f93740d2effad48420b2992872b89df12e0baaf99c3344c356de5f92f76300c30cac32230c7a97a4a9ce6bb74308078fb6844fa3051f24594eaf7 SHA512 4332821044029020404c0ed5d040b7d5e5548a67447517424a54ed4c586bad3461ab1e25f0dcb37c24ea2a1496d1cbf2b95f24de0eda79f0c6921b6b1f085f83
DIST gnome-shell-extensions-41.1.tar.xz 219848 BLAKE2B 31da29fa8f804b1568677a9a875ac6efcb1906588f239a34c360d5dcc1947d4c99200dc1b63ca6d17b257ccc5c22d6eed9401fba625eda1bded57aac0d83c22f SHA512 2cbcd1ff384254545645cf4cd6a6f887e4fb42088bcff3fbb4179fd3400f1eb62ebeb87ccb25cd327bdb01060d1994c5dec1c26103bc968366ac521f7eaa8cde
diff --git a/gnome-extra/gnome-shell-extensions/files/40.3-drive-menu-hide-items.patch b/gnome-extra/gnome-shell-extensions/files/40.3-drive-menu-hide-items.patch
deleted file mode 100644
index c69dd5fd3577..000000000000
--- a/gnome-extra/gnome-shell-extensions/files/40.3-drive-menu-hide-items.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From d421bbfa609426032f07f27934eefb214d59012f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Tue, 13 Jul 2021 11:54:21 +0200
-Subject: [PATCH] drive-menu: Hide items initially
-
-Now that the check for network mounts is non-blocking, the initial
-sync doesn't take effect immediately. We don't want hidden items
-to briefly flash the indicator, so create them initially hidden.
-
-Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/176>
----
- extensions/drive-menu/extension.js | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/extensions/drive-menu/extension.js b/extensions/drive-menu/extension.js
-index 6c6fd76..f60dab7 100644
---- a/extensions/drive-menu/extension.js
-+++ b/extensions/drive-menu/extension.js
-@@ -41,6 +41,8 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
- ejectButton.connect('clicked', this._eject.bind(this));
- this.add(ejectButton);
-
-+ this.hide();
-+
- this._changedId = mount.connect('changed', this._syncVisibility.bind(this));
- this._syncVisibility();
- }
-@@ -155,10 +157,8 @@ class DriveMenu extends PanelMenu.Button {
- this.add_child(icon);
-
- this._monitor = Gio.VolumeMonitor.get();
-- this._addedId = this._monitor.connect('mount-added', (monitor, mount) => {
-- this._addMount(mount);
-- this._updateMenuVisibility();
-- });
-+ this._addedId = this._monitor.connect('mount-added',
-+ (monitor, mount) => this._addMount(mount));
- this._removedId = this._monitor.connect('mount-removed', (monitor, mount) => {
- this._removeMount(mount);
- this._updateMenuVisibility();
---
-GitLab
-
diff --git a/gnome-extra/gnome-shell-extensions/files/40.3-drive-menu-indicator-visibility.patch b/gnome-extra/gnome-shell-extensions/files/40.3-drive-menu-indicator-visibility.patch
deleted file mode 100644
index f76335d4596e..000000000000
--- a/gnome-extra/gnome-shell-extensions/files/40.3-drive-menu-indicator-visibility.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3539ce113907ffda813e1a990891b0911c9702ef Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Tue, 13 Jul 2021 11:40:31 +0200
-Subject: [PATCH] drive-menu: Fix indicator visibility
-
-Commit 519269be9d made the check for network mounts non-blocking, and
-we now update the indicator's visibility before a newly-added network
-mount is hidden.
-
-Address this by monitoring the item itself for visibility changes.
-
-Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/176>
----
- extensions/drive-menu/extension.js | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/extensions/drive-menu/extension.js b/extensions/drive-menu/extension.js
-index 3fac236..6c6fd76 100644
---- a/extensions/drive-menu/extension.js
-+++ b/extensions/drive-menu/extension.js
-@@ -189,6 +189,8 @@ class DriveMenu extends PanelMenu.Button {
- let item = new MountMenuItem(mount);
- this._mounts.unshift(item);
- this.menu.addMenuItem(item, 0);
-+
-+ item.connect('notify::visible', () => this._updateMenuVisibility());
- }
-
- _removeMount(mount) {
---
-GitLab
-
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.3-r1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.3-r1.ebuild
deleted file mode 100644
index 114c39cad749..000000000000
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.3-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org readme.gentoo-r1 meson xdg
-
-DESCRIPTION="JavaScript extensions for GNOME Shell"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-DEPEND="
- >=dev-libs/glib-2.26:2
- >=gnome-base/libgtop-2.28.3[introspection]
- >=app-eselect/eselect-gnome-shell-extensions-20111211
-"
-RDEPEND="${DEPEND}
- >=dev-libs/gjs-1.29
- dev-libs/gobject-introspection:=
- dev-libs/atk[introspection]
- gnome-base/gnome-menus:3[introspection]
- =gnome-base/gnome-shell-$(ver_cut 1-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/adwaita-icon-theme
- >=x11-wm/mutter-3.32[introspection]
-"
-BDEPEND="
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-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-tweaks GUI, or modify the org.gnome.shell
-enabled-extensions gsettings key from the command line or a script."
-
-PATCHES=(
- "${FILESDIR}/${PV}-drive-menu-indicator-visibility.patch"
- "${FILESDIR}/${PV}-drive-menu-hide-items.patch"
-)
-
-src_configure() {
- meson_src_configure \
- -Dextension_set=all \
- -Dclassic_mode=true
-}
-
-src_install() {
- meson_src_install
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- ebegin "Updating list of installed extensions"
- eselect gnome-shell-extensions update
- eend $?
-
- readme.gentoo_print_elog
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-12-14 17:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-14 17:07 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-shell-extensions/, gnome-extra/gnome-shell-extensions/files/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2015-12-26 15:28 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox