diff options
Diffstat (limited to 'gnome-base')
18 files changed, 1 insertions, 1224 deletions
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz Binary files differindex a0338a871079..5a13eab4f7aa 100644 --- a/gnome-base/Manifest.gz +++ b/gnome-base/Manifest.gz diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest index 85ee95ee71c2..1027b54334e4 100644 --- a/gnome-base/gnome-desktop/Manifest +++ b/gnome-base/gnome-desktop/Manifest @@ -1,8 +1,4 @@ -AUX 42.0-meson-Add-optionality-for-introspection.patch 3275 BLAKE2B f3629eab79b830397646ea855991daf5d61a9bb992262deb452e32a19e1564be20f98dfa49f8b08f6ca6a36b69fe44e46bee16b23533a27d089b77e2ae524a07 SHA512 9982e691e080dfa03c5ee6038b9a3a0e47521272240082d0da1ebf00c75f958d60c5d764ebae580415489e39b18ee77bb0c99587d32b4575ae0495fc88793c83 -DIST gnome-desktop-42.4.tar.xz 743212 BLAKE2B d0e5ce93aa476b2e2c4252480fb315ce8c1802622857c7fb0af90804a621c3c358772b70957f902941b0fd75c58aa575e36ee7d960ade1409caa1f06df9e958d SHA512 6e2648aee7e7b7800276ba1f6b32a0918f6dfbd35a60a5fd22239efe75b3bd4cbed14458ab2d1b0ad0ad295428feae5342a64f2cf83505196eccb17720a26756 DIST gnome-desktop-43.tar.xz 764256 BLAKE2B 68e13477034bb16d1c8dbe22ae940bb6711c53f93230b93ac4b6be3e61a1b60f223c9177ab004d6cd0876feecb1a71d922779f9901f914359e7aac1650a55363 SHA512 01244bf397d8ef4d9424ef9289789efde148c38f4588fe3a9094cbdd4612c56fbbff079182d6c85083462d2f3ae9771e463c5cb86995a1aef29b2f5cfd023713 -EBUILD gnome-desktop-42.4-r300.ebuild 1934 BLAKE2B 6920f1ce50aa1edd89676b5be034d01c8d71df6e687dddea1db296064ab63549448ebde729705710ea0a17756855261efbd5c0ee07e733e2c2181d3ba4693b7e SHA512 d16202197817d69c3280f703f287218c8af3e16ecb05a2e165a5018258009a61dfb723c6994272ee2ac67c7220f7584ec176be33d1938a589de062d283eef2d1 -EBUILD gnome-desktop-42.4-r400.ebuild 1749 BLAKE2B a38edb5e5388c49417f1e117867de92bdd17bdd9ff088156561c966f195a335a029e719366414ddfc7b7b9b3a8d36d07f17ffea68119511bdaad06e33b2a2969 SHA512 d0c864187121ea620fbfed9492537476527885a54e8c7b03a6fd024bb50919c6747bb262e402e9466a7835523043c68d3a837216842ec4f0f7b7ad26ae9bb3d3 EBUILD gnome-desktop-43-r301.ebuild 1785 BLAKE2B 7f51caed130f4ca53a2ca9bce3b9442c281b021aee8e33b921c74d6c59b428555f6e06418cc41bcb9f88ea633728b795619430d13b6acdc65d589f45385d18fb SHA512 e4c56fbee4d4c6b32c35148291b48404d25247db10153c0d2f237c8880df85f9b94feb66db99b3986deda1af48f9adfe84a2f0836a6d5231a32f3bca4ccccc92 EBUILD gnome-desktop-43-r400.ebuild 1712 BLAKE2B e3c486930c1af903d011b09a7568b06eded3f35fd033d4a45cf77906714935653eb50129863f033c633390ccdddccdf9f74571d242144248d897aab80ba5d746 SHA512 c20db4dd5f8a31e6c97976a3f5058aae9c4412442a08b3af7ae5c60bba565785db614ca87741aa5ba010594d52fd605db7a49ae87d6a947b663c29196dee6a7c MISC metadata.xml 354 BLAKE2B 18259186f2894236db115d9b1bd16b94d6b9edfe189133039c6ad5bc9729c6e9292539ec385d2d957b8905b50d59db7ccddb50c37bdbc9722a7851b14038e035 SHA512 b4c5c0643dc3168dd0b6345687a6c85f4526a1cba2664e8ee7d2eb15b251a7d388e6f4f4669ed8da00566d262d31815ecbd157b9f560b14e151dc9da346fb714 diff --git a/gnome-base/gnome-desktop/files/42.0-meson-Add-optionality-for-introspection.patch b/gnome-base/gnome-desktop/files/42.0-meson-Add-optionality-for-introspection.patch deleted file mode 100644 index f697be9db1fa..000000000000 --- a/gnome-base/gnome-desktop/files/42.0-meson-Add-optionality-for-introspection.patch +++ /dev/null @@ -1,96 +0,0 @@ -https://gitlab.gnome.org/GNOME/gnome-desktop/-/merge_requests/139 - -From 94b253000f081423a3c813d340ed486fc170768d Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Wed, 18 Sep 2019 22:28:21 +0300 -Subject: [PATCH 2/2] meson: Add optionality for introspection - ---- - libgnome-desktop/meson.build | 48 +++++++++++++++++++----------------- - meson_options.txt | 4 +++ - 2 files changed, 30 insertions(+), 22 deletions(-) - -diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build -index a0fb11f8..375cf57c 100644 ---- a/libgnome-desktop/meson.build -+++ b/libgnome-desktop/meson.build -@@ -125,17 +125,19 @@ if get_option('build_gtk4') - ], - ) - -- libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base, -- sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources], -- export_packages: 'gnome-desktop-4', -- namespace: 'GnomeDesktop', -- nsversion: '4.0', -- includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'], -- extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], -- identifier_prefix: 'Gnome', -- symbol_prefix: 'gnome', -- install: true, -- ) -+ if get_option('introspection') -+ libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base, -+ sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources], -+ export_packages: 'gnome-desktop-4', -+ namespace: 'GnomeDesktop', -+ nsversion: '4.0', -+ includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'], -+ extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], -+ identifier_prefix: 'Gnome', -+ symbol_prefix: 'gnome', -+ install: true, -+ ) -+ endif - - pkg.generate( - libgnome_desktop_base, -@@ -255,17 +257,19 @@ if get_option('legacy_library') - ], - ) - -- gnome.generate_gir(libgnome_desktop, -- sources: introspection_sources + libgnome_desktop_headers, -- export_packages: 'gnome-desktop-3.0', -- namespace: 'GnomeDesktop', -- nsversion: '3.0', -- includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'], -- extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], -- identifier_prefix: 'Gnome', -- symbol_prefix: 'gnome', -- install: true -- ) -+ if get_option('introspection') -+ gnome.generate_gir(libgnome_desktop, -+ sources: introspection_sources + libgnome_desktop_headers, -+ export_packages: 'gnome-desktop-3.0', -+ namespace: 'GnomeDesktop', -+ nsversion: '3.0', -+ includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'], -+ extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], -+ identifier_prefix: 'Gnome', -+ symbol_prefix: 'gnome', -+ install: true -+ ) -+ endif - - pkg.generate( - libraries: libgnome_desktop, -diff --git a/meson_options.txt b/meson_options.txt -index e17e7330..c4db6eaf 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -17,6 +17,10 @@ option('debug_tools', - type: 'boolean', value: true, description: 'Build debug tools' - ) - -+option('introspection', -+ type: 'boolean', value: true, description: 'Whether to build introspection files' -+) -+ - option('udev', - type: 'feature', description: 'Udev support' - ) --- -2.34.1 - diff --git a/gnome-base/gnome-desktop/gnome-desktop-42.4-r300.ebuild b/gnome-base/gnome-desktop/gnome-desktop-42.4-r300.ebuild deleted file mode 100644 index 213db2dcf6c5..000000000000 --- a/gnome-base/gnome-desktop/gnome-desktop-42.4-r300.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit gnome.org meson xdg - -DESCRIPTION="Library with common API for various GNOME modules" -HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/" - -LICENSE="GPL-2+ LGPL-2+ FDL-1.1+" -SLOT="3/19" # subslot = libgnome-desktop-3 soname version -IUSE="debug +introspection seccomp systemd udev" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" - -COMMON_DEPEND=" - >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] - >=x11-libs/gtk+-3.3.6:3[introspection?] - >=dev-libs/glib-2.53.0:2 - >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?] - x11-misc/xkeyboard-config - x11-libs/libxkbcommon - app-text/iso-codes - systemd? ( sys-apps/systemd:= ) - udev? ( virtual/libudev:= ) - seccomp? ( sys-libs/libseccomp ) - - x11-libs/cairo:= - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) -" -DEPEND="${COMMON_DEPEND} - media-libs/fontconfig -" -RDEPEND="${COMMON_DEPEND} - seccomp? ( sys-apps/bubblewrap ) -" -BDEPEND=" - app-text/docbook-xml-dtd:4.1.2 - dev-util/gdbus-codegen - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/42.0-meson-Add-optionality-for-introspection.patch -) - -src_prepare() { - default - xdg_environment_reset - - # Don't build manual test programs that will never get run - sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die -} - -src_configure() { - local emesonargs=( - -Dgnome_distributor=Gentoo - -Ddate_in_gnome_version=true - -Ddesktop_docs=false - $(meson_use debug debug_tools) - $(meson_use introspection) - $(meson_feature udev) - $(meson_feature systemd) - -Dgtk_doc=false - -Dinstalled_tests=false - -Dbuild_gtk4=false - -Dlegacy_library=true - ) - meson_src_configure -} - -src_install() { - meson_src_install - - rm -r \ - "${ED}"/usr/share/gnome/gnome-version.xml \ - "${ED}"/usr/share/locale \ - || die -} diff --git a/gnome-base/gnome-desktop/gnome-desktop-42.4-r400.ebuild b/gnome-base/gnome-desktop/gnome-desktop-42.4-r400.ebuild deleted file mode 100644 index ec390679df10..000000000000 --- a/gnome-base/gnome-desktop/gnome-desktop-42.4-r400.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit gnome.org meson xdg - -DESCRIPTION="Library with common API for various GNOME modules" -HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/" - -LICENSE="GPL-2+ LGPL-2+ FDL-1.1+" -SLOT="4/1" # subslot = libgnome-desktop-4 soname version -IUSE="debug gtk-doc seccomp systemd udev" -KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" - -COMMON_DEPEND=" - >=x11-libs/gdk-pixbuf-2.36.5:2[introspection] - >=gui-libs/gtk-4.4.0:4[introspection] - >=dev-libs/glib-2.53.0:2 - >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection] - x11-misc/xkeyboard-config - x11-libs/libxkbcommon - app-text/iso-codes - systemd? ( sys-apps/systemd:= ) - udev? ( virtual/libudev:= ) - seccomp? ( sys-libs/libseccomp ) - - x11-libs/cairo:= - >=dev-libs/gobject-introspection-1.54:= -" -DEPEND="${COMMON_DEPEND} - media-libs/fontconfig -" -RDEPEND="${COMMON_DEPEND} - seccomp? ( sys-apps/bubblewrap ) - !<gnome-base/gnome-desktop-${PV}:3 -" -BDEPEND=" - app-text/docbook-xml-dtd:4.1.2 - dev-util/gdbus-codegen - gtk-doc? ( >=dev-util/gtk-doc-1.14 ) - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -src_prepare() { - default - xdg_environment_reset - - # Don't build manual test programs that will never get run - sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die -} - -src_configure() { - local emesonargs=( - -Dgnome_distributor=Gentoo - -Ddate_in_gnome_version=true - -Ddesktop_docs=true - $(meson_use debug debug_tools) - $(meson_feature udev) - $(meson_feature systemd) - $(meson_use gtk-doc gtk_doc) - -Dinstalled_tests=false - -Dbuild_gtk4=true - -Dlegacy_library=false - ) - meson_src_configure -} diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest index c3da10ca5cf7..ebc4cfedff50 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -1,9 +1,6 @@ AUX 42.1-build-Make-wacom-optional-and-controllable-via-meson.patch 1759 BLAKE2B e734dfb341143f3f246d268ff479a528fa09d6c5e496611e06e4ffea914098349eab2b2c5a4a55e8b47e5032b68bf6b929b76a1aa899402953cdcc1d3cf0589e SHA512 faffde0cd940ac6a8dabdab09ea38bd126e11822e75df5adf1a0bb3b055135a8c52abbb6ecb4d71476899ec0c5d8a78ba0075cb84cfebafe6c3aa5310dfca308 -AUX gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch 4505 BLAKE2B a61199b8da339dbe9bbe7e8941a56958f5a69fafeb95c6f7027c483e35b193854560ad12f2df45dd8374db1abcefd9bfb8dae5b5381be3215755f907a73726ec SHA512 468a73b69f441886d1ce5e0e5f263ea695170a3610f6124100e3eaed1d8dd62c3439193461620d6f8b18c81d2066163ff2c1839194ebcfeec424868163f46997 AUX gnome-settings-daemon-3.38.1-build-Allow-NM-optional-on-Linux.patch 694 BLAKE2B e4f32a376c2b1c55a396504e98c8a69d512bb9161a854482aa877023a2761e59d3fc682d724398ffb53bc138b010c33276071359d42ac19bcac2d9af87d42eef SHA512 618ad312b54709d0f95e5d881c2896c156246ae41eee1925f76b0a398b7ce6815a7466f8587f2291b07f7a34d1a3e1afb7df33823d9b52ebe8ad46a3f5f1e84d AUX org.gnome.settings-daemon.plugins.power.gschema.override 75 BLAKE2B 1c80bbb15e998de9f5fddc956dab862552ecc3734083391f124ef577dd2efb70e29efd230511cca83536dcd8c32118ecebcfe52b2927d6f0094540ec73a6ae23 SHA512 9c4b1e1b63b1a6d97eed962969704accca2fc53763a4b7806e2a3e4ff49ecc7d4a0d7f8253ff2e33d83e766908d852721ffa33f363aed7d04c20002bfdee173b -DIST gnome-settings-daemon-42.2.tar.xz 1483864 BLAKE2B c2051f129e66df8ca55eb72b0c3a037275c89d3c519fe01822aa4ad2309af9a27e840f4f797a8ecac8e0767d8e7894ffe9c5942840b0ca57536325e3cbe12617 SHA512 66f1e766a7d1c36d4609c9505ba5d99516505ecfc5123483a3cbc6189d21cce23abf26da067bf9c05c3c25bc96d4568a8b07477f0722b0cb9442085f6d886e5c DIST gnome-settings-daemon-43.0.tar.xz 1453808 BLAKE2B 365a1fe4d253e84b9fc355331688951e1428eaee421afbe052a16226c7006a420f28134b5fa02929bbb1d4250af243b02594444a4bdd208e5c41ed9e63e5f979 SHA512 8cc3ed73fa66d2cf72621db78be68e4fe01f292ab3987aff8cc67a1c67d910622e306c2d3e69a8dca5ac6517c8e57883faf02aec871c7aa1f1348d13ff1900a3 -EBUILD gnome-settings-daemon-42.2-r4.ebuild 3719 BLAKE2B 4662c0b1bbbf16de1e2eda9b79508020af0dca49498c2aa26ba23ca70e94578af349af41b7e73b7fde2a67839ac53b96c876b2224578013be464879df4a65133 SHA512 e4f09bf4043ce51d712a4d9883cf4e2bb8b84162c83367f705623eed209cd6292b9db3bbf7ad330a1bb0e0cef40d19578ecc82b0250721f7f25b10bb841ead86 EBUILD gnome-settings-daemon-43.0.ebuild 3541 BLAKE2B 485f9c2d6127a221d7cc2426a94dd58101b78129ce5dc7df583c29c9951838629cbbfb38876fef39ec786b54c2e998a40915c688d18e67770c7618267c42afb0 SHA512 eac98da5025105cffa80ac31345a4ed7cd9bd1b57556133dbde93e8b010c825fe65a570784c2a35e9aab0836dfd70636f2c88b9067a4a6c35611bbf4e59e51c9 MISC metadata.xml 663 BLAKE2B 27a0e4135576aeea4c6b962c90d894df06f92b3b015fab78246724ce7ca2f985cfde730f1f9c91f0cc01733f274c0225816e24fac2fca40c585b1a8667fd7d4d SHA512 e21c9dc181f13228662a2a91d7d8e0fedc6270f818a79308e270c9de788011379c155e835534ebb5dbd5f3b07a9e83ec618d9d85f81f46784007b380c6a7ef18 diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch deleted file mode 100644 index 658f4a3f48ee..000000000000 --- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 6a44d3a6741da48d769353023c8801d41c969663 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Sun, 12 Jul 2020 16:30:59 +0300 -Subject: [PATCH 3/3] Allow udev optional on Linux - ---- - meson.build | 4 ---- - plugins/power/gsd-backlight.c | 14 +++++++------- - plugins/power/meson.build | 6 +++--- - 3 files changed, 10 insertions(+), 14 deletions(-) - -diff --git a/meson.build b/meson.build -index 21d9341d..0a527513 100644 ---- a/meson.build -+++ b/meson.build -@@ -138,9 +138,6 @@ if enable_gudev - gudev_dep = dependency('gudev-1.0') - endif - config_h.set10('HAVE_GUDEV', enable_gudev) --if host_is_linux -- assert(enable_gudev, 'GUdev is not optional on Linux platforms') --endif - - # Check for colord - enable_colord = get_option('colord') -@@ -203,7 +200,6 @@ endif - - # Rfkill - enable_rfkill = get_option('rfkill') --assert(enable_rfkill or not host_is_linux, 'rfkill is not optional on Linux platforms') - if enable_rfkill - assert(cc.has_header('linux/rfkill.h'), 'rfkill support requested but RFKill headers not found') - assert(enable_gudev, 'GUdev is required for rfkill support') -diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c -index ca5f2723..f58f5343 100644 ---- a/plugins/power/gsd-backlight.c -+++ b/plugins/power/gsd-backlight.c -@@ -25,7 +25,7 @@ - #include "gsd-power-constants.h" - #include "gsd-power-manager.h" - --#ifdef __linux__ -+#if defined(__linux__) && defined(HAVE_GUDEV) - #include <gudev/gudev.h> - #endif /* __linux__ */ - -@@ -39,7 +39,7 @@ struct _GsdBacklight - gint brightness_target; - gint brightness_step; - --#ifdef __linux__ -+#if defined(__linux__) && defined(HAVE_GUDEV) - GDBusProxy *logind_proxy; - - GUdevClient *udev; -@@ -77,7 +77,7 @@ G_DEFINE_TYPE_EXTENDED (GsdBacklight, gsd_backlight, G_TYPE_OBJECT, 0, - G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, - gsd_backlight_initable_iface_init);) - --#ifdef __linux__ -+#if defined(__linux__) && defined(HAVE_GUDEV) - static GUdevDevice* - gsd_backlight_udev_get_type (GList *devices, const gchar *type) - { -@@ -478,7 +478,7 @@ gsd_backlight_set_brightness_val_async (GsdBacklight *backlight, - - task = g_task_new (backlight, cancellable, callback, user_data); - --#ifdef __linux__ -+#if defined(__linux__) && defined(HAVE_GUDEV) - if (backlight->udev_device != NULL) { - BacklightHelperData *task_data; - -@@ -831,7 +831,7 @@ gsd_backlight_initable_init (GInitable *initable, - return FALSE; - } - --#ifdef __linux__ -+#if defined(__linux__) && defined(HAVE_GUDEV) - backlight->logind_proxy = - g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, - 0, -@@ -908,7 +908,7 @@ gsd_backlight_finalize (GObject *object) - { - GsdBacklight *backlight = GSD_BACKLIGHT (object); - --#ifdef __linux__ -+#if defined(__linux__) && defined(HAVE_GUDEV) - g_assert (backlight->active_task == NULL); - g_assert (g_queue_is_empty (&backlight->tasks)); - g_clear_object (&backlight->logind_proxy); -@@ -961,7 +961,7 @@ gsd_backlight_init (GsdBacklight *backlight) - backlight->brightness_val = -1; - backlight->brightness_step = 1; - --#ifdef __linux__ -+#if defined(__linux__) && defined(HAVE_GUDEV) - backlight->active_task = NULL; - g_queue_init (&backlight->tasks); - #endif /* __linux__ */ -diff --git a/plugins/power/meson.build b/plugins/power/meson.build -index 69e619f2..6c6ea939 100644 ---- a/plugins/power/meson.build -+++ b/plugins/power/meson.build -@@ -24,7 +24,7 @@ native_deps = [ - dependency('gio-2.0', native:true) - ] - --if host_is_linux -+if host_is_linux and enable_gudev - deps += gudev_dep - endif - -@@ -66,7 +66,7 @@ gsd_power_enums_update = executable( - native: true - ) - --if host_is_linux -+if host_is_linux and enable_gudev - policy = 'org.gnome.settings-daemon.plugins.power.policy' - - policy_in = configure_file( -@@ -130,7 +130,7 @@ envs.set('BUILDDIR', meson.current_build_dir()) - envs.set('TOP_BUILDDIR', meson.build_root()) - envs.set('LD_PRELOAD', 'libumockdev-preload.so.0') - envs.set('NO_AT_BRIDGE', '1') --envs.set('HAVE_SYSFS_BACKLIGHT', host_is_linux ? '1' : '0') -+envs.set('HAVE_SYSFS_BACKLIGHT', (host_is_linux and enable_gudev) ? '1' : '0') - - if get_option('b_sanitize').split(',').contains('address') - # libasan needs to be loaded first; so we need to explicitly preload it --- -2.26.2 - diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.2-r4.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.2-r4.ebuild deleted file mode 100644 index 3669dd83b3bc..000000000000 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.2-r4.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# 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 python-any-r1 meson udev virtualx xdg - -DESCRIPTION="Gnome Settings Daemon" -HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-settings-daemon" - -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" -IUSE="+colord +cups debug elogind input_devices_wacom modemmanager networkmanager smartcard systemd test +udev wayland" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - ^^ ( elogind systemd ) - input_devices_wacom? ( udev ) - wayland? ( udev ) -" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" - -# <libgweather-4.2.0 because of libsoup:3 transition -DEPEND=" - >=sci-geosciences/geocode-glib-3.10:0 - >=dev-libs/glib-2.58:2 - >=gnome-base/gnome-desktop-3.37.1:3= - >=gnome-base/gsettings-desktop-schemas-42 - >=x11-libs/gtk+-3.15.3:3[X,wayland?] - >=dev-libs/libgweather-4.0.0:4= - <dev-libs/libgweather-4.2.0:4= - colord? ( - >=x11-misc/colord-1.4.5:= - >=media-libs/lcms-2.2:2 - ) - media-libs/libcanberra[gtk3] - >=app-misc/geoclue-2.3.1:2.0 - >=x11-libs/libnotify-0.7.3 - >=media-sound/pulseaudio-12.99.3[glib] - >=sys-auth/polkit-0.114 - >=sys-power/upower-0.99.12:= - x11-libs/libX11 - >=x11-libs/libXfixes-6.0.0 - udev? ( dev-libs/libgudev:= ) - wayland? ( dev-libs/wayland ) - input_devices_wacom? ( - >=dev-libs/libwacom-0.7:= - >=x11-libs/pango-1.20.0 - x11-libs/gdk-pixbuf:2 - ) - smartcard? ( >=dev-libs/nss-3.11.2 ) - cups? ( >=net-print/cups-1.4[dbus] ) - modemmanager? ( - >=app-crypt/gcr-3.7.5:0= - >=net-misc/modemmanager-1.0:= - ) - networkmanager? ( >=net-misc/networkmanager-1.0 ) - media-libs/alsa-lib - x11-libs/libXi - x11-libs/libXext - media-libs/fontconfig - systemd? ( - >=sys-apps/systemd-243 - ) -" -# logind needed for power and session management, bug #464944 -RDEPEND="${DEPEND} - gnome-base/dconf - elogind? ( sys-auth/elogind ) -" -# rfkill requires linux/rfkill.h (and USE=udev), thus linux-headers dep, not os-headers. If this package wants to work on other kernels, we need to make rfkill conditional instead -BDEPEND=" - sys-kernel/linux-headers - dev-util/glib-utils - dev-util/gdbus-codegen - x11-base/xorg-proto - ${PYTHON_DEPS} - test? ( - $(python_gen_any_dep ' - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/python-dbusmock[${PYTHON_USEDEP}] - ') - gnome-base/gnome-session - ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch - "${FILESDIR}"/${PN}-3.38.1-build-Allow-NM-optional-on-Linux.patch - "${FILESDIR}"/${PN}-3.38.1-Allow-udev-optional-on-Linux.patch -) - -python_check_deps() { - if use test; then - python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" \ - "dev-python/python-dbusmock[${PYTHON_USEDEP}]" - fi -} - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_configure() { - local emesonargs=( - #-Dnssdb_dir # TODO: Is the default /etc/pki/nssdb path correct for our nss? - -Dudev_dir="$(get_udevdir)" - $(meson_use systemd) - -Dalsa=true - $(meson_use udev gudev) - $(meson_use colord) - $(meson_use cups) - $(meson_use networkmanager network_manager) - $(meson_use udev rfkill) - $(meson_use smartcard) - $(meson_use input_devices_wacom wacom) - $(meson_use wayland) - $(meson_use modemmanager wwan) - ) - meson_src_configure -} - -src_install() { - meson_src_install - # Don't auto-suspend by default on AC power - insinto /usr/share/glib-2.0/schemas - doins "${FILESDIR}"/org.gnome.settings-daemon.plugins.power.gschema.override -} - -src_test() { - virtx meson_src_test -} - -pkg_postinst() { - udev_reload - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - udev_reload - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest index fe2b51aab7d1..9baab3d30c2e 100644 --- a/gnome-base/gnome-shell/Manifest +++ b/gnome-base/gnome-shell/Manifest @@ -1,9 +1,4 @@ AUX 40.0-defaults.patch 1412 BLAKE2B e36f7215cf756586479b8bdc71339beb3bbde53ca9745ddc4ef1c3feb59c720e4920e8aa4aadd7912874c386e7495a4b5d554e0d0616db17a81c4ec52a2baa6b SHA512 d82cf1e329d5974755738e29e6366bb10452620021a5db6c2ec63c4ee38e87a65dada34d57026e9510dbffa78c7060ae6f2ccec1739e3026bb0c67dab95f94a9 -AUX 42.0-optional-bluetooth.patch 2032 BLAKE2B 635ba18f5bb5ca0c9f44fe11c2b52652355e1de4647c277524e3f19ef6d57870e75f32b8a2be10eb4e3be4ecf885765b8f0899ab71906f71324795763effa23a SHA512 5fb17c6ffd0486e43b5451747b346e5e9feb3f918f4ef23adc517c43bf61eb5b8850b03022e84848e446de1f0b2145a9dd2b954dde9994e9da176559cd6e48a8 -DIST gnome-shell-42.5.tar.xz 1930668 BLAKE2B 0442ef92588e9891082c024d1e3b4ddb105a01ef5b7913ac8f1d2cac1af1c2ae8efd18184c511c554e41d8c0540c8712b7ef39ba1a9cac8c6c9336bb7b4cb320 SHA512 575559b99161b7045b04fc100cde719bbca83d90f78b673acc2189f3bb5104fd14f40da7d19611b154976f1c006e0dc2ff8cc124dc816da765c933fdda0624d9 -DIST gnome-shell-43.1.tar.xz 1947824 BLAKE2B d03bf5e970a92762724e5e1ab534e610f73b1c4af48b42fd676304f0d75808fcf5ba21ab9b9a0503cc2a806b826340d7d441da4b3ce51b881ffd4cb08132ae86 SHA512 1e41f0ce38b285aca1f9189fdb50e4d409232554da73e9c08e21b5888d35bad3e2bf4a47e93fdf20798ea6f63864223088b78cab7c63fc1105cd955701ea2e81 DIST gnome-shell-43.2.tar.xz 1946776 BLAKE2B 0b581ed84bb3b8804cb4b5be07ae6be479f1092abf4c018d140edc81dcf0f88dc6c3321f591bc55c16e2141b4dd59e353c1f244749de13e4571a5b5aba6ad57d SHA512 f25754b60696723db3db4141eb14fda88f5d913cc8a9d7270a34b9a1493f9bd4caadf45b142fd0bd82f594d9fb47980c3b0242bb58ee184a61968f0d1f09bfc4 -EBUILD gnome-shell-42.5-r2.ebuild 7512 BLAKE2B 38c7c58e13fb94ed45205192c6da4b6f98c0bd9bd7f0b3e05cf873904e3560b5018885fdfc84f0c799a92fcc5d2314c07f1797a4dce02b29e72883eee5ac40ef SHA512 a27b74b05f7a9540eecf73fce261fd0434c8d86a321a7d53db7b11c496892b7be55f671e2d2edfacec25c8638308bc74f264e45b589f6d52e04328560941704a -EBUILD gnome-shell-43.1.ebuild 6433 BLAKE2B 621e39f822dfa659dbedaebcdf8eb3985565b3648646522458227f7ad455068bae108c016133236f04ce4c496c4cf725009a893e9b5f6e6aaafdf95fdbd92b27 SHA512 41ffd85589ecbb2e59a7364631eabfc51c435004916db3418c218371a974790b68aa6d679866b5ae63130d7336a6b2b13e4582ef1216b6291ea7a4d16c7e6194 EBUILD gnome-shell-43.2-r1.ebuild 6431 BLAKE2B c27b238c78ca891a742ba28018f34dbd0106f2e31881176c966ab565cab1b0d0eb1f545f0280d57e01e55cb3779539069d361505131277c36a6352623736f729 SHA512 c7da6032b1ffb4fdccee9bfa8ce1e4f55044e1f38bc349de2089ae4b2ad7f6211b9060278e36b34d4d6d338d97333db586394671c940174ea1fdaf728f83443a -MISC metadata.xml 1187 BLAKE2B 112179de090fbd712f5af966853e0837f7b0cdd78e377fce9c8d3c6078e17ac98acfaabf93dfc738a45fb78a94f82903f5d8609bdd7f3769877e6ac24a5424a1 SHA512 f679fd454c50795c347235ebab1ce8b2e070c4afd797ce574226dee7aae25991a00e2c98000b11178f8aa943af1be8652b585937f8cab41ef349b6ee7b897d05 +MISC metadata.xml 957 BLAKE2B d2325c60974cb52f548436df192a77963b5353cbda67f65b9966829d2d5c4159c73bfc8f686255050546a9b384864d3ce9b6c9cd9d26d2d301fa78d50d5c8d9d SHA512 abe6d6768f8c4e090c0fc8d494c00551e76dd2b7409a99c8bf59d8353966dde305ce9fc0c1712d87c2e342a5e7b75b1f9ad7972e2a2bd0a6c0cb598a859cd13e diff --git a/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch b/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch deleted file mode 100644 index c7fe07dd69de..000000000000 --- a/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch +++ /dev/null @@ -1,59 +0,0 @@ -From d7cfd7bff4f9fa9d8528f72d4275e07551c6b288 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -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.5-r2.ebuild b/gnome-base/gnome-shell/gnome-shell-42.5-r2.ebuild deleted file mode 100644 index d7a5b587215f..000000000000 --- a/gnome-base/gnome-shell/gnome-shell-42.5-r2.ebuild +++ /dev/null @@ -1,210 +0,0 @@ -# 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 https://gitlab.gnome.org/GNOME/gnome-shell" - -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 <X11/extensions/Xfixes.h> -# FIXME: -# * gstreamer/pipewire support is currently automagic -DEPEND=" - >=gnome-extra/evolution-data-server-3.33.1:= - >=app-crypt/gcr-3.7.5:0=[introspection] - >=dev-libs/glib-2.68:2 - >=dev-libs/gobject-introspection-1.49.1:= - >=dev-libs/gjs-1.71.1[cairo] - >=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:2 - x11-libs/gdk-pixbuf:2[introspection] - dev-libs/libxml2:2 - x11-libs/libX11 - - >=media-libs/libpulse-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 -# <libgweather-4.2.0 because of libsoup:3 transition -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] - <dev-libs/libgweather-4.2.0:4 - 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 -" -# 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/gnome-browser-connector ) -" -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() { - default - xdg_environment_reset - # Hack in correct python shebang - sed -e "s:python\.full_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-43.1.ebuild b/gnome-base/gnome-shell/gnome-shell-43.1.ebuild deleted file mode 100644 index 093284d2a739..000000000000 --- a/gnome-base/gnome-shell/gnome-shell-43.1.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# 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 optfeature python-single-r1 virtualx xdg - -DESCRIPTION="Provides core UI functions for the GNOME desktop" -HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell https://gitlab.gnome.org/GNOME/gnome-shell" - -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" -IUSE="elogind gtk-doc +ibus +networkmanager systemd 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 <X11/extensions/Xfixes.h> -DEPEND=" - >=gnome-extra/evolution-data-server-3.33.1:= - >=app-crypt/gcr-3.90.0:4=[introspection] - >=dev-libs/glib-2.68:2 - >=dev-libs/gobject-introspection-1.49.1:= - >=dev-libs/gjs-1.73.1[cairo] - >=x11-libs/gtk+-3.15.0:3[introspection] - >=x11-wm/mutter-43.0:0/11[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] - 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-core-2.46:2[introspection] - x11-libs/gdk-pixbuf:2[introspection] - dev-libs/libxml2:2 - x11-libs/libX11 - - >=media-libs/libpulse-2[glib] - 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. 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) -# 9. xdg-desktop-portal-gtk for various integration, e.g. #764632 -# 10. 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] - x11-libs/pango[introspection] - net-libs/libsoup:3.0[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] ) - media-fonts/cantarell - - sys-apps/xdg-desktop-portal-gnome -" -# avoid circular dependency, see bug #546134 -PDEPEND=" - >=gnome-base/gdm-3.5[introspection(+)] - >=gnome-base/gnome-control-center-3.26[networkmanager(+)?] -" -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 - test? ( x11-wm/mutter[test] ) -" -# These are not needed from tarballs, unless stylesheets or manpage get patched with patchset: -# dev-lang/sassc -# app-text/asciidoc - -PATCHES=( - # Change favorites defaults, bug #479918 - "${FILESDIR}"/40.0-defaults.patch -) - -src_prepare() { - default - xdg_environment_reset - # Hack in correct python shebang - sed -e "s:python\.full_path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die -} - -src_configure() { - local emesonargs=( - -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=false - ) - 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/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 - - optfeature "Bluetooth integration" gnome-base/gnome-control-center[bluetooth] net-wireless/gnome-bluetooth:3[introspection] - optfeature "Browser extension integration" gnome-extra/gnome-browser-connector - optfeature "Screencast/capture support" media-video/pipewire media-libs/gstreamer[introspection] media-libs/gst-plugins-base[introspection] media-libs/gst-plugins-good media-plugins/gst-plugins-vpx - optfeature "Weather support" dev-libs/libgweather:4[introspection] -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/gnome-base/gnome-shell/metadata.xml b/gnome-base/gnome-shell/metadata.xml index 8cf603b229be..3ef3d305b308 100644 --- a/gnome-base/gnome-shell/metadata.xml +++ b/gnome-base/gnome-shell/metadata.xml @@ -13,10 +13,8 @@ provide a visually attractive and easy to use experience. </longdescription> <use> - <flag name="browser-extension">Ensure the presence of extensions.gnome.org native connector <pkg>gnome-extra/gnome-browser-connector</pkg></flag> <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking and suspend support.</flag> <flag name="ibus">Enable support for enhanced input methods through <pkg>app-i18n/ibus</pkg></flag> - <flag name="telepathy">Ensure presence of telepathy chat integration</flag> </use> <upstream> <remote-id type="gnome-gitlab">GNOME/gnome-shell</remote-id> diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest index 19d6613138c8..9bac509d5606 100644 --- a/gnome-base/gvfs/Manifest +++ b/gnome-base/gvfs/Manifest @@ -1,6 +1,3 @@ -AUX meson-0.61.patch 985 BLAKE2B 39f9a905a69f1cc724a04ce5c994f00ccf4272ac4038d95ea1afba42bb85d29624bcd7c1b573496c6eebf2541c224cd978eff6e6b7b9640a58b0d9361a7b919e SHA512 ceb03541b0c1991ec1f4d933e7b6c0741cb8d36b3083945763a8ea91bfe271c3395e715e52f9a6724a132baf7792fbfcd97a0e43050eaeaa72d50a6388d61e3a -DIST gvfs-1.48.1.tar.xz 1225916 BLAKE2B f2c46d94ba68065fcaef93cfaf25d5d6cc2fbbf4c1842452d30a9fec2ac5259b440fe569411cf3a874d3464f8d001ef2d04a705230a21b381ff1c3abe9c0f16e SHA512 19a642bcfce37eaa0d2d9f509fed6c67abfea0f79f5be9a17074d20e9ba71252a13583a2e08de88718cb141c5e79e34c84c765c87160351fe21291a8f88abe8c DIST gvfs-1.50.2.tar.xz 1214464 BLAKE2B 3fbd461cd640fcb956158e6fce97cb6cb7c30e444c5955ee197f827273271b876de62469daee994586b2bfe6ab7ab41d8a9eb2f346a0b9ed45289d9d516f5bf5 SHA512 980ff8a857ad4dc820685a9331d875274f893aebf8aca406c8ee06e2a25026fc51572515f3ccaa06062314f7f5f8d1982c5813d235bd7d81b975874e1796ca04 -EBUILD gvfs-1.48.1-r2.ebuild 3918 BLAKE2B 6250f10bd9de0db9a23707bb8ab3e97c18886b51a6076edc635aeda25c9d157926ae558b93015dcc039bdf2c27cdf3045e7a47104b3a6cfc99913cf403c5f047 SHA512 0c199aad98c83b0fc6a845e5f49dcdd8deb7372cab9ed6422065f51db373f49e6077a7f6c6fd2ebf6df839b15a3d3c3fae72c0889dd58e67b13f8578a2756036 EBUILD gvfs-1.50.2-r1.ebuild 3908 BLAKE2B 8c277a085fbdaf12f7667c8c27079f0da1966e2b6a213f109e5adb974f649a9610287845d89c8b64c9c3405b6d01d8bcdc09715423d2678b8437d230924ff851 SHA512 afbabfd1b5be102d375c372e96db748f9e92cdd7b9177869b0ed4ae832f8ff5dff0451f694c5f973aa44a17d4e61fc06aa6ece18452a0e9a0292ddb302162262 MISC metadata.xml 1857 BLAKE2B ecd1ccd9d258829723b274a45c4d831755032988e60edad0294c2c313addd274f4f9c7b3b3fb6db4e705a9694dd07f5963440b1bed00a51a4266b6f1c638d11b SHA512 8f45e74dbd38fdfbae9bd51734ffdc516f2fd55ed964d03bd3ee8bb809bf0d858d7b93bc17894a446d5e4a4299da4cc65062d52f49cf4cb60c72d26d45d26dc1 diff --git a/gnome-base/gvfs/files/meson-0.61.patch b/gnome-base/gvfs/files/meson-0.61.patch deleted file mode 100644 index 20e03388d7c6..000000000000 --- a/gnome-base/gvfs/files/meson-0.61.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://bugs.gentoo.org/831840 -https://gitlab.gnome.org/GNOME/gvfs/-/merge_requests/133 - -From 1522bf6a9741cf6f1fe16eaf50fd20af46882873 Mon Sep 17 00:00:00 2001 -From: Ondrej Holy <oholy@redhat.com> -Date: Fri, 21 Jan 2022 08:32:31 +0100 -Subject: [PATCH] build: Remove incorrect i18n.merge_file argument - -The positional argument was being silently ignored until meson 0.60.0 where -it fails with "ERROR: Function does not take positional arguments". - -Related: https://github.com/mesonbuild/meson/issues/9441 -Fixes: https://gitlab.gnome.org/GNOME/gvfs/-/issues/599 -(cherry picked from commit 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0) ---- - daemon/meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/daemon/meson.build b/daemon/meson.build -index dffeef3e..bdc506fe 100644 ---- a/daemon/meson.build -+++ b/daemon/meson.build -@@ -366,7 +366,6 @@ if enable_admin - ) - - i18n.merge_file( -- policy, - input: policy_in, - output: '@BASENAME@', - po_dir: po_dir, --- -2.34.1 - diff --git a/gnome-base/gvfs/gvfs-1.48.1-r2.ebuild b/gnome-base/gvfs/gvfs-1.48.1-r2.ebuild deleted file mode 100644 index 305bbb54a8d6..000000000000 --- a/gnome-base/gvfs/gvfs-1.48.1-r2.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -TMPFILES_OPTIONAL=1 -inherit gnome.org gnome2-utils meson systemd tmpfiles xdg - -DESCRIPTION="Virtual filesystem implementation for GIO" -HOMEPAGE="https://wiki.gnome.org/Projects/gvfs" - -LICENSE="LGPL-2+" -SLOT="0" - -IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf" -RESTRICT="!test? ( test )" -# elogind/systemd only relevant to udisks (in v1.38.1) -REQUIRED_USE=" - ?? ( elogind systemd ) - cdda? ( udev ) - google? ( gnome-online-accounts ) - gphoto2? ( udev ) - mtp? ( udev ) - udisks? ( udev ) -" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" - -RDEPEND=" - >=dev-libs/glib-2.65.1:2 - >=gnome-base/gsettings-desktop-schemas-3.33.0 - afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) - sys-apps/dbus - app-crypt/gcr:0= - policykit? ( - >=sys-auth/polkit-0.114 - sys-libs/libcap - ) - http? ( - dev-libs/libxml2:2 - >=net-libs/libsoup-2.58.0:2.4 - ) - zeroconf? ( >=net-dns/avahi-0.6[dbus] ) - udev? ( >=dev-libs/libgudev-147:= ) - fuse? ( - >=sys-fs/fuse-3.0.0:3 - virtual/tmpfiles - ) - udisks? ( >=sys-fs/udisks-1.97:2 ) - systemd? ( >=sys-apps/systemd-206:0= ) - elogind? ( >=sys-auth/elogind-229:0= ) - ios? ( - >=app-pda/libimobiledevice-1.2:= - >=app-pda/libplist-1:= - ) - gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= ) - gnome-keyring? ( app-crypt/libsecret ) - bluray? ( media-libs/libbluray:= ) - mtp? ( - virtual/libusb:1 - >=media-libs/libmtp-1.1.15 - ) - samba? ( >=net-fs/samba-4[client] ) - archive? ( app-arch/libarchive:= ) - cdda? ( - dev-libs/libcdio:0= - >=dev-libs/libcdio-paranoia-0.78.2 - ) - google? ( >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] ) - gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) - nfs? ( >=net-fs/libnfs-1.9.8 ) - net-misc/openssh -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.2 - dev-libs/libxslt - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - dev-util/gdbus-codegen - test? ( dev-libs/libgdata ) -" - -PATCHES=( - "${FILESDIR}/meson-0.61.patch" -) - -src_configure() { - local enable_logind="false" - if use systemd || use elogind; then - enable_logind="true" - fi - - local enable_gcrypt="false" - if use afp; then # currently HAVE_GCRYPT and linkage only used with afp; check it on big bumps (grep for HAVE_GCRYPT and enable_gcrypt); adjust depends if changes - enable_gcrypt="true" - fi - - local enable_libusb="false" - if use mtp; then # currently HAVE_LIBUSB and linkage only used with mtp; check it on big bumps (grep for HAVE_LIBUSB and enable_libusb); adjust depends if changes - enable_libusb="true" - fi - - local emesonargs=( - -Dsystemduserunitdir="$(systemd_get_userunitdir)" - -Dtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d - $(meson_use policykit admin) - $(meson_use ios afc) - $(meson_use afp) - $(meson_use archive) - $(meson_use cdda) - $(meson_use zeroconf dnssd) - $(meson_use gnome-online-accounts goa) - $(meson_use google) - $(meson_use gphoto2) - $(meson_use http) - $(meson_use mtp) - $(meson_use nfs) - -Dsftp=true - $(meson_use samba smb) - $(meson_use udisks udisks2) - $(meson_use bluray) - $(meson_use fuse) - -Dgcr=true - -Dgcrypt=${enable_gcrypt} - $(meson_use udev gudev) - $(meson_use gnome-keyring keyring) - -Dlogind=${enable_logind} - -Dlibusb=${enable_libusb} - -Ddevel_utils=false # wouldn't install any of it as of 1.38.1; some tests need it, but they aren't automated tests in v1.38.1 - -Dinstalled_tests=false - -Dman=true - ) - meson_src_configure -} - -pkg_postinst() { - if use fuse; then - tmpfiles_process gvfsd-fuse-tmpfiles.conf - fi - - xdg_pkg_postinst - gnome2_schemas_update - gnome2_giomodule_cache_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update - gnome2_giomodule_cache_update -} diff --git a/gnome-base/libgtop/Manifest b/gnome-base/libgtop/Manifest index 484576f497f9..d31afa61a17a 100644 --- a/gnome-base/libgtop/Manifest +++ b/gnome-base/libgtop/Manifest @@ -2,6 +2,5 @@ AUX 2.40.0-clang.patch 4657 BLAKE2B 4a04d3f14bbc0f255b4f243f5e482b4e5aff7a1c25ea AUX 2.40.0-sandbox-workaround.patch 890 BLAKE2B b231acfa4f15b04d5148864da0ef32f08c65fd4ddcda940cd39d832bc30d46edb8f48633e08974521abee126251e5e80693bb224f0630f17065e7c5580ba9439 SHA512 ec5b1f9e9b8174dee576370ccfeb2d758ad5369c1ffacc7d8840f9936046fbedfd0d3e1e2b024606d33a32da59c65cdf204ba98fb108a92dcff660b0769d71b6 DIST libgtop-2.40.0-patchset.tar.xz 9700 BLAKE2B 0d7e42b12fe0989df8e5abd1d45578acb97981c05c43aeeea57ba38f526e61aaa9507cd9520a20634f4559b4dfe60efd368d343f2d1ac6803e33bc5dc4832522 SHA512 15b5a81f4ec7a3e921a2c114e8f57dcca194e38849e09080c55a3a16078a8ec706f8efef6d4b22931927e7ab7789596e85054ccd85f37d6dd3206c962734960b DIST libgtop-2.40.0.tar.xz 744316 BLAKE2B 3ffd11937e29aacc4b0d5569429ec92835a3743d7cb65336c5c36165b1bb0d817629e73db88c29eff4baf4965791497a8676a897d0de9b394f583fb2cab15b3a SHA512 a9b2135796d7e41c63a6621f672c385d1baeb74d4af3e55c9164aaaae18c66a8a76b09a6ae8b37f89f120092123c38830e0da840c6613a09035ea62339117861 -EBUILD libgtop-2.40.0-r1.ebuild 1237 BLAKE2B fa027c28549b2458b8beb9db18ed4f2de24aff23d88e5ee11c99225bfe4dc4bcc9494d6cd304f98bb119401e06ce91ce1bbe81f8ebb3edb111939502dc35b4a0 SHA512 073209f56c4fa66b5f2f57ed0b913d686b4e5e6e9cb694ca22c169685f0c77436664defee690e2bbfc27b6f20a78ff80892c11df40205653fad143fa78314f65 EBUILD libgtop-2.40.0-r2.ebuild 1270 BLAKE2B 9f09fc210bced6a1c73ac676ed89a62812edf5806d556cf926e6d60f1addb327fab28a19b8a969d60d5b0a577da1c11f61c70437bd399fa18d3d7e0f44c9b9f5 SHA512 7c7da01945cc8f076ab6562950c7f73505d2f526b52bc195c72b6829fb1cfc14dd37f60e00617830f95ef5cd65150f1fbe70076247f873cd965c818da3533038 MISC metadata.xml 348 BLAKE2B a3b76adccaf7cac9d18f004f987e5931ad391a4c73b16dd18ea008761d1ab8d0d343b50281278a27ec1a621c211babdf72db28513bec173916488a64b7b1cb26 SHA512 b99cbbcdb86b81c8280e14ba5d31e396ba6de133334ebeb827113c34a24f03a365c0e40934f6dc39ecfb76be17452e4c50694e1ef3b0358853708dfda040c28c diff --git a/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild b/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild deleted file mode 100644 index 553d12ec96ad..000000000000 --- a/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -GNOME2_EAUTORECONF="yes" -inherit flag-o-matic gnome2 - -DESCRIPTION="A library that provides top functionality to applications" -HOMEPAGE="https://gitlab.gnome.org/GNOME/libgtop" -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" - -LICENSE="GPL-2+" -SLOT="2/11" # libgtop soname version -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" -IUSE="+introspection" - -RDEPEND=" - >=dev-libs/glib-2.26:2 - introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - >=dev-util/gtk-doc-am-1.4 - >=sys-devel/gettext-0.19.6 - virtual/pkgconfig -" - -PATCHES=( - "${WORKDIR}"/patches # patches from master (not stable branch) that seem safe and fix potential eautoreconf problems - "${FILESDIR}"/${PV}-sandbox-workaround.patch # requires suid handling in ebuild - https://gitlab.gnome.org/GNOME/libgtop/issues/48 -) - -src_configure() { - # Add explicit stdc, bug #628256 - append-cflags "-std=c99" - - gnome2_src_configure \ - --disable-static \ - $(use_enable introspection) -} - -src_install() { - gnome2_src_install - chmod 4755 "${ED}"/usr/bin/libgtop_server2 || die -} |