public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-shell-extensions/files/, gnome-extra/gnome-shell-extensions/
@ 2015-12-26 15:28 Pacho Ramos
  0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2015-12-26 15:28 UTC (permalink / raw
  To: gentoo-commits

commit:     a516d1388b6ac81daac0efdb6277c038eefe3aac
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 26 14:53:36 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Dec 26 15:28:41 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a516d138

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

 ...-shell-extensions-3.18.2-revert-encodings.patch | 35 +++++++++
 .../gnome-shell-extensions-3.18.2-r1.ebuild        | 85 ++++++++++++++++++++++
 2 files changed, 120 insertions(+)

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 0000000..8764998
--- /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 0000000..720f548
--- /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
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-shell-extensions/files/, gnome-extra/gnome-shell-extensions/
@ 2016-01-10 18:30 Pacho Ramos
  0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2016-01-10 18:30 UTC (permalink / raw
  To: gentoo-commits

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?= <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
-

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?= <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/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?= <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
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="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
-}

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="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
-}

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="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] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-shell-extensions/files/, gnome-extra/gnome-shell-extensions/
@ 2019-09-06 21:47 Mart Raudsepp
  0 siblings, 0 replies; 6+ messages in thread
From: Mart Raudsepp @ 2019-09-06 21:47 UTC (permalink / raw
  To: gentoo-commits

commit:     c35fff67a4199bfb6792a4d0a1a8d569ce5e86ae
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  6 21:19:44 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Sep  6 21:44:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c35fff67

gnome-extra/gnome-shell-extensions: bump to 3.32.1

Package-Manager: Portage-2.3.69, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 gnome-extra/gnome-shell-extensions/Manifest        |  1 +
 .../files/3.32.1-leak-fix.patch                    | 36 ++++++++++
 .../gnome-shell-extensions-3.32.1.ebuild           | 76 ++++++++++++++++++++++
 3 files changed, 113 insertions(+)

diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index f11ba629020..335b92ff62e 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1 +1,2 @@
 DIST gnome-shell-extensions-3.30.1.tar.xz 198652 BLAKE2B d65ae90f6acf607aa1fe2eacfdcd22800b2dfcfee71240b600dd8a2e9e0320ed972a434a68a7020eafcfa6a0eec84572dc9f80258dc96fc205978882fe0c85c8 SHA512 492d99bac6345cc0c9e1a8a067859d2ff6d7b1b620277cac43429573e2e952af1a2ad3d94cc2fb5db3978fd15226c7f2231eb4d11fbcf1da39fe07afd58ee7b3
+DIST gnome-shell-extensions-3.32.1.tar.xz 198320 BLAKE2B 416f77ea37431f8b806b8373f9a18091374f4b40b734375edfff2f673af50c073c3e3091e2b9b4be4241ebfa647b7f44b0f0f6e69460876feb7f90901e499a29 SHA512 e587a17eace87e05211bd4a0b8101a731054c99ba708051f6549c5e19974ccfeff75b0802d190d327f5ee8b4595c20e747d492f82c86aa76e0fc1cf3d20f0e4e

diff --git a/gnome-extra/gnome-shell-extensions/files/3.32.1-leak-fix.patch b/gnome-extra/gnome-shell-extensions/files/3.32.1-leak-fix.patch
new file mode 100644
index 00000000000..6166b67acd6
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/files/3.32.1-leak-fix.patch
@@ -0,0 +1,36 @@
+From 13372e7e121209aa329b9784432dff8673b01d3f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Thu, 27 Jun 2019 01:57:53 +0000
+Subject: [PATCH] apps-menu: Add missing chain-up
+
+PanelMenu.Button is a bit weird in that it also "contains" its parent
+actor. That container is supposed to be destroyed with the button, but
+as we currently don't chain up to the parent class' _onDestroy(), we
+leave behind an empty container every time the extension is disabled.
+
+Fix this by adding the missing chain-up.
+
+https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/75
+
+
+(cherry picked from commit dfeb99fc0a37051c33980b97a86c16f2ccdfa2bc)
+---
+ extensions/apps-menu/extension.js | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js
+index d7ba570..c657a7e 100644
+--- a/extensions/apps-menu/extension.js
++++ b/extensions/apps-menu/extension.js
+@@ -459,6 +459,8 @@ class ApplicationsButton extends PanelMenu.Button {
+     }
+ 
+     _onDestroy() {
++        super._onDestroy();
++
+         Main.overview.disconnect(this._showingId);
+         Main.overview.disconnect(this._hidingId);
+         appSys.disconnect(this._installedChangedId);
+-- 
+2.20.1
+

diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.32.1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.32.1.ebuild
new file mode 100644
index 00000000000..876b7d4873d
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.32.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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"
+IUSE="test"
+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.32
+	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]
+"
+DEPEND="${COMMON_DEPEND}
+	dev-lang/sassc
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( dev-lang/spidermonkey:60 )
+"
+
+RESTRICT="!test? ( test )"
+
+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}-leak-fix.patch # tiny leak fix on extension disable from origin/gnome-3-32
+)
+
+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] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-shell-extensions/files/, gnome-extra/gnome-shell-extensions/
@ 2021-05-10  0:52 Matt Turner
  0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2021-05-10  0:52 UTC (permalink / raw
  To: gentoo-commits

commit:     35e3514030b905e16a44074ea4aee6a8e7fef30c
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon May 10 00:52:12 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon May 10 00:52:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35e35140

gnome-extra/gnome-shell-extensions: Add patch to fix compatibility

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 ...owsNavigator-Adjust-to-gnome-shell-change.patch | 43 ++++++++++++++++++++++
 ...build => gnome-shell-extensions-40.0-r1.ebuild} |  4 ++
 2 files changed, 47 insertions(+)

