From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- gnome-base/gnome-shell/Manifest | 17 +- .../files/40.0-optional-bluetooth.patch | 59 ------ .../files/41.3-fix-build-with-meson-0.61.1.patch | 84 --------- ....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-shell/files/42.1-polkit-g_autoptr.patch | 53 ++++++ gnome-base/gnome-shell/gnome-shell-41.4-r1.ebuild | 203 -------------------- gnome-base/gnome-shell/gnome-shell-41.5.ebuild | 208 --------------------- gnome-base/gnome-shell/gnome-shell-42.0-r1.ebuild | 202 -------------------- gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild | 206 ++++++++++++++++++++ gnome-base/gnome-shell/gnome-shell-42.1.ebuild | 2 +- gnome-base/gnome-shell/gnome-shell-42.2.ebuild | 203 ++++++++++++++++++++ 13 files changed, 468 insertions(+), 863 deletions(-) delete mode 100644 gnome-base/gnome-shell/files/40.0-optional-bluetooth.patch delete mode 100644 gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch delete mode 100644 gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch delete mode 100644 gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch delete mode 100644 gnome-base/gnome-shell/files/41.5-environment-Require-libgweather-3.0.patch create mode 100644 gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch delete mode 100644 gnome-base/gnome-shell/gnome-shell-41.4-r1.ebuild delete mode 100644 gnome-base/gnome-shell/gnome-shell-41.5.ebuild delete mode 100644 gnome-base/gnome-shell/gnome-shell-42.0-r1.ebuild create mode 100644 gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild create mode 100644 gnome-base/gnome-shell/gnome-shell-42.2.ebuild (limited to 'gnome-base/gnome-shell') diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest index e49f32e6afa3..f63314976277 100644 --- a/gnome-base/gnome-shell/Manifest +++ b/gnome-base/gnome-shell/Manifest @@ -1,16 +1,9 @@ AUX 40.0-defaults.patch 1412 BLAKE2B e36f7215cf756586479b8bdc71339beb3bbde53ca9745ddc4ef1c3feb59c720e4920e8aa4aadd7912874c386e7495a4b5d554e0d0616db17a81c4ec52a2baa6b SHA512 d82cf1e329d5974755738e29e6366bb10452620021a5db6c2ec63c4ee38e87a65dada34d57026e9510dbffa78c7060ae6f2ccec1739e3026bb0c67dab95f94a9 -AUX 40.0-optional-bluetooth.patch 2034 BLAKE2B 9df252dbef229d372bae87ab017d49086090a4194644fc0f7f3dc78226f78fa58cb99d67d4aac2b156894721658c6094aa6609c0da8c707cf0a8dac5a9a404ee SHA512 ec82f1ef7a9123134af2617526c22fa4258413edb6d68acdcd074911b98ed27d2e761904ccd88a364d9064d79bdefd402988bc53e1139f0e54f993c84242f19f -AUX 41.3-fix-build-with-meson-0.61.1.patch 3166 BLAKE2B 85378cb7a5ccf02833c409c9c0735d6004d59aa7cb915902b1b518d41235f89b649b353ecefce6228ff42724d6a299c18b3397f7bd584509a06356784871ce48 SHA512 70af8bc42e7a15d68834eed58dd3cac0074e2aa0ccc55c028112b9e06aaf79ffd41a135e1366a1d8131f5acd3857d282cf2471845df7cb301b1de10503e47e1f -AUX 41.5-environment-Require-GnomeBluetooth-1.0.patch 1286 BLAKE2B 926168a408e7adfa4f42ad470d0bb657248d90f857fe2650f0349b1355d09b5c962ec31288ad1128c8cc03a05d043208101543fc82c71fd4ddc803360101062f SHA512 cd7a4b39c8478e047841fcb44f4b0efca0187ed1b5a3de336c66c6c3e7c90d33ccdda1fc765f78d6c14f326f03b4abafe59ffa5228feac9e0823b9d6684bd197 -AUX 41.5-environment-Require-gnome-desktop-3.0.patch 1021 BLAKE2B fee68ab772f0dbcba318864c440a7b2c160ce3dc60244848d4307dfdb707d535cf57814cf8baaa4886139e91c87c14741f4de4f03f5eac17e1bf1d2f434cb2ad SHA512 9cd44be2a55b22392f49d0f0d32f930245c6882ccab169806cd3583d77aa5c34357a19fa6587c9ba1b584afd5e752cfe7c647319de8c29b07ac71e07bea0c1b7 -AUX 41.5-environment-Require-libgweather-3.0.patch 1045 BLAKE2B d66eed70ba417590eebe1921e00fba045fa80295f17b432deaee5b823bc5248b4bd35ef6423b5947b2c77a2409675f3ab4ea31cb13f728cd42615e602ac69e4d SHA512 bd86e120203801f9a1a091d7be7adefa94f86fea5af400cd9469a1077ee422470f1e486693518d39e7210f3226b9fdfd6ee34a0e5cdbdee63ceea9d054795c40 AUX 42.0-optional-bluetooth.patch 2032 BLAKE2B 635ba18f5bb5ca0c9f44fe11c2b52652355e1de4647c277524e3f19ef6d57870e75f32b8a2be10eb4e3be4ecf885765b8f0899ab71906f71324795763effa23a SHA512 5fb17c6ffd0486e43b5451747b346e5e9feb3f918f4ef23adc517c43bf61eb5b8850b03022e84848e446de1f0b2145a9dd2b954dde9994e9da176559cd6e48a8 -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 +AUX 42.1-polkit-g_autoptr.patch 1760 BLAKE2B d1d873af81e9b7641f0f2627c4c38cfa281f8ebb50b96af0c8bd6b71ee675d69865565d365e18b8cc09e1345239165cf1eed6bf9c130a68267c133e334a87381 SHA512 0b1bb7e984f9e714d6225c6016299abfe6d9b5b7ff1fb06bfa2f0a88d5191eb2fd3690f0ed1e8b1381440daf2896d17a9ee44c4e42bab68a2cfd004539ac2bfd DIST gnome-shell-42.1.tar.xz 1928924 BLAKE2B c8a1aed79a93d713a52ef0161ff9f06c39f7fb9a762086c78505d220e1e8ec43d7a0e376421f912dc91b33da8fd9394c6a233bb2d9d8b361d63ea2ad0406cee6 SHA512 3d27fdbcf5359f631a71b0fa6495fa50e2b43bb2b3c5c0efd740d9a6a88128ae54fe0ba11ea88990ba10ee2fc9f55211d0a21e60beca250bd197535d944d07ed -EBUILD gnome-shell-41.4-r1.ebuild 7395 BLAKE2B 3769ab65768b699cf7394ea80a22274279c3d410da4b3d05ceb7f1ce33d9aa41524a0bb4de2a5b11acf9b540cf11c5c9a23c236e4a2df6e41544a74577a37ab7 SHA512 4af8c66e12a16e05e82389a7a28a7e49ae34ed72e68b6ce373a8c223be207f2fdbc007ec9d8fe57b4a53e5612c41f062225fe47d6851cd5481e3d34051cec2da -EBUILD gnome-shell-41.5.ebuild 7610 BLAKE2B 52e2009ac7e4ad24ca062608bd131436d7533f7a228258d6a525521fbe23060fecddcc3823fe696f1f5252abfaad765113bc677894647da92dbfbbae273200bb SHA512 27a9f2200200fba82eb6ff9aabddce02533077aa1d5cb64e3977e49b5d07fa085a00810de0f68db59554589502f8537ff9d34ceab354215aacdd26e9f7442217 -EBUILD gnome-shell-42.0-r1.ebuild 7336 BLAKE2B f83be460fcfbd49398804bd30618aab5ac678e676a3e1f46daa7785780d7883af1c4d07614365633d7f48609a0721e0212b09850786cd82a56319fdd7507f434 SHA512 37976b8a9762d017688ab48459ecd091e7c5ef722f392a547e23b422b9cb8aa031db278612cf60ff003e61d9007935e7e83ca95b20826f08e6908b6bc04fed6a -EBUILD gnome-shell-42.1.ebuild 7356 BLAKE2B 11be2d6171e95520dfebadefa926ef69f9c7a0d450fc4402a6c1e8dde93e08d1d7735d1c51c9387091ff84dabd692b7849a87daa3fa917fef65babf35448d208 SHA512 1820a7d815f860eb085cce14f312246b18548e0be767dbdf2d612f86e0a41a40a9a30f77e519f6cb039d06e12812df8ec22a3f735d5bce4eefb61a89e8f47de3 +DIST gnome-shell-42.2.tar.xz 1928948 BLAKE2B e263acfc9e6929accfb46b65b91b1173cfa4c778405c0852e93b83d78e1bf3a85e3b5c49b73445f604c0fdecb48f294931ab2403806661013bcef3a71b99f911 SHA512 dd77195772e23d8260e55a2db1103fa6dee8945ad168478c293e43e9971698aa191e17f7f5ef46cf46eeaae5051c34f0eb5df134690f7dc5ca98d6ca747e4eb0 +EBUILD gnome-shell-42.1-r3.ebuild 7490 BLAKE2B 5ac71aef32204d503da5369c6b2094e5f03591d514a5fe8087a338f537b244096c945fcc81c6ea76cd0bf510167e18e496c5840e8417b682651602f056505193 SHA512 447ea4e9af49dfa9e625caa81f80d6f2184d28ea7aeccb765d3b4b37e02d66c636793ec6793f7858361c85d0b2384c108cf9d105b0e747b9556e80245ac9f008 +EBUILD gnome-shell-42.1.ebuild 7353 BLAKE2B 6f9a84055d0e94cd98ee0bee5598f3f827d23969249b8d29ff4f29392699289c0bf23872a6dd74844627df66031b10bdc0157873aa12366fa52a44f437c7a25d SHA512 b274bc62c5869fb8c5dddd42aa93a783fa98f59523d7e5c9342799b14fbcd405650bf5b3b0eee590d8b9ca23869978fe12d1fac63dc4b84be11de4b3912af735 +EBUILD gnome-shell-42.2.ebuild 7415 BLAKE2B c24ed61ad5badba44fde2c241c8051e44a1778bd6db81912c64c2f13c136955fb2a1045140ddede366e28592884f1bb757b6bf2628c553eac0b311dc3abe22a2 SHA512 eaa4d064bdd2f4e9ead120919e51ad7794f60a1cfba23a1c538e89a96098524a363784b96c6ebf0241c9dc322c57299bf0d654a826e813ebd71fdf539d9f05b7 MISC metadata.xml 1051 BLAKE2B 86f9156deb6546719e6bcd09ad609b2837901743dd390f430521226df6b9e8f54387d2c93411d63d0099261ee0463428fb8854ce2c47463b999827b377807d84 SHA512 f6a3efe242c1726508a56506a7817c3beea3cb17fbe37d2d38403bc6f4f1d11fd366b68b5c9c6ce44f200a21d48da6ccfcf07c9758369481376b5882ea872129 diff --git a/gnome-base/gnome-shell/files/40.0-optional-bluetooth.patch b/gnome-base/gnome-shell/files/40.0-optional-bluetooth.patch deleted file mode 100644 index dba20fe8c093..000000000000 --- a/gnome-base/gnome-shell/files/40.0-optional-bluetooth.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 1ef0033f8148466256b403c9d8c79b9fed1dd343 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Thu, 28 Feb 2019 00:50:19 +0200 -Subject: [PATCH 2/2] 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 2702c3dbc..7a6c831b9 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.set('datadir', datadir) - jsconf.set('libexecdir', libexecdir) -diff --git a/meson.build b/meson.build -index 14b75c1c9..8b1c7a380 100644 ---- a/meson.build -+++ b/meson.build -@@ -94,7 +94,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-1.0', version: bt_req, required: false) -+if get_option('bluetooth') -+ bt_dep = dependency('gnome-bluetooth-1.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 ef76b73c3..41cc0ff9d 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.26.2 - 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 deleted file mode 100644 index ecf212b9794c..000000000000 --- a/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch +++ /dev/null @@ -1,84 +0,0 @@ -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/files/41.5-environment-Require-GnomeBluetooth-1.0.patch b/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch deleted file mode 100644 index 8729a6c3e671..000000000000 --- a/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 deleted file mode 100644 index 3dbb50bb989b..000000000000 --- a/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch +++ /dev/null @@ -1,30 +0,0 @@ -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-Require-libgweather-3.0.patch b/gnome-base/gnome-shell/files/41.5-environment-Require-libgweather-3.0.patch deleted file mode 100644 index dedd485a2627..000000000000 --- a/gnome-base/gnome-shell/files/41.5-environment-Require-libgweather-3.0.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f07a40d5eeb1daf6e2d118c548c8314c721d558c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= -Date: Wed, 5 Jan 2022 02:42:49 +0100 -Subject: [PATCH] environment: Require libgweather 3.0 - -GWeather did a major version bump on its main branch, so it is -now possible that multiple versions are installed in parallel, -and we should explicitly pick the one we are using. - -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 cb254e319..ad2b8e4f2 100644 ---- a/js/ui/environment.js -+++ b/js/ui/environment.js -@@ -9,6 +9,7 @@ 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.GWeather = '3.0'; - imports.gi.versions.Soup = '3.0'; - imports.gi.versions.TelepathyGLib = '0.12'; - imports.gi.versions.TelepathyLogger = '0.2'; --- -2.34.1 - 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 000000000000..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-41.4-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-41.4-r1.ebuild deleted file mode 100644 index a0a38c2b4fa2..000000000000 --- a/gnome-base/gnome-shell/gnome-shell-41.4-r1.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# 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-introspection-1.49.1:= - >=dev-libs/gjs-1.69.2 - >=x11-libs/gtk+-3.15.0:3[introspection] - >=x11-wm/mutter-41.0:0/9[introspection,test?] - >=sys-auth/polkit-0.100[introspection] - >=gnome-base/gsettings-desktop-schemas-41_alpha[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.9:2=[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 - x11-libs/gdk-pixbuf:2[introspection] - dev-libs/libxml2:2 - x11-libs/libX11 - - >=media-sound/pulseaudio-2[glib] - >=dev-libs/atk-2[introspection] - dev-libs/libical:= - >=x11-libs/libXfixes-5.0 - - gui-libs/gtk:4[introspection] - - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_USEDEP}] - ') - media-libs/mesa[X(+)] -" -# Runtime-only deps are probably incomplete and approximate. -# Introspection deps generated from inspection of the output of: -# for i in `rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- |sort -u`; do echo $i ;done |cut -d, -f1 |sort -u -# or -# rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- | sed -e 's:[{}]::g' | awk '{$1=$1; print}' | awk -F',' '{$1=$1;print}' | tr ' ' '\n' | sort -u | sed -e 's/://g' -# These will give a lot of unnecessary things due to greedy matching (TODO), and `(?s).*?` doesn't seem to work as desired. -# Compare with `grep -rhI 'imports.gi.versions' |sort -u` for any SLOT requirements -# Each block: -# 1. Introspection stuff needed via imports.gi (those that build time check may be listed above already) -# 2. gnome-session needed for shutdown/reboot/inhibitors/etc -# 3. Control shell settings -# 4. xdg-utils needed for xdg-open, used by extension tool -# 5. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+) -# 6. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review -# 7. IBus is needed for nls integration -# 8. Optional telepathy chat integration -# 9. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too) -# 10. xdg-desktop-portal-gtk for various integration, e.g. #764632 -# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper -RDEPEND="${DEPEND} - >=sys-apps/accountsservice-0.6.14[introspection] - app-accessibility/at-spi2-core:2[introspection] - app-misc/geoclue[introspection] - media-libs/graphene[introspection] - >=dev-libs/libgweather-3.26:2[introspection] - x11-libs/pango[introspection] - net-libs/libsoup:2.4[introspection] - >=sys-power/upower-0.99:=[introspection] - gnome-base/librsvg:2[introspection] - - >=gnome-base/gnome-session-2.91.91 - >=gnome-base/gnome-settings-daemon-3.8.3 - - x11-misc/xdg-utils - - >=x11-themes/adwaita-icon-theme-3.26 - - networkmanager? ( - net-misc/mobile-broadband-provider-info - sys-libs/timezone-data ) - ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) - telepathy? ( - >=net-im/telepathy-logger-0.2.4[introspection] - >=net-libs/telepathy-glib-0.19[introspection] ) - media-fonts/cantarell - - sys-apps/xdg-desktop-portal-gtk -" -# avoid circular dependency, see bug #546134 -PDEPEND=" - >=gnome-base/gdm-3.5[introspection(+)] - >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] - browser-extension? ( gnome-extra/chrome-gnome-shell ) -" -BDEPEND=" - dev-libs/libxslt - >=dev-util/gdbus-codegen-2.45.3 - dev-util/glib-utils - gtk-doc? ( >=dev-util/gtk-doc-1.17 - app-text/docbook-xml-dtd:4.5 ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" -# These are not needed from tarballs, unless stylesheets or manpage get patched with patchset: -# dev-lang/sassc -# app-text/asciidoc - -PATCHES=( - # Fix automagic gnome-bluetooth dep, bug #398145 - "${FILESDIR}"/40.0-optional-bluetooth.patch - # Change favorites defaults, bug #479918 - "${FILESDIR}"/40.0-defaults.patch - "${FILESDIR}"/41.3-fix-build-with-meson-0.61.1.patch -) - -src_prepare() { - xdg_src_prepare - # Hack in correct python shebang - sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die -} - -src_configure() { - local emesonargs=( - $(meson_use bluetooth) - -Dextensions_tool=true - -Dextensions_app=true - $(meson_use gtk-doc gtk_doc) - -Dman=true - $(meson_use test tests) - $(meson_use networkmanager) - $(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4 - # (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session) - # suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary - -Dsoup2=true # libslot SLOT needs to match with what libgweather is using - ) - meson_src_configure -} - -src_test() { - gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed - virtx meson_src_test -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update - - if ! has_version 'media-libs/gst-plugins-good:1.0' || \ - ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then - ewarn "To make use of GNOME Shell's built-in screen recording utility," - ewarn "you need to either install media-libs/gst-plugins-good:1.0" - ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" - ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." - fi - - if ! has_version "media-libs/mesa[llvm]"; then - elog "llvmpipe is used as fallback when no 3D acceleration" - elog "is available. You will need to enable llvm USE for" - elog "media-libs/mesa if you do not have hardware 3D setup." - fi - - # https://bugs.gentoo.org/show_bug.cgi?id=563084 - # TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)? - if has_version "x11-drivers/nvidia-drivers[-kms]"; then - ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers," - ewarn "otherwise Gnome will fail to start" - fi -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/gnome-base/gnome-shell/gnome-shell-41.5.ebuild b/gnome-base/gnome-shell/gnome-shell-41.5.ebuild deleted file mode 100644 index 06c3d23b7f72..000000000000 --- a/gnome-base/gnome-shell/gnome-shell-41.5.ebuild +++ /dev/null @@ -1,208 +0,0 @@ -# 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-introspection-1.49.1:= - >=dev-libs/gjs-1.69.2 - >=x11-libs/gtk+-3.15.0:3[introspection] - >=x11-wm/mutter-41.0:0/9[introspection,test?] - >=sys-auth/polkit-0.100[introspection] - >=gnome-base/gsettings-desktop-schemas-41_alpha[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.9:2=[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 - x11-libs/gdk-pixbuf:2[introspection] - dev-libs/libxml2:2 - x11-libs/libX11 - - >=media-sound/pulseaudio-2[glib] - >=dev-libs/atk-2[introspection] - dev-libs/libical:= - >=x11-libs/libXfixes-5.0 - - gui-libs/gtk:4[introspection] - - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_USEDEP}] - ') - media-libs/mesa[X(+)] -" -# Runtime-only deps are probably incomplete and approximate. -# Introspection deps generated from inspection of the output of: -# for i in `rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- |sort -u`; do echo $i ;done |cut -d, -f1 |sort -u -# or -# rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- | sed -e 's:[{}]::g' | awk '{$1=$1; print}' | awk -F',' '{$1=$1;print}' | tr ' ' '\n' | sort -u | sed -e 's/://g' -# These will give a lot of unnecessary things due to greedy matching (TODO), and `(?s).*?` doesn't seem to work as desired. -# Compare with `grep -rhI 'imports.gi.versions' |sort -u` for any SLOT requirements -# Each block: -# 1. Introspection stuff needed via imports.gi (those that build time check may be listed above already) -# 2. gnome-session needed for shutdown/reboot/inhibitors/etc -# 3. Control shell settings -# 4. xdg-utils needed for xdg-open, used by extension tool -# 5. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+) -# 6. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review -# 7. IBus is needed for nls integration -# 8. Optional telepathy chat integration -# 9. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too) -# 10. xdg-desktop-portal-gtk for various integration, e.g. #764632 -# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper -RDEPEND="${DEPEND} - >=sys-apps/accountsservice-0.6.14[introspection] - app-accessibility/at-spi2-core:2[introspection] - app-misc/geoclue[introspection] - media-libs/graphene[introspection] - >=dev-libs/libgweather-3.26:2[introspection] - x11-libs/pango[introspection] - net-libs/libsoup:2.4[introspection] - >=sys-power/upower-0.99:=[introspection] - gnome-base/librsvg:2[introspection] - - >=gnome-base/gnome-session-2.91.91 - >=gnome-base/gnome-settings-daemon-3.8.3 - - x11-misc/xdg-utils - - >=x11-themes/adwaita-icon-theme-3.26 - - networkmanager? ( - net-misc/mobile-broadband-provider-info - sys-libs/timezone-data ) - ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) - telepathy? ( - >=net-im/telepathy-logger-0.2.4[introspection] - >=net-libs/telepathy-glib-0.19[introspection] ) - media-fonts/cantarell - - sys-apps/xdg-desktop-portal-gtk -" -# avoid circular dependency, see bug #546134 -PDEPEND=" - >=gnome-base/gdm-3.5[introspection(+)] - >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] - browser-extension? ( gnome-extra/chrome-gnome-shell ) -" -BDEPEND=" - dev-libs/libxslt - >=dev-util/gdbus-codegen-2.45.3 - dev-util/glib-utils - gtk-doc? ( >=dev-util/gtk-doc-1.17 - app-text/docbook-xml-dtd:4.5 ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" -# These are not needed from tarballs, unless stylesheets or manpage get patched with patchset: -# dev-lang/sassc -# app-text/asciidoc - -PATCHES=( - # Fix automagic gnome-bluetooth dep, bug #398145 - "${FILESDIR}"/40.0-optional-bluetooth.patch - # Change favorites defaults, bug #479918 - "${FILESDIR}"/40.0-defaults.patch - "${FILESDIR}"/41.3-fix-build-with-meson-0.61.1.patch - - # From upstream - "${FILESDIR}"/${PV}-environment-Require-GnomeBluetooth-1.0.patch - "${FILESDIR}"/${PV}-environment-Require-gnome-desktop-3.0.patch - "${FILESDIR}"/${PV}-environment-Require-libgweather-3.0.patch -) - -src_prepare() { - xdg_src_prepare - # Hack in correct python shebang - sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die -} - -src_configure() { - local emesonargs=( - $(meson_use bluetooth) - -Dextensions_tool=true - -Dextensions_app=true - $(meson_use gtk-doc gtk_doc) - -Dman=true - $(meson_use test tests) - $(meson_use networkmanager) - $(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4 - # (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session) - # suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary - -Dsoup2=true # libslot SLOT needs to match with what libgweather is using - ) - meson_src_configure -} - -src_test() { - gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed - virtx meson_src_test -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update - - if ! has_version 'media-libs/gst-plugins-good:1.0' || \ - ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then - ewarn "To make use of GNOME Shell's built-in screen recording utility," - ewarn "you need to either install media-libs/gst-plugins-good:1.0" - ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" - ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." - fi - - if ! has_version "media-libs/mesa[llvm]"; then - elog "llvmpipe is used as fallback when no 3D acceleration" - elog "is available. You will need to enable llvm USE for" - elog "media-libs/mesa if you do not have hardware 3D setup." - fi - - # https://bugs.gentoo.org/show_bug.cgi?id=563084 - # TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)? - if has_version "x11-drivers/nvidia-drivers[-kms]"; then - ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers," - ewarn "otherwise Gnome will fail to start" - fi -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/gnome-base/gnome-shell/gnome-shell-42.0-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-42.0-r1.ebuild deleted file mode 100644 index f7c9320819dd..000000000000 --- a/gnome-base/gnome-shell/gnome-shell-42.0-r1.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# 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-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.100[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 - x11-libs/gdk-pixbuf:2[introspection] - dev-libs/libxml2:2 - x11-libs/libX11 - - >=media-sound/pulseaudio-2[glib] - >=dev-libs/atk-2[introspection] - dev-libs/libical:= - >=x11-libs/libXfixes-5.0 - - gui-libs/gtk:4[introspection] - - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_USEDEP}] - ') - media-libs/mesa[X(+)] -" -# Runtime-only deps are probably incomplete and approximate. -# Introspection deps generated from inspection of the output of: -# for i in `rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- |sort -u`; do echo $i ;done |cut -d, -f1 |sort -u -# or -# rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- | sed -e 's:[{}]::g' | awk '{$1=$1; print}' | awk -F',' '{$1=$1;print}' | tr ' ' '\n' | sort -u | sed -e 's/://g' -# These will give a lot of unnecessary things due to greedy matching (TODO), and `(?s).*?` doesn't seem to work as desired. -# Compare with `grep -rhI 'imports.gi.versions' |sort -u` for any SLOT requirements -# Each block: -# 1. Introspection stuff needed via imports.gi (those that build time check may be listed above already) -# 2. gnome-session needed for shutdown/reboot/inhibitors/etc -# 3. Control shell settings -# 4. xdg-utils needed for xdg-open, used by extension tool -# 5. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+) -# 6. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review -# 7. IBus is needed for nls integration -# 8. Optional telepathy chat integration -# 9. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too) -# 10. xdg-desktop-portal-gtk for various integration, e.g. #764632 -# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper -RDEPEND="${DEPEND} - >=sys-apps/accountsservice-0.6.14[introspection] - app-accessibility/at-spi2-core:2[introspection] - app-misc/geoclue[introspection] - media-libs/graphene[introspection] - >=dev-libs/libgweather-4.0.0:4[introspection] - x11-libs/pango[introspection] - net-libs/libsoup:2.4[introspection] - >=sys-power/upower-0.99:=[introspection] - gnome-base/librsvg:2[introspection] - - >=gnome-base/gnome-session-2.91.91 - >=gnome-base/gnome-settings-daemon-3.8.3 - - x11-misc/xdg-utils - - >=x11-themes/adwaita-icon-theme-3.26 - - networkmanager? ( - net-misc/mobile-broadband-provider-info - sys-libs/timezone-data ) - ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] ) - telepathy? ( - >=net-im/telepathy-logger-0.2.4[introspection] - >=net-libs/telepathy-glib-0.19[introspection] ) - media-fonts/cantarell - - sys-apps/xdg-desktop-portal-gtk -" -# avoid circular dependency, see bug #546134 -PDEPEND=" - >=gnome-base/gdm-3.5[introspection(+)] - >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] - browser-extension? ( gnome-extra/chrome-gnome-shell ) -" -BDEPEND=" - dev-libs/libxslt - >=dev-util/gdbus-codegen-2.45.3 - dev-util/glib-utils - gtk-doc? ( >=dev-util/gtk-doc-1.17 - app-text/docbook-xml-dtd:4.5 ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" -# These are not needed from tarballs, unless stylesheets or manpage get patched with patchset: -# dev-lang/sassc -# app-text/asciidoc - -PATCHES=( - # Fix automagic gnome-bluetooth dep, bug #398145 - "${FILESDIR}"/42.0-optional-bluetooth.patch - # Change favorites defaults, bug #479918 - "${FILESDIR}"/40.0-defaults.patch -) - -src_prepare() { - xdg_src_prepare - # Hack in correct python shebang - sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die -} - -src_configure() { - local emesonargs=( - $(meson_use bluetooth) - -Dextensions_tool=true - -Dextensions_app=true - $(meson_use gtk-doc gtk_doc) - -Dman=true - $(meson_use test tests) - $(meson_use networkmanager) - $(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4 - # (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session) - # suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary - -Dsoup2=true # libslot SLOT needs to match with what libgweather is using - ) - meson_src_configure -} - -src_test() { - gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed - virtx meson_src_test -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update - - if ! has_version 'media-libs/gst-plugins-good:1.0' || \ - ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then - ewarn "To make use of GNOME Shell's built-in screen recording utility," - ewarn "you need to either install media-libs/gst-plugins-good:1.0" - ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" - ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." - fi - - if ! has_version "media-libs/mesa[llvm]"; then - elog "llvmpipe is used as fallback when no 3D acceleration" - elog "is available. You will need to enable llvm USE for" - elog "media-libs/mesa if you do not have hardware 3D setup." - fi - - # https://bugs.gentoo.org/show_bug.cgi?id=563084 - # TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)? - if has_version "x11-drivers/nvidia-drivers[-kms]"; then - ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers," - ewarn "otherwise Gnome will fail to start" - fi -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} 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 000000000000..5cee4f6b828c --- /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 + x11-libs/gdk-pixbuf:2[introspection] + dev-libs/libxml2:2 + x11-libs/libX11 + + >=media-sound/pulseaudio-2[glib] + >=dev-libs/atk-2[introspection] + dev-libs/libical:= + >=x11-libs/libXfixes-5.0 + + gui-libs/gtk:4[introspection] + + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') + media-libs/mesa[X(+)] +" +# Runtime-only deps are probably incomplete and approximate. +# Introspection deps generated from inspection of the output of: +# for i in `rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- |sort -u`; do echo $i ;done |cut -d, -f1 |sort -u +# or +# rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- | sed -e 's:[{}]::g' | awk '{$1=$1; print}' | awk -F',' '{$1=$1;print}' | tr ' ' '\n' | sort -u | sed -e 's/://g' +# These will give a lot of unnecessary things due to greedy matching (TODO), and `(?s).*?` doesn't seem to work as desired. +# Compare with `grep -rhI 'imports.gi.versions' |sort -u` for any SLOT requirements +# Each block: +# 1. Introspection stuff needed via imports.gi (those that build time check may be listed above already) +# 2. gnome-session needed for shutdown/reboot/inhibitors/etc +# 3. Control shell settings +# 4. xdg-utils needed for xdg-open, used by extension tool +# 5. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+) +# 6. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review +# 7. IBus is needed for nls integration +# 8. Optional telepathy chat integration +# 9. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too) +# 10. xdg-desktop-portal-gtk for various integration, e.g. #764632 +# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper +RDEPEND="${DEPEND} + >=sys-apps/accountsservice-0.6.14[introspection] + app-accessibility/at-spi2-core:2[introspection] + app-misc/geoclue[introspection] + media-libs/graphene[introspection] + >=dev-libs/libgweather-4.0.0:4[introspection] + x11-libs/pango[introspection] + net-libs/libsoup:2.4[introspection] + >=sys-power/upower-0.99:=[introspection] + gnome-base/librsvg:2[introspection] + + >=gnome-base/gnome-session-2.91.91 + >=gnome-base/gnome-settings-daemon-3.8.3 + + x11-misc/xdg-utils + + >=x11-themes/adwaita-icon-theme-3.26 + + networkmanager? ( + net-misc/mobile-broadband-provider-info + sys-libs/timezone-data ) + ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] ) + telepathy? ( + >=net-im/telepathy-logger-0.2.4[introspection] + >=net-libs/telepathy-glib-0.19[introspection] ) + media-fonts/cantarell + + || ( sys-apps/xdg-desktop-portal-gnome # FIXME: diff --git a/gnome-base/gnome-shell/gnome-shell-42.2.ebuild b/gnome-base/gnome-shell/gnome-shell-42.2.ebuild new file mode 100644 index 000000000000..fb0f8f85b1d5 --- /dev/null +++ b/gnome-base/gnome-shell/gnome-shell-42.2.ebuild @@ -0,0 +1,203 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{8..11} ) + +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 + x11-libs/gdk-pixbuf:2[introspection] + dev-libs/libxml2:2 + x11-libs/libX11 + + >=media-sound/pulseaudio-2[glib] + >=dev-libs/atk-2[introspection] + dev-libs/libical:= + >=x11-libs/libXfixes-5.0 + + gui-libs/gtk:4[introspection] + + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') + media-libs/mesa[X(+)] +" +# Runtime-only deps are probably incomplete and approximate. +# Introspection deps generated from inspection of the output of: +# for i in `rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- |sort -u`; do echo $i ;done |cut -d, -f1 |sort -u +# or +# rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- | sed -e 's:[{}]::g' | awk '{$1=$1; print}' | awk -F',' '{$1=$1;print}' | tr ' ' '\n' | sort -u | sed -e 's/://g' +# These will give a lot of unnecessary things due to greedy matching (TODO), and `(?s).*?` doesn't seem to work as desired. +# Compare with `grep -rhI 'imports.gi.versions' |sort -u` for any SLOT requirements +# Each block: +# 1. Introspection stuff needed via imports.gi (those that build time check may be listed above already) +# 2. gnome-session needed for shutdown/reboot/inhibitors/etc +# 3. Control shell settings +# 4. xdg-utils needed for xdg-open, used by extension tool +# 5. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+) +# 6. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review +# 7. IBus is needed for nls integration +# 8. Optional telepathy chat integration +# 9. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too) +# 10. xdg-desktop-portal-gtk for various integration, e.g. #764632 +# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper +RDEPEND="${DEPEND} + >=sys-apps/accountsservice-0.6.14[introspection] + app-accessibility/at-spi2-core:2[introspection] + app-misc/geoclue[introspection] + media-libs/graphene[introspection] + >=dev-libs/libgweather-4.0.0:4[introspection] + x11-libs/pango[introspection] + net-libs/libsoup:2.4[introspection] + >=sys-power/upower-0.99:=[introspection] + gnome-base/librsvg:2[introspection] + + >=gnome-base/gnome-session-2.91.91 + >=gnome-base/gnome-settings-daemon-3.8.3 + + x11-misc/xdg-utils + + >=x11-themes/adwaita-icon-theme-3.26 + + networkmanager? ( + net-misc/mobile-broadband-provider-info + sys-libs/timezone-data ) + ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] ) + telepathy? ( + >=net-im/telepathy-logger-0.2.4[introspection] + >=net-libs/telepathy-glib-0.19[introspection] ) + media-fonts/cantarell + + || ( sys-apps/xdg-desktop-portal-gnome