subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: gnome\-base\/gnome\-shell\/, gnome\-base\/gnome\-shell\/files\/"

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2020-07-12 Thread Mart Raudsepp

commit: 11fe8d4fb3c9edab0b962f39bc9a73fb89d55218
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Jul 12 21:00:15 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Jul 12 21:02:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11fe8d4f

gnome-base/gnome-shell: bump to 3.36.4

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 gnome-base/gnome-shell/Manifest  |   1 +
 gnome-base/gnome-shell/files/3.36-defaults.patch |  28 
 gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild | 185 +++
 3 files changed, 214 insertions(+)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 39314cf9595..ee51ba0ed5a 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1 +1,2 @@
 DIST gnome-shell-3.34.5.tar.xz 1558672 BLAKE2B 
7b786a35b6b79a4532d9bbb761ee0629cfb18b8c4c151f5958bb9169cae01ddb489a31c9d1a0cfef3ab6dd1f29c449600c1ad9bb11adbae284e86035bec15234
 SHA512 
ef6a70b0b3bb14fedb07c465742fe0d78c96ddd24352fd0babf871336ee404f9823cadea5bd522e388f5b714d33b219c8ff2badaed379b7135dd90de9fca9bc4
+DIST gnome-shell-3.36.4.tar.xz 1774584 BLAKE2B 
92fe544ae743235c673628f2ad82a75f58eaed94547fc3e0728a492cfee22783cb9d820ac55e1e125bf2ce83dadbddece7222eef9bad0891bfc5a7097ddde4bb
 SHA512 
879b1590d516e7e9e1ad066c870023d59cbaaca13e1e77d8b14de302574b3138451c4b8ab0ba1b43aec3e6e03bd147304e8e0e995359b181522a790afc97d450

diff --git a/gnome-base/gnome-shell/files/3.36-defaults.patch 
b/gnome-base/gnome-shell/files/3.36-defaults.patch
new file mode 100644
index 000..0a4746ac46b
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.36-defaults.patch
@@ -0,0 +1,28 @@
+From 7a671f99b7ef2d5f38be67668aac762764b32a42 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Tue, 10 Dec 2013 23:33:51 +0100
+Subject: [PATCH 1/2] Alter list of default applications
+
+Signed-off-by: Gilles Dartiguelongue 
+[Updated to include desktop file renames to reverse DNS and 3.36 changes]
+Signed-off-by: Mart Raudsepp 
+---
+ data/org.gnome.shell.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.gnome.shell.gschema.xml.in 
b/data/org.gnome.shell.gschema.xml.in
+index c1e6b21..368c654 100644
+--- a/data/org.gnome.shell.gschema.xml.in
 b/data/org.gnome.shell.gschema.xml.in
+@@ -31,7 +31,7 @@
+   
+ 
+ 
+-  [ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 
'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 
'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 
'org.gnome.Software.desktop' ]
++  [ 'chromium-browser-chromium.desktop', 'firefox.desktop', 
'firefox-bin.desktop', 'org.gnome.Evolution.desktop', 
'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 
'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 
'org.gnome.Software.desktop' ]
+   List of desktop file IDs for favorite applications
+   
+ The applications corresponding to these identifiers
+-- 
+2.10.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild
new file mode 100644
index 000..fd3fd1b3ae9
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer support is currently automagic
+DEPEND="
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.57.2:2
+   >=dev-libs/gobject-introspection-1.49.1:=
+   >=dev-libs/gjs-1.63.2
+   >=x11-libs/gtk+-3.15.0:3[introspection]
+   >=x11-wm/mutter-3.36.0:0/6[introspection]
+   >=sys-auth/polkit-0.100[introspection]
+   >=gnome-base/gsettings-desktop-schemas-3.33.1
+   >=x11-libs/startup-notification-0.11
+   >=app-i18n/ibus-1.5.2
+   >=gnome-base/gnome-desktop-3.35.90:3=[introspection]
+   bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+   >=media-libs/gstreamer-0.11.92:1.0
+   media-libs/gst-plugins-base:1.0
+   networkmanager? (
+   >=net-misc/networkmanager-1.10.4:=[introspection]
+   net-libs/libnma[introspection]
+   >=app-crypt/libsecret-0.18
+   dev-libs/dbus-glib )
+   system

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2020-08-13 Thread Mart Raudsepp

commit: 9c4bb6c530c0a64b7e0c776806882026798bc1dc
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Aug 13 20:38:14 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Aug 13 20:38:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c4bb6c5

gnome-base/gnome-shell: backport fix for CVE-2020-17489

Bug: https://bugs.gentoo.org/736802
Package-Manager: Portage-2.3.103, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../gnome-shell/files/3.34.5-CVE-2020-17489.patch  |  47 +
 .../gnome-shell/gnome-shell-3.34.5-r1.ebuild   | 198 +
 2 files changed, 245 insertions(+)

diff --git a/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch 
b/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch
new file mode 100644
index 000..c6ed147c5a2
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch
@@ -0,0 +1,47 @@
+From e7f7da78d4d5a9abae780589810bd012300442e9 Mon Sep 17 00:00:00 2001
+From: Ray Strode 
+Date: Mon, 27 Jul 2020 10:58:49 -0400
+Subject: [PATCH] loginDialog: Reset auth prompt on vt switch before fade in
+
+At the moment, if a user switches to the login screen vt,
+the login screen fades in whatever was on screen prior, and
+then does a reset.
+
+It makes more sense to reset first, so we fade in what the
+user is going to interact with instead of what they interacted
+with before.
+
+Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2997
+(cherry picked from commit 13137aad9db52223e8b62cecbd3456f4a7f66f04)
+---
+ js/gdm/loginDialog.js | 9 -
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
+index c3f90dc58..6b35ebb16 100644
+--- a/js/gdm/loginDialog.js
 b/js/gdm/loginDialog.js
+@@ -920,16 +920,15 @@ var LoginDialog = GObject.registerClass({
+ if (this.opacity == 255 && this._authPrompt.verificationStatus == 
AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
+ return;
+ 
++if (this._authPrompt.verificationStatus !== 
AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
++this._authPrompt.reset();
++
+ this._bindOpacity();
+ this.ease({
+ opacity: 255,
+ duration: _FADE_ANIMATION_TIME,
+ mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+-onComplete: () => {
+-if (this._authPrompt.verificationStatus != 
AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
+-this._authPrompt.reset();
+-this._unbindOpacity();
+-}
++onComplete: () => this._unbindOpacity()
+ });
+ }
+ 
+-- 
+2.20.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild
new file mode 100644
index 000..0aeebc31a62
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org gnome2-utils meson pax-utils python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer support is currently automagic
+DEPEND="
+   >=dev-libs/libcroco-0.6.8:0.6
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.57.2:2
+   >=dev-libs/gobject-introspection-1.49.1:=
+   >=dev-libs/gjs-1.57.3
+   >=x11-libs/gtk+-3.15.0:3[introspection]
+   >=x11-wm/mutter-3.34.0:0/5[introspection]
+   >=sys-auth/polkit-0.100[introspection]
+   >=gnome-base/gsettings-desktop-schemas-3.33.1
+   >=x11-libs/startup-notification-0.11
+   >=app-i18n/ibus-1.5.2
+   >=gnome-base/gnome-desktop-3.32:3=[introspection]
+   bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+   >=media-libs/gstreamer-0.11.92:1.0
+   media-libs/gst-plugins-base:1.0
+   networkmanager? (
+   >=net-misc/networkmanager-1.10.4:=[introspection]
+   net-libs/libnma[introspection]
+   >=app-crypt/libsecret-0.18
+   dev-libs/dbus-glib )
+   systemd? ( >=sys-apps/systemd-31
+   >=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
+   elogind? ( >=sys-auth/elogind-237 )
+   app-arch/gnome-autoar
+   dev-libs/json-glib
+
+   >=app-accessibility/at-spi2-atk-2.5.3
+   x11-libs/gdk-pixbuf:2[introspection]
+   dev-libs/libxml2:2
+   x11-libs/libX11
+
+

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-01-24 Thread Sam James

commit: b7d4f62f083b1e8d0857633c0fd2cf356729d6ca
Author: Christophe Lermytte  lermytte  be>
AuthorDate: Mon Jan 24 22:16:41 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 25 00:49:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7d4f62f

gnome-base/gnome-shell: fix build with meson-0.61

Closes: https://bugs.gentoo.org/831921
Signed-off-by: Christophe Lermytte  lermytte.be>
Signed-off-by: Sam James  gentoo.org>

 .../files/41.3-fix-build-with-meson-0.61.1.patch   | 84 ++
 gnome-base/gnome-shell/gnome-shell-41.3.ebuild |  1 +
 2 files changed, 85 insertions(+)

diff --git 
a/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch 
b/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch
new file mode 100644
index ..ecf212b9794c
--- /dev/null
+++ b/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,84 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/65450a836ee9e0722a2d4c3327f52345eae293c6
+https://bugs.gentoo.org/831921
+
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= 
+Date: Thu, 23 Dec 2021 17:18:16 +0100
+Subject: [PATCH] build: Drop incorrect positional arg
+
+Unlike other targets that take a name, i18n.merge_file() does not.
+
+Part-of: 
+---
+ data/meson.build  | 2 +-
+ src/calendar-server/meson.build   | 2 +-
+ subprojects/extensions-app/data/meson.build   | 2 +-
+ subprojects/extensions-app/data/metainfo/meson.build  | 2 +-
+ subprojects/extensions-tool/src/templates/meson.build | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index f924fdf806..76ae45c93a 100644
+--- a/data/meson.build
 b/data/meson.build
+@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir)
+ desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false')
+ 
+ foreach desktop_file : desktop_files
+-  i18n.merge_file('desktop',
++  i18n.merge_file(
+ input: configure_file(
+   input: desktop_file + '.in.in',
+   output: desktop_file + '.in',
+diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build
+index 7363282a59..8b4ef411c8 100644
+--- a/src/calendar-server/meson.build
 b/src/calendar-server/meson.build
+@@ -27,7 +27,7 @@ configure_file(
+   install_dir: servicedir
+ )
+ 
+-i18n.merge_file('evolution-calendar.desktop',
++i18n.merge_file(
+   input: 'evolution-calendar.desktop.in',
+   output: 'evolution-calendar.desktop',
+   po_dir: po_dir,
+diff --git a/subprojects/extensions-app/data/meson.build 
b/subprojects/extensions-app/data/meson.build
+index d7e7d4001c..4b601e8bd1 100644
+--- a/subprojects/extensions-app/data/meson.build
 b/subprojects/extensions-app/data/meson.build
+@@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir)
+ desktopconf.set('app_id', app_id)
+ desktopconf.set('prgname', prgname)
+ 
+-i18n.merge_file('desktop',
++i18n.merge_file(
+   input: configure_file(
+ input: base_id + '.desktop.in.in',
+ output: desktop_file + '.in',
+diff --git a/subprojects/extensions-app/data/metainfo/meson.build 
b/subprojects/extensions-app/data/metainfo/meson.build
+index c4962c0576..a19bfa80a4 100644
+--- a/subprojects/extensions-app/data/metainfo/meson.build
 b/subprojects/extensions-app/data/metainfo/meson.build
+@@ -1,5 +1,5 @@
+ metainfo = app_id + '.metainfo.xml'
+-i18n.merge_file(metainfo,
++i18n.merge_file(
+   input: base_id + '.metainfo.xml.in',
+   output: metainfo,
+   po_dir: po_dir,
+diff --git a/subprojects/extensions-tool/src/templates/meson.build 
b/subprojects/extensions-tool/src/templates/meson.build
+index 670e2bf448..d693bfaddb 100644
+--- a/subprojects/extensions-tool/src/templates/meson.build
 b/subprojects/extensions-tool/src/templates/meson.build
+@@ -4,7 +4,7 @@ template_metas = [
+ ]
+ template_deps = []
+ foreach template : template_metas
+-  template_deps += i18n.merge_file(template,
++  template_deps += i18n.merge_file(
+ input: template + '.in',
+ output: template,
+ po_dir: po_dir,
+-- 
+GitLab
+

diff --git a/gnome-base/gnome-shell/gnome-shell-41.3.ebuild 
b/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
index a5b2b5a53e21..25496f9f35dc 100644
--- a/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
@@ -139,6 +139,7 @@ PATCHES=(
"${FILESDIR}"/40.0-optional-bluetooth.patch
# Change favorites defaults, bug #479918
"${FILESDIR}"/40.0-defaults.patch
+   "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-03-28 Thread Matt Turner

commit: 998b2b1d772d35e29e0e9df326df12943af8d94e
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Mar 28 15:14:24 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Mar 28 15:17:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=998b2b1d

gnome-base/gnome-shell: Version bump to 41.5

Closes: https://bugs.gentoo.org/836311
Signed-off-by: Matt Turner  gentoo.org>

 gnome-base/gnome-shell/Manifest|   1 +
 5-environment-Require-GnomeBluetooth-1.0.patch |  35 
 ...1.5-environment-Require-gnome-desktop-3.0.patch |  30 +++
 .../41.5-environment-Require-libgweather-3.0.patch |  29 +++
 gnome-base/gnome-shell/gnome-shell-41.5.ebuild | 208 +
 5 files changed, 303 insertions(+)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 9cedbba95216..be1d64fd56a4 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-shell-41.4.tar.xz 1899464 BLAKE2B 
202408be8886bb5eb5615328a774993bea8dfe2fb78d304fde2806096ca68eff3fae7d5bdb4972b627cf10192ff76e3d457dc37eaa806cd4ed57d1558c235a48
 SHA512 
6ed5f215fcf9a1cf450b406620568aeceb3d255e0bb979151ccd2260565748e69825d7f5f7fb0c6768ed584a530599a8dcbc713c1ec12617551ae9df782c5ad7
+DIST gnome-shell-41.5.tar.xz 1899888 BLAKE2B 
73491f382413c313956fc6ab878a54d8a881190ee93cac5d334d169636d8dd21557c78719142f717c94463e02c7ca4eaf12a6e4ca6167e48a002ece9379b6d03
 SHA512 
b638103528413dcfa12d65d0c7add45716d21334294babbadd0a05e3410ca068ae336b28c30eb8811222b9f90e5efdf0d1a6e0a2e3f104b49061bb28333f066e
 DIST gnome-shell-42.0.tar.xz 1918044 BLAKE2B 
742d13ad92795fb71bbe8376a86b8e9a828882288f105f026cf98304ef2e9eae8fb967fa978ec322f5c621303a1798d3490c001bbd63c704b0cddc5db688389d
 SHA512 
39b56d3c09a238d9ca387145fdbddfaa929b124d4006f097b792de2dceb882e50cbce1255b0b4585aea04b522a92a4e7a743367f43a863f95bb6386401e73935

diff --git 
a/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
 
b/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
new file mode 100644
index ..8729a6c3e671
--- /dev/null
+++ 
b/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
@@ -0,0 +1,35 @@
+From 9ce6756235ba272b8602d50d1f005dc2ef265889 Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto 
+Date: Sun, 31 Oct 2021 17:24:58 -0300
+Subject: [PATCH 1/2] environment: Require GnomeBluetooth 1.0
+
+libgnome-bluetooth will start to offer a 2.0 library version
+depending on GTK4. Given that GNOME Shell already depends on
+GTK3, it cannot use this next version of gnome-bluetooth. And
+since GJS will automatically try and use the latest version
+available of any library, Shell must specify it wants 1.0
+explicitly.
+
+Add a required GnomeBluetooth version number when importing it
+for the status indicator.
+
+Part-of: 
+---
+ js/ui/environment.js | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/js/ui/environment.js b/js/ui/environment.js
+index ef53e6022..e906fa6c6 100644
+--- a/js/ui/environment.js
 b/js/ui/environment.js
+@@ -6,6 +6,7 @@ const Config = imports.misc.config;
+ imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
+ imports.gi.versions.Gio = '2.0';
+ imports.gi.versions.GdkPixbuf = '2.0';
++imports.gi.versions.GnomeBluetooth = '1.0';
+ imports.gi.versions.Gtk = '3.0';
+ imports.gi.versions.Soup = '3.0';
+ imports.gi.versions.TelepathyGLib = '0.12';
+-- 
+2.34.1
+

diff --git 
a/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch 
b/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch
new file mode 100644
index ..3dbb50bb989b
--- /dev/null
+++ 
b/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch
@@ -0,0 +1,30 @@
+From 795312b8d5634d3005679b3c1313114e41e538fd Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto 
+Date: Thu, 11 Nov 2021 16:20:39 -0300
+Subject: [PATCH 2/2] environment: Require gnome-desktop 3.0
+
+Pretty much the exact same case of 9ce6756235.
+
+libgnome-desktop saw a major version bump, and we have to
+stick with 3.0 for a while.
+
+Part-of: 
+---
+ js/ui/environment.js | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/js/ui/environment.js b/js/ui/environment.js
+index e906fa6c6..cb254e319 100644
+--- a/js/ui/environment.js
 b/js/ui/environment.js
+@@ -7,6 +7,7 @@ imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
+ imports.gi.versions.Gio = '2.0';
+ imports.gi.versions.GdkPixbuf = '2.0';
+ imports.gi.versions.GnomeBluetooth = '1.0';
++imports.gi.versions.GnomeDesktop = '3.0';
+ imports.gi.versions.Gtk = '3.0';
+ imports.gi.versions.Soup = '3.0';
+ imports.gi.versions.TelepathyGLib = '0.12';
+-- 
+2.34.1
+

diff --git 
a/gnome-base/gnome-shell/files/41.5-environment

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-06-23 Thread Sam James

commit: dea2c90c1aee7d012a467eeb937fc4a7ecae9237
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 24 03:42:30 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 24 03:42:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dea2c90c

gnome-base/gnome-shell: restore 42.1-r3 for Polkit fix

Bug: https://bugs.gentoo.org/844919
Bug: https://bugs.gentoo.org/849566
Fixes: eed2ee4b79e40099d84db0dde29dced1e3346bb6
Signed-off-by: Sam James  gentoo.org>

 .../gnome-shell/files/42.1-polkit-g_autoptr.patch  |  53 ++
 gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild  | 206 +
 2 files changed, 259 insertions(+)

diff --git a/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch 
b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
new file mode 100644
index ..78d3de086260
--- /dev/null
+++ b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
@@ -0,0 +1,53 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/1d0a08b5e25fea7b0e792ec9798e68a7c5606a75
+https://bugs.gentoo.org/844919
+
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= 
+Date: Tue, 17 May 2022 15:36:43 +0200
+Subject: [PATCH] build: Do not redefine polkit autocleanup
+
+PolkitAgent recently added autocleanup functions itself, so check
+for their existence at configure time and only define our own when
+they don't exist upstream.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5490
+
+Part-of: 
+--- a/config.h.meson
 b/config.h.meson
+@@ -33,3 +33,6 @@
+ 
+ /* Define if fdwalk is available in libc */
+ #mesondefine HAVE_FDWALK
++
++/* Define if polkit defines autocleanup functions */
++#mesondefine HAVE_POLKIT_AUTOCLEANUP
+--- a/meson.build
 b/meson.build
+@@ -169,6 +169,13 @@ cdata.set('HAVE_FDWALK',
+   cc.has_function('fdwalk')
+ )
+ 
++polkit_has_autocleanup = cc.compiles(
++  '#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
++  #include 
++  void main(void) { g_autoptr(PolkitAgentListener) agent = NULL; }',
++  dependencies: polkit_dep)
++cdata.set('HAVE_POLKIT_AUTOCLEANUP', polkit_has_autocleanup)
++
+ buildtype = get_option('buildtype')
+ if buildtype != 'plain'
+   all_warnings = [
+--- a/src/shell-polkit-authentication-agent.h
 b/src/shell-polkit-authentication-agent.h
+@@ -14,8 +14,10 @@
+ 
+ G_BEGIN_DECLS
+ 
++#ifndef HAVE_POLKIT_AUTOCLEANUP
+ /* Polkit doesn't have g_autoptr support, thus we have to manually set the 
autoptr function here */
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (PolkitAgentListener, g_object_unref)
++#endif
+ 
+ #define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT 
(shell_polkit_authentication_agent_get_type())
+ 
+GitLab

diff --git a/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild 
b/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild
new file mode 100644
index ..3bc4781371bb
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer/pipewire support is currently automagic
+DEPEND="
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.68:2
+   >=dev-libs/gobject-introspection-1.49.1:=
+   >=dev-libs/gjs-1.71.1
+   >=x11-libs/gtk+-3.15.0:3[introspection]
+   >=x11-wm/mutter-42.0:0/10[introspection,test?]
+   >=sys-auth/polkit-0.120_p20220509[introspection]
+   >=gnome-base/gsettings-desktop-schemas-42_beta[introspection]
+   >=x11-libs/startup-notification-0.11
+   >=app-i18n/ibus-1.5.19
+   >=gnome-base/gnome-desktop-3.35.90:3=[introspection]
+   bluetooth? ( net-wireless/gnome-bluetooth:3=[introspection] )
+   >=media-libs/gstreamer-0.11.92:1.0
+   media-libs/gst-plugins-base:1.0
+   >=media-video/pipewire-0.3.0:=
+   networkmanager? (
+   >=net-misc/networkmanager-1.10.4:=[introspection]
+   net-libs/libnma[introspection]
+   >=app-crypt/libsecret-0.18
+   dev-libs/dbus-glib )
+   systemd? ( >=sys-apps/systemd-242
+   >=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
+   elogind? ( >=sys-auth/elogind-237 )
+
+   app-arch/gnome-autoar
+   dev-libs/json-glib
+
+   >=app-accessibility/at-spi2-atk-2.5.3

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-05-17 Thread Sam James

commit: 042dabffb96f3b8fd74e0cbb14c524c81e7304df
Author: Sam James  gentoo  org>
AuthorDate: Tue May 17 21:58:52 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 17 21:58:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=042dabff

gnome-base/gnome-shell: backport new Polkit patch (g_autoptr)

Closes: https://bugs.gentoo.org/844919
Signed-off-by: Sam James  gentoo.org>

 .../gnome-shell/files/42.1-polkit-g_autoptr.patch  | 53 ++
 gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild  |  3 ++
 2 files changed, 56 insertions(+)

diff --git a/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch 
b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
new file mode 100644
index ..78d3de086260
--- /dev/null
+++ b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
@@ -0,0 +1,53 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/1d0a08b5e25fea7b0e792ec9798e68a7c5606a75
+https://bugs.gentoo.org/844919
+
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= 
+Date: Tue, 17 May 2022 15:36:43 +0200
+Subject: [PATCH] build: Do not redefine polkit autocleanup
+
+PolkitAgent recently added autocleanup functions itself, so check
+for their existence at configure time and only define our own when
+they don't exist upstream.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5490
+
+Part-of: 
+--- a/config.h.meson
 b/config.h.meson
+@@ -33,3 +33,6 @@
+ 
+ /* Define if fdwalk is available in libc */
+ #mesondefine HAVE_FDWALK
++
++/* Define if polkit defines autocleanup functions */
++#mesondefine HAVE_POLKIT_AUTOCLEANUP
+--- a/meson.build
 b/meson.build
+@@ -169,6 +169,13 @@ cdata.set('HAVE_FDWALK',
+   cc.has_function('fdwalk')
+ )
+ 
++polkit_has_autocleanup = cc.compiles(
++  '#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
++  #include 
++  void main(void) { g_autoptr(PolkitAgentListener) agent = NULL; }',
++  dependencies: polkit_dep)
++cdata.set('HAVE_POLKIT_AUTOCLEANUP', polkit_has_autocleanup)
++
+ buildtype = get_option('buildtype')
+ if buildtype != 'plain'
+   all_warnings = [
+--- a/src/shell-polkit-authentication-agent.h
 b/src/shell-polkit-authentication-agent.h
+@@ -14,8 +14,10 @@
+ 
+ G_BEGIN_DECLS
+ 
++#ifndef HAVE_POLKIT_AUTOCLEANUP
+ /* Polkit doesn't have g_autoptr support, thus we have to manually set the 
autoptr function here */
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (PolkitAgentListener, g_object_unref)
++#endif
+ 
+ #define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT 
(shell_polkit_authentication_agent_get_type())
+ 
+GitLab

diff --git a/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild 
b/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild
index db6f1390fcef..7a1cc841e4f9 100644
--- a/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild
@@ -140,6 +140,9 @@ PATCHES=(
"${FILESDIR}"/42.0-optional-bluetooth.patch
# Change favorites defaults, bug #479918
"${FILESDIR}"/40.0-defaults.patch
+
+   # Upstream backport, bug #844919
+   "${FILESDIR}"/42.1-polkit-g_autoptr.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-03-20 Thread Matt Turner

commit: 314bbe352252e6e0085be5342025fee3df903888
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Mar 20 17:38:59 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Mar 20 19:54:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=314bbe35

gnome-base/gnome-shell: Version bump to 42.0

Signed-off-by: Matt Turner  gentoo.org>

 gnome-base/gnome-shell/Manifest|   1 +
 .../files/42.0-optional-bluetooth.patch|  59 ++
 gnome-base/gnome-shell/gnome-shell-42.0.ebuild | 202 +
 3 files changed, 262 insertions(+)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 8f39615367ab..9cedbba95216 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1 +1,2 @@
 DIST gnome-shell-41.4.tar.xz 1899464 BLAKE2B 
202408be8886bb5eb5615328a774993bea8dfe2fb78d304fde2806096ca68eff3fae7d5bdb4972b627cf10192ff76e3d457dc37eaa806cd4ed57d1558c235a48
 SHA512 
6ed5f215fcf9a1cf450b406620568aeceb3d255e0bb979151ccd2260565748e69825d7f5f7fb0c6768ed584a530599a8dcbc713c1ec12617551ae9df782c5ad7
+DIST gnome-shell-42.0.tar.xz 1918044 BLAKE2B 
742d13ad92795fb71bbe8376a86b8e9a828882288f105f026cf98304ef2e9eae8fb967fa978ec322f5c621303a1798d3490c001bbd63c704b0cddc5db688389d
 SHA512 
39b56d3c09a238d9ca387145fdbddfaa929b124d4006f097b792de2dceb882e50cbce1255b0b4585aea04b522a92a4e7a743367f43a863f95bb6386401e73935

diff --git a/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch 
b/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch
new file mode 100644
index ..c7fe07dd69de
--- /dev/null
+++ b/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch
@@ -0,0 +1,59 @@
+From d7cfd7bff4f9fa9d8528f72d4275e07551c6b288 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp 
+Date: Thu, 28 Feb 2019 00:50:19 +0200
+Subject: [PATCH] build: Make bluetooth support optional
+
+---
+ js/misc/meson.build | 2 +-
+ meson.build | 7 ++-
+ meson_options.txt   | 6 ++
+ 3 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/js/misc/meson.build b/js/misc/meson.build
+index 582562711..ec9c62645 100644
+--- a/js/misc/meson.build
 b/js/misc/meson.build
+@@ -3,7 +3,7 @@ jsconf.set('PACKAGE_NAME', meson.project_name())
+ jsconf.set('PACKAGE_VERSION', meson.project_version())
+ jsconf.set('GETTEXT_PACKAGE', meson.project_name())
+ jsconf.set('LIBMUTTER_API_VERSION', mutter_api_version)
+-jsconf.set10('HAVE_BLUETOOTH', bt_dep.found())
++jsconf.set10('HAVE_BLUETOOTH', have_bluetooth)
+ jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager)
+ jsconf.set10('HAVE_SOUP2', have_soup2)
+ jsconf.set('datadir', datadir)
+diff --git a/meson.build b/meson.build
+index 8d7478f9b..79d340840 100644
+--- a/meson.build
 b/meson.build
+@@ -93,7 +93,12 @@ x11_dep = dependency('x11')
+ schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req)
+ gnome_desktop_dep = dependency('gnome-desktop-3.0', version: 
gnome_desktop_req)
+ 
+-bt_dep = dependency('gnome-bluetooth-3.0', version: bt_req, required: false)
++if get_option('bluetooth')
++  bt_dep = dependency('gnome-bluetooth-3.0', version: bt_req)
++  have_bluetooth = true
++else
++  have_bluetooth = false
++endif
+ gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false)
+ gst_base_dep = dependency('gstreamer-base-1.0', required: false)
+ pipewire_dep = dependency('libpipewire-0.3', required: false)
+diff --git a/meson_options.txt b/meson_options.txt
+index f0f2ecf6c..85fc58ea4 100644
+--- a/meson_options.txt
 b/meson_options.txt
+@@ -1,3 +1,9 @@
++option('bluetooth',
++  type: 'boolean',
++  value: true,
++  description: 'Enable bluetooth support'
++)
++
+ option('extensions_tool',
+   type: 'boolean',
+   value: true,
+-- 
+2.34.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-42.0.ebuild 
b/gnome-base/gnome-shell/gnome-shell-42.0.ebuild
new file mode 100644
index ..002edd7d2f1e
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-42.0.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer/pipewire support is currently automagic
+DEPEND="
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.68:2
+   >=dev-libs/gobject-introspe

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2016-06-27 Thread Alexandre Rostovtsev

commit: de093187ffd212744ab9952167e511d74de42153
Author: Alexandre Rostovtsev  gentoo  org>
AuthorDate: Mon Jun 27 14:05:46 2016 +
Commit: Alexandre Rostovtsev  gentoo  org>
CommitDate: Mon Jun 27 14:05:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de093187

gnome-base/gnome-shell: fix nvidia-drivers crash (bug #587110)

Thanks to Mark R. Pariente for reporting.

Also, require adwaita-icon-theme-3.20 for new grid icon (bug #587130)

Package-Manager: portage-2.3.0

 .../files/gnome-shell-3.20.2-st-nvidia.patch   | 121 +++
 .../gnome-shell/gnome-shell-3.20.2-r1.ebuild   | 221 +
 2 files changed, 342 insertions(+)

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch 
b/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch
new file mode 100644
index 000..63df248
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch
@@ -0,0 +1,121 @@
+From 35cc224240ec4fc8159fc689fe3e093a81f97dc9 Mon Sep 17 00:00:00 2001
+From: Martin Szulecki 
+Date: Tue, 17 May 2016 15:00:04 +0200
+Subject: [PATCH] st: Init framebuffer early to fix gnome-shell crash on NVIDIA
+ drivers
+
+Checking offscreen for COGL_INVALID_HANDLE is not sufficient,
+as cogl_offscreen_new_with_texture doesn't initialize framebuffer
+objects but lets Cogl solve this the lazy way.
+cogl_offscreen_new_with_texture will never return COGL_INVALID_HANDLE
+anyways.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=764898
+---
+ src/st/st-theme-node-drawing.c| 18 --
+ src/st/st-theme-node-transition.c | 25 -
+ 2 files changed, 32 insertions(+), 11 deletions(-)
+
+diff --git a/src/st/st-theme-node-drawing.c b/src/st/st-theme-node-drawing.c
+index 85feb20..8942966 100644
+--- a/src/st/st-theme-node-drawing.c
 b/src/st/st-theme-node-drawing.c
+@@ -2224,6 +2224,7 @@ st_theme_node_prerender_shadow (StThemeNodePaintState 
*state)
+   int max_borders[4];
+   int center_radius, corner_id;
+   CoglHandle buffer, offscreen = COGL_INVALID_HANDLE;
++  CoglError *error = NULL;
+ 
+   /* Get infos from the node */
+   if (state->alloc_width < node->box_shadow_min_width ||
+@@ -2264,10 +2265,12 @@ st_theme_node_prerender_shadow (StThemeNodePaintState 
*state)
+state->box_shadow_height,
+COGL_TEXTURE_NO_SLICING,
+COGL_PIXEL_FORMAT_ANY);
+-  if (buffer != COGL_INVALID_HANDLE)
+-offscreen = cogl_offscreen_new_with_texture (buffer);
++  if (buffer == NULL)
++return;
+ 
+-  if (offscreen != COGL_INVALID_HANDLE)
++  offscreen = cogl_offscreen_new_with_texture (buffer);
++
++  if (cogl_framebuffer_allocate (COGL_FRAMEBUFFER (offscreen), &error))
+ {
+   ClutterActorBox box = { 0, 0, state->box_shadow_width, 
state->box_shadow_height};
+ 
+@@ -2277,14 +2280,17 @@ st_theme_node_prerender_shadow (StThemeNodePaintState 
*state)
+   cogl_framebuffer_clear4f (offscreen, COGL_BUFFER_BIT_COLOR, 0, 0, 0, 0);
+ 
+   st_theme_node_paint_borders (state, offscreen, &box, 0xFF);
+-  cogl_handle_unref (offscreen);
+ 
+   state->box_shadow_pipeline = _st_create_shadow_pipeline 
(st_theme_node_get_box_shadow (node),
+buffer);
+ }
++  else
++{
++  cogl_error_free (error);
++}
+ 
+-  if (buffer != COGL_INVALID_HANDLE)
+-cogl_handle_unref (buffer);
++  cogl_handle_unref (offscreen);
++  cogl_handle_unref (buffer);
+ }
+ 
+ static void
+diff --git a/src/st/st-theme-node-transition.c 
b/src/st/st-theme-node-transition.c
+index 1eef17b..afde977 100644
+--- a/src/st/st-theme-node-transition.c
 b/src/st/st-theme-node-transition.c
+@@ -241,6 +241,7 @@ setup_framebuffers (StThemeNodeTransition *transition,
+ {
+   StThemeNodeTransitionPrivate *priv = transition->priv;
+   guint width, height;
++  CoglError *catch_error = NULL;
+ 
+   /* template material to avoid unnecessary shader compilation */
+   static CoglHandle material_template = COGL_INVALID_HANDLE;
+@@ -263,19 +264,33 @@ setup_framebuffers (StThemeNodeTransition *transition,
+   COGL_TEXTURE_NO_SLICING,
+   COGL_PIXEL_FORMAT_ANY);
+ 
+-  g_return_val_if_fail (priv->old_texture != COGL_INVALID_HANDLE, FALSE);
+-  g_return_val_if_fail (priv->new_texture != COGL_INVALID_HANDLE, FALSE);
++  if (priv->old_texture == COGL_INVALID_HANDLE)
++return FALSE;
++
++  if (priv->new_texture == COGL_INVALID_HANDLE)
++return FALSE;
+ 
+   if (priv->old_offscreen)
+ cogl_handle_unref (priv->old_offscreen);
+   priv->old_offscreen = cogl_offscreen_new_with_texture (priv->old_texture);
++  if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (priv->old_offscreen), 
&catch_error))
++{
++  cogl_object_unref (priv->old_offscreen);
++

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2016-11-11 Thread Gilles Dartiguelongue

commit: a4358aee4a36b9c9eeef3e487ea9c3459218c0cf
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Fri Nov 11 22:45:09 2016 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sat Nov 12 00:33:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4358aee

gnome-base/gnome-shell: version bump 3.20.4 → 3.22.1

Cleanup unused dependencies. Add missing dependencies with
introspection support. Make nsplugin optional as there is the chrome
extension in tree too. Update comments.

Package-Manager: portage-2.3.2

 .../files/gnome-shell-3.22.0-defaults.patch| 26 
 .../files/gnome-shell-3.22.0-gir-build-fix.patch   | 28 +
 gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild   | 49 +-
 3 files changed, 73 insertions(+), 30 deletions(-)

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch 
b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch
new file mode 100644
index ..b80dbc3
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch
@@ -0,0 +1,26 @@
+From 7a671f99b7ef2d5f38be67668aac762764b32a42 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Tue, 10 Dec 2013 23:33:51 +0100
+Subject: [PATCH 1/2] Alter list of default applications
+
+Signed-off-by: Gilles Dartiguelongue 
+---
+ data/org.gnome.shell.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.gnome.shell.gschema.xml.in 
b/data/org.gnome.shell.gschema.xml.in
+index c1e6b21..368c654 100644
+--- a/data/org.gnome.shell.gschema.xml.in
 b/data/org.gnome.shell.gschema.xml.in
+@@ -31,7 +31,7 @@
+   
+ 
+ 
+-  [ 'epiphany.desktop', 'evolution.desktop', 
'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 
'org.gnome.Software.desktop' ]
++  [ 'chromium-browser-chromium.desktop', 'firefox.desktop', 
'firefox-bin.desktop', 'evolution.desktop', 'rhythmbox.desktop', 
'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' 
]
+   List of desktop file IDs for favorite applications
+   
+ The applications corresponding to these identifiers
+-- 
+2.10.1
+

diff --git 
a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch 
b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch
new file mode 100644
index ..b0c5fb7
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch
@@ -0,0 +1,28 @@
+From 395bede20811b0cf2bcecb0b4e5bcbc2c2fa35f4 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Sat, 12 Nov 2016 00:21:25 +0100
+Subject: [PATCH] Add missing rpath to point to mutter specific libraries
+
+Reported-By: alpha...@gmail.com
+X-Gentoo-Bug: 597842
+X-Gentoo-Url: https://bugs.gentoo.org/show_bug.cgi?id=597842
+---
+ src/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index e9aacfe..fd98ba5 100644
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -311,7 +311,7 @@ shell-enum-types.c: $(srcdir)/shell-enum-types.c.in 
stamp-shell-enum-types.h
+   rm -f $(@F).tmp
+ EXTRA_DIST += shell-enum-types.c.in
+ 
+-libgnome_shell_ldflags = -avoid-version
++libgnome_shell_ldflags = -avoid-version -Wl,-rpath,$(MUTTER_TYPELIB_DIR)
+ libgnome_shell_libadd =   \
+   -lm \
+   $(GNOME_SHELL_LIBS) \
+-- 
+2.10.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild
index c5e7062..60739bd 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild
@@ -6,14 +6,14 @@ EAPI=6
 GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python{3_4,3_5} )
 
-inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd
+inherit autotools gnome2 multilib pax-utils python-r1 systemd
 
 DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-IUSE="+bluetooth +networkmanager +nls -openrc-force"
+IUSE="+bluetooth +networkmanager nsplugin +nls -openrc-force"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
@@ -30,13 +30,9 @@ COMMON_DEPEND="
>=dev-libs/gobject-introspection-1.49.1:=
dev-libs/libical:=
>=x11-libs/gtk+-3.15.0:3[introspection]
-   >=media-libs/clutter-1.21.5:1.0[introspection]
-   >=dev-libs/json-glib-0.13.2
>=dev-libs/libcroco-0.6.8:0.6
>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
>=gnome-base/gsettings-desktop-schemas-3.21.3
-   >=gnome-base/gnome-keyring-3.3.90
-   gnome-base/libgnome-keyring
>=gnome-extra/evolution-data-server-3.17.2:=
>=media-libs/gstreamer-0.11.92:1.0
>=net-im/telepathy-logger-0.2.4[introspection]
@@ -52,14 +48,13 @@ COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2019-03-30 Thread Mart Raudsepp

commit: aebd86e5f849893f8a0f00d38b9fd777cc1317a6
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Mar 30 22:26:46 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Mar 30 22:26:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aebd86e5

gnome-base/gnome-shell: remove old

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 gnome-base/gnome-shell/Manifest|   2 -
 .../files/3.28.3-fix-gtk-doc-meson.patch   |  59 ---
 gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild   | 193 -
 3 files changed, 254 deletions(-)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index bea6c4afe6e..a99b75f076a 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,7 +1,5 @@
 DIST gnome-shell-3.24.3.tar.xz 1982088 BLAKE2B 
608b3e73d546dea543a23c31a64b03c32f35d118cd79fd0371a9e392377b4dd03bc16413443d643ed604a2fa81c2838939d92ef4c89a54469a8bd83dc9661f8f
 SHA512 
369ed80b975369b79d4ac9b3f1fbd469fdde331e9079d09eeac6398a9b3c349b09f7570dfce1ed6e1cdfaf514b4b40c6038f34b6c3c7928470b2cd65b702ff15
 DIST gnome-shell-3.26.2-patchset.tar.xz 55492 BLAKE2B 
745b8549f7480b004f4df9b81508c94c9224f77a5a503f45dfda20105e9c305f8cae6ae5e420e597cea9f98899933bb19efd8cf0e9811dc35d0844a3c2920143
 SHA512 
93a730082e84807c23f4b7e390c2d0fb02d3666fc32241de02b3534cc271b160bd9a6a6a2e908ed5bdde91cef383c1e400b0f7cbf04ac104f7f9758218e635ed
 DIST gnome-shell-3.26.2.tar.xz 1405580 BLAKE2B 
ccbb8ad374931335fdc6e752a7feedcba4fe2b61112404b62bc9711b1736216d46fd6e85c6f06439cae50af86a174359d7df0e111e8db6ffed567e91b4292b14
 SHA512 
0e13bc7abff2367d24ea748cd69a1879ff14a6755ef27d17cf20cef61bc6d15bf6e9d18362142a2d6462689f64eada833f9bba21ebaac3a33765a5be0ae48d3a
-DIST gnome-shell-3.28.3-patchset.tar.xz 30820 BLAKE2B 
3402a1c455a5e9d028f6c15ea40db94afb84576643b9bfe9e973a7f375d9f0a22003eab3ccabec0b4b31c31f70ef02ca055c0f62a5c0392529fc375f6cef7029
 SHA512 
a1da84374dd97bff2546d6ddc5656bade69711d05b4b4f4283df66ebbac566767a509dcbd6db52c28a1915cf873c99b81029128cb2a2b63c325dc3e3340fffb4
-DIST gnome-shell-3.28.3.tar.xz 1433388 BLAKE2B 
656e2edabef363d779fd339b7158ad3461a05452a2fdad611889d19f272cd98dfbbb39871d10631326b83108678f8a7245c349583eb257e9d7e4827078134ade
 SHA512 
3550a9e59101a96cf04e4a4bc183ac9a447baa72d74e57c3f438764741b4365f8848895c1eb2c4d0af5c7936e38eb8971ef578bbee315e78b9fdcbbe49fdc1e8
 DIST gnome-shell-3.30.2-patchset.tar.xz 39864 BLAKE2B 
61c02e5ae87ab24f30d28865ff20e32fef63eefbfc1134bf0582eb25933700902aad08176fd2011781262552385bcb3ffaf35fc2d7a060c09ba0d27cb9a8
 SHA512 
8ad976c05488a6b7447d29105a566d0bb975c8e0798be18c1dc07295c51a27578274e611da4979397fc6c4da538f6d9f48072e043829a63faf87a781518ee531
 DIST gnome-shell-3.30.2.tar.xz 1439556 BLAKE2B 
547ccf5571ea431d15c6430619640bd497a381191cad56bbf1a5c9992c5df47eb48527cc2749ea4d417cbe5fd7cc2acb44915ee35d3d89cd386541f19d743877
 SHA512 
5cdf2b9a4dc9dbcc75d76020a01b953ae3922d5820b692d1bc1cf62daf1f00d04b95d6ec076920563f555115c4f4ad11a019e4523a353ef4dd2189a5240239c6

diff --git a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch 
b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
deleted file mode 100644
index 9948b163009..000
--- a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 9f4aa6ebf2193bb19dd8012de7699fce35681078 Mon Sep 17 00:00:00 2001
-From: Pascal Nowack 
-Date: Mon, 6 Aug 2018 14:21:02 +0200
-Subject: [PATCH] build: Fix build with meson >= 47.0
-
-With meson >= 47.0, building gnome-shell will fail
-when --rebuild-types is used as an option for gtk-doc,
-so stop using that option and bump the meson requirement.
-
-https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/191

- docs/reference/shell/meson.build | 3 +--
- docs/reference/st/meson.build| 3 +--
- meson.build  | 2 +-
- 3 files changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/docs/reference/shell/meson.build 
b/docs/reference/shell/meson.build
-index 1469ed422..a32d6a58a 100644
 a/docs/reference/shell/meson.build
-+++ b/docs/reference/shell/meson.build
-@@ -50,8 +50,7 @@ gnome.gtkdoc('shell',
- join_paths(meson.build_root(), 'src')
-   ],
-   scan_args: [
--'--ignore-headers=' + ' '.join(private_headers + exclude_directories),
--'--rebuild-types'
-+'--ignore-headers=' + ' '.join(private_headers + exclude_directories)
-   ],
-   install: true
- )
-diff --git a/docs/reference/st/meson.build b/docs/reference/st/meson.build
-index fe89b53d4..3e9e9ab7c 100644
 a/docs/reference/st/meson.build
-+++ b/docs/reference/st/meson.build
-@@ -17,8 +17,7 @@ gnome.gtkdoc('st',
-   ],
-   scan_args: [
- '--ignore-headers=' + ' '.join(private_headers),
--'--rebuild-sections',
--'--rebuild-types'
-+'--rebuild-sections'
-   ],
-   install: true
- )
-diff --git a/meson.build b/meson.build
-index 03b9d52a8..e33a76183 100644

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2019-02-28 Thread Mart Raudsepp

commit: 35943bda95329e610052831ff5245621a1b53638
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Feb 28 21:11:23 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Feb 28 22:37:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35943bda

gnome-base/gnome-shell: fix and re-enable USE=gtk-doc support

Turned out to be a meson-0.47 incompatibility, not gtk-doc

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../files/3.28.3-fix-gtk-doc-meson.patch   | 59 ++
 gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild   |  9 ++--
 2 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch 
b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
new file mode 100644
index 000..9948b163009
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
@@ -0,0 +1,59 @@
+From 9f4aa6ebf2193bb19dd8012de7699fce35681078 Mon Sep 17 00:00:00 2001
+From: Pascal Nowack 
+Date: Mon, 6 Aug 2018 14:21:02 +0200
+Subject: [PATCH] build: Fix build with meson >= 47.0
+
+With meson >= 47.0, building gnome-shell will fail
+when --rebuild-types is used as an option for gtk-doc,
+so stop using that option and bump the meson requirement.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/191
+---
+ docs/reference/shell/meson.build | 3 +--
+ docs/reference/st/meson.build| 3 +--
+ meson.build  | 2 +-
+ 3 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/docs/reference/shell/meson.build 
b/docs/reference/shell/meson.build
+index 1469ed422..a32d6a58a 100644
+--- a/docs/reference/shell/meson.build
 b/docs/reference/shell/meson.build
+@@ -50,8 +50,7 @@ gnome.gtkdoc('shell',
+ join_paths(meson.build_root(), 'src')
+   ],
+   scan_args: [
+-'--ignore-headers=' + ' '.join(private_headers + exclude_directories),
+-'--rebuild-types'
++'--ignore-headers=' + ' '.join(private_headers + exclude_directories)
+   ],
+   install: true
+ )
+diff --git a/docs/reference/st/meson.build b/docs/reference/st/meson.build
+index fe89b53d4..3e9e9ab7c 100644
+--- a/docs/reference/st/meson.build
 b/docs/reference/st/meson.build
+@@ -17,8 +17,7 @@ gnome.gtkdoc('st',
+   ],
+   scan_args: [
+ '--ignore-headers=' + ' '.join(private_headers),
+-'--rebuild-sections',
+-'--rebuild-types'
++'--rebuild-sections'
+   ],
+   install: true
+ )
+diff --git a/meson.build b/meson.build
+index 03b9d52a8..e33a76183 100644
+--- a/meson.build
 b/meson.build
+@@ -1,6 +1,6 @@
+ project('gnome-shell', 'c',
+   version: '3.28.3',
+-  meson_version: '>= 0.42.0',
++  meson_version: '>= 0.47.0',
+   license: 'GPLv2+'
+ )
+ 
+-- 
+2.17.0
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild
index d49823e4bdf..0a3ea629b3f 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz";
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-IUSE="+bluetooth +browser-extension elogind +ibus +networkmanager nsplugin 
systemd telepathy"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
nsplugin systemd telepathy"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
?? ( elogind systemd )"
 
@@ -110,9 +110,10 @@ DEPEND="${COMMON_DEPEND}
dev-libs/libxslt
>=dev-util/gdbus-codegen-2.45.3
dev-util/glib-utils
+   gtk-doc? ( >=dev-util/gtk-doc-1.17 )
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
-" #gtk-doc? ( >=dev-util/gtk-doc-1.17 )
+"
 
 PATCHES=(
# Patches from gnome-3-26 branch on top of 3.26.2
@@ -121,6 +122,8 @@ PATCHES=(
"${FILESDIR}"/${PV}-defaults.patch
# Fix automagic gnome-bluetooth dep, bug #398145
"${FILESDIR}"/${PV}-optional-bluetooth.patch
+   # Fix gtk-doc build with >=meson-0.47
+   "${FILESDIR}"/${PV}-fix-gtk-doc-meson.patch
 )
 
 src_prepare() {
@@ -135,7 +138,7 @@ src_configure() {
local emesonargs=(
$(meson_use bluetooth)
$(meson_use nsplugin browser_plugin)
-   #$(meson_use gtk-doc gtk_doc) # fails in gtkdoc-scangobj call 
with gtk-doc-1.25 (perl regex parenthesis issue); probably needs newer 
python-based gtk-doc to work
+   $(meson_use gtk-doc gtk_doc)
-Dman=true
$(meson_use networkmanager)
$(meson_use systemd) # this controls journald integration only 
as of 3.26.2 (structured logging and having gnome-shell launched apps use its 
own identifier instead of gnome-session)

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2016-06-27 Thread Alexandre Rostovtsev

commit: de093187ffd212744ab9952167e511d74de42153
Author: Alexandre Rostovtsev  gentoo  org>
AuthorDate: Mon Jun 27 14:05:46 2016 +
Commit: Alexandre Rostovtsev  gentoo  org>
CommitDate: Mon Jun 27 14:05:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de093187

gnome-base/gnome-shell: fix nvidia-drivers crash (bug #587110)

Thanks to Mark R. Pariente for reporting.

Also, require adwaita-icon-theme-3.20 for new grid icon (bug #587130)

Package-Manager: portage-2.3.0

 .../files/gnome-shell-3.20.2-st-nvidia.patch   | 121 +++
 .../gnome-shell/gnome-shell-3.20.2-r1.ebuild   | 221 +
 2 files changed, 342 insertions(+)

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch 
b/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch
new file mode 100644
index 000..63df248
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch
@@ -0,0 +1,121 @@
+From 35cc224240ec4fc8159fc689fe3e093a81f97dc9 Mon Sep 17 00:00:00 2001
+From: Martin Szulecki 
+Date: Tue, 17 May 2016 15:00:04 +0200
+Subject: [PATCH] st: Init framebuffer early to fix gnome-shell crash on NVIDIA
+ drivers
+
+Checking offscreen for COGL_INVALID_HANDLE is not sufficient,
+as cogl_offscreen_new_with_texture doesn't initialize framebuffer
+objects but lets Cogl solve this the lazy way.
+cogl_offscreen_new_with_texture will never return COGL_INVALID_HANDLE
+anyways.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=764898
+---
+ src/st/st-theme-node-drawing.c| 18 --
+ src/st/st-theme-node-transition.c | 25 -
+ 2 files changed, 32 insertions(+), 11 deletions(-)
+
+diff --git a/src/st/st-theme-node-drawing.c b/src/st/st-theme-node-drawing.c
+index 85feb20..8942966 100644
+--- a/src/st/st-theme-node-drawing.c
 b/src/st/st-theme-node-drawing.c
+@@ -2224,6 +2224,7 @@ st_theme_node_prerender_shadow (StThemeNodePaintState 
*state)
+   int max_borders[4];
+   int center_radius, corner_id;
+   CoglHandle buffer, offscreen = COGL_INVALID_HANDLE;
++  CoglError *error = NULL;
+ 
+   /* Get infos from the node */
+   if (state->alloc_width < node->box_shadow_min_width ||
+@@ -2264,10 +2265,12 @@ st_theme_node_prerender_shadow (StThemeNodePaintState 
*state)
+state->box_shadow_height,
+COGL_TEXTURE_NO_SLICING,
+COGL_PIXEL_FORMAT_ANY);
+-  if (buffer != COGL_INVALID_HANDLE)
+-offscreen = cogl_offscreen_new_with_texture (buffer);
++  if (buffer == NULL)
++return;
+ 
+-  if (offscreen != COGL_INVALID_HANDLE)
++  offscreen = cogl_offscreen_new_with_texture (buffer);
++
++  if (cogl_framebuffer_allocate (COGL_FRAMEBUFFER (offscreen), &error))
+ {
+   ClutterActorBox box = { 0, 0, state->box_shadow_width, 
state->box_shadow_height};
+ 
+@@ -2277,14 +2280,17 @@ st_theme_node_prerender_shadow (StThemeNodePaintState 
*state)
+   cogl_framebuffer_clear4f (offscreen, COGL_BUFFER_BIT_COLOR, 0, 0, 0, 0);
+ 
+   st_theme_node_paint_borders (state, offscreen, &box, 0xFF);
+-  cogl_handle_unref (offscreen);
+ 
+   state->box_shadow_pipeline = _st_create_shadow_pipeline 
(st_theme_node_get_box_shadow (node),
+buffer);
+ }
++  else
++{
++  cogl_error_free (error);
++}
+ 
+-  if (buffer != COGL_INVALID_HANDLE)
+-cogl_handle_unref (buffer);
++  cogl_handle_unref (offscreen);
++  cogl_handle_unref (buffer);
+ }
+ 
+ static void
+diff --git a/src/st/st-theme-node-transition.c 
b/src/st/st-theme-node-transition.c
+index 1eef17b..afde977 100644
+--- a/src/st/st-theme-node-transition.c
 b/src/st/st-theme-node-transition.c
+@@ -241,6 +241,7 @@ setup_framebuffers (StThemeNodeTransition *transition,
+ {
+   StThemeNodeTransitionPrivate *priv = transition->priv;
+   guint width, height;
++  CoglError *catch_error = NULL;
+ 
+   /* template material to avoid unnecessary shader compilation */
+   static CoglHandle material_template = COGL_INVALID_HANDLE;
+@@ -263,19 +264,33 @@ setup_framebuffers (StThemeNodeTransition *transition,
+   COGL_TEXTURE_NO_SLICING,
+   COGL_PIXEL_FORMAT_ANY);
+ 
+-  g_return_val_if_fail (priv->old_texture != COGL_INVALID_HANDLE, FALSE);
+-  g_return_val_if_fail (priv->new_texture != COGL_INVALID_HANDLE, FALSE);
++  if (priv->old_texture == COGL_INVALID_HANDLE)
++return FALSE;
++
++  if (priv->new_texture == COGL_INVALID_HANDLE)
++return FALSE;
+ 
+   if (priv->old_offscreen)
+ cogl_handle_unref (priv->old_offscreen);
+   priv->old_offscreen = cogl_offscreen_new_with_texture (priv->old_texture);
++  if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (priv->old_offscreen), 
&catch_error))
++{
++  cogl_object_unref (priv->old_offscreen);
++

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2016-11-11 Thread Gilles Dartiguelongue

commit: a4358aee4a36b9c9eeef3e487ea9c3459218c0cf
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Fri Nov 11 22:45:09 2016 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sat Nov 12 00:33:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4358aee

gnome-base/gnome-shell: version bump 3.20.4 → 3.22.1

Cleanup unused dependencies. Add missing dependencies with
introspection support. Make nsplugin optional as there is the chrome
extension in tree too. Update comments.

Package-Manager: portage-2.3.2

 .../files/gnome-shell-3.22.0-defaults.patch| 26 
 .../files/gnome-shell-3.22.0-gir-build-fix.patch   | 28 +
 gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild   | 49 +-
 3 files changed, 73 insertions(+), 30 deletions(-)

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch 
b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch
new file mode 100644
index ..b80dbc3
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch
@@ -0,0 +1,26 @@
+From 7a671f99b7ef2d5f38be67668aac762764b32a42 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Tue, 10 Dec 2013 23:33:51 +0100
+Subject: [PATCH 1/2] Alter list of default applications
+
+Signed-off-by: Gilles Dartiguelongue 
+---
+ data/org.gnome.shell.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.gnome.shell.gschema.xml.in 
b/data/org.gnome.shell.gschema.xml.in
+index c1e6b21..368c654 100644
+--- a/data/org.gnome.shell.gschema.xml.in
 b/data/org.gnome.shell.gschema.xml.in
+@@ -31,7 +31,7 @@
+   
+ 
+ 
+-  [ 'epiphany.desktop', 'evolution.desktop', 
'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 
'org.gnome.Software.desktop' ]
++  [ 'chromium-browser-chromium.desktop', 'firefox.desktop', 
'firefox-bin.desktop', 'evolution.desktop', 'rhythmbox.desktop', 
'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' 
]
+   List of desktop file IDs for favorite applications
+   
+ The applications corresponding to these identifiers
+-- 
+2.10.1
+

diff --git 
a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch 
b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch
new file mode 100644
index ..b0c5fb7
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch
@@ -0,0 +1,28 @@
+From 395bede20811b0cf2bcecb0b4e5bcbc2c2fa35f4 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Sat, 12 Nov 2016 00:21:25 +0100
+Subject: [PATCH] Add missing rpath to point to mutter specific libraries
+
+Reported-By: alpha...@gmail.com
+X-Gentoo-Bug: 597842
+X-Gentoo-Url: https://bugs.gentoo.org/show_bug.cgi?id=597842
+---
+ src/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index e9aacfe..fd98ba5 100644
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -311,7 +311,7 @@ shell-enum-types.c: $(srcdir)/shell-enum-types.c.in 
stamp-shell-enum-types.h
+   rm -f $(@F).tmp
+ EXTRA_DIST += shell-enum-types.c.in
+ 
+-libgnome_shell_ldflags = -avoid-version
++libgnome_shell_ldflags = -avoid-version -Wl,-rpath,$(MUTTER_TYPELIB_DIR)
+ libgnome_shell_libadd =   \
+   -lm \
+   $(GNOME_SHELL_LIBS) \
+-- 
+2.10.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild
index c5e7062..60739bd 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild
@@ -6,14 +6,14 @@ EAPI=6
 GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python{3_4,3_5} )
 
-inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd
+inherit autotools gnome2 multilib pax-utils python-r1 systemd
 
 DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-IUSE="+bluetooth +networkmanager +nls -openrc-force"
+IUSE="+bluetooth +networkmanager nsplugin +nls -openrc-force"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
@@ -30,13 +30,9 @@ COMMON_DEPEND="
>=dev-libs/gobject-introspection-1.49.1:=
dev-libs/libical:=
>=x11-libs/gtk+-3.15.0:3[introspection]
-   >=media-libs/clutter-1.21.5:1.0[introspection]
-   >=dev-libs/json-glib-0.13.2
>=dev-libs/libcroco-0.6.8:0.6
>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
>=gnome-base/gsettings-desktop-schemas-3.21.3
-   >=gnome-base/gnome-keyring-3.3.90
-   gnome-base/libgnome-keyring
>=gnome-extra/evolution-data-server-3.17.2:=
>=media-libs/gstreamer-0.11.92:1.0
>=net-im/telepathy-logger-0.2.4[introspection]
@@ -52,14 +48,13 @@ COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2019-03-30 Thread Mart Raudsepp

commit: aebd86e5f849893f8a0f00d38b9fd777cc1317a6
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Mar 30 22:26:46 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Mar 30 22:26:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aebd86e5

gnome-base/gnome-shell: remove old

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 gnome-base/gnome-shell/Manifest|   2 -
 .../files/3.28.3-fix-gtk-doc-meson.patch   |  59 ---
 gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild   | 193 -
 3 files changed, 254 deletions(-)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index bea6c4afe6e..a99b75f076a 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,7 +1,5 @@
 DIST gnome-shell-3.24.3.tar.xz 1982088 BLAKE2B 
608b3e73d546dea543a23c31a64b03c32f35d118cd79fd0371a9e392377b4dd03bc16413443d643ed604a2fa81c2838939d92ef4c89a54469a8bd83dc9661f8f
 SHA512 
369ed80b975369b79d4ac9b3f1fbd469fdde331e9079d09eeac6398a9b3c349b09f7570dfce1ed6e1cdfaf514b4b40c6038f34b6c3c7928470b2cd65b702ff15
 DIST gnome-shell-3.26.2-patchset.tar.xz 55492 BLAKE2B 
745b8549f7480b004f4df9b81508c94c9224f77a5a503f45dfda20105e9c305f8cae6ae5e420e597cea9f98899933bb19efd8cf0e9811dc35d0844a3c2920143
 SHA512 
93a730082e84807c23f4b7e390c2d0fb02d3666fc32241de02b3534cc271b160bd9a6a6a2e908ed5bdde91cef383c1e400b0f7cbf04ac104f7f9758218e635ed
 DIST gnome-shell-3.26.2.tar.xz 1405580 BLAKE2B 
ccbb8ad374931335fdc6e752a7feedcba4fe2b61112404b62bc9711b1736216d46fd6e85c6f06439cae50af86a174359d7df0e111e8db6ffed567e91b4292b14
 SHA512 
0e13bc7abff2367d24ea748cd69a1879ff14a6755ef27d17cf20cef61bc6d15bf6e9d18362142a2d6462689f64eada833f9bba21ebaac3a33765a5be0ae48d3a
-DIST gnome-shell-3.28.3-patchset.tar.xz 30820 BLAKE2B 
3402a1c455a5e9d028f6c15ea40db94afb84576643b9bfe9e973a7f375d9f0a22003eab3ccabec0b4b31c31f70ef02ca055c0f62a5c0392529fc375f6cef7029
 SHA512 
a1da84374dd97bff2546d6ddc5656bade69711d05b4b4f4283df66ebbac566767a509dcbd6db52c28a1915cf873c99b81029128cb2a2b63c325dc3e3340fffb4
-DIST gnome-shell-3.28.3.tar.xz 1433388 BLAKE2B 
656e2edabef363d779fd339b7158ad3461a05452a2fdad611889d19f272cd98dfbbb39871d10631326b83108678f8a7245c349583eb257e9d7e4827078134ade
 SHA512 
3550a9e59101a96cf04e4a4bc183ac9a447baa72d74e57c3f438764741b4365f8848895c1eb2c4d0af5c7936e38eb8971ef578bbee315e78b9fdcbbe49fdc1e8
 DIST gnome-shell-3.30.2-patchset.tar.xz 39864 BLAKE2B 
61c02e5ae87ab24f30d28865ff20e32fef63eefbfc1134bf0582eb25933700902aad08176fd2011781262552385bcb3ffaf35fc2d7a060c09ba0d27cb9a8
 SHA512 
8ad976c05488a6b7447d29105a566d0bb975c8e0798be18c1dc07295c51a27578274e611da4979397fc6c4da538f6d9f48072e043829a63faf87a781518ee531
 DIST gnome-shell-3.30.2.tar.xz 1439556 BLAKE2B 
547ccf5571ea431d15c6430619640bd497a381191cad56bbf1a5c9992c5df47eb48527cc2749ea4d417cbe5fd7cc2acb44915ee35d3d89cd386541f19d743877
 SHA512 
5cdf2b9a4dc9dbcc75d76020a01b953ae3922d5820b692d1bc1cf62daf1f00d04b95d6ec076920563f555115c4f4ad11a019e4523a353ef4dd2189a5240239c6

diff --git a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch 
b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
deleted file mode 100644
index 9948b163009..000
--- a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 9f4aa6ebf2193bb19dd8012de7699fce35681078 Mon Sep 17 00:00:00 2001
-From: Pascal Nowack 
-Date: Mon, 6 Aug 2018 14:21:02 +0200
-Subject: [PATCH] build: Fix build with meson >= 47.0
-
-With meson >= 47.0, building gnome-shell will fail
-when --rebuild-types is used as an option for gtk-doc,
-so stop using that option and bump the meson requirement.
-
-https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/191

- docs/reference/shell/meson.build | 3 +--
- docs/reference/st/meson.build| 3 +--
- meson.build  | 2 +-
- 3 files changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/docs/reference/shell/meson.build 
b/docs/reference/shell/meson.build
-index 1469ed422..a32d6a58a 100644
 a/docs/reference/shell/meson.build
-+++ b/docs/reference/shell/meson.build
-@@ -50,8 +50,7 @@ gnome.gtkdoc('shell',
- join_paths(meson.build_root(), 'src')
-   ],
-   scan_args: [
--'--ignore-headers=' + ' '.join(private_headers + exclude_directories),
--'--rebuild-types'
-+'--ignore-headers=' + ' '.join(private_headers + exclude_directories)
-   ],
-   install: true
- )
-diff --git a/docs/reference/st/meson.build b/docs/reference/st/meson.build
-index fe89b53d4..3e9e9ab7c 100644
 a/docs/reference/st/meson.build
-+++ b/docs/reference/st/meson.build
-@@ -17,8 +17,7 @@ gnome.gtkdoc('st',
-   ],
-   scan_args: [
- '--ignore-headers=' + ' '.join(private_headers),
--'--rebuild-sections',
--'--rebuild-types'
-+'--rebuild-sections'
-   ],
-   install: true
- )
-diff --git a/meson.build b/meson.build
-index 03b9d52a8..e33a76183 100644

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2019-02-28 Thread Mart Raudsepp

commit: 35943bda95329e610052831ff5245621a1b53638
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Feb 28 21:11:23 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Feb 28 22:37:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35943bda

gnome-base/gnome-shell: fix and re-enable USE=gtk-doc support

Turned out to be a meson-0.47 incompatibility, not gtk-doc

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../files/3.28.3-fix-gtk-doc-meson.patch   | 59 ++
 gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild   |  9 ++--
 2 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch 
b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
new file mode 100644
index 000..9948b163009
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
@@ -0,0 +1,59 @@
+From 9f4aa6ebf2193bb19dd8012de7699fce35681078 Mon Sep 17 00:00:00 2001
+From: Pascal Nowack 
+Date: Mon, 6 Aug 2018 14:21:02 +0200
+Subject: [PATCH] build: Fix build with meson >= 47.0
+
+With meson >= 47.0, building gnome-shell will fail
+when --rebuild-types is used as an option for gtk-doc,
+so stop using that option and bump the meson requirement.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/191
+---
+ docs/reference/shell/meson.build | 3 +--
+ docs/reference/st/meson.build| 3 +--
+ meson.build  | 2 +-
+ 3 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/docs/reference/shell/meson.build 
b/docs/reference/shell/meson.build
+index 1469ed422..a32d6a58a 100644
+--- a/docs/reference/shell/meson.build
 b/docs/reference/shell/meson.build
+@@ -50,8 +50,7 @@ gnome.gtkdoc('shell',
+ join_paths(meson.build_root(), 'src')
+   ],
+   scan_args: [
+-'--ignore-headers=' + ' '.join(private_headers + exclude_directories),
+-'--rebuild-types'
++'--ignore-headers=' + ' '.join(private_headers + exclude_directories)
+   ],
+   install: true
+ )
+diff --git a/docs/reference/st/meson.build b/docs/reference/st/meson.build
+index fe89b53d4..3e9e9ab7c 100644
+--- a/docs/reference/st/meson.build
 b/docs/reference/st/meson.build
+@@ -17,8 +17,7 @@ gnome.gtkdoc('st',
+   ],
+   scan_args: [
+ '--ignore-headers=' + ' '.join(private_headers),
+-'--rebuild-sections',
+-'--rebuild-types'
++'--rebuild-sections'
+   ],
+   install: true
+ )
+diff --git a/meson.build b/meson.build
+index 03b9d52a8..e33a76183 100644
+--- a/meson.build
 b/meson.build
+@@ -1,6 +1,6 @@
+ project('gnome-shell', 'c',
+   version: '3.28.3',
+-  meson_version: '>= 0.42.0',
++  meson_version: '>= 0.47.0',
+   license: 'GPLv2+'
+ )
+ 
+-- 
+2.17.0
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild
index d49823e4bdf..0a3ea629b3f 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz";
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-IUSE="+bluetooth +browser-extension elogind +ibus +networkmanager nsplugin 
systemd telepathy"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
nsplugin systemd telepathy"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
?? ( elogind systemd )"
 
@@ -110,9 +110,10 @@ DEPEND="${COMMON_DEPEND}
dev-libs/libxslt
>=dev-util/gdbus-codegen-2.45.3
dev-util/glib-utils
+   gtk-doc? ( >=dev-util/gtk-doc-1.17 )
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
-" #gtk-doc? ( >=dev-util/gtk-doc-1.17 )
+"
 
 PATCHES=(
# Patches from gnome-3-26 branch on top of 3.26.2
@@ -121,6 +122,8 @@ PATCHES=(
"${FILESDIR}"/${PV}-defaults.patch
# Fix automagic gnome-bluetooth dep, bug #398145
"${FILESDIR}"/${PV}-optional-bluetooth.patch
+   # Fix gtk-doc build with >=meson-0.47
+   "${FILESDIR}"/${PV}-fix-gtk-doc-meson.patch
 )
 
 src_prepare() {
@@ -135,7 +138,7 @@ src_configure() {
local emesonargs=(
$(meson_use bluetooth)
$(meson_use nsplugin browser_plugin)
-   #$(meson_use gtk-doc gtk_doc) # fails in gtkdoc-scangobj call 
with gtk-doc-1.25 (perl regex parenthesis issue); probably needs newer 
python-based gtk-doc to work
+   $(meson_use gtk-doc gtk_doc)
-Dman=true
$(meson_use networkmanager)
$(meson_use systemd) # this controls journald integration only 
as of 3.26.2 (structured logging and having gnome-shell launched apps use its 
own identifier instead of gnome-session)

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-06-23 Thread Sam James

commit: dea2c90c1aee7d012a467eeb937fc4a7ecae9237
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 24 03:42:30 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 24 03:42:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dea2c90c

gnome-base/gnome-shell: restore 42.1-r3 for Polkit fix

Bug: https://bugs.gentoo.org/844919
Bug: https://bugs.gentoo.org/849566
Fixes: eed2ee4b79e40099d84db0dde29dced1e3346bb6
Signed-off-by: Sam James  gentoo.org>

 .../gnome-shell/files/42.1-polkit-g_autoptr.patch  |  53 ++
 gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild  | 206 +
 2 files changed, 259 insertions(+)

diff --git a/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch 
b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
new file mode 100644
index ..78d3de086260
--- /dev/null
+++ b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
@@ -0,0 +1,53 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/1d0a08b5e25fea7b0e792ec9798e68a7c5606a75
+https://bugs.gentoo.org/844919
+
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= 
+Date: Tue, 17 May 2022 15:36:43 +0200
+Subject: [PATCH] build: Do not redefine polkit autocleanup
+
+PolkitAgent recently added autocleanup functions itself, so check
+for their existence at configure time and only define our own when
+they don't exist upstream.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5490
+
+Part-of: 
+--- a/config.h.meson
 b/config.h.meson
+@@ -33,3 +33,6 @@
+ 
+ /* Define if fdwalk is available in libc */
+ #mesondefine HAVE_FDWALK
++
++/* Define if polkit defines autocleanup functions */
++#mesondefine HAVE_POLKIT_AUTOCLEANUP
+--- a/meson.build
 b/meson.build
+@@ -169,6 +169,13 @@ cdata.set('HAVE_FDWALK',
+   cc.has_function('fdwalk')
+ )
+ 
++polkit_has_autocleanup = cc.compiles(
++  '#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
++  #include 
++  void main(void) { g_autoptr(PolkitAgentListener) agent = NULL; }',
++  dependencies: polkit_dep)
++cdata.set('HAVE_POLKIT_AUTOCLEANUP', polkit_has_autocleanup)
++
+ buildtype = get_option('buildtype')
+ if buildtype != 'plain'
+   all_warnings = [
+--- a/src/shell-polkit-authentication-agent.h
 b/src/shell-polkit-authentication-agent.h
+@@ -14,8 +14,10 @@
+ 
+ G_BEGIN_DECLS
+ 
++#ifndef HAVE_POLKIT_AUTOCLEANUP
+ /* Polkit doesn't have g_autoptr support, thus we have to manually set the 
autoptr function here */
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (PolkitAgentListener, g_object_unref)
++#endif
+ 
+ #define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT 
(shell_polkit_authentication_agent_get_type())
+ 
+GitLab

diff --git a/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild 
b/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild
new file mode 100644
index ..3bc4781371bb
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer/pipewire support is currently automagic
+DEPEND="
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.68:2
+   >=dev-libs/gobject-introspection-1.49.1:=
+   >=dev-libs/gjs-1.71.1
+   >=x11-libs/gtk+-3.15.0:3[introspection]
+   >=x11-wm/mutter-42.0:0/10[introspection,test?]
+   >=sys-auth/polkit-0.120_p20220509[introspection]
+   >=gnome-base/gsettings-desktop-schemas-42_beta[introspection]
+   >=x11-libs/startup-notification-0.11
+   >=app-i18n/ibus-1.5.19
+   >=gnome-base/gnome-desktop-3.35.90:3=[introspection]
+   bluetooth? ( net-wireless/gnome-bluetooth:3=[introspection] )
+   >=media-libs/gstreamer-0.11.92:1.0
+   media-libs/gst-plugins-base:1.0
+   >=media-video/pipewire-0.3.0:=
+   networkmanager? (
+   >=net-misc/networkmanager-1.10.4:=[introspection]
+   net-libs/libnma[introspection]
+   >=app-crypt/libsecret-0.18
+   dev-libs/dbus-glib )
+   systemd? ( >=sys-apps/systemd-242
+   >=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
+   elogind? ( >=sys-auth/elogind-237 )
+
+   app-arch/gnome-autoar
+   dev-libs/json-glib
+
+   >=app-accessibility/at-spi2-atk-2.5.3

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-05-17 Thread Sam James

commit: 042dabffb96f3b8fd74e0cbb14c524c81e7304df
Author: Sam James  gentoo  org>
AuthorDate: Tue May 17 21:58:52 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 17 21:58:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=042dabff

gnome-base/gnome-shell: backport new Polkit patch (g_autoptr)

Closes: https://bugs.gentoo.org/844919
Signed-off-by: Sam James  gentoo.org>

 .../gnome-shell/files/42.1-polkit-g_autoptr.patch  | 53 ++
 gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild  |  3 ++
 2 files changed, 56 insertions(+)

diff --git a/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch 
b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
new file mode 100644
index ..78d3de086260
--- /dev/null
+++ b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
@@ -0,0 +1,53 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/1d0a08b5e25fea7b0e792ec9798e68a7c5606a75
+https://bugs.gentoo.org/844919
+
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= 
+Date: Tue, 17 May 2022 15:36:43 +0200
+Subject: [PATCH] build: Do not redefine polkit autocleanup
+
+PolkitAgent recently added autocleanup functions itself, so check
+for their existence at configure time and only define our own when
+they don't exist upstream.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5490
+
+Part-of: 
+--- a/config.h.meson
 b/config.h.meson
+@@ -33,3 +33,6 @@
+ 
+ /* Define if fdwalk is available in libc */
+ #mesondefine HAVE_FDWALK
++
++/* Define if polkit defines autocleanup functions */
++#mesondefine HAVE_POLKIT_AUTOCLEANUP
+--- a/meson.build
 b/meson.build
+@@ -169,6 +169,13 @@ cdata.set('HAVE_FDWALK',
+   cc.has_function('fdwalk')
+ )
+ 
++polkit_has_autocleanup = cc.compiles(
++  '#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
++  #include 
++  void main(void) { g_autoptr(PolkitAgentListener) agent = NULL; }',
++  dependencies: polkit_dep)
++cdata.set('HAVE_POLKIT_AUTOCLEANUP', polkit_has_autocleanup)
++
+ buildtype = get_option('buildtype')
+ if buildtype != 'plain'
+   all_warnings = [
+--- a/src/shell-polkit-authentication-agent.h
 b/src/shell-polkit-authentication-agent.h
+@@ -14,8 +14,10 @@
+ 
+ G_BEGIN_DECLS
+ 
++#ifndef HAVE_POLKIT_AUTOCLEANUP
+ /* Polkit doesn't have g_autoptr support, thus we have to manually set the 
autoptr function here */
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (PolkitAgentListener, g_object_unref)
++#endif
+ 
+ #define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT 
(shell_polkit_authentication_agent_get_type())
+ 
+GitLab

diff --git a/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild 
b/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild
index db6f1390fcef..7a1cc841e4f9 100644
--- a/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild
@@ -140,6 +140,9 @@ PATCHES=(
"${FILESDIR}"/42.0-optional-bluetooth.patch
# Change favorites defaults, bug #479918
"${FILESDIR}"/40.0-defaults.patch
+
+   # Upstream backport, bug #844919
+   "${FILESDIR}"/42.1-polkit-g_autoptr.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-01-24 Thread Sam James

commit: b7d4f62f083b1e8d0857633c0fd2cf356729d6ca
Author: Christophe Lermytte  lermytte  be>
AuthorDate: Mon Jan 24 22:16:41 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 25 00:49:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7d4f62f

gnome-base/gnome-shell: fix build with meson-0.61

Closes: https://bugs.gentoo.org/831921
Signed-off-by: Christophe Lermytte  lermytte.be>
Signed-off-by: Sam James  gentoo.org>

 .../files/41.3-fix-build-with-meson-0.61.1.patch   | 84 ++
 gnome-base/gnome-shell/gnome-shell-41.3.ebuild |  1 +
 2 files changed, 85 insertions(+)

diff --git 
a/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch 
b/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch
new file mode 100644
index ..ecf212b9794c
--- /dev/null
+++ b/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,84 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/65450a836ee9e0722a2d4c3327f52345eae293c6
+https://bugs.gentoo.org/831921
+
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= 
+Date: Thu, 23 Dec 2021 17:18:16 +0100
+Subject: [PATCH] build: Drop incorrect positional arg
+
+Unlike other targets that take a name, i18n.merge_file() does not.
+
+Part-of: 
+---
+ data/meson.build  | 2 +-
+ src/calendar-server/meson.build   | 2 +-
+ subprojects/extensions-app/data/meson.build   | 2 +-
+ subprojects/extensions-app/data/metainfo/meson.build  | 2 +-
+ subprojects/extensions-tool/src/templates/meson.build | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index f924fdf806..76ae45c93a 100644
+--- a/data/meson.build
 b/data/meson.build
+@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir)
+ desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false')
+ 
+ foreach desktop_file : desktop_files
+-  i18n.merge_file('desktop',
++  i18n.merge_file(
+ input: configure_file(
+   input: desktop_file + '.in.in',
+   output: desktop_file + '.in',
+diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build
+index 7363282a59..8b4ef411c8 100644
+--- a/src/calendar-server/meson.build
 b/src/calendar-server/meson.build
+@@ -27,7 +27,7 @@ configure_file(
+   install_dir: servicedir
+ )
+ 
+-i18n.merge_file('evolution-calendar.desktop',
++i18n.merge_file(
+   input: 'evolution-calendar.desktop.in',
+   output: 'evolution-calendar.desktop',
+   po_dir: po_dir,
+diff --git a/subprojects/extensions-app/data/meson.build 
b/subprojects/extensions-app/data/meson.build
+index d7e7d4001c..4b601e8bd1 100644
+--- a/subprojects/extensions-app/data/meson.build
 b/subprojects/extensions-app/data/meson.build
+@@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir)
+ desktopconf.set('app_id', app_id)
+ desktopconf.set('prgname', prgname)
+ 
+-i18n.merge_file('desktop',
++i18n.merge_file(
+   input: configure_file(
+ input: base_id + '.desktop.in.in',
+ output: desktop_file + '.in',
+diff --git a/subprojects/extensions-app/data/metainfo/meson.build 
b/subprojects/extensions-app/data/metainfo/meson.build
+index c4962c0576..a19bfa80a4 100644
+--- a/subprojects/extensions-app/data/metainfo/meson.build
 b/subprojects/extensions-app/data/metainfo/meson.build
+@@ -1,5 +1,5 @@
+ metainfo = app_id + '.metainfo.xml'
+-i18n.merge_file(metainfo,
++i18n.merge_file(
+   input: base_id + '.metainfo.xml.in',
+   output: metainfo,
+   po_dir: po_dir,
+diff --git a/subprojects/extensions-tool/src/templates/meson.build 
b/subprojects/extensions-tool/src/templates/meson.build
+index 670e2bf448..d693bfaddb 100644
+--- a/subprojects/extensions-tool/src/templates/meson.build
 b/subprojects/extensions-tool/src/templates/meson.build
+@@ -4,7 +4,7 @@ template_metas = [
+ ]
+ template_deps = []
+ foreach template : template_metas
+-  template_deps += i18n.merge_file(template,
++  template_deps += i18n.merge_file(
+ input: template + '.in',
+ output: template,
+ po_dir: po_dir,
+-- 
+GitLab
+

diff --git a/gnome-base/gnome-shell/gnome-shell-41.3.ebuild 
b/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
index a5b2b5a53e21..25496f9f35dc 100644
--- a/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
@@ -139,6 +139,7 @@ PATCHES=(
"${FILESDIR}"/40.0-optional-bluetooth.patch
# Change favorites defaults, bug #479918
"${FILESDIR}"/40.0-defaults.patch
+   "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2016-06-27 Thread Alexandre Rostovtsev

commit: de093187ffd212744ab9952167e511d74de42153
Author: Alexandre Rostovtsev  gentoo  org>
AuthorDate: Mon Jun 27 14:05:46 2016 +
Commit: Alexandre Rostovtsev  gentoo  org>
CommitDate: Mon Jun 27 14:05:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de093187

gnome-base/gnome-shell: fix nvidia-drivers crash (bug #587110)

Thanks to Mark R. Pariente for reporting.

Also, require adwaita-icon-theme-3.20 for new grid icon (bug #587130)

Package-Manager: portage-2.3.0

 .../files/gnome-shell-3.20.2-st-nvidia.patch   | 121 +++
 .../gnome-shell/gnome-shell-3.20.2-r1.ebuild   | 221 +
 2 files changed, 342 insertions(+)

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch 
b/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch
new file mode 100644
index 000..63df248
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch
@@ -0,0 +1,121 @@
+From 35cc224240ec4fc8159fc689fe3e093a81f97dc9 Mon Sep 17 00:00:00 2001
+From: Martin Szulecki 
+Date: Tue, 17 May 2016 15:00:04 +0200
+Subject: [PATCH] st: Init framebuffer early to fix gnome-shell crash on NVIDIA
+ drivers
+
+Checking offscreen for COGL_INVALID_HANDLE is not sufficient,
+as cogl_offscreen_new_with_texture doesn't initialize framebuffer
+objects but lets Cogl solve this the lazy way.
+cogl_offscreen_new_with_texture will never return COGL_INVALID_HANDLE
+anyways.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=764898
+---
+ src/st/st-theme-node-drawing.c| 18 --
+ src/st/st-theme-node-transition.c | 25 -
+ 2 files changed, 32 insertions(+), 11 deletions(-)
+
+diff --git a/src/st/st-theme-node-drawing.c b/src/st/st-theme-node-drawing.c
+index 85feb20..8942966 100644
+--- a/src/st/st-theme-node-drawing.c
 b/src/st/st-theme-node-drawing.c
+@@ -2224,6 +2224,7 @@ st_theme_node_prerender_shadow (StThemeNodePaintState 
*state)
+   int max_borders[4];
+   int center_radius, corner_id;
+   CoglHandle buffer, offscreen = COGL_INVALID_HANDLE;
++  CoglError *error = NULL;
+ 
+   /* Get infos from the node */
+   if (state->alloc_width < node->box_shadow_min_width ||
+@@ -2264,10 +2265,12 @@ st_theme_node_prerender_shadow (StThemeNodePaintState 
*state)
+state->box_shadow_height,
+COGL_TEXTURE_NO_SLICING,
+COGL_PIXEL_FORMAT_ANY);
+-  if (buffer != COGL_INVALID_HANDLE)
+-offscreen = cogl_offscreen_new_with_texture (buffer);
++  if (buffer == NULL)
++return;
+ 
+-  if (offscreen != COGL_INVALID_HANDLE)
++  offscreen = cogl_offscreen_new_with_texture (buffer);
++
++  if (cogl_framebuffer_allocate (COGL_FRAMEBUFFER (offscreen), &error))
+ {
+   ClutterActorBox box = { 0, 0, state->box_shadow_width, 
state->box_shadow_height};
+ 
+@@ -2277,14 +2280,17 @@ st_theme_node_prerender_shadow (StThemeNodePaintState 
*state)
+   cogl_framebuffer_clear4f (offscreen, COGL_BUFFER_BIT_COLOR, 0, 0, 0, 0);
+ 
+   st_theme_node_paint_borders (state, offscreen, &box, 0xFF);
+-  cogl_handle_unref (offscreen);
+ 
+   state->box_shadow_pipeline = _st_create_shadow_pipeline 
(st_theme_node_get_box_shadow (node),
+buffer);
+ }
++  else
++{
++  cogl_error_free (error);
++}
+ 
+-  if (buffer != COGL_INVALID_HANDLE)
+-cogl_handle_unref (buffer);
++  cogl_handle_unref (offscreen);
++  cogl_handle_unref (buffer);
+ }
+ 
+ static void
+diff --git a/src/st/st-theme-node-transition.c 
b/src/st/st-theme-node-transition.c
+index 1eef17b..afde977 100644
+--- a/src/st/st-theme-node-transition.c
 b/src/st/st-theme-node-transition.c
+@@ -241,6 +241,7 @@ setup_framebuffers (StThemeNodeTransition *transition,
+ {
+   StThemeNodeTransitionPrivate *priv = transition->priv;
+   guint width, height;
++  CoglError *catch_error = NULL;
+ 
+   /* template material to avoid unnecessary shader compilation */
+   static CoglHandle material_template = COGL_INVALID_HANDLE;
+@@ -263,19 +264,33 @@ setup_framebuffers (StThemeNodeTransition *transition,
+   COGL_TEXTURE_NO_SLICING,
+   COGL_PIXEL_FORMAT_ANY);
+ 
+-  g_return_val_if_fail (priv->old_texture != COGL_INVALID_HANDLE, FALSE);
+-  g_return_val_if_fail (priv->new_texture != COGL_INVALID_HANDLE, FALSE);
++  if (priv->old_texture == COGL_INVALID_HANDLE)
++return FALSE;
++
++  if (priv->new_texture == COGL_INVALID_HANDLE)
++return FALSE;
+ 
+   if (priv->old_offscreen)
+ cogl_handle_unref (priv->old_offscreen);
+   priv->old_offscreen = cogl_offscreen_new_with_texture (priv->old_texture);
++  if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (priv->old_offscreen), 
&catch_error))
++{
++  cogl_object_unref (priv->old_offscreen);
++

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-06-23 Thread Sam James

commit: dea2c90c1aee7d012a467eeb937fc4a7ecae9237
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 24 03:42:30 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 24 03:42:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dea2c90c

gnome-base/gnome-shell: restore 42.1-r3 for Polkit fix

Bug: https://bugs.gentoo.org/844919
Bug: https://bugs.gentoo.org/849566
Fixes: eed2ee4b79e40099d84db0dde29dced1e3346bb6
Signed-off-by: Sam James  gentoo.org>

 .../gnome-shell/files/42.1-polkit-g_autoptr.patch  |  53 ++
 gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild  | 206 +
 2 files changed, 259 insertions(+)

diff --git a/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch 
b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
new file mode 100644
index ..78d3de086260
--- /dev/null
+++ b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
@@ -0,0 +1,53 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/1d0a08b5e25fea7b0e792ec9798e68a7c5606a75
+https://bugs.gentoo.org/844919
+
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= 
+Date: Tue, 17 May 2022 15:36:43 +0200
+Subject: [PATCH] build: Do not redefine polkit autocleanup
+
+PolkitAgent recently added autocleanup functions itself, so check
+for their existence at configure time and only define our own when
+they don't exist upstream.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5490
+
+Part-of: 
+--- a/config.h.meson
 b/config.h.meson
+@@ -33,3 +33,6 @@
+ 
+ /* Define if fdwalk is available in libc */
+ #mesondefine HAVE_FDWALK
++
++/* Define if polkit defines autocleanup functions */
++#mesondefine HAVE_POLKIT_AUTOCLEANUP
+--- a/meson.build
 b/meson.build
+@@ -169,6 +169,13 @@ cdata.set('HAVE_FDWALK',
+   cc.has_function('fdwalk')
+ )
+ 
++polkit_has_autocleanup = cc.compiles(
++  '#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
++  #include 
++  void main(void) { g_autoptr(PolkitAgentListener) agent = NULL; }',
++  dependencies: polkit_dep)
++cdata.set('HAVE_POLKIT_AUTOCLEANUP', polkit_has_autocleanup)
++
+ buildtype = get_option('buildtype')
+ if buildtype != 'plain'
+   all_warnings = [
+--- a/src/shell-polkit-authentication-agent.h
 b/src/shell-polkit-authentication-agent.h
+@@ -14,8 +14,10 @@
+ 
+ G_BEGIN_DECLS
+ 
++#ifndef HAVE_POLKIT_AUTOCLEANUP
+ /* Polkit doesn't have g_autoptr support, thus we have to manually set the 
autoptr function here */
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (PolkitAgentListener, g_object_unref)
++#endif
+ 
+ #define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT 
(shell_polkit_authentication_agent_get_type())
+ 
+GitLab

diff --git a/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild 
b/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild
new file mode 100644
index ..3bc4781371bb
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer/pipewire support is currently automagic
+DEPEND="
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.68:2
+   >=dev-libs/gobject-introspection-1.49.1:=
+   >=dev-libs/gjs-1.71.1
+   >=x11-libs/gtk+-3.15.0:3[introspection]
+   >=x11-wm/mutter-42.0:0/10[introspection,test?]
+   >=sys-auth/polkit-0.120_p20220509[introspection]
+   >=gnome-base/gsettings-desktop-schemas-42_beta[introspection]
+   >=x11-libs/startup-notification-0.11
+   >=app-i18n/ibus-1.5.19
+   >=gnome-base/gnome-desktop-3.35.90:3=[introspection]
+   bluetooth? ( net-wireless/gnome-bluetooth:3=[introspection] )
+   >=media-libs/gstreamer-0.11.92:1.0
+   media-libs/gst-plugins-base:1.0
+   >=media-video/pipewire-0.3.0:=
+   networkmanager? (
+   >=net-misc/networkmanager-1.10.4:=[introspection]
+   net-libs/libnma[introspection]
+   >=app-crypt/libsecret-0.18
+   dev-libs/dbus-glib )
+   systemd? ( >=sys-apps/systemd-242
+   >=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
+   elogind? ( >=sys-auth/elogind-237 )
+
+   app-arch/gnome-autoar
+   dev-libs/json-glib
+
+   >=app-accessibility/at-spi2-atk-2.5.3

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-05-17 Thread Sam James

commit: 042dabffb96f3b8fd74e0cbb14c524c81e7304df
Author: Sam James  gentoo  org>
AuthorDate: Tue May 17 21:58:52 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 17 21:58:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=042dabff

gnome-base/gnome-shell: backport new Polkit patch (g_autoptr)

Closes: https://bugs.gentoo.org/844919
Signed-off-by: Sam James  gentoo.org>

 .../gnome-shell/files/42.1-polkit-g_autoptr.patch  | 53 ++
 gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild  |  3 ++
 2 files changed, 56 insertions(+)

diff --git a/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch 
b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
new file mode 100644
index ..78d3de086260
--- /dev/null
+++ b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
@@ -0,0 +1,53 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/1d0a08b5e25fea7b0e792ec9798e68a7c5606a75
+https://bugs.gentoo.org/844919
+
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= 
+Date: Tue, 17 May 2022 15:36:43 +0200
+Subject: [PATCH] build: Do not redefine polkit autocleanup
+
+PolkitAgent recently added autocleanup functions itself, so check
+for their existence at configure time and only define our own when
+they don't exist upstream.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5490
+
+Part-of: 
+--- a/config.h.meson
 b/config.h.meson
+@@ -33,3 +33,6 @@
+ 
+ /* Define if fdwalk is available in libc */
+ #mesondefine HAVE_FDWALK
++
++/* Define if polkit defines autocleanup functions */
++#mesondefine HAVE_POLKIT_AUTOCLEANUP
+--- a/meson.build
 b/meson.build
+@@ -169,6 +169,13 @@ cdata.set('HAVE_FDWALK',
+   cc.has_function('fdwalk')
+ )
+ 
++polkit_has_autocleanup = cc.compiles(
++  '#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
++  #include 
++  void main(void) { g_autoptr(PolkitAgentListener) agent = NULL; }',
++  dependencies: polkit_dep)
++cdata.set('HAVE_POLKIT_AUTOCLEANUP', polkit_has_autocleanup)
++
+ buildtype = get_option('buildtype')
+ if buildtype != 'plain'
+   all_warnings = [
+--- a/src/shell-polkit-authentication-agent.h
 b/src/shell-polkit-authentication-agent.h
+@@ -14,8 +14,10 @@
+ 
+ G_BEGIN_DECLS
+ 
++#ifndef HAVE_POLKIT_AUTOCLEANUP
+ /* Polkit doesn't have g_autoptr support, thus we have to manually set the 
autoptr function here */
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (PolkitAgentListener, g_object_unref)
++#endif
+ 
+ #define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT 
(shell_polkit_authentication_agent_get_type())
+ 
+GitLab

diff --git a/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild 
b/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild
index db6f1390fcef..7a1cc841e4f9 100644
--- a/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild
@@ -140,6 +140,9 @@ PATCHES=(
"${FILESDIR}"/42.0-optional-bluetooth.patch
# Change favorites defaults, bug #479918
"${FILESDIR}"/40.0-defaults.patch
+
+   # Upstream backport, bug #844919
+   "${FILESDIR}"/42.1-polkit-g_autoptr.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-01-24 Thread Sam James

commit: b7d4f62f083b1e8d0857633c0fd2cf356729d6ca
Author: Christophe Lermytte  lermytte  be>
AuthorDate: Mon Jan 24 22:16:41 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 25 00:49:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7d4f62f

gnome-base/gnome-shell: fix build with meson-0.61

Closes: https://bugs.gentoo.org/831921
Signed-off-by: Christophe Lermytte  lermytte.be>
Signed-off-by: Sam James  gentoo.org>

 .../files/41.3-fix-build-with-meson-0.61.1.patch   | 84 ++
 gnome-base/gnome-shell/gnome-shell-41.3.ebuild |  1 +
 2 files changed, 85 insertions(+)

diff --git 
a/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch 
b/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch
new file mode 100644
index ..ecf212b9794c
--- /dev/null
+++ b/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,84 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/65450a836ee9e0722a2d4c3327f52345eae293c6
+https://bugs.gentoo.org/831921
+
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= 
+Date: Thu, 23 Dec 2021 17:18:16 +0100
+Subject: [PATCH] build: Drop incorrect positional arg
+
+Unlike other targets that take a name, i18n.merge_file() does not.
+
+Part-of: 
+---
+ data/meson.build  | 2 +-
+ src/calendar-server/meson.build   | 2 +-
+ subprojects/extensions-app/data/meson.build   | 2 +-
+ subprojects/extensions-app/data/metainfo/meson.build  | 2 +-
+ subprojects/extensions-tool/src/templates/meson.build | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index f924fdf806..76ae45c93a 100644
+--- a/data/meson.build
 b/data/meson.build
+@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir)
+ desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false')
+ 
+ foreach desktop_file : desktop_files
+-  i18n.merge_file('desktop',
++  i18n.merge_file(
+ input: configure_file(
+   input: desktop_file + '.in.in',
+   output: desktop_file + '.in',
+diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build
+index 7363282a59..8b4ef411c8 100644
+--- a/src/calendar-server/meson.build
 b/src/calendar-server/meson.build
+@@ -27,7 +27,7 @@ configure_file(
+   install_dir: servicedir
+ )
+ 
+-i18n.merge_file('evolution-calendar.desktop',
++i18n.merge_file(
+   input: 'evolution-calendar.desktop.in',
+   output: 'evolution-calendar.desktop',
+   po_dir: po_dir,
+diff --git a/subprojects/extensions-app/data/meson.build 
b/subprojects/extensions-app/data/meson.build
+index d7e7d4001c..4b601e8bd1 100644
+--- a/subprojects/extensions-app/data/meson.build
 b/subprojects/extensions-app/data/meson.build
+@@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir)
+ desktopconf.set('app_id', app_id)
+ desktopconf.set('prgname', prgname)
+ 
+-i18n.merge_file('desktop',
++i18n.merge_file(
+   input: configure_file(
+ input: base_id + '.desktop.in.in',
+ output: desktop_file + '.in',
+diff --git a/subprojects/extensions-app/data/metainfo/meson.build 
b/subprojects/extensions-app/data/metainfo/meson.build
+index c4962c0576..a19bfa80a4 100644
+--- a/subprojects/extensions-app/data/metainfo/meson.build
 b/subprojects/extensions-app/data/metainfo/meson.build
+@@ -1,5 +1,5 @@
+ metainfo = app_id + '.metainfo.xml'
+-i18n.merge_file(metainfo,
++i18n.merge_file(
+   input: base_id + '.metainfo.xml.in',
+   output: metainfo,
+   po_dir: po_dir,
+diff --git a/subprojects/extensions-tool/src/templates/meson.build 
b/subprojects/extensions-tool/src/templates/meson.build
+index 670e2bf448..d693bfaddb 100644
+--- a/subprojects/extensions-tool/src/templates/meson.build
 b/subprojects/extensions-tool/src/templates/meson.build
+@@ -4,7 +4,7 @@ template_metas = [
+ ]
+ template_deps = []
+ foreach template : template_metas
+-  template_deps += i18n.merge_file(template,
++  template_deps += i18n.merge_file(
+ input: template + '.in',
+ output: template,
+ po_dir: po_dir,
+-- 
+GitLab
+

diff --git a/gnome-base/gnome-shell/gnome-shell-41.3.ebuild 
b/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
index a5b2b5a53e21..25496f9f35dc 100644
--- a/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
@@ -139,6 +139,7 @@ PATCHES=(
"${FILESDIR}"/40.0-optional-bluetooth.patch
# Change favorites defaults, bug #479918
"${FILESDIR}"/40.0-defaults.patch
+   "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-03-28 Thread Matt Turner

commit: 998b2b1d772d35e29e0e9df326df12943af8d94e
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Mar 28 15:14:24 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Mar 28 15:17:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=998b2b1d

gnome-base/gnome-shell: Version bump to 41.5

Closes: https://bugs.gentoo.org/836311
Signed-off-by: Matt Turner  gentoo.org>

 gnome-base/gnome-shell/Manifest|   1 +
 5-environment-Require-GnomeBluetooth-1.0.patch |  35 
 ...1.5-environment-Require-gnome-desktop-3.0.patch |  30 +++
 .../41.5-environment-Require-libgweather-3.0.patch |  29 +++
 gnome-base/gnome-shell/gnome-shell-41.5.ebuild | 208 +
 5 files changed, 303 insertions(+)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 9cedbba95216..be1d64fd56a4 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-shell-41.4.tar.xz 1899464 BLAKE2B 
202408be8886bb5eb5615328a774993bea8dfe2fb78d304fde2806096ca68eff3fae7d5bdb4972b627cf10192ff76e3d457dc37eaa806cd4ed57d1558c235a48
 SHA512 
6ed5f215fcf9a1cf450b406620568aeceb3d255e0bb979151ccd2260565748e69825d7f5f7fb0c6768ed584a530599a8dcbc713c1ec12617551ae9df782c5ad7
+DIST gnome-shell-41.5.tar.xz 1899888 BLAKE2B 
73491f382413c313956fc6ab878a54d8a881190ee93cac5d334d169636d8dd21557c78719142f717c94463e02c7ca4eaf12a6e4ca6167e48a002ece9379b6d03
 SHA512 
b638103528413dcfa12d65d0c7add45716d21334294babbadd0a05e3410ca068ae336b28c30eb8811222b9f90e5efdf0d1a6e0a2e3f104b49061bb28333f066e
 DIST gnome-shell-42.0.tar.xz 1918044 BLAKE2B 
742d13ad92795fb71bbe8376a86b8e9a828882288f105f026cf98304ef2e9eae8fb967fa978ec322f5c621303a1798d3490c001bbd63c704b0cddc5db688389d
 SHA512 
39b56d3c09a238d9ca387145fdbddfaa929b124d4006f097b792de2dceb882e50cbce1255b0b4585aea04b522a92a4e7a743367f43a863f95bb6386401e73935

diff --git 
a/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
 
b/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
new file mode 100644
index ..8729a6c3e671
--- /dev/null
+++ 
b/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
@@ -0,0 +1,35 @@
+From 9ce6756235ba272b8602d50d1f005dc2ef265889 Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto 
+Date: Sun, 31 Oct 2021 17:24:58 -0300
+Subject: [PATCH 1/2] environment: Require GnomeBluetooth 1.0
+
+libgnome-bluetooth will start to offer a 2.0 library version
+depending on GTK4. Given that GNOME Shell already depends on
+GTK3, it cannot use this next version of gnome-bluetooth. And
+since GJS will automatically try and use the latest version
+available of any library, Shell must specify it wants 1.0
+explicitly.
+
+Add a required GnomeBluetooth version number when importing it
+for the status indicator.
+
+Part-of: 
+---
+ js/ui/environment.js | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/js/ui/environment.js b/js/ui/environment.js
+index ef53e6022..e906fa6c6 100644
+--- a/js/ui/environment.js
 b/js/ui/environment.js
+@@ -6,6 +6,7 @@ const Config = imports.misc.config;
+ imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
+ imports.gi.versions.Gio = '2.0';
+ imports.gi.versions.GdkPixbuf = '2.0';
++imports.gi.versions.GnomeBluetooth = '1.0';
+ imports.gi.versions.Gtk = '3.0';
+ imports.gi.versions.Soup = '3.0';
+ imports.gi.versions.TelepathyGLib = '0.12';
+-- 
+2.34.1
+

diff --git 
a/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch 
b/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch
new file mode 100644
index ..3dbb50bb989b
--- /dev/null
+++ 
b/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch
@@ -0,0 +1,30 @@
+From 795312b8d5634d3005679b3c1313114e41e538fd Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto 
+Date: Thu, 11 Nov 2021 16:20:39 -0300
+Subject: [PATCH 2/2] environment: Require gnome-desktop 3.0
+
+Pretty much the exact same case of 9ce6756235.
+
+libgnome-desktop saw a major version bump, and we have to
+stick with 3.0 for a while.
+
+Part-of: 
+---
+ js/ui/environment.js | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/js/ui/environment.js b/js/ui/environment.js
+index e906fa6c6..cb254e319 100644
+--- a/js/ui/environment.js
 b/js/ui/environment.js
+@@ -7,6 +7,7 @@ imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
+ imports.gi.versions.Gio = '2.0';
+ imports.gi.versions.GdkPixbuf = '2.0';
+ imports.gi.versions.GnomeBluetooth = '1.0';
++imports.gi.versions.GnomeDesktop = '3.0';
+ imports.gi.versions.Gtk = '3.0';
+ imports.gi.versions.Soup = '3.0';
+ imports.gi.versions.TelepathyGLib = '0.12';
+-- 
+2.34.1
+

diff --git 
a/gnome-base/gnome-shell/files/41.5-environment

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-03-20 Thread Matt Turner

commit: 314bbe352252e6e0085be5342025fee3df903888
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Mar 20 17:38:59 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Mar 20 19:54:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=314bbe35

gnome-base/gnome-shell: Version bump to 42.0

Signed-off-by: Matt Turner  gentoo.org>

 gnome-base/gnome-shell/Manifest|   1 +
 .../files/42.0-optional-bluetooth.patch|  59 ++
 gnome-base/gnome-shell/gnome-shell-42.0.ebuild | 202 +
 3 files changed, 262 insertions(+)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 8f39615367ab..9cedbba95216 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1 +1,2 @@
 DIST gnome-shell-41.4.tar.xz 1899464 BLAKE2B 
202408be8886bb5eb5615328a774993bea8dfe2fb78d304fde2806096ca68eff3fae7d5bdb4972b627cf10192ff76e3d457dc37eaa806cd4ed57d1558c235a48
 SHA512 
6ed5f215fcf9a1cf450b406620568aeceb3d255e0bb979151ccd2260565748e69825d7f5f7fb0c6768ed584a530599a8dcbc713c1ec12617551ae9df782c5ad7
+DIST gnome-shell-42.0.tar.xz 1918044 BLAKE2B 
742d13ad92795fb71bbe8376a86b8e9a828882288f105f026cf98304ef2e9eae8fb967fa978ec322f5c621303a1798d3490c001bbd63c704b0cddc5db688389d
 SHA512 
39b56d3c09a238d9ca387145fdbddfaa929b124d4006f097b792de2dceb882e50cbce1255b0b4585aea04b522a92a4e7a743367f43a863f95bb6386401e73935

diff --git a/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch 
b/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch
new file mode 100644
index ..c7fe07dd69de
--- /dev/null
+++ b/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch
@@ -0,0 +1,59 @@
+From d7cfd7bff4f9fa9d8528f72d4275e07551c6b288 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp 
+Date: Thu, 28 Feb 2019 00:50:19 +0200
+Subject: [PATCH] build: Make bluetooth support optional
+
+---
+ js/misc/meson.build | 2 +-
+ meson.build | 7 ++-
+ meson_options.txt   | 6 ++
+ 3 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/js/misc/meson.build b/js/misc/meson.build
+index 582562711..ec9c62645 100644
+--- a/js/misc/meson.build
 b/js/misc/meson.build
+@@ -3,7 +3,7 @@ jsconf.set('PACKAGE_NAME', meson.project_name())
+ jsconf.set('PACKAGE_VERSION', meson.project_version())
+ jsconf.set('GETTEXT_PACKAGE', meson.project_name())
+ jsconf.set('LIBMUTTER_API_VERSION', mutter_api_version)
+-jsconf.set10('HAVE_BLUETOOTH', bt_dep.found())
++jsconf.set10('HAVE_BLUETOOTH', have_bluetooth)
+ jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager)
+ jsconf.set10('HAVE_SOUP2', have_soup2)
+ jsconf.set('datadir', datadir)
+diff --git a/meson.build b/meson.build
+index 8d7478f9b..79d340840 100644
+--- a/meson.build
 b/meson.build
+@@ -93,7 +93,12 @@ x11_dep = dependency('x11')
+ schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req)
+ gnome_desktop_dep = dependency('gnome-desktop-3.0', version: 
gnome_desktop_req)
+ 
+-bt_dep = dependency('gnome-bluetooth-3.0', version: bt_req, required: false)
++if get_option('bluetooth')
++  bt_dep = dependency('gnome-bluetooth-3.0', version: bt_req)
++  have_bluetooth = true
++else
++  have_bluetooth = false
++endif
+ gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false)
+ gst_base_dep = dependency('gstreamer-base-1.0', required: false)
+ pipewire_dep = dependency('libpipewire-0.3', required: false)
+diff --git a/meson_options.txt b/meson_options.txt
+index f0f2ecf6c..85fc58ea4 100644
+--- a/meson_options.txt
 b/meson_options.txt
+@@ -1,3 +1,9 @@
++option('bluetooth',
++  type: 'boolean',
++  value: true,
++  description: 'Enable bluetooth support'
++)
++
+ option('extensions_tool',
+   type: 'boolean',
+   value: true,
+-- 
+2.34.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-42.0.ebuild 
b/gnome-base/gnome-shell/gnome-shell-42.0.ebuild
new file mode 100644
index ..002edd7d2f1e
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-42.0.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer/pipewire support is currently automagic
+DEPEND="
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.68:2
+   >=dev-libs/gobject-introspe

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2020-07-12 Thread Mart Raudsepp

commit: 11fe8d4fb3c9edab0b962f39bc9a73fb89d55218
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Jul 12 21:00:15 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Jul 12 21:02:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11fe8d4f

gnome-base/gnome-shell: bump to 3.36.4

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 gnome-base/gnome-shell/Manifest  |   1 +
 gnome-base/gnome-shell/files/3.36-defaults.patch |  28 
 gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild | 185 +++
 3 files changed, 214 insertions(+)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 39314cf9595..ee51ba0ed5a 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1 +1,2 @@
 DIST gnome-shell-3.34.5.tar.xz 1558672 BLAKE2B 
7b786a35b6b79a4532d9bbb761ee0629cfb18b8c4c151f5958bb9169cae01ddb489a31c9d1a0cfef3ab6dd1f29c449600c1ad9bb11adbae284e86035bec15234
 SHA512 
ef6a70b0b3bb14fedb07c465742fe0d78c96ddd24352fd0babf871336ee404f9823cadea5bd522e388f5b714d33b219c8ff2badaed379b7135dd90de9fca9bc4
+DIST gnome-shell-3.36.4.tar.xz 1774584 BLAKE2B 
92fe544ae743235c673628f2ad82a75f58eaed94547fc3e0728a492cfee22783cb9d820ac55e1e125bf2ce83dadbddece7222eef9bad0891bfc5a7097ddde4bb
 SHA512 
879b1590d516e7e9e1ad066c870023d59cbaaca13e1e77d8b14de302574b3138451c4b8ab0ba1b43aec3e6e03bd147304e8e0e995359b181522a790afc97d450

diff --git a/gnome-base/gnome-shell/files/3.36-defaults.patch 
b/gnome-base/gnome-shell/files/3.36-defaults.patch
new file mode 100644
index 000..0a4746ac46b
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.36-defaults.patch
@@ -0,0 +1,28 @@
+From 7a671f99b7ef2d5f38be67668aac762764b32a42 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Tue, 10 Dec 2013 23:33:51 +0100
+Subject: [PATCH 1/2] Alter list of default applications
+
+Signed-off-by: Gilles Dartiguelongue 
+[Updated to include desktop file renames to reverse DNS and 3.36 changes]
+Signed-off-by: Mart Raudsepp 
+---
+ data/org.gnome.shell.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.gnome.shell.gschema.xml.in 
b/data/org.gnome.shell.gschema.xml.in
+index c1e6b21..368c654 100644
+--- a/data/org.gnome.shell.gschema.xml.in
 b/data/org.gnome.shell.gschema.xml.in
+@@ -31,7 +31,7 @@
+   
+ 
+ 
+-  [ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 
'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 
'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 
'org.gnome.Software.desktop' ]
++  [ 'chromium-browser-chromium.desktop', 'firefox.desktop', 
'firefox-bin.desktop', 'org.gnome.Evolution.desktop', 
'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 
'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 
'org.gnome.Software.desktop' ]
+   List of desktop file IDs for favorite applications
+   
+ The applications corresponding to these identifiers
+-- 
+2.10.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild
new file mode 100644
index 000..fd3fd1b3ae9
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer support is currently automagic
+DEPEND="
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.57.2:2
+   >=dev-libs/gobject-introspection-1.49.1:=
+   >=dev-libs/gjs-1.63.2
+   >=x11-libs/gtk+-3.15.0:3[introspection]
+   >=x11-wm/mutter-3.36.0:0/6[introspection]
+   >=sys-auth/polkit-0.100[introspection]
+   >=gnome-base/gsettings-desktop-schemas-3.33.1
+   >=x11-libs/startup-notification-0.11
+   >=app-i18n/ibus-1.5.2
+   >=gnome-base/gnome-desktop-3.35.90:3=[introspection]
+   bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+   >=media-libs/gstreamer-0.11.92:1.0
+   media-libs/gst-plugins-base:1.0
+   networkmanager? (
+   >=net-misc/networkmanager-1.10.4:=[introspection]
+   net-libs/libnma[introspection]
+   >=app-crypt/libsecret-0.18
+   dev-libs/dbus-glib )
+   system

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-03-20 Thread Matt Turner

commit: 314bbe352252e6e0085be5342025fee3df903888
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Mar 20 17:38:59 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Mar 20 19:54:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=314bbe35

gnome-base/gnome-shell: Version bump to 42.0

Signed-off-by: Matt Turner  gentoo.org>

 gnome-base/gnome-shell/Manifest|   1 +
 .../files/42.0-optional-bluetooth.patch|  59 ++
 gnome-base/gnome-shell/gnome-shell-42.0.ebuild | 202 +
 3 files changed, 262 insertions(+)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 8f39615367ab..9cedbba95216 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1 +1,2 @@
 DIST gnome-shell-41.4.tar.xz 1899464 BLAKE2B 
202408be8886bb5eb5615328a774993bea8dfe2fb78d304fde2806096ca68eff3fae7d5bdb4972b627cf10192ff76e3d457dc37eaa806cd4ed57d1558c235a48
 SHA512 
6ed5f215fcf9a1cf450b406620568aeceb3d255e0bb979151ccd2260565748e69825d7f5f7fb0c6768ed584a530599a8dcbc713c1ec12617551ae9df782c5ad7
+DIST gnome-shell-42.0.tar.xz 1918044 BLAKE2B 
742d13ad92795fb71bbe8376a86b8e9a828882288f105f026cf98304ef2e9eae8fb967fa978ec322f5c621303a1798d3490c001bbd63c704b0cddc5db688389d
 SHA512 
39b56d3c09a238d9ca387145fdbddfaa929b124d4006f097b792de2dceb882e50cbce1255b0b4585aea04b522a92a4e7a743367f43a863f95bb6386401e73935

diff --git a/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch 
b/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch
new file mode 100644
index ..c7fe07dd69de
--- /dev/null
+++ b/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch
@@ -0,0 +1,59 @@
+From d7cfd7bff4f9fa9d8528f72d4275e07551c6b288 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp 
+Date: Thu, 28 Feb 2019 00:50:19 +0200
+Subject: [PATCH] build: Make bluetooth support optional
+
+---
+ js/misc/meson.build | 2 +-
+ meson.build | 7 ++-
+ meson_options.txt   | 6 ++
+ 3 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/js/misc/meson.build b/js/misc/meson.build
+index 582562711..ec9c62645 100644
+--- a/js/misc/meson.build
 b/js/misc/meson.build
+@@ -3,7 +3,7 @@ jsconf.set('PACKAGE_NAME', meson.project_name())
+ jsconf.set('PACKAGE_VERSION', meson.project_version())
+ jsconf.set('GETTEXT_PACKAGE', meson.project_name())
+ jsconf.set('LIBMUTTER_API_VERSION', mutter_api_version)
+-jsconf.set10('HAVE_BLUETOOTH', bt_dep.found())
++jsconf.set10('HAVE_BLUETOOTH', have_bluetooth)
+ jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager)
+ jsconf.set10('HAVE_SOUP2', have_soup2)
+ jsconf.set('datadir', datadir)
+diff --git a/meson.build b/meson.build
+index 8d7478f9b..79d340840 100644
+--- a/meson.build
 b/meson.build
+@@ -93,7 +93,12 @@ x11_dep = dependency('x11')
+ schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req)
+ gnome_desktop_dep = dependency('gnome-desktop-3.0', version: 
gnome_desktop_req)
+ 
+-bt_dep = dependency('gnome-bluetooth-3.0', version: bt_req, required: false)
++if get_option('bluetooth')
++  bt_dep = dependency('gnome-bluetooth-3.0', version: bt_req)
++  have_bluetooth = true
++else
++  have_bluetooth = false
++endif
+ gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false)
+ gst_base_dep = dependency('gstreamer-base-1.0', required: false)
+ pipewire_dep = dependency('libpipewire-0.3', required: false)
+diff --git a/meson_options.txt b/meson_options.txt
+index f0f2ecf6c..85fc58ea4 100644
+--- a/meson_options.txt
 b/meson_options.txt
+@@ -1,3 +1,9 @@
++option('bluetooth',
++  type: 'boolean',
++  value: true,
++  description: 'Enable bluetooth support'
++)
++
+ option('extensions_tool',
+   type: 'boolean',
+   value: true,
+-- 
+2.34.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-42.0.ebuild 
b/gnome-base/gnome-shell/gnome-shell-42.0.ebuild
new file mode 100644
index ..002edd7d2f1e
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-42.0.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer/pipewire support is currently automagic
+DEPEND="
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.68:2
+   >=dev-libs/gobject-introspe

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-03-28 Thread Matt Turner

commit: 998b2b1d772d35e29e0e9df326df12943af8d94e
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Mar 28 15:14:24 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Mar 28 15:17:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=998b2b1d

gnome-base/gnome-shell: Version bump to 41.5

Closes: https://bugs.gentoo.org/836311
Signed-off-by: Matt Turner  gentoo.org>

 gnome-base/gnome-shell/Manifest|   1 +
 5-environment-Require-GnomeBluetooth-1.0.patch |  35 
 ...1.5-environment-Require-gnome-desktop-3.0.patch |  30 +++
 .../41.5-environment-Require-libgweather-3.0.patch |  29 +++
 gnome-base/gnome-shell/gnome-shell-41.5.ebuild | 208 +
 5 files changed, 303 insertions(+)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 9cedbba95216..be1d64fd56a4 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-shell-41.4.tar.xz 1899464 BLAKE2B 
202408be8886bb5eb5615328a774993bea8dfe2fb78d304fde2806096ca68eff3fae7d5bdb4972b627cf10192ff76e3d457dc37eaa806cd4ed57d1558c235a48
 SHA512 
6ed5f215fcf9a1cf450b406620568aeceb3d255e0bb979151ccd2260565748e69825d7f5f7fb0c6768ed584a530599a8dcbc713c1ec12617551ae9df782c5ad7
+DIST gnome-shell-41.5.tar.xz 1899888 BLAKE2B 
73491f382413c313956fc6ab878a54d8a881190ee93cac5d334d169636d8dd21557c78719142f717c94463e02c7ca4eaf12a6e4ca6167e48a002ece9379b6d03
 SHA512 
b638103528413dcfa12d65d0c7add45716d21334294babbadd0a05e3410ca068ae336b28c30eb8811222b9f90e5efdf0d1a6e0a2e3f104b49061bb28333f066e
 DIST gnome-shell-42.0.tar.xz 1918044 BLAKE2B 
742d13ad92795fb71bbe8376a86b8e9a828882288f105f026cf98304ef2e9eae8fb967fa978ec322f5c621303a1798d3490c001bbd63c704b0cddc5db688389d
 SHA512 
39b56d3c09a238d9ca387145fdbddfaa929b124d4006f097b792de2dceb882e50cbce1255b0b4585aea04b522a92a4e7a743367f43a863f95bb6386401e73935

diff --git 
a/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
 
b/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
new file mode 100644
index ..8729a6c3e671
--- /dev/null
+++ 
b/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
@@ -0,0 +1,35 @@
+From 9ce6756235ba272b8602d50d1f005dc2ef265889 Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto 
+Date: Sun, 31 Oct 2021 17:24:58 -0300
+Subject: [PATCH 1/2] environment: Require GnomeBluetooth 1.0
+
+libgnome-bluetooth will start to offer a 2.0 library version
+depending on GTK4. Given that GNOME Shell already depends on
+GTK3, it cannot use this next version of gnome-bluetooth. And
+since GJS will automatically try and use the latest version
+available of any library, Shell must specify it wants 1.0
+explicitly.
+
+Add a required GnomeBluetooth version number when importing it
+for the status indicator.
+
+Part-of: 
+---
+ js/ui/environment.js | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/js/ui/environment.js b/js/ui/environment.js
+index ef53e6022..e906fa6c6 100644
+--- a/js/ui/environment.js
 b/js/ui/environment.js
+@@ -6,6 +6,7 @@ const Config = imports.misc.config;
+ imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
+ imports.gi.versions.Gio = '2.0';
+ imports.gi.versions.GdkPixbuf = '2.0';
++imports.gi.versions.GnomeBluetooth = '1.0';
+ imports.gi.versions.Gtk = '3.0';
+ imports.gi.versions.Soup = '3.0';
+ imports.gi.versions.TelepathyGLib = '0.12';
+-- 
+2.34.1
+

diff --git 
a/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch 
b/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch
new file mode 100644
index ..3dbb50bb989b
--- /dev/null
+++ 
b/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch
@@ -0,0 +1,30 @@
+From 795312b8d5634d3005679b3c1313114e41e538fd Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto 
+Date: Thu, 11 Nov 2021 16:20:39 -0300
+Subject: [PATCH 2/2] environment: Require gnome-desktop 3.0
+
+Pretty much the exact same case of 9ce6756235.
+
+libgnome-desktop saw a major version bump, and we have to
+stick with 3.0 for a while.
+
+Part-of: 
+---
+ js/ui/environment.js | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/js/ui/environment.js b/js/ui/environment.js
+index e906fa6c6..cb254e319 100644
+--- a/js/ui/environment.js
 b/js/ui/environment.js
+@@ -7,6 +7,7 @@ imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
+ imports.gi.versions.Gio = '2.0';
+ imports.gi.versions.GdkPixbuf = '2.0';
+ imports.gi.versions.GnomeBluetooth = '1.0';
++imports.gi.versions.GnomeDesktop = '3.0';
+ imports.gi.versions.Gtk = '3.0';
+ imports.gi.versions.Soup = '3.0';
+ imports.gi.versions.TelepathyGLib = '0.12';
+-- 
+2.34.1
+

diff --git 
a/gnome-base/gnome-shell/files/41.5-environment

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2020-08-13 Thread Mart Raudsepp

commit: 9c4bb6c530c0a64b7e0c776806882026798bc1dc
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Aug 13 20:38:14 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Aug 13 20:38:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c4bb6c5

gnome-base/gnome-shell: backport fix for CVE-2020-17489

Bug: https://bugs.gentoo.org/736802
Package-Manager: Portage-2.3.103, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../gnome-shell/files/3.34.5-CVE-2020-17489.patch  |  47 +
 .../gnome-shell/gnome-shell-3.34.5-r1.ebuild   | 198 +
 2 files changed, 245 insertions(+)

diff --git a/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch 
b/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch
new file mode 100644
index 000..c6ed147c5a2
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch
@@ -0,0 +1,47 @@
+From e7f7da78d4d5a9abae780589810bd012300442e9 Mon Sep 17 00:00:00 2001
+From: Ray Strode 
+Date: Mon, 27 Jul 2020 10:58:49 -0400
+Subject: [PATCH] loginDialog: Reset auth prompt on vt switch before fade in
+
+At the moment, if a user switches to the login screen vt,
+the login screen fades in whatever was on screen prior, and
+then does a reset.
+
+It makes more sense to reset first, so we fade in what the
+user is going to interact with instead of what they interacted
+with before.
+
+Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2997
+(cherry picked from commit 13137aad9db52223e8b62cecbd3456f4a7f66f04)
+---
+ js/gdm/loginDialog.js | 9 -
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
+index c3f90dc58..6b35ebb16 100644
+--- a/js/gdm/loginDialog.js
 b/js/gdm/loginDialog.js
+@@ -920,16 +920,15 @@ var LoginDialog = GObject.registerClass({
+ if (this.opacity == 255 && this._authPrompt.verificationStatus == 
AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
+ return;
+ 
++if (this._authPrompt.verificationStatus !== 
AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
++this._authPrompt.reset();
++
+ this._bindOpacity();
+ this.ease({
+ opacity: 255,
+ duration: _FADE_ANIMATION_TIME,
+ mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+-onComplete: () => {
+-if (this._authPrompt.verificationStatus != 
AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
+-this._authPrompt.reset();
+-this._unbindOpacity();
+-}
++onComplete: () => this._unbindOpacity()
+ });
+ }
+ 
+-- 
+2.20.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild
new file mode 100644
index 000..0aeebc31a62
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org gnome2-utils meson pax-utils python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer support is currently automagic
+DEPEND="
+   >=dev-libs/libcroco-0.6.8:0.6
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.57.2:2
+   >=dev-libs/gobject-introspection-1.49.1:=
+   >=dev-libs/gjs-1.57.3
+   >=x11-libs/gtk+-3.15.0:3[introspection]
+   >=x11-wm/mutter-3.34.0:0/5[introspection]
+   >=sys-auth/polkit-0.100[introspection]
+   >=gnome-base/gsettings-desktop-schemas-3.33.1
+   >=x11-libs/startup-notification-0.11
+   >=app-i18n/ibus-1.5.2
+   >=gnome-base/gnome-desktop-3.32:3=[introspection]
+   bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+   >=media-libs/gstreamer-0.11.92:1.0
+   media-libs/gst-plugins-base:1.0
+   networkmanager? (
+   >=net-misc/networkmanager-1.10.4:=[introspection]
+   net-libs/libnma[introspection]
+   >=app-crypt/libsecret-0.18
+   dev-libs/dbus-glib )
+   systemd? ( >=sys-apps/systemd-31
+   >=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
+   elogind? ( >=sys-auth/elogind-237 )
+   app-arch/gnome-autoar
+   dev-libs/json-glib
+
+   >=app-accessibility/at-spi2-atk-2.5.3
+   x11-libs/gdk-pixbuf:2[introspection]
+   dev-libs/libxml2:2
+   x11-libs/libX11
+
+

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2019-03-30 Thread Mart Raudsepp

commit: aebd86e5f849893f8a0f00d38b9fd777cc1317a6
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Mar 30 22:26:46 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Mar 30 22:26:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aebd86e5

gnome-base/gnome-shell: remove old

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 gnome-base/gnome-shell/Manifest|   2 -
 .../files/3.28.3-fix-gtk-doc-meson.patch   |  59 ---
 gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild   | 193 -
 3 files changed, 254 deletions(-)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index bea6c4afe6e..a99b75f076a 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,7 +1,5 @@
 DIST gnome-shell-3.24.3.tar.xz 1982088 BLAKE2B 
608b3e73d546dea543a23c31a64b03c32f35d118cd79fd0371a9e392377b4dd03bc16413443d643ed604a2fa81c2838939d92ef4c89a54469a8bd83dc9661f8f
 SHA512 
369ed80b975369b79d4ac9b3f1fbd469fdde331e9079d09eeac6398a9b3c349b09f7570dfce1ed6e1cdfaf514b4b40c6038f34b6c3c7928470b2cd65b702ff15
 DIST gnome-shell-3.26.2-patchset.tar.xz 55492 BLAKE2B 
745b8549f7480b004f4df9b81508c94c9224f77a5a503f45dfda20105e9c305f8cae6ae5e420e597cea9f98899933bb19efd8cf0e9811dc35d0844a3c2920143
 SHA512 
93a730082e84807c23f4b7e390c2d0fb02d3666fc32241de02b3534cc271b160bd9a6a6a2e908ed5bdde91cef383c1e400b0f7cbf04ac104f7f9758218e635ed
 DIST gnome-shell-3.26.2.tar.xz 1405580 BLAKE2B 
ccbb8ad374931335fdc6e752a7feedcba4fe2b61112404b62bc9711b1736216d46fd6e85c6f06439cae50af86a174359d7df0e111e8db6ffed567e91b4292b14
 SHA512 
0e13bc7abff2367d24ea748cd69a1879ff14a6755ef27d17cf20cef61bc6d15bf6e9d18362142a2d6462689f64eada833f9bba21ebaac3a33765a5be0ae48d3a
-DIST gnome-shell-3.28.3-patchset.tar.xz 30820 BLAKE2B 
3402a1c455a5e9d028f6c15ea40db94afb84576643b9bfe9e973a7f375d9f0a22003eab3ccabec0b4b31c31f70ef02ca055c0f62a5c0392529fc375f6cef7029
 SHA512 
a1da84374dd97bff2546d6ddc5656bade69711d05b4b4f4283df66ebbac566767a509dcbd6db52c28a1915cf873c99b81029128cb2a2b63c325dc3e3340fffb4
-DIST gnome-shell-3.28.3.tar.xz 1433388 BLAKE2B 
656e2edabef363d779fd339b7158ad3461a05452a2fdad611889d19f272cd98dfbbb39871d10631326b83108678f8a7245c349583eb257e9d7e4827078134ade
 SHA512 
3550a9e59101a96cf04e4a4bc183ac9a447baa72d74e57c3f438764741b4365f8848895c1eb2c4d0af5c7936e38eb8971ef578bbee315e78b9fdcbbe49fdc1e8
 DIST gnome-shell-3.30.2-patchset.tar.xz 39864 BLAKE2B 
61c02e5ae87ab24f30d28865ff20e32fef63eefbfc1134bf0582eb25933700902aad08176fd2011781262552385bcb3ffaf35fc2d7a060c09ba0d27cb9a8
 SHA512 
8ad976c05488a6b7447d29105a566d0bb975c8e0798be18c1dc07295c51a27578274e611da4979397fc6c4da538f6d9f48072e043829a63faf87a781518ee531
 DIST gnome-shell-3.30.2.tar.xz 1439556 BLAKE2B 
547ccf5571ea431d15c6430619640bd497a381191cad56bbf1a5c9992c5df47eb48527cc2749ea4d417cbe5fd7cc2acb44915ee35d3d89cd386541f19d743877
 SHA512 
5cdf2b9a4dc9dbcc75d76020a01b953ae3922d5820b692d1bc1cf62daf1f00d04b95d6ec076920563f555115c4f4ad11a019e4523a353ef4dd2189a5240239c6

diff --git a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch 
b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
deleted file mode 100644
index 9948b163009..000
--- a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 9f4aa6ebf2193bb19dd8012de7699fce35681078 Mon Sep 17 00:00:00 2001
-From: Pascal Nowack 
-Date: Mon, 6 Aug 2018 14:21:02 +0200
-Subject: [PATCH] build: Fix build with meson >= 47.0
-
-With meson >= 47.0, building gnome-shell will fail
-when --rebuild-types is used as an option for gtk-doc,
-so stop using that option and bump the meson requirement.
-
-https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/191

- docs/reference/shell/meson.build | 3 +--
- docs/reference/st/meson.build| 3 +--
- meson.build  | 2 +-
- 3 files changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/docs/reference/shell/meson.build 
b/docs/reference/shell/meson.build
-index 1469ed422..a32d6a58a 100644
 a/docs/reference/shell/meson.build
-+++ b/docs/reference/shell/meson.build
-@@ -50,8 +50,7 @@ gnome.gtkdoc('shell',
- join_paths(meson.build_root(), 'src')
-   ],
-   scan_args: [
--'--ignore-headers=' + ' '.join(private_headers + exclude_directories),
--'--rebuild-types'
-+'--ignore-headers=' + ' '.join(private_headers + exclude_directories)
-   ],
-   install: true
- )
-diff --git a/docs/reference/st/meson.build b/docs/reference/st/meson.build
-index fe89b53d4..3e9e9ab7c 100644
 a/docs/reference/st/meson.build
-+++ b/docs/reference/st/meson.build
-@@ -17,8 +17,7 @@ gnome.gtkdoc('st',
-   ],
-   scan_args: [
- '--ignore-headers=' + ' '.join(private_headers),
--'--rebuild-sections',
--'--rebuild-types'
-+'--rebuild-sections'
-   ],
-   install: true
- )
-diff --git a/meson.build b/meson.build
-index 03b9d52a8..e33a76183 100644

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2019-02-28 Thread Mart Raudsepp

commit: 35943bda95329e610052831ff5245621a1b53638
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Feb 28 21:11:23 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Feb 28 22:37:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35943bda

gnome-base/gnome-shell: fix and re-enable USE=gtk-doc support

Turned out to be a meson-0.47 incompatibility, not gtk-doc

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../files/3.28.3-fix-gtk-doc-meson.patch   | 59 ++
 gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild   |  9 ++--
 2 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch 
b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
new file mode 100644
index 000..9948b163009
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
@@ -0,0 +1,59 @@
+From 9f4aa6ebf2193bb19dd8012de7699fce35681078 Mon Sep 17 00:00:00 2001
+From: Pascal Nowack 
+Date: Mon, 6 Aug 2018 14:21:02 +0200
+Subject: [PATCH] build: Fix build with meson >= 47.0
+
+With meson >= 47.0, building gnome-shell will fail
+when --rebuild-types is used as an option for gtk-doc,
+so stop using that option and bump the meson requirement.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/191
+---
+ docs/reference/shell/meson.build | 3 +--
+ docs/reference/st/meson.build| 3 +--
+ meson.build  | 2 +-
+ 3 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/docs/reference/shell/meson.build 
b/docs/reference/shell/meson.build
+index 1469ed422..a32d6a58a 100644
+--- a/docs/reference/shell/meson.build
 b/docs/reference/shell/meson.build
+@@ -50,8 +50,7 @@ gnome.gtkdoc('shell',
+ join_paths(meson.build_root(), 'src')
+   ],
+   scan_args: [
+-'--ignore-headers=' + ' '.join(private_headers + exclude_directories),
+-'--rebuild-types'
++'--ignore-headers=' + ' '.join(private_headers + exclude_directories)
+   ],
+   install: true
+ )
+diff --git a/docs/reference/st/meson.build b/docs/reference/st/meson.build
+index fe89b53d4..3e9e9ab7c 100644
+--- a/docs/reference/st/meson.build
 b/docs/reference/st/meson.build
+@@ -17,8 +17,7 @@ gnome.gtkdoc('st',
+   ],
+   scan_args: [
+ '--ignore-headers=' + ' '.join(private_headers),
+-'--rebuild-sections',
+-'--rebuild-types'
++'--rebuild-sections'
+   ],
+   install: true
+ )
+diff --git a/meson.build b/meson.build
+index 03b9d52a8..e33a76183 100644
+--- a/meson.build
 b/meson.build
+@@ -1,6 +1,6 @@
+ project('gnome-shell', 'c',
+   version: '3.28.3',
+-  meson_version: '>= 0.42.0',
++  meson_version: '>= 0.47.0',
+   license: 'GPLv2+'
+ )
+ 
+-- 
+2.17.0
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild
index d49823e4bdf..0a3ea629b3f 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz";
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-IUSE="+bluetooth +browser-extension elogind +ibus +networkmanager nsplugin 
systemd telepathy"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
nsplugin systemd telepathy"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
?? ( elogind systemd )"
 
@@ -110,9 +110,10 @@ DEPEND="${COMMON_DEPEND}
dev-libs/libxslt
>=dev-util/gdbus-codegen-2.45.3
dev-util/glib-utils
+   gtk-doc? ( >=dev-util/gtk-doc-1.17 )
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
-" #gtk-doc? ( >=dev-util/gtk-doc-1.17 )
+"
 
 PATCHES=(
# Patches from gnome-3-26 branch on top of 3.26.2
@@ -121,6 +122,8 @@ PATCHES=(
"${FILESDIR}"/${PV}-defaults.patch
# Fix automagic gnome-bluetooth dep, bug #398145
"${FILESDIR}"/${PV}-optional-bluetooth.patch
+   # Fix gtk-doc build with >=meson-0.47
+   "${FILESDIR}"/${PV}-fix-gtk-doc-meson.patch
 )
 
 src_prepare() {
@@ -135,7 +138,7 @@ src_configure() {
local emesonargs=(
$(meson_use bluetooth)
$(meson_use nsplugin browser_plugin)
-   #$(meson_use gtk-doc gtk_doc) # fails in gtkdoc-scangobj call 
with gtk-doc-1.25 (perl regex parenthesis issue); probably needs newer 
python-based gtk-doc to work
+   $(meson_use gtk-doc gtk_doc)
-Dman=true
$(meson_use networkmanager)
$(meson_use systemd) # this controls journald integration only 
as of 3.26.2 (structured logging and having gnome-shell launched apps use its 
own identifier instead of gnome-session)

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2020-07-12 Thread Mart Raudsepp

commit: 11fe8d4fb3c9edab0b962f39bc9a73fb89d55218
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Jul 12 21:00:15 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Jul 12 21:02:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11fe8d4f

gnome-base/gnome-shell: bump to 3.36.4

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 gnome-base/gnome-shell/Manifest  |   1 +
 gnome-base/gnome-shell/files/3.36-defaults.patch |  28 
 gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild | 185 +++
 3 files changed, 214 insertions(+)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 39314cf9595..ee51ba0ed5a 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1 +1,2 @@
 DIST gnome-shell-3.34.5.tar.xz 1558672 BLAKE2B 
7b786a35b6b79a4532d9bbb761ee0629cfb18b8c4c151f5958bb9169cae01ddb489a31c9d1a0cfef3ab6dd1f29c449600c1ad9bb11adbae284e86035bec15234
 SHA512 
ef6a70b0b3bb14fedb07c465742fe0d78c96ddd24352fd0babf871336ee404f9823cadea5bd522e388f5b714d33b219c8ff2badaed379b7135dd90de9fca9bc4
+DIST gnome-shell-3.36.4.tar.xz 1774584 BLAKE2B 
92fe544ae743235c673628f2ad82a75f58eaed94547fc3e0728a492cfee22783cb9d820ac55e1e125bf2ce83dadbddece7222eef9bad0891bfc5a7097ddde4bb
 SHA512 
879b1590d516e7e9e1ad066c870023d59cbaaca13e1e77d8b14de302574b3138451c4b8ab0ba1b43aec3e6e03bd147304e8e0e995359b181522a790afc97d450

diff --git a/gnome-base/gnome-shell/files/3.36-defaults.patch 
b/gnome-base/gnome-shell/files/3.36-defaults.patch
new file mode 100644
index 000..0a4746ac46b
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.36-defaults.patch
@@ -0,0 +1,28 @@
+From 7a671f99b7ef2d5f38be67668aac762764b32a42 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Tue, 10 Dec 2013 23:33:51 +0100
+Subject: [PATCH 1/2] Alter list of default applications
+
+Signed-off-by: Gilles Dartiguelongue 
+[Updated to include desktop file renames to reverse DNS and 3.36 changes]
+Signed-off-by: Mart Raudsepp 
+---
+ data/org.gnome.shell.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.gnome.shell.gschema.xml.in 
b/data/org.gnome.shell.gschema.xml.in
+index c1e6b21..368c654 100644
+--- a/data/org.gnome.shell.gschema.xml.in
 b/data/org.gnome.shell.gschema.xml.in
+@@ -31,7 +31,7 @@
+   
+ 
+ 
+-  [ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 
'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 
'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 
'org.gnome.Software.desktop' ]
++  [ 'chromium-browser-chromium.desktop', 'firefox.desktop', 
'firefox-bin.desktop', 'org.gnome.Evolution.desktop', 
'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 
'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 
'org.gnome.Software.desktop' ]
+   List of desktop file IDs for favorite applications
+   
+ The applications corresponding to these identifiers
+-- 
+2.10.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild
new file mode 100644
index 000..fd3fd1b3ae9
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer support is currently automagic
+DEPEND="
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.57.2:2
+   >=dev-libs/gobject-introspection-1.49.1:=
+   >=dev-libs/gjs-1.63.2
+   >=x11-libs/gtk+-3.15.0:3[introspection]
+   >=x11-wm/mutter-3.36.0:0/6[introspection]
+   >=sys-auth/polkit-0.100[introspection]
+   >=gnome-base/gsettings-desktop-schemas-3.33.1
+   >=x11-libs/startup-notification-0.11
+   >=app-i18n/ibus-1.5.2
+   >=gnome-base/gnome-desktop-3.35.90:3=[introspection]
+   bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+   >=media-libs/gstreamer-0.11.92:1.0
+   media-libs/gst-plugins-base:1.0
+   networkmanager? (
+   >=net-misc/networkmanager-1.10.4:=[introspection]
+   net-libs/libnma[introspection]
+   >=app-crypt/libsecret-0.18
+   dev-libs/dbus-glib )
+   system

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2020-08-13 Thread Mart Raudsepp

commit: 9c4bb6c530c0a64b7e0c776806882026798bc1dc
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Aug 13 20:38:14 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Aug 13 20:38:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c4bb6c5

gnome-base/gnome-shell: backport fix for CVE-2020-17489

Bug: https://bugs.gentoo.org/736802
Package-Manager: Portage-2.3.103, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../gnome-shell/files/3.34.5-CVE-2020-17489.patch  |  47 +
 .../gnome-shell/gnome-shell-3.34.5-r1.ebuild   | 198 +
 2 files changed, 245 insertions(+)

diff --git a/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch 
b/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch
new file mode 100644
index 000..c6ed147c5a2
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch
@@ -0,0 +1,47 @@
+From e7f7da78d4d5a9abae780589810bd012300442e9 Mon Sep 17 00:00:00 2001
+From: Ray Strode 
+Date: Mon, 27 Jul 2020 10:58:49 -0400
+Subject: [PATCH] loginDialog: Reset auth prompt on vt switch before fade in
+
+At the moment, if a user switches to the login screen vt,
+the login screen fades in whatever was on screen prior, and
+then does a reset.
+
+It makes more sense to reset first, so we fade in what the
+user is going to interact with instead of what they interacted
+with before.
+
+Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2997
+(cherry picked from commit 13137aad9db52223e8b62cecbd3456f4a7f66f04)
+---
+ js/gdm/loginDialog.js | 9 -
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
+index c3f90dc58..6b35ebb16 100644
+--- a/js/gdm/loginDialog.js
 b/js/gdm/loginDialog.js
+@@ -920,16 +920,15 @@ var LoginDialog = GObject.registerClass({
+ if (this.opacity == 255 && this._authPrompt.verificationStatus == 
AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
+ return;
+ 
++if (this._authPrompt.verificationStatus !== 
AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
++this._authPrompt.reset();
++
+ this._bindOpacity();
+ this.ease({
+ opacity: 255,
+ duration: _FADE_ANIMATION_TIME,
+ mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+-onComplete: () => {
+-if (this._authPrompt.verificationStatus != 
AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
+-this._authPrompt.reset();
+-this._unbindOpacity();
+-}
++onComplete: () => this._unbindOpacity()
+ });
+ }
+ 
+-- 
+2.20.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild
new file mode 100644
index 000..0aeebc31a62
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org gnome2-utils meson pax-utils python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer support is currently automagic
+DEPEND="
+   >=dev-libs/libcroco-0.6.8:0.6
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.57.2:2
+   >=dev-libs/gobject-introspection-1.49.1:=
+   >=dev-libs/gjs-1.57.3
+   >=x11-libs/gtk+-3.15.0:3[introspection]
+   >=x11-wm/mutter-3.34.0:0/5[introspection]
+   >=sys-auth/polkit-0.100[introspection]
+   >=gnome-base/gsettings-desktop-schemas-3.33.1
+   >=x11-libs/startup-notification-0.11
+   >=app-i18n/ibus-1.5.2
+   >=gnome-base/gnome-desktop-3.32:3=[introspection]
+   bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+   >=media-libs/gstreamer-0.11.92:1.0
+   media-libs/gst-plugins-base:1.0
+   networkmanager? (
+   >=net-misc/networkmanager-1.10.4:=[introspection]
+   net-libs/libnma[introspection]
+   >=app-crypt/libsecret-0.18
+   dev-libs/dbus-glib )
+   systemd? ( >=sys-apps/systemd-31
+   >=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
+   elogind? ( >=sys-auth/elogind-237 )
+   app-arch/gnome-autoar
+   dev-libs/json-glib
+
+   >=app-accessibility/at-spi2-atk-2.5.3
+   x11-libs/gdk-pixbuf:2[introspection]
+   dev-libs/libxml2:2
+   x11-libs/libX11
+
+

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2016-11-11 Thread Gilles Dartiguelongue

commit: a4358aee4a36b9c9eeef3e487ea9c3459218c0cf
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Fri Nov 11 22:45:09 2016 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sat Nov 12 00:33:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4358aee

gnome-base/gnome-shell: version bump 3.20.4 → 3.22.1

Cleanup unused dependencies. Add missing dependencies with
introspection support. Make nsplugin optional as there is the chrome
extension in tree too. Update comments.

Package-Manager: portage-2.3.2

 .../files/gnome-shell-3.22.0-defaults.patch| 26 
 .../files/gnome-shell-3.22.0-gir-build-fix.patch   | 28 +
 gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild   | 49 +-
 3 files changed, 73 insertions(+), 30 deletions(-)

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch 
b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch
new file mode 100644
index ..b80dbc3
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch
@@ -0,0 +1,26 @@
+From 7a671f99b7ef2d5f38be67668aac762764b32a42 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Tue, 10 Dec 2013 23:33:51 +0100
+Subject: [PATCH 1/2] Alter list of default applications
+
+Signed-off-by: Gilles Dartiguelongue 
+---
+ data/org.gnome.shell.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.gnome.shell.gschema.xml.in 
b/data/org.gnome.shell.gschema.xml.in
+index c1e6b21..368c654 100644
+--- a/data/org.gnome.shell.gschema.xml.in
 b/data/org.gnome.shell.gschema.xml.in
+@@ -31,7 +31,7 @@
+   
+ 
+ 
+-  [ 'epiphany.desktop', 'evolution.desktop', 
'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 
'org.gnome.Software.desktop' ]
++  [ 'chromium-browser-chromium.desktop', 'firefox.desktop', 
'firefox-bin.desktop', 'evolution.desktop', 'rhythmbox.desktop', 
'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' 
]
+   List of desktop file IDs for favorite applications
+   
+ The applications corresponding to these identifiers
+-- 
+2.10.1
+

diff --git 
a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch 
b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch
new file mode 100644
index ..b0c5fb7
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch
@@ -0,0 +1,28 @@
+From 395bede20811b0cf2bcecb0b4e5bcbc2c2fa35f4 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Sat, 12 Nov 2016 00:21:25 +0100
+Subject: [PATCH] Add missing rpath to point to mutter specific libraries
+
+Reported-By: alpha...@gmail.com
+X-Gentoo-Bug: 597842
+X-Gentoo-Url: https://bugs.gentoo.org/show_bug.cgi?id=597842
+---
+ src/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index e9aacfe..fd98ba5 100644
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -311,7 +311,7 @@ shell-enum-types.c: $(srcdir)/shell-enum-types.c.in 
stamp-shell-enum-types.h
+   rm -f $(@F).tmp
+ EXTRA_DIST += shell-enum-types.c.in
+ 
+-libgnome_shell_ldflags = -avoid-version
++libgnome_shell_ldflags = -avoid-version -Wl,-rpath,$(MUTTER_TYPELIB_DIR)
+ libgnome_shell_libadd =   \
+   -lm \
+   $(GNOME_SHELL_LIBS) \
+-- 
+2.10.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild
index c5e7062..60739bd 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild
@@ -6,14 +6,14 @@ EAPI=6
 GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python{3_4,3_5} )
 
-inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd
+inherit autotools gnome2 multilib pax-utils python-r1 systemd
 
 DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-IUSE="+bluetooth +networkmanager +nls -openrc-force"
+IUSE="+bluetooth +networkmanager nsplugin +nls -openrc-force"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
@@ -30,13 +30,9 @@ COMMON_DEPEND="
>=dev-libs/gobject-introspection-1.49.1:=
dev-libs/libical:=
>=x11-libs/gtk+-3.15.0:3[introspection]
-   >=media-libs/clutter-1.21.5:1.0[introspection]
-   >=dev-libs/json-glib-0.13.2
>=dev-libs/libcroco-0.6.8:0.6
>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
>=gnome-base/gsettings-desktop-schemas-3.21.3
-   >=gnome-base/gnome-keyring-3.3.90
-   gnome-base/libgnome-keyring
>=gnome-extra/evolution-data-server-3.17.2:=
>=media-libs/gstreamer-0.11.92:1.0
>=net-im/telepathy-logger-0.2.4[introspection]
@@ -52,14 +48,13 @@ COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-01-24 Thread Sam James

commit: b7d4f62f083b1e8d0857633c0fd2cf356729d6ca
Author: Christophe Lermytte  lermytte  be>
AuthorDate: Mon Jan 24 22:16:41 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 25 00:49:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7d4f62f

gnome-base/gnome-shell: fix build with meson-0.61

Closes: https://bugs.gentoo.org/831921
Signed-off-by: Christophe Lermytte  lermytte.be>
Signed-off-by: Sam James  gentoo.org>

 .../files/41.3-fix-build-with-meson-0.61.1.patch   | 84 ++
 gnome-base/gnome-shell/gnome-shell-41.3.ebuild |  1 +
 2 files changed, 85 insertions(+)

diff --git 
a/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch 
b/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch
new file mode 100644
index ..ecf212b9794c
--- /dev/null
+++ b/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,84 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/65450a836ee9e0722a2d4c3327f52345eae293c6
+https://bugs.gentoo.org/831921
+
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= 
+Date: Thu, 23 Dec 2021 17:18:16 +0100
+Subject: [PATCH] build: Drop incorrect positional arg
+
+Unlike other targets that take a name, i18n.merge_file() does not.
+
+Part-of: 
+---
+ data/meson.build  | 2 +-
+ src/calendar-server/meson.build   | 2 +-
+ subprojects/extensions-app/data/meson.build   | 2 +-
+ subprojects/extensions-app/data/metainfo/meson.build  | 2 +-
+ subprojects/extensions-tool/src/templates/meson.build | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index f924fdf806..76ae45c93a 100644
+--- a/data/meson.build
 b/data/meson.build
+@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir)
+ desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false')
+ 
+ foreach desktop_file : desktop_files
+-  i18n.merge_file('desktop',
++  i18n.merge_file(
+ input: configure_file(
+   input: desktop_file + '.in.in',
+   output: desktop_file + '.in',
+diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build
+index 7363282a59..8b4ef411c8 100644
+--- a/src/calendar-server/meson.build
 b/src/calendar-server/meson.build
+@@ -27,7 +27,7 @@ configure_file(
+   install_dir: servicedir
+ )
+ 
+-i18n.merge_file('evolution-calendar.desktop',
++i18n.merge_file(
+   input: 'evolution-calendar.desktop.in',
+   output: 'evolution-calendar.desktop',
+   po_dir: po_dir,
+diff --git a/subprojects/extensions-app/data/meson.build 
b/subprojects/extensions-app/data/meson.build
+index d7e7d4001c..4b601e8bd1 100644
+--- a/subprojects/extensions-app/data/meson.build
 b/subprojects/extensions-app/data/meson.build
+@@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir)
+ desktopconf.set('app_id', app_id)
+ desktopconf.set('prgname', prgname)
+ 
+-i18n.merge_file('desktop',
++i18n.merge_file(
+   input: configure_file(
+ input: base_id + '.desktop.in.in',
+ output: desktop_file + '.in',
+diff --git a/subprojects/extensions-app/data/metainfo/meson.build 
b/subprojects/extensions-app/data/metainfo/meson.build
+index c4962c0576..a19bfa80a4 100644
+--- a/subprojects/extensions-app/data/metainfo/meson.build
 b/subprojects/extensions-app/data/metainfo/meson.build
+@@ -1,5 +1,5 @@
+ metainfo = app_id + '.metainfo.xml'
+-i18n.merge_file(metainfo,
++i18n.merge_file(
+   input: base_id + '.metainfo.xml.in',
+   output: metainfo,
+   po_dir: po_dir,
+diff --git a/subprojects/extensions-tool/src/templates/meson.build 
b/subprojects/extensions-tool/src/templates/meson.build
+index 670e2bf448..d693bfaddb 100644
+--- a/subprojects/extensions-tool/src/templates/meson.build
 b/subprojects/extensions-tool/src/templates/meson.build
+@@ -4,7 +4,7 @@ template_metas = [
+ ]
+ template_deps = []
+ foreach template : template_metas
+-  template_deps += i18n.merge_file(template,
++  template_deps += i18n.merge_file(
+ input: template + '.in',
+ output: template,
+ po_dir: po_dir,
+-- 
+GitLab
+

diff --git a/gnome-base/gnome-shell/gnome-shell-41.3.ebuild 
b/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
index a5b2b5a53e21..25496f9f35dc 100644
--- a/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
@@ -139,6 +139,7 @@ PATCHES=(
"${FILESDIR}"/40.0-optional-bluetooth.patch
# Change favorites defaults, bug #479918
"${FILESDIR}"/40.0-defaults.patch
+   "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-03-20 Thread Matt Turner

commit: 314bbe352252e6e0085be5342025fee3df903888
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Mar 20 17:38:59 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Mar 20 19:54:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=314bbe35

gnome-base/gnome-shell: Version bump to 42.0

Signed-off-by: Matt Turner  gentoo.org>

 gnome-base/gnome-shell/Manifest|   1 +
 .../files/42.0-optional-bluetooth.patch|  59 ++
 gnome-base/gnome-shell/gnome-shell-42.0.ebuild | 202 +
 3 files changed, 262 insertions(+)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 8f39615367ab..9cedbba95216 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1 +1,2 @@
 DIST gnome-shell-41.4.tar.xz 1899464 BLAKE2B 
202408be8886bb5eb5615328a774993bea8dfe2fb78d304fde2806096ca68eff3fae7d5bdb4972b627cf10192ff76e3d457dc37eaa806cd4ed57d1558c235a48
 SHA512 
6ed5f215fcf9a1cf450b406620568aeceb3d255e0bb979151ccd2260565748e69825d7f5f7fb0c6768ed584a530599a8dcbc713c1ec12617551ae9df782c5ad7
+DIST gnome-shell-42.0.tar.xz 1918044 BLAKE2B 
742d13ad92795fb71bbe8376a86b8e9a828882288f105f026cf98304ef2e9eae8fb967fa978ec322f5c621303a1798d3490c001bbd63c704b0cddc5db688389d
 SHA512 
39b56d3c09a238d9ca387145fdbddfaa929b124d4006f097b792de2dceb882e50cbce1255b0b4585aea04b522a92a4e7a743367f43a863f95bb6386401e73935

diff --git a/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch 
b/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch
new file mode 100644
index ..c7fe07dd69de
--- /dev/null
+++ b/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch
@@ -0,0 +1,59 @@
+From d7cfd7bff4f9fa9d8528f72d4275e07551c6b288 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp 
+Date: Thu, 28 Feb 2019 00:50:19 +0200
+Subject: [PATCH] build: Make bluetooth support optional
+
+---
+ js/misc/meson.build | 2 +-
+ meson.build | 7 ++-
+ meson_options.txt   | 6 ++
+ 3 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/js/misc/meson.build b/js/misc/meson.build
+index 582562711..ec9c62645 100644
+--- a/js/misc/meson.build
 b/js/misc/meson.build
+@@ -3,7 +3,7 @@ jsconf.set('PACKAGE_NAME', meson.project_name())
+ jsconf.set('PACKAGE_VERSION', meson.project_version())
+ jsconf.set('GETTEXT_PACKAGE', meson.project_name())
+ jsconf.set('LIBMUTTER_API_VERSION', mutter_api_version)
+-jsconf.set10('HAVE_BLUETOOTH', bt_dep.found())
++jsconf.set10('HAVE_BLUETOOTH', have_bluetooth)
+ jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager)
+ jsconf.set10('HAVE_SOUP2', have_soup2)
+ jsconf.set('datadir', datadir)
+diff --git a/meson.build b/meson.build
+index 8d7478f9b..79d340840 100644
+--- a/meson.build
 b/meson.build
+@@ -93,7 +93,12 @@ x11_dep = dependency('x11')
+ schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req)
+ gnome_desktop_dep = dependency('gnome-desktop-3.0', version: 
gnome_desktop_req)
+ 
+-bt_dep = dependency('gnome-bluetooth-3.0', version: bt_req, required: false)
++if get_option('bluetooth')
++  bt_dep = dependency('gnome-bluetooth-3.0', version: bt_req)
++  have_bluetooth = true
++else
++  have_bluetooth = false
++endif
+ gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false)
+ gst_base_dep = dependency('gstreamer-base-1.0', required: false)
+ pipewire_dep = dependency('libpipewire-0.3', required: false)
+diff --git a/meson_options.txt b/meson_options.txt
+index f0f2ecf6c..85fc58ea4 100644
+--- a/meson_options.txt
 b/meson_options.txt
+@@ -1,3 +1,9 @@
++option('bluetooth',
++  type: 'boolean',
++  value: true,
++  description: 'Enable bluetooth support'
++)
++
+ option('extensions_tool',
+   type: 'boolean',
+   value: true,
+-- 
+2.34.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-42.0.ebuild 
b/gnome-base/gnome-shell/gnome-shell-42.0.ebuild
new file mode 100644
index ..002edd7d2f1e
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-42.0.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer/pipewire support is currently automagic
+DEPEND="
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.68:2
+   >=dev-libs/gobject-introspe

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2020-07-12 Thread Mart Raudsepp

commit: 11fe8d4fb3c9edab0b962f39bc9a73fb89d55218
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Jul 12 21:00:15 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Jul 12 21:02:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11fe8d4f

gnome-base/gnome-shell: bump to 3.36.4

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 gnome-base/gnome-shell/Manifest  |   1 +
 gnome-base/gnome-shell/files/3.36-defaults.patch |  28 
 gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild | 185 +++
 3 files changed, 214 insertions(+)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 39314cf9595..ee51ba0ed5a 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1 +1,2 @@
 DIST gnome-shell-3.34.5.tar.xz 1558672 BLAKE2B 
7b786a35b6b79a4532d9bbb761ee0629cfb18b8c4c151f5958bb9169cae01ddb489a31c9d1a0cfef3ab6dd1f29c449600c1ad9bb11adbae284e86035bec15234
 SHA512 
ef6a70b0b3bb14fedb07c465742fe0d78c96ddd24352fd0babf871336ee404f9823cadea5bd522e388f5b714d33b219c8ff2badaed379b7135dd90de9fca9bc4
+DIST gnome-shell-3.36.4.tar.xz 1774584 BLAKE2B 
92fe544ae743235c673628f2ad82a75f58eaed94547fc3e0728a492cfee22783cb9d820ac55e1e125bf2ce83dadbddece7222eef9bad0891bfc5a7097ddde4bb
 SHA512 
879b1590d516e7e9e1ad066c870023d59cbaaca13e1e77d8b14de302574b3138451c4b8ab0ba1b43aec3e6e03bd147304e8e0e995359b181522a790afc97d450

diff --git a/gnome-base/gnome-shell/files/3.36-defaults.patch 
b/gnome-base/gnome-shell/files/3.36-defaults.patch
new file mode 100644
index 000..0a4746ac46b
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.36-defaults.patch
@@ -0,0 +1,28 @@
+From 7a671f99b7ef2d5f38be67668aac762764b32a42 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Tue, 10 Dec 2013 23:33:51 +0100
+Subject: [PATCH 1/2] Alter list of default applications
+
+Signed-off-by: Gilles Dartiguelongue 
+[Updated to include desktop file renames to reverse DNS and 3.36 changes]
+Signed-off-by: Mart Raudsepp 
+---
+ data/org.gnome.shell.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.gnome.shell.gschema.xml.in 
b/data/org.gnome.shell.gschema.xml.in
+index c1e6b21..368c654 100644
+--- a/data/org.gnome.shell.gschema.xml.in
 b/data/org.gnome.shell.gschema.xml.in
+@@ -31,7 +31,7 @@
+   
+ 
+ 
+-  [ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 
'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 
'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 
'org.gnome.Software.desktop' ]
++  [ 'chromium-browser-chromium.desktop', 'firefox.desktop', 
'firefox-bin.desktop', 'org.gnome.Evolution.desktop', 
'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 
'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 
'org.gnome.Software.desktop' ]
+   List of desktop file IDs for favorite applications
+   
+ The applications corresponding to these identifiers
+-- 
+2.10.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild
new file mode 100644
index 000..fd3fd1b3ae9
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer support is currently automagic
+DEPEND="
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.57.2:2
+   >=dev-libs/gobject-introspection-1.49.1:=
+   >=dev-libs/gjs-1.63.2
+   >=x11-libs/gtk+-3.15.0:3[introspection]
+   >=x11-wm/mutter-3.36.0:0/6[introspection]
+   >=sys-auth/polkit-0.100[introspection]
+   >=gnome-base/gsettings-desktop-schemas-3.33.1
+   >=x11-libs/startup-notification-0.11
+   >=app-i18n/ibus-1.5.2
+   >=gnome-base/gnome-desktop-3.35.90:3=[introspection]
+   bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+   >=media-libs/gstreamer-0.11.92:1.0
+   media-libs/gst-plugins-base:1.0
+   networkmanager? (
+   >=net-misc/networkmanager-1.10.4:=[introspection]
+   net-libs/libnma[introspection]
+   >=app-crypt/libsecret-0.18
+   dev-libs/dbus-glib )
+   system

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2020-08-13 Thread Mart Raudsepp

commit: 9c4bb6c530c0a64b7e0c776806882026798bc1dc
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Aug 13 20:38:14 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Aug 13 20:38:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c4bb6c5

gnome-base/gnome-shell: backport fix for CVE-2020-17489

Bug: https://bugs.gentoo.org/736802
Package-Manager: Portage-2.3.103, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../gnome-shell/files/3.34.5-CVE-2020-17489.patch  |  47 +
 .../gnome-shell/gnome-shell-3.34.5-r1.ebuild   | 198 +
 2 files changed, 245 insertions(+)

diff --git a/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch 
b/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch
new file mode 100644
index 000..c6ed147c5a2
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch
@@ -0,0 +1,47 @@
+From e7f7da78d4d5a9abae780589810bd012300442e9 Mon Sep 17 00:00:00 2001
+From: Ray Strode 
+Date: Mon, 27 Jul 2020 10:58:49 -0400
+Subject: [PATCH] loginDialog: Reset auth prompt on vt switch before fade in
+
+At the moment, if a user switches to the login screen vt,
+the login screen fades in whatever was on screen prior, and
+then does a reset.
+
+It makes more sense to reset first, so we fade in what the
+user is going to interact with instead of what they interacted
+with before.
+
+Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2997
+(cherry picked from commit 13137aad9db52223e8b62cecbd3456f4a7f66f04)
+---
+ js/gdm/loginDialog.js | 9 -
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
+index c3f90dc58..6b35ebb16 100644
+--- a/js/gdm/loginDialog.js
 b/js/gdm/loginDialog.js
+@@ -920,16 +920,15 @@ var LoginDialog = GObject.registerClass({
+ if (this.opacity == 255 && this._authPrompt.verificationStatus == 
AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
+ return;
+ 
++if (this._authPrompt.verificationStatus !== 
AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
++this._authPrompt.reset();
++
+ this._bindOpacity();
+ this.ease({
+ opacity: 255,
+ duration: _FADE_ANIMATION_TIME,
+ mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+-onComplete: () => {
+-if (this._authPrompt.verificationStatus != 
AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
+-this._authPrompt.reset();
+-this._unbindOpacity();
+-}
++onComplete: () => this._unbindOpacity()
+ });
+ }
+ 
+-- 
+2.20.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild
new file mode 100644
index 000..0aeebc31a62
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org gnome2-utils meson pax-utils python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer support is currently automagic
+DEPEND="
+   >=dev-libs/libcroco-0.6.8:0.6
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.57.2:2
+   >=dev-libs/gobject-introspection-1.49.1:=
+   >=dev-libs/gjs-1.57.3
+   >=x11-libs/gtk+-3.15.0:3[introspection]
+   >=x11-wm/mutter-3.34.0:0/5[introspection]
+   >=sys-auth/polkit-0.100[introspection]
+   >=gnome-base/gsettings-desktop-schemas-3.33.1
+   >=x11-libs/startup-notification-0.11
+   >=app-i18n/ibus-1.5.2
+   >=gnome-base/gnome-desktop-3.32:3=[introspection]
+   bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+   >=media-libs/gstreamer-0.11.92:1.0
+   media-libs/gst-plugins-base:1.0
+   networkmanager? (
+   >=net-misc/networkmanager-1.10.4:=[introspection]
+   net-libs/libnma[introspection]
+   >=app-crypt/libsecret-0.18
+   dev-libs/dbus-glib )
+   systemd? ( >=sys-apps/systemd-31
+   >=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
+   elogind? ( >=sys-auth/elogind-237 )
+   app-arch/gnome-autoar
+   dev-libs/json-glib
+
+   >=app-accessibility/at-spi2-atk-2.5.3
+   x11-libs/gdk-pixbuf:2[introspection]
+   dev-libs/libxml2:2
+   x11-libs/libX11
+
+

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2019-03-30 Thread Mart Raudsepp

commit: aebd86e5f849893f8a0f00d38b9fd777cc1317a6
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Mar 30 22:26:46 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Mar 30 22:26:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aebd86e5

gnome-base/gnome-shell: remove old

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 gnome-base/gnome-shell/Manifest|   2 -
 .../files/3.28.3-fix-gtk-doc-meson.patch   |  59 ---
 gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild   | 193 -
 3 files changed, 254 deletions(-)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index bea6c4afe6e..a99b75f076a 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,7 +1,5 @@
 DIST gnome-shell-3.24.3.tar.xz 1982088 BLAKE2B 
608b3e73d546dea543a23c31a64b03c32f35d118cd79fd0371a9e392377b4dd03bc16413443d643ed604a2fa81c2838939d92ef4c89a54469a8bd83dc9661f8f
 SHA512 
369ed80b975369b79d4ac9b3f1fbd469fdde331e9079d09eeac6398a9b3c349b09f7570dfce1ed6e1cdfaf514b4b40c6038f34b6c3c7928470b2cd65b702ff15
 DIST gnome-shell-3.26.2-patchset.tar.xz 55492 BLAKE2B 
745b8549f7480b004f4df9b81508c94c9224f77a5a503f45dfda20105e9c305f8cae6ae5e420e597cea9f98899933bb19efd8cf0e9811dc35d0844a3c2920143
 SHA512 
93a730082e84807c23f4b7e390c2d0fb02d3666fc32241de02b3534cc271b160bd9a6a6a2e908ed5bdde91cef383c1e400b0f7cbf04ac104f7f9758218e635ed
 DIST gnome-shell-3.26.2.tar.xz 1405580 BLAKE2B 
ccbb8ad374931335fdc6e752a7feedcba4fe2b61112404b62bc9711b1736216d46fd6e85c6f06439cae50af86a174359d7df0e111e8db6ffed567e91b4292b14
 SHA512 
0e13bc7abff2367d24ea748cd69a1879ff14a6755ef27d17cf20cef61bc6d15bf6e9d18362142a2d6462689f64eada833f9bba21ebaac3a33765a5be0ae48d3a
-DIST gnome-shell-3.28.3-patchset.tar.xz 30820 BLAKE2B 
3402a1c455a5e9d028f6c15ea40db94afb84576643b9bfe9e973a7f375d9f0a22003eab3ccabec0b4b31c31f70ef02ca055c0f62a5c0392529fc375f6cef7029
 SHA512 
a1da84374dd97bff2546d6ddc5656bade69711d05b4b4f4283df66ebbac566767a509dcbd6db52c28a1915cf873c99b81029128cb2a2b63c325dc3e3340fffb4
-DIST gnome-shell-3.28.3.tar.xz 1433388 BLAKE2B 
656e2edabef363d779fd339b7158ad3461a05452a2fdad611889d19f272cd98dfbbb39871d10631326b83108678f8a7245c349583eb257e9d7e4827078134ade
 SHA512 
3550a9e59101a96cf04e4a4bc183ac9a447baa72d74e57c3f438764741b4365f8848895c1eb2c4d0af5c7936e38eb8971ef578bbee315e78b9fdcbbe49fdc1e8
 DIST gnome-shell-3.30.2-patchset.tar.xz 39864 BLAKE2B 
61c02e5ae87ab24f30d28865ff20e32fef63eefbfc1134bf0582eb25933700902aad08176fd2011781262552385bcb3ffaf35fc2d7a060c09ba0d27cb9a8
 SHA512 
8ad976c05488a6b7447d29105a566d0bb975c8e0798be18c1dc07295c51a27578274e611da4979397fc6c4da538f6d9f48072e043829a63faf87a781518ee531
 DIST gnome-shell-3.30.2.tar.xz 1439556 BLAKE2B 
547ccf5571ea431d15c6430619640bd497a381191cad56bbf1a5c9992c5df47eb48527cc2749ea4d417cbe5fd7cc2acb44915ee35d3d89cd386541f19d743877
 SHA512 
5cdf2b9a4dc9dbcc75d76020a01b953ae3922d5820b692d1bc1cf62daf1f00d04b95d6ec076920563f555115c4f4ad11a019e4523a353ef4dd2189a5240239c6

diff --git a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch 
b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
deleted file mode 100644
index 9948b163009..000
--- a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 9f4aa6ebf2193bb19dd8012de7699fce35681078 Mon Sep 17 00:00:00 2001
-From: Pascal Nowack 
-Date: Mon, 6 Aug 2018 14:21:02 +0200
-Subject: [PATCH] build: Fix build with meson >= 47.0
-
-With meson >= 47.0, building gnome-shell will fail
-when --rebuild-types is used as an option for gtk-doc,
-so stop using that option and bump the meson requirement.
-
-https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/191

- docs/reference/shell/meson.build | 3 +--
- docs/reference/st/meson.build| 3 +--
- meson.build  | 2 +-
- 3 files changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/docs/reference/shell/meson.build 
b/docs/reference/shell/meson.build
-index 1469ed422..a32d6a58a 100644
 a/docs/reference/shell/meson.build
-+++ b/docs/reference/shell/meson.build
-@@ -50,8 +50,7 @@ gnome.gtkdoc('shell',
- join_paths(meson.build_root(), 'src')
-   ],
-   scan_args: [
--'--ignore-headers=' + ' '.join(private_headers + exclude_directories),
--'--rebuild-types'
-+'--ignore-headers=' + ' '.join(private_headers + exclude_directories)
-   ],
-   install: true
- )
-diff --git a/docs/reference/st/meson.build b/docs/reference/st/meson.build
-index fe89b53d4..3e9e9ab7c 100644
 a/docs/reference/st/meson.build
-+++ b/docs/reference/st/meson.build
-@@ -17,8 +17,7 @@ gnome.gtkdoc('st',
-   ],
-   scan_args: [
- '--ignore-headers=' + ' '.join(private_headers),
--'--rebuild-sections',
--'--rebuild-types'
-+'--rebuild-sections'
-   ],
-   install: true
- )
-diff --git a/meson.build b/meson.build
-index 03b9d52a8..e33a76183 100644

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2019-02-28 Thread Mart Raudsepp

commit: 35943bda95329e610052831ff5245621a1b53638
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Feb 28 21:11:23 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Feb 28 22:37:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35943bda

gnome-base/gnome-shell: fix and re-enable USE=gtk-doc support

Turned out to be a meson-0.47 incompatibility, not gtk-doc

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../files/3.28.3-fix-gtk-doc-meson.patch   | 59 ++
 gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild   |  9 ++--
 2 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch 
b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
new file mode 100644
index 000..9948b163009
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
@@ -0,0 +1,59 @@
+From 9f4aa6ebf2193bb19dd8012de7699fce35681078 Mon Sep 17 00:00:00 2001
+From: Pascal Nowack 
+Date: Mon, 6 Aug 2018 14:21:02 +0200
+Subject: [PATCH] build: Fix build with meson >= 47.0
+
+With meson >= 47.0, building gnome-shell will fail
+when --rebuild-types is used as an option for gtk-doc,
+so stop using that option and bump the meson requirement.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/191
+---
+ docs/reference/shell/meson.build | 3 +--
+ docs/reference/st/meson.build| 3 +--
+ meson.build  | 2 +-
+ 3 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/docs/reference/shell/meson.build 
b/docs/reference/shell/meson.build
+index 1469ed422..a32d6a58a 100644
+--- a/docs/reference/shell/meson.build
 b/docs/reference/shell/meson.build
+@@ -50,8 +50,7 @@ gnome.gtkdoc('shell',
+ join_paths(meson.build_root(), 'src')
+   ],
+   scan_args: [
+-'--ignore-headers=' + ' '.join(private_headers + exclude_directories),
+-'--rebuild-types'
++'--ignore-headers=' + ' '.join(private_headers + exclude_directories)
+   ],
+   install: true
+ )
+diff --git a/docs/reference/st/meson.build b/docs/reference/st/meson.build
+index fe89b53d4..3e9e9ab7c 100644
+--- a/docs/reference/st/meson.build
 b/docs/reference/st/meson.build
+@@ -17,8 +17,7 @@ gnome.gtkdoc('st',
+   ],
+   scan_args: [
+ '--ignore-headers=' + ' '.join(private_headers),
+-'--rebuild-sections',
+-'--rebuild-types'
++'--rebuild-sections'
+   ],
+   install: true
+ )
+diff --git a/meson.build b/meson.build
+index 03b9d52a8..e33a76183 100644
+--- a/meson.build
 b/meson.build
+@@ -1,6 +1,6 @@
+ project('gnome-shell', 'c',
+   version: '3.28.3',
+-  meson_version: '>= 0.42.0',
++  meson_version: '>= 0.47.0',
+   license: 'GPLv2+'
+ )
+ 
+-- 
+2.17.0
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild
index d49823e4bdf..0a3ea629b3f 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz";
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-IUSE="+bluetooth +browser-extension elogind +ibus +networkmanager nsplugin 
systemd telepathy"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
nsplugin systemd telepathy"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
?? ( elogind systemd )"
 
@@ -110,9 +110,10 @@ DEPEND="${COMMON_DEPEND}
dev-libs/libxslt
>=dev-util/gdbus-codegen-2.45.3
dev-util/glib-utils
+   gtk-doc? ( >=dev-util/gtk-doc-1.17 )
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
-" #gtk-doc? ( >=dev-util/gtk-doc-1.17 )
+"
 
 PATCHES=(
# Patches from gnome-3-26 branch on top of 3.26.2
@@ -121,6 +122,8 @@ PATCHES=(
"${FILESDIR}"/${PV}-defaults.patch
# Fix automagic gnome-bluetooth dep, bug #398145
"${FILESDIR}"/${PV}-optional-bluetooth.patch
+   # Fix gtk-doc build with >=meson-0.47
+   "${FILESDIR}"/${PV}-fix-gtk-doc-meson.patch
 )
 
 src_prepare() {
@@ -135,7 +138,7 @@ src_configure() {
local emesonargs=(
$(meson_use bluetooth)
$(meson_use nsplugin browser_plugin)
-   #$(meson_use gtk-doc gtk_doc) # fails in gtkdoc-scangobj call 
with gtk-doc-1.25 (perl regex parenthesis issue); probably needs newer 
python-based gtk-doc to work
+   $(meson_use gtk-doc gtk_doc)
-Dman=true
$(meson_use networkmanager)
$(meson_use systemd) # this controls journald integration only 
as of 3.26.2 (structured logging and having gnome-shell launched apps use its 
own identifier instead of gnome-session)

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2016-11-11 Thread Gilles Dartiguelongue

commit: a4358aee4a36b9c9eeef3e487ea9c3459218c0cf
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Fri Nov 11 22:45:09 2016 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sat Nov 12 00:33:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4358aee

gnome-base/gnome-shell: version bump 3.20.4 → 3.22.1

Cleanup unused dependencies. Add missing dependencies with
introspection support. Make nsplugin optional as there is the chrome
extension in tree too. Update comments.

Package-Manager: portage-2.3.2

 .../files/gnome-shell-3.22.0-defaults.patch| 26 
 .../files/gnome-shell-3.22.0-gir-build-fix.patch   | 28 +
 gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild   | 49 +-
 3 files changed, 73 insertions(+), 30 deletions(-)

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch 
b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch
new file mode 100644
index ..b80dbc3
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch
@@ -0,0 +1,26 @@
+From 7a671f99b7ef2d5f38be67668aac762764b32a42 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Tue, 10 Dec 2013 23:33:51 +0100
+Subject: [PATCH 1/2] Alter list of default applications
+
+Signed-off-by: Gilles Dartiguelongue 
+---
+ data/org.gnome.shell.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.gnome.shell.gschema.xml.in 
b/data/org.gnome.shell.gschema.xml.in
+index c1e6b21..368c654 100644
+--- a/data/org.gnome.shell.gschema.xml.in
 b/data/org.gnome.shell.gschema.xml.in
+@@ -31,7 +31,7 @@
+   
+ 
+ 
+-  [ 'epiphany.desktop', 'evolution.desktop', 
'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 
'org.gnome.Software.desktop' ]
++  [ 'chromium-browser-chromium.desktop', 'firefox.desktop', 
'firefox-bin.desktop', 'evolution.desktop', 'rhythmbox.desktop', 
'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' 
]
+   List of desktop file IDs for favorite applications
+   
+ The applications corresponding to these identifiers
+-- 
+2.10.1
+

diff --git 
a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch 
b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch
new file mode 100644
index ..b0c5fb7
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch
@@ -0,0 +1,28 @@
+From 395bede20811b0cf2bcecb0b4e5bcbc2c2fa35f4 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Sat, 12 Nov 2016 00:21:25 +0100
+Subject: [PATCH] Add missing rpath to point to mutter specific libraries
+
+Reported-By: alpha...@gmail.com
+X-Gentoo-Bug: 597842
+X-Gentoo-Url: https://bugs.gentoo.org/show_bug.cgi?id=597842
+---
+ src/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index e9aacfe..fd98ba5 100644
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -311,7 +311,7 @@ shell-enum-types.c: $(srcdir)/shell-enum-types.c.in 
stamp-shell-enum-types.h
+   rm -f $(@F).tmp
+ EXTRA_DIST += shell-enum-types.c.in
+ 
+-libgnome_shell_ldflags = -avoid-version
++libgnome_shell_ldflags = -avoid-version -Wl,-rpath,$(MUTTER_TYPELIB_DIR)
+ libgnome_shell_libadd =   \
+   -lm \
+   $(GNOME_SHELL_LIBS) \
+-- 
+2.10.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild
index c5e7062..60739bd 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild
@@ -6,14 +6,14 @@ EAPI=6
 GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python{3_4,3_5} )
 
-inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd
+inherit autotools gnome2 multilib pax-utils python-r1 systemd
 
 DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-IUSE="+bluetooth +networkmanager +nls -openrc-force"
+IUSE="+bluetooth +networkmanager nsplugin +nls -openrc-force"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
@@ -30,13 +30,9 @@ COMMON_DEPEND="
>=dev-libs/gobject-introspection-1.49.1:=
dev-libs/libical:=
>=x11-libs/gtk+-3.15.0:3[introspection]
-   >=media-libs/clutter-1.21.5:1.0[introspection]
-   >=dev-libs/json-glib-0.13.2
>=dev-libs/libcroco-0.6.8:0.6
>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
>=gnome-base/gsettings-desktop-schemas-3.21.3
-   >=gnome-base/gnome-keyring-3.3.90
-   gnome-base/libgnome-keyring
>=gnome-extra/evolution-data-server-3.17.2:=
>=media-libs/gstreamer-0.11.92:1.0
>=net-im/telepathy-logger-0.2.4[introspection]
@@ -52,14 +48,13 @@ COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2016-06-27 Thread Alexandre Rostovtsev

commit: de093187ffd212744ab9952167e511d74de42153
Author: Alexandre Rostovtsev  gentoo  org>
AuthorDate: Mon Jun 27 14:05:46 2016 +
Commit: Alexandre Rostovtsev  gentoo  org>
CommitDate: Mon Jun 27 14:05:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de093187

gnome-base/gnome-shell: fix nvidia-drivers crash (bug #587110)

Thanks to Mark R. Pariente for reporting.

Also, require adwaita-icon-theme-3.20 for new grid icon (bug #587130)

Package-Manager: portage-2.3.0

 .../files/gnome-shell-3.20.2-st-nvidia.patch   | 121 +++
 .../gnome-shell/gnome-shell-3.20.2-r1.ebuild   | 221 +
 2 files changed, 342 insertions(+)

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch 
b/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch
new file mode 100644
index 000..63df248
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch
@@ -0,0 +1,121 @@
+From 35cc224240ec4fc8159fc689fe3e093a81f97dc9 Mon Sep 17 00:00:00 2001
+From: Martin Szulecki 
+Date: Tue, 17 May 2016 15:00:04 +0200
+Subject: [PATCH] st: Init framebuffer early to fix gnome-shell crash on NVIDIA
+ drivers
+
+Checking offscreen for COGL_INVALID_HANDLE is not sufficient,
+as cogl_offscreen_new_with_texture doesn't initialize framebuffer
+objects but lets Cogl solve this the lazy way.
+cogl_offscreen_new_with_texture will never return COGL_INVALID_HANDLE
+anyways.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=764898
+---
+ src/st/st-theme-node-drawing.c| 18 --
+ src/st/st-theme-node-transition.c | 25 -
+ 2 files changed, 32 insertions(+), 11 deletions(-)
+
+diff --git a/src/st/st-theme-node-drawing.c b/src/st/st-theme-node-drawing.c
+index 85feb20..8942966 100644
+--- a/src/st/st-theme-node-drawing.c
 b/src/st/st-theme-node-drawing.c
+@@ -2224,6 +2224,7 @@ st_theme_node_prerender_shadow (StThemeNodePaintState 
*state)
+   int max_borders[4];
+   int center_radius, corner_id;
+   CoglHandle buffer, offscreen = COGL_INVALID_HANDLE;
++  CoglError *error = NULL;
+ 
+   /* Get infos from the node */
+   if (state->alloc_width < node->box_shadow_min_width ||
+@@ -2264,10 +2265,12 @@ st_theme_node_prerender_shadow (StThemeNodePaintState 
*state)
+state->box_shadow_height,
+COGL_TEXTURE_NO_SLICING,
+COGL_PIXEL_FORMAT_ANY);
+-  if (buffer != COGL_INVALID_HANDLE)
+-offscreen = cogl_offscreen_new_with_texture (buffer);
++  if (buffer == NULL)
++return;
+ 
+-  if (offscreen != COGL_INVALID_HANDLE)
++  offscreen = cogl_offscreen_new_with_texture (buffer);
++
++  if (cogl_framebuffer_allocate (COGL_FRAMEBUFFER (offscreen), &error))
+ {
+   ClutterActorBox box = { 0, 0, state->box_shadow_width, 
state->box_shadow_height};
+ 
+@@ -2277,14 +2280,17 @@ st_theme_node_prerender_shadow (StThemeNodePaintState 
*state)
+   cogl_framebuffer_clear4f (offscreen, COGL_BUFFER_BIT_COLOR, 0, 0, 0, 0);
+ 
+   st_theme_node_paint_borders (state, offscreen, &box, 0xFF);
+-  cogl_handle_unref (offscreen);
+ 
+   state->box_shadow_pipeline = _st_create_shadow_pipeline 
(st_theme_node_get_box_shadow (node),
+buffer);
+ }
++  else
++{
++  cogl_error_free (error);
++}
+ 
+-  if (buffer != COGL_INVALID_HANDLE)
+-cogl_handle_unref (buffer);
++  cogl_handle_unref (offscreen);
++  cogl_handle_unref (buffer);
+ }
+ 
+ static void
+diff --git a/src/st/st-theme-node-transition.c 
b/src/st/st-theme-node-transition.c
+index 1eef17b..afde977 100644
+--- a/src/st/st-theme-node-transition.c
 b/src/st/st-theme-node-transition.c
+@@ -241,6 +241,7 @@ setup_framebuffers (StThemeNodeTransition *transition,
+ {
+   StThemeNodeTransitionPrivate *priv = transition->priv;
+   guint width, height;
++  CoglError *catch_error = NULL;
+ 
+   /* template material to avoid unnecessary shader compilation */
+   static CoglHandle material_template = COGL_INVALID_HANDLE;
+@@ -263,19 +264,33 @@ setup_framebuffers (StThemeNodeTransition *transition,
+   COGL_TEXTURE_NO_SLICING,
+   COGL_PIXEL_FORMAT_ANY);
+ 
+-  g_return_val_if_fail (priv->old_texture != COGL_INVALID_HANDLE, FALSE);
+-  g_return_val_if_fail (priv->new_texture != COGL_INVALID_HANDLE, FALSE);
++  if (priv->old_texture == COGL_INVALID_HANDLE)
++return FALSE;
++
++  if (priv->new_texture == COGL_INVALID_HANDLE)
++return FALSE;
+ 
+   if (priv->old_offscreen)
+ cogl_handle_unref (priv->old_offscreen);
+   priv->old_offscreen = cogl_offscreen_new_with_texture (priv->old_texture);
++  if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (priv->old_offscreen), 
&catch_error))
++{
++  cogl_object_unref (priv->old_offscreen);
++

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2019-03-30 Thread Mart Raudsepp

commit: aebd86e5f849893f8a0f00d38b9fd777cc1317a6
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Mar 30 22:26:46 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Mar 30 22:26:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aebd86e5

gnome-base/gnome-shell: remove old

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 gnome-base/gnome-shell/Manifest|   2 -
 .../files/3.28.3-fix-gtk-doc-meson.patch   |  59 ---
 gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild   | 193 -
 3 files changed, 254 deletions(-)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index bea6c4afe6e..a99b75f076a 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,7 +1,5 @@
 DIST gnome-shell-3.24.3.tar.xz 1982088 BLAKE2B 
608b3e73d546dea543a23c31a64b03c32f35d118cd79fd0371a9e392377b4dd03bc16413443d643ed604a2fa81c2838939d92ef4c89a54469a8bd83dc9661f8f
 SHA512 
369ed80b975369b79d4ac9b3f1fbd469fdde331e9079d09eeac6398a9b3c349b09f7570dfce1ed6e1cdfaf514b4b40c6038f34b6c3c7928470b2cd65b702ff15
 DIST gnome-shell-3.26.2-patchset.tar.xz 55492 BLAKE2B 
745b8549f7480b004f4df9b81508c94c9224f77a5a503f45dfda20105e9c305f8cae6ae5e420e597cea9f98899933bb19efd8cf0e9811dc35d0844a3c2920143
 SHA512 
93a730082e84807c23f4b7e390c2d0fb02d3666fc32241de02b3534cc271b160bd9a6a6a2e908ed5bdde91cef383c1e400b0f7cbf04ac104f7f9758218e635ed
 DIST gnome-shell-3.26.2.tar.xz 1405580 BLAKE2B 
ccbb8ad374931335fdc6e752a7feedcba4fe2b61112404b62bc9711b1736216d46fd6e85c6f06439cae50af86a174359d7df0e111e8db6ffed567e91b4292b14
 SHA512 
0e13bc7abff2367d24ea748cd69a1879ff14a6755ef27d17cf20cef61bc6d15bf6e9d18362142a2d6462689f64eada833f9bba21ebaac3a33765a5be0ae48d3a
-DIST gnome-shell-3.28.3-patchset.tar.xz 30820 BLAKE2B 
3402a1c455a5e9d028f6c15ea40db94afb84576643b9bfe9e973a7f375d9f0a22003eab3ccabec0b4b31c31f70ef02ca055c0f62a5c0392529fc375f6cef7029
 SHA512 
a1da84374dd97bff2546d6ddc5656bade69711d05b4b4f4283df66ebbac566767a509dcbd6db52c28a1915cf873c99b81029128cb2a2b63c325dc3e3340fffb4
-DIST gnome-shell-3.28.3.tar.xz 1433388 BLAKE2B 
656e2edabef363d779fd339b7158ad3461a05452a2fdad611889d19f272cd98dfbbb39871d10631326b83108678f8a7245c349583eb257e9d7e4827078134ade
 SHA512 
3550a9e59101a96cf04e4a4bc183ac9a447baa72d74e57c3f438764741b4365f8848895c1eb2c4d0af5c7936e38eb8971ef578bbee315e78b9fdcbbe49fdc1e8
 DIST gnome-shell-3.30.2-patchset.tar.xz 39864 BLAKE2B 
61c02e5ae87ab24f30d28865ff20e32fef63eefbfc1134bf0582eb25933700902aad08176fd2011781262552385bcb3ffaf35fc2d7a060c09ba0d27cb9a8
 SHA512 
8ad976c05488a6b7447d29105a566d0bb975c8e0798be18c1dc07295c51a27578274e611da4979397fc6c4da538f6d9f48072e043829a63faf87a781518ee531
 DIST gnome-shell-3.30.2.tar.xz 1439556 BLAKE2B 
547ccf5571ea431d15c6430619640bd497a381191cad56bbf1a5c9992c5df47eb48527cc2749ea4d417cbe5fd7cc2acb44915ee35d3d89cd386541f19d743877
 SHA512 
5cdf2b9a4dc9dbcc75d76020a01b953ae3922d5820b692d1bc1cf62daf1f00d04b95d6ec076920563f555115c4f4ad11a019e4523a353ef4dd2189a5240239c6

diff --git a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch 
b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
deleted file mode 100644
index 9948b163009..000
--- a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 9f4aa6ebf2193bb19dd8012de7699fce35681078 Mon Sep 17 00:00:00 2001
-From: Pascal Nowack 
-Date: Mon, 6 Aug 2018 14:21:02 +0200
-Subject: [PATCH] build: Fix build with meson >= 47.0
-
-With meson >= 47.0, building gnome-shell will fail
-when --rebuild-types is used as an option for gtk-doc,
-so stop using that option and bump the meson requirement.
-
-https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/191

- docs/reference/shell/meson.build | 3 +--
- docs/reference/st/meson.build| 3 +--
- meson.build  | 2 +-
- 3 files changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/docs/reference/shell/meson.build 
b/docs/reference/shell/meson.build
-index 1469ed422..a32d6a58a 100644
 a/docs/reference/shell/meson.build
-+++ b/docs/reference/shell/meson.build
-@@ -50,8 +50,7 @@ gnome.gtkdoc('shell',
- join_paths(meson.build_root(), 'src')
-   ],
-   scan_args: [
--'--ignore-headers=' + ' '.join(private_headers + exclude_directories),
--'--rebuild-types'
-+'--ignore-headers=' + ' '.join(private_headers + exclude_directories)
-   ],
-   install: true
- )
-diff --git a/docs/reference/st/meson.build b/docs/reference/st/meson.build
-index fe89b53d4..3e9e9ab7c 100644
 a/docs/reference/st/meson.build
-+++ b/docs/reference/st/meson.build
-@@ -17,8 +17,7 @@ gnome.gtkdoc('st',
-   ],
-   scan_args: [
- '--ignore-headers=' + ' '.join(private_headers),
--'--rebuild-sections',
--'--rebuild-types'
-+'--rebuild-sections'
-   ],
-   install: true
- )
-diff --git a/meson.build b/meson.build
-index 03b9d52a8..e33a76183 100644

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2019-02-28 Thread Mart Raudsepp

commit: 35943bda95329e610052831ff5245621a1b53638
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Feb 28 21:11:23 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Feb 28 22:37:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35943bda

gnome-base/gnome-shell: fix and re-enable USE=gtk-doc support

Turned out to be a meson-0.47 incompatibility, not gtk-doc

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../files/3.28.3-fix-gtk-doc-meson.patch   | 59 ++
 gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild   |  9 ++--
 2 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch 
b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
new file mode 100644
index 000..9948b163009
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
@@ -0,0 +1,59 @@
+From 9f4aa6ebf2193bb19dd8012de7699fce35681078 Mon Sep 17 00:00:00 2001
+From: Pascal Nowack 
+Date: Mon, 6 Aug 2018 14:21:02 +0200
+Subject: [PATCH] build: Fix build with meson >= 47.0
+
+With meson >= 47.0, building gnome-shell will fail
+when --rebuild-types is used as an option for gtk-doc,
+so stop using that option and bump the meson requirement.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/191
+---
+ docs/reference/shell/meson.build | 3 +--
+ docs/reference/st/meson.build| 3 +--
+ meson.build  | 2 +-
+ 3 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/docs/reference/shell/meson.build 
b/docs/reference/shell/meson.build
+index 1469ed422..a32d6a58a 100644
+--- a/docs/reference/shell/meson.build
 b/docs/reference/shell/meson.build
+@@ -50,8 +50,7 @@ gnome.gtkdoc('shell',
+ join_paths(meson.build_root(), 'src')
+   ],
+   scan_args: [
+-'--ignore-headers=' + ' '.join(private_headers + exclude_directories),
+-'--rebuild-types'
++'--ignore-headers=' + ' '.join(private_headers + exclude_directories)
+   ],
+   install: true
+ )
+diff --git a/docs/reference/st/meson.build b/docs/reference/st/meson.build
+index fe89b53d4..3e9e9ab7c 100644
+--- a/docs/reference/st/meson.build
 b/docs/reference/st/meson.build
+@@ -17,8 +17,7 @@ gnome.gtkdoc('st',
+   ],
+   scan_args: [
+ '--ignore-headers=' + ' '.join(private_headers),
+-'--rebuild-sections',
+-'--rebuild-types'
++'--rebuild-sections'
+   ],
+   install: true
+ )
+diff --git a/meson.build b/meson.build
+index 03b9d52a8..e33a76183 100644
+--- a/meson.build
 b/meson.build
+@@ -1,6 +1,6 @@
+ project('gnome-shell', 'c',
+   version: '3.28.3',
+-  meson_version: '>= 0.42.0',
++  meson_version: '>= 0.47.0',
+   license: 'GPLv2+'
+ )
+ 
+-- 
+2.17.0
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild
index d49823e4bdf..0a3ea629b3f 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz";
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-IUSE="+bluetooth +browser-extension elogind +ibus +networkmanager nsplugin 
systemd telepathy"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
nsplugin systemd telepathy"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
?? ( elogind systemd )"
 
@@ -110,9 +110,10 @@ DEPEND="${COMMON_DEPEND}
dev-libs/libxslt
>=dev-util/gdbus-codegen-2.45.3
dev-util/glib-utils
+   gtk-doc? ( >=dev-util/gtk-doc-1.17 )
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
-" #gtk-doc? ( >=dev-util/gtk-doc-1.17 )
+"
 
 PATCHES=(
# Patches from gnome-3-26 branch on top of 3.26.2
@@ -121,6 +122,8 @@ PATCHES=(
"${FILESDIR}"/${PV}-defaults.patch
# Fix automagic gnome-bluetooth dep, bug #398145
"${FILESDIR}"/${PV}-optional-bluetooth.patch
+   # Fix gtk-doc build with >=meson-0.47
+   "${FILESDIR}"/${PV}-fix-gtk-doc-meson.patch
 )
 
 src_prepare() {
@@ -135,7 +138,7 @@ src_configure() {
local emesonargs=(
$(meson_use bluetooth)
$(meson_use nsplugin browser_plugin)
-   #$(meson_use gtk-doc gtk_doc) # fails in gtkdoc-scangobj call 
with gtk-doc-1.25 (perl regex parenthesis issue); probably needs newer 
python-based gtk-doc to work
+   $(meson_use gtk-doc gtk_doc)
-Dman=true
$(meson_use networkmanager)
$(meson_use systemd) # this controls journald integration only 
as of 3.26.2 (structured logging and having gnome-shell launched apps use its 
own identifier instead of gnome-session)

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-06-23 Thread Sam James

commit: dea2c90c1aee7d012a467eeb937fc4a7ecae9237
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 24 03:42:30 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 24 03:42:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dea2c90c

gnome-base/gnome-shell: restore 42.1-r3 for Polkit fix

Bug: https://bugs.gentoo.org/844919
Bug: https://bugs.gentoo.org/849566
Fixes: eed2ee4b79e40099d84db0dde29dced1e3346bb6
Signed-off-by: Sam James  gentoo.org>

 .../gnome-shell/files/42.1-polkit-g_autoptr.patch  |  53 ++
 gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild  | 206 +
 2 files changed, 259 insertions(+)

diff --git a/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch 
b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
new file mode 100644
index ..78d3de086260
--- /dev/null
+++ b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
@@ -0,0 +1,53 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/1d0a08b5e25fea7b0e792ec9798e68a7c5606a75
+https://bugs.gentoo.org/844919
+
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= 
+Date: Tue, 17 May 2022 15:36:43 +0200
+Subject: [PATCH] build: Do not redefine polkit autocleanup
+
+PolkitAgent recently added autocleanup functions itself, so check
+for their existence at configure time and only define our own when
+they don't exist upstream.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5490
+
+Part-of: 
+--- a/config.h.meson
 b/config.h.meson
+@@ -33,3 +33,6 @@
+ 
+ /* Define if fdwalk is available in libc */
+ #mesondefine HAVE_FDWALK
++
++/* Define if polkit defines autocleanup functions */
++#mesondefine HAVE_POLKIT_AUTOCLEANUP
+--- a/meson.build
 b/meson.build
+@@ -169,6 +169,13 @@ cdata.set('HAVE_FDWALK',
+   cc.has_function('fdwalk')
+ )
+ 
++polkit_has_autocleanup = cc.compiles(
++  '#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
++  #include 
++  void main(void) { g_autoptr(PolkitAgentListener) agent = NULL; }',
++  dependencies: polkit_dep)
++cdata.set('HAVE_POLKIT_AUTOCLEANUP', polkit_has_autocleanup)
++
+ buildtype = get_option('buildtype')
+ if buildtype != 'plain'
+   all_warnings = [
+--- a/src/shell-polkit-authentication-agent.h
 b/src/shell-polkit-authentication-agent.h
+@@ -14,8 +14,10 @@
+ 
+ G_BEGIN_DECLS
+ 
++#ifndef HAVE_POLKIT_AUTOCLEANUP
+ /* Polkit doesn't have g_autoptr support, thus we have to manually set the 
autoptr function here */
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (PolkitAgentListener, g_object_unref)
++#endif
+ 
+ #define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT 
(shell_polkit_authentication_agent_get_type())
+ 
+GitLab

diff --git a/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild 
b/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild
new file mode 100644
index ..3bc4781371bb
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer/pipewire support is currently automagic
+DEPEND="
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.68:2
+   >=dev-libs/gobject-introspection-1.49.1:=
+   >=dev-libs/gjs-1.71.1
+   >=x11-libs/gtk+-3.15.0:3[introspection]
+   >=x11-wm/mutter-42.0:0/10[introspection,test?]
+   >=sys-auth/polkit-0.120_p20220509[introspection]
+   >=gnome-base/gsettings-desktop-schemas-42_beta[introspection]
+   >=x11-libs/startup-notification-0.11
+   >=app-i18n/ibus-1.5.19
+   >=gnome-base/gnome-desktop-3.35.90:3=[introspection]
+   bluetooth? ( net-wireless/gnome-bluetooth:3=[introspection] )
+   >=media-libs/gstreamer-0.11.92:1.0
+   media-libs/gst-plugins-base:1.0
+   >=media-video/pipewire-0.3.0:=
+   networkmanager? (
+   >=net-misc/networkmanager-1.10.4:=[introspection]
+   net-libs/libnma[introspection]
+   >=app-crypt/libsecret-0.18
+   dev-libs/dbus-glib )
+   systemd? ( >=sys-apps/systemd-242
+   >=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
+   elogind? ( >=sys-auth/elogind-237 )
+
+   app-arch/gnome-autoar
+   dev-libs/json-glib
+
+   >=app-accessibility/at-spi2-atk-2.5.3

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-05-17 Thread Sam James

commit: 042dabffb96f3b8fd74e0cbb14c524c81e7304df
Author: Sam James  gentoo  org>
AuthorDate: Tue May 17 21:58:52 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 17 21:58:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=042dabff

gnome-base/gnome-shell: backport new Polkit patch (g_autoptr)

Closes: https://bugs.gentoo.org/844919
Signed-off-by: Sam James  gentoo.org>

 .../gnome-shell/files/42.1-polkit-g_autoptr.patch  | 53 ++
 gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild  |  3 ++
 2 files changed, 56 insertions(+)

diff --git a/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch 
b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
new file mode 100644
index ..78d3de086260
--- /dev/null
+++ b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
@@ -0,0 +1,53 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/1d0a08b5e25fea7b0e792ec9798e68a7c5606a75
+https://bugs.gentoo.org/844919
+
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= 
+Date: Tue, 17 May 2022 15:36:43 +0200
+Subject: [PATCH] build: Do not redefine polkit autocleanup
+
+PolkitAgent recently added autocleanup functions itself, so check
+for their existence at configure time and only define our own when
+they don't exist upstream.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5490
+
+Part-of: 
+--- a/config.h.meson
 b/config.h.meson
+@@ -33,3 +33,6 @@
+ 
+ /* Define if fdwalk is available in libc */
+ #mesondefine HAVE_FDWALK
++
++/* Define if polkit defines autocleanup functions */
++#mesondefine HAVE_POLKIT_AUTOCLEANUP
+--- a/meson.build
 b/meson.build
+@@ -169,6 +169,13 @@ cdata.set('HAVE_FDWALK',
+   cc.has_function('fdwalk')
+ )
+ 
++polkit_has_autocleanup = cc.compiles(
++  '#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
++  #include 
++  void main(void) { g_autoptr(PolkitAgentListener) agent = NULL; }',
++  dependencies: polkit_dep)
++cdata.set('HAVE_POLKIT_AUTOCLEANUP', polkit_has_autocleanup)
++
+ buildtype = get_option('buildtype')
+ if buildtype != 'plain'
+   all_warnings = [
+--- a/src/shell-polkit-authentication-agent.h
 b/src/shell-polkit-authentication-agent.h
+@@ -14,8 +14,10 @@
+ 
+ G_BEGIN_DECLS
+ 
++#ifndef HAVE_POLKIT_AUTOCLEANUP
+ /* Polkit doesn't have g_autoptr support, thus we have to manually set the 
autoptr function here */
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (PolkitAgentListener, g_object_unref)
++#endif
+ 
+ #define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT 
(shell_polkit_authentication_agent_get_type())
+ 
+GitLab

diff --git a/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild 
b/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild
index db6f1390fcef..7a1cc841e4f9 100644
--- a/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild
@@ -140,6 +140,9 @@ PATCHES=(
"${FILESDIR}"/42.0-optional-bluetooth.patch
# Change favorites defaults, bug #479918
"${FILESDIR}"/40.0-defaults.patch
+
+   # Upstream backport, bug #844919
+   "${FILESDIR}"/42.1-polkit-g_autoptr.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-01-24 Thread Sam James

commit: b7d4f62f083b1e8d0857633c0fd2cf356729d6ca
Author: Christophe Lermytte  lermytte  be>
AuthorDate: Mon Jan 24 22:16:41 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 25 00:49:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7d4f62f

gnome-base/gnome-shell: fix build with meson-0.61

Closes: https://bugs.gentoo.org/831921
Signed-off-by: Christophe Lermytte  lermytte.be>
Signed-off-by: Sam James  gentoo.org>

 .../files/41.3-fix-build-with-meson-0.61.1.patch   | 84 ++
 gnome-base/gnome-shell/gnome-shell-41.3.ebuild |  1 +
 2 files changed, 85 insertions(+)

diff --git 
a/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch 
b/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch
new file mode 100644
index ..ecf212b9794c
--- /dev/null
+++ b/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,84 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/65450a836ee9e0722a2d4c3327f52345eae293c6
+https://bugs.gentoo.org/831921
+
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= 
+Date: Thu, 23 Dec 2021 17:18:16 +0100
+Subject: [PATCH] build: Drop incorrect positional arg
+
+Unlike other targets that take a name, i18n.merge_file() does not.
+
+Part-of: 
+---
+ data/meson.build  | 2 +-
+ src/calendar-server/meson.build   | 2 +-
+ subprojects/extensions-app/data/meson.build   | 2 +-
+ subprojects/extensions-app/data/metainfo/meson.build  | 2 +-
+ subprojects/extensions-tool/src/templates/meson.build | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index f924fdf806..76ae45c93a 100644
+--- a/data/meson.build
 b/data/meson.build
+@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir)
+ desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false')
+ 
+ foreach desktop_file : desktop_files
+-  i18n.merge_file('desktop',
++  i18n.merge_file(
+ input: configure_file(
+   input: desktop_file + '.in.in',
+   output: desktop_file + '.in',
+diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build
+index 7363282a59..8b4ef411c8 100644
+--- a/src/calendar-server/meson.build
 b/src/calendar-server/meson.build
+@@ -27,7 +27,7 @@ configure_file(
+   install_dir: servicedir
+ )
+ 
+-i18n.merge_file('evolution-calendar.desktop',
++i18n.merge_file(
+   input: 'evolution-calendar.desktop.in',
+   output: 'evolution-calendar.desktop',
+   po_dir: po_dir,
+diff --git a/subprojects/extensions-app/data/meson.build 
b/subprojects/extensions-app/data/meson.build
+index d7e7d4001c..4b601e8bd1 100644
+--- a/subprojects/extensions-app/data/meson.build
 b/subprojects/extensions-app/data/meson.build
+@@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir)
+ desktopconf.set('app_id', app_id)
+ desktopconf.set('prgname', prgname)
+ 
+-i18n.merge_file('desktop',
++i18n.merge_file(
+   input: configure_file(
+ input: base_id + '.desktop.in.in',
+ output: desktop_file + '.in',
+diff --git a/subprojects/extensions-app/data/metainfo/meson.build 
b/subprojects/extensions-app/data/metainfo/meson.build
+index c4962c0576..a19bfa80a4 100644
+--- a/subprojects/extensions-app/data/metainfo/meson.build
 b/subprojects/extensions-app/data/metainfo/meson.build
+@@ -1,5 +1,5 @@
+ metainfo = app_id + '.metainfo.xml'
+-i18n.merge_file(metainfo,
++i18n.merge_file(
+   input: base_id + '.metainfo.xml.in',
+   output: metainfo,
+   po_dir: po_dir,
+diff --git a/subprojects/extensions-tool/src/templates/meson.build 
b/subprojects/extensions-tool/src/templates/meson.build
+index 670e2bf448..d693bfaddb 100644
+--- a/subprojects/extensions-tool/src/templates/meson.build
 b/subprojects/extensions-tool/src/templates/meson.build
+@@ -4,7 +4,7 @@ template_metas = [
+ ]
+ template_deps = []
+ foreach template : template_metas
+-  template_deps += i18n.merge_file(template,
++  template_deps += i18n.merge_file(
+ input: template + '.in',
+ output: template,
+ po_dir: po_dir,
+-- 
+GitLab
+

diff --git a/gnome-base/gnome-shell/gnome-shell-41.3.ebuild 
b/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
index a5b2b5a53e21..25496f9f35dc 100644
--- a/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
@@ -139,6 +139,7 @@ PATCHES=(
"${FILESDIR}"/40.0-optional-bluetooth.patch
# Change favorites defaults, bug #479918
"${FILESDIR}"/40.0-defaults.patch
+   "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-03-28 Thread Matt Turner

commit: 998b2b1d772d35e29e0e9df326df12943af8d94e
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Mar 28 15:14:24 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Mar 28 15:17:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=998b2b1d

gnome-base/gnome-shell: Version bump to 41.5

Closes: https://bugs.gentoo.org/836311
Signed-off-by: Matt Turner  gentoo.org>

 gnome-base/gnome-shell/Manifest|   1 +
 5-environment-Require-GnomeBluetooth-1.0.patch |  35 
 ...1.5-environment-Require-gnome-desktop-3.0.patch |  30 +++
 .../41.5-environment-Require-libgweather-3.0.patch |  29 +++
 gnome-base/gnome-shell/gnome-shell-41.5.ebuild | 208 +
 5 files changed, 303 insertions(+)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 9cedbba95216..be1d64fd56a4 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-shell-41.4.tar.xz 1899464 BLAKE2B 
202408be8886bb5eb5615328a774993bea8dfe2fb78d304fde2806096ca68eff3fae7d5bdb4972b627cf10192ff76e3d457dc37eaa806cd4ed57d1558c235a48
 SHA512 
6ed5f215fcf9a1cf450b406620568aeceb3d255e0bb979151ccd2260565748e69825d7f5f7fb0c6768ed584a530599a8dcbc713c1ec12617551ae9df782c5ad7
+DIST gnome-shell-41.5.tar.xz 1899888 BLAKE2B 
73491f382413c313956fc6ab878a54d8a881190ee93cac5d334d169636d8dd21557c78719142f717c94463e02c7ca4eaf12a6e4ca6167e48a002ece9379b6d03
 SHA512 
b638103528413dcfa12d65d0c7add45716d21334294babbadd0a05e3410ca068ae336b28c30eb8811222b9f90e5efdf0d1a6e0a2e3f104b49061bb28333f066e
 DIST gnome-shell-42.0.tar.xz 1918044 BLAKE2B 
742d13ad92795fb71bbe8376a86b8e9a828882288f105f026cf98304ef2e9eae8fb967fa978ec322f5c621303a1798d3490c001bbd63c704b0cddc5db688389d
 SHA512 
39b56d3c09a238d9ca387145fdbddfaa929b124d4006f097b792de2dceb882e50cbce1255b0b4585aea04b522a92a4e7a743367f43a863f95bb6386401e73935

diff --git 
a/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
 
b/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
new file mode 100644
index ..8729a6c3e671
--- /dev/null
+++ 
b/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
@@ -0,0 +1,35 @@
+From 9ce6756235ba272b8602d50d1f005dc2ef265889 Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto 
+Date: Sun, 31 Oct 2021 17:24:58 -0300
+Subject: [PATCH 1/2] environment: Require GnomeBluetooth 1.0
+
+libgnome-bluetooth will start to offer a 2.0 library version
+depending on GTK4. Given that GNOME Shell already depends on
+GTK3, it cannot use this next version of gnome-bluetooth. And
+since GJS will automatically try and use the latest version
+available of any library, Shell must specify it wants 1.0
+explicitly.
+
+Add a required GnomeBluetooth version number when importing it
+for the status indicator.
+
+Part-of: 
+---
+ js/ui/environment.js | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/js/ui/environment.js b/js/ui/environment.js
+index ef53e6022..e906fa6c6 100644
+--- a/js/ui/environment.js
 b/js/ui/environment.js
+@@ -6,6 +6,7 @@ const Config = imports.misc.config;
+ imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
+ imports.gi.versions.Gio = '2.0';
+ imports.gi.versions.GdkPixbuf = '2.0';
++imports.gi.versions.GnomeBluetooth = '1.0';
+ imports.gi.versions.Gtk = '3.0';
+ imports.gi.versions.Soup = '3.0';
+ imports.gi.versions.TelepathyGLib = '0.12';
+-- 
+2.34.1
+

diff --git 
a/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch 
b/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch
new file mode 100644
index ..3dbb50bb989b
--- /dev/null
+++ 
b/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch
@@ -0,0 +1,30 @@
+From 795312b8d5634d3005679b3c1313114e41e538fd Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto 
+Date: Thu, 11 Nov 2021 16:20:39 -0300
+Subject: [PATCH 2/2] environment: Require gnome-desktop 3.0
+
+Pretty much the exact same case of 9ce6756235.
+
+libgnome-desktop saw a major version bump, and we have to
+stick with 3.0 for a while.
+
+Part-of: 
+---
+ js/ui/environment.js | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/js/ui/environment.js b/js/ui/environment.js
+index e906fa6c6..cb254e319 100644
+--- a/js/ui/environment.js
 b/js/ui/environment.js
+@@ -7,6 +7,7 @@ imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
+ imports.gi.versions.Gio = '2.0';
+ imports.gi.versions.GdkPixbuf = '2.0';
+ imports.gi.versions.GnomeBluetooth = '1.0';
++imports.gi.versions.GnomeDesktop = '3.0';
+ imports.gi.versions.Gtk = '3.0';
+ imports.gi.versions.Soup = '3.0';
+ imports.gi.versions.TelepathyGLib = '0.12';
+-- 
+2.34.1
+

diff --git 
a/gnome-base/gnome-shell/files/41.5-environment

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-03-20 Thread Matt Turner

commit: 314bbe352252e6e0085be5342025fee3df903888
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Mar 20 17:38:59 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Mar 20 19:54:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=314bbe35

gnome-base/gnome-shell: Version bump to 42.0

Signed-off-by: Matt Turner  gentoo.org>

 gnome-base/gnome-shell/Manifest|   1 +
 .../files/42.0-optional-bluetooth.patch|  59 ++
 gnome-base/gnome-shell/gnome-shell-42.0.ebuild | 202 +
 3 files changed, 262 insertions(+)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 8f39615367ab..9cedbba95216 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1 +1,2 @@
 DIST gnome-shell-41.4.tar.xz 1899464 BLAKE2B 
202408be8886bb5eb5615328a774993bea8dfe2fb78d304fde2806096ca68eff3fae7d5bdb4972b627cf10192ff76e3d457dc37eaa806cd4ed57d1558c235a48
 SHA512 
6ed5f215fcf9a1cf450b406620568aeceb3d255e0bb979151ccd2260565748e69825d7f5f7fb0c6768ed584a530599a8dcbc713c1ec12617551ae9df782c5ad7
+DIST gnome-shell-42.0.tar.xz 1918044 BLAKE2B 
742d13ad92795fb71bbe8376a86b8e9a828882288f105f026cf98304ef2e9eae8fb967fa978ec322f5c621303a1798d3490c001bbd63c704b0cddc5db688389d
 SHA512 
39b56d3c09a238d9ca387145fdbddfaa929b124d4006f097b792de2dceb882e50cbce1255b0b4585aea04b522a92a4e7a743367f43a863f95bb6386401e73935

diff --git a/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch 
b/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch
new file mode 100644
index ..c7fe07dd69de
--- /dev/null
+++ b/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch
@@ -0,0 +1,59 @@
+From d7cfd7bff4f9fa9d8528f72d4275e07551c6b288 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp 
+Date: Thu, 28 Feb 2019 00:50:19 +0200
+Subject: [PATCH] build: Make bluetooth support optional
+
+---
+ js/misc/meson.build | 2 +-
+ meson.build | 7 ++-
+ meson_options.txt   | 6 ++
+ 3 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/js/misc/meson.build b/js/misc/meson.build
+index 582562711..ec9c62645 100644
+--- a/js/misc/meson.build
 b/js/misc/meson.build
+@@ -3,7 +3,7 @@ jsconf.set('PACKAGE_NAME', meson.project_name())
+ jsconf.set('PACKAGE_VERSION', meson.project_version())
+ jsconf.set('GETTEXT_PACKAGE', meson.project_name())
+ jsconf.set('LIBMUTTER_API_VERSION', mutter_api_version)
+-jsconf.set10('HAVE_BLUETOOTH', bt_dep.found())
++jsconf.set10('HAVE_BLUETOOTH', have_bluetooth)
+ jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager)
+ jsconf.set10('HAVE_SOUP2', have_soup2)
+ jsconf.set('datadir', datadir)
+diff --git a/meson.build b/meson.build
+index 8d7478f9b..79d340840 100644
+--- a/meson.build
 b/meson.build
+@@ -93,7 +93,12 @@ x11_dep = dependency('x11')
+ schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req)
+ gnome_desktop_dep = dependency('gnome-desktop-3.0', version: 
gnome_desktop_req)
+ 
+-bt_dep = dependency('gnome-bluetooth-3.0', version: bt_req, required: false)
++if get_option('bluetooth')
++  bt_dep = dependency('gnome-bluetooth-3.0', version: bt_req)
++  have_bluetooth = true
++else
++  have_bluetooth = false
++endif
+ gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false)
+ gst_base_dep = dependency('gstreamer-base-1.0', required: false)
+ pipewire_dep = dependency('libpipewire-0.3', required: false)
+diff --git a/meson_options.txt b/meson_options.txt
+index f0f2ecf6c..85fc58ea4 100644
+--- a/meson_options.txt
 b/meson_options.txt
+@@ -1,3 +1,9 @@
++option('bluetooth',
++  type: 'boolean',
++  value: true,
++  description: 'Enable bluetooth support'
++)
++
+ option('extensions_tool',
+   type: 'boolean',
+   value: true,
+-- 
+2.34.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-42.0.ebuild 
b/gnome-base/gnome-shell/gnome-shell-42.0.ebuild
new file mode 100644
index ..002edd7d2f1e
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-42.0.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer/pipewire support is currently automagic
+DEPEND="
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.68:2
+   >=dev-libs/gobject-introspe

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-06-23 Thread Sam James

commit: dea2c90c1aee7d012a467eeb937fc4a7ecae9237
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 24 03:42:30 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 24 03:42:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dea2c90c

gnome-base/gnome-shell: restore 42.1-r3 for Polkit fix

Bug: https://bugs.gentoo.org/844919
Bug: https://bugs.gentoo.org/849566
Fixes: eed2ee4b79e40099d84db0dde29dced1e3346bb6
Signed-off-by: Sam James  gentoo.org>

 .../gnome-shell/files/42.1-polkit-g_autoptr.patch  |  53 ++
 gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild  | 206 +
 2 files changed, 259 insertions(+)

diff --git a/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch 
b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
new file mode 100644
index ..78d3de086260
--- /dev/null
+++ b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
@@ -0,0 +1,53 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/1d0a08b5e25fea7b0e792ec9798e68a7c5606a75
+https://bugs.gentoo.org/844919
+
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= 
+Date: Tue, 17 May 2022 15:36:43 +0200
+Subject: [PATCH] build: Do not redefine polkit autocleanup
+
+PolkitAgent recently added autocleanup functions itself, so check
+for their existence at configure time and only define our own when
+they don't exist upstream.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5490
+
+Part-of: 
+--- a/config.h.meson
 b/config.h.meson
+@@ -33,3 +33,6 @@
+ 
+ /* Define if fdwalk is available in libc */
+ #mesondefine HAVE_FDWALK
++
++/* Define if polkit defines autocleanup functions */
++#mesondefine HAVE_POLKIT_AUTOCLEANUP
+--- a/meson.build
 b/meson.build
+@@ -169,6 +169,13 @@ cdata.set('HAVE_FDWALK',
+   cc.has_function('fdwalk')
+ )
+ 
++polkit_has_autocleanup = cc.compiles(
++  '#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
++  #include 
++  void main(void) { g_autoptr(PolkitAgentListener) agent = NULL; }',
++  dependencies: polkit_dep)
++cdata.set('HAVE_POLKIT_AUTOCLEANUP', polkit_has_autocleanup)
++
+ buildtype = get_option('buildtype')
+ if buildtype != 'plain'
+   all_warnings = [
+--- a/src/shell-polkit-authentication-agent.h
 b/src/shell-polkit-authentication-agent.h
+@@ -14,8 +14,10 @@
+ 
+ G_BEGIN_DECLS
+ 
++#ifndef HAVE_POLKIT_AUTOCLEANUP
+ /* Polkit doesn't have g_autoptr support, thus we have to manually set the 
autoptr function here */
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (PolkitAgentListener, g_object_unref)
++#endif
+ 
+ #define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT 
(shell_polkit_authentication_agent_get_type())
+ 
+GitLab

diff --git a/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild 
b/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild
new file mode 100644
index ..3bc4781371bb
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer/pipewire support is currently automagic
+DEPEND="
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.68:2
+   >=dev-libs/gobject-introspection-1.49.1:=
+   >=dev-libs/gjs-1.71.1
+   >=x11-libs/gtk+-3.15.0:3[introspection]
+   >=x11-wm/mutter-42.0:0/10[introspection,test?]
+   >=sys-auth/polkit-0.120_p20220509[introspection]
+   >=gnome-base/gsettings-desktop-schemas-42_beta[introspection]
+   >=x11-libs/startup-notification-0.11
+   >=app-i18n/ibus-1.5.19
+   >=gnome-base/gnome-desktop-3.35.90:3=[introspection]
+   bluetooth? ( net-wireless/gnome-bluetooth:3=[introspection] )
+   >=media-libs/gstreamer-0.11.92:1.0
+   media-libs/gst-plugins-base:1.0
+   >=media-video/pipewire-0.3.0:=
+   networkmanager? (
+   >=net-misc/networkmanager-1.10.4:=[introspection]
+   net-libs/libnma[introspection]
+   >=app-crypt/libsecret-0.18
+   dev-libs/dbus-glib )
+   systemd? ( >=sys-apps/systemd-242
+   >=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
+   elogind? ( >=sys-auth/elogind-237 )
+
+   app-arch/gnome-autoar
+   dev-libs/json-glib
+
+   >=app-accessibility/at-spi2-atk-2.5.3

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-01-24 Thread Sam James

commit: b7d4f62f083b1e8d0857633c0fd2cf356729d6ca
Author: Christophe Lermytte  lermytte  be>
AuthorDate: Mon Jan 24 22:16:41 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 25 00:49:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7d4f62f

gnome-base/gnome-shell: fix build with meson-0.61

Closes: https://bugs.gentoo.org/831921
Signed-off-by: Christophe Lermytte  lermytte.be>
Signed-off-by: Sam James  gentoo.org>

 .../files/41.3-fix-build-with-meson-0.61.1.patch   | 84 ++
 gnome-base/gnome-shell/gnome-shell-41.3.ebuild |  1 +
 2 files changed, 85 insertions(+)

diff --git 
a/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch 
b/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch
new file mode 100644
index ..ecf212b9794c
--- /dev/null
+++ b/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,84 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/65450a836ee9e0722a2d4c3327f52345eae293c6
+https://bugs.gentoo.org/831921
+
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= 
+Date: Thu, 23 Dec 2021 17:18:16 +0100
+Subject: [PATCH] build: Drop incorrect positional arg
+
+Unlike other targets that take a name, i18n.merge_file() does not.
+
+Part-of: 
+---
+ data/meson.build  | 2 +-
+ src/calendar-server/meson.build   | 2 +-
+ subprojects/extensions-app/data/meson.build   | 2 +-
+ subprojects/extensions-app/data/metainfo/meson.build  | 2 +-
+ subprojects/extensions-tool/src/templates/meson.build | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index f924fdf806..76ae45c93a 100644
+--- a/data/meson.build
 b/data/meson.build
+@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir)
+ desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false')
+ 
+ foreach desktop_file : desktop_files
+-  i18n.merge_file('desktop',
++  i18n.merge_file(
+ input: configure_file(
+   input: desktop_file + '.in.in',
+   output: desktop_file + '.in',
+diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build
+index 7363282a59..8b4ef411c8 100644
+--- a/src/calendar-server/meson.build
 b/src/calendar-server/meson.build
+@@ -27,7 +27,7 @@ configure_file(
+   install_dir: servicedir
+ )
+ 
+-i18n.merge_file('evolution-calendar.desktop',
++i18n.merge_file(
+   input: 'evolution-calendar.desktop.in',
+   output: 'evolution-calendar.desktop',
+   po_dir: po_dir,
+diff --git a/subprojects/extensions-app/data/meson.build 
b/subprojects/extensions-app/data/meson.build
+index d7e7d4001c..4b601e8bd1 100644
+--- a/subprojects/extensions-app/data/meson.build
 b/subprojects/extensions-app/data/meson.build
+@@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir)
+ desktopconf.set('app_id', app_id)
+ desktopconf.set('prgname', prgname)
+ 
+-i18n.merge_file('desktop',
++i18n.merge_file(
+   input: configure_file(
+ input: base_id + '.desktop.in.in',
+ output: desktop_file + '.in',
+diff --git a/subprojects/extensions-app/data/metainfo/meson.build 
b/subprojects/extensions-app/data/metainfo/meson.build
+index c4962c0576..a19bfa80a4 100644
+--- a/subprojects/extensions-app/data/metainfo/meson.build
 b/subprojects/extensions-app/data/metainfo/meson.build
+@@ -1,5 +1,5 @@
+ metainfo = app_id + '.metainfo.xml'
+-i18n.merge_file(metainfo,
++i18n.merge_file(
+   input: base_id + '.metainfo.xml.in',
+   output: metainfo,
+   po_dir: po_dir,
+diff --git a/subprojects/extensions-tool/src/templates/meson.build 
b/subprojects/extensions-tool/src/templates/meson.build
+index 670e2bf448..d693bfaddb 100644
+--- a/subprojects/extensions-tool/src/templates/meson.build
 b/subprojects/extensions-tool/src/templates/meson.build
+@@ -4,7 +4,7 @@ template_metas = [
+ ]
+ template_deps = []
+ foreach template : template_metas
+-  template_deps += i18n.merge_file(template,
++  template_deps += i18n.merge_file(
+ input: template + '.in',
+ output: template,
+ po_dir: po_dir,
+-- 
+GitLab
+

diff --git a/gnome-base/gnome-shell/gnome-shell-41.3.ebuild 
b/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
index a5b2b5a53e21..25496f9f35dc 100644
--- a/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
@@ -139,6 +139,7 @@ PATCHES=(
"${FILESDIR}"/40.0-optional-bluetooth.patch
# Change favorites defaults, bug #479918
"${FILESDIR}"/40.0-defaults.patch
+   "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-03-28 Thread Matt Turner

commit: 998b2b1d772d35e29e0e9df326df12943af8d94e
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Mar 28 15:14:24 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Mar 28 15:17:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=998b2b1d

gnome-base/gnome-shell: Version bump to 41.5

Closes: https://bugs.gentoo.org/836311
Signed-off-by: Matt Turner  gentoo.org>

 gnome-base/gnome-shell/Manifest|   1 +
 5-environment-Require-GnomeBluetooth-1.0.patch |  35 
 ...1.5-environment-Require-gnome-desktop-3.0.patch |  30 +++
 .../41.5-environment-Require-libgweather-3.0.patch |  29 +++
 gnome-base/gnome-shell/gnome-shell-41.5.ebuild | 208 +
 5 files changed, 303 insertions(+)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 9cedbba95216..be1d64fd56a4 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-shell-41.4.tar.xz 1899464 BLAKE2B 
202408be8886bb5eb5615328a774993bea8dfe2fb78d304fde2806096ca68eff3fae7d5bdb4972b627cf10192ff76e3d457dc37eaa806cd4ed57d1558c235a48
 SHA512 
6ed5f215fcf9a1cf450b406620568aeceb3d255e0bb979151ccd2260565748e69825d7f5f7fb0c6768ed584a530599a8dcbc713c1ec12617551ae9df782c5ad7
+DIST gnome-shell-41.5.tar.xz 1899888 BLAKE2B 
73491f382413c313956fc6ab878a54d8a881190ee93cac5d334d169636d8dd21557c78719142f717c94463e02c7ca4eaf12a6e4ca6167e48a002ece9379b6d03
 SHA512 
b638103528413dcfa12d65d0c7add45716d21334294babbadd0a05e3410ca068ae336b28c30eb8811222b9f90e5efdf0d1a6e0a2e3f104b49061bb28333f066e
 DIST gnome-shell-42.0.tar.xz 1918044 BLAKE2B 
742d13ad92795fb71bbe8376a86b8e9a828882288f105f026cf98304ef2e9eae8fb967fa978ec322f5c621303a1798d3490c001bbd63c704b0cddc5db688389d
 SHA512 
39b56d3c09a238d9ca387145fdbddfaa929b124d4006f097b792de2dceb882e50cbce1255b0b4585aea04b522a92a4e7a743367f43a863f95bb6386401e73935

diff --git 
a/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
 
b/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
new file mode 100644
index ..8729a6c3e671
--- /dev/null
+++ 
b/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
@@ -0,0 +1,35 @@
+From 9ce6756235ba272b8602d50d1f005dc2ef265889 Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto 
+Date: Sun, 31 Oct 2021 17:24:58 -0300
+Subject: [PATCH 1/2] environment: Require GnomeBluetooth 1.0
+
+libgnome-bluetooth will start to offer a 2.0 library version
+depending on GTK4. Given that GNOME Shell already depends on
+GTK3, it cannot use this next version of gnome-bluetooth. And
+since GJS will automatically try and use the latest version
+available of any library, Shell must specify it wants 1.0
+explicitly.
+
+Add a required GnomeBluetooth version number when importing it
+for the status indicator.
+
+Part-of: 
+---
+ js/ui/environment.js | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/js/ui/environment.js b/js/ui/environment.js
+index ef53e6022..e906fa6c6 100644
+--- a/js/ui/environment.js
 b/js/ui/environment.js
+@@ -6,6 +6,7 @@ const Config = imports.misc.config;
+ imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
+ imports.gi.versions.Gio = '2.0';
+ imports.gi.versions.GdkPixbuf = '2.0';
++imports.gi.versions.GnomeBluetooth = '1.0';
+ imports.gi.versions.Gtk = '3.0';
+ imports.gi.versions.Soup = '3.0';
+ imports.gi.versions.TelepathyGLib = '0.12';
+-- 
+2.34.1
+

diff --git 
a/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch 
b/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch
new file mode 100644
index ..3dbb50bb989b
--- /dev/null
+++ 
b/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch
@@ -0,0 +1,30 @@
+From 795312b8d5634d3005679b3c1313114e41e538fd Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto 
+Date: Thu, 11 Nov 2021 16:20:39 -0300
+Subject: [PATCH 2/2] environment: Require gnome-desktop 3.0
+
+Pretty much the exact same case of 9ce6756235.
+
+libgnome-desktop saw a major version bump, and we have to
+stick with 3.0 for a while.
+
+Part-of: 
+---
+ js/ui/environment.js | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/js/ui/environment.js b/js/ui/environment.js
+index e906fa6c6..cb254e319 100644
+--- a/js/ui/environment.js
 b/js/ui/environment.js
+@@ -7,6 +7,7 @@ imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
+ imports.gi.versions.Gio = '2.0';
+ imports.gi.versions.GdkPixbuf = '2.0';
+ imports.gi.versions.GnomeBluetooth = '1.0';
++imports.gi.versions.GnomeDesktop = '3.0';
+ imports.gi.versions.Gtk = '3.0';
+ imports.gi.versions.Soup = '3.0';
+ imports.gi.versions.TelepathyGLib = '0.12';
+-- 
+2.34.1
+

diff --git 
a/gnome-base/gnome-shell/files/41.5-environment

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-03-20 Thread Matt Turner

commit: 314bbe352252e6e0085be5342025fee3df903888
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Mar 20 17:38:59 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Mar 20 19:54:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=314bbe35

gnome-base/gnome-shell: Version bump to 42.0

Signed-off-by: Matt Turner  gentoo.org>

 gnome-base/gnome-shell/Manifest|   1 +
 .../files/42.0-optional-bluetooth.patch|  59 ++
 gnome-base/gnome-shell/gnome-shell-42.0.ebuild | 202 +
 3 files changed, 262 insertions(+)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 8f39615367ab..9cedbba95216 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1 +1,2 @@
 DIST gnome-shell-41.4.tar.xz 1899464 BLAKE2B 
202408be8886bb5eb5615328a774993bea8dfe2fb78d304fde2806096ca68eff3fae7d5bdb4972b627cf10192ff76e3d457dc37eaa806cd4ed57d1558c235a48
 SHA512 
6ed5f215fcf9a1cf450b406620568aeceb3d255e0bb979151ccd2260565748e69825d7f5f7fb0c6768ed584a530599a8dcbc713c1ec12617551ae9df782c5ad7
+DIST gnome-shell-42.0.tar.xz 1918044 BLAKE2B 
742d13ad92795fb71bbe8376a86b8e9a828882288f105f026cf98304ef2e9eae8fb967fa978ec322f5c621303a1798d3490c001bbd63c704b0cddc5db688389d
 SHA512 
39b56d3c09a238d9ca387145fdbddfaa929b124d4006f097b792de2dceb882e50cbce1255b0b4585aea04b522a92a4e7a743367f43a863f95bb6386401e73935

diff --git a/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch 
b/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch
new file mode 100644
index ..c7fe07dd69de
--- /dev/null
+++ b/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch
@@ -0,0 +1,59 @@
+From d7cfd7bff4f9fa9d8528f72d4275e07551c6b288 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp 
+Date: Thu, 28 Feb 2019 00:50:19 +0200
+Subject: [PATCH] build: Make bluetooth support optional
+
+---
+ js/misc/meson.build | 2 +-
+ meson.build | 7 ++-
+ meson_options.txt   | 6 ++
+ 3 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/js/misc/meson.build b/js/misc/meson.build
+index 582562711..ec9c62645 100644
+--- a/js/misc/meson.build
 b/js/misc/meson.build
+@@ -3,7 +3,7 @@ jsconf.set('PACKAGE_NAME', meson.project_name())
+ jsconf.set('PACKAGE_VERSION', meson.project_version())
+ jsconf.set('GETTEXT_PACKAGE', meson.project_name())
+ jsconf.set('LIBMUTTER_API_VERSION', mutter_api_version)
+-jsconf.set10('HAVE_BLUETOOTH', bt_dep.found())
++jsconf.set10('HAVE_BLUETOOTH', have_bluetooth)
+ jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager)
+ jsconf.set10('HAVE_SOUP2', have_soup2)
+ jsconf.set('datadir', datadir)
+diff --git a/meson.build b/meson.build
+index 8d7478f9b..79d340840 100644
+--- a/meson.build
 b/meson.build
+@@ -93,7 +93,12 @@ x11_dep = dependency('x11')
+ schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req)
+ gnome_desktop_dep = dependency('gnome-desktop-3.0', version: 
gnome_desktop_req)
+ 
+-bt_dep = dependency('gnome-bluetooth-3.0', version: bt_req, required: false)
++if get_option('bluetooth')
++  bt_dep = dependency('gnome-bluetooth-3.0', version: bt_req)
++  have_bluetooth = true
++else
++  have_bluetooth = false
++endif
+ gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false)
+ gst_base_dep = dependency('gstreamer-base-1.0', required: false)
+ pipewire_dep = dependency('libpipewire-0.3', required: false)
+diff --git a/meson_options.txt b/meson_options.txt
+index f0f2ecf6c..85fc58ea4 100644
+--- a/meson_options.txt
 b/meson_options.txt
+@@ -1,3 +1,9 @@
++option('bluetooth',
++  type: 'boolean',
++  value: true,
++  description: 'Enable bluetooth support'
++)
++
+ option('extensions_tool',
+   type: 'boolean',
+   value: true,
+-- 
+2.34.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-42.0.ebuild 
b/gnome-base/gnome-shell/gnome-shell-42.0.ebuild
new file mode 100644
index ..002edd7d2f1e
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-42.0.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer/pipewire support is currently automagic
+DEPEND="
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.68:2
+   >=dev-libs/gobject-introspe

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-05-17 Thread Sam James

commit: 042dabffb96f3b8fd74e0cbb14c524c81e7304df
Author: Sam James  gentoo  org>
AuthorDate: Tue May 17 21:58:52 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 17 21:58:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=042dabff

gnome-base/gnome-shell: backport new Polkit patch (g_autoptr)

Closes: https://bugs.gentoo.org/844919
Signed-off-by: Sam James  gentoo.org>

 .../gnome-shell/files/42.1-polkit-g_autoptr.patch  | 53 ++
 gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild  |  3 ++
 2 files changed, 56 insertions(+)

diff --git a/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch 
b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
new file mode 100644
index ..78d3de086260
--- /dev/null
+++ b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
@@ -0,0 +1,53 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/1d0a08b5e25fea7b0e792ec9798e68a7c5606a75
+https://bugs.gentoo.org/844919
+
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= 
+Date: Tue, 17 May 2022 15:36:43 +0200
+Subject: [PATCH] build: Do not redefine polkit autocleanup
+
+PolkitAgent recently added autocleanup functions itself, so check
+for their existence at configure time and only define our own when
+they don't exist upstream.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5490
+
+Part-of: 
+--- a/config.h.meson
 b/config.h.meson
+@@ -33,3 +33,6 @@
+ 
+ /* Define if fdwalk is available in libc */
+ #mesondefine HAVE_FDWALK
++
++/* Define if polkit defines autocleanup functions */
++#mesondefine HAVE_POLKIT_AUTOCLEANUP
+--- a/meson.build
 b/meson.build
+@@ -169,6 +169,13 @@ cdata.set('HAVE_FDWALK',
+   cc.has_function('fdwalk')
+ )
+ 
++polkit_has_autocleanup = cc.compiles(
++  '#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
++  #include 
++  void main(void) { g_autoptr(PolkitAgentListener) agent = NULL; }',
++  dependencies: polkit_dep)
++cdata.set('HAVE_POLKIT_AUTOCLEANUP', polkit_has_autocleanup)
++
+ buildtype = get_option('buildtype')
+ if buildtype != 'plain'
+   all_warnings = [
+--- a/src/shell-polkit-authentication-agent.h
 b/src/shell-polkit-authentication-agent.h
+@@ -14,8 +14,10 @@
+ 
+ G_BEGIN_DECLS
+ 
++#ifndef HAVE_POLKIT_AUTOCLEANUP
+ /* Polkit doesn't have g_autoptr support, thus we have to manually set the 
autoptr function here */
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (PolkitAgentListener, g_object_unref)
++#endif
+ 
+ #define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT 
(shell_polkit_authentication_agent_get_type())
+ 
+GitLab

diff --git a/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild 
b/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild
index db6f1390fcef..7a1cc841e4f9 100644
--- a/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild
@@ -140,6 +140,9 @@ PATCHES=(
"${FILESDIR}"/42.0-optional-bluetooth.patch
# Change favorites defaults, bug #479918
"${FILESDIR}"/40.0-defaults.patch
+
+   # Upstream backport, bug #844919
+   "${FILESDIR}"/42.1-polkit-g_autoptr.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2020-07-12 Thread Mart Raudsepp

commit: 11fe8d4fb3c9edab0b962f39bc9a73fb89d55218
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Jul 12 21:00:15 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Jul 12 21:02:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11fe8d4f

gnome-base/gnome-shell: bump to 3.36.4

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 gnome-base/gnome-shell/Manifest  |   1 +
 gnome-base/gnome-shell/files/3.36-defaults.patch |  28 
 gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild | 185 +++
 3 files changed, 214 insertions(+)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 39314cf9595..ee51ba0ed5a 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1 +1,2 @@
 DIST gnome-shell-3.34.5.tar.xz 1558672 BLAKE2B 
7b786a35b6b79a4532d9bbb761ee0629cfb18b8c4c151f5958bb9169cae01ddb489a31c9d1a0cfef3ab6dd1f29c449600c1ad9bb11adbae284e86035bec15234
 SHA512 
ef6a70b0b3bb14fedb07c465742fe0d78c96ddd24352fd0babf871336ee404f9823cadea5bd522e388f5b714d33b219c8ff2badaed379b7135dd90de9fca9bc4
+DIST gnome-shell-3.36.4.tar.xz 1774584 BLAKE2B 
92fe544ae743235c673628f2ad82a75f58eaed94547fc3e0728a492cfee22783cb9d820ac55e1e125bf2ce83dadbddece7222eef9bad0891bfc5a7097ddde4bb
 SHA512 
879b1590d516e7e9e1ad066c870023d59cbaaca13e1e77d8b14de302574b3138451c4b8ab0ba1b43aec3e6e03bd147304e8e0e995359b181522a790afc97d450

diff --git a/gnome-base/gnome-shell/files/3.36-defaults.patch 
b/gnome-base/gnome-shell/files/3.36-defaults.patch
new file mode 100644
index 000..0a4746ac46b
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.36-defaults.patch
@@ -0,0 +1,28 @@
+From 7a671f99b7ef2d5f38be67668aac762764b32a42 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Tue, 10 Dec 2013 23:33:51 +0100
+Subject: [PATCH 1/2] Alter list of default applications
+
+Signed-off-by: Gilles Dartiguelongue 
+[Updated to include desktop file renames to reverse DNS and 3.36 changes]
+Signed-off-by: Mart Raudsepp 
+---
+ data/org.gnome.shell.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.gnome.shell.gschema.xml.in 
b/data/org.gnome.shell.gschema.xml.in
+index c1e6b21..368c654 100644
+--- a/data/org.gnome.shell.gschema.xml.in
 b/data/org.gnome.shell.gschema.xml.in
+@@ -31,7 +31,7 @@
+   
+ 
+ 
+-  [ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 
'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 
'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 
'org.gnome.Software.desktop' ]
++  [ 'chromium-browser-chromium.desktop', 'firefox.desktop', 
'firefox-bin.desktop', 'org.gnome.Evolution.desktop', 
'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 
'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 
'org.gnome.Software.desktop' ]
+   List of desktop file IDs for favorite applications
+   
+ The applications corresponding to these identifiers
+-- 
+2.10.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild
new file mode 100644
index 000..fd3fd1b3ae9
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer support is currently automagic
+DEPEND="
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.57.2:2
+   >=dev-libs/gobject-introspection-1.49.1:=
+   >=dev-libs/gjs-1.63.2
+   >=x11-libs/gtk+-3.15.0:3[introspection]
+   >=x11-wm/mutter-3.36.0:0/6[introspection]
+   >=sys-auth/polkit-0.100[introspection]
+   >=gnome-base/gsettings-desktop-schemas-3.33.1
+   >=x11-libs/startup-notification-0.11
+   >=app-i18n/ibus-1.5.2
+   >=gnome-base/gnome-desktop-3.35.90:3=[introspection]
+   bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+   >=media-libs/gstreamer-0.11.92:1.0
+   media-libs/gst-plugins-base:1.0
+   networkmanager? (
+   >=net-misc/networkmanager-1.10.4:=[introspection]
+   net-libs/libnma[introspection]
+   >=app-crypt/libsecret-0.18
+   dev-libs/dbus-glib )
+   system

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2020-08-13 Thread Mart Raudsepp

commit: 9c4bb6c530c0a64b7e0c776806882026798bc1dc
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Aug 13 20:38:14 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Aug 13 20:38:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c4bb6c5

gnome-base/gnome-shell: backport fix for CVE-2020-17489

Bug: https://bugs.gentoo.org/736802
Package-Manager: Portage-2.3.103, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../gnome-shell/files/3.34.5-CVE-2020-17489.patch  |  47 +
 .../gnome-shell/gnome-shell-3.34.5-r1.ebuild   | 198 +
 2 files changed, 245 insertions(+)

diff --git a/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch 
b/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch
new file mode 100644
index 000..c6ed147c5a2
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch
@@ -0,0 +1,47 @@
+From e7f7da78d4d5a9abae780589810bd012300442e9 Mon Sep 17 00:00:00 2001
+From: Ray Strode 
+Date: Mon, 27 Jul 2020 10:58:49 -0400
+Subject: [PATCH] loginDialog: Reset auth prompt on vt switch before fade in
+
+At the moment, if a user switches to the login screen vt,
+the login screen fades in whatever was on screen prior, and
+then does a reset.
+
+It makes more sense to reset first, so we fade in what the
+user is going to interact with instead of what they interacted
+with before.
+
+Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2997
+(cherry picked from commit 13137aad9db52223e8b62cecbd3456f4a7f66f04)
+---
+ js/gdm/loginDialog.js | 9 -
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
+index c3f90dc58..6b35ebb16 100644
+--- a/js/gdm/loginDialog.js
 b/js/gdm/loginDialog.js
+@@ -920,16 +920,15 @@ var LoginDialog = GObject.registerClass({
+ if (this.opacity == 255 && this._authPrompt.verificationStatus == 
AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
+ return;
+ 
++if (this._authPrompt.verificationStatus !== 
AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
++this._authPrompt.reset();
++
+ this._bindOpacity();
+ this.ease({
+ opacity: 255,
+ duration: _FADE_ANIMATION_TIME,
+ mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+-onComplete: () => {
+-if (this._authPrompt.verificationStatus != 
AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
+-this._authPrompt.reset();
+-this._unbindOpacity();
+-}
++onComplete: () => this._unbindOpacity()
+ });
+ }
+ 
+-- 
+2.20.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild
new file mode 100644
index 000..0aeebc31a62
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org gnome2-utils meson pax-utils python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer support is currently automagic
+DEPEND="
+   >=dev-libs/libcroco-0.6.8:0.6
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.57.2:2
+   >=dev-libs/gobject-introspection-1.49.1:=
+   >=dev-libs/gjs-1.57.3
+   >=x11-libs/gtk+-3.15.0:3[introspection]
+   >=x11-wm/mutter-3.34.0:0/5[introspection]
+   >=sys-auth/polkit-0.100[introspection]
+   >=gnome-base/gsettings-desktop-schemas-3.33.1
+   >=x11-libs/startup-notification-0.11
+   >=app-i18n/ibus-1.5.2
+   >=gnome-base/gnome-desktop-3.32:3=[introspection]
+   bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+   >=media-libs/gstreamer-0.11.92:1.0
+   media-libs/gst-plugins-base:1.0
+   networkmanager? (
+   >=net-misc/networkmanager-1.10.4:=[introspection]
+   net-libs/libnma[introspection]
+   >=app-crypt/libsecret-0.18
+   dev-libs/dbus-glib )
+   systemd? ( >=sys-apps/systemd-31
+   >=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
+   elogind? ( >=sys-auth/elogind-237 )
+   app-arch/gnome-autoar
+   dev-libs/json-glib
+
+   >=app-accessibility/at-spi2-atk-2.5.3
+   x11-libs/gdk-pixbuf:2[introspection]
+   dev-libs/libxml2:2
+   x11-libs/libX11
+
+

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-06-23 Thread Sam James

commit: dea2c90c1aee7d012a467eeb937fc4a7ecae9237
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 24 03:42:30 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 24 03:42:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dea2c90c

gnome-base/gnome-shell: restore 42.1-r3 for Polkit fix

Bug: https://bugs.gentoo.org/844919
Bug: https://bugs.gentoo.org/849566
Fixes: eed2ee4b79e40099d84db0dde29dced1e3346bb6
Signed-off-by: Sam James  gentoo.org>

 .../gnome-shell/files/42.1-polkit-g_autoptr.patch  |  53 ++
 gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild  | 206 +
 2 files changed, 259 insertions(+)

diff --git a/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch 
b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
new file mode 100644
index ..78d3de086260
--- /dev/null
+++ b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
@@ -0,0 +1,53 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/1d0a08b5e25fea7b0e792ec9798e68a7c5606a75
+https://bugs.gentoo.org/844919
+
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= 
+Date: Tue, 17 May 2022 15:36:43 +0200
+Subject: [PATCH] build: Do not redefine polkit autocleanup
+
+PolkitAgent recently added autocleanup functions itself, so check
+for their existence at configure time and only define our own when
+they don't exist upstream.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5490
+
+Part-of: 
+--- a/config.h.meson
 b/config.h.meson
+@@ -33,3 +33,6 @@
+ 
+ /* Define if fdwalk is available in libc */
+ #mesondefine HAVE_FDWALK
++
++/* Define if polkit defines autocleanup functions */
++#mesondefine HAVE_POLKIT_AUTOCLEANUP
+--- a/meson.build
 b/meson.build
+@@ -169,6 +169,13 @@ cdata.set('HAVE_FDWALK',
+   cc.has_function('fdwalk')
+ )
+ 
++polkit_has_autocleanup = cc.compiles(
++  '#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
++  #include 
++  void main(void) { g_autoptr(PolkitAgentListener) agent = NULL; }',
++  dependencies: polkit_dep)
++cdata.set('HAVE_POLKIT_AUTOCLEANUP', polkit_has_autocleanup)
++
+ buildtype = get_option('buildtype')
+ if buildtype != 'plain'
+   all_warnings = [
+--- a/src/shell-polkit-authentication-agent.h
 b/src/shell-polkit-authentication-agent.h
+@@ -14,8 +14,10 @@
+ 
+ G_BEGIN_DECLS
+ 
++#ifndef HAVE_POLKIT_AUTOCLEANUP
+ /* Polkit doesn't have g_autoptr support, thus we have to manually set the 
autoptr function here */
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (PolkitAgentListener, g_object_unref)
++#endif
+ 
+ #define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT 
(shell_polkit_authentication_agent_get_type())
+ 
+GitLab

diff --git a/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild 
b/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild
new file mode 100644
index ..3bc4781371bb
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer/pipewire support is currently automagic
+DEPEND="
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.68:2
+   >=dev-libs/gobject-introspection-1.49.1:=
+   >=dev-libs/gjs-1.71.1
+   >=x11-libs/gtk+-3.15.0:3[introspection]
+   >=x11-wm/mutter-42.0:0/10[introspection,test?]
+   >=sys-auth/polkit-0.120_p20220509[introspection]
+   >=gnome-base/gsettings-desktop-schemas-42_beta[introspection]
+   >=x11-libs/startup-notification-0.11
+   >=app-i18n/ibus-1.5.19
+   >=gnome-base/gnome-desktop-3.35.90:3=[introspection]
+   bluetooth? ( net-wireless/gnome-bluetooth:3=[introspection] )
+   >=media-libs/gstreamer-0.11.92:1.0
+   media-libs/gst-plugins-base:1.0
+   >=media-video/pipewire-0.3.0:=
+   networkmanager? (
+   >=net-misc/networkmanager-1.10.4:=[introspection]
+   net-libs/libnma[introspection]
+   >=app-crypt/libsecret-0.18
+   dev-libs/dbus-glib )
+   systemd? ( >=sys-apps/systemd-242
+   >=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
+   elogind? ( >=sys-auth/elogind-237 )
+
+   app-arch/gnome-autoar
+   dev-libs/json-glib
+
+   >=app-accessibility/at-spi2-atk-2.5.3

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-05-17 Thread Sam James

commit: 042dabffb96f3b8fd74e0cbb14c524c81e7304df
Author: Sam James  gentoo  org>
AuthorDate: Tue May 17 21:58:52 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 17 21:58:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=042dabff

gnome-base/gnome-shell: backport new Polkit patch (g_autoptr)

Closes: https://bugs.gentoo.org/844919
Signed-off-by: Sam James  gentoo.org>

 .../gnome-shell/files/42.1-polkit-g_autoptr.patch  | 53 ++
 gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild  |  3 ++
 2 files changed, 56 insertions(+)

diff --git a/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch 
b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
new file mode 100644
index ..78d3de086260
--- /dev/null
+++ b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
@@ -0,0 +1,53 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/1d0a08b5e25fea7b0e792ec9798e68a7c5606a75
+https://bugs.gentoo.org/844919
+
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= 
+Date: Tue, 17 May 2022 15:36:43 +0200
+Subject: [PATCH] build: Do not redefine polkit autocleanup
+
+PolkitAgent recently added autocleanup functions itself, so check
+for their existence at configure time and only define our own when
+they don't exist upstream.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5490
+
+Part-of: 
+--- a/config.h.meson
 b/config.h.meson
+@@ -33,3 +33,6 @@
+ 
+ /* Define if fdwalk is available in libc */
+ #mesondefine HAVE_FDWALK
++
++/* Define if polkit defines autocleanup functions */
++#mesondefine HAVE_POLKIT_AUTOCLEANUP
+--- a/meson.build
 b/meson.build
+@@ -169,6 +169,13 @@ cdata.set('HAVE_FDWALK',
+   cc.has_function('fdwalk')
+ )
+ 
++polkit_has_autocleanup = cc.compiles(
++  '#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
++  #include 
++  void main(void) { g_autoptr(PolkitAgentListener) agent = NULL; }',
++  dependencies: polkit_dep)
++cdata.set('HAVE_POLKIT_AUTOCLEANUP', polkit_has_autocleanup)
++
+ buildtype = get_option('buildtype')
+ if buildtype != 'plain'
+   all_warnings = [
+--- a/src/shell-polkit-authentication-agent.h
 b/src/shell-polkit-authentication-agent.h
+@@ -14,8 +14,10 @@
+ 
+ G_BEGIN_DECLS
+ 
++#ifndef HAVE_POLKIT_AUTOCLEANUP
+ /* Polkit doesn't have g_autoptr support, thus we have to manually set the 
autoptr function here */
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (PolkitAgentListener, g_object_unref)
++#endif
+ 
+ #define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT 
(shell_polkit_authentication_agent_get_type())
+ 
+GitLab

diff --git a/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild 
b/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild
index db6f1390fcef..7a1cc841e4f9 100644
--- a/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild
@@ -140,6 +140,9 @@ PATCHES=(
"${FILESDIR}"/42.0-optional-bluetooth.patch
# Change favorites defaults, bug #479918
"${FILESDIR}"/40.0-defaults.patch
+
+   # Upstream backport, bug #844919
+   "${FILESDIR}"/42.1-polkit-g_autoptr.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-03-28 Thread Matt Turner

commit: 998b2b1d772d35e29e0e9df326df12943af8d94e
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Mar 28 15:14:24 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Mar 28 15:17:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=998b2b1d

gnome-base/gnome-shell: Version bump to 41.5

Closes: https://bugs.gentoo.org/836311
Signed-off-by: Matt Turner  gentoo.org>

 gnome-base/gnome-shell/Manifest|   1 +
 5-environment-Require-GnomeBluetooth-1.0.patch |  35 
 ...1.5-environment-Require-gnome-desktop-3.0.patch |  30 +++
 .../41.5-environment-Require-libgweather-3.0.patch |  29 +++
 gnome-base/gnome-shell/gnome-shell-41.5.ebuild | 208 +
 5 files changed, 303 insertions(+)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 9cedbba95216..be1d64fd56a4 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-shell-41.4.tar.xz 1899464 BLAKE2B 
202408be8886bb5eb5615328a774993bea8dfe2fb78d304fde2806096ca68eff3fae7d5bdb4972b627cf10192ff76e3d457dc37eaa806cd4ed57d1558c235a48
 SHA512 
6ed5f215fcf9a1cf450b406620568aeceb3d255e0bb979151ccd2260565748e69825d7f5f7fb0c6768ed584a530599a8dcbc713c1ec12617551ae9df782c5ad7
+DIST gnome-shell-41.5.tar.xz 1899888 BLAKE2B 
73491f382413c313956fc6ab878a54d8a881190ee93cac5d334d169636d8dd21557c78719142f717c94463e02c7ca4eaf12a6e4ca6167e48a002ece9379b6d03
 SHA512 
b638103528413dcfa12d65d0c7add45716d21334294babbadd0a05e3410ca068ae336b28c30eb8811222b9f90e5efdf0d1a6e0a2e3f104b49061bb28333f066e
 DIST gnome-shell-42.0.tar.xz 1918044 BLAKE2B 
742d13ad92795fb71bbe8376a86b8e9a828882288f105f026cf98304ef2e9eae8fb967fa978ec322f5c621303a1798d3490c001bbd63c704b0cddc5db688389d
 SHA512 
39b56d3c09a238d9ca387145fdbddfaa929b124d4006f097b792de2dceb882e50cbce1255b0b4585aea04b522a92a4e7a743367f43a863f95bb6386401e73935

diff --git 
a/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
 
b/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
new file mode 100644
index ..8729a6c3e671
--- /dev/null
+++ 
b/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
@@ -0,0 +1,35 @@
+From 9ce6756235ba272b8602d50d1f005dc2ef265889 Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto 
+Date: Sun, 31 Oct 2021 17:24:58 -0300
+Subject: [PATCH 1/2] environment: Require GnomeBluetooth 1.0
+
+libgnome-bluetooth will start to offer a 2.0 library version
+depending on GTK4. Given that GNOME Shell already depends on
+GTK3, it cannot use this next version of gnome-bluetooth. And
+since GJS will automatically try and use the latest version
+available of any library, Shell must specify it wants 1.0
+explicitly.
+
+Add a required GnomeBluetooth version number when importing it
+for the status indicator.
+
+Part-of: 
+---
+ js/ui/environment.js | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/js/ui/environment.js b/js/ui/environment.js
+index ef53e6022..e906fa6c6 100644
+--- a/js/ui/environment.js
 b/js/ui/environment.js
+@@ -6,6 +6,7 @@ const Config = imports.misc.config;
+ imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
+ imports.gi.versions.Gio = '2.0';
+ imports.gi.versions.GdkPixbuf = '2.0';
++imports.gi.versions.GnomeBluetooth = '1.0';
+ imports.gi.versions.Gtk = '3.0';
+ imports.gi.versions.Soup = '3.0';
+ imports.gi.versions.TelepathyGLib = '0.12';
+-- 
+2.34.1
+

diff --git 
a/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch 
b/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch
new file mode 100644
index ..3dbb50bb989b
--- /dev/null
+++ 
b/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch
@@ -0,0 +1,30 @@
+From 795312b8d5634d3005679b3c1313114e41e538fd Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto 
+Date: Thu, 11 Nov 2021 16:20:39 -0300
+Subject: [PATCH 2/2] environment: Require gnome-desktop 3.0
+
+Pretty much the exact same case of 9ce6756235.
+
+libgnome-desktop saw a major version bump, and we have to
+stick with 3.0 for a while.
+
+Part-of: 
+---
+ js/ui/environment.js | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/js/ui/environment.js b/js/ui/environment.js
+index e906fa6c6..cb254e319 100644
+--- a/js/ui/environment.js
 b/js/ui/environment.js
+@@ -7,6 +7,7 @@ imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
+ imports.gi.versions.Gio = '2.0';
+ imports.gi.versions.GdkPixbuf = '2.0';
+ imports.gi.versions.GnomeBluetooth = '1.0';
++imports.gi.versions.GnomeDesktop = '3.0';
+ imports.gi.versions.Gtk = '3.0';
+ imports.gi.versions.Soup = '3.0';
+ imports.gi.versions.TelepathyGLib = '0.12';
+-- 
+2.34.1
+

diff --git 
a/gnome-base/gnome-shell/files/41.5-environment

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2019-03-30 Thread Mart Raudsepp

commit: aebd86e5f849893f8a0f00d38b9fd777cc1317a6
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Mar 30 22:26:46 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Mar 30 22:26:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aebd86e5

gnome-base/gnome-shell: remove old

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 gnome-base/gnome-shell/Manifest|   2 -
 .../files/3.28.3-fix-gtk-doc-meson.patch   |  59 ---
 gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild   | 193 -
 3 files changed, 254 deletions(-)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index bea6c4afe6e..a99b75f076a 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,7 +1,5 @@
 DIST gnome-shell-3.24.3.tar.xz 1982088 BLAKE2B 
608b3e73d546dea543a23c31a64b03c32f35d118cd79fd0371a9e392377b4dd03bc16413443d643ed604a2fa81c2838939d92ef4c89a54469a8bd83dc9661f8f
 SHA512 
369ed80b975369b79d4ac9b3f1fbd469fdde331e9079d09eeac6398a9b3c349b09f7570dfce1ed6e1cdfaf514b4b40c6038f34b6c3c7928470b2cd65b702ff15
 DIST gnome-shell-3.26.2-patchset.tar.xz 55492 BLAKE2B 
745b8549f7480b004f4df9b81508c94c9224f77a5a503f45dfda20105e9c305f8cae6ae5e420e597cea9f98899933bb19efd8cf0e9811dc35d0844a3c2920143
 SHA512 
93a730082e84807c23f4b7e390c2d0fb02d3666fc32241de02b3534cc271b160bd9a6a6a2e908ed5bdde91cef383c1e400b0f7cbf04ac104f7f9758218e635ed
 DIST gnome-shell-3.26.2.tar.xz 1405580 BLAKE2B 
ccbb8ad374931335fdc6e752a7feedcba4fe2b61112404b62bc9711b1736216d46fd6e85c6f06439cae50af86a174359d7df0e111e8db6ffed567e91b4292b14
 SHA512 
0e13bc7abff2367d24ea748cd69a1879ff14a6755ef27d17cf20cef61bc6d15bf6e9d18362142a2d6462689f64eada833f9bba21ebaac3a33765a5be0ae48d3a
-DIST gnome-shell-3.28.3-patchset.tar.xz 30820 BLAKE2B 
3402a1c455a5e9d028f6c15ea40db94afb84576643b9bfe9e973a7f375d9f0a22003eab3ccabec0b4b31c31f70ef02ca055c0f62a5c0392529fc375f6cef7029
 SHA512 
a1da84374dd97bff2546d6ddc5656bade69711d05b4b4f4283df66ebbac566767a509dcbd6db52c28a1915cf873c99b81029128cb2a2b63c325dc3e3340fffb4
-DIST gnome-shell-3.28.3.tar.xz 1433388 BLAKE2B 
656e2edabef363d779fd339b7158ad3461a05452a2fdad611889d19f272cd98dfbbb39871d10631326b83108678f8a7245c349583eb257e9d7e4827078134ade
 SHA512 
3550a9e59101a96cf04e4a4bc183ac9a447baa72d74e57c3f438764741b4365f8848895c1eb2c4d0af5c7936e38eb8971ef578bbee315e78b9fdcbbe49fdc1e8
 DIST gnome-shell-3.30.2-patchset.tar.xz 39864 BLAKE2B 
61c02e5ae87ab24f30d28865ff20e32fef63eefbfc1134bf0582eb25933700902aad08176fd2011781262552385bcb3ffaf35fc2d7a060c09ba0d27cb9a8
 SHA512 
8ad976c05488a6b7447d29105a566d0bb975c8e0798be18c1dc07295c51a27578274e611da4979397fc6c4da538f6d9f48072e043829a63faf87a781518ee531
 DIST gnome-shell-3.30.2.tar.xz 1439556 BLAKE2B 
547ccf5571ea431d15c6430619640bd497a381191cad56bbf1a5c9992c5df47eb48527cc2749ea4d417cbe5fd7cc2acb44915ee35d3d89cd386541f19d743877
 SHA512 
5cdf2b9a4dc9dbcc75d76020a01b953ae3922d5820b692d1bc1cf62daf1f00d04b95d6ec076920563f555115c4f4ad11a019e4523a353ef4dd2189a5240239c6

diff --git a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch 
b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
deleted file mode 100644
index 9948b163009..000
--- a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 9f4aa6ebf2193bb19dd8012de7699fce35681078 Mon Sep 17 00:00:00 2001
-From: Pascal Nowack 
-Date: Mon, 6 Aug 2018 14:21:02 +0200
-Subject: [PATCH] build: Fix build with meson >= 47.0
-
-With meson >= 47.0, building gnome-shell will fail
-when --rebuild-types is used as an option for gtk-doc,
-so stop using that option and bump the meson requirement.
-
-https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/191

- docs/reference/shell/meson.build | 3 +--
- docs/reference/st/meson.build| 3 +--
- meson.build  | 2 +-
- 3 files changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/docs/reference/shell/meson.build 
b/docs/reference/shell/meson.build
-index 1469ed422..a32d6a58a 100644
 a/docs/reference/shell/meson.build
-+++ b/docs/reference/shell/meson.build
-@@ -50,8 +50,7 @@ gnome.gtkdoc('shell',
- join_paths(meson.build_root(), 'src')
-   ],
-   scan_args: [
--'--ignore-headers=' + ' '.join(private_headers + exclude_directories),
--'--rebuild-types'
-+'--ignore-headers=' + ' '.join(private_headers + exclude_directories)
-   ],
-   install: true
- )
-diff --git a/docs/reference/st/meson.build b/docs/reference/st/meson.build
-index fe89b53d4..3e9e9ab7c 100644
 a/docs/reference/st/meson.build
-+++ b/docs/reference/st/meson.build
-@@ -17,8 +17,7 @@ gnome.gtkdoc('st',
-   ],
-   scan_args: [
- '--ignore-headers=' + ' '.join(private_headers),
--'--rebuild-sections',
--'--rebuild-types'
-+'--rebuild-sections'
-   ],
-   install: true
- )
-diff --git a/meson.build b/meson.build
-index 03b9d52a8..e33a76183 100644

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2020-07-12 Thread Mart Raudsepp

commit: 11fe8d4fb3c9edab0b962f39bc9a73fb89d55218
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Jul 12 21:00:15 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Jul 12 21:02:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11fe8d4f

gnome-base/gnome-shell: bump to 3.36.4

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 gnome-base/gnome-shell/Manifest  |   1 +
 gnome-base/gnome-shell/files/3.36-defaults.patch |  28 
 gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild | 185 +++
 3 files changed, 214 insertions(+)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 39314cf9595..ee51ba0ed5a 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1 +1,2 @@
 DIST gnome-shell-3.34.5.tar.xz 1558672 BLAKE2B 
7b786a35b6b79a4532d9bbb761ee0629cfb18b8c4c151f5958bb9169cae01ddb489a31c9d1a0cfef3ab6dd1f29c449600c1ad9bb11adbae284e86035bec15234
 SHA512 
ef6a70b0b3bb14fedb07c465742fe0d78c96ddd24352fd0babf871336ee404f9823cadea5bd522e388f5b714d33b219c8ff2badaed379b7135dd90de9fca9bc4
+DIST gnome-shell-3.36.4.tar.xz 1774584 BLAKE2B 
92fe544ae743235c673628f2ad82a75f58eaed94547fc3e0728a492cfee22783cb9d820ac55e1e125bf2ce83dadbddece7222eef9bad0891bfc5a7097ddde4bb
 SHA512 
879b1590d516e7e9e1ad066c870023d59cbaaca13e1e77d8b14de302574b3138451c4b8ab0ba1b43aec3e6e03bd147304e8e0e995359b181522a790afc97d450

diff --git a/gnome-base/gnome-shell/files/3.36-defaults.patch 
b/gnome-base/gnome-shell/files/3.36-defaults.patch
new file mode 100644
index 000..0a4746ac46b
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.36-defaults.patch
@@ -0,0 +1,28 @@
+From 7a671f99b7ef2d5f38be67668aac762764b32a42 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Tue, 10 Dec 2013 23:33:51 +0100
+Subject: [PATCH 1/2] Alter list of default applications
+
+Signed-off-by: Gilles Dartiguelongue 
+[Updated to include desktop file renames to reverse DNS and 3.36 changes]
+Signed-off-by: Mart Raudsepp 
+---
+ data/org.gnome.shell.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.gnome.shell.gschema.xml.in 
b/data/org.gnome.shell.gschema.xml.in
+index c1e6b21..368c654 100644
+--- a/data/org.gnome.shell.gschema.xml.in
 b/data/org.gnome.shell.gschema.xml.in
+@@ -31,7 +31,7 @@
+   
+ 
+ 
+-  [ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 
'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 
'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 
'org.gnome.Software.desktop' ]
++  [ 'chromium-browser-chromium.desktop', 'firefox.desktop', 
'firefox-bin.desktop', 'org.gnome.Evolution.desktop', 
'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 
'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 
'org.gnome.Software.desktop' ]
+   List of desktop file IDs for favorite applications
+   
+ The applications corresponding to these identifiers
+-- 
+2.10.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild
new file mode 100644
index 000..fd3fd1b3ae9
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer support is currently automagic
+DEPEND="
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.57.2:2
+   >=dev-libs/gobject-introspection-1.49.1:=
+   >=dev-libs/gjs-1.63.2
+   >=x11-libs/gtk+-3.15.0:3[introspection]
+   >=x11-wm/mutter-3.36.0:0/6[introspection]
+   >=sys-auth/polkit-0.100[introspection]
+   >=gnome-base/gsettings-desktop-schemas-3.33.1
+   >=x11-libs/startup-notification-0.11
+   >=app-i18n/ibus-1.5.2
+   >=gnome-base/gnome-desktop-3.35.90:3=[introspection]
+   bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+   >=media-libs/gstreamer-0.11.92:1.0
+   media-libs/gst-plugins-base:1.0
+   networkmanager? (
+   >=net-misc/networkmanager-1.10.4:=[introspection]
+   net-libs/libnma[introspection]
+   >=app-crypt/libsecret-0.18
+   dev-libs/dbus-glib )
+   system

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2020-08-13 Thread Mart Raudsepp

commit: 9c4bb6c530c0a64b7e0c776806882026798bc1dc
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Aug 13 20:38:14 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Aug 13 20:38:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c4bb6c5

gnome-base/gnome-shell: backport fix for CVE-2020-17489

Bug: https://bugs.gentoo.org/736802
Package-Manager: Portage-2.3.103, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../gnome-shell/files/3.34.5-CVE-2020-17489.patch  |  47 +
 .../gnome-shell/gnome-shell-3.34.5-r1.ebuild   | 198 +
 2 files changed, 245 insertions(+)

diff --git a/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch 
b/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch
new file mode 100644
index 000..c6ed147c5a2
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch
@@ -0,0 +1,47 @@
+From e7f7da78d4d5a9abae780589810bd012300442e9 Mon Sep 17 00:00:00 2001
+From: Ray Strode 
+Date: Mon, 27 Jul 2020 10:58:49 -0400
+Subject: [PATCH] loginDialog: Reset auth prompt on vt switch before fade in
+
+At the moment, if a user switches to the login screen vt,
+the login screen fades in whatever was on screen prior, and
+then does a reset.
+
+It makes more sense to reset first, so we fade in what the
+user is going to interact with instead of what they interacted
+with before.
+
+Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2997
+(cherry picked from commit 13137aad9db52223e8b62cecbd3456f4a7f66f04)
+---
+ js/gdm/loginDialog.js | 9 -
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
+index c3f90dc58..6b35ebb16 100644
+--- a/js/gdm/loginDialog.js
 b/js/gdm/loginDialog.js
+@@ -920,16 +920,15 @@ var LoginDialog = GObject.registerClass({
+ if (this.opacity == 255 && this._authPrompt.verificationStatus == 
AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
+ return;
+ 
++if (this._authPrompt.verificationStatus !== 
AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
++this._authPrompt.reset();
++
+ this._bindOpacity();
+ this.ease({
+ opacity: 255,
+ duration: _FADE_ANIMATION_TIME,
+ mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+-onComplete: () => {
+-if (this._authPrompt.verificationStatus != 
AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
+-this._authPrompt.reset();
+-this._unbindOpacity();
+-}
++onComplete: () => this._unbindOpacity()
+ });
+ }
+ 
+-- 
+2.20.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild
new file mode 100644
index 000..0aeebc31a62
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org gnome2-utils meson pax-utils python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer support is currently automagic
+DEPEND="
+   >=dev-libs/libcroco-0.6.8:0.6
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.57.2:2
+   >=dev-libs/gobject-introspection-1.49.1:=
+   >=dev-libs/gjs-1.57.3
+   >=x11-libs/gtk+-3.15.0:3[introspection]
+   >=x11-wm/mutter-3.34.0:0/5[introspection]
+   >=sys-auth/polkit-0.100[introspection]
+   >=gnome-base/gsettings-desktop-schemas-3.33.1
+   >=x11-libs/startup-notification-0.11
+   >=app-i18n/ibus-1.5.2
+   >=gnome-base/gnome-desktop-3.32:3=[introspection]
+   bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+   >=media-libs/gstreamer-0.11.92:1.0
+   media-libs/gst-plugins-base:1.0
+   networkmanager? (
+   >=net-misc/networkmanager-1.10.4:=[introspection]
+   net-libs/libnma[introspection]
+   >=app-crypt/libsecret-0.18
+   dev-libs/dbus-glib )
+   systemd? ( >=sys-apps/systemd-31
+   >=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
+   elogind? ( >=sys-auth/elogind-237 )
+   app-arch/gnome-autoar
+   dev-libs/json-glib
+
+   >=app-accessibility/at-spi2-atk-2.5.3
+   x11-libs/gdk-pixbuf:2[introspection]
+   dev-libs/libxml2:2
+   x11-libs/libX11
+
+

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2019-02-28 Thread Mart Raudsepp

commit: 35943bda95329e610052831ff5245621a1b53638
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Feb 28 21:11:23 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Feb 28 22:37:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35943bda

gnome-base/gnome-shell: fix and re-enable USE=gtk-doc support

Turned out to be a meson-0.47 incompatibility, not gtk-doc

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../files/3.28.3-fix-gtk-doc-meson.patch   | 59 ++
 gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild   |  9 ++--
 2 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch 
b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
new file mode 100644
index 000..9948b163009
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
@@ -0,0 +1,59 @@
+From 9f4aa6ebf2193bb19dd8012de7699fce35681078 Mon Sep 17 00:00:00 2001
+From: Pascal Nowack 
+Date: Mon, 6 Aug 2018 14:21:02 +0200
+Subject: [PATCH] build: Fix build with meson >= 47.0
+
+With meson >= 47.0, building gnome-shell will fail
+when --rebuild-types is used as an option for gtk-doc,
+so stop using that option and bump the meson requirement.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/191
+---
+ docs/reference/shell/meson.build | 3 +--
+ docs/reference/st/meson.build| 3 +--
+ meson.build  | 2 +-
+ 3 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/docs/reference/shell/meson.build 
b/docs/reference/shell/meson.build
+index 1469ed422..a32d6a58a 100644
+--- a/docs/reference/shell/meson.build
 b/docs/reference/shell/meson.build
+@@ -50,8 +50,7 @@ gnome.gtkdoc('shell',
+ join_paths(meson.build_root(), 'src')
+   ],
+   scan_args: [
+-'--ignore-headers=' + ' '.join(private_headers + exclude_directories),
+-'--rebuild-types'
++'--ignore-headers=' + ' '.join(private_headers + exclude_directories)
+   ],
+   install: true
+ )
+diff --git a/docs/reference/st/meson.build b/docs/reference/st/meson.build
+index fe89b53d4..3e9e9ab7c 100644
+--- a/docs/reference/st/meson.build
 b/docs/reference/st/meson.build
+@@ -17,8 +17,7 @@ gnome.gtkdoc('st',
+   ],
+   scan_args: [
+ '--ignore-headers=' + ' '.join(private_headers),
+-'--rebuild-sections',
+-'--rebuild-types'
++'--rebuild-sections'
+   ],
+   install: true
+ )
+diff --git a/meson.build b/meson.build
+index 03b9d52a8..e33a76183 100644
+--- a/meson.build
 b/meson.build
+@@ -1,6 +1,6 @@
+ project('gnome-shell', 'c',
+   version: '3.28.3',
+-  meson_version: '>= 0.42.0',
++  meson_version: '>= 0.47.0',
+   license: 'GPLv2+'
+ )
+ 
+-- 
+2.17.0
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild
index d49823e4bdf..0a3ea629b3f 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz";
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-IUSE="+bluetooth +browser-extension elogind +ibus +networkmanager nsplugin 
systemd telepathy"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
nsplugin systemd telepathy"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
?? ( elogind systemd )"
 
@@ -110,9 +110,10 @@ DEPEND="${COMMON_DEPEND}
dev-libs/libxslt
>=dev-util/gdbus-codegen-2.45.3
dev-util/glib-utils
+   gtk-doc? ( >=dev-util/gtk-doc-1.17 )
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
-" #gtk-doc? ( >=dev-util/gtk-doc-1.17 )
+"
 
 PATCHES=(
# Patches from gnome-3-26 branch on top of 3.26.2
@@ -121,6 +122,8 @@ PATCHES=(
"${FILESDIR}"/${PV}-defaults.patch
# Fix automagic gnome-bluetooth dep, bug #398145
"${FILESDIR}"/${PV}-optional-bluetooth.patch
+   # Fix gtk-doc build with >=meson-0.47
+   "${FILESDIR}"/${PV}-fix-gtk-doc-meson.patch
 )
 
 src_prepare() {
@@ -135,7 +138,7 @@ src_configure() {
local emesonargs=(
$(meson_use bluetooth)
$(meson_use nsplugin browser_plugin)
-   #$(meson_use gtk-doc gtk_doc) # fails in gtkdoc-scangobj call 
with gtk-doc-1.25 (perl regex parenthesis issue); probably needs newer 
python-based gtk-doc to work
+   $(meson_use gtk-doc gtk_doc)
-Dman=true
$(meson_use networkmanager)
$(meson_use systemd) # this controls journald integration only 
as of 3.26.2 (structured logging and having gnome-shell launched apps use its 
own identifier instead of gnome-session)

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2016-06-27 Thread Alexandre Rostovtsev

commit: de093187ffd212744ab9952167e511d74de42153
Author: Alexandre Rostovtsev  gentoo  org>
AuthorDate: Mon Jun 27 14:05:46 2016 +
Commit: Alexandre Rostovtsev  gentoo  org>
CommitDate: Mon Jun 27 14:05:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de093187

gnome-base/gnome-shell: fix nvidia-drivers crash (bug #587110)

Thanks to Mark R. Pariente for reporting.

Also, require adwaita-icon-theme-3.20 for new grid icon (bug #587130)

Package-Manager: portage-2.3.0

 .../files/gnome-shell-3.20.2-st-nvidia.patch   | 121 +++
 .../gnome-shell/gnome-shell-3.20.2-r1.ebuild   | 221 +
 2 files changed, 342 insertions(+)

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch 
b/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch
new file mode 100644
index 000..63df248
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch
@@ -0,0 +1,121 @@
+From 35cc224240ec4fc8159fc689fe3e093a81f97dc9 Mon Sep 17 00:00:00 2001
+From: Martin Szulecki 
+Date: Tue, 17 May 2016 15:00:04 +0200
+Subject: [PATCH] st: Init framebuffer early to fix gnome-shell crash on NVIDIA
+ drivers
+
+Checking offscreen for COGL_INVALID_HANDLE is not sufficient,
+as cogl_offscreen_new_with_texture doesn't initialize framebuffer
+objects but lets Cogl solve this the lazy way.
+cogl_offscreen_new_with_texture will never return COGL_INVALID_HANDLE
+anyways.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=764898
+---
+ src/st/st-theme-node-drawing.c| 18 --
+ src/st/st-theme-node-transition.c | 25 -
+ 2 files changed, 32 insertions(+), 11 deletions(-)
+
+diff --git a/src/st/st-theme-node-drawing.c b/src/st/st-theme-node-drawing.c
+index 85feb20..8942966 100644
+--- a/src/st/st-theme-node-drawing.c
 b/src/st/st-theme-node-drawing.c
+@@ -2224,6 +2224,7 @@ st_theme_node_prerender_shadow (StThemeNodePaintState 
*state)
+   int max_borders[4];
+   int center_radius, corner_id;
+   CoglHandle buffer, offscreen = COGL_INVALID_HANDLE;
++  CoglError *error = NULL;
+ 
+   /* Get infos from the node */
+   if (state->alloc_width < node->box_shadow_min_width ||
+@@ -2264,10 +2265,12 @@ st_theme_node_prerender_shadow (StThemeNodePaintState 
*state)
+state->box_shadow_height,
+COGL_TEXTURE_NO_SLICING,
+COGL_PIXEL_FORMAT_ANY);
+-  if (buffer != COGL_INVALID_HANDLE)
+-offscreen = cogl_offscreen_new_with_texture (buffer);
++  if (buffer == NULL)
++return;
+ 
+-  if (offscreen != COGL_INVALID_HANDLE)
++  offscreen = cogl_offscreen_new_with_texture (buffer);
++
++  if (cogl_framebuffer_allocate (COGL_FRAMEBUFFER (offscreen), &error))
+ {
+   ClutterActorBox box = { 0, 0, state->box_shadow_width, 
state->box_shadow_height};
+ 
+@@ -2277,14 +2280,17 @@ st_theme_node_prerender_shadow (StThemeNodePaintState 
*state)
+   cogl_framebuffer_clear4f (offscreen, COGL_BUFFER_BIT_COLOR, 0, 0, 0, 0);
+ 
+   st_theme_node_paint_borders (state, offscreen, &box, 0xFF);
+-  cogl_handle_unref (offscreen);
+ 
+   state->box_shadow_pipeline = _st_create_shadow_pipeline 
(st_theme_node_get_box_shadow (node),
+buffer);
+ }
++  else
++{
++  cogl_error_free (error);
++}
+ 
+-  if (buffer != COGL_INVALID_HANDLE)
+-cogl_handle_unref (buffer);
++  cogl_handle_unref (offscreen);
++  cogl_handle_unref (buffer);
+ }
+ 
+ static void
+diff --git a/src/st/st-theme-node-transition.c 
b/src/st/st-theme-node-transition.c
+index 1eef17b..afde977 100644
+--- a/src/st/st-theme-node-transition.c
 b/src/st/st-theme-node-transition.c
+@@ -241,6 +241,7 @@ setup_framebuffers (StThemeNodeTransition *transition,
+ {
+   StThemeNodeTransitionPrivate *priv = transition->priv;
+   guint width, height;
++  CoglError *catch_error = NULL;
+ 
+   /* template material to avoid unnecessary shader compilation */
+   static CoglHandle material_template = COGL_INVALID_HANDLE;
+@@ -263,19 +264,33 @@ setup_framebuffers (StThemeNodeTransition *transition,
+   COGL_TEXTURE_NO_SLICING,
+   COGL_PIXEL_FORMAT_ANY);
+ 
+-  g_return_val_if_fail (priv->old_texture != COGL_INVALID_HANDLE, FALSE);
+-  g_return_val_if_fail (priv->new_texture != COGL_INVALID_HANDLE, FALSE);
++  if (priv->old_texture == COGL_INVALID_HANDLE)
++return FALSE;
++
++  if (priv->new_texture == COGL_INVALID_HANDLE)
++return FALSE;
+ 
+   if (priv->old_offscreen)
+ cogl_handle_unref (priv->old_offscreen);
+   priv->old_offscreen = cogl_offscreen_new_with_texture (priv->old_texture);
++  if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (priv->old_offscreen), 
&catch_error))
++{
++  cogl_object_unref (priv->old_offscreen);
++

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2016-11-11 Thread Gilles Dartiguelongue

commit: a4358aee4a36b9c9eeef3e487ea9c3459218c0cf
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Fri Nov 11 22:45:09 2016 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sat Nov 12 00:33:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4358aee

gnome-base/gnome-shell: version bump 3.20.4 → 3.22.1

Cleanup unused dependencies. Add missing dependencies with
introspection support. Make nsplugin optional as there is the chrome
extension in tree too. Update comments.

Package-Manager: portage-2.3.2

 .../files/gnome-shell-3.22.0-defaults.patch| 26 
 .../files/gnome-shell-3.22.0-gir-build-fix.patch   | 28 +
 gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild   | 49 +-
 3 files changed, 73 insertions(+), 30 deletions(-)

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch 
b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch
new file mode 100644
index ..b80dbc3
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch
@@ -0,0 +1,26 @@
+From 7a671f99b7ef2d5f38be67668aac762764b32a42 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Tue, 10 Dec 2013 23:33:51 +0100
+Subject: [PATCH 1/2] Alter list of default applications
+
+Signed-off-by: Gilles Dartiguelongue 
+---
+ data/org.gnome.shell.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.gnome.shell.gschema.xml.in 
b/data/org.gnome.shell.gschema.xml.in
+index c1e6b21..368c654 100644
+--- a/data/org.gnome.shell.gschema.xml.in
 b/data/org.gnome.shell.gschema.xml.in
+@@ -31,7 +31,7 @@
+   
+ 
+ 
+-  [ 'epiphany.desktop', 'evolution.desktop', 
'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 
'org.gnome.Software.desktop' ]
++  [ 'chromium-browser-chromium.desktop', 'firefox.desktop', 
'firefox-bin.desktop', 'evolution.desktop', 'rhythmbox.desktop', 
'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' 
]
+   List of desktop file IDs for favorite applications
+   
+ The applications corresponding to these identifiers
+-- 
+2.10.1
+

diff --git 
a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch 
b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch
new file mode 100644
index ..b0c5fb7
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch
@@ -0,0 +1,28 @@
+From 395bede20811b0cf2bcecb0b4e5bcbc2c2fa35f4 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Sat, 12 Nov 2016 00:21:25 +0100
+Subject: [PATCH] Add missing rpath to point to mutter specific libraries
+
+Reported-By: alpha...@gmail.com
+X-Gentoo-Bug: 597842
+X-Gentoo-Url: https://bugs.gentoo.org/show_bug.cgi?id=597842
+---
+ src/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index e9aacfe..fd98ba5 100644
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -311,7 +311,7 @@ shell-enum-types.c: $(srcdir)/shell-enum-types.c.in 
stamp-shell-enum-types.h
+   rm -f $(@F).tmp
+ EXTRA_DIST += shell-enum-types.c.in
+ 
+-libgnome_shell_ldflags = -avoid-version
++libgnome_shell_ldflags = -avoid-version -Wl,-rpath,$(MUTTER_TYPELIB_DIR)
+ libgnome_shell_libadd =   \
+   -lm \
+   $(GNOME_SHELL_LIBS) \
+-- 
+2.10.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild
index c5e7062..60739bd 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild
@@ -6,14 +6,14 @@ EAPI=6
 GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python{3_4,3_5} )
 
-inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd
+inherit autotools gnome2 multilib pax-utils python-r1 systemd
 
 DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-IUSE="+bluetooth +networkmanager +nls -openrc-force"
+IUSE="+bluetooth +networkmanager nsplugin +nls -openrc-force"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
@@ -30,13 +30,9 @@ COMMON_DEPEND="
>=dev-libs/gobject-introspection-1.49.1:=
dev-libs/libical:=
>=x11-libs/gtk+-3.15.0:3[introspection]
-   >=media-libs/clutter-1.21.5:1.0[introspection]
-   >=dev-libs/json-glib-0.13.2
>=dev-libs/libcroco-0.6.8:0.6
>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
>=gnome-base/gsettings-desktop-schemas-3.21.3
-   >=gnome-base/gnome-keyring-3.3.90
-   gnome-base/libgnome-keyring
>=gnome-extra/evolution-data-server-3.17.2:=
>=media-libs/gstreamer-0.11.92:1.0
>=net-im/telepathy-logger-0.2.4[introspection]
@@ -52,14 +48,13 @@ COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-03-20 Thread Matt Turner

commit: 314bbe352252e6e0085be5342025fee3df903888
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Mar 20 17:38:59 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Mar 20 19:54:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=314bbe35

gnome-base/gnome-shell: Version bump to 42.0

Signed-off-by: Matt Turner  gentoo.org>

 gnome-base/gnome-shell/Manifest|   1 +
 .../files/42.0-optional-bluetooth.patch|  59 ++
 gnome-base/gnome-shell/gnome-shell-42.0.ebuild | 202 +
 3 files changed, 262 insertions(+)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 8f39615367ab..9cedbba95216 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1 +1,2 @@
 DIST gnome-shell-41.4.tar.xz 1899464 BLAKE2B 
202408be8886bb5eb5615328a774993bea8dfe2fb78d304fde2806096ca68eff3fae7d5bdb4972b627cf10192ff76e3d457dc37eaa806cd4ed57d1558c235a48
 SHA512 
6ed5f215fcf9a1cf450b406620568aeceb3d255e0bb979151ccd2260565748e69825d7f5f7fb0c6768ed584a530599a8dcbc713c1ec12617551ae9df782c5ad7
+DIST gnome-shell-42.0.tar.xz 1918044 BLAKE2B 
742d13ad92795fb71bbe8376a86b8e9a828882288f105f026cf98304ef2e9eae8fb967fa978ec322f5c621303a1798d3490c001bbd63c704b0cddc5db688389d
 SHA512 
39b56d3c09a238d9ca387145fdbddfaa929b124d4006f097b792de2dceb882e50cbce1255b0b4585aea04b522a92a4e7a743367f43a863f95bb6386401e73935

diff --git a/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch 
b/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch
new file mode 100644
index ..c7fe07dd69de
--- /dev/null
+++ b/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch
@@ -0,0 +1,59 @@
+From d7cfd7bff4f9fa9d8528f72d4275e07551c6b288 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp 
+Date: Thu, 28 Feb 2019 00:50:19 +0200
+Subject: [PATCH] build: Make bluetooth support optional
+
+---
+ js/misc/meson.build | 2 +-
+ meson.build | 7 ++-
+ meson_options.txt   | 6 ++
+ 3 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/js/misc/meson.build b/js/misc/meson.build
+index 582562711..ec9c62645 100644
+--- a/js/misc/meson.build
 b/js/misc/meson.build
+@@ -3,7 +3,7 @@ jsconf.set('PACKAGE_NAME', meson.project_name())
+ jsconf.set('PACKAGE_VERSION', meson.project_version())
+ jsconf.set('GETTEXT_PACKAGE', meson.project_name())
+ jsconf.set('LIBMUTTER_API_VERSION', mutter_api_version)
+-jsconf.set10('HAVE_BLUETOOTH', bt_dep.found())
++jsconf.set10('HAVE_BLUETOOTH', have_bluetooth)
+ jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager)
+ jsconf.set10('HAVE_SOUP2', have_soup2)
+ jsconf.set('datadir', datadir)
+diff --git a/meson.build b/meson.build
+index 8d7478f9b..79d340840 100644
+--- a/meson.build
 b/meson.build
+@@ -93,7 +93,12 @@ x11_dep = dependency('x11')
+ schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req)
+ gnome_desktop_dep = dependency('gnome-desktop-3.0', version: 
gnome_desktop_req)
+ 
+-bt_dep = dependency('gnome-bluetooth-3.0', version: bt_req, required: false)
++if get_option('bluetooth')
++  bt_dep = dependency('gnome-bluetooth-3.0', version: bt_req)
++  have_bluetooth = true
++else
++  have_bluetooth = false
++endif
+ gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false)
+ gst_base_dep = dependency('gstreamer-base-1.0', required: false)
+ pipewire_dep = dependency('libpipewire-0.3', required: false)
+diff --git a/meson_options.txt b/meson_options.txt
+index f0f2ecf6c..85fc58ea4 100644
+--- a/meson_options.txt
 b/meson_options.txt
+@@ -1,3 +1,9 @@
++option('bluetooth',
++  type: 'boolean',
++  value: true,
++  description: 'Enable bluetooth support'
++)
++
+ option('extensions_tool',
+   type: 'boolean',
+   value: true,
+-- 
+2.34.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-42.0.ebuild 
b/gnome-base/gnome-shell/gnome-shell-42.0.ebuild
new file mode 100644
index ..002edd7d2f1e
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-42.0.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer/pipewire support is currently automagic
+DEPEND="
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.68:2
+   >=dev-libs/gobject-introspe

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-03-28 Thread Matt Turner

commit: 998b2b1d772d35e29e0e9df326df12943af8d94e
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Mar 28 15:14:24 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Mar 28 15:17:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=998b2b1d

gnome-base/gnome-shell: Version bump to 41.5

Closes: https://bugs.gentoo.org/836311
Signed-off-by: Matt Turner  gentoo.org>

 gnome-base/gnome-shell/Manifest|   1 +
 5-environment-Require-GnomeBluetooth-1.0.patch |  35 
 ...1.5-environment-Require-gnome-desktop-3.0.patch |  30 +++
 .../41.5-environment-Require-libgweather-3.0.patch |  29 +++
 gnome-base/gnome-shell/gnome-shell-41.5.ebuild | 208 +
 5 files changed, 303 insertions(+)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 9cedbba95216..be1d64fd56a4 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-shell-41.4.tar.xz 1899464 BLAKE2B 
202408be8886bb5eb5615328a774993bea8dfe2fb78d304fde2806096ca68eff3fae7d5bdb4972b627cf10192ff76e3d457dc37eaa806cd4ed57d1558c235a48
 SHA512 
6ed5f215fcf9a1cf450b406620568aeceb3d255e0bb979151ccd2260565748e69825d7f5f7fb0c6768ed584a530599a8dcbc713c1ec12617551ae9df782c5ad7
+DIST gnome-shell-41.5.tar.xz 1899888 BLAKE2B 
73491f382413c313956fc6ab878a54d8a881190ee93cac5d334d169636d8dd21557c78719142f717c94463e02c7ca4eaf12a6e4ca6167e48a002ece9379b6d03
 SHA512 
b638103528413dcfa12d65d0c7add45716d21334294babbadd0a05e3410ca068ae336b28c30eb8811222b9f90e5efdf0d1a6e0a2e3f104b49061bb28333f066e
 DIST gnome-shell-42.0.tar.xz 1918044 BLAKE2B 
742d13ad92795fb71bbe8376a86b8e9a828882288f105f026cf98304ef2e9eae8fb967fa978ec322f5c621303a1798d3490c001bbd63c704b0cddc5db688389d
 SHA512 
39b56d3c09a238d9ca387145fdbddfaa929b124d4006f097b792de2dceb882e50cbce1255b0b4585aea04b522a92a4e7a743367f43a863f95bb6386401e73935

diff --git 
a/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
 
b/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
new file mode 100644
index ..8729a6c3e671
--- /dev/null
+++ 
b/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
@@ -0,0 +1,35 @@
+From 9ce6756235ba272b8602d50d1f005dc2ef265889 Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto 
+Date: Sun, 31 Oct 2021 17:24:58 -0300
+Subject: [PATCH 1/2] environment: Require GnomeBluetooth 1.0
+
+libgnome-bluetooth will start to offer a 2.0 library version
+depending on GTK4. Given that GNOME Shell already depends on
+GTK3, it cannot use this next version of gnome-bluetooth. And
+since GJS will automatically try and use the latest version
+available of any library, Shell must specify it wants 1.0
+explicitly.
+
+Add a required GnomeBluetooth version number when importing it
+for the status indicator.
+
+Part-of: 
+---
+ js/ui/environment.js | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/js/ui/environment.js b/js/ui/environment.js
+index ef53e6022..e906fa6c6 100644
+--- a/js/ui/environment.js
 b/js/ui/environment.js
+@@ -6,6 +6,7 @@ const Config = imports.misc.config;
+ imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
+ imports.gi.versions.Gio = '2.0';
+ imports.gi.versions.GdkPixbuf = '2.0';
++imports.gi.versions.GnomeBluetooth = '1.0';
+ imports.gi.versions.Gtk = '3.0';
+ imports.gi.versions.Soup = '3.0';
+ imports.gi.versions.TelepathyGLib = '0.12';
+-- 
+2.34.1
+

diff --git 
a/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch 
b/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch
new file mode 100644
index ..3dbb50bb989b
--- /dev/null
+++ 
b/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch
@@ -0,0 +1,30 @@
+From 795312b8d5634d3005679b3c1313114e41e538fd Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto 
+Date: Thu, 11 Nov 2021 16:20:39 -0300
+Subject: [PATCH 2/2] environment: Require gnome-desktop 3.0
+
+Pretty much the exact same case of 9ce6756235.
+
+libgnome-desktop saw a major version bump, and we have to
+stick with 3.0 for a while.
+
+Part-of: 
+---
+ js/ui/environment.js | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/js/ui/environment.js b/js/ui/environment.js
+index e906fa6c6..cb254e319 100644
+--- a/js/ui/environment.js
 b/js/ui/environment.js
+@@ -7,6 +7,7 @@ imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
+ imports.gi.versions.Gio = '2.0';
+ imports.gi.versions.GdkPixbuf = '2.0';
+ imports.gi.versions.GnomeBluetooth = '1.0';
++imports.gi.versions.GnomeDesktop = '3.0';
+ imports.gi.versions.Gtk = '3.0';
+ imports.gi.versions.Soup = '3.0';
+ imports.gi.versions.TelepathyGLib = '0.12';
+-- 
+2.34.1
+

diff --git 
a/gnome-base/gnome-shell/files/41.5-environment

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2016-11-11 Thread Gilles Dartiguelongue

commit: a4358aee4a36b9c9eeef3e487ea9c3459218c0cf
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Fri Nov 11 22:45:09 2016 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sat Nov 12 00:33:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4358aee

gnome-base/gnome-shell: version bump 3.20.4 → 3.22.1

Cleanup unused dependencies. Add missing dependencies with
introspection support. Make nsplugin optional as there is the chrome
extension in tree too. Update comments.

Package-Manager: portage-2.3.2

 .../files/gnome-shell-3.22.0-defaults.patch| 26 
 .../files/gnome-shell-3.22.0-gir-build-fix.patch   | 28 +
 gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild   | 49 +-
 3 files changed, 73 insertions(+), 30 deletions(-)

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch 
b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch
new file mode 100644
index ..b80dbc3
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch
@@ -0,0 +1,26 @@
+From 7a671f99b7ef2d5f38be67668aac762764b32a42 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Tue, 10 Dec 2013 23:33:51 +0100
+Subject: [PATCH 1/2] Alter list of default applications
+
+Signed-off-by: Gilles Dartiguelongue 
+---
+ data/org.gnome.shell.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.gnome.shell.gschema.xml.in 
b/data/org.gnome.shell.gschema.xml.in
+index c1e6b21..368c654 100644
+--- a/data/org.gnome.shell.gschema.xml.in
 b/data/org.gnome.shell.gschema.xml.in
+@@ -31,7 +31,7 @@
+   
+ 
+ 
+-  [ 'epiphany.desktop', 'evolution.desktop', 
'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 
'org.gnome.Software.desktop' ]
++  [ 'chromium-browser-chromium.desktop', 'firefox.desktop', 
'firefox-bin.desktop', 'evolution.desktop', 'rhythmbox.desktop', 
'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' 
]
+   List of desktop file IDs for favorite applications
+   
+ The applications corresponding to these identifiers
+-- 
+2.10.1
+

diff --git 
a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch 
b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch
new file mode 100644
index ..b0c5fb7
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch
@@ -0,0 +1,28 @@
+From 395bede20811b0cf2bcecb0b4e5bcbc2c2fa35f4 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Sat, 12 Nov 2016 00:21:25 +0100
+Subject: [PATCH] Add missing rpath to point to mutter specific libraries
+
+Reported-By: alpha...@gmail.com
+X-Gentoo-Bug: 597842
+X-Gentoo-Url: https://bugs.gentoo.org/show_bug.cgi?id=597842
+---
+ src/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index e9aacfe..fd98ba5 100644
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -311,7 +311,7 @@ shell-enum-types.c: $(srcdir)/shell-enum-types.c.in 
stamp-shell-enum-types.h
+   rm -f $(@F).tmp
+ EXTRA_DIST += shell-enum-types.c.in
+ 
+-libgnome_shell_ldflags = -avoid-version
++libgnome_shell_ldflags = -avoid-version -Wl,-rpath,$(MUTTER_TYPELIB_DIR)
+ libgnome_shell_libadd =   \
+   -lm \
+   $(GNOME_SHELL_LIBS) \
+-- 
+2.10.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild
index c5e7062..60739bd 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild
@@ -6,14 +6,14 @@ EAPI=6
 GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python{3_4,3_5} )
 
-inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd
+inherit autotools gnome2 multilib pax-utils python-r1 systemd
 
 DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-IUSE="+bluetooth +networkmanager +nls -openrc-force"
+IUSE="+bluetooth +networkmanager nsplugin +nls -openrc-force"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
@@ -30,13 +30,9 @@ COMMON_DEPEND="
>=dev-libs/gobject-introspection-1.49.1:=
dev-libs/libical:=
>=x11-libs/gtk+-3.15.0:3[introspection]
-   >=media-libs/clutter-1.21.5:1.0[introspection]
-   >=dev-libs/json-glib-0.13.2
>=dev-libs/libcroco-0.6.8:0.6
>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
>=gnome-base/gsettings-desktop-schemas-3.21.3
-   >=gnome-base/gnome-keyring-3.3.90
-   gnome-base/libgnome-keyring
>=gnome-extra/evolution-data-server-3.17.2:=
>=media-libs/gstreamer-0.11.92:1.0
>=net-im/telepathy-logger-0.2.4[introspection]
@@ -52,14 +48,13 @@ COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2016-06-27 Thread Alexandre Rostovtsev

commit: de093187ffd212744ab9952167e511d74de42153
Author: Alexandre Rostovtsev  gentoo  org>
AuthorDate: Mon Jun 27 14:05:46 2016 +
Commit: Alexandre Rostovtsev  gentoo  org>
CommitDate: Mon Jun 27 14:05:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de093187

gnome-base/gnome-shell: fix nvidia-drivers crash (bug #587110)

Thanks to Mark R. Pariente for reporting.

Also, require adwaita-icon-theme-3.20 for new grid icon (bug #587130)

Package-Manager: portage-2.3.0

 .../files/gnome-shell-3.20.2-st-nvidia.patch   | 121 +++
 .../gnome-shell/gnome-shell-3.20.2-r1.ebuild   | 221 +
 2 files changed, 342 insertions(+)

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch 
b/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch
new file mode 100644
index 000..63df248
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch
@@ -0,0 +1,121 @@
+From 35cc224240ec4fc8159fc689fe3e093a81f97dc9 Mon Sep 17 00:00:00 2001
+From: Martin Szulecki 
+Date: Tue, 17 May 2016 15:00:04 +0200
+Subject: [PATCH] st: Init framebuffer early to fix gnome-shell crash on NVIDIA
+ drivers
+
+Checking offscreen for COGL_INVALID_HANDLE is not sufficient,
+as cogl_offscreen_new_with_texture doesn't initialize framebuffer
+objects but lets Cogl solve this the lazy way.
+cogl_offscreen_new_with_texture will never return COGL_INVALID_HANDLE
+anyways.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=764898
+---
+ src/st/st-theme-node-drawing.c| 18 --
+ src/st/st-theme-node-transition.c | 25 -
+ 2 files changed, 32 insertions(+), 11 deletions(-)
+
+diff --git a/src/st/st-theme-node-drawing.c b/src/st/st-theme-node-drawing.c
+index 85feb20..8942966 100644
+--- a/src/st/st-theme-node-drawing.c
 b/src/st/st-theme-node-drawing.c
+@@ -2224,6 +2224,7 @@ st_theme_node_prerender_shadow (StThemeNodePaintState 
*state)
+   int max_borders[4];
+   int center_radius, corner_id;
+   CoglHandle buffer, offscreen = COGL_INVALID_HANDLE;
++  CoglError *error = NULL;
+ 
+   /* Get infos from the node */
+   if (state->alloc_width < node->box_shadow_min_width ||
+@@ -2264,10 +2265,12 @@ st_theme_node_prerender_shadow (StThemeNodePaintState 
*state)
+state->box_shadow_height,
+COGL_TEXTURE_NO_SLICING,
+COGL_PIXEL_FORMAT_ANY);
+-  if (buffer != COGL_INVALID_HANDLE)
+-offscreen = cogl_offscreen_new_with_texture (buffer);
++  if (buffer == NULL)
++return;
+ 
+-  if (offscreen != COGL_INVALID_HANDLE)
++  offscreen = cogl_offscreen_new_with_texture (buffer);
++
++  if (cogl_framebuffer_allocate (COGL_FRAMEBUFFER (offscreen), &error))
+ {
+   ClutterActorBox box = { 0, 0, state->box_shadow_width, 
state->box_shadow_height};
+ 
+@@ -2277,14 +2280,17 @@ st_theme_node_prerender_shadow (StThemeNodePaintState 
*state)
+   cogl_framebuffer_clear4f (offscreen, COGL_BUFFER_BIT_COLOR, 0, 0, 0, 0);
+ 
+   st_theme_node_paint_borders (state, offscreen, &box, 0xFF);
+-  cogl_handle_unref (offscreen);
+ 
+   state->box_shadow_pipeline = _st_create_shadow_pipeline 
(st_theme_node_get_box_shadow (node),
+buffer);
+ }
++  else
++{
++  cogl_error_free (error);
++}
+ 
+-  if (buffer != COGL_INVALID_HANDLE)
+-cogl_handle_unref (buffer);
++  cogl_handle_unref (offscreen);
++  cogl_handle_unref (buffer);
+ }
+ 
+ static void
+diff --git a/src/st/st-theme-node-transition.c 
b/src/st/st-theme-node-transition.c
+index 1eef17b..afde977 100644
+--- a/src/st/st-theme-node-transition.c
 b/src/st/st-theme-node-transition.c
+@@ -241,6 +241,7 @@ setup_framebuffers (StThemeNodeTransition *transition,
+ {
+   StThemeNodeTransitionPrivate *priv = transition->priv;
+   guint width, height;
++  CoglError *catch_error = NULL;
+ 
+   /* template material to avoid unnecessary shader compilation */
+   static CoglHandle material_template = COGL_INVALID_HANDLE;
+@@ -263,19 +264,33 @@ setup_framebuffers (StThemeNodeTransition *transition,
+   COGL_TEXTURE_NO_SLICING,
+   COGL_PIXEL_FORMAT_ANY);
+ 
+-  g_return_val_if_fail (priv->old_texture != COGL_INVALID_HANDLE, FALSE);
+-  g_return_val_if_fail (priv->new_texture != COGL_INVALID_HANDLE, FALSE);
++  if (priv->old_texture == COGL_INVALID_HANDLE)
++return FALSE;
++
++  if (priv->new_texture == COGL_INVALID_HANDLE)
++return FALSE;
+ 
+   if (priv->old_offscreen)
+ cogl_handle_unref (priv->old_offscreen);
+   priv->old_offscreen = cogl_offscreen_new_with_texture (priv->old_texture);
++  if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (priv->old_offscreen), 
&catch_error))
++{
++  cogl_object_unref (priv->old_offscreen);
++

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-06-23 Thread Sam James

commit: dea2c90c1aee7d012a467eeb937fc4a7ecae9237
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 24 03:42:30 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 24 03:42:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dea2c90c

gnome-base/gnome-shell: restore 42.1-r3 for Polkit fix

Bug: https://bugs.gentoo.org/844919
Bug: https://bugs.gentoo.org/849566
Fixes: eed2ee4b79e40099d84db0dde29dced1e3346bb6
Signed-off-by: Sam James  gentoo.org>

 .../gnome-shell/files/42.1-polkit-g_autoptr.patch  |  53 ++
 gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild  | 206 +
 2 files changed, 259 insertions(+)

diff --git a/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch 
b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
new file mode 100644
index ..78d3de086260
--- /dev/null
+++ b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
@@ -0,0 +1,53 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/1d0a08b5e25fea7b0e792ec9798e68a7c5606a75
+https://bugs.gentoo.org/844919
+
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= 
+Date: Tue, 17 May 2022 15:36:43 +0200
+Subject: [PATCH] build: Do not redefine polkit autocleanup
+
+PolkitAgent recently added autocleanup functions itself, so check
+for their existence at configure time and only define our own when
+they don't exist upstream.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5490
+
+Part-of: 
+--- a/config.h.meson
 b/config.h.meson
+@@ -33,3 +33,6 @@
+ 
+ /* Define if fdwalk is available in libc */
+ #mesondefine HAVE_FDWALK
++
++/* Define if polkit defines autocleanup functions */
++#mesondefine HAVE_POLKIT_AUTOCLEANUP
+--- a/meson.build
 b/meson.build
+@@ -169,6 +169,13 @@ cdata.set('HAVE_FDWALK',
+   cc.has_function('fdwalk')
+ )
+ 
++polkit_has_autocleanup = cc.compiles(
++  '#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
++  #include 
++  void main(void) { g_autoptr(PolkitAgentListener) agent = NULL; }',
++  dependencies: polkit_dep)
++cdata.set('HAVE_POLKIT_AUTOCLEANUP', polkit_has_autocleanup)
++
+ buildtype = get_option('buildtype')
+ if buildtype != 'plain'
+   all_warnings = [
+--- a/src/shell-polkit-authentication-agent.h
 b/src/shell-polkit-authentication-agent.h
+@@ -14,8 +14,10 @@
+ 
+ G_BEGIN_DECLS
+ 
++#ifndef HAVE_POLKIT_AUTOCLEANUP
+ /* Polkit doesn't have g_autoptr support, thus we have to manually set the 
autoptr function here */
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (PolkitAgentListener, g_object_unref)
++#endif
+ 
+ #define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT 
(shell_polkit_authentication_agent_get_type())
+ 
+GitLab

diff --git a/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild 
b/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild
new file mode 100644
index ..3bc4781371bb
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer/pipewire support is currently automagic
+DEPEND="
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.68:2
+   >=dev-libs/gobject-introspection-1.49.1:=
+   >=dev-libs/gjs-1.71.1
+   >=x11-libs/gtk+-3.15.0:3[introspection]
+   >=x11-wm/mutter-42.0:0/10[introspection,test?]
+   >=sys-auth/polkit-0.120_p20220509[introspection]
+   >=gnome-base/gsettings-desktop-schemas-42_beta[introspection]
+   >=x11-libs/startup-notification-0.11
+   >=app-i18n/ibus-1.5.19
+   >=gnome-base/gnome-desktop-3.35.90:3=[introspection]
+   bluetooth? ( net-wireless/gnome-bluetooth:3=[introspection] )
+   >=media-libs/gstreamer-0.11.92:1.0
+   media-libs/gst-plugins-base:1.0
+   >=media-video/pipewire-0.3.0:=
+   networkmanager? (
+   >=net-misc/networkmanager-1.10.4:=[introspection]
+   net-libs/libnma[introspection]
+   >=app-crypt/libsecret-0.18
+   dev-libs/dbus-glib )
+   systemd? ( >=sys-apps/systemd-242
+   >=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
+   elogind? ( >=sys-auth/elogind-237 )
+
+   app-arch/gnome-autoar
+   dev-libs/json-glib
+
+   >=app-accessibility/at-spi2-atk-2.5.3

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-03-20 Thread Matt Turner

commit: 314bbe352252e6e0085be5342025fee3df903888
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Mar 20 17:38:59 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Mar 20 19:54:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=314bbe35

gnome-base/gnome-shell: Version bump to 42.0

Signed-off-by: Matt Turner  gentoo.org>

 gnome-base/gnome-shell/Manifest|   1 +
 .../files/42.0-optional-bluetooth.patch|  59 ++
 gnome-base/gnome-shell/gnome-shell-42.0.ebuild | 202 +
 3 files changed, 262 insertions(+)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 8f39615367ab..9cedbba95216 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1 +1,2 @@
 DIST gnome-shell-41.4.tar.xz 1899464 BLAKE2B 
202408be8886bb5eb5615328a774993bea8dfe2fb78d304fde2806096ca68eff3fae7d5bdb4972b627cf10192ff76e3d457dc37eaa806cd4ed57d1558c235a48
 SHA512 
6ed5f215fcf9a1cf450b406620568aeceb3d255e0bb979151ccd2260565748e69825d7f5f7fb0c6768ed584a530599a8dcbc713c1ec12617551ae9df782c5ad7
+DIST gnome-shell-42.0.tar.xz 1918044 BLAKE2B 
742d13ad92795fb71bbe8376a86b8e9a828882288f105f026cf98304ef2e9eae8fb967fa978ec322f5c621303a1798d3490c001bbd63c704b0cddc5db688389d
 SHA512 
39b56d3c09a238d9ca387145fdbddfaa929b124d4006f097b792de2dceb882e50cbce1255b0b4585aea04b522a92a4e7a743367f43a863f95bb6386401e73935

diff --git a/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch 
b/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch
new file mode 100644
index ..c7fe07dd69de
--- /dev/null
+++ b/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch
@@ -0,0 +1,59 @@
+From d7cfd7bff4f9fa9d8528f72d4275e07551c6b288 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp 
+Date: Thu, 28 Feb 2019 00:50:19 +0200
+Subject: [PATCH] build: Make bluetooth support optional
+
+---
+ js/misc/meson.build | 2 +-
+ meson.build | 7 ++-
+ meson_options.txt   | 6 ++
+ 3 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/js/misc/meson.build b/js/misc/meson.build
+index 582562711..ec9c62645 100644
+--- a/js/misc/meson.build
 b/js/misc/meson.build
+@@ -3,7 +3,7 @@ jsconf.set('PACKAGE_NAME', meson.project_name())
+ jsconf.set('PACKAGE_VERSION', meson.project_version())
+ jsconf.set('GETTEXT_PACKAGE', meson.project_name())
+ jsconf.set('LIBMUTTER_API_VERSION', mutter_api_version)
+-jsconf.set10('HAVE_BLUETOOTH', bt_dep.found())
++jsconf.set10('HAVE_BLUETOOTH', have_bluetooth)
+ jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager)
+ jsconf.set10('HAVE_SOUP2', have_soup2)
+ jsconf.set('datadir', datadir)
+diff --git a/meson.build b/meson.build
+index 8d7478f9b..79d340840 100644
+--- a/meson.build
 b/meson.build
+@@ -93,7 +93,12 @@ x11_dep = dependency('x11')
+ schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req)
+ gnome_desktop_dep = dependency('gnome-desktop-3.0', version: 
gnome_desktop_req)
+ 
+-bt_dep = dependency('gnome-bluetooth-3.0', version: bt_req, required: false)
++if get_option('bluetooth')
++  bt_dep = dependency('gnome-bluetooth-3.0', version: bt_req)
++  have_bluetooth = true
++else
++  have_bluetooth = false
++endif
+ gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false)
+ gst_base_dep = dependency('gstreamer-base-1.0', required: false)
+ pipewire_dep = dependency('libpipewire-0.3', required: false)
+diff --git a/meson_options.txt b/meson_options.txt
+index f0f2ecf6c..85fc58ea4 100644
+--- a/meson_options.txt
 b/meson_options.txt
+@@ -1,3 +1,9 @@
++option('bluetooth',
++  type: 'boolean',
++  value: true,
++  description: 'Enable bluetooth support'
++)
++
+ option('extensions_tool',
+   type: 'boolean',
+   value: true,
+-- 
+2.34.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-42.0.ebuild 
b/gnome-base/gnome-shell/gnome-shell-42.0.ebuild
new file mode 100644
index ..002edd7d2f1e
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-42.0.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer/pipewire support is currently automagic
+DEPEND="
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.68:2
+   >=dev-libs/gobject-introspe

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-05-17 Thread Sam James

commit: 042dabffb96f3b8fd74e0cbb14c524c81e7304df
Author: Sam James  gentoo  org>
AuthorDate: Tue May 17 21:58:52 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 17 21:58:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=042dabff

gnome-base/gnome-shell: backport new Polkit patch (g_autoptr)

Closes: https://bugs.gentoo.org/844919
Signed-off-by: Sam James  gentoo.org>

 .../gnome-shell/files/42.1-polkit-g_autoptr.patch  | 53 ++
 gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild  |  3 ++
 2 files changed, 56 insertions(+)

diff --git a/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch 
b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
new file mode 100644
index ..78d3de086260
--- /dev/null
+++ b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
@@ -0,0 +1,53 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/1d0a08b5e25fea7b0e792ec9798e68a7c5606a75
+https://bugs.gentoo.org/844919
+
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= 
+Date: Tue, 17 May 2022 15:36:43 +0200
+Subject: [PATCH] build: Do not redefine polkit autocleanup
+
+PolkitAgent recently added autocleanup functions itself, so check
+for their existence at configure time and only define our own when
+they don't exist upstream.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5490
+
+Part-of: 
+--- a/config.h.meson
 b/config.h.meson
+@@ -33,3 +33,6 @@
+ 
+ /* Define if fdwalk is available in libc */
+ #mesondefine HAVE_FDWALK
++
++/* Define if polkit defines autocleanup functions */
++#mesondefine HAVE_POLKIT_AUTOCLEANUP
+--- a/meson.build
 b/meson.build
+@@ -169,6 +169,13 @@ cdata.set('HAVE_FDWALK',
+   cc.has_function('fdwalk')
+ )
+ 
++polkit_has_autocleanup = cc.compiles(
++  '#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
++  #include 
++  void main(void) { g_autoptr(PolkitAgentListener) agent = NULL; }',
++  dependencies: polkit_dep)
++cdata.set('HAVE_POLKIT_AUTOCLEANUP', polkit_has_autocleanup)
++
+ buildtype = get_option('buildtype')
+ if buildtype != 'plain'
+   all_warnings = [
+--- a/src/shell-polkit-authentication-agent.h
 b/src/shell-polkit-authentication-agent.h
+@@ -14,8 +14,10 @@
+ 
+ G_BEGIN_DECLS
+ 
++#ifndef HAVE_POLKIT_AUTOCLEANUP
+ /* Polkit doesn't have g_autoptr support, thus we have to manually set the 
autoptr function here */
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (PolkitAgentListener, g_object_unref)
++#endif
+ 
+ #define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT 
(shell_polkit_authentication_agent_get_type())
+ 
+GitLab

diff --git a/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild 
b/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild
index db6f1390fcef..7a1cc841e4f9 100644
--- a/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild
@@ -140,6 +140,9 @@ PATCHES=(
"${FILESDIR}"/42.0-optional-bluetooth.patch
# Change favorites defaults, bug #479918
"${FILESDIR}"/40.0-defaults.patch
+
+   # Upstream backport, bug #844919
+   "${FILESDIR}"/42.1-polkit-g_autoptr.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-01-24 Thread Sam James

commit: b7d4f62f083b1e8d0857633c0fd2cf356729d6ca
Author: Christophe Lermytte  lermytte  be>
AuthorDate: Mon Jan 24 22:16:41 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 25 00:49:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7d4f62f

gnome-base/gnome-shell: fix build with meson-0.61

Closes: https://bugs.gentoo.org/831921
Signed-off-by: Christophe Lermytte  lermytte.be>
Signed-off-by: Sam James  gentoo.org>

 .../files/41.3-fix-build-with-meson-0.61.1.patch   | 84 ++
 gnome-base/gnome-shell/gnome-shell-41.3.ebuild |  1 +
 2 files changed, 85 insertions(+)

diff --git 
a/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch 
b/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch
new file mode 100644
index ..ecf212b9794c
--- /dev/null
+++ b/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,84 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/65450a836ee9e0722a2d4c3327f52345eae293c6
+https://bugs.gentoo.org/831921
+
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= 
+Date: Thu, 23 Dec 2021 17:18:16 +0100
+Subject: [PATCH] build: Drop incorrect positional arg
+
+Unlike other targets that take a name, i18n.merge_file() does not.
+
+Part-of: 
+---
+ data/meson.build  | 2 +-
+ src/calendar-server/meson.build   | 2 +-
+ subprojects/extensions-app/data/meson.build   | 2 +-
+ subprojects/extensions-app/data/metainfo/meson.build  | 2 +-
+ subprojects/extensions-tool/src/templates/meson.build | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index f924fdf806..76ae45c93a 100644
+--- a/data/meson.build
 b/data/meson.build
+@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir)
+ desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false')
+ 
+ foreach desktop_file : desktop_files
+-  i18n.merge_file('desktop',
++  i18n.merge_file(
+ input: configure_file(
+   input: desktop_file + '.in.in',
+   output: desktop_file + '.in',
+diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build
+index 7363282a59..8b4ef411c8 100644
+--- a/src/calendar-server/meson.build
 b/src/calendar-server/meson.build
+@@ -27,7 +27,7 @@ configure_file(
+   install_dir: servicedir
+ )
+ 
+-i18n.merge_file('evolution-calendar.desktop',
++i18n.merge_file(
+   input: 'evolution-calendar.desktop.in',
+   output: 'evolution-calendar.desktop',
+   po_dir: po_dir,
+diff --git a/subprojects/extensions-app/data/meson.build 
b/subprojects/extensions-app/data/meson.build
+index d7e7d4001c..4b601e8bd1 100644
+--- a/subprojects/extensions-app/data/meson.build
 b/subprojects/extensions-app/data/meson.build
+@@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir)
+ desktopconf.set('app_id', app_id)
+ desktopconf.set('prgname', prgname)
+ 
+-i18n.merge_file('desktop',
++i18n.merge_file(
+   input: configure_file(
+ input: base_id + '.desktop.in.in',
+ output: desktop_file + '.in',
+diff --git a/subprojects/extensions-app/data/metainfo/meson.build 
b/subprojects/extensions-app/data/metainfo/meson.build
+index c4962c0576..a19bfa80a4 100644
+--- a/subprojects/extensions-app/data/metainfo/meson.build
 b/subprojects/extensions-app/data/metainfo/meson.build
+@@ -1,5 +1,5 @@
+ metainfo = app_id + '.metainfo.xml'
+-i18n.merge_file(metainfo,
++i18n.merge_file(
+   input: base_id + '.metainfo.xml.in',
+   output: metainfo,
+   po_dir: po_dir,
+diff --git a/subprojects/extensions-tool/src/templates/meson.build 
b/subprojects/extensions-tool/src/templates/meson.build
+index 670e2bf448..d693bfaddb 100644
+--- a/subprojects/extensions-tool/src/templates/meson.build
 b/subprojects/extensions-tool/src/templates/meson.build
+@@ -4,7 +4,7 @@ template_metas = [
+ ]
+ template_deps = []
+ foreach template : template_metas
+-  template_deps += i18n.merge_file(template,
++  template_deps += i18n.merge_file(
+ input: template + '.in',
+ output: template,
+ po_dir: po_dir,
+-- 
+GitLab
+

diff --git a/gnome-base/gnome-shell/gnome-shell-41.3.ebuild 
b/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
index a5b2b5a53e21..25496f9f35dc 100644
--- a/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
@@ -139,6 +139,7 @@ PATCHES=(
"${FILESDIR}"/40.0-optional-bluetooth.patch
# Change favorites defaults, bug #479918
"${FILESDIR}"/40.0-defaults.patch
+   "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-03-28 Thread Matt Turner

commit: 998b2b1d772d35e29e0e9df326df12943af8d94e
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Mar 28 15:14:24 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Mar 28 15:17:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=998b2b1d

gnome-base/gnome-shell: Version bump to 41.5

Closes: https://bugs.gentoo.org/836311
Signed-off-by: Matt Turner  gentoo.org>

 gnome-base/gnome-shell/Manifest|   1 +
 5-environment-Require-GnomeBluetooth-1.0.patch |  35 
 ...1.5-environment-Require-gnome-desktop-3.0.patch |  30 +++
 .../41.5-environment-Require-libgweather-3.0.patch |  29 +++
 gnome-base/gnome-shell/gnome-shell-41.5.ebuild | 208 +
 5 files changed, 303 insertions(+)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 9cedbba95216..be1d64fd56a4 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-shell-41.4.tar.xz 1899464 BLAKE2B 
202408be8886bb5eb5615328a774993bea8dfe2fb78d304fde2806096ca68eff3fae7d5bdb4972b627cf10192ff76e3d457dc37eaa806cd4ed57d1558c235a48
 SHA512 
6ed5f215fcf9a1cf450b406620568aeceb3d255e0bb979151ccd2260565748e69825d7f5f7fb0c6768ed584a530599a8dcbc713c1ec12617551ae9df782c5ad7
+DIST gnome-shell-41.5.tar.xz 1899888 BLAKE2B 
73491f382413c313956fc6ab878a54d8a881190ee93cac5d334d169636d8dd21557c78719142f717c94463e02c7ca4eaf12a6e4ca6167e48a002ece9379b6d03
 SHA512 
b638103528413dcfa12d65d0c7add45716d21334294babbadd0a05e3410ca068ae336b28c30eb8811222b9f90e5efdf0d1a6e0a2e3f104b49061bb28333f066e
 DIST gnome-shell-42.0.tar.xz 1918044 BLAKE2B 
742d13ad92795fb71bbe8376a86b8e9a828882288f105f026cf98304ef2e9eae8fb967fa978ec322f5c621303a1798d3490c001bbd63c704b0cddc5db688389d
 SHA512 
39b56d3c09a238d9ca387145fdbddfaa929b124d4006f097b792de2dceb882e50cbce1255b0b4585aea04b522a92a4e7a743367f43a863f95bb6386401e73935

diff --git 
a/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
 
b/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
new file mode 100644
index ..8729a6c3e671
--- /dev/null
+++ 
b/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
@@ -0,0 +1,35 @@
+From 9ce6756235ba272b8602d50d1f005dc2ef265889 Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto 
+Date: Sun, 31 Oct 2021 17:24:58 -0300
+Subject: [PATCH 1/2] environment: Require GnomeBluetooth 1.0
+
+libgnome-bluetooth will start to offer a 2.0 library version
+depending on GTK4. Given that GNOME Shell already depends on
+GTK3, it cannot use this next version of gnome-bluetooth. And
+since GJS will automatically try and use the latest version
+available of any library, Shell must specify it wants 1.0
+explicitly.
+
+Add a required GnomeBluetooth version number when importing it
+for the status indicator.
+
+Part-of: 
+---
+ js/ui/environment.js | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/js/ui/environment.js b/js/ui/environment.js
+index ef53e6022..e906fa6c6 100644
+--- a/js/ui/environment.js
 b/js/ui/environment.js
+@@ -6,6 +6,7 @@ const Config = imports.misc.config;
+ imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
+ imports.gi.versions.Gio = '2.0';
+ imports.gi.versions.GdkPixbuf = '2.0';
++imports.gi.versions.GnomeBluetooth = '1.0';
+ imports.gi.versions.Gtk = '3.0';
+ imports.gi.versions.Soup = '3.0';
+ imports.gi.versions.TelepathyGLib = '0.12';
+-- 
+2.34.1
+

diff --git 
a/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch 
b/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch
new file mode 100644
index ..3dbb50bb989b
--- /dev/null
+++ 
b/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch
@@ -0,0 +1,30 @@
+From 795312b8d5634d3005679b3c1313114e41e538fd Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto 
+Date: Thu, 11 Nov 2021 16:20:39 -0300
+Subject: [PATCH 2/2] environment: Require gnome-desktop 3.0
+
+Pretty much the exact same case of 9ce6756235.
+
+libgnome-desktop saw a major version bump, and we have to
+stick with 3.0 for a while.
+
+Part-of: 
+---
+ js/ui/environment.js | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/js/ui/environment.js b/js/ui/environment.js
+index e906fa6c6..cb254e319 100644
+--- a/js/ui/environment.js
 b/js/ui/environment.js
+@@ -7,6 +7,7 @@ imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
+ imports.gi.versions.Gio = '2.0';
+ imports.gi.versions.GdkPixbuf = '2.0';
+ imports.gi.versions.GnomeBluetooth = '1.0';
++imports.gi.versions.GnomeDesktop = '3.0';
+ imports.gi.versions.Gtk = '3.0';
+ imports.gi.versions.Soup = '3.0';
+ imports.gi.versions.TelepathyGLib = '0.12';
+-- 
+2.34.1
+

diff --git 
a/gnome-base/gnome-shell/files/41.5-environment

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2020-07-12 Thread Mart Raudsepp

commit: 11fe8d4fb3c9edab0b962f39bc9a73fb89d55218
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Jul 12 21:00:15 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Jul 12 21:02:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11fe8d4f

gnome-base/gnome-shell: bump to 3.36.4

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 gnome-base/gnome-shell/Manifest  |   1 +
 gnome-base/gnome-shell/files/3.36-defaults.patch |  28 
 gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild | 185 +++
 3 files changed, 214 insertions(+)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 39314cf9595..ee51ba0ed5a 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1 +1,2 @@
 DIST gnome-shell-3.34.5.tar.xz 1558672 BLAKE2B 
7b786a35b6b79a4532d9bbb761ee0629cfb18b8c4c151f5958bb9169cae01ddb489a31c9d1a0cfef3ab6dd1f29c449600c1ad9bb11adbae284e86035bec15234
 SHA512 
ef6a70b0b3bb14fedb07c465742fe0d78c96ddd24352fd0babf871336ee404f9823cadea5bd522e388f5b714d33b219c8ff2badaed379b7135dd90de9fca9bc4
+DIST gnome-shell-3.36.4.tar.xz 1774584 BLAKE2B 
92fe544ae743235c673628f2ad82a75f58eaed94547fc3e0728a492cfee22783cb9d820ac55e1e125bf2ce83dadbddece7222eef9bad0891bfc5a7097ddde4bb
 SHA512 
879b1590d516e7e9e1ad066c870023d59cbaaca13e1e77d8b14de302574b3138451c4b8ab0ba1b43aec3e6e03bd147304e8e0e995359b181522a790afc97d450

diff --git a/gnome-base/gnome-shell/files/3.36-defaults.patch 
b/gnome-base/gnome-shell/files/3.36-defaults.patch
new file mode 100644
index 000..0a4746ac46b
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.36-defaults.patch
@@ -0,0 +1,28 @@
+From 7a671f99b7ef2d5f38be67668aac762764b32a42 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Tue, 10 Dec 2013 23:33:51 +0100
+Subject: [PATCH 1/2] Alter list of default applications
+
+Signed-off-by: Gilles Dartiguelongue 
+[Updated to include desktop file renames to reverse DNS and 3.36 changes]
+Signed-off-by: Mart Raudsepp 
+---
+ data/org.gnome.shell.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.gnome.shell.gschema.xml.in 
b/data/org.gnome.shell.gschema.xml.in
+index c1e6b21..368c654 100644
+--- a/data/org.gnome.shell.gschema.xml.in
 b/data/org.gnome.shell.gschema.xml.in
+@@ -31,7 +31,7 @@
+   
+ 
+ 
+-  [ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 
'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 
'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 
'org.gnome.Software.desktop' ]
++  [ 'chromium-browser-chromium.desktop', 'firefox.desktop', 
'firefox-bin.desktop', 'org.gnome.Evolution.desktop', 
'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 
'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 
'org.gnome.Software.desktop' ]
+   List of desktop file IDs for favorite applications
+   
+ The applications corresponding to these identifiers
+-- 
+2.10.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild
new file mode 100644
index 000..fd3fd1b3ae9
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer support is currently automagic
+DEPEND="
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.57.2:2
+   >=dev-libs/gobject-introspection-1.49.1:=
+   >=dev-libs/gjs-1.63.2
+   >=x11-libs/gtk+-3.15.0:3[introspection]
+   >=x11-wm/mutter-3.36.0:0/6[introspection]
+   >=sys-auth/polkit-0.100[introspection]
+   >=gnome-base/gsettings-desktop-schemas-3.33.1
+   >=x11-libs/startup-notification-0.11
+   >=app-i18n/ibus-1.5.2
+   >=gnome-base/gnome-desktop-3.35.90:3=[introspection]
+   bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+   >=media-libs/gstreamer-0.11.92:1.0
+   media-libs/gst-plugins-base:1.0
+   networkmanager? (
+   >=net-misc/networkmanager-1.10.4:=[introspection]
+   net-libs/libnma[introspection]
+   >=app-crypt/libsecret-0.18
+   dev-libs/dbus-glib )
+   system

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2019-03-30 Thread Mart Raudsepp

commit: aebd86e5f849893f8a0f00d38b9fd777cc1317a6
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Mar 30 22:26:46 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Mar 30 22:26:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aebd86e5

gnome-base/gnome-shell: remove old

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 gnome-base/gnome-shell/Manifest|   2 -
 .../files/3.28.3-fix-gtk-doc-meson.patch   |  59 ---
 gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild   | 193 -
 3 files changed, 254 deletions(-)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index bea6c4afe6e..a99b75f076a 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,7 +1,5 @@
 DIST gnome-shell-3.24.3.tar.xz 1982088 BLAKE2B 
608b3e73d546dea543a23c31a64b03c32f35d118cd79fd0371a9e392377b4dd03bc16413443d643ed604a2fa81c2838939d92ef4c89a54469a8bd83dc9661f8f
 SHA512 
369ed80b975369b79d4ac9b3f1fbd469fdde331e9079d09eeac6398a9b3c349b09f7570dfce1ed6e1cdfaf514b4b40c6038f34b6c3c7928470b2cd65b702ff15
 DIST gnome-shell-3.26.2-patchset.tar.xz 55492 BLAKE2B 
745b8549f7480b004f4df9b81508c94c9224f77a5a503f45dfda20105e9c305f8cae6ae5e420e597cea9f98899933bb19efd8cf0e9811dc35d0844a3c2920143
 SHA512 
93a730082e84807c23f4b7e390c2d0fb02d3666fc32241de02b3534cc271b160bd9a6a6a2e908ed5bdde91cef383c1e400b0f7cbf04ac104f7f9758218e635ed
 DIST gnome-shell-3.26.2.tar.xz 1405580 BLAKE2B 
ccbb8ad374931335fdc6e752a7feedcba4fe2b61112404b62bc9711b1736216d46fd6e85c6f06439cae50af86a174359d7df0e111e8db6ffed567e91b4292b14
 SHA512 
0e13bc7abff2367d24ea748cd69a1879ff14a6755ef27d17cf20cef61bc6d15bf6e9d18362142a2d6462689f64eada833f9bba21ebaac3a33765a5be0ae48d3a
-DIST gnome-shell-3.28.3-patchset.tar.xz 30820 BLAKE2B 
3402a1c455a5e9d028f6c15ea40db94afb84576643b9bfe9e973a7f375d9f0a22003eab3ccabec0b4b31c31f70ef02ca055c0f62a5c0392529fc375f6cef7029
 SHA512 
a1da84374dd97bff2546d6ddc5656bade69711d05b4b4f4283df66ebbac566767a509dcbd6db52c28a1915cf873c99b81029128cb2a2b63c325dc3e3340fffb4
-DIST gnome-shell-3.28.3.tar.xz 1433388 BLAKE2B 
656e2edabef363d779fd339b7158ad3461a05452a2fdad611889d19f272cd98dfbbb39871d10631326b83108678f8a7245c349583eb257e9d7e4827078134ade
 SHA512 
3550a9e59101a96cf04e4a4bc183ac9a447baa72d74e57c3f438764741b4365f8848895c1eb2c4d0af5c7936e38eb8971ef578bbee315e78b9fdcbbe49fdc1e8
 DIST gnome-shell-3.30.2-patchset.tar.xz 39864 BLAKE2B 
61c02e5ae87ab24f30d28865ff20e32fef63eefbfc1134bf0582eb25933700902aad08176fd2011781262552385bcb3ffaf35fc2d7a060c09ba0d27cb9a8
 SHA512 
8ad976c05488a6b7447d29105a566d0bb975c8e0798be18c1dc07295c51a27578274e611da4979397fc6c4da538f6d9f48072e043829a63faf87a781518ee531
 DIST gnome-shell-3.30.2.tar.xz 1439556 BLAKE2B 
547ccf5571ea431d15c6430619640bd497a381191cad56bbf1a5c9992c5df47eb48527cc2749ea4d417cbe5fd7cc2acb44915ee35d3d89cd386541f19d743877
 SHA512 
5cdf2b9a4dc9dbcc75d76020a01b953ae3922d5820b692d1bc1cf62daf1f00d04b95d6ec076920563f555115c4f4ad11a019e4523a353ef4dd2189a5240239c6

diff --git a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch 
b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
deleted file mode 100644
index 9948b163009..000
--- a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 9f4aa6ebf2193bb19dd8012de7699fce35681078 Mon Sep 17 00:00:00 2001
-From: Pascal Nowack 
-Date: Mon, 6 Aug 2018 14:21:02 +0200
-Subject: [PATCH] build: Fix build with meson >= 47.0
-
-With meson >= 47.0, building gnome-shell will fail
-when --rebuild-types is used as an option for gtk-doc,
-so stop using that option and bump the meson requirement.
-
-https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/191

- docs/reference/shell/meson.build | 3 +--
- docs/reference/st/meson.build| 3 +--
- meson.build  | 2 +-
- 3 files changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/docs/reference/shell/meson.build 
b/docs/reference/shell/meson.build
-index 1469ed422..a32d6a58a 100644
 a/docs/reference/shell/meson.build
-+++ b/docs/reference/shell/meson.build
-@@ -50,8 +50,7 @@ gnome.gtkdoc('shell',
- join_paths(meson.build_root(), 'src')
-   ],
-   scan_args: [
--'--ignore-headers=' + ' '.join(private_headers + exclude_directories),
--'--rebuild-types'
-+'--ignore-headers=' + ' '.join(private_headers + exclude_directories)
-   ],
-   install: true
- )
-diff --git a/docs/reference/st/meson.build b/docs/reference/st/meson.build
-index fe89b53d4..3e9e9ab7c 100644
 a/docs/reference/st/meson.build
-+++ b/docs/reference/st/meson.build
-@@ -17,8 +17,7 @@ gnome.gtkdoc('st',
-   ],
-   scan_args: [
- '--ignore-headers=' + ' '.join(private_headers),
--'--rebuild-sections',
--'--rebuild-types'
-+'--rebuild-sections'
-   ],
-   install: true
- )
-diff --git a/meson.build b/meson.build
-index 03b9d52a8..e33a76183 100644

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2019-02-28 Thread Mart Raudsepp

commit: 35943bda95329e610052831ff5245621a1b53638
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Feb 28 21:11:23 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Feb 28 22:37:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35943bda

gnome-base/gnome-shell: fix and re-enable USE=gtk-doc support

Turned out to be a meson-0.47 incompatibility, not gtk-doc

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../files/3.28.3-fix-gtk-doc-meson.patch   | 59 ++
 gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild   |  9 ++--
 2 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch 
b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
new file mode 100644
index 000..9948b163009
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
@@ -0,0 +1,59 @@
+From 9f4aa6ebf2193bb19dd8012de7699fce35681078 Mon Sep 17 00:00:00 2001
+From: Pascal Nowack 
+Date: Mon, 6 Aug 2018 14:21:02 +0200
+Subject: [PATCH] build: Fix build with meson >= 47.0
+
+With meson >= 47.0, building gnome-shell will fail
+when --rebuild-types is used as an option for gtk-doc,
+so stop using that option and bump the meson requirement.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/191
+---
+ docs/reference/shell/meson.build | 3 +--
+ docs/reference/st/meson.build| 3 +--
+ meson.build  | 2 +-
+ 3 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/docs/reference/shell/meson.build 
b/docs/reference/shell/meson.build
+index 1469ed422..a32d6a58a 100644
+--- a/docs/reference/shell/meson.build
 b/docs/reference/shell/meson.build
+@@ -50,8 +50,7 @@ gnome.gtkdoc('shell',
+ join_paths(meson.build_root(), 'src')
+   ],
+   scan_args: [
+-'--ignore-headers=' + ' '.join(private_headers + exclude_directories),
+-'--rebuild-types'
++'--ignore-headers=' + ' '.join(private_headers + exclude_directories)
+   ],
+   install: true
+ )
+diff --git a/docs/reference/st/meson.build b/docs/reference/st/meson.build
+index fe89b53d4..3e9e9ab7c 100644
+--- a/docs/reference/st/meson.build
 b/docs/reference/st/meson.build
+@@ -17,8 +17,7 @@ gnome.gtkdoc('st',
+   ],
+   scan_args: [
+ '--ignore-headers=' + ' '.join(private_headers),
+-'--rebuild-sections',
+-'--rebuild-types'
++'--rebuild-sections'
+   ],
+   install: true
+ )
+diff --git a/meson.build b/meson.build
+index 03b9d52a8..e33a76183 100644
+--- a/meson.build
 b/meson.build
+@@ -1,6 +1,6 @@
+ project('gnome-shell', 'c',
+   version: '3.28.3',
+-  meson_version: '>= 0.42.0',
++  meson_version: '>= 0.47.0',
+   license: 'GPLv2+'
+ )
+ 
+-- 
+2.17.0
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild
index d49823e4bdf..0a3ea629b3f 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz";
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-IUSE="+bluetooth +browser-extension elogind +ibus +networkmanager nsplugin 
systemd telepathy"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
nsplugin systemd telepathy"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
?? ( elogind systemd )"
 
@@ -110,9 +110,10 @@ DEPEND="${COMMON_DEPEND}
dev-libs/libxslt
>=dev-util/gdbus-codegen-2.45.3
dev-util/glib-utils
+   gtk-doc? ( >=dev-util/gtk-doc-1.17 )
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
-" #gtk-doc? ( >=dev-util/gtk-doc-1.17 )
+"
 
 PATCHES=(
# Patches from gnome-3-26 branch on top of 3.26.2
@@ -121,6 +122,8 @@ PATCHES=(
"${FILESDIR}"/${PV}-defaults.patch
# Fix automagic gnome-bluetooth dep, bug #398145
"${FILESDIR}"/${PV}-optional-bluetooth.patch
+   # Fix gtk-doc build with >=meson-0.47
+   "${FILESDIR}"/${PV}-fix-gtk-doc-meson.patch
 )
 
 src_prepare() {
@@ -135,7 +138,7 @@ src_configure() {
local emesonargs=(
$(meson_use bluetooth)
$(meson_use nsplugin browser_plugin)
-   #$(meson_use gtk-doc gtk_doc) # fails in gtkdoc-scangobj call 
with gtk-doc-1.25 (perl regex parenthesis issue); probably needs newer 
python-based gtk-doc to work
+   $(meson_use gtk-doc gtk_doc)
-Dman=true
$(meson_use networkmanager)
$(meson_use systemd) # this controls journald integration only 
as of 3.26.2 (structured logging and having gnome-shell launched apps use its 
own identifier instead of gnome-session)

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2020-08-13 Thread Mart Raudsepp

commit: 9c4bb6c530c0a64b7e0c776806882026798bc1dc
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Aug 13 20:38:14 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Aug 13 20:38:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c4bb6c5

gnome-base/gnome-shell: backport fix for CVE-2020-17489

Bug: https://bugs.gentoo.org/736802
Package-Manager: Portage-2.3.103, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../gnome-shell/files/3.34.5-CVE-2020-17489.patch  |  47 +
 .../gnome-shell/gnome-shell-3.34.5-r1.ebuild   | 198 +
 2 files changed, 245 insertions(+)

diff --git a/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch 
b/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch
new file mode 100644
index 000..c6ed147c5a2
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch
@@ -0,0 +1,47 @@
+From e7f7da78d4d5a9abae780589810bd012300442e9 Mon Sep 17 00:00:00 2001
+From: Ray Strode 
+Date: Mon, 27 Jul 2020 10:58:49 -0400
+Subject: [PATCH] loginDialog: Reset auth prompt on vt switch before fade in
+
+At the moment, if a user switches to the login screen vt,
+the login screen fades in whatever was on screen prior, and
+then does a reset.
+
+It makes more sense to reset first, so we fade in what the
+user is going to interact with instead of what they interacted
+with before.
+
+Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2997
+(cherry picked from commit 13137aad9db52223e8b62cecbd3456f4a7f66f04)
+---
+ js/gdm/loginDialog.js | 9 -
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
+index c3f90dc58..6b35ebb16 100644
+--- a/js/gdm/loginDialog.js
 b/js/gdm/loginDialog.js
+@@ -920,16 +920,15 @@ var LoginDialog = GObject.registerClass({
+ if (this.opacity == 255 && this._authPrompt.verificationStatus == 
AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
+ return;
+ 
++if (this._authPrompt.verificationStatus !== 
AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
++this._authPrompt.reset();
++
+ this._bindOpacity();
+ this.ease({
+ opacity: 255,
+ duration: _FADE_ANIMATION_TIME,
+ mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+-onComplete: () => {
+-if (this._authPrompt.verificationStatus != 
AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
+-this._authPrompt.reset();
+-this._unbindOpacity();
+-}
++onComplete: () => this._unbindOpacity()
+ });
+ }
+ 
+-- 
+2.20.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild
new file mode 100644
index 000..0aeebc31a62
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org gnome2-utils meson pax-utils python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer support is currently automagic
+DEPEND="
+   >=dev-libs/libcroco-0.6.8:0.6
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.57.2:2
+   >=dev-libs/gobject-introspection-1.49.1:=
+   >=dev-libs/gjs-1.57.3
+   >=x11-libs/gtk+-3.15.0:3[introspection]
+   >=x11-wm/mutter-3.34.0:0/5[introspection]
+   >=sys-auth/polkit-0.100[introspection]
+   >=gnome-base/gsettings-desktop-schemas-3.33.1
+   >=x11-libs/startup-notification-0.11
+   >=app-i18n/ibus-1.5.2
+   >=gnome-base/gnome-desktop-3.32:3=[introspection]
+   bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+   >=media-libs/gstreamer-0.11.92:1.0
+   media-libs/gst-plugins-base:1.0
+   networkmanager? (
+   >=net-misc/networkmanager-1.10.4:=[introspection]
+   net-libs/libnma[introspection]
+   >=app-crypt/libsecret-0.18
+   dev-libs/dbus-glib )
+   systemd? ( >=sys-apps/systemd-31
+   >=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
+   elogind? ( >=sys-auth/elogind-237 )
+   app-arch/gnome-autoar
+   dev-libs/json-glib
+
+   >=app-accessibility/at-spi2-atk-2.5.3
+   x11-libs/gdk-pixbuf:2[introspection]
+   dev-libs/libxml2:2
+   x11-libs/libX11
+
+

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2020-07-12 Thread Mart Raudsepp

commit: 11fe8d4fb3c9edab0b962f39bc9a73fb89d55218
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Jul 12 21:00:15 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Jul 12 21:02:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11fe8d4f

gnome-base/gnome-shell: bump to 3.36.4

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 gnome-base/gnome-shell/Manifest  |   1 +
 gnome-base/gnome-shell/files/3.36-defaults.patch |  28 
 gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild | 185 +++
 3 files changed, 214 insertions(+)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 39314cf9595..ee51ba0ed5a 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1 +1,2 @@
 DIST gnome-shell-3.34.5.tar.xz 1558672 BLAKE2B 
7b786a35b6b79a4532d9bbb761ee0629cfb18b8c4c151f5958bb9169cae01ddb489a31c9d1a0cfef3ab6dd1f29c449600c1ad9bb11adbae284e86035bec15234
 SHA512 
ef6a70b0b3bb14fedb07c465742fe0d78c96ddd24352fd0babf871336ee404f9823cadea5bd522e388f5b714d33b219c8ff2badaed379b7135dd90de9fca9bc4
+DIST gnome-shell-3.36.4.tar.xz 1774584 BLAKE2B 
92fe544ae743235c673628f2ad82a75f58eaed94547fc3e0728a492cfee22783cb9d820ac55e1e125bf2ce83dadbddece7222eef9bad0891bfc5a7097ddde4bb
 SHA512 
879b1590d516e7e9e1ad066c870023d59cbaaca13e1e77d8b14de302574b3138451c4b8ab0ba1b43aec3e6e03bd147304e8e0e995359b181522a790afc97d450

diff --git a/gnome-base/gnome-shell/files/3.36-defaults.patch 
b/gnome-base/gnome-shell/files/3.36-defaults.patch
new file mode 100644
index 000..0a4746ac46b
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.36-defaults.patch
@@ -0,0 +1,28 @@
+From 7a671f99b7ef2d5f38be67668aac762764b32a42 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Tue, 10 Dec 2013 23:33:51 +0100
+Subject: [PATCH 1/2] Alter list of default applications
+
+Signed-off-by: Gilles Dartiguelongue 
+[Updated to include desktop file renames to reverse DNS and 3.36 changes]
+Signed-off-by: Mart Raudsepp 
+---
+ data/org.gnome.shell.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.gnome.shell.gschema.xml.in 
b/data/org.gnome.shell.gschema.xml.in
+index c1e6b21..368c654 100644
+--- a/data/org.gnome.shell.gschema.xml.in
 b/data/org.gnome.shell.gschema.xml.in
+@@ -31,7 +31,7 @@
+   
+ 
+ 
+-  [ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 
'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 
'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 
'org.gnome.Software.desktop' ]
++  [ 'chromium-browser-chromium.desktop', 'firefox.desktop', 
'firefox-bin.desktop', 'org.gnome.Evolution.desktop', 
'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 
'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 
'org.gnome.Software.desktop' ]
+   List of desktop file IDs for favorite applications
+   
+ The applications corresponding to these identifiers
+-- 
+2.10.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild
new file mode 100644
index 000..fd3fd1b3ae9
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer support is currently automagic
+DEPEND="
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.57.2:2
+   >=dev-libs/gobject-introspection-1.49.1:=
+   >=dev-libs/gjs-1.63.2
+   >=x11-libs/gtk+-3.15.0:3[introspection]
+   >=x11-wm/mutter-3.36.0:0/6[introspection]
+   >=sys-auth/polkit-0.100[introspection]
+   >=gnome-base/gsettings-desktop-schemas-3.33.1
+   >=x11-libs/startup-notification-0.11
+   >=app-i18n/ibus-1.5.2
+   >=gnome-base/gnome-desktop-3.35.90:3=[introspection]
+   bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+   >=media-libs/gstreamer-0.11.92:1.0
+   media-libs/gst-plugins-base:1.0
+   networkmanager? (
+   >=net-misc/networkmanager-1.10.4:=[introspection]
+   net-libs/libnma[introspection]
+   >=app-crypt/libsecret-0.18
+   dev-libs/dbus-glib )
+   system

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2020-08-13 Thread Mart Raudsepp

commit: 9c4bb6c530c0a64b7e0c776806882026798bc1dc
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Aug 13 20:38:14 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Aug 13 20:38:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c4bb6c5

gnome-base/gnome-shell: backport fix for CVE-2020-17489

Bug: https://bugs.gentoo.org/736802
Package-Manager: Portage-2.3.103, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../gnome-shell/files/3.34.5-CVE-2020-17489.patch  |  47 +
 .../gnome-shell/gnome-shell-3.34.5-r1.ebuild   | 198 +
 2 files changed, 245 insertions(+)

diff --git a/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch 
b/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch
new file mode 100644
index 000..c6ed147c5a2
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch
@@ -0,0 +1,47 @@
+From e7f7da78d4d5a9abae780589810bd012300442e9 Mon Sep 17 00:00:00 2001
+From: Ray Strode 
+Date: Mon, 27 Jul 2020 10:58:49 -0400
+Subject: [PATCH] loginDialog: Reset auth prompt on vt switch before fade in
+
+At the moment, if a user switches to the login screen vt,
+the login screen fades in whatever was on screen prior, and
+then does a reset.
+
+It makes more sense to reset first, so we fade in what the
+user is going to interact with instead of what they interacted
+with before.
+
+Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2997
+(cherry picked from commit 13137aad9db52223e8b62cecbd3456f4a7f66f04)
+---
+ js/gdm/loginDialog.js | 9 -
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
+index c3f90dc58..6b35ebb16 100644
+--- a/js/gdm/loginDialog.js
 b/js/gdm/loginDialog.js
+@@ -920,16 +920,15 @@ var LoginDialog = GObject.registerClass({
+ if (this.opacity == 255 && this._authPrompt.verificationStatus == 
AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
+ return;
+ 
++if (this._authPrompt.verificationStatus !== 
AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
++this._authPrompt.reset();
++
+ this._bindOpacity();
+ this.ease({
+ opacity: 255,
+ duration: _FADE_ANIMATION_TIME,
+ mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+-onComplete: () => {
+-if (this._authPrompt.verificationStatus != 
AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
+-this._authPrompt.reset();
+-this._unbindOpacity();
+-}
++onComplete: () => this._unbindOpacity()
+ });
+ }
+ 
+-- 
+2.20.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild
new file mode 100644
index 000..0aeebc31a62
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org gnome2-utils meson pax-utils python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer support is currently automagic
+DEPEND="
+   >=dev-libs/libcroco-0.6.8:0.6
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.57.2:2
+   >=dev-libs/gobject-introspection-1.49.1:=
+   >=dev-libs/gjs-1.57.3
+   >=x11-libs/gtk+-3.15.0:3[introspection]
+   >=x11-wm/mutter-3.34.0:0/5[introspection]
+   >=sys-auth/polkit-0.100[introspection]
+   >=gnome-base/gsettings-desktop-schemas-3.33.1
+   >=x11-libs/startup-notification-0.11
+   >=app-i18n/ibus-1.5.2
+   >=gnome-base/gnome-desktop-3.32:3=[introspection]
+   bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+   >=media-libs/gstreamer-0.11.92:1.0
+   media-libs/gst-plugins-base:1.0
+   networkmanager? (
+   >=net-misc/networkmanager-1.10.4:=[introspection]
+   net-libs/libnma[introspection]
+   >=app-crypt/libsecret-0.18
+   dev-libs/dbus-glib )
+   systemd? ( >=sys-apps/systemd-31
+   >=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
+   elogind? ( >=sys-auth/elogind-237 )
+   app-arch/gnome-autoar
+   dev-libs/json-glib
+
+   >=app-accessibility/at-spi2-atk-2.5.3
+   x11-libs/gdk-pixbuf:2[introspection]
+   dev-libs/libxml2:2
+   x11-libs/libX11
+
+

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2019-03-30 Thread Mart Raudsepp

commit: aebd86e5f849893f8a0f00d38b9fd777cc1317a6
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Mar 30 22:26:46 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Mar 30 22:26:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aebd86e5

gnome-base/gnome-shell: remove old

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 gnome-base/gnome-shell/Manifest|   2 -
 .../files/3.28.3-fix-gtk-doc-meson.patch   |  59 ---
 gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild   | 193 -
 3 files changed, 254 deletions(-)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index bea6c4afe6e..a99b75f076a 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,7 +1,5 @@
 DIST gnome-shell-3.24.3.tar.xz 1982088 BLAKE2B 
608b3e73d546dea543a23c31a64b03c32f35d118cd79fd0371a9e392377b4dd03bc16413443d643ed604a2fa81c2838939d92ef4c89a54469a8bd83dc9661f8f
 SHA512 
369ed80b975369b79d4ac9b3f1fbd469fdde331e9079d09eeac6398a9b3c349b09f7570dfce1ed6e1cdfaf514b4b40c6038f34b6c3c7928470b2cd65b702ff15
 DIST gnome-shell-3.26.2-patchset.tar.xz 55492 BLAKE2B 
745b8549f7480b004f4df9b81508c94c9224f77a5a503f45dfda20105e9c305f8cae6ae5e420e597cea9f98899933bb19efd8cf0e9811dc35d0844a3c2920143
 SHA512 
93a730082e84807c23f4b7e390c2d0fb02d3666fc32241de02b3534cc271b160bd9a6a6a2e908ed5bdde91cef383c1e400b0f7cbf04ac104f7f9758218e635ed
 DIST gnome-shell-3.26.2.tar.xz 1405580 BLAKE2B 
ccbb8ad374931335fdc6e752a7feedcba4fe2b61112404b62bc9711b1736216d46fd6e85c6f06439cae50af86a174359d7df0e111e8db6ffed567e91b4292b14
 SHA512 
0e13bc7abff2367d24ea748cd69a1879ff14a6755ef27d17cf20cef61bc6d15bf6e9d18362142a2d6462689f64eada833f9bba21ebaac3a33765a5be0ae48d3a
-DIST gnome-shell-3.28.3-patchset.tar.xz 30820 BLAKE2B 
3402a1c455a5e9d028f6c15ea40db94afb84576643b9bfe9e973a7f375d9f0a22003eab3ccabec0b4b31c31f70ef02ca055c0f62a5c0392529fc375f6cef7029
 SHA512 
a1da84374dd97bff2546d6ddc5656bade69711d05b4b4f4283df66ebbac566767a509dcbd6db52c28a1915cf873c99b81029128cb2a2b63c325dc3e3340fffb4
-DIST gnome-shell-3.28.3.tar.xz 1433388 BLAKE2B 
656e2edabef363d779fd339b7158ad3461a05452a2fdad611889d19f272cd98dfbbb39871d10631326b83108678f8a7245c349583eb257e9d7e4827078134ade
 SHA512 
3550a9e59101a96cf04e4a4bc183ac9a447baa72d74e57c3f438764741b4365f8848895c1eb2c4d0af5c7936e38eb8971ef578bbee315e78b9fdcbbe49fdc1e8
 DIST gnome-shell-3.30.2-patchset.tar.xz 39864 BLAKE2B 
61c02e5ae87ab24f30d28865ff20e32fef63eefbfc1134bf0582eb25933700902aad08176fd2011781262552385bcb3ffaf35fc2d7a060c09ba0d27cb9a8
 SHA512 
8ad976c05488a6b7447d29105a566d0bb975c8e0798be18c1dc07295c51a27578274e611da4979397fc6c4da538f6d9f48072e043829a63faf87a781518ee531
 DIST gnome-shell-3.30.2.tar.xz 1439556 BLAKE2B 
547ccf5571ea431d15c6430619640bd497a381191cad56bbf1a5c9992c5df47eb48527cc2749ea4d417cbe5fd7cc2acb44915ee35d3d89cd386541f19d743877
 SHA512 
5cdf2b9a4dc9dbcc75d76020a01b953ae3922d5820b692d1bc1cf62daf1f00d04b95d6ec076920563f555115c4f4ad11a019e4523a353ef4dd2189a5240239c6

diff --git a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch 
b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
deleted file mode 100644
index 9948b163009..000
--- a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 9f4aa6ebf2193bb19dd8012de7699fce35681078 Mon Sep 17 00:00:00 2001
-From: Pascal Nowack 
-Date: Mon, 6 Aug 2018 14:21:02 +0200
-Subject: [PATCH] build: Fix build with meson >= 47.0
-
-With meson >= 47.0, building gnome-shell will fail
-when --rebuild-types is used as an option for gtk-doc,
-so stop using that option and bump the meson requirement.
-
-https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/191

- docs/reference/shell/meson.build | 3 +--
- docs/reference/st/meson.build| 3 +--
- meson.build  | 2 +-
- 3 files changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/docs/reference/shell/meson.build 
b/docs/reference/shell/meson.build
-index 1469ed422..a32d6a58a 100644
 a/docs/reference/shell/meson.build
-+++ b/docs/reference/shell/meson.build
-@@ -50,8 +50,7 @@ gnome.gtkdoc('shell',
- join_paths(meson.build_root(), 'src')
-   ],
-   scan_args: [
--'--ignore-headers=' + ' '.join(private_headers + exclude_directories),
--'--rebuild-types'
-+'--ignore-headers=' + ' '.join(private_headers + exclude_directories)
-   ],
-   install: true
- )
-diff --git a/docs/reference/st/meson.build b/docs/reference/st/meson.build
-index fe89b53d4..3e9e9ab7c 100644
 a/docs/reference/st/meson.build
-+++ b/docs/reference/st/meson.build
-@@ -17,8 +17,7 @@ gnome.gtkdoc('st',
-   ],
-   scan_args: [
- '--ignore-headers=' + ' '.join(private_headers),
--'--rebuild-sections',
--'--rebuild-types'
-+'--rebuild-sections'
-   ],
-   install: true
- )
-diff --git a/meson.build b/meson.build
-index 03b9d52a8..e33a76183 100644

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2019-02-28 Thread Mart Raudsepp

commit: 35943bda95329e610052831ff5245621a1b53638
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Feb 28 21:11:23 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Feb 28 22:37:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35943bda

gnome-base/gnome-shell: fix and re-enable USE=gtk-doc support

Turned out to be a meson-0.47 incompatibility, not gtk-doc

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../files/3.28.3-fix-gtk-doc-meson.patch   | 59 ++
 gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild   |  9 ++--
 2 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch 
b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
new file mode 100644
index 000..9948b163009
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch
@@ -0,0 +1,59 @@
+From 9f4aa6ebf2193bb19dd8012de7699fce35681078 Mon Sep 17 00:00:00 2001
+From: Pascal Nowack 
+Date: Mon, 6 Aug 2018 14:21:02 +0200
+Subject: [PATCH] build: Fix build with meson >= 47.0
+
+With meson >= 47.0, building gnome-shell will fail
+when --rebuild-types is used as an option for gtk-doc,
+so stop using that option and bump the meson requirement.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/191
+---
+ docs/reference/shell/meson.build | 3 +--
+ docs/reference/st/meson.build| 3 +--
+ meson.build  | 2 +-
+ 3 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/docs/reference/shell/meson.build 
b/docs/reference/shell/meson.build
+index 1469ed422..a32d6a58a 100644
+--- a/docs/reference/shell/meson.build
 b/docs/reference/shell/meson.build
+@@ -50,8 +50,7 @@ gnome.gtkdoc('shell',
+ join_paths(meson.build_root(), 'src')
+   ],
+   scan_args: [
+-'--ignore-headers=' + ' '.join(private_headers + exclude_directories),
+-'--rebuild-types'
++'--ignore-headers=' + ' '.join(private_headers + exclude_directories)
+   ],
+   install: true
+ )
+diff --git a/docs/reference/st/meson.build b/docs/reference/st/meson.build
+index fe89b53d4..3e9e9ab7c 100644
+--- a/docs/reference/st/meson.build
 b/docs/reference/st/meson.build
+@@ -17,8 +17,7 @@ gnome.gtkdoc('st',
+   ],
+   scan_args: [
+ '--ignore-headers=' + ' '.join(private_headers),
+-'--rebuild-sections',
+-'--rebuild-types'
++'--rebuild-sections'
+   ],
+   install: true
+ )
+diff --git a/meson.build b/meson.build
+index 03b9d52a8..e33a76183 100644
+--- a/meson.build
 b/meson.build
+@@ -1,6 +1,6 @@
+ project('gnome-shell', 'c',
+   version: '3.28.3',
+-  meson_version: '>= 0.42.0',
++  meson_version: '>= 0.47.0',
+   license: 'GPLv2+'
+ )
+ 
+-- 
+2.17.0
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild
index d49823e4bdf..0a3ea629b3f 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz";
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-IUSE="+bluetooth +browser-extension elogind +ibus +networkmanager nsplugin 
systemd telepathy"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
nsplugin systemd telepathy"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
?? ( elogind systemd )"
 
@@ -110,9 +110,10 @@ DEPEND="${COMMON_DEPEND}
dev-libs/libxslt
>=dev-util/gdbus-codegen-2.45.3
dev-util/glib-utils
+   gtk-doc? ( >=dev-util/gtk-doc-1.17 )
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
-" #gtk-doc? ( >=dev-util/gtk-doc-1.17 )
+"
 
 PATCHES=(
# Patches from gnome-3-26 branch on top of 3.26.2
@@ -121,6 +122,8 @@ PATCHES=(
"${FILESDIR}"/${PV}-defaults.patch
# Fix automagic gnome-bluetooth dep, bug #398145
"${FILESDIR}"/${PV}-optional-bluetooth.patch
+   # Fix gtk-doc build with >=meson-0.47
+   "${FILESDIR}"/${PV}-fix-gtk-doc-meson.patch
 )
 
 src_prepare() {
@@ -135,7 +138,7 @@ src_configure() {
local emesonargs=(
$(meson_use bluetooth)
$(meson_use nsplugin browser_plugin)
-   #$(meson_use gtk-doc gtk_doc) # fails in gtkdoc-scangobj call 
with gtk-doc-1.25 (perl regex parenthesis issue); probably needs newer 
python-based gtk-doc to work
+   $(meson_use gtk-doc gtk_doc)
-Dman=true
$(meson_use networkmanager)
$(meson_use systemd) # this controls journald integration only 
as of 3.26.2 (structured logging and having gnome-shell launched apps use its 
own identifier instead of gnome-session)

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2016-06-27 Thread Alexandre Rostovtsev

commit: de093187ffd212744ab9952167e511d74de42153
Author: Alexandre Rostovtsev  gentoo  org>
AuthorDate: Mon Jun 27 14:05:46 2016 +
Commit: Alexandre Rostovtsev  gentoo  org>
CommitDate: Mon Jun 27 14:05:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de093187

gnome-base/gnome-shell: fix nvidia-drivers crash (bug #587110)

Thanks to Mark R. Pariente for reporting.

Also, require adwaita-icon-theme-3.20 for new grid icon (bug #587130)

Package-Manager: portage-2.3.0

 .../files/gnome-shell-3.20.2-st-nvidia.patch   | 121 +++
 .../gnome-shell/gnome-shell-3.20.2-r1.ebuild   | 221 +
 2 files changed, 342 insertions(+)

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch 
b/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch
new file mode 100644
index 000..63df248
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch
@@ -0,0 +1,121 @@
+From 35cc224240ec4fc8159fc689fe3e093a81f97dc9 Mon Sep 17 00:00:00 2001
+From: Martin Szulecki 
+Date: Tue, 17 May 2016 15:00:04 +0200
+Subject: [PATCH] st: Init framebuffer early to fix gnome-shell crash on NVIDIA
+ drivers
+
+Checking offscreen for COGL_INVALID_HANDLE is not sufficient,
+as cogl_offscreen_new_with_texture doesn't initialize framebuffer
+objects but lets Cogl solve this the lazy way.
+cogl_offscreen_new_with_texture will never return COGL_INVALID_HANDLE
+anyways.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=764898
+---
+ src/st/st-theme-node-drawing.c| 18 --
+ src/st/st-theme-node-transition.c | 25 -
+ 2 files changed, 32 insertions(+), 11 deletions(-)
+
+diff --git a/src/st/st-theme-node-drawing.c b/src/st/st-theme-node-drawing.c
+index 85feb20..8942966 100644
+--- a/src/st/st-theme-node-drawing.c
 b/src/st/st-theme-node-drawing.c
+@@ -2224,6 +2224,7 @@ st_theme_node_prerender_shadow (StThemeNodePaintState 
*state)
+   int max_borders[4];
+   int center_radius, corner_id;
+   CoglHandle buffer, offscreen = COGL_INVALID_HANDLE;
++  CoglError *error = NULL;
+ 
+   /* Get infos from the node */
+   if (state->alloc_width < node->box_shadow_min_width ||
+@@ -2264,10 +2265,12 @@ st_theme_node_prerender_shadow (StThemeNodePaintState 
*state)
+state->box_shadow_height,
+COGL_TEXTURE_NO_SLICING,
+COGL_PIXEL_FORMAT_ANY);
+-  if (buffer != COGL_INVALID_HANDLE)
+-offscreen = cogl_offscreen_new_with_texture (buffer);
++  if (buffer == NULL)
++return;
+ 
+-  if (offscreen != COGL_INVALID_HANDLE)
++  offscreen = cogl_offscreen_new_with_texture (buffer);
++
++  if (cogl_framebuffer_allocate (COGL_FRAMEBUFFER (offscreen), &error))
+ {
+   ClutterActorBox box = { 0, 0, state->box_shadow_width, 
state->box_shadow_height};
+ 
+@@ -2277,14 +2280,17 @@ st_theme_node_prerender_shadow (StThemeNodePaintState 
*state)
+   cogl_framebuffer_clear4f (offscreen, COGL_BUFFER_BIT_COLOR, 0, 0, 0, 0);
+ 
+   st_theme_node_paint_borders (state, offscreen, &box, 0xFF);
+-  cogl_handle_unref (offscreen);
+ 
+   state->box_shadow_pipeline = _st_create_shadow_pipeline 
(st_theme_node_get_box_shadow (node),
+buffer);
+ }
++  else
++{
++  cogl_error_free (error);
++}
+ 
+-  if (buffer != COGL_INVALID_HANDLE)
+-cogl_handle_unref (buffer);
++  cogl_handle_unref (offscreen);
++  cogl_handle_unref (buffer);
+ }
+ 
+ static void
+diff --git a/src/st/st-theme-node-transition.c 
b/src/st/st-theme-node-transition.c
+index 1eef17b..afde977 100644
+--- a/src/st/st-theme-node-transition.c
 b/src/st/st-theme-node-transition.c
+@@ -241,6 +241,7 @@ setup_framebuffers (StThemeNodeTransition *transition,
+ {
+   StThemeNodeTransitionPrivate *priv = transition->priv;
+   guint width, height;
++  CoglError *catch_error = NULL;
+ 
+   /* template material to avoid unnecessary shader compilation */
+   static CoglHandle material_template = COGL_INVALID_HANDLE;
+@@ -263,19 +264,33 @@ setup_framebuffers (StThemeNodeTransition *transition,
+   COGL_TEXTURE_NO_SLICING,
+   COGL_PIXEL_FORMAT_ANY);
+ 
+-  g_return_val_if_fail (priv->old_texture != COGL_INVALID_HANDLE, FALSE);
+-  g_return_val_if_fail (priv->new_texture != COGL_INVALID_HANDLE, FALSE);
++  if (priv->old_texture == COGL_INVALID_HANDLE)
++return FALSE;
++
++  if (priv->new_texture == COGL_INVALID_HANDLE)
++return FALSE;
+ 
+   if (priv->old_offscreen)
+ cogl_handle_unref (priv->old_offscreen);
+   priv->old_offscreen = cogl_offscreen_new_with_texture (priv->old_texture);
++  if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (priv->old_offscreen), 
&catch_error))
++{
++  cogl_object_unref (priv->old_offscreen);
++

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2016-11-11 Thread Gilles Dartiguelongue

commit: a4358aee4a36b9c9eeef3e487ea9c3459218c0cf
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Fri Nov 11 22:45:09 2016 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sat Nov 12 00:33:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4358aee

gnome-base/gnome-shell: version bump 3.20.4 → 3.22.1

Cleanup unused dependencies. Add missing dependencies with
introspection support. Make nsplugin optional as there is the chrome
extension in tree too. Update comments.

Package-Manager: portage-2.3.2

 .../files/gnome-shell-3.22.0-defaults.patch| 26 
 .../files/gnome-shell-3.22.0-gir-build-fix.patch   | 28 +
 gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild   | 49 +-
 3 files changed, 73 insertions(+), 30 deletions(-)

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch 
b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch
new file mode 100644
index ..b80dbc3
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch
@@ -0,0 +1,26 @@
+From 7a671f99b7ef2d5f38be67668aac762764b32a42 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Tue, 10 Dec 2013 23:33:51 +0100
+Subject: [PATCH 1/2] Alter list of default applications
+
+Signed-off-by: Gilles Dartiguelongue 
+---
+ data/org.gnome.shell.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.gnome.shell.gschema.xml.in 
b/data/org.gnome.shell.gschema.xml.in
+index c1e6b21..368c654 100644
+--- a/data/org.gnome.shell.gschema.xml.in
 b/data/org.gnome.shell.gschema.xml.in
+@@ -31,7 +31,7 @@
+   
+ 
+ 
+-  [ 'epiphany.desktop', 'evolution.desktop', 
'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 
'org.gnome.Software.desktop' ]
++  [ 'chromium-browser-chromium.desktop', 'firefox.desktop', 
'firefox-bin.desktop', 'evolution.desktop', 'rhythmbox.desktop', 
'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' 
]
+   List of desktop file IDs for favorite applications
+   
+ The applications corresponding to these identifiers
+-- 
+2.10.1
+

diff --git 
a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch 
b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch
new file mode 100644
index ..b0c5fb7
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch
@@ -0,0 +1,28 @@
+From 395bede20811b0cf2bcecb0b4e5bcbc2c2fa35f4 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Sat, 12 Nov 2016 00:21:25 +0100
+Subject: [PATCH] Add missing rpath to point to mutter specific libraries
+
+Reported-By: alpha...@gmail.com
+X-Gentoo-Bug: 597842
+X-Gentoo-Url: https://bugs.gentoo.org/show_bug.cgi?id=597842
+---
+ src/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index e9aacfe..fd98ba5 100644
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -311,7 +311,7 @@ shell-enum-types.c: $(srcdir)/shell-enum-types.c.in 
stamp-shell-enum-types.h
+   rm -f $(@F).tmp
+ EXTRA_DIST += shell-enum-types.c.in
+ 
+-libgnome_shell_ldflags = -avoid-version
++libgnome_shell_ldflags = -avoid-version -Wl,-rpath,$(MUTTER_TYPELIB_DIR)
+ libgnome_shell_libadd =   \
+   -lm \
+   $(GNOME_SHELL_LIBS) \
+-- 
+2.10.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild
index c5e7062..60739bd 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild
@@ -6,14 +6,14 @@ EAPI=6
 GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python{3_4,3_5} )
 
-inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd
+inherit autotools gnome2 multilib pax-utils python-r1 systemd
 
 DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-IUSE="+bluetooth +networkmanager +nls -openrc-force"
+IUSE="+bluetooth +networkmanager nsplugin +nls -openrc-force"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
@@ -30,13 +30,9 @@ COMMON_DEPEND="
>=dev-libs/gobject-introspection-1.49.1:=
dev-libs/libical:=
>=x11-libs/gtk+-3.15.0:3[introspection]
-   >=media-libs/clutter-1.21.5:1.0[introspection]
-   >=dev-libs/json-glib-0.13.2
>=dev-libs/libcroco-0.6.8:0.6
>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
>=gnome-base/gsettings-desktop-schemas-3.21.3
-   >=gnome-base/gnome-keyring-3.3.90
-   gnome-base/libgnome-keyring
>=gnome-extra/evolution-data-server-3.17.2:=
>=media-libs/gstreamer-0.11.92:1.0
>=net-im/telepathy-logger-0.2.4[introspection]
@@ -52,14 +48,13 @@ COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2016-11-11 Thread Gilles Dartiguelongue

commit: a4358aee4a36b9c9eeef3e487ea9c3459218c0cf
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Fri Nov 11 22:45:09 2016 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sat Nov 12 00:33:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4358aee

gnome-base/gnome-shell: version bump 3.20.4 → 3.22.1

Cleanup unused dependencies. Add missing dependencies with
introspection support. Make nsplugin optional as there is the chrome
extension in tree too. Update comments.

Package-Manager: portage-2.3.2

 .../files/gnome-shell-3.22.0-defaults.patch| 26 
 .../files/gnome-shell-3.22.0-gir-build-fix.patch   | 28 +
 gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild   | 49 +-
 3 files changed, 73 insertions(+), 30 deletions(-)

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch 
b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch
new file mode 100644
index ..b80dbc3
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch
@@ -0,0 +1,26 @@
+From 7a671f99b7ef2d5f38be67668aac762764b32a42 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Tue, 10 Dec 2013 23:33:51 +0100
+Subject: [PATCH 1/2] Alter list of default applications
+
+Signed-off-by: Gilles Dartiguelongue 
+---
+ data/org.gnome.shell.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.gnome.shell.gschema.xml.in 
b/data/org.gnome.shell.gschema.xml.in
+index c1e6b21..368c654 100644
+--- a/data/org.gnome.shell.gschema.xml.in
 b/data/org.gnome.shell.gschema.xml.in
+@@ -31,7 +31,7 @@
+   
+ 
+ 
+-  [ 'epiphany.desktop', 'evolution.desktop', 
'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 
'org.gnome.Software.desktop' ]
++  [ 'chromium-browser-chromium.desktop', 'firefox.desktop', 
'firefox-bin.desktop', 'evolution.desktop', 'rhythmbox.desktop', 
'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' 
]
+   List of desktop file IDs for favorite applications
+   
+ The applications corresponding to these identifiers
+-- 
+2.10.1
+

diff --git 
a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch 
b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch
new file mode 100644
index ..b0c5fb7
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch
@@ -0,0 +1,28 @@
+From 395bede20811b0cf2bcecb0b4e5bcbc2c2fa35f4 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Sat, 12 Nov 2016 00:21:25 +0100
+Subject: [PATCH] Add missing rpath to point to mutter specific libraries
+
+Reported-By: alpha...@gmail.com
+X-Gentoo-Bug: 597842
+X-Gentoo-Url: https://bugs.gentoo.org/show_bug.cgi?id=597842
+---
+ src/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index e9aacfe..fd98ba5 100644
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -311,7 +311,7 @@ shell-enum-types.c: $(srcdir)/shell-enum-types.c.in 
stamp-shell-enum-types.h
+   rm -f $(@F).tmp
+ EXTRA_DIST += shell-enum-types.c.in
+ 
+-libgnome_shell_ldflags = -avoid-version
++libgnome_shell_ldflags = -avoid-version -Wl,-rpath,$(MUTTER_TYPELIB_DIR)
+ libgnome_shell_libadd =   \
+   -lm \
+   $(GNOME_SHELL_LIBS) \
+-- 
+2.10.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild
index c5e7062..60739bd 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild
@@ -6,14 +6,14 @@ EAPI=6
 GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python{3_4,3_5} )
 
-inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd
+inherit autotools gnome2 multilib pax-utils python-r1 systemd
 
 DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-IUSE="+bluetooth +networkmanager +nls -openrc-force"
+IUSE="+bluetooth +networkmanager nsplugin +nls -openrc-force"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
@@ -30,13 +30,9 @@ COMMON_DEPEND="
>=dev-libs/gobject-introspection-1.49.1:=
dev-libs/libical:=
>=x11-libs/gtk+-3.15.0:3[introspection]
-   >=media-libs/clutter-1.21.5:1.0[introspection]
-   >=dev-libs/json-glib-0.13.2
>=dev-libs/libcroco-0.6.8:0.6
>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
>=gnome-base/gsettings-desktop-schemas-3.21.3
-   >=gnome-base/gnome-keyring-3.3.90
-   gnome-base/libgnome-keyring
>=gnome-extra/evolution-data-server-3.17.2:=
>=media-libs/gstreamer-0.11.92:1.0
>=net-im/telepathy-logger-0.2.4[introspection]
@@ -52,14 +48,13 @@ COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2016-06-27 Thread Alexandre Rostovtsev

commit: de093187ffd212744ab9952167e511d74de42153
Author: Alexandre Rostovtsev  gentoo  org>
AuthorDate: Mon Jun 27 14:05:46 2016 +
Commit: Alexandre Rostovtsev  gentoo  org>
CommitDate: Mon Jun 27 14:05:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de093187

gnome-base/gnome-shell: fix nvidia-drivers crash (bug #587110)

Thanks to Mark R. Pariente for reporting.

Also, require adwaita-icon-theme-3.20 for new grid icon (bug #587130)

Package-Manager: portage-2.3.0

 .../files/gnome-shell-3.20.2-st-nvidia.patch   | 121 +++
 .../gnome-shell/gnome-shell-3.20.2-r1.ebuild   | 221 +
 2 files changed, 342 insertions(+)

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch 
b/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch
new file mode 100644
index 000..63df248
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch
@@ -0,0 +1,121 @@
+From 35cc224240ec4fc8159fc689fe3e093a81f97dc9 Mon Sep 17 00:00:00 2001
+From: Martin Szulecki 
+Date: Tue, 17 May 2016 15:00:04 +0200
+Subject: [PATCH] st: Init framebuffer early to fix gnome-shell crash on NVIDIA
+ drivers
+
+Checking offscreen for COGL_INVALID_HANDLE is not sufficient,
+as cogl_offscreen_new_with_texture doesn't initialize framebuffer
+objects but lets Cogl solve this the lazy way.
+cogl_offscreen_new_with_texture will never return COGL_INVALID_HANDLE
+anyways.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=764898
+---
+ src/st/st-theme-node-drawing.c| 18 --
+ src/st/st-theme-node-transition.c | 25 -
+ 2 files changed, 32 insertions(+), 11 deletions(-)
+
+diff --git a/src/st/st-theme-node-drawing.c b/src/st/st-theme-node-drawing.c
+index 85feb20..8942966 100644
+--- a/src/st/st-theme-node-drawing.c
 b/src/st/st-theme-node-drawing.c
+@@ -2224,6 +2224,7 @@ st_theme_node_prerender_shadow (StThemeNodePaintState 
*state)
+   int max_borders[4];
+   int center_radius, corner_id;
+   CoglHandle buffer, offscreen = COGL_INVALID_HANDLE;
++  CoglError *error = NULL;
+ 
+   /* Get infos from the node */
+   if (state->alloc_width < node->box_shadow_min_width ||
+@@ -2264,10 +2265,12 @@ st_theme_node_prerender_shadow (StThemeNodePaintState 
*state)
+state->box_shadow_height,
+COGL_TEXTURE_NO_SLICING,
+COGL_PIXEL_FORMAT_ANY);
+-  if (buffer != COGL_INVALID_HANDLE)
+-offscreen = cogl_offscreen_new_with_texture (buffer);
++  if (buffer == NULL)
++return;
+ 
+-  if (offscreen != COGL_INVALID_HANDLE)
++  offscreen = cogl_offscreen_new_with_texture (buffer);
++
++  if (cogl_framebuffer_allocate (COGL_FRAMEBUFFER (offscreen), &error))
+ {
+   ClutterActorBox box = { 0, 0, state->box_shadow_width, 
state->box_shadow_height};
+ 
+@@ -2277,14 +2280,17 @@ st_theme_node_prerender_shadow (StThemeNodePaintState 
*state)
+   cogl_framebuffer_clear4f (offscreen, COGL_BUFFER_BIT_COLOR, 0, 0, 0, 0);
+ 
+   st_theme_node_paint_borders (state, offscreen, &box, 0xFF);
+-  cogl_handle_unref (offscreen);
+ 
+   state->box_shadow_pipeline = _st_create_shadow_pipeline 
(st_theme_node_get_box_shadow (node),
+buffer);
+ }
++  else
++{
++  cogl_error_free (error);
++}
+ 
+-  if (buffer != COGL_INVALID_HANDLE)
+-cogl_handle_unref (buffer);
++  cogl_handle_unref (offscreen);
++  cogl_handle_unref (buffer);
+ }
+ 
+ static void
+diff --git a/src/st/st-theme-node-transition.c 
b/src/st/st-theme-node-transition.c
+index 1eef17b..afde977 100644
+--- a/src/st/st-theme-node-transition.c
 b/src/st/st-theme-node-transition.c
+@@ -241,6 +241,7 @@ setup_framebuffers (StThemeNodeTransition *transition,
+ {
+   StThemeNodeTransitionPrivate *priv = transition->priv;
+   guint width, height;
++  CoglError *catch_error = NULL;
+ 
+   /* template material to avoid unnecessary shader compilation */
+   static CoglHandle material_template = COGL_INVALID_HANDLE;
+@@ -263,19 +264,33 @@ setup_framebuffers (StThemeNodeTransition *transition,
+   COGL_TEXTURE_NO_SLICING,
+   COGL_PIXEL_FORMAT_ANY);
+ 
+-  g_return_val_if_fail (priv->old_texture != COGL_INVALID_HANDLE, FALSE);
+-  g_return_val_if_fail (priv->new_texture != COGL_INVALID_HANDLE, FALSE);
++  if (priv->old_texture == COGL_INVALID_HANDLE)
++return FALSE;
++
++  if (priv->new_texture == COGL_INVALID_HANDLE)
++return FALSE;
+ 
+   if (priv->old_offscreen)
+ cogl_handle_unref (priv->old_offscreen);
+   priv->old_offscreen = cogl_offscreen_new_with_texture (priv->old_texture);
++  if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (priv->old_offscreen), 
&catch_error))
++{
++  cogl_object_unref (priv->old_offscreen);
++

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-05-17 Thread Sam James

commit: 042dabffb96f3b8fd74e0cbb14c524c81e7304df
Author: Sam James  gentoo  org>
AuthorDate: Tue May 17 21:58:52 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 17 21:58:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=042dabff

gnome-base/gnome-shell: backport new Polkit patch (g_autoptr)

Closes: https://bugs.gentoo.org/844919
Signed-off-by: Sam James  gentoo.org>

 .../gnome-shell/files/42.1-polkit-g_autoptr.patch  | 53 ++
 gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild  |  3 ++
 2 files changed, 56 insertions(+)

diff --git a/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch 
b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
new file mode 100644
index ..78d3de086260
--- /dev/null
+++ b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
@@ -0,0 +1,53 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/1d0a08b5e25fea7b0e792ec9798e68a7c5606a75
+https://bugs.gentoo.org/844919
+
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= 
+Date: Tue, 17 May 2022 15:36:43 +0200
+Subject: [PATCH] build: Do not redefine polkit autocleanup
+
+PolkitAgent recently added autocleanup functions itself, so check
+for their existence at configure time and only define our own when
+they don't exist upstream.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5490
+
+Part-of: 
+--- a/config.h.meson
 b/config.h.meson
+@@ -33,3 +33,6 @@
+ 
+ /* Define if fdwalk is available in libc */
+ #mesondefine HAVE_FDWALK
++
++/* Define if polkit defines autocleanup functions */
++#mesondefine HAVE_POLKIT_AUTOCLEANUP
+--- a/meson.build
 b/meson.build
+@@ -169,6 +169,13 @@ cdata.set('HAVE_FDWALK',
+   cc.has_function('fdwalk')
+ )
+ 
++polkit_has_autocleanup = cc.compiles(
++  '#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
++  #include 
++  void main(void) { g_autoptr(PolkitAgentListener) agent = NULL; }',
++  dependencies: polkit_dep)
++cdata.set('HAVE_POLKIT_AUTOCLEANUP', polkit_has_autocleanup)
++
+ buildtype = get_option('buildtype')
+ if buildtype != 'plain'
+   all_warnings = [
+--- a/src/shell-polkit-authentication-agent.h
 b/src/shell-polkit-authentication-agent.h
+@@ -14,8 +14,10 @@
+ 
+ G_BEGIN_DECLS
+ 
++#ifndef HAVE_POLKIT_AUTOCLEANUP
+ /* Polkit doesn't have g_autoptr support, thus we have to manually set the 
autoptr function here */
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (PolkitAgentListener, g_object_unref)
++#endif
+ 
+ #define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT 
(shell_polkit_authentication_agent_get_type())
+ 
+GitLab

diff --git a/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild 
b/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild
index db6f1390fcef..7a1cc841e4f9 100644
--- a/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild
@@ -140,6 +140,9 @@ PATCHES=(
"${FILESDIR}"/42.0-optional-bluetooth.patch
# Change favorites defaults, bug #479918
"${FILESDIR}"/40.0-defaults.patch
+
+   # Upstream backport, bug #844919
+   "${FILESDIR}"/42.1-polkit-g_autoptr.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-01-24 Thread Sam James

commit: b7d4f62f083b1e8d0857633c0fd2cf356729d6ca
Author: Christophe Lermytte  lermytte  be>
AuthorDate: Mon Jan 24 22:16:41 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 25 00:49:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7d4f62f

gnome-base/gnome-shell: fix build with meson-0.61

Closes: https://bugs.gentoo.org/831921
Signed-off-by: Christophe Lermytte  lermytte.be>
Signed-off-by: Sam James  gentoo.org>

 .../files/41.3-fix-build-with-meson-0.61.1.patch   | 84 ++
 gnome-base/gnome-shell/gnome-shell-41.3.ebuild |  1 +
 2 files changed, 85 insertions(+)

diff --git 
a/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch 
b/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch
new file mode 100644
index ..ecf212b9794c
--- /dev/null
+++ b/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,84 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/65450a836ee9e0722a2d4c3327f52345eae293c6
+https://bugs.gentoo.org/831921
+
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= 
+Date: Thu, 23 Dec 2021 17:18:16 +0100
+Subject: [PATCH] build: Drop incorrect positional arg
+
+Unlike other targets that take a name, i18n.merge_file() does not.
+
+Part-of: 
+---
+ data/meson.build  | 2 +-
+ src/calendar-server/meson.build   | 2 +-
+ subprojects/extensions-app/data/meson.build   | 2 +-
+ subprojects/extensions-app/data/metainfo/meson.build  | 2 +-
+ subprojects/extensions-tool/src/templates/meson.build | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index f924fdf806..76ae45c93a 100644
+--- a/data/meson.build
 b/data/meson.build
+@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir)
+ desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false')
+ 
+ foreach desktop_file : desktop_files
+-  i18n.merge_file('desktop',
++  i18n.merge_file(
+ input: configure_file(
+   input: desktop_file + '.in.in',
+   output: desktop_file + '.in',
+diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build
+index 7363282a59..8b4ef411c8 100644
+--- a/src/calendar-server/meson.build
 b/src/calendar-server/meson.build
+@@ -27,7 +27,7 @@ configure_file(
+   install_dir: servicedir
+ )
+ 
+-i18n.merge_file('evolution-calendar.desktop',
++i18n.merge_file(
+   input: 'evolution-calendar.desktop.in',
+   output: 'evolution-calendar.desktop',
+   po_dir: po_dir,
+diff --git a/subprojects/extensions-app/data/meson.build 
b/subprojects/extensions-app/data/meson.build
+index d7e7d4001c..4b601e8bd1 100644
+--- a/subprojects/extensions-app/data/meson.build
 b/subprojects/extensions-app/data/meson.build
+@@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir)
+ desktopconf.set('app_id', app_id)
+ desktopconf.set('prgname', prgname)
+ 
+-i18n.merge_file('desktop',
++i18n.merge_file(
+   input: configure_file(
+ input: base_id + '.desktop.in.in',
+ output: desktop_file + '.in',
+diff --git a/subprojects/extensions-app/data/metainfo/meson.build 
b/subprojects/extensions-app/data/metainfo/meson.build
+index c4962c0576..a19bfa80a4 100644
+--- a/subprojects/extensions-app/data/metainfo/meson.build
 b/subprojects/extensions-app/data/metainfo/meson.build
+@@ -1,5 +1,5 @@
+ metainfo = app_id + '.metainfo.xml'
+-i18n.merge_file(metainfo,
++i18n.merge_file(
+   input: base_id + '.metainfo.xml.in',
+   output: metainfo,
+   po_dir: po_dir,
+diff --git a/subprojects/extensions-tool/src/templates/meson.build 
b/subprojects/extensions-tool/src/templates/meson.build
+index 670e2bf448..d693bfaddb 100644
+--- a/subprojects/extensions-tool/src/templates/meson.build
 b/subprojects/extensions-tool/src/templates/meson.build
+@@ -4,7 +4,7 @@ template_metas = [
+ ]
+ template_deps = []
+ foreach template : template_metas
+-  template_deps += i18n.merge_file(template,
++  template_deps += i18n.merge_file(
+ input: template + '.in',
+ output: template,
+ po_dir: po_dir,
+-- 
+GitLab
+

diff --git a/gnome-base/gnome-shell/gnome-shell-41.3.ebuild 
b/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
index a5b2b5a53e21..25496f9f35dc 100644
--- a/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
@@ -139,6 +139,7 @@ PATCHES=(
"${FILESDIR}"/40.0-optional-bluetooth.patch
# Change favorites defaults, bug #479918
"${FILESDIR}"/40.0-defaults.patch
+   "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2022-06-23 Thread Sam James

commit: dea2c90c1aee7d012a467eeb937fc4a7ecae9237
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 24 03:42:30 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 24 03:42:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dea2c90c

gnome-base/gnome-shell: restore 42.1-r3 for Polkit fix

Bug: https://bugs.gentoo.org/844919
Bug: https://bugs.gentoo.org/849566
Fixes: eed2ee4b79e40099d84db0dde29dced1e3346bb6
Signed-off-by: Sam James  gentoo.org>

 .../gnome-shell/files/42.1-polkit-g_autoptr.patch  |  53 ++
 gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild  | 206 +
 2 files changed, 259 insertions(+)

diff --git a/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch 
b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
new file mode 100644
index ..78d3de086260
--- /dev/null
+++ b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
@@ -0,0 +1,53 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/1d0a08b5e25fea7b0e792ec9798e68a7c5606a75
+https://bugs.gentoo.org/844919
+
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= 
+Date: Tue, 17 May 2022 15:36:43 +0200
+Subject: [PATCH] build: Do not redefine polkit autocleanup
+
+PolkitAgent recently added autocleanup functions itself, so check
+for their existence at configure time and only define our own when
+they don't exist upstream.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5490
+
+Part-of: 
+--- a/config.h.meson
 b/config.h.meson
+@@ -33,3 +33,6 @@
+ 
+ /* Define if fdwalk is available in libc */
+ #mesondefine HAVE_FDWALK
++
++/* Define if polkit defines autocleanup functions */
++#mesondefine HAVE_POLKIT_AUTOCLEANUP
+--- a/meson.build
 b/meson.build
+@@ -169,6 +169,13 @@ cdata.set('HAVE_FDWALK',
+   cc.has_function('fdwalk')
+ )
+ 
++polkit_has_autocleanup = cc.compiles(
++  '#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
++  #include 
++  void main(void) { g_autoptr(PolkitAgentListener) agent = NULL; }',
++  dependencies: polkit_dep)
++cdata.set('HAVE_POLKIT_AUTOCLEANUP', polkit_has_autocleanup)
++
+ buildtype = get_option('buildtype')
+ if buildtype != 'plain'
+   all_warnings = [
+--- a/src/shell-polkit-authentication-agent.h
 b/src/shell-polkit-authentication-agent.h
+@@ -14,8 +14,10 @@
+ 
+ G_BEGIN_DECLS
+ 
++#ifndef HAVE_POLKIT_AUTOCLEANUP
+ /* Polkit doesn't have g_autoptr support, thus we have to manually set the 
autoptr function here */
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (PolkitAgentListener, g_object_unref)
++#endif
+ 
+ #define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT 
(shell_polkit_authentication_agent_get_type())
+ 
+GitLab

diff --git a/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild 
b/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild
new file mode 100644
index ..3bc4781371bb
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer/pipewire support is currently automagic
+DEPEND="
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.68:2
+   >=dev-libs/gobject-introspection-1.49.1:=
+   >=dev-libs/gjs-1.71.1
+   >=x11-libs/gtk+-3.15.0:3[introspection]
+   >=x11-wm/mutter-42.0:0/10[introspection,test?]
+   >=sys-auth/polkit-0.120_p20220509[introspection]
+   >=gnome-base/gsettings-desktop-schemas-42_beta[introspection]
+   >=x11-libs/startup-notification-0.11
+   >=app-i18n/ibus-1.5.19
+   >=gnome-base/gnome-desktop-3.35.90:3=[introspection]
+   bluetooth? ( net-wireless/gnome-bluetooth:3=[introspection] )
+   >=media-libs/gstreamer-0.11.92:1.0
+   media-libs/gst-plugins-base:1.0
+   >=media-video/pipewire-0.3.0:=
+   networkmanager? (
+   >=net-misc/networkmanager-1.10.4:=[introspection]
+   net-libs/libnma[introspection]
+   >=app-crypt/libsecret-0.18
+   dev-libs/dbus-glib )
+   systemd? ( >=sys-apps/systemd-242
+   >=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
+   elogind? ( >=sys-auth/elogind-237 )
+
+   app-arch/gnome-autoar
+   dev-libs/json-glib
+
+   >=app-accessibility/at-spi2-atk-2.5.3

88 matches

Mail list logo