diff --git a/gnome-extra/gnome-shell-extensions/files/40.0-windowsNavigator-Adjust-to-gnome-shell-change.patch b/gnome-extra/gnome-shell-extensions/files/40.0-windowsNavigator-Adjust-to-gnome-shell-change.patch
new file mode 100644
index 00000000000..9e335b781aa
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/files/40.0-windowsNavigator-Adjust-to-gnome-shell-change.patch
@@ -0,0 +1,43 @@
+From e094dead91389c4a5f602e5bef2747ad5e73e8bd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Thu, 8 Apr 2021 16:38:40 +0200
+Subject: [PATCH] windowsNavigator: Adjust to gnome-shell change
+
+Parts of WindowPreview were moved to C for performance reasons, which
+turned a formerly private JS property into a GObject property.
+
+https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/issues/302
+
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/170>
+---
+ extensions/windowsNavigator/extension.js | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/extensions/windowsNavigator/extension.js b/extensions/windowsNavigator/extension.js
+index 0ea9645..bb72d7b 100644
+--- a/extensions/windowsNavigator/extension.js
++++ b/extensions/windowsNavigator/extension.js
+@@ -84,17 +84,17 @@ class MyWorkspace extends Workspace.Workspace {
+             });
+ 
+             this._text.add_constraint(new Clutter.BindConstraint({
+-                source: this._windowContainer,
++                source: this.windowContainer,
+                 coordinate: Clutter.BindCoordinate.POSITION,
+             }));
+             this._text.add_constraint(new Clutter.AlignConstraint({
+-                source: this._windowContainer,
++                source: this.windowContainer,
+                 align_axis: Clutter.AlignAxis.X_AXIS,
+                 pivot_point: new Graphene.Point({ x: 0.5, y: -1 }),
+                 factor: this._closeButtonSide === St.Side.LEFT ? 1 : 0,
+             }));
+             this._text.add_constraint(new Clutter.AlignConstraint({
+-                source: this._windowContainer,
++                source: this.windowContainer,
+                 align_axis: Clutter.AlignAxis.Y_AXIS,
+                 pivot_point: new Graphene.Point({ x: -1, y: 0.5 }),
+                 factor: 0,
+-- 
+2.26.3
+

diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.0.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.0-r1.ebuild
similarity index 95%
rename from gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.0.ebuild
rename to gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.0-r1.ebuild
index 3c33ad2de50..1d9b5892655 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.0.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.0-r1.ebuild
@@ -35,6 +35,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-windowsNavigator-Adjust-to-gnome-shell-change.patch
+)
+
 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


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-shell-extensions/files/, gnome-extra/gnome-shell-extensions/
@ 2021-07-16  8:17 Pacho Ramos
  0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2021-07-16  8:17 UTC (permalink / raw
  To: gentoo-commits

commit:     a8ed912e69534cfc85801b6188bfecbb2ad29f4a
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 16 08:01:21 2021 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Jul 16 08:01:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8ed912e

gnome-extra/gnome-shell-extensions: Fix drive-menu hiding

Apply upstream fixes to properly hide remote filesystems

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 .../files/40.3-drive-menu-hide-items.patch         | 43 +++++++++++++
 .../40.3-drive-menu-indicator-visibility.patch     | 32 ++++++++++
 .../gnome-shell-extensions-40.3-r1.ebuild          | 72 ++++++++++++++++++++++
 3 files changed, 147 insertions(+)

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
new file mode 100644
index 00000000000..c69dd5fd357
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/files/40.3-drive-menu-hide-items.patch
@@ -0,0 +1,43 @@
+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
new file mode 100644
index 00000000000..f76335d4596
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/files/40.3-drive-menu-indicator-visibility.patch
@@ -0,0 +1,32 @@
+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
new file mode 100644
index 00000000000..f879892a324
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.3-r1.ebuild
@@ -0,0 +1,72 @@
+# 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] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-shell-extensions/files/, gnome-extra/gnome-shell-extensions/
@ 2022-02-03  9:05 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-02-03  9:05 UTC (permalink / raw
  To: gentoo-commits

commit:     7630b95d0d2d9d9d825d39081b282cd6c280bfa2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  3 09:00:32 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb  3 09:00:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7630b95d

gnome-extra/gnome-shell-extensions: fix build with meson 0.61

Closes: https://bugs.gentoo.org/831938
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/gnome-shell-extensions-41.1-meson-0.61.patch       | 12 ++++++++++++
 .../gnome-shell-extensions-41.1.ebuild                       |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-41.1-meson-0.61.patch b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-41.1-meson-0.61.patch
new file mode 100644
index 000000000000..692f828ecd7f
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-41.1-meson-0.61.patch
@@ -0,0 +1,12 @@
+Rebased version of https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/commit/cdaa837d48894737ca0b4e7d2dfb365119e53759
+https://bugs.gentoo.org/831938
+
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,5 +1,5 @@
+ session_desktop = 'gnome-classic.desktop'
+-i18n.merge_file('',
++i18n.merge_file(
+   input:  session_desktop + '.in',
+   output: session_desktop,
+   po_dir: '../po',

diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.1.ebuild
index aea37b082f55..286bd9385b2d 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.1.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.1.ebuild
@@ -46,6 +46,10 @@ https://extensions.gnome.org/ web interface, or modify the
 org.gnome.shell enabled-extensions gsettings key from the command
 line or a script."
 
+PATCHES=(
+	"${FILESDIR}"/${P}-meson-0.61.patch
+)
+
 src_configure() {
 	meson_src_configure \
 		-Dextension_set=all \


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-02-03  9:05 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-16  8:17 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-shell-extensions/files/, gnome-extra/gnome-shell-extensions/ Pacho Ramos
  -- strict thread matches above, loose matches on Subject: below --
2022-02-03  9:05 Sam James
2021-05-10  0:52 Matt Turner
2019-09-06 21:47 Mart Raudsepp
2016-01-10 18:30 Pacho Ramos
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