From d5d5b6958f6a161a49d4502caa4dc2d72614f6fe Mon Sep 17 00:00:00 2001 From: sadlerm4 Date: Fri, 14 Feb 2025 05:59:07 +1100 Subject: [PATCH] chore(el10): remove bazzite-specific packages --- ...pdate-GPUs-comment-for-dbus-property.patch | 27 - .../0002-main-add-Discrete-key.patch | 379 ----- ...x-integration-tests-without-UMockdev.patch | 27 - ...for-discrete-detection-with-mock-lib.patch | 278 --- ...05-main-remove-leftover-and-fix-typo.patch | 39 - ...screte-dependencies-out-of-main-deps.patch | 48 - ...-for-discrete-command-line-arguments.patch | 137 -- .../0008-main-add-udev-rule-for-i915.patch | 25 - ...in-use-Discrete-key-in-switcherooctl.patch | 34 - ...0010-main-use-new-GPU-list-on-uevent.patch | 45 - anda/apps/switcheroo-control/anda.hcl | 8 - .../switcheroo-control.spec | 194 --- anda/apps/switcheroo-control/update.rhai | 1 - ...Work-around-failing-fingerprint-auth.patch | 67 - ...board-Add-a-catch-around-reload-call.patch | 35 - ...Load-keyboard-from-system-settings-i.patch | 136 -- ...Use-gnome-desktop-API-for-getting-de.patch | 128 -- anda/desktops/gnome/gnome-shell/3193.patch | 98 -- anda/desktops/gnome/gnome-shell/anda.hcl | 9 - anda/desktops/gnome/gnome-shell/changelog | 1484 ----------------- anda/desktops/gnome/gnome-shell/gitignore | 227 --- .../gnome-shell-favourite-apps-firefox.patch | 38 - .../gnome/gnome-shell/gnome-shell.spec | 262 --- anda/desktops/gnome/gnome-shell/update.rhai | 25 - ...sfiltereng_private-a-VERSION-and-SOV.patch | 30 - anda/desktops/kde/kf6-kio/1556.patch | 290 ---- ...75d315f389df0a440ed62b842ce83dc9a27e.patch | 34 - anda/desktops/kde/kf6-kio/anda.hcl | 9 - anda/desktops/kde/kf6-kio/kf6-kio.spec | 340 ---- anda/desktops/kde/kf6-kio/update.rhai | 16 - 30 files changed, 4470 deletions(-) delete mode 100644 anda/apps/switcheroo-control/0001-main-update-GPUs-comment-for-dbus-property.patch delete mode 100644 anda/apps/switcheroo-control/0002-main-add-Discrete-key.patch delete mode 100644 anda/apps/switcheroo-control/0003-tests-fix-integration-tests-without-UMockdev.patch delete mode 100644 anda/apps/switcheroo-control/0004-tests-add-tests-for-discrete-detection-with-mock-lib.patch delete mode 100644 anda/apps/switcheroo-control/0005-main-remove-leftover-and-fix-typo.patch delete mode 100644 anda/apps/switcheroo-control/0006-main-move-discrete-dependencies-out-of-main-deps.patch delete mode 100644 anda/apps/switcheroo-control/0007-main-use-glib-for-discrete-command-line-arguments.patch delete mode 100644 anda/apps/switcheroo-control/0008-main-add-udev-rule-for-i915.patch delete mode 100644 anda/apps/switcheroo-control/0009-main-use-Discrete-key-in-switcherooctl.patch delete mode 100644 anda/apps/switcheroo-control/0010-main-use-new-GPU-list-on-uevent.patch delete mode 100644 anda/apps/switcheroo-control/anda.hcl delete mode 100644 anda/apps/switcheroo-control/switcheroo-control.spec delete mode 100644 anda/apps/switcheroo-control/update.rhai delete mode 100644 anda/desktops/gnome/gnome-shell/0001-gdm-Work-around-failing-fingerprint-auth.patch delete mode 100644 anda/desktops/gnome/gnome-shell/0001-status-keyboard-Add-a-catch-around-reload-call.patch delete mode 100644 anda/desktops/gnome/gnome-shell/0002-status-keyboard-Load-keyboard-from-system-settings-i.patch delete mode 100644 anda/desktops/gnome/gnome-shell/0003-status-keyboard-Use-gnome-desktop-API-for-getting-de.patch delete mode 100644 anda/desktops/gnome/gnome-shell/3193.patch delete mode 100644 anda/desktops/gnome/gnome-shell/anda.hcl delete mode 100644 anda/desktops/gnome/gnome-shell/changelog delete mode 100644 anda/desktops/gnome/gnome-shell/gitignore delete mode 100644 anda/desktops/gnome/gnome-shell/gnome-shell-favourite-apps-firefox.patch delete mode 100644 anda/desktops/gnome/gnome-shell/gnome-shell.spec delete mode 100644 anda/desktops/gnome/gnome-shell/update.rhai delete mode 100644 anda/desktops/kde/kf6-kio/0001-Give-the-kuriikwsfiltereng_private-a-VERSION-and-SOV.patch delete mode 100644 anda/desktops/kde/kf6-kio/1556.patch delete mode 100644 anda/desktops/kde/kf6-kio/6e7775d315f389df0a440ed62b842ce83dc9a27e.patch delete mode 100644 anda/desktops/kde/kf6-kio/anda.hcl delete mode 100644 anda/desktops/kde/kf6-kio/kf6-kio.spec delete mode 100644 anda/desktops/kde/kf6-kio/update.rhai diff --git a/anda/apps/switcheroo-control/0001-main-update-GPUs-comment-for-dbus-property.patch b/anda/apps/switcheroo-control/0001-main-update-GPUs-comment-for-dbus-property.patch deleted file mode 100644 index 825ca07b19..0000000000 --- a/anda/apps/switcheroo-control/0001-main-update-GPUs-comment-for-dbus-property.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 44046bfbcb30a19c45416113a2a82a4d17a1a998 Mon Sep 17 00:00:00 2001 -From: Jan200101 -Date: Mon, 14 Aug 2023 14:06:45 +0200 -Subject: [PATCH 01/10] main: update GPUs comment for dbus property - -Signed-off-by: Jan200101 ---- - src/net.hadess.SwitcherooControl.xml | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/net.hadess.SwitcherooControl.xml b/src/net.hadess.SwitcherooControl.xml -index e52bc1a..59a8896 100644 ---- a/src/net.hadess.SwitcherooControl.xml -+++ b/src/net.hadess.SwitcherooControl.xml -@@ -38,7 +38,8 @@ - will contain a user-facing name for the GPU, the "Environment" (as) key will - contain an array of even number of strings, each being an environment - variable to set to use the GPU, followed by its value, the "Default" (b) key -- will tag the default (usually integrated) GPU. -+ will tag the default GPU, the "Discrete" (b) key tags if the GPU is a -+ dedicated component. - --> - - --- -2.46.0 - diff --git a/anda/apps/switcheroo-control/0002-main-add-Discrete-key.patch b/anda/apps/switcheroo-control/0002-main-add-Discrete-key.patch deleted file mode 100644 index b67ca67fae..0000000000 --- a/anda/apps/switcheroo-control/0002-main-add-Discrete-key.patch +++ /dev/null @@ -1,379 +0,0 @@ -From 4f31415cb61a50c2bcba1510a7511518417d0970 Mon Sep 17 00:00:00 2001 -From: Jan200101 -Date: Mon, 11 Sep 2023 15:21:46 +0200 -Subject: [PATCH 02/10] main: add Discrete key - -Signed-off-by: Jan200101 ---- - .gitlab-ci.yml | 1 + - data/30-discrete-gpu.rules.in | 3 + - data/meson.build | 7 ++ - meson.build | 9 +++ - meson_options.txt | 24 +++++++ - src/discrete-detection/amdgpu.c | 46 +++++++++++++ - src/discrete-detection/meson.build | 18 +++++ - src/discrete-detection/nouveau.c | 105 +++++++++++++++++++++++++++++ - src/meson.build | 4 +- - src/switcheroo-control.c | 16 +++++ - 10 files changed, 232 insertions(+), 1 deletion(-) - create mode 100644 data/30-discrete-gpu.rules.in - create mode 100644 src/discrete-detection/amdgpu.c - create mode 100644 src/discrete-detection/meson.build - create mode 100644 src/discrete-detection/nouveau.c - -diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml -index a6aa3c7..a09fe20 100644 ---- a/.gitlab-ci.yml -+++ b/.gitlab-ci.yml -@@ -3,6 +3,7 @@ image: fedora:rawhide - variables: - DEPENDENCIES: glib2-devel - libgudev-devel -+ libdrm-devel - gtk-doc - gcc - gcc-c++ -diff --git a/data/30-discrete-gpu.rules.in b/data/30-discrete-gpu.rules.in -new file mode 100644 -index 0000000..a803ed4 ---- /dev/null -+++ b/data/30-discrete-gpu.rules.in -@@ -0,0 +1,3 @@ -+DRIVERS=="amdgpu", SUBSYSTEM=="drm", PROGRAM="@libexecdir@/check-discrete-amdgpu $env{DEVNAME}", TAG+="switcheroo-discrete-gpu" -+DRIVERS=="nouveau", SUBSYSTEM=="drm", PROGRAM="@libexecdir@/check-discrete-nouveau $env{DEVNAME}", TAG+="switcheroo-discrete-gpu" -+DRIVERS=="nvidia", TAG+="switcheroo-discrete-gpu" -diff --git a/data/meson.build b/data/meson.build -index 85e5c93..38cf96c 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -17,3 +17,10 @@ install_data( - '30-pci-intel-gpu.hwdb', - install_dir: hwdb_dir, - ) -+ -+configure_file( -+ input: '30-discrete-gpu.rules.in', -+ output: '30-discrete-gpu.rules', -+ configuration: data_conf, -+ install_dir: rules_dir, -+) -diff --git a/meson.build b/meson.build -index b8f4bff..b3aaf0c 100644 ---- a/meson.build -+++ b/meson.build -@@ -20,6 +20,9 @@ gnome = import('gnome') - glib = dependency('glib-2.0', version: '>= 2.56.0') - gio = dependency('gio-2.0', version: '>= 2.56.0') - gudev = dependency('gudev-1.0', version: '>= 232') -+libdrm = dependency('libdrm', version: '>= 2.4.97', required: get_option('libdrm')) -+libdrm_nouveau = dependency('libdrm_nouveau', version: '>= 2.4.97', required: get_option('libdrm_nouveau')) -+libdrm_amdgpu = dependency('libdrm_amdgpu', version: '>= 2.4.97', required: get_option('libdrm_amdgpu')) - - systemd_systemunitdir = get_option('systemdsystemunitdir') - if systemd_systemunitdir == '' -@@ -32,6 +35,12 @@ if hwdb_dir == '' - hwdb_dir = udevdir / 'hwdb.d' - endif - -+rules_dir = get_option('rulesdir') -+if rules_dir == '' -+ udevdir = dependency('udev').get_pkgconfig_variable('udevdir') -+ rules_dir = udevdir / 'rules.d' -+endif -+ - # Make like license available in the build root for docs - configure_file( - input: 'COPYING', -diff --git a/meson_options.txt b/meson_options.txt -index c8d9619..b8d671a 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -10,6 +10,12 @@ option('hwdbdir', - description: 'Directory for hwdb files', - ) - -+option('rulesdir', -+ type: 'string', -+ value: '', -+ description: 'Directory for ruke files', -+) -+ - option('gtk_doc', - type: 'boolean', - value: false, -@@ -21,3 +27,21 @@ option('tests', - type: 'boolean', - value: false - ) -+ -+option('libdrm', -+ description: 'Whether libdrm should be used to probe GPUs', -+ type: 'feature', -+ value: 'auto' -+) -+ -+option('libdrm_nouveau', -+ description: 'Whether libdrm_nouveau should be used to probe Nvidia GPUs', -+ type: 'feature', -+ value: 'auto' -+) -+ -+option('libdrm_amdgpu', -+ description: 'Whether libdrm_amdgpu should be used to probe AMD GPUs', -+ type: 'feature', -+ value: 'auto' -+) -diff --git a/src/discrete-detection/amdgpu.c b/src/discrete-detection/amdgpu.c -new file mode 100644 -index 0000000..2d9804f ---- /dev/null -+++ b/src/discrete-detection/amdgpu.c -@@ -0,0 +1,46 @@ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+ -+typedef int handle; -+G_DEFINE_AUTO_CLEANUP_FREE_FUNC(handle, close, -1) -+G_DEFINE_AUTOPTR_CLEANUP_FUNC(amdgpu_device_handle, free); -+ -+int main(int argc, char** argv) -+{ -+ if (argc < 2) -+ { -+ puts ("check-discrete-amdgpu [DEVNAME]"); -+ return EXIT_FAILURE; -+ } -+ -+ const char *devname; -+ g_auto(handle) fd = -1; -+ g_autoptr(GUdevDevice) parent = NULL; -+ struct drm_amdgpu_info_device device_info = {0}; -+ amdgpu_device_handle device = NULL; -+ uint32_t drm_major, drm_minor; -+ -+ devname = argv[1]; -+ fd = open (devname, O_RDWR); -+ if (fd < 0) -+ return EXIT_FAILURE; -+ -+ if (amdgpu_device_initialize (fd, &drm_major, &drm_minor, &device)) -+ return EXIT_FAILURE; -+ -+ if (amdgpu_query_info (device, AMDGPU_INFO_DEV_INFO, sizeof(device_info), &device_info)) -+ return EXIT_FAILURE; -+ -+ /* AMDGPU_IDS_FLAGS_FUSION is set for all APUs */ -+ if (device_info.ids_flags & AMDGPU_IDS_FLAGS_FUSION) -+ return EXIT_FAILURE; -+ -+ return EXIT_SUCCESS; -+} -diff --git a/src/discrete-detection/meson.build b/src/discrete-detection/meson.build -new file mode 100644 -index 0000000..3a6c03f ---- /dev/null -+++ b/src/discrete-detection/meson.build -@@ -0,0 +1,18 @@ -+ -+if libdrm_amdgpu.found() -+ executable('check-discrete-amdgpu', -+ files('amdgpu.c'), -+ dependencies: deps, -+ install: true, -+ install_dir: libexecdir, -+ ) -+endif -+ -+if libdrm.found() and libdrm_nouveau.found() -+ executable('check-discrete-nouveau', -+ files('nouveau.c'), -+ dependencies: deps, -+ install: true, -+ install_dir: libexecdir, -+ ) -+endif -diff --git a/src/discrete-detection/nouveau.c b/src/discrete-detection/nouveau.c -new file mode 100644 -index 0000000..0a1f220 ---- /dev/null -+++ b/src/discrete-detection/nouveau.c -@@ -0,0 +1,105 @@ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+ -+typedef int handle; -+G_DEFINE_AUTO_CLEANUP_FREE_FUNC(handle, close, -1) -+ -+int main(int argc, char** argv) -+{ -+ if (argc < 2) -+ { -+ puts ("check-discrete-nouveau [DEVNAME]"); -+ return EXIT_FAILURE; -+ } -+ -+ const char *devname; -+ g_auto(handle) fd = -1; -+ -+ devname = argv[1]; -+ fd = open (devname, O_RDWR); -+ if (fd < 0) -+ return EXIT_FAILURE; -+ -+ g_autofree void *device = malloc(352); -+ -+ /* Init device */ -+ { -+ struct { -+ struct nvif_ioctl_v0 ioctl; -+ struct nvif_ioctl_new_v0 new; -+ struct nv_device_v0 dev; -+ } init_args = { -+ .ioctl = { -+ .object = 0, -+ .owner = NVIF_IOCTL_V0_OWNER_ANY, -+ .route = 0x00, -+ .type = NVIF_IOCTL_V0_NEW, -+ .version = 0, -+ }, -+ .new = { -+ .handle = 0, -+ .object = (uintptr_t)device, -+ .oclass = NV_DEVICE, -+ .route = NVIF_IOCTL_V0_ROUTE_NVIF, -+ .token = (uintptr_t)device, -+ .version = 0, -+ }, -+ .dev = { -+ .device = ~0ULL, -+ }, -+ }; -+ -+ if (drmCommandWrite (fd, DRM_NOUVEAU_NVIF, &init_args, sizeof(init_args))) -+ return EXIT_FAILURE; -+ } -+ -+ /* Query device info */ -+ struct { -+ struct nvif_ioctl_v0 ioctl; -+ struct nvif_ioctl_mthd_v0 mthd; -+ struct nv_device_info_v0 info; -+ } args = { -+ .ioctl = { -+ .object = (uintptr_t)device, -+ .owner = NVIF_IOCTL_V0_OWNER_ANY, -+ .route = 0x00, -+ .type = NVIF_IOCTL_V0_MTHD, -+ .version = 0, -+ }, -+ .mthd = { -+ .method = NV_DEVICE_V0_INFO, -+ .version = 0, -+ }, -+ .info = { -+ .version = 0, -+ }, -+ }; -+ -+ if (drmCommandWriteRead (fd, DRM_NOUVEAU_NVIF, &args, sizeof(args))) -+ return EXIT_FAILURE; -+ -+ -+ switch (args.info.platform) -+ { -+ case NV_DEVICE_INFO_V0_IGP: -+ case NV_DEVICE_INFO_V0_SOC: -+ return EXIT_FAILURE; -+ -+ case NV_DEVICE_INFO_V0_PCI: -+ case NV_DEVICE_INFO_V0_AGP: -+ case NV_DEVICE_INFO_V0_PCIE: -+ default: -+ return EXIT_SUCCESS; -+ } -+ return EXIT_FAILURE; -+} -diff --git a/src/meson.build b/src/meson.build -index ab3a77d..da4267f 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -1,4 +1,4 @@ --deps = [glib, gio, gudev] -+deps = [glib, gio, gudev, libdrm, libdrm_nouveau, libdrm_amdgpu] - - sources = [ - 'info-cleanup.c', -@@ -34,3 +34,5 @@ configure_file( - configuration: switcherooctl_conf, - install_dir: get_option('bindir') - ) -+ -+subdir('discrete-detection') -diff --git a/src/switcheroo-control.c b/src/switcheroo-control.c -index abd8154..e407bfb 100644 ---- a/src/switcheroo-control.c -+++ b/src/switcheroo-control.c -@@ -31,6 +31,7 @@ typedef struct { - char *name; - GPtrArray *env; - gboolean is_default; -+ gboolean is_discrete; - } CardData; - - typedef struct { -@@ -94,6 +95,8 @@ build_gpus_variant (ControlData *data) - g_variant_new_strv ((const gchar * const *) card->env->pdata, card->env->len)); - g_variant_builder_add (&asv_builder, "{sv}", "Default", - g_variant_new_boolean (card->is_default)); -+ g_variant_builder_add (&asv_builder, "{sv}", "Discrete", -+ g_variant_new_boolean (card->is_discrete)); - - g_variant_builder_add (&builder, "a{sv}", &asv_builder); - } -@@ -312,6 +315,18 @@ get_card_is_default (GUdevDevice *d) - return g_udev_device_get_sysfs_attr_as_boolean (parent, "boot_vga"); - } - -+static gboolean -+get_card_is_discrete (GUdevDevice *d) -+{ -+ const char * const * tags; -+ g_autoptr (GUdevDevice) platform_device = NULL; -+ -+ tags = g_udev_device_get_tags (d); -+ if (tags && g_strv_contains (tags, "switcheroo-discrete-gpu")) -+ return TRUE; -+ return FALSE; -+} -+ - static CardData * - get_card_data (GUdevClient *client, - GUdevDevice *d) -@@ -328,6 +343,7 @@ get_card_data (GUdevClient *client, - data->name = get_card_name (d); - data->env = env; - data->is_default = get_card_is_default (d); -+ data->is_discrete = get_card_is_discrete (d); - - return data; - } --- -2.46.0 - diff --git a/anda/apps/switcheroo-control/0003-tests-fix-integration-tests-without-UMockdev.patch b/anda/apps/switcheroo-control/0003-tests-fix-integration-tests-without-UMockdev.patch deleted file mode 100644 index e8ee844d53..0000000000 --- a/anda/apps/switcheroo-control/0003-tests-fix-integration-tests-without-UMockdev.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 1b115ed72e03ff1169cbfddd79ef10890baca133 Mon Sep 17 00:00:00 2001 -From: Jan200101 -Date: Tue, 12 Sep 2023 15:53:40 +0200 -Subject: [PATCH 03/10] tests: fix integration tests without UMockdev - `gi.require_version` throws ValueError if the dependency cannot be found - -Signed-off-by: Jan200101 ---- - tests/integration-test.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/integration-test.py b/tests/integration-test.py -index d8dea16..e3dd996 100755 ---- a/tests/integration-test.py -+++ b/tests/integration-test.py -@@ -37,7 +37,7 @@ except ImportError as e: - try: - gi.require_version('UMockdev', '1.0') - from gi.repository import UMockdev --except ImportError: -+except (ImportError, ValueError): - sys.stderr.write('Skipping tests, umockdev not available (https://github.com/martinpitt/umockdev)\n') - sys.exit(0) - --- -2.46.0 - diff --git a/anda/apps/switcheroo-control/0004-tests-add-tests-for-discrete-detection-with-mock-lib.patch b/anda/apps/switcheroo-control/0004-tests-add-tests-for-discrete-detection-with-mock-lib.patch deleted file mode 100644 index 24915eba46..0000000000 --- a/anda/apps/switcheroo-control/0004-tests-add-tests-for-discrete-detection-with-mock-lib.patch +++ /dev/null @@ -1,278 +0,0 @@ -From d933e96bdb15679ae7653f929461982aa66973ba Mon Sep 17 00:00:00 2001 -From: Jan200101 -Date: Tue, 12 Sep 2023 15:58:16 +0200 -Subject: [PATCH 04/10] tests: add tests for discrete detection with mock libs - Both tests have 4 different ways of testing: - Invalid Device - Unexpected - Device - Non Discrete GPU (iGPU/APU) - Discrete GPU - -Signed-off-by: Jan200101 ---- - src/discrete-detection/meson.build | 4 +- - tests/discrete-detection/libdrm_amdgpu_mock.c | 57 +++++++++++++ - .../discrete-detection/libdrm_nouveau_mock.c | 68 ++++++++++++++++ - tests/discrete-detection/meson.build | 80 +++++++++++++++++++ - tests/meson.build | 2 + - 5 files changed, 209 insertions(+), 2 deletions(-) - create mode 100644 tests/discrete-detection/libdrm_amdgpu_mock.c - create mode 100644 tests/discrete-detection/libdrm_nouveau_mock.c - create mode 100644 tests/discrete-detection/meson.build - -diff --git a/src/discrete-detection/meson.build b/src/discrete-detection/meson.build -index 3a6c03f..8eb8437 100644 ---- a/src/discrete-detection/meson.build -+++ b/src/discrete-detection/meson.build -@@ -1,6 +1,6 @@ - - if libdrm_amdgpu.found() -- executable('check-discrete-amdgpu', -+ amdgpu_discrete = executable('check-discrete-amdgpu', - files('amdgpu.c'), - dependencies: deps, - install: true, -@@ -9,7 +9,7 @@ if libdrm_amdgpu.found() - endif - - if libdrm.found() and libdrm_nouveau.found() -- executable('check-discrete-nouveau', -+ nouveau_discrete = executable('check-discrete-nouveau', - files('nouveau.c'), - dependencies: deps, - install: true, -diff --git a/tests/discrete-detection/libdrm_amdgpu_mock.c b/tests/discrete-detection/libdrm_amdgpu_mock.c -new file mode 100644 -index 0000000..20fa4aa ---- /dev/null -+++ b/tests/discrete-detection/libdrm_amdgpu_mock.c -@@ -0,0 +1,57 @@ -+#include -+#include -+#include -+ -+#include -+ -+enum { -+ OTHER_GPU, -+ AMD_APU, -+ AMD_GPU, -+}; -+ -+/* Mock open(2) so we can test multiple devices configurations */ -+int open(const char *pathname, int flags) -+{ -+ if (!strcmp(pathname, "OTHER_GPU")) -+ return OTHER_GPU; -+ if (!strcmp (pathname, "AMD_APU")) -+ return AMD_APU; -+ if (!strcmp (pathname, "AMD_GPU")) -+ return AMD_GPU; -+ -+ return -1; -+} -+ -+/* open64 may be used for large file support */ -+int open64(const char *pathname, int flags) -+{ -+ return open (pathname, flags); -+} -+ -+int amdgpu_device_initialize(int fd, uint32_t *major_version, uint32_t *minor_version, int *device_handle) -+{ -+ // Store the fd in the device handle for access in query_info -+ *device_handle = fd; -+ -+ if (fd != AMD_GPU && fd != AMD_APU) -+ return 1; -+ -+ return 0; -+} -+ -+int amdgpu_query_info(int device_handle, unsigned info_id, unsigned size, void *value) -+{ -+ struct drm_amdgpu_info_device* device_info = value; -+ -+ if (device_handle == AMD_GPU) { -+ device_info->ids_flags = 0; -+ return 0; -+ } -+ if (device_handle == AMD_APU) { -+ device_info->ids_flags = AMDGPU_IDS_FLAGS_FUSION; -+ return 0; -+ } -+ -+ return 1; -+} -diff --git a/tests/discrete-detection/libdrm_nouveau_mock.c b/tests/discrete-detection/libdrm_nouveau_mock.c -new file mode 100644 -index 0000000..cdbfda8 ---- /dev/null -+++ b/tests/discrete-detection/libdrm_nouveau_mock.c -@@ -0,0 +1,68 @@ -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+ -+enum { -+ OTHER_GPU, -+ NVIDIA_IGPU, -+ NVIDIA_GPU, -+}; -+ -+/* Mock open(2) so we can test multiple devices configurations */ -+int open(const char *pathname, int flags) -+{ -+ if (!strcmp(pathname, "OTHER_GPU")) -+ return OTHER_GPU; -+ if (!strcmp (pathname, "NVIDIA_IGPU")) -+ return NVIDIA_IGPU; -+ if (!strcmp (pathname, "NVIDIA_GPU")) -+ return NVIDIA_GPU; -+ -+ return -1; -+} -+ -+/* open64 may be used for large file support */ -+int open64(const char *pathname, int flags) -+{ -+ return open (pathname, flags); -+} -+ -+int drmCommandWrite(int fd, unsigned long drmCommandIndex, void *data, unsigned long size) -+{ -+ if (drmCommandIndex != DRM_NOUVEAU_NVIF) -+ return 1; -+ -+ if (fd != NVIDIA_GPU && fd != NVIDIA_IGPU) -+ return 1; -+ -+ return 0; -+} -+ -+int drmCommandWriteRead(int fd, unsigned long drmCommandIndex, void *data, unsigned long size) -+{ -+ if (drmCommandIndex != DRM_NOUVEAU_NVIF) -+ return 1; -+ -+ struct { -+ struct nvif_ioctl_v0 ioctl; -+ struct nvif_ioctl_mthd_v0 mthd; -+ struct nv_device_info_v0 info; -+ } *args = data; -+ -+ if (fd == NVIDIA_GPU) { -+ args->info.platform = NV_DEVICE_INFO_V0_PCIE; -+ return 0; -+ } -+ if (fd == NVIDIA_IGPU) { -+ args->info.platform = NV_DEVICE_INFO_V0_IGP; -+ return 0; -+ } -+ -+ return 1; -+} -\ No newline at end of file -diff --git a/tests/discrete-detection/meson.build b/tests/discrete-detection/meson.build -new file mode 100644 -index 0000000..f01a014 ---- /dev/null -+++ b/tests/discrete-detection/meson.build -@@ -0,0 +1,80 @@ -+ -+if libdrm_amdgpu.found() -+ amdgpu_mock_lib = shared_library( -+ 'drm_amdgpu_mock', -+ files('libdrm_amdgpu_mock.c'), -+ dependencies: libdrm_amdgpu -+ ) -+ -+ test( -+ 'test amdgpu detection with invalid device', -+ amdgpu_discrete, -+ args: ['NO_GPU'], -+ env: environment({'LD_PRELOAD': amdgpu_mock_lib.full_path()}), -+ should_fail: true -+ ) -+ -+ test( -+ 'test amdgpu detection with non-AMD GPU', -+ amdgpu_discrete, -+ args: ['OTHER_GPU'], -+ env: environment({'LD_PRELOAD': amdgpu_mock_lib.full_path()}), -+ should_fail: true -+ ) -+ -+ test( -+ 'test amdgpu detection with AMD APU', -+ amdgpu_discrete, -+ args: ['AMD_APU'], -+ env: environment({'LD_PRELOAD': amdgpu_mock_lib.full_path()}), -+ should_fail: true -+ ) -+ -+ test( -+ 'test amdgpu detection with AMD GPU', -+ amdgpu_discrete, -+ args: ['AMD_GPU'], -+ env: environment({'LD_PRELOAD': amdgpu_mock_lib.full_path()}), -+ should_fail: false -+ ) -+endif -+ -+if libdrm.found() and libdrm_nouveau.found() -+ nouveau_mock_lib = shared_library( -+ 'drm_nouveau_mock', -+ files('libdrm_nouveau_mock.c'), -+ dependencies: [libdrm, libdrm_nouveau] -+ ) -+ -+ test( -+ 'test nouveau detection with invalid device', -+ nouveau_discrete, -+ args: ['NO_GPU'], -+ env: environment({'LD_PRELOAD': nouveau_mock_lib.full_path()}), -+ should_fail: true -+ ) -+ -+ test( -+ 'test nouveau detection with non-Nvidia GPU', -+ nouveau_discrete, -+ args: ['OTHER_GPU'], -+ env: environment({'LD_PRELOAD': nouveau_mock_lib.full_path()}), -+ should_fail: true -+ ) -+ -+ test( -+ 'test nouveau detection with Nvidia iGPU', -+ nouveau_discrete, -+ args: ['NVIDIA_IGPU'], -+ env: environment({'LD_PRELOAD': nouveau_mock_lib.full_path()}), -+ should_fail: true -+ ) -+ -+ test( -+ 'test nouveau detection with Nvidia GPU', -+ nouveau_discrete, -+ args: ['NVIDIA_GPU'], -+ env: environment({'LD_PRELOAD': nouveau_mock_lib.full_path()}), -+ should_fail: false -+ ) -+endif -\ No newline at end of file -diff --git a/tests/meson.build b/tests/meson.build -index b0b7476..61ef00c 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -15,3 +15,5 @@ foreach ut: unit_tests - env: envs, - ) - endforeach -+ -+subdir('discrete-detection') --- -2.46.0 - diff --git a/anda/apps/switcheroo-control/0005-main-remove-leftover-and-fix-typo.patch b/anda/apps/switcheroo-control/0005-main-remove-leftover-and-fix-typo.patch deleted file mode 100644 index b10984fc67..0000000000 --- a/anda/apps/switcheroo-control/0005-main-remove-leftover-and-fix-typo.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c102b643945dc076d881497dd2ca5865938f7053 Mon Sep 17 00:00:00 2001 -From: Jan200101 -Date: Tue, 12 Sep 2023 15:57:47 +0200 -Subject: [PATCH 05/10] main: remove leftover and fix typo - -Signed-off-by: Jan200101 ---- - meson_options.txt | 2 +- - src/switcheroo-control.c | 1 - - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/meson_options.txt b/meson_options.txt -index b8d671a..c77fea8 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -13,7 +13,7 @@ option('hwdbdir', - option('rulesdir', - type: 'string', - value: '', -- description: 'Directory for ruke files', -+ description: 'Directory for rule files', - ) - - option('gtk_doc', -diff --git a/src/switcheroo-control.c b/src/switcheroo-control.c -index e407bfb..0f6a548 100644 ---- a/src/switcheroo-control.c -+++ b/src/switcheroo-control.c -@@ -319,7 +319,6 @@ static gboolean - get_card_is_discrete (GUdevDevice *d) - { - const char * const * tags; -- g_autoptr (GUdevDevice) platform_device = NULL; - - tags = g_udev_device_get_tags (d); - if (tags && g_strv_contains (tags, "switcheroo-discrete-gpu")) --- -2.46.0 - diff --git a/anda/apps/switcheroo-control/0006-main-move-discrete-dependencies-out-of-main-deps.patch b/anda/apps/switcheroo-control/0006-main-move-discrete-dependencies-out-of-main-deps.patch deleted file mode 100644 index 18a0e42158..0000000000 --- a/anda/apps/switcheroo-control/0006-main-move-discrete-dependencies-out-of-main-deps.patch +++ /dev/null @@ -1,48 +0,0 @@ -From f764db4eb565c19ba14155791fbfced3fb5d34c8 Mon Sep 17 00:00:00 2001 -From: Jan200101 -Date: Tue, 12 Sep 2023 15:58:27 +0200 -Subject: [PATCH 06/10] main: move discrete dependencies out of main deps - -Signed-off-by: Jan200101 ---- - src/discrete-detection/meson.build | 5 +++-- - src/meson.build | 2 +- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/discrete-detection/meson.build b/src/discrete-detection/meson.build -index 8eb8437..353316f 100644 ---- a/src/discrete-detection/meson.build -+++ b/src/discrete-detection/meson.build -@@ -1,8 +1,9 @@ -+discrete_deps = deps + [libdrm, libdrm_nouveau, libdrm_amdgpu] - - if libdrm_amdgpu.found() - amdgpu_discrete = executable('check-discrete-amdgpu', - files('amdgpu.c'), -- dependencies: deps, -+ dependencies: discrete_deps, - install: true, - install_dir: libexecdir, - ) -@@ -11,7 +12,7 @@ endif - if libdrm.found() and libdrm_nouveau.found() - nouveau_discrete = executable('check-discrete-nouveau', - files('nouveau.c'), -- dependencies: deps, -+ dependencies: discrete_deps, - install: true, - install_dir: libexecdir, - ) -diff --git a/src/meson.build b/src/meson.build -index da4267f..22d69e7 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -1,4 +1,4 @@ --deps = [glib, gio, gudev, libdrm, libdrm_nouveau, libdrm_amdgpu] -+deps = [glib, gio, gudev] - - sources = [ - 'info-cleanup.c', --- -2.46.0 - diff --git a/anda/apps/switcheroo-control/0007-main-use-glib-for-discrete-command-line-arguments.patch b/anda/apps/switcheroo-control/0007-main-use-glib-for-discrete-command-line-arguments.patch deleted file mode 100644 index 524930709f..0000000000 --- a/anda/apps/switcheroo-control/0007-main-use-glib-for-discrete-command-line-arguments.patch +++ /dev/null @@ -1,137 +0,0 @@ -From d2ecc29469d5572fd171926c9d1dbb1b851c7b09 Mon Sep 17 00:00:00 2001 -From: Jan200101 -Date: Tue, 12 Sep 2023 17:12:00 +0200 -Subject: [PATCH 07/10] main: use glib for discrete command-line arguments - -Signed-off-by: Jan200101 ---- - src/discrete-detection/amdgpu.c | 29 ++++++++++++++++++++--------- - src/discrete-detection/nouveau.c | 29 ++++++++++++++++++++--------- - 2 files changed, 40 insertions(+), 18 deletions(-) - -diff --git a/src/discrete-detection/amdgpu.c b/src/discrete-detection/amdgpu.c -index 2d9804f..5a9a4ab 100644 ---- a/src/discrete-detection/amdgpu.c -+++ b/src/discrete-detection/amdgpu.c -@@ -1,9 +1,10 @@ -- - #include - #include - #include -+#include - #include - #include -+#include - - #include - #include -@@ -12,22 +13,32 @@ typedef int handle; - G_DEFINE_AUTO_CLEANUP_FREE_FUNC(handle, close, -1) - G_DEFINE_AUTOPTR_CLEANUP_FUNC(amdgpu_device_handle, free); - --int main(int argc, char** argv) -+int main (int argc, char** argv) - { -- if (argc < 2) -- { -- puts ("check-discrete-amdgpu [DEVNAME]"); -- return EXIT_FAILURE; -- } -- - const char *devname; - g_auto(handle) fd = -1; -- g_autoptr(GUdevDevice) parent = NULL; - struct drm_amdgpu_info_device device_info = {0}; - amdgpu_device_handle device = NULL; - uint32_t drm_major, drm_minor; -+ g_autoptr(GOptionContext) option_context = NULL; -+ g_autoptr(GError) error = NULL; - -+ setlocale (LC_ALL, ""); -+ option_context = g_option_context_new (""); -+ -+ if (!g_option_context_parse (option_context, &argc, &argv, &error)) { -+ g_print ("Failed to parse arguments: %s\n", error->message); -+ return EXIT_FAILURE; -+ } -+ -+ if (argc < 2) -+ { -+ g_print ("%s\n", g_option_context_get_help (option_context, TRUE, NULL)); -+ return EXIT_FAILURE; -+ } - devname = argv[1]; -+; -+ - fd = open (devname, O_RDWR); - if (fd < 0) - return EXIT_FAILURE; -diff --git a/src/discrete-detection/nouveau.c b/src/discrete-detection/nouveau.c -index 0a1f220..1d61cbb 100644 ---- a/src/discrete-detection/nouveau.c -+++ b/src/discrete-detection/nouveau.c -@@ -1,9 +1,10 @@ -- - #include - #include - #include -+#include - #include - #include -+#include - - #include - #include -@@ -14,23 +15,34 @@ - typedef int handle; - G_DEFINE_AUTO_CLEANUP_FREE_FUNC(handle, close, -1) - --int main(int argc, char** argv) -+int main (int argc, char** argv) - { -+ const gchar *devname = NULL; -+ g_auto(handle) fd = -1; -+ g_autofree void *device = NULL; -+ g_autoptr(GOptionContext) option_context = NULL; -+ g_autoptr(GError) error = NULL; -+ -+ setlocale (LC_ALL, ""); -+ option_context = g_option_context_new (""); -+ -+ if (!g_option_context_parse (option_context, &argc, &argv, &error)) { -+ g_print ("Failed to parse arguments: %s\n", error->message); -+ return EXIT_FAILURE; -+ } -+ - if (argc < 2) - { -- puts ("check-discrete-nouveau [DEVNAME]"); -+ g_print ("%s\n", g_option_context_get_help (option_context, TRUE, NULL)); - return EXIT_FAILURE; - } -- -- const char *devname; -- g_auto(handle) fd = -1; -- - devname = argv[1]; -+ - fd = open (devname, O_RDWR); - if (fd < 0) - return EXIT_FAILURE; - -- g_autofree void *device = malloc(352); -+ device = malloc(352); - - /* Init device */ - { -@@ -88,7 +100,6 @@ int main(int argc, char** argv) - if (drmCommandWriteRead (fd, DRM_NOUVEAU_NVIF, &args, sizeof(args))) - return EXIT_FAILURE; - -- - switch (args.info.platform) - { - case NV_DEVICE_INFO_V0_IGP: --- -2.46.0 - diff --git a/anda/apps/switcheroo-control/0008-main-add-udev-rule-for-i915.patch b/anda/apps/switcheroo-control/0008-main-add-udev-rule-for-i915.patch deleted file mode 100644 index b7a684a1c6..0000000000 --- a/anda/apps/switcheroo-control/0008-main-add-udev-rule-for-i915.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 462b09f02de37dfd2965d23cc7c4137bcf45a4ae Mon Sep 17 00:00:00 2001 -From: Jan200101 -Date: Wed, 14 Feb 2024 20:25:42 +0100 -Subject: [PATCH 08/10] main: add udev rule for i915 checking a lot of systems - has shown that the intel iGPU will always be available at `0000:00:02.0`. - Using ID_PATH would have been cleaner, but I couldn't get it to work. - -Signed-off-by: Jan200101 ---- - data/30-discrete-gpu.rules.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/data/30-discrete-gpu.rules.in b/data/30-discrete-gpu.rules.in -index a803ed4..f30f315 100644 ---- a/data/30-discrete-gpu.rules.in -+++ b/data/30-discrete-gpu.rules.in -@@ -1,3 +1,4 @@ - DRIVERS=="amdgpu", SUBSYSTEM=="drm", PROGRAM="@libexecdir@/check-discrete-amdgpu $env{DEVNAME}", TAG+="switcheroo-discrete-gpu" - DRIVERS=="nouveau", SUBSYSTEM=="drm", PROGRAM="@libexecdir@/check-discrete-nouveau $env{DEVNAME}", TAG+="switcheroo-discrete-gpu" --DRIVERS=="nvidia", TAG+="switcheroo-discrete-gpu" -+DRIVERS=="nvidia", SUBSYSTEM=="drm", TAG+="switcheroo-discrete-gpu" -+DRIVERS=="i915", SUBSYSTEM=="drm", DEVPATH!="/devices/pci0000:00/0000:00:02.0/drm/*", TAG+="switcheroo-discrete-gpu" --- -2.46.0 - diff --git a/anda/apps/switcheroo-control/0009-main-use-Discrete-key-in-switcherooctl.patch b/anda/apps/switcheroo-control/0009-main-use-Discrete-key-in-switcherooctl.patch deleted file mode 100644 index abb8fdf525..0000000000 --- a/anda/apps/switcheroo-control/0009-main-use-Discrete-key-in-switcherooctl.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 55db3aeaeb962952881f73e94432f750cfb64fc8 Mon Sep 17 00:00:00 2001 -From: Jan200101 -Date: Thu, 15 Feb 2024 16:24:00 +0100 -Subject: [PATCH 09/10] main: use Discrete key in switcherooctl - -Signed-off-by: Jan200101 ---- - src/switcherooctl.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/switcherooctl.in b/src/switcherooctl.in -index 96c21cc..c0e3f07 100755 ---- a/src/switcherooctl.in -+++ b/src/switcherooctl.in -@@ -77,6 +77,7 @@ def print_gpu(gpu, index): - print('Device:', index) - print(' Name: ', gpu['Name']) - print(' Default: ', "yes" if gpu['Default'] else "no") -+ print(' Discrete: ', "yes" if gpu['Discrete'] else "no") - print(' Environment:', env_to_str(gpu['Environment'])) - - def _list(): -@@ -126,7 +127,7 @@ def get_discrete_gpu(): - return None - - try: -- gpu = next(gpu for gpu in gpus if not gpu['Default']) -+ gpu = next(gpu for gpu in gpus if gpu['Discrete']) - except StopIteration: - return None - else: --- -2.46.0 - diff --git a/anda/apps/switcheroo-control/0010-main-use-new-GPU-list-on-uevent.patch b/anda/apps/switcheroo-control/0010-main-use-new-GPU-list-on-uevent.patch deleted file mode 100644 index 9f55d398e7..0000000000 --- a/anda/apps/switcheroo-control/0010-main-use-new-GPU-list-on-uevent.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 4232c75fe41158bb5063d630d36b3ffd6a8a57ec Mon Sep 17 00:00:00 2001 -From: Jan200101 -Date: Fri, 6 Sep 2024 22:31:56 +0200 -Subject: [PATCH 10/10] main: use new GPU list on uevent the amount of GPUs may - still be the same but underlying attributes may have changed On the ASUS TUF - Dash F15 running Fedora 40 6.10.7-200.fc40.x86_64 the udev tags are not - applied at the time switcheroo-control starts but at a later uevent they are - correct. Memory gets allocated anyways to check if the GPU count has changed, - so this shouldn't affect memory usage. - -Signed-off-by: Jan200101 ---- - src/switcheroo-control.c | 16 ++++++---------- - 1 file changed, 6 insertions(+), 10 deletions(-) - -diff --git a/src/switcheroo-control.c b/src/switcheroo-control.c -index 0f6a548..01954c7 100644 ---- a/src/switcheroo-control.c -+++ b/src/switcheroo-control.c -@@ -438,16 +438,12 @@ uevent_cb (GUdevClient *client, - - cards = get_drm_cards (data); - num_gpus = cards->len; -- if (num_gpus != data->num_gpus) { -- g_debug ("GPUs added or removed (old: %d new: %d)", -- data->num_gpus, num_gpus); -- g_ptr_array_free (data->cards, TRUE); -- data->cards = cards; -- data->num_gpus = cards->len; -- send_dbus_event (data); -- } else { -- g_ptr_array_free (cards, TRUE); -- } -+ g_debug ("GPUs updated (old: %d new: %d)", -+ data->num_gpus, num_gpus); -+ g_ptr_array_free (data->cards, TRUE); -+ data->cards = cards; -+ data->num_gpus = cards->len; -+ send_dbus_event (data); - } - - static void --- -2.46.0 - diff --git a/anda/apps/switcheroo-control/anda.hcl b/anda/apps/switcheroo-control/anda.hcl deleted file mode 100644 index 4e4b929667..0000000000 --- a/anda/apps/switcheroo-control/anda.hcl +++ /dev/null @@ -1,8 +0,0 @@ -project pkg { - rpm { - spec = "switcheroo-control.spec" - } - labels { - subrepo = "extras" - } -} diff --git a/anda/apps/switcheroo-control/switcheroo-control.spec b/anda/apps/switcheroo-control/switcheroo-control.spec deleted file mode 100644 index dde67c0bb2..0000000000 --- a/anda/apps/switcheroo-control/switcheroo-control.spec +++ /dev/null @@ -1,194 +0,0 @@ -Name: switcheroo-control -Version: 2.6 -Release: 8%{?dist} -Summary: D-Bus service to check the availability of dual-GPU - -License: GPLv3 -URL: https://gitlab.freedesktop.org/hadess/switcheroo-control/ -# URL from https://gitlab.freedesktop.org/hadess/switcheroo-control/-/releases -Source0: https://gitlab.freedesktop.org/hadess/switcheroo-control/uploads/86ea54ac7ddb901b6bf6e915209151f8/switcheroo-control-2.6.tar.xz -Patch: 0001-main-update-GPUs-comment-for-dbus-property.patch -Patch: 0002-main-add-Discrete-key.patch -Patch: 0003-tests-fix-integration-tests-without-UMockdev.patch -Patch: 0004-tests-add-tests-for-discrete-detection-with-mock-lib.patch -Patch: 0005-main-remove-leftover-and-fix-typo.patch -Patch: 0006-main-move-discrete-dependencies-out-of-main-deps.patch -Patch: 0007-main-use-glib-for-discrete-command-line-arguments.patch -Patch: 0008-main-add-udev-rule-for-i915.patch -Patch: 0009-main-use-Discrete-key-in-switcherooctl.patch -Patch: 0010-main-use-new-GPU-list-on-uevent.patch - -BuildRequires: gcc -BuildRequires: pkgconfig(gudev-1.0) -BuildRequires: pkgconfig(gio-2.0) -BuildRequires: gtk-doc -BuildRequires: meson -BuildRequires: systemd -BuildRequires: libdrm-devel -BuildRequires: python3-dbusmock -BuildRequires: umockdev - -%{?systemd_requires} - -%description -D-Bus service to check the availability of dual-GPU. - -%package docs -Summary: Documentation for %{name} -BuildArch: noarch - -%description docs - -This package contains the documentation for %{name}. - -%prep -%autosetup -p1 - - -%build -%meson -Dgtk_doc=true -%meson_build - - -%install -%meson_install - -%post -if [ $1 -eq 2 ] && [ -x /usr/bin/systemctl ] ; then - /usr/bin/systemctl daemon-reload -fi -%systemd_post switcheroo-control.service -%udev_hwdb_update - -%preun -%systemd_preun switcheroo-control.service - -%postun -%systemd_postun_with_restart switcheroo-control.service -%udev_hwdb_update - -%files -%license COPYING -%doc NEWS README.md -%{_bindir}/switcherooctl -%{_datadir}/dbus-1/system.d/net.hadess.SwitcherooControl.conf -%{_unitdir}/switcheroo-control.service -%{_libexecdir}/switcheroo-control -%{_udevhwdbdir}/30-pci-intel-gpu.hwdb -%{_mandir}/man1/switcherooctl.1* -%{_libexecdir}/check-discrete-amdgpu -%{_libexecdir}/check-discrete-nouveau -%{_udevrulesdir}/30-discrete-gpu.rules - -%files docs -%dir %{_datadir}/gtk-doc/ -%dir %{_datadir}/gtk-doc/html/ -%{_datadir}/gtk-doc/html/%{name}/ - -%changelog -* Fri Sep 06 2024 Jan200101 - 2.6-8 -- Update discrete patch - -* Thu Feb 15 2024 Jan Drögehoff - 2.6-7 -- Update discrete patch - -* Wed Feb 14 2024 Jan Drögehoff - 2.6-6 -- Add discrete patch - -* Sat Jan 27 2024 Fedora Release Engineering - 2.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 2.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 2.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 2.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jul 01 2022 Bastien Nocera - 2.6-1 -+ switcheroo-control-2.6-1 -- Update to 2.6 - -* Fri Apr 29 2022 Bastien Nocera - 2.5-1 -+ switcheroo-control-2.5-1 -- Update to 2.5 - -* Sat Jan 22 2022 Fedora Release Engineering - 2.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 2.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.4-3 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Wed Jan 27 2021 Fedora Release Engineering - 2.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jan 04 2021 Bastien Nocera - 2.4-1 -+ switcheroo-control-2.4-1 -- Update to 2.4 - -* Wed Jul 29 2020 Fedora Release Engineering - 2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Apr 27 2020 Bastien Nocera - 2.2-1 -+ switcheroo-control-2.2-1 -- Update to 2.2 - -* Fri Jan 31 2020 Fedora Release Engineering - 2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jan 02 2020 Bastien Nocera - 2.1-1 -+ switcheroo-control-2.1-1 -- Update to 2.1 -- Fix crasher on startup (#1786846) - -* Thu Nov 21 2019 Bastien Nocera - 2.0-2 -+ switcheroo-control-2.0-2 -- Fix post scripts not reloading service file - -* Tue Nov 05 2019 Bastien Nocera - 2.0-1 -+ switcheroo-control-2.0-1 -- Update to 2.0 - -* Sat Jul 27 2019 Fedora Release Engineering - 1.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Jun 17 2019 Bastien Nocera - 1.3.1-1 -+ switcheroo-control-1.3.1-1 -- Fix Secure Boot work-around - -* Wed Jun 12 2019 Bastien Nocera - 1.3-1 -+ switcheroo-control-1.3-1 -- Update to 1.3 -- Fix operation with SecureBoot enabled - -* Sun Feb 03 2019 Fedora Release Engineering - 1.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 1.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Nov 04 2016 Bastien Nocera - 1.1-1 -+ switcheroo-control-1.1-1 -- Update to 1.1 -- Don't throw errors when the machine doesn't have dual-GPU (#1391212) - -* Fri Oct 21 2016 Kalev Lember - 1.0-1 -- Initial Fedora packaging diff --git a/anda/apps/switcheroo-control/update.rhai b/anda/apps/switcheroo-control/update.rhai deleted file mode 100644 index f2a0c871d7..0000000000 --- a/anda/apps/switcheroo-control/update.rhai +++ /dev/null @@ -1 +0,0 @@ -rpm.version(gitlab("gitlab.freedesktop.org", "4339")); diff --git a/anda/desktops/gnome/gnome-shell/0001-gdm-Work-around-failing-fingerprint-auth.patch b/anda/desktops/gnome/gnome-shell/0001-gdm-Work-around-failing-fingerprint-auth.patch deleted file mode 100644 index 2baa7b6829..0000000000 --- a/anda/desktops/gnome/gnome-shell/0001-gdm-Work-around-failing-fingerprint-auth.patch +++ /dev/null @@ -1,67 +0,0 @@ -From ff73f820b1398e5d60b8984b0003db46ad70b8ec Mon Sep 17 00:00:00 2001 -From: Benjamin Berg -Date: Wed, 28 Apr 2021 16:50:03 +0200 -Subject: [PATCH] gdm: Work around failing fingerprint auth - -On Fedora we have the problem that fingerprint auth fails immediately if -the PAM configuration has not been updated and no prints are enrolled. - -So, consider a verification failure within one second to be a service -failure instead. ---- - js/gdm/util.js | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/js/gdm/util.js b/js/gdm/util.js -index 97df6d687e..371953cb25 100644 ---- a/js/gdm/util.js -+++ b/js/gdm/util.js -@@ -109,6 +109,7 @@ export class ShellUserVerifier extends Signals.EventEmitter { - this._defaultService = null; - this._preemptingService = null; - this._fingerprintReaderType = FingerprintReaderType.NONE; -+ this._fprintStartTime = -1; - - this._messageQueue = []; - this._messageQueueTimeoutId = 0; -@@ -669,6 +670,10 @@ export class ShellUserVerifier extends Signals.EventEmitter { - this._hold.acquire(); - try { - this._activeServices.add(serviceName); -+ -+ if (serviceName == FINGERPRINT_SERVICE_NAME) -+ this._fprintStartTime = GLib.get_monotonic_time(); -+ - if (this._userName) { - await this._userVerifier.call_begin_verification_for_user( - serviceName, this._userName, this._cancellable); -@@ -763,6 +768,7 @@ export class ShellUserVerifier extends Signals.EventEmitter { - const cancellable = this._cancellable; - this._fingerprintFailedId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, - FINGERPRINT_ERROR_TIMEOUT_WAIT, () => { -+ log("Generating _verificationFailed!"); - this._fingerprintFailedId = 0; - if (!cancellable.is_cancelled()) - this._verificationFailed(serviceName, false); -@@ -829,6 +835,18 @@ export class ShellUserVerifier extends Signals.EventEmitter { - if (serviceName === FINGERPRINT_SERVICE_NAME) { - if (this._fingerprintFailedId) - GLib.source_remove(this._fingerprintFailedId); -+ -+ // On Fedora we have the problem that fingerprint auth fails -+ // immediately if the PAM configuration has not been updated and no -+ // prints are enrolled. -+ // So, consider a verification failure within one second to be a service -+ // failure instead. -+ if (this._fprintStartTime > GLib.get_monotonic_time() - GLib.USEC_PER_SEC) { -+ log("Fingerprint service failed almost immediately, considering it unavailable."); -+ log("Please fix your configuration by running: authselect select --force sssd with-fingerprint with-silent-lastlog"); -+ this._onServiceUnavailable(this._client, serviceName, null); -+ return; -+ } - } - - // For Not Listed / enterprise logins, immediately reset --- -2.43.2 - diff --git a/anda/desktops/gnome/gnome-shell/0001-status-keyboard-Add-a-catch-around-reload-call.patch b/anda/desktops/gnome/gnome-shell/0001-status-keyboard-Add-a-catch-around-reload-call.patch deleted file mode 100644 index 20717d1caf..0000000000 --- a/anda/desktops/gnome/gnome-shell/0001-status-keyboard-Add-a-catch-around-reload-call.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 78a733bae62f8af15f0771d7efde55473f295e46 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Wed, 16 Aug 2023 18:46:54 -0400 -Subject: [PATCH 1/3] status/keyboard: Add a catch around reload call - -Now that system input settings can get used in the user session -they're getting seen by the tests and the tests are complaining: - -Unhandled promise rejection. To suppress this warning, add an -error handler to your promise chain with .catch() or a try-catch block -around your await expression. - -This commit adds the catch it's asking for. ---- - js/ui/status/keyboard.js | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js -index cfc0a01f6b..4ef2f355d3 100644 ---- a/js/ui/status/keyboard.js -+++ b/js/ui/status/keyboard.js -@@ -204,7 +204,9 @@ class InputSourceSystemSettings extends InputSourceSettings { - this._options = ''; - this._model = ''; - -- this._reload(); -+ this._reload().catch(error => { -+ logError(error, 'Could not reload system input settings'); -+ }); - - Gio.DBus.system.signal_subscribe(this._BUS_NAME, - this._BUS_PROPS_IFACE, --- -2.43.1 - diff --git a/anda/desktops/gnome/gnome-shell/0002-status-keyboard-Load-keyboard-from-system-settings-i.patch b/anda/desktops/gnome/gnome-shell/0002-status-keyboard-Load-keyboard-from-system-settings-i.patch deleted file mode 100644 index 7b0ac52eae..0000000000 --- a/anda/desktops/gnome/gnome-shell/0002-status-keyboard-Load-keyboard-from-system-settings-i.patch +++ /dev/null @@ -1,136 +0,0 @@ -From 0c0cc4ce1d3e08eba3e701d565398e01aa479ff7 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Wed, 16 Aug 2023 11:13:39 -0400 -Subject: [PATCH 2/3] status/keyboard: Load keyboard from system settings if - gsettings unconfigured - -Right now if a user hasn't configured their input sources, the code -falls back to -using the current layout on Xorg and the mutter default with wayland. - -This commit changes the code to instead fall back to using the system -default (as configured by localed). ---- - js/ui/status/keyboard.js | 62 +++++++++++++++++++++++++++++++--------- - 1 file changed, 48 insertions(+), 14 deletions(-) - -diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js -index 4ef2f355d3..d91eb41bc6 100644 ---- a/js/ui/status/keyboard.js -+++ b/js/ui/status/keyboard.js -@@ -22,6 +22,9 @@ import * as Util from '../../misc/util.js'; - export const INPUT_SOURCE_TYPE_XKB = 'xkb'; - export const INPUT_SOURCE_TYPE_IBUS = 'ibus'; - -+const DESKTOP_INPUT_SOURCES_SCHEMA = 'org.gnome.desktop.input-sources'; -+const KEY_INPUT_SOURCES = 'sources'; -+ - export const LayoutMenuItem = GObject.registerClass( - class LayoutMenuItem extends PopupMenu.PopupBaseMenuItem { - _init(displayName, shortName) { -@@ -278,18 +281,16 @@ class InputSourceSystemSettings extends InputSourceSettings { - } - - class InputSourceSessionSettings extends InputSourceSettings { -- constructor() { -+ constructor(settings) { - super(); - -- this._DESKTOP_INPUT_SOURCES_SCHEMA = 'org.gnome.desktop.input-sources'; -- this._KEY_INPUT_SOURCES = 'sources'; - this._KEY_MRU_SOURCES = 'mru-sources'; - this._KEY_KEYBOARD_OPTIONS = 'xkb-options'; - this._KEY_KEYBOARD_MODEL = 'xkb-model'; - this._KEY_PER_WINDOW = 'per-window'; - -- this._settings = new Gio.Settings({schema_id: this._DESKTOP_INPUT_SOURCES_SCHEMA}); -- this._settings.connect(`changed::${this._KEY_INPUT_SOURCES}`, this._emitInputSourcesChanged.bind(this)); -+ this._settings = settings; -+ this._settings.connect(`changed::${KEY_INPUT_SOURCES}`, this._emitInputSourcesChanged.bind(this)); - this._settings.connect(`changed::${this._KEY_KEYBOARD_OPTIONS}`, this._emitKeyboardOptionsChanged.bind(this)); - this._settings.connect(`changed::${this._KEY_KEYBOARD_MODEL}`, this._emitKeyboardModelChanged.bind(this)); - this._settings.connect(`changed::${this._KEY_PER_WINDOW}`, this._emitPerWindowChanged.bind(this)); -@@ -308,7 +309,7 @@ class InputSourceSessionSettings extends InputSourceSettings { - } - - get inputSources() { -- return this._getSourcesList(this._KEY_INPUT_SOURCES); -+ return this._getSourcesList(KEY_INPUT_SOURCES); - } - - get mruSources() { -@@ -363,13 +364,6 @@ export class InputSourceManager extends Signals.EventEmitter { - Meta.KeyBindingFlags.IS_REVERSED, - Shell.ActionMode.ALL, - this._switchInputSource.bind(this)); -- if (Main.sessionMode.isGreeter) -- this._settings = new InputSourceSystemSettings(); -- else -- this._settings = new InputSourceSessionSettings(); -- this._settings.connect('input-sources-changed', this._inputSourcesChanged.bind(this)); -- this._settings.connect('keyboard-options-changed', this._keyboardOptionsChanged.bind(this)); -- this._settings.connect('keyboard-model-changed', this._keyboardModelChanged.bind(this)); - - this._xkbInfo = KeyboardManager.getXkbInfo(); - this._keyboardManager = KeyboardManager.getKeyboardManager(); -@@ -381,16 +375,56 @@ export class InputSourceManager extends Signals.EventEmitter { - this._ibusManager.connect('property-updated', this._ibusPropertyUpdated.bind(this)); - this._ibusManager.connect('set-content-type', this._ibusSetContentType.bind(this)); - -+ this._inputSettings = new Gio.Settings({schema_id: DESKTOP_INPUT_SOURCES_SCHEMA}); -+ this._setupInputSettings(); -+ - global.display.connect('modifiers-accelerator-activated', this._modifiersSwitcher.bind(this)); - - this._sourcesPerWindow = false; - this._focusWindowNotifyId = 0; -- this._settings.connect('per-window-changed', this._sourcesPerWindowChanged.bind(this)); - this._sourcesPerWindowChanged(); - this._disableIBus = false; - this._reloading = false; - } - -+ _sessionHasNoInputSettings() { -+ return this._inputSettings.get_user_value(KEY_INPUT_SOURCES) === null; -+ } -+ -+ _reloadInputSettings() { -+ const hadNoSessionInputSettings = this._hasNoSessionInputSettings; -+ -+ if (Main.sessionMode.isGreeter) -+ this._hasNoSessionInputSettings = true; -+ else -+ this._hasNoSessionInputSettings = this._sessionHasNoInputSettings(); -+ -+ if (this._settings && hadNoSessionInputSettings === this._hasNoSessionInputSettings) -+ return; -+ -+ this._settings?.disconnectObject(this); -+ -+ if (this._hasNoSessionInputSettings) -+ this._settings = new InputSourceSystemSettings(); -+ else -+ this._settings = new InputSourceSessionSettings(this._inputSettings); -+ -+ this._settings.connectObject( -+ 'input-sources-changed', this._inputSourcesChanged.bind(this), -+ 'keyboard-options-changed', this._keyboardOptionsChanged.bind(this), -+ 'keyboard-model-changed', this._keyboardModelChanged.bind(this), -+ 'per-window-changed', this._sourcesPerWindowChanged.bind(this), -+ this); -+ this.reload(); -+ } -+ -+ _setupInputSettings() { -+ if (!Main.sessionMode.isGreeter) -+ this._inputSettings.connect(`changed::${KEY_INPUT_SOURCES}`, this._reloadInputSettings.bind(this)); -+ -+ this._reloadInputSettings(); -+ } -+ - reload() { - this._reloading = true; - this._keyboardManager.setKeyboardOptions(this._settings.keyboardOptions); --- -2.43.1 - diff --git a/anda/desktops/gnome/gnome-shell/0003-status-keyboard-Use-gnome-desktop-API-for-getting-de.patch b/anda/desktops/gnome/gnome-shell/0003-status-keyboard-Use-gnome-desktop-API-for-getting-de.patch deleted file mode 100644 index 3e8af0cabc..0000000000 --- a/anda/desktops/gnome/gnome-shell/0003-status-keyboard-Use-gnome-desktop-API-for-getting-de.patch +++ /dev/null @@ -1,128 +0,0 @@ -From d060baeb69a2a7d80fe403fc8eec90e20aa6cb7f Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Wed, 16 Aug 2023 14:09:50 -0400 -Subject: [PATCH 3/3] status/keyboard: Use gnome-desktop API for getting - default input sources list - -At the moment, gnome-shell tries to figure out the default input sources -from localed. It fails to take into account the system locale and input -methods. - -This commit switches it to use a new function in gnome-desktop, -gnome_get_default_input_sources, which does most of the heavy -lifting itself, instead. ---- - js/ui/status/keyboard.js | 59 ++++++++++++++++++---------------------- - 1 file changed, 27 insertions(+), 32 deletions(-) - -diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js -index d91eb41bc6..19c36031f6 100644 ---- a/js/ui/status/keyboard.js -+++ b/js/ui/status/keyboard.js -@@ -3,6 +3,7 @@ - import Clutter from 'gi://Clutter'; - import Gio from 'gi://Gio'; - import GLib from 'gi://GLib'; -+import GnomeDesktop from 'gi://GnomeDesktop'; - import GObject from 'gi://GObject'; - import IBus from 'gi://IBus'; - import Meta from 'gi://Meta'; -@@ -25,6 +26,8 @@ export const INPUT_SOURCE_TYPE_IBUS = 'ibus'; - const DESKTOP_INPUT_SOURCES_SCHEMA = 'org.gnome.desktop.input-sources'; - const KEY_INPUT_SOURCES = 'sources'; - -+Gio._promisify(GnomeDesktop, 'get_default_input_sources'); -+ - export const LayoutMenuItem = GObject.registerClass( - class LayoutMenuItem extends PopupMenu.PopupBaseMenuItem { - _init(displayName, shortName) { -@@ -202,9 +205,9 @@ class InputSourceSystemSettings extends InputSourceSettings { - this._BUS_IFACE = 'org.freedesktop.locale1'; - this._BUS_PROPS_IFACE = 'org.freedesktop.DBus.Properties'; - -- this._layouts = ''; -- this._variants = ''; -- this._options = ''; -+ this._inputSourceIds = []; -+ this._inputSourceTypes = []; -+ this._options = []; - this._model = ''; - - this._reload().catch(error => { -@@ -221,30 +224,22 @@ class InputSourceSystemSettings extends InputSourceSettings { - } - - async _reload() { -- let props; -+ let inputSourceIds; -+ let inputSourceTypes; -+ let options; -+ let model; - try { -- const result = await Gio.DBus.system.call( -- this._BUS_NAME, -- this._BUS_PATH, -- this._BUS_PROPS_IFACE, -- 'GetAll', -- new GLib.Variant('(s)', [this._BUS_IFACE]), -- null, Gio.DBusCallFlags.NONE, -1, null); -- [props] = result.deepUnpack(); -+ [inputSourceIds, inputSourceTypes, options, model] = -+ await GnomeDesktop.get_default_input_sources(null); - } catch (e) { -- log(`Could not get properties from ${this._BUS_NAME}`); -+ logError(e, 'Could not get default input sources'); - return; - } - -- const layouts = props['X11Layout'].unpack(); -- const variants = props['X11Variant'].unpack(); -- const options = props['X11Options'].unpack(); -- const model = props['X11Model'].unpack(); -- -- if (layouts !== this._layouts || -- variants !== this._variants) { -- this._layouts = layouts; -- this._variants = variants; -+ if (inputSourceIds !== this._inputSourceIds || -+ inputSourceTypes !== this._inputSourceTypes) { -+ this._inputSourceIds = inputSourceIds; -+ this._inputSourceTypes = inputSourceTypes; - this._emitInputSourcesChanged(); - } - if (options !== this._options) { -@@ -258,21 +253,21 @@ class InputSourceSystemSettings extends InputSourceSettings { - } - - get inputSources() { -- let sourcesList = []; -- let layouts = this._layouts.split(','); -- let variants = this._variants.split(','); -- -- for (let i = 0; i < layouts.length && !!layouts[i]; i++) { -- let id = layouts[i]; -- if (variants[i]) -- id += `+${variants[i]}`; -- sourcesList.push({type: INPUT_SOURCE_TYPE_XKB, id}); -+ let sourcesList; -+ -+ if (this._inputSourceIds) { -+ sourcesList = this._inputSourceIds.map((id, index) => { -+ return {type: this._inputSourceTypes[index], id}; -+ }); -+ } else { -+ sourcesList = []; - } -+ - return sourcesList; - } - - get keyboardOptions() { -- return this._options.split(','); -+ return this._options; - } - - get keyboardModel() { --- -2.43.1 - diff --git a/anda/desktops/gnome/gnome-shell/3193.patch b/anda/desktops/gnome/gnome-shell/3193.patch deleted file mode 100644 index d4dd536ce2..0000000000 --- a/anda/desktops/gnome/gnome-shell/3193.patch +++ /dev/null @@ -1,98 +0,0 @@ -From c8c05c4a142f3de9c17a9ca83692dda364abccc8 Mon Sep 17 00:00:00 2001 -From: Jan200101 -Date: Thu, 15 Feb 2024 16:05:40 +0100 -Subject: [PATCH] shell-app: Improve discrete GPU detection - ---- - .../net.hadess.SwitcherooControl.xml | 3 +- - src/shell-app.c | 60 +++++++++++++++++++ - 2 files changed, 62 insertions(+), 1 deletion(-) - -diff --git a/data/dbus-interfaces/net.hadess.SwitcherooControl.xml b/data/dbus-interfaces/net.hadess.SwitcherooControl.xml -index e52bc1a0d25..59a889654f4 100644 ---- a/data/dbus-interfaces/net.hadess.SwitcherooControl.xml -+++ b/data/dbus-interfaces/net.hadess.SwitcherooControl.xml -@@ -38,7 +38,8 @@ - will contain a user-facing name for the GPU, the "Environment" (as) key will - contain an array of even number of strings, each being an environment - variable to set to use the GPU, followed by its value, the "Default" (b) key -- will tag the default (usually integrated) GPU. -+ will tag the default GPU, the "Discrete" (b) key tags if the GPU is a -+ dedicated component. - --> - - -diff --git a/src/shell-app.c b/src/shell-app.c -index 371bc6cf762..39f220ba954 100644 ---- a/src/shell-app.c -+++ b/src/shell-app.c -@@ -1300,6 +1300,66 @@ apply_discrete_gpu_env (GAppLaunchContext *context, - } - - num_children = g_variant_n_children (variant); -+ -+ // Check if the Default GPU is Discrete -+ for (i = 0; i < num_children; i++) -+ { -+ g_autoptr(GVariant) gpu = NULL; -+ g_autoptr(GVariant) env = NULL; -+ g_autoptr(GVariant) default_variant = NULL; -+ g_autoptr(GVariant) discrete_variant = NULL; -+ g_autofree const char **env_s = NULL; -+ -+ gpu = g_variant_get_child_value (variant, i); -+ if (!gpu || -+ !g_variant_is_of_type (gpu, G_VARIANT_TYPE ("a{s*}"))) -+ continue; -+ -+ /* Skip over non-default GPUs */ -+ default_variant = g_variant_lookup_value (gpu, "Default", NULL); -+ if (!default_variant || !g_variant_get_boolean (default_variant)) -+ continue; -+ -+ /* break out if default GPU is not discrete */ -+ discrete_variant = g_variant_lookup_value (gpu, "Discrete", NULL); -+ if (!discrete_variant || !g_variant_get_boolean (discrete_variant)) -+ break; -+ -+ // Default GPU is discrete, no need to do anything -+ return; -+ } -+ -+ // Find the first Discrete GPU -+ for (i = 0; i < num_children; i++) -+ { -+ g_autoptr(GVariant) gpu = NULL; -+ g_autoptr(GVariant) env = NULL; -+ g_autoptr(GVariant) discrete_variant = NULL; -+ g_autofree const char **env_s = NULL; -+ guint j; -+ -+ gpu = g_variant_get_child_value (variant, i); -+ if (!gpu || -+ !g_variant_is_of_type (gpu, G_VARIANT_TYPE ("a{s*}"))) -+ continue; -+ -+ /* Skip over non-discrete GPUs */ -+ discrete_variant = g_variant_lookup_value (gpu, "Discrete", NULL); -+ if (!discrete_variant || !g_variant_get_boolean (discrete_variant)) -+ continue; -+ -+ env = g_variant_lookup_value (gpu, "Environment", NULL); -+ if (!env) -+ continue; -+ -+ env_s = g_variant_get_strv (env, NULL); -+ for (j = 0; env_s[j] != NULL; j = j + 2) -+ g_app_launch_context_setenv (context, env_s[j], env_s[j+1]); -+ return; -+ } -+ -+ // fallback to old behavior -+ // find the first non-Default GPU - for (i = 0; i < num_children; i++) - { - g_autoptr(GVariant) gpu = NULL; --- -GitLab - diff --git a/anda/desktops/gnome/gnome-shell/anda.hcl b/anda/desktops/gnome/gnome-shell/anda.hcl deleted file mode 100644 index 2b9ead9f9e..0000000000 --- a/anda/desktops/gnome/gnome-shell/anda.hcl +++ /dev/null @@ -1,9 +0,0 @@ -project pkg { - rpm { - spec = "gnome-shell.spec" - } - labels { - subrepo = "extras" - updbranch = 1 - } -} diff --git a/anda/desktops/gnome/gnome-shell/changelog b/anda/desktops/gnome/gnome-shell/changelog deleted file mode 100644 index 260698e2e2..0000000000 --- a/anda/desktops/gnome/gnome-shell/changelog +++ /dev/null @@ -1,1484 +0,0 @@ -* Sat Mar 25 2023 Adam Williamson - 44.0-4 -- Backport MR #2725 - *another* fix for screenshot notifications - -* Fri Mar 24 2023 Adam Williamson - 44.0-3 -- Backport a fix for screenshot notifications - -* Sun Mar 19 2023 Florian Müllner - 44.0-2 -- Fix timed logout - Resolves: #2177853 - -* Sun Mar 19 2023 Florian Müllner - 44.0-1 -- Update to 44.0 - -* Tue Mar 14 2023 Dominik Mierzejewski - 44~rc-2 -- Recommend gnome-bluetooth instead of requiring it - Resolves rhbz#2172653 - -* Mon Mar 06 2023 Florian Müllner - 44~rc-1 -- Update to 44.rc - -* Sun Mar 05 2023 Ray Strode - 44~beta-3 -- Fix slowdown in at shutdown - Resolves: #2174753 - -* Mon Feb 20 2023 Adam Williamson - 44~beta-2 -- Rebuild without changes for Bodhi reasons - -* Tue Feb 14 2023 Florian Müllner - 44~beta-1 -- Update to 44.beta - -* Thu Jan 19 2023 Fedora Release Engineering - 43.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Nov 21 2022 Adam Williamson - 43.1-4 -- Backport MR #2548 to fix keyboard shortcut inhibiting - -* Thu Nov 17 2022 Jonas Ådahl - 43.1-3 -- Backport missing screencast if gstreamer1-vaapi is installed - -* Wed Nov 16 2022 Adam Williamson - 43.1-2 -- Backport MR #2534 to fix layout switching in password entries - -* Fri Nov 04 2022 Florian Müllner - 43.1-1 -- Update to 43.1 - -* Tue Oct 11 2022 Adam Williamson - 43.0-3 -- Backport MR2508 to fix OSK space entry (#2131837) - -* Thu Sep 22 2022 Kalev Lember - 43.0-2 -- Backport MR2487 and MR2495 to fix input sources sorting (#2121110) - -* Sat Sep 17 2022 Florian Müllner - 43.0-1 -- Update to 43.0 - -* Thu Sep 15 2022 Kalev Lember - 43~rc-3 -- Backport a fix for initial setup session input sources sorting (#2121110) - -* Tue Sep 06 2022 Kalev Lember - 43~rc-2 -- Backport upstream fix to fix boot options (#2124043) - -* Sun Sep 04 2022 Florian Müllner - 43~rc-1 -- Update to 43.rc - -* Fri Sep 02 2022 Kalev Lember - 43~beta-3 -- Add missing dep on gcr - -* Thu Aug 11 2022 Kalev Lember - 43~beta-2 -- Bump minimum required gjs version - -* Wed Aug 10 2022 Florian Müllner - 43~beta-1 -- Update to 43.beta - -* Thu Jul 21 2022 Fedora Release Engineering - 43~alpha-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Jul 19 2022 Milan Crha - 43~alpha-2 -- Rebuilt for evolution-data-server soname version bump -- Add patch to port to gcr4 - -* Sun Jul 10 2022 Florian Müllner - 43~alpha-1 -- Update to 43.alpha - -* Sat May 28 2022 Florian Müllner - 42.2-1 -- Update to 42.2 - -* Fri May 06 2022 Florian Müllner - 42.1-1 -- Update to 42.1 - -* Mon Apr 18 2022 Florian Müllner - 42.0-3 -- Fix monitor config switches with p (#2073406) -- Fix stuck cover pane after startup animation (#2063156) - -* Tue Mar 15 2022 Adam Williamson - 42.0-2 -- Backport MR #2242 to fix new user default folder creation (#2064473) - -* Sun Mar 13 2022 Florian Müllner - 42.0-1 -- Update to 42.0 - -* Wed Mar 09 2022 Adam Williamson - 42~rc-2 -- Backport MR #2238 to fix crashes on first login - -* Mon Mar 07 2022 Florian Müllner - 42~rc-1 -- Update to 42.rc - -* Tue Mar 01 2022 Adam Williamson - 42~beta-4 -- Update the MR #2185 backport - -* Tue Mar 01 2022 Adam Williamson - 42~beta-3 -- Backport MR #2185 to fix some styling issues at lower resolutions - -* Wed Feb 16 2022 David King - 42~beta-2 -- Update some dependency versions - -* Tue Feb 15 2022 Florian Müllner - 42~beta-1 -- Update to 42.beta - -* Thu Jan 20 2022 Fedora Release Engineering - 42~alpha-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jan 14 2022 David King - 42~alpha-2 -- Fix gweather4 dependency - -* Fri Jan 14 2022 David King - 42~alpha-1 -- Update to 42.alpha -- Use pkgconfig for BuildRequires - -* Fri Oct 29 2021 Adam Williamson - 41.0-8 -- Backport MR #2011 to further fix unexpected scrolling (#2017192) - -* Wed Oct 27 2021 Ray Strode - 41.0-7 -- Use correct patch for fixing unlock screen confusion - -* Tue Oct 26 2021 Jonas Ådahl - 41.0-6 -- Work around crashy tear down - -* Tue Oct 26 2021 Ray Strode - 41.0-5 -- Fix unlock screen confusion when hitting escape too much - -* Tue Oct 12 2021 Ray Strode - 41.0-4 -- Fix StPasswordEntry crash - Resolves: #2009637 - -* Thu Oct 07 2021 Adam Williamson - 41.0-3 -- Backport MR #1983 to fix wrong OSD icons (#2011872) - -* Tue Oct 05 2021 Kalev Lember - 41.0-2 -- Backport upstream patch to fix scrolling to incorrect positions - -* Sun Sep 19 2021 Florian Müllner - 41.0-1 -- Update to 41.0 - -* Tue Sep 14 2021 Ray Strode - 41~rc.1-2 -- Drop extra capabilities from gnome-shell. They're optional and they break shutdown from the login screen with new glibs. - Resolves: #1996998 - -* Tue Sep 07 2021 Florian Müllner - 41~rc.1-1 -- Update to 41.rc.1 - -* Sun Sep 05 2021 Florian Müllner - 41~rc-1 -- Update to 41.rc - -* Wed Aug 18 2021 Florian Müllner - 41~beta-1 -- Update to 41.beta - -* Thu Jul 22 2021 Fedora Release Engineering - 40.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Jul 12 2021 Florian Müllner - 40.3-1 -- Update to 40.3 - -* Thu Jun 10 2021 Florian Müllner - 40.2-1 -- Update to 40.2 - -* Thu May 13 2021 Florian Müllner - 40.1-1 -- Update to 40.1 - -* Fri Apr 30 2021 Kalev Lember - 40.0-6 -- Move gnome-tour dep here from gnome-initial-setup (#1955179) - -* Wed Apr 28 2021 Benjamin Berg - 40.0-5 -- Update fix for password auth after background service failure - Related: #1942443 - -* Fri Apr 23 2021 Benjamin Berg - 40.0-4 -- Fix password auth after secondary service failure - Related: #1942443 - -* Tue Apr 13 2021 Adam Williamson - 40.0-3 -- Fix scrolling between workspaces/app grid pages with PgUp/PgDn - -* Tue Apr 13 2021 Ray Strode - 40.0-2 -- Fix timed login when user list is disabled - Resolves: #1940618 - -* Sat Mar 20 2021 Florian Müllner - 40.0-1 -- Update to 40.0 - -* Mon Mar 15 2021 Florian Müllner - 40.0~rc-1 -- Update to 40.rc - -* Thu Mar 11 2021 Kalev Lember - 40.0~beta-4.20210304git7a57528bd -- Recommend gnome-session-xsession rather than hard-require it - -* Mon Mar 08 2021 Florian Müllner - 40.0~beta-3.20210304git40.7a57528bd -- Fix crash after launching apps via drag-and-drop - -* Thu Mar 04 2021 Florian Müllner - 40.0~beta-2.20210304git40.7a57528bd -- Build snapshot of current upstream - -* Tue Feb 23 2021 Florian Müllner - 40.0~beta-1 -- Update to 40.beta - -* Mon Feb 22 2021 Kalev Lember - 40.0~alpha.1.1-9.20210212git829a096ba -- Add missing requires on gstreamer1-plugins-good and xdg-user-dirs-gtk (#1931342) - -* Sun Feb 14 2021 Florian Müllner - 40.0~alpha.1.1-8.20210212git829a096ba -- Only open app picker on left-click/touch - -* Sun Feb 14 2021 Florian Müllner - 40.0~alpha.1.1-7.20210212git829a096ba -- Don't open app picker when clicking minimap - -* Fri Feb 12 2021 Florian Müllner - 40.0~alpha.1.1-6.20210212git829a096ba -- Update snapshot to current upstream -- Allow opening app picker by clicking overview background - -* Fri Feb 12 2021 Milan Crha - 40.0~alpha.1.1-5.20210202git9ce666ac1 -- Rebuilt for evolution-data-server soname version bump - -* Tue Feb 02 2021 Florian Müllner - 40.0~alpha.1.1-4.20210202git9ce666ac1 -- Build snapshot of current upstream - -* Tue Jan 26 2021 Fedora Release Engineering - 40.0~alpha.1.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jan 19 2021 Kalev Lember - 40.0~alpha.1.1-2 -- Require libgweather >= 40~alpha for new application_id property - -* Mon Jan 18 2021 Florian Müllner - 40.alpha.1.1-1 -- Update to 40.alpha.1.1 - -* Fri Jan 15 2021 Florian Müllner - 40.alpha.1-1 -- Update to 40.alpha.1 - -* Wed Dec 02 2020 Florian Müllner - 40.alpha-1 -- Update to 40.alpha - -* Tue Oct 13 2020 Florian Müllner - 3.38.1-2 -- Fix crash on size change (non-)transitions - -* Mon Oct 05 2020 Florian Müllner - 3.38.1-1 -- Update to 3.38.1 - -* Tue Sep 29 2020 David King - 3.38.0-2 -- Better specify xdg-desktop-portal-gtk dependency (#1882894) - -* Mon Sep 14 2020 Florian Müllner - 3.38.0-1 -- Update to 3.38.0 - -* Thu Sep 10 2020 Kalev Lember - 3.37.92-5 -- Set minimum gnome-settings-daemon version for Screencast proxy changes - -* Wed Sep 09 2020 Kalev Lember - 3.37.92-4 -- Add missing pipewire-gstreamer dependency for screen recorder - -* Sun Sep 06 2020 Florian Müllner - 3.37.92-1 -- Update to 3.37.92 - -* Wed Sep 02 2020 Florian Müllner - 3.37.91-3 -- Add missing pipewire dependency for screen recorder - -* Wed Aug 26 2020 Kalev Lember - 3.37.91-2 -- Add PolicyKit-authentication-agent virtual provides - -* Mon Aug 24 2020 Florian Müllner - 3.37.91-1 -- Update to 3.37.91 - -* Sun Aug 23 2020 Kalev Lember - 3.37.90-2 -- Backport a fix for launching apps under X11 (#1870234) - -* Fri Aug 14 2020 Florian Müllner - 3.37.90-1 -- Update to 3.37.90 - -* Sat Aug 01 2020 Fedora Release Engineering - 3.37.3-4 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 3.37.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 13 2020 Milan Crha - 3.37.3-2 -- Rebuilt for evolution-data-server soname version bump - -* Tue Jul 07 2020 Florian Müllner - 3.37.3-1 -- Update to 3.37.3 - -* Fri Jul 03 2020 Milan Crha - 3.37.2-2 -- Rebuilt for evolution-data-server soname version bump - -* Wed Jun 03 2020 Florian Müllner - 3.37.2-1 -- Update to 3.37.2 - -* Wed May 20 2020 Stephen Gallagher - 3.37.1-3 -- Fix crashes when locking the screen while certain extensions are active -- Resolves: rhbz#1817082 - -* Mon May 04 2020 Adam Williamson - 3.37.1-2 -- Fix panel to show input methods (MR #1235) - -* Thu Apr 30 2020 Florian Müllner - 3.36.1-2 -- Backport fixup for spring animation fix - -* Tue Mar 31 2020 Florian Müllner - 3.36.1-1 -- Update to 3.36.1 -- Remove gnome-extensions-app subpackage (will move to a separate .spec) - -* Wed Mar 25 2020 Ray Strode - 3.36.0-4 -- Clear environment on logout - Fixes log in to Xorg right after log out from wayland - Resolves: #1815487 - -* Wed Mar 11 2020 Adam Williamson - 3.36.0-3 -- Backport fix for input method preedit issue (MR #1084) - -* Tue Mar 10 2020 Adam Williamson - 3.36.0-2 -- Backport fix for ibus failing to start automatically (MR #1080) - -* Sat Mar 07 2020 Florian Müllner - 3.36.0-1 -- Update to 3.36.0 - -* Sun Mar 01 2020 Florian Müllner - 3.35.92-1 -- Update to 3.35.92 - -* Tue Feb 18 2020 Florian Müllner - 3.35.91-1 -- Update to 3.35.91 - -* Fri Feb 07 2020 Kalev Lember - 3.35.90-2 -- Adjust the favorites patch to include the apps we install by default - -* Thu Feb 06 2020 Florian Müllner - 3.35.90-1 -- Update to 3.35.90 - -* Tue Jan 28 2020 Fedora Release Engineering - 3.35.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jan 16 2020 Kalev Lember - 3.35.3-2 -- Rebuilt for libgnome-desktop soname bump - -* Sun Jan 05 2020 Florian Müllner - 3.35.3-2 -- Update to 3.35.3 - -* Wed Dec 11 2019 Florian Müllner - 3.35.2-1 -- Udpate to 3.35.2 - -* Sat Oct 12 2019 Florian Müllner - 3.35.1-1 -- Update to 3.35.1 - -* Sat Oct 12 2019 Adam Williamson - 3.34.1-2 -- Backport MR #754 to fix #1749433 - -* Wed Oct 09 2019 Florian Müllner - 3.34.1-1 -- Update to 3.34.1 - -* Tue Sep 24 2019 Debarshi Ray - 3.34.0-3 -- Stop NOTIFY_SOCKET from leaking into the GNOME environment - -* Fri Sep 20 2019 Florian Müllner - 3.34.0-2 -- Fix disappearing icons in frequent view - -* Mon Sep 09 2019 Florian Müllner - 3.34.0-1 -- Update to 3.34.0 - -* Thu Sep 05 2019 Kalev Lember - 3.33.92-1 -- Update to 3.33.92 - -* Mon Aug 26 2019 Kalev Lember - 3.33.91-1 -- Update to 3.33.91 - -* Fri Aug 23 2019 Adam Williamson - 3.33.90-2 -- Revert commit that causes #1740897 (overview type-to-search bug) - Resolves: #1740897 - -* Sat Aug 10 2019 Florian Müllner - 3.33.90-1 -- Update to 3.33.90 - -* Thu Jul 25 2019 Fedora Release Engineering - 3.33.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Jul 20 2019 Florian Müllner - 3.33.4-1 -- Update to 3.33.4 - -* Mon Jun 24 2019 Florian Mülllner - 3.33.3-1 -- Update to 3.33.3 - -* Wed May 22 2019 Florian Müllner - 3.33.2-1 -- Update to 3.33.2 - -* Wed May 22 2019 Kalev Lember - 3.33.1-2 -- Rebuild for libecal-2.0 - -* Tue May 14 2019 Florian Müllner - 3.33.1-1 -- Update to 3.33.1 - -* Wed Apr 17 2019 Florian Müllner - 3.32.1-1 -- Update to 3.32.1 - -* Wed Apr 17 2019 Adam Williamson - 3.32.0-3 -- Backport MR #463 and MR #494 to fix a couple of bugs - Resolves: #1696270 - Resolves: #1690429 - -* Sat Mar 23 2019 Phil Wyett - 3.32.0-2 -- Update source URL -- Add gcc BuildRequires -- Update versions required for gjs and mutter - -* Tue Mar 12 2019 Florian Müllner - 3.32.0-1 -- Update to 3.32.0 - -* Tue Mar 05 2019 Florian Müllner - 3.31.92-1 -- Update to 3.31.92 - -* Thu Feb 21 2019 Florian Müllner - 3.31.91-1 -- Update to 3.31.91 - -* Mon Feb 11 2019 Adam Williamson - 3.31.90-2 -- Backport MR #402 to fix missing logo on login screen - -* Thu Feb 07 2019 Florian Müllner - 3.31.90-1 -- Update to 3.31.90 - -* Thu Jan 31 2019 Fedora Release Engineering - 3.31.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jan 10 2019 Florian Müllner - 3.31.4-1 -- Update to 3.31.4 - -* Fri Dec 14 2018 Adam Williamson - 3.31.2-3 -- Backport several bugfix commits from current git master - -* Fri Nov 30 2018 Adam Williamson - 3.31.2-2 -- Backport PR #293 to fix 'empty input method indicator' bug - -* Wed Nov 14 2018 Florian Müllner - 3.31.2-1 -- Update to 3.31.2 - -* Mon Nov 12 2018 Mohan Boddu - 3.30.1-3 -- Rebuilt for evolution-data-server soname bump - -* Tue Oct 23 2018 Jonas Ådahl - 3.30.1-2 -- Backport keyboard layout change fixes (rhbz#1637418) - -* Mon Oct 08 2018 Florian Müllner - 3.30.1-1 -- Update to 3.30.1 - -* Thu Sep 27 2018 Hans de Goede - 3.30.0-9 -- Add downstream patches implementing the "Boot Options" menu from: - https://wiki.gnome.org/Design/OS/BootOptions - -* Sat Sep 22 2018 Adam Williamson - 3.30.0-8 -- Backport fix for IBus type issue (GGO MR #228) - -* Wed Sep 19 2018 Adam Williamson - 3.30.0-7 -- Replace dnd fix from -5 with upstream version (GGO MR #209) -- Fix a window destroy crash which can occur with new gjs (GGO #539) -- Fix a window menu issue on multi-monitor systems (GGO MR #227) -- Fix hover and active states for some buttons (GGO #523) - -* Wed Sep 19 2018 Adam Williamson - 3.30.0-6 -- Fix missing key description in ssh key unlock prompt (GGO #574) - -* Wed Sep 19 2018 Ray Strode - 3.30.0-5 -- Fix lock up when dropping icon on dash - Resolves: #1630134 - -* Tue Sep 18 2018 Adam Williamson - 3.30.0-4 -- Fix connecting to wifi from user menu (RHBZ #1628263) - -* Sat Sep 15 2018 Adam Williamson - 3.30.0-3 -- Backport fix for GGO #140 from upstream master - -* Thu Sep 13 2018 Kalev Lember - 3.30.0-2 -- Require xdg-desktop-portal-gtk - -* Tue Sep 04 2018 Florian Müllner - 3.30.0-1 -- Update to 3.30.0 - -* Wed Aug 29 2018 Florian Müllner - 3.29.92-1 -- Update to 3.29.92 - -* Mon Aug 20 2018 Florian Müllner - 3.29.91-1 -- Update to 3.29.91 - -* Thu Aug 09 2018 Debarshi Ray - 3.29.90-2 -- Remove telepathy-logger and telepathy-glib runtime dependencies - -* Wed Aug 01 2018 Florian Müllner - 3.29.90-1 -- Update to 3.29.90 - -* Wed Jul 18 2018 Florian Müllner - 3.29.4-1 -- Update to 3.29.4 - -* Fri Jul 13 2018 Fedora Release Engineering - 3.29.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu May 24 2018 Florian Müllner - 3.29.2-1 -- Update to 3.29.2 - -* Wed May 09 2018 Florian Müllner - 3.29.1-3 -- Fix automatic connection to wireless networks without stored secrets - -* Sun Apr 29 2018 Adam Williamson - 3.29.1-2 -- Backport fix for password entry modifier key issues (#1569211) - -* Wed Apr 25 2018 Florian Müllner - 3.29.1-1 -- Update to 3.29.1 - -* Tue Apr 24 2018 Ray Strode - 3.28.1-2 -- pull polkit cancel lock up from upstream - Resolves: #1568213 - -* Fri Apr 13 2018 Florian Müllner - 3.28.1-1 -- Update to 3.28.1 - -* Mon Mar 12 2018 Florian Müllner - 3.28.0-1 -- Update to 3.28.0 - -* Mon Mar 05 2018 Florian Müllner - 3.27.92-1 -- Update to 3.27.92 - -* Thu Feb 22 2018 Lubomir Rintel - 3.27.91-2 -- Replace libnm-gtk with libnma - -* Wed Feb 21 2018 Florian Müllner - 3.27.91-1 -- Update to 3.27.91 - -* Wed Feb 07 2018 Kalev Lember - 3.27.1-5 -- Rebuilt for evolution-data-server soname bump - -* Mon Jan 22 2018 Adam Williamson - 3.27.1-4 -- Backport fix for crasher bug BGO #788931 (#1469129) - -* Tue Dec 19 2017 Kalev Lember - 3.27.1-3 -- Explicitly require libnm-gtk (#1509496) - -* Wed Nov 08 2017 Milan Crha - 3.27.1-2 -- Rebuild for newer libical - -* Tue Oct 17 2017 Florian Müllner - 3.27.1-1 -- Update to 3.27.1 - -* Wed Oct 04 2017 Florian Müllner - 3.26.1-1 -- Update to 3.26.1 - -* Thu Sep 21 2017 Florian Müllner - 3.26.0-2 -- Fix crash on fast status icon remapping - -* Tue Sep 12 2017 Florian Müllner - 3.26.0-1 -- Update to 3.26.0 - -* Tue Aug 22 2017 Florian Müllner - 3.25.91-1 -- Update to 3.25.91 - -* Fri Aug 11 2017 Kevin Fenzi - 3.25.90-2 -- Rebuild with older working rpm - -* Thu Aug 10 2017 Florian Müllner - 3.25.90-1 -- Update to 3.25.90 - -* Wed Aug 02 2017 Fedora Release Engineering - 3.25.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 3.25.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Jul 20 2017 Florian Müllner - 3.25.4-1 -- Update to 3.25.4 - -* Wed Jun 21 2017 Florian Müllner - 3.25.3-1 -- Update to 3.25.3 - -* Thu May 25 2017 Florian Müllner - 3.25.2-1 -- Update to 3.25.2 - -* Thu Apr 27 2017 Florian Müllner - 3.25.1-1 -- Update to 3.25.1 - -* Tue Apr 11 2017 Florian Müllner - 3.24.1-1 -- Update to 3.24.1 - -* Mon Mar 20 2017 Florian Müllner - 3.24.0-1 -- Update to 3.24.0 - -* Thu Mar 16 2017 Igor Gnatenko - 3.23.92-2 -- Fix wrong runtime requirements - -* Tue Mar 14 2017 Florian Müllner - 3.23.92-1 -- Update to 3.23.92 - -* Wed Mar 01 2017 Florian Müllner - 3.23.91-1 -- Update to 3.23.91 - -* Thu Feb 16 2017 Florian Müllner - 3.23.90-1 -- Update to 3.23.90 - -* Tue Feb 14 2017 Richard Hughes - 3.23.3-1 -- Update to 3.23.3 - -* Fri Feb 10 2017 Fedora Release Engineering - 3.23.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Dec 19 2016 Miro Hrončok - 3.23.2-3 -- Rebuild for Python 3.6 - -* Tue Dec 6 2016 Rui Matos - 3.23.2-2 -- Tighten mutter version dependency for plugin API changes - Resolves: #1401886 - -* Wed Nov 23 2016 Florian Müllner - 3.23.2-1 -- Update to 3.23.2 - -* Sun Oct 30 2016 Florian Müllner - 3.23.1-1 -- Update to 3.23.1 - -* Fri Oct 21 2016 Bastien Nocera - 3.22.1-2 -- Add patches to allow launching on discrete GPU when available - -* Tue Oct 11 2016 Florian Müllner - 3.22.1 -- Update to 3.22.1 - -* Mon Sep 19 2016 Florian Müllner - 3.22.0 -- Update to 3.22.0 - -* Tue Sep 13 2016 Florian Müllner - 3.21.92 -- Update to 3.21.92 - -* Fri Sep 09 2016 Kalev Lember - 3.21.91-2 -- Drop libgsystem dependency - -* Tue Aug 30 2016 Florian Müllner - 3.21.91 -- Update to 3.21.91 - -* Sat Aug 20 2016 Florian Müllner - 3.21.90.1-1 -- Update to 3.21.90.1 - (Fixes a corrupt .desktop file that made it from the build directory into - the 3.21.90 tarball) - -* Fri Aug 19 2016 Florian Müllner - 3.21.90-1 -- Update to 3.21.90 - -* Wed Jul 20 2016 Florian Müllner - 3.21.4-1 -- Update to 3.21.4 - -* Mon Jul 18 2016 Milan Crha - 3.21.3-2 -- Rebuild for newer evolution-data-server - -* Tue Jun 21 2016 Florian Müllner - 3.21.3-1 -- Update to 3.21.3 - -* Tue Jun 21 2016 Milan Crha - 3.21.2-2 -- Rebuild for newer evolution-data-server - -* Thu May 26 2016 Florian Müllner - 3.21.2-1 -- Update to 3.21.2 - -* Fri Apr 29 2016 Florian Müllner - 3.21.1-1 -- Update to 3.21.1 - -* Fri Apr 15 2016 David Tardon - 3.20.1-2 -- rebuild for ICU 57.1 - -* Wed Apr 13 2016 Florian Müllner - 3.20.1-1 -- Update to 3.20.1 - -* Tue Mar 22 2016 Florian Müllner - 3.20.0-1 -- Update to 3.20.0 - -* Wed Mar 16 2016 Florian Müllner - 3.19.92-1 -- Update to 3.19.92 - -* Thu Mar 03 2016 Florian Müllner - 3.19.91-1 -- Update to 3.19.91 - -* Fri Feb 19 2016 Florian Müllner - 3.19.90-1 -- Update to 3.19.90 - -* Tue Feb 16 2016 Milan Crha - 3.19.4-3 -- Rebuild for newer evolution-data-server - -* Wed Feb 03 2016 Fedora Release Engineering - 3.19.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Jan 21 2016 Florian Müllner - 3.19.4-1 -- Update to 3.19.4 - -* Mon Jan 18 2016 David Tardon - 3.19.3-2 -- rebuild for libical 2.0.0 - -* Thu Dec 17 2015 Florian Müllner - 3.19.3-1 -- Update to 3.19.3 - -* Tue Dec 01 2015 Kalev Lember - 3.19.2-2 -- Bump gsettings-desktop-schemas dep to 3.19.2 - -* Wed Nov 25 2015 Florian Müllner - 3.19.2-1 -- Update to 3.19.2 - -* Tue Nov 10 2015 Ray Strode 3.19.1-3.20151110 -- Update to git snapshot - -* Sun Nov 01 2015 Kalev Lember - 3.19.1-2 -- Fix gnome-shell crashing in gdm mode (#1276833) - -* Thu Oct 29 2015 Florian Müllner - 3.19.1-1 -- Update to 3.19.1 - -* Thu Oct 15 2015 Florian Müllner - 3.18.1-1 -- Update to 3.18.1 - -* Mon Sep 21 2015 Florian Müllner - 3.18.0-1 -- Update to 3.18.0 - -* Wed Sep 16 2015 Florian Müllner - 3.17.92-1 -- Update to 3.17.92 - -* Thu Sep 03 2015 Florian Müllner - 3.17.91-1 -- Update to 3.17.91 - -* Thu Aug 20 2015 Florian Müllner - 3.17.90-1 -- Update to 3.17.90 - -* Wed Aug 19 2015 Kalev Lember - 3.17.4-2 -- Create empty directories for extensions and search providers -- Move desktop file validation to %%check section -- Use make_install macro - -* Thu Jul 23 2015 Florian Müllner - 3.17.4-1 -- Update to 3.17.4 - -* Wed Jul 22 2015 Milan Crha - 3.17.3-3 -- Rebuild for newer evolution-data-server - -* Sat Jul 04 2015 Kalev Lember - 3.17.3-2 -- Require gobject-introspection 1.45.3 - -* Thu Jul 02 2015 Florian Müllner - 3.17.3-1 -- Update to 3.17.3 - -* Wed Jun 17 2015 Fedora Release Engineering - 3.17.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed May 27 2015 Florian Müllner - 3.17.2-1 -- Update to 3.17.2 - -* Thu Apr 30 2015 Florian Müllner - 3.17.1-1 -- Update to 3.17.1 - -* Tue Apr 28 2015 Milan Crha - 3.16.1-2 -- Rebuild for newer evolution-data-server - -* Tue Apr 14 2015 Florian Müllner - 3.16.1-1 -- Update to 3.16.1 - -* Mon Mar 23 2015 Florian Müllner - 3.16.0-1 -- Update to 3.16.0 - -* Tue Mar 17 2015 Kalev Lember - 3.15.92-2 -- Update minimum dep versions -- Use license macro for the COPYING file - -* Tue Mar 17 2015 Florian Müllner - 3.15.92-1 -- Update to 3.15.92 - -* Tue Mar 17 2015 Ray Strode 3.15.91-2 -- Drop dep on NetworkManager-config-connectivity-fedora - It's already required by fedora-release-workstation - -* Wed Mar 04 2015 Florian Müllner - 3.15.91-1 -- Update to 3.15.91 - -* Fri Feb 20 2015 Florian Müllner - 3.15.90-1 -- Update to 3.15.90 - -* Tue Feb 17 2015 Milan Crha - 3.15.4-2 -- Rebuild against newer evolution-data-server - -* Wed Jan 21 2015 Florian Müllner - 3.15.4-1 -- Update to 3.15.4 - -* Fri Dec 19 2014 Florian Müllner - 3.15.3-1 -- Update to 3.15.3 - -* Thu Nov 27 2014 Florian Müllner - 3.15.2-1 -- Update to 3.15.2 - -* Thu Oct 30 2014 Florian Müllner - 3.15.1-1 -- Update to 3.15.1 - -* Tue Oct 14 2014 Florian Müllner - 3.14.1-1 -- Update to 3.14.1 - -* Tue Sep 23 2014 Kalev Lember - 3.14.0-2 -- Drop unused gnome-menus dependency - -* Mon Sep 22 2014 Florian Müllner - 3.14.0-1 -- Update to 3.14.0 - -* Wed Sep 17 2014 Florian Müllner - 3.13.92-1 -- Update to 3.13.92 - -* Wed Sep 03 2014 Florian Müllner - 3.13.91-1 -- Update to 3.13.91 - -* Wed Aug 20 2014 Florian Müllner - 3.13.90-1 -- Update to 3.13.90 - -* Sat Aug 16 2014 Fedora Release Engineering - 3.13.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Thu Jul 31 2014 Milan Crha - 3.13.4-3 -- Rebuild against newer evolution-data-server - -* Mon Jul 28 2014 Adel Gadllah - 3.13.4-2 -- Require NetworkManager-config-connectivity-fedora - -* Wed Jul 23 2014 Florian Müllner - 3.13.4-1 -- Update to 3.13.4 - -* Tue Jul 22 2014 Kalev Lember - 3.13.3-2 -- Rebuilt for gobject-introspection 1.41.4 - -* Fri Jun 27 2014 Florian Müllner - 3.13.3-1 -- New gobject-introspection has been built, drop the last patch again - -* Wed Jun 25 2014 Florian Müllner - 3.13.3-1 -- Revert annotation updates until we get a new gobject-introspection build - -* Wed Jun 25 2014 Florian Müllner - 3.13.3-1 -- Update to 3.13.3 - -* Sat Jun 07 2014 Fedora Release Engineering - 3.13.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue May 27 2014 Florian Müllner - 3.13.2-1 -- Update to 3.13.2 - -* Thu May 01 2014 Kalev Lember - 3.13.1-2 -- Pull in libgsystem - -* Wed Apr 30 2014 Florian Müllner - 3.13.1-1 -- Update to 3.13.1 - -* Tue Apr 15 2014 Florian Müllner - 3.12.1-1 -- Update to 3.12.1 - -* Sat Apr 05 2014 Kalev Lember - 3.12.0-2 -- Update dep versions - -* Tue Mar 25 2014 Florian Müllner - 3.12.0-1 -- Update to 3.12.0 - -* Wed Mar 19 2014 Florian Müllner - 3.11.92-1 -- Update to 3.11.92 - -* Wed Mar 12 2014 Adam Williamson - 3.11.91-2 -- update to final revision of background bug fix from upstream (BGO #722149) - -* Thu Mar 06 2014 Florian Müllner - 3.11.91-1 -- Update to 3.11.91 - -* Mon Mar 03 2014 Adam Williamson - 3.11.90-5 -- backport fixes to fix drag-and-drop workspace creation (BGO #724686) - -* Wed Feb 26 2014 Adam Williamson - 3.11.90-4 -- backport a couple of bugfixes from BGO for things that annoy me - -* Sat Feb 22 2014 Florian Müllner - 3.11.90-3 -- Add dependency on gnome-control-center - several panels are referenced - by a number of menu items - -* Thu Feb 20 2014 Kalev Lember - 3.11.90-2 -- Rebuilt for cogl soname bump - -* Thu Feb 20 2014 Florian Müllner - 3.11.90-1 -- Update to 3.11.90 - -* Mon Feb 10 2014 Peter Hutterer - 3.11.5-3 -- Rebuild for libevdev soname bump - -* Wed Feb 05 2014 Adam Williamson - 3.11.5-2 -- build against new gjs (and hence mozjs24) - -* Wed Feb 05 2014 Richard Hughes - 3.11.5-1 -- Update to 3.11.5 - -* Mon Feb 03 2014 Milan Crha - 3.11.4-2 -- Rebuild against newer evolution-data-server - -* Thu Jan 16 2014 Florian Müllner - 3.11.4-1 -- Update to 3.11.4 - -* Tue Jan 14 2014 Milan Crha - 3.11.3-2 -- Rebuild against newer evolution-data-server - -* Fri Dec 20 2013 Florian Müllner - 3.11.3-1 -- Update to 3.11.3 - -* Thu Nov 21 2013 Milan Crha - 3.11.2-3 -- Rebuild for new libical (RH bug #1023020) - -* Tue Nov 19 2013 Milan Crha - 3.11.2-2 -- Rebuild against newer evolution-data-server - -* Wed Nov 13 2013 Florian Müllner - 3.11.2-1 -- Update to 3.11.2 - -* Wed Oct 30 2013 Florian Müllner - 3.11.1-1 -- Update to 3.11.1 - -* Fri Oct 25 2013 Florian Müllner - 3.10.1-2 -- Rebuild for new e-d-s - -* Tue Oct 15 2013 Florian Müllner - 3.10.1-1 -- Update to 3.10.1 - -* Wed Sep 25 2013 Kalev Lember - 3.10.0.1-1 -- Update to 3.10.0.1 - -* Tue Sep 24 2013 Florian Müllner - 3.10.0-1 -- Update to 3.10.0 - -* Wed Sep 18 2013 Matthias Clasen - 3.9.92-3 -- Build against mutter-wayland - -* Tue Sep 17 2013 Florian Müllner - 3.9.92-1 -- Update to 3.9.92 - -* Tue Sep 03 2013 Florian Müllner - 3.9.91-1 -- Update to 3.9.91 - -* Thu Aug 22 2013 Florian Müllner - 3.9.90-1 -- Update to 3.9.90 - -* Mon Aug 19 2013 Adam Williamson - 3.9.5-3 -- Rebuild for new e-d-s - -* Sat Aug 10 2013 Kalev Lember - 3.9.5-2 -- Drop the bluez revert patch as we now have new enough gnome-bluetooth - -* Tue Jul 30 2013 Florian Müllner - 3.9.5 -- Update to 3.9.5 - -* Mon Jul 29 2013 Adam Williamson - 3.9.4-2 -- rebuild against updated evolution-data-server - -* Wed Jul 10 2013 Florian Müllner - 3.9.4-1 -- Update to 3.9.4 - -* Wed Jul 10 2013 Milan Crha - 3.9.3-3 -- Rebuild against newer evolution-data-server - -* Wed Jul 10 2013 Kalev Lember - 3.9.3-2 -- Add a downstream patch to revert back to bluez 4 - -* Tue Jun 18 2013 Florian Müllner - 3.9.3-1 -- Update to 3.9.3 - -* Tue May 28 2013 Florian Müllner - 3.9.2-1 -- Update to 3.9.2 - -* Sat May 25 2013 Rex Dieter 3.9.1-3 -- rebuild (libical) - -* Wed May 01 2013 Kalev Lember - 3.9.1-2 -- Add missing telepathy-logger runtime dep -- Depend on gnome-session-xsession so that it gets pulled in for - typical GNOME installs - -* Wed May 01 2013 Florian Müllner - 3.9.1-1 -- Update to 3.9.1 - -* Tue Apr 16 2013 Florian Müllner - 3.8.1-1 -- Update to 3.8.1 - -* Thu Mar 28 2013 Adel Gadllah - 3.8.0.1-2 -- Ship the perf tool - -* Wed Mar 27 2013 Ray Strode - 3.8.0.1-1 -- Update to 3.8.0.1 - -* Tue Mar 26 2013 Florian Müllner - 3.8.0-1 -- Update to 3.8.0 - -* Tue Mar 19 2013 Florian Müllner - 3.7.92-1 -- Update to 3.7.92 - -* Tue Mar 05 2013 Florian Müllner - 3.7.91-1 -- Update to 3.7.91 - -* Wed Feb 20 2013 Florian Müllner - 3.7.90-1 -- Update to 3.7.90 - -* Wed Feb 06 2013 Kalev Lember - 3.7.5-2 -- Rebuilt for libgcr soname bump - -* Wed Feb 06 2013 Florian Müllner - 3.7.5-1 -- Update to 3.7.5 - -* Fri Jan 25 2013 Peter Robinson 3.7.4.1-2 -- Rebuild for new cogl - -* Thu Jan 17 2013 Florian Müllner - 3.7.4.1-1 -- Update to 3.7.4.1 - -* Tue Jan 15 2013 Florian Müllner - 3.7.4-1 -- Update to 3.7.4 - -* Wed Jan 09 2013 Richard Hughes - 3.7.3.1-1 -- Update to 3.7.3.1 - -* Tue Dec 18 2012 Florian Müllner 3.7.3-1 -- Update to 3.7.3 - -* Mon Dec 17 2012 Adam Jackson 3.7.2-3 -- Also don't mangle rpath on power - -* Mon Dec 10 2012 Adam Jackson 3.7.2-2 -- Disable bluetooth on power - -* Mon Nov 19 2012 Florian Müllner - 3.7.2-1 -- Update to 3.7.2 - -* Tue Nov 13 2012 Dan Horák - 3.7.1-2 -- don't Require: gnome-bluetooth on s390(x) - -* Fri Nov 09 2012 Kalev Lember - 3.7.1-1 -- Update to 3.7.1 - -* Wed Oct 31 2012 Brian Pepple - 3.6.1-5 -- Rebuild against latest telepathy-logger - -* Thu Oct 25 2012 Milan Crha - 3.6.1-4 -- Rebuild against newer evolution-data-server - -* Sat Oct 20 2012 Dan Horák - 3.6.1-3 -- explicit BR: control-center as it isn't brought in indirectly on s390(x) - -* Thu Oct 18 2012 Florian Müllner - 3.6.1-2 -- Remove avoid-redhat-menus patch - - The standard way of supporting a desktop-specific menu layout is - to set XDG_MENU_PREFIX (which we made gnome-session do now). - -* Mon Oct 15 2012 Florian Müllner - 3.6.1-1 -- Update to 3.6.1 - -* Tue Sep 25 2012 Florian Müllner - 3.6.0-1 -- Update to 3.6.0 - -* Wed Sep 19 2012 Florian Müllner - 3.5.92-1 -- Update to 3.5.92 - -* Tue Sep 11 2012 Florian Müllner - 3.5.91-1 -- Update dependencies - -* Tue Sep 04 2012 Richard Hughes - 3.5.91-1 -- Update to 3.5.91 - -* Tue Aug 28 2012 Matthias Clasen - 3.5.90-3 -- Rebuild against new cogl/clutter - -* Mon Aug 27 2012 Debarshi Ray - 3.5.90-2 -- Rebuild for new libcamel and synchronize gnome-bluetooth Requires with - BuildRequires. - -* Wed Aug 22 2012 Richard Hughes - 3.5.90-1 -- Update to 3.5.90 - -* Tue Aug 14 2012 Debarshi Ray - 3.5.5-2 -- Add Requires: gnome-bluetooth >= 3.5.5 - -* Mon Aug 13 2012 Debarshi Ray - 3.5.5-1 -- Update to 3.5.5 - -* Fri Jul 27 2012 Fedora Release Engineering - 3.5.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jul 21 2012 Kalev Lember - 3.5.4-4 -- Tighten runtime requires - -* Thu Jul 19 2012 Matthias Clasen - 3.5.4-3 -- Add a gdm-libs dependency - -* Wed Jul 18 2012 Colin Walters - 3.5.4-2 -- Bump release - -* Wed Jul 18 2012 Ray Strode 3.5.4-1 -- Update to 3.5.4 - -* Tue Jun 26 2012 Matthias Clasen - 3.5.3-2 -- Rebuild against new e-d-s - -* Tue Jun 26 2012 Matthias Clasen - 3.5.3-1 -- Update to 3.5.3 - -* Thu Jun 07 2012 Richard Hughes - 3.5.2-2 -- Remove upstreamed patch - -* Thu Jun 07 2012 Richard Hughes - 3.5.2-1 -- Update to 3.5.2 - -* Mon May 28 2012 Peter Robinson - 3.4.1-6 -- Cherry pick F17 changes, bump build for new evo soname - -* Wed May 16 2012 Owen Taylor - 3.4.1-5 -- New version of unmount notification - -* Tue May 15 2012 Owen Taylor - 3.4.1-4 -- Add a patch to display a notification until it's safe to remove a drive (#819492) - -* Fri Apr 20 2012 Owen Taylor - 3.4.1-3 -- Add a patch from upstream to avoid a crash when Evolution is not installed (#814401) - -* Wed Apr 18 2012 Kalev Lember - 3.4.1-2 -- Silence glib-compile-schemas scriplets - -* Wed Apr 18 2012 Kalev Lember - 3.4.1-1 -- Update to 3.4.1 - -* Thu Apr 5 2012 Owen Taylor - 3.4.0-2 -- Change gnome-shell-favourite-apps-firefox.patch to also patch the JS code - to handle the transition from mozilla-firefox.desktop to firefox.desktop. - (#808894, reported by Jonathan Kamens) - -* Tue Mar 27 2012 Richard Hughes - 3.4.0-1 -- Update to 3.4.0 - -* Wed Mar 21 2012 Matthias Clasen - 3.3.92-1 -- Update to 3.3.92 - -* Sat Mar 10 2012 Matthias Clasen - 3.3.90-2 -- Rebuild for new cogl - -* Sat Feb 25 2012 Matthias Clasen - 3.3.90-1 -- Update to 3.3.90 - -* Thu Feb 9 2012 Matthias Clasen - 3.3.5-2 -- Depend on accountsservice-libs (#755112) - -* Tue Feb 7 2012 Matthias Clasen - 3.3.5-1 -- Update to 3.3.5 - -* Fri Jan 20 2012 Matthias Clasen - 3.3.4-1 -- Update to 3.3.4 - -* Thu Jan 19 2012 Matthias Clasen - 3.3.3-2 -- Rebuild for new cogl - -* Thu Jan 5 2012 Matthias Clasen - 3.3.3-1 -- Update to 3.3.3 - -* Sun Nov 27 2011 Peter Robinson - 3.3.2-2 -- Rebuild for new clutter and e-d-s - -* Wed Nov 23 2011 Matthias Clasen - 3.3.2-1 -- Update to 3.3.2 - -* Wed Nov 09 2011 Kalev Lember - 3.2.1-6 -- Adapt to firefox desktop file name change in F17 - -* Thu Nov 03 2011 Adam Jackson 3.2.1-5 -- Build with -Wno-error=disabled-declarations for the moment - -* Wed Nov 02 2011 Brian Pepple - 3.2.1-4 -- Rebuld against tp-logger. - -* Sun Oct 30 2011 Bruno Wolff III - 3.2.1-3 -- Rebuild for new evolution-data-server - -* Wed Oct 26 2011 Fedora Release Engineering - 3.2.1-2 -- Rebuilt for glibc bug#747377 - -* Wed Oct 19 2011 Matthias Clasen - 3.2.1-1 -- Update to 3.2.1 - -* Wed Sep 28 2011 Ray Strode 3.2.0-2 -- rebuild - -* Mon Sep 26 2011 Owen Taylor - 3.2.0-1 -- Update to 3.2.0 - -* Tue Sep 20 2011 Matthias Clasen - 3.1.92-1 -- Update to 3.1.92 - -* Fri Sep 16 2011 Kalev Lember - 3.1.91.1-2 -- Tighten dependencies by specifying the required arch (#739130) - -* Wed Sep 14 2011 Owen Taylor - 3.1.91.1-1 -- Update to 3.1.91.1 (adds browser plugin) - Update Requires - -* Thu Sep 08 2011 Dan Horák - 3.1.91-3 -- workaround a chrpath issue on s390(x) - -* Wed Sep 07 2011 Kalev Lember - 3.1.91-2 -- Replace Epiphany with Firefox in the default favourite apps - -* Wed Sep 7 2011 Matthias Clasen - 3.1.91-1 -- Update to 3.1.91 - -* Thu Sep 1 2011 Matthias Clasen - 3.1.90.1-2 -- Require caribou - -* Wed Aug 31 2011 Matthias Clasen - 3.1.90.1-1 -- Update to 3.1.90.1 - -* Wed Aug 31 2011 Adam Williamson - 3.1.4-3.gite7b9933 -- rebuild against e-d-s - -* Fri Aug 19 2011 Matthias Clasen - 3.1.4-2.gite7b9933 -- git snapshot that builds against gnome-menus 3.1.5 - -* Thu Aug 18 2011 Matthew Barnes - 3.1.5-1 -- Rebuild against newer eds libraries. - -* Wed Jul 27 2011 Matthias Clasen - 3.1.4-1 -- Update to 3.1.4 - -* Wed Jul 27 2011 Matthias Clasen - 3.1.3-4 -- Rebuild - -* Tue Jul 26 2011 Matthias Clasen - 3.1.3-3 -- Add necessary requires - -* Mon Jul 25 2011 Matthias Clasen - 3.1.3-2 -- Rebuild - -* Tue Jul 5 2011 Peter Robinson - 3.1.3-1 -- Upstream 3.1.3 dev release - -* Mon Jun 27 2011 Adam Williamson - 3.0.2-4 -- add fixes from f15 branch (gjs dep and rpath) - -* Wed Jun 22 2011 Owen Taylor - 3.0.2-3 -- Add a patch from upstream to avoid g_file_get_contents() - -* Fri Jun 17 2011 Tomas Bzatek - 3.0.2-2 -- Rebuilt for new gtk3 and gnome-desktop3 - -* Wed May 25 2011 Owen Taylor - 3.0.2-1 -- Update to 3.0.2 - -* Tue May 10 2011 Dan Williams - 3.0.1-4 -- Fix initial connections to WPA Enterprise access points (#699014) -- Fix initial connections to mobile broadband networks - -* Thu Apr 28 2011 Dan Horák - 3.0.1-3 -- no bluetooth on s390(x) - -* Wed Apr 27 2011 Owen Taylor - 3.0.1-2 -- Add a patch from upstream to fix duplicate applications in application display - -* Mon Apr 25 2011 Owen Taylor - 3.0.1-1 -- Update to 3.0.1 - -* Mon Apr 11 2011 Colin Walters - 3.0.0.2-2 -- We want to use the GNOME menus which has the designed categories, - not the legacy redhat-menus. - -* Fri Apr 08 2011 Nils Philippsen - 3.0.0.2-1 -- Update to 3.0.0.2 (fixes missing import that was preventing extensions from - loading.) -- Update source URL - -* Tue Apr 5 2011 Owen Taylor - 3.0.0.1-1 -- Update to 3.0.0.1 (fixes bug where network menu could leave - Clutter event handling stuck.) - -* Mon Apr 4 2011 Owen Taylor - 3.0.0-1 -- Update to 3.0.0 - -* Tue Mar 29 2011 Brian Pepple - 2.91.93-3 -- Bump - -* Tue Mar 29 2011 Brian Pepple - 2.91.93-2 -- Rebuild for new tp-logger - -* Mon Mar 28 2011 Owen Taylor - 2.91.93-1 -- Update to 2.91.93. - -* Fri Mar 25 2011 Ray Strode 2.91.92-3 -- Adjustments for More nm-client api changes. -- Fix VPN indicator - -* Thu Mar 24 2011 Christopher Aillon - 2.91.92-2 -- Make activating vpn connections work from the shell indicator - -* Wed Mar 23 2011 Matthias Clasen - 2.91.92-1 -- Update to 2.91.92 - -* Wed Mar 16 2011 Michel Salim - 2.91.91-2 -- Fix alt-tab behavior on when primary display is not leftmost (# 683932) - -* Tue Mar 8 2011 Owen Taylor - 2.91.91-1 -- Update to 2.91.91 - -* Tue Feb 22 2011 Matthias Clasen - 2.91.90-2 -- Require upower and polkit at runtime - -* Tue Feb 22 2011 Matthias Clasen - 2.91.90-1 -- Update to 2.91.90 - -* Thu Feb 10 2011 Matthias Clasen - 2.91.6-6 -- Rebuild against newer gtk - -* Tue Feb 08 2011 Fedora Release Engineering - 2.91.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Feb 3 2011 Bill Nottingham - 2.91.6-4 -- buildrequire gnome-bluetooth to fix bluetooth status icon (#674874) - -* Wed Feb 2 2011 Matthias Clasen - 2.91.6-3 -- Rebuild against newer gtk - -* Tue Feb 1 2011 Owen Taylor - 2.91.6-2 -- Build-requires evolution-data-server-devel - -* Tue Feb 1 2011 Owen Taylor - 2.91.6-1 -- Update to 2.91.6 - -* Thu Jan 13 2011 Mattihas Clasen - 2.91.5-3 -- Drop desktop-effects dependency - -* Wed Jan 12 2011 Colin Walters - 2.91.5-2 -- BR latest g-i, handles flags as arguments better - -* Tue Jan 11 2011 Matthias Clasen - 2.91.5-1 -- Update to 2.91.5 - -* Sat Jan 8 2011 Matthias Clasen - 2.91.4-1 -- Update to 2.91.4 -- Rebuild against new gtk - -* Fri Dec 3 2010 Matthias Clasen - 2.91.3-2 -- Rebuild aginst new gtk - -* Mon Nov 29 2010 Owen Taylor - 2.91.2-1 -- Update to 2.91.3 - -* Thu Nov 18 2010 Owen Taylor - 2.91.2-3 -- Add another memory-management crasher fix from upstream - -* Mon Nov 15 2010 Owen Taylor - 2.91.2-2 -- Add a patch from upstream fixing a memory-management crasher - -* Tue Nov 9 2010 Owen Taylor - 2.91.2-1 -- Update to 2.91.2 - -* Mon Nov 1 2010 Owen Taylor - 2.91.1-1 -- Update to 2.91.1 -- Add libcroco-devel to BuildRequires, apparently it was getting - pulled in indirectly before -- Add libcanberra-devel and pulseaudio-libs-devel BuildRequires - -* Mon Oct 4 2010 Owen Taylor - 2.91.0-1 -- Update to 2.91.0 -- Remove patch to disable VBlank syncing - -* Thu Aug 12 2010 Colin Walters - 2.31.5-7 -- Add patch to disable vblank syncing - -* Tue Jul 13 2010 Colin Walters - 2.31.5-5 -- Run glib-compile-schemas - -* Tue Jul 13 2010 Colin Walters - 2.31.5-4 -- Bless stuff in files section - -* Tue Jul 13 2010 Colin Walters - 2.31.5-3 -- Axe gnome-desktop-devel - -* Tue Jul 13 2010 Adel Gadllah - 2.31.5-2 -- BuildRequire gnome-desktop3-devel, gtk3 - -* Mon Jul 12 2010 Colin Walters - 2.31.5-1 -- New upstream version -- Drop rpath goop, shouldn't be necessary any more - -* Fri Jun 25 2010 Colin Walters - 2.31.2-3 -- Drop gir-repository-devel build dependency - -* Fri May 28 2010 Adam Miller - 2.31.2-2 -- Added new version requirements for dependencies based on upstream releases -- Added new file listings for gnome-shell-clock-preferences binary and .desktop -- Added gnome-shell man page file listing - -* Wed May 26 2010 Adam Miller - 2.31.2-1 -- New upstream release - -* Fri Mar 26 2010 Colin Walters - 2.29.1-3 -- Specify V=1 for build, readd smp_mflags since parallel is fixed upstream - -* Thu Mar 25 2010 Adam Miller - 2.29.1-2 -- Bumped for new version of mutter and clutter -- Added version requirement to gjs-devel because of dependency of build - -* Wed Mar 24 2010 Adam Miller - 2.29.1-1 -- Update to latest version 2.29.1 - -* Sun Feb 21 2010 Bastien Nocera 2.28.1-0.2.20100128git -- Require json-glib -- Rebuild for new clutter with json split out -- Fix deprecation in COGL - -* Thu Jan 28 2010 Adam Miller - 2.28.1-0.1.20100128git -- New git snapshot -- Fixed Version for alphatag use - -* Fri Jan 15 2010 Adam Miller - 2.28.0.20101015git-1 -- Added dependency on a git build of gobject-introspect to solve some breakage -- Also went ahead and made a new git tarball - -* Tue Jan 12 2010 Adam Miller - 2.28.0.20100112git-1 -- New git snapshot - -* Mon Dec 07 2009 Adam Miller - 2.28.0.20091206git-5 -- Added libtool, glib-gettext for the libtoolize dep of git snapshot - -* Mon Dec 07 2009 Adam Miller - 2.28.0.20091206git-4 -- Added gnome-common needed by autogen.sh in git snapshot build - -* Sun Dec 06 2009 Adam Miller - 2.28.0.20091206git-3 -- Added the autotools needed to build the git snapshot to the build requires - -* Sun Dec 06 2009 Adam Miller - 2.28.0.20091206git-2 -- Fixed the setup naming issue with the git snapshot directory naming - -* Sun Dec 06 2009 Adam Miller - 2.28.0.20091206git-1 -- Update to git snapshot on 20091206 - -* Wed Oct 7 2009 Owen Taylor - 2.28.0-2 -- Update to 2.28.0 - -* Tue Sep 15 2009 Owen Taylor - 2.27.3-1 -- Update to 2.27.3 - -* Fri Sep 4 2009 Owen Taylor - 2.27.2-2 -- Test for gobject-introspection version should be >= not > - -* Fri Sep 4 2009 Owen Taylor - 2.27.2-1 -- Update to 2.27.2 -- Add an explicit dep on gobject-introspection 0.6.5 which is required - for the new version - -* Sat Aug 29 2009 Owen Taylor - 2.27.1-4 -- Fix GConf %%preun script to properly be for package removal - -* Fri Aug 28 2009 Owen Taylor - 2.27.1-3 -- Replace libgnomeui with gnome-desktop in BuildRequires - -* Fri Aug 28 2009 Owen Taylor - 2.27.1-2 -- BuildRequire intltool -- Add find_lang - -* Fri Aug 28 2009 Owen Taylor - 2.27.1-1 -- Update to 2.27.1 -- Update Requires, add desktop-effects - -* Wed Aug 12 2009 Owen Taylor - 2.27.0-4 -- Add an explicit dependency on GConf2 for pre/post - -* Tue Aug 11 2009 Owen Taylor - 2.27.0-3 -- Add missing BuildRequires on gir-repository-devel - -* Tue Aug 11 2009 Owen Taylor - 2.27.0-2 -- Temporarily use a non-parallel-build until gnome-shell is fixed - -* Mon Aug 10 2009 Owen Taylor - 2.27.0-1 -- Initial version - diff --git a/anda/desktops/gnome/gnome-shell/gitignore b/anda/desktops/gnome/gnome-shell/gitignore deleted file mode 100644 index 45e71025a0..0000000000 --- a/anda/desktops/gnome/gnome-shell/gitignore +++ /dev/null @@ -1,227 +0,0 @@ -gnome-shell-2.31.5.tar.bz2 -/gnome-shell-2.91.0.tar.bz2 -/gnome-shell-2.91.1.tar.bz2 -/gnome-shell-2.91.2.tar.bz2 -/gnome-shell-2.91.3.tar.bz2 -/gnome-shell-2.91.4.tar.bz2 -/gnome-shell-2.91.5.tar.bz2 -/gnome-shell-2.91.6.tar.bz2 -/gnome-shell-2.91.90.tar.bz2 -/gnome-shell-2.91.91.tar.bz2 -/gnome-shell-2.91.92.tar.bz2 -/gnome-shell-2.91.93.tar.bz2 -/gnome-shell-3.0.0.tar.bz2 -/gnome-shell-3.0.0.1.tar.bz2 -/gnome-shell-3.0.0.2.tar.bz2 -/gnome-shell-3.0.1.tar.bz2 -/gnome-shell-3.0.2.tar.bz2 -/gnome-shell-3.1.3.tar.bz2 -/gnome-shell-3.1.4.tar.xz -/gnome-shell-3.1.4-gite7b9933.tar.bz2 -/gnome-shell-3.1.90.1.tar.xz -/gnome-shell-3.1.91.tar.xz -/gnome-shell-3.1.91.1.tar.xz -/gnome-shell-3.1.92.tar.xz -/gnome-shell-3.2.0.tar.xz -/gnome-shell-3.2.1.tar.xz -/gnome-shell-3.3.2.tar.xz -/gnome-shell-3.3.3.tar.xz -/gnome-shell-3.3.4.tar.xz -/gnome-shell-3.3.5.tar.xz -/gnome-shell-3.3.90.tar.xz -/gnome-shell-3.3.92.tar.xz -/gnome-shell-3.4.0.tar.xz -/gnome-shell-3.4.1.tar.xz -/gnome-shell-3.5.2.tar.xz -/gnome-shell-3.5.3.tar.xz -/gnome-shell-3.5.4.tar.xz -/gnome-shell-3.5.5.tar.xz -/gnome-shell-3.5.90.tar.xz -/gnome-shell-3.5.91.tar.xz -/gnome-shell-3.5.92.tar.xz -/gnome-shell-3.6.0.tar.xz -/gnome-shell-3.6.1.tar.xz -/gnome-shell-3.7.1.tar.xz -/gnome-shell-3.7.2.tar.xz -/gnome-shell-3.7.3.tar.xz -/gnome-shell-3.7.3.1.tar.xz -/gnome-shell-3.7.4.tar.xz -/gnome-shell-3.7.4.1.tar.xz -/gnome-shell-3.7.5.tar.xz -/gnome-shell-3.7.90.tar.xz -/gnome-shell-3.7.91.tar.xz -/gnome-shell-3.7.92.tar.xz -/gnome-shell-3.8.0.tar.xz -/gnome-shell-3.8.0.1.tar.xz -/gnome-shell-3.8.1.tar.xz -/gnome-shell-3.9.1.tar.xz -/gnome-shell-3.9.2.tar.xz -/gnome-shell-3.9.3.tar.xz -/gnome-shell-3.9.4.tar.xz -/gnome-shell-3.9.5.tar.xz -/gnome-shell-3.9.90.tar.xz -/gnome-shell-3.9.91.tar.xz -/gnome-shell-3.9.92.tar.xz -/gnome-shell-3.10.0.tar.xz -/gnome-shell-3.10.0.1.tar.xz -/gnome-shell-3.10.1.tar.xz -/gnome-shell-3.11.1.tar.xz -/gnome-shell-3.11.2.tar.xz -/gnome-shell-3.11.3.tar.xz -/gnome-shell-3.11.4.tar.xz -/gnome-shell-3.11.5.tar.xz -/gnome-shell-3.11.90.tar.xz -/gnome-shell-3.11.91.tar.xz -/gnome-shell-3.11.92.tar.xz -/gnome-shell-3.12.0.tar.xz -/gnome-shell-3.12.1.tar.xz -/gnome-shell-3.13.1.tar.xz -/gnome-shell-3.13.2.tar.xz -/gnome-shell-3.13.3.tar.xz -/gnome-shell-3.13.4.tar.xz -/gnome-shell-3.13.90.tar.xz -/gnome-shell-3.13.91.tar.xz -/gnome-shell-3.13.92.tar.xz -/gnome-shell-3.14.0.tar.xz -/gnome-shell-3.14.1.tar.xz -/gnome-shell-3.15.1.tar.xz -/gnome-shell-3.15.2.tar.xz -/gnome-shell-3.15.3.tar.xz -/gnome-shell-3.15.4.tar.xz -/gnome-shell-3.15.90.tar.xz -/gnome-shell-3.15.91.tar.xz -/gnome-shell-3.15.92.tar.xz -/gnome-shell-3.16.0.tar.xz -/gnome-shell-3.16.1.tar.xz -/gnome-shell-3.17.1.tar.xz -/gnome-shell-3.17.2.tar.xz -/gnome-shell-3.17.3.tar.xz -/gnome-shell-3.17.4.tar.xz -/gnome-shell-3.17.90.tar.xz -/gnome-shell-3.17.91.tar.xz -/gnome-shell-3.17.92.tar.xz -/gnome-shell-3.18.0.tar.xz -/gnome-shell-3.18.1.tar.xz -/gnome-shell-3.19.1.tar.xz -/gnome-shell-3.19.2.tar.xz -/gnome-shell-3.19.3.tar.xz -/gnome-shell-3.19.4.tar.xz -/gnome-shell-3.19.90.tar.xz -/gnome-shell-3.19.91.tar.xz -/gnome-shell-3.19.92.tar.xz -/gnome-shell-3.20.0.tar.xz -/gnome-shell-3.20.1.tar.xz -/gnome-shell-3.21.1.tar.xz -/gnome-shell-3.21.2.tar.xz -/gnome-shell-3.21.3.tar.xz -/gnome-shell-3.21.4.tar.xz -/gnome-shell-3.21.90.tar.xz -/gnome-shell-3.21.90.1.tar.xz -/gnome-shell-3.21.91.tar.xz -/gnome-shell-3.21.92.tar.xz -/gnome-shell-3.22.0.tar.xz -/gnome-shell-3.22.1.tar.xz -/gnome-shell-3.23.1.tar.xz -/gnome-shell-3.23.2.tar.xz -/gnome-shell-3.23.3.tar.xz -/gnome-shell-3.23.90.tar.xz -/gnome-shell-3.23.91.tar.xz -/gnome-shell-3.23.92.tar.xz -/gnome-shell-3.24.0.tar.xz -/gnome-shell-3.24.1.tar.xz -/gnome-shell-3.25.1.tar.xz -/gnome-shell-3.25.2.tar.xz -/gnome-shell-3.25.3.tar.xz -/gnome-shell-3.25.4.tar.xz -/gnome-shell-3.25.90.tar.xz -/gnome-shell-3.25.91.tar.xz -/gnome-shell-3.26.0.tar.xz -/gnome-shell-3.26.1.tar.xz -/gnome-shell-3.27.1.tar.xz -/gnome-shell-3.27.91.tar.xz -/gnome-shell-3.27.92.tar.xz -/gnome-shell-3.28.0.tar.xz -/gnome-shell-3.28.1.tar.xz -/gnome-shell-3.29.1.tar.xz -/gnome-shell-3.29.2.tar.xz -/gnome-shell-3.29.4.tar.xz -/gnome-shell-3.29.90.tar.xz -/gnome-shell-3.29.91.tar.xz -/gnome-shell-3.29.92.tar.xz -/gnome-shell-3.30.0.tar.xz -/gnome-shell-3.30.1.tar.xz -/gnome-shell-3.31.2.tar.xz -/gnome-shell-3.31.4.tar.xz -/gnome-shell-3.31.90.tar.xz -/gnome-shell-3.31.91.tar.xz -/gnome-shell-3.31.92.tar.xz -/gnome-shell-3.32.0.tar.xz -/gnome-shell-3.32.1.tar.xz -/gnome-shell-3.33.1.tar.xz -/gnome-shell-3.33.2.tar.xz -/gnome-shell-3.33.3.tar.xz -/gnome-shell-3.33.4.tar.xz -/gnome-shell-3.33.90.tar.xz -/gnome-shell-3.33.91.tar.xz -/gnome-shell-3.33.92.tar.xz -/gnome-shell-3.34.0.tar.xz -/gnome-shell-3.34.1.tar.xz -/gnome-shell-3.35.1.tar.xz -/gnome-shell-3.35.2.tar.xz -/gnome-shell-3.35.3.tar.xz -/gnome-shell-3.35.90.tar.xz -/gnome-shell-3.35.91.tar.xz -/gnome-shell-3.35.92.tar.xz -/gnome-shell-3.36.0.tar.xz -/gnome-shell-3.36.1.tar.xz -/gnome-shell-3.37.1.tar.xz -/gnome-shell-3.37.2.tar.xz -/gnome-shell-3.37.3.tar.xz -/gnome-shell-3.37.90.tar.xz -/gnome-shell-3.37.91.tar.xz -/gnome-shell-3.37.92.tar.xz -/gnome-shell-3.38.0.tar.xz -/gnome-shell-3.38.1.tar.xz -/gnome-shell-40.alpha.tar.xz -/gnome-shell-40.alpha.1.tar.xz -/gnome-shell-40.alpha.1.1.tar.xz -/gnome-shell-40.alpha.1.1-94-g9ce666ac1.tar.xz -/gnome-shell-40.alpha.1.1-228-g829a096ba.tar.xz -/gnome-shell-40.beta.tar.xz -/gnome-shell-40.beta-79-g7a57528bd.tar.xz -/gnome-shell-40.rc.tar.xz -/gnome-shell-40.0.tar.xz -/gnome-shell-40.1.tar.xz -/gnome-shell-40.2.tar.xz -/gnome-shell-40.3.tar.xz -/gnome-shell-41.beta.tar.xz -/gnome-shell-41.rc.tar.xz -/gnome-shell-41.rc.1.tar.xz -/gnome-shell-41.0.tar.xz -/gnome-shell-42.alpha.tar.xz -/gnome-shell-42.beta.tar.xz -/gnome-shell-42.rc.tar.xz -/gnome-shell-42.0.tar.xz -/gnome-shell-42.1.tar.xz -/gnome-shell-42.2.tar.xz -/gnome-shell-43.alpha.tar.xz -/gnome-shell-43.beta.tar.xz -/gnome-shell-43.rc.tar.xz -/gnome-shell-43.0.tar.xz -/gnome-shell-43.1.tar.xz -/gnome-shell-44.beta.tar.xz -/gnome-shell-44.rc.tar.xz -/gnome-shell-44.0.tar.xz -/gnome-shell-44.1.tar.xz -/gnome-shell-44.2.tar.xz -/gnome-shell-45.alpha.tar.xz -/gnome-shell-45.beta.tar.xz -/gnome-shell-45.beta.1.tar.xz -/gnome-shell-45.rc.tar.xz -/gnome-shell-45.0.tar.xz -/gnome-shell-45.1.tar.xz -/gnome-shell-45.2.tar.xz -/gnome-shell-46.alpha.tar.xz -/gnome-shell-46.beta.tar.xz -/gnome-shell-46.rc.tar.xz -/gnome-shell-46.0.tar.xz diff --git a/anda/desktops/gnome/gnome-shell/gnome-shell-favourite-apps-firefox.patch b/anda/desktops/gnome/gnome-shell/gnome-shell-favourite-apps-firefox.patch deleted file mode 100644 index 326f82714e..0000000000 --- a/anda/desktops/gnome/gnome-shell/gnome-shell-favourite-apps-firefox.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 551b8979483e127471c726fd1db1d52e063a7d81 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= -Date: Wed, 17 Sep 2014 07:11:12 +0200 -Subject: [PATCH] Replace Web with Firefox in default favorites - ---- - data/org.gnome.shell.gschema.xml.in | 2 +- - js/ui/appFavorites.js | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in -index f4fa86d013..86b4bf85ee 100644 ---- a/data/org.gnome.shell.gschema.xml.in -+++ b/data/org.gnome.shell.gschema.xml.in -@@ -50,7 +50,7 @@ - - - -- [ 'org.gnome.Epiphany.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop', 'org.gnome.TextEditor.desktop'] -+ [ 'org.mozilla.firefox.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop', 'org.gnome.TextEditor.desktop'] - List of desktop file IDs for favorite applications - - The applications corresponding to these identifiers -diff --git a/js/ui/appFavorites.js b/js/ui/appFavorites.js -index 576df3800d..1f55a3c881 100644 ---- a/js/ui/appFavorites.js -+++ b/js/ui/appFavorites.js -@@ -51,6 +51,7 @@ const RENAMED_DESKTOP_IDS = { - 'gnotski.desktop': 'org.gnome.Klotski.desktop', - 'gtali.desktop': 'org.gnome.Tali.desktop', - 'iagno.desktop': 'org.gnome.Reversi.desktop', -+ 'firefox.desktop': 'org.mozilla.firefox.desktop', - 'nautilus.desktop': 'org.gnome.Nautilus.desktop', - 'org.gnome.gnome-2048.desktop': 'org.gnome.TwentyFortyEight.desktop', - 'org.gnome.taquin.desktop': 'org.gnome.Taquin.desktop', --- -2.43.0 - diff --git a/anda/desktops/gnome/gnome-shell/gnome-shell.spec b/anda/desktops/gnome/gnome-shell/gnome-shell.spec deleted file mode 100644 index 452fa5094f..0000000000 --- a/anda/desktops/gnome/gnome-shell/gnome-shell.spec +++ /dev/null @@ -1,262 +0,0 @@ -%global tarball_version %%(echo %{version} | tr '~' '.') -%global major_version 47 -%global minor_version 3 - -%if 0%{?rhel} -%global portal_helper 0 -%else -%global portal_helper 1 -%endif - -Name: gnome-shell -Version: %{major_version}.%{minor_version} -Release: 1%{?dist}.switcheroo -Summary: Window management and application launching for GNOME - -License: GPL-2.0-or-later -URL: https://wiki.gnome.org/Projects/GnomeShell -Source0: https://download.gnome.org/sources/gnome-shell/%{major_version}/%{name}-%{tarball_version}.tar.xz - -# Replace Epiphany with Firefox in the default favourite apps list -Patch: gnome-shell-favourite-apps-firefox.patch - -# Some users might have a broken PAM config, so we really need this -# downstream patch to stop trying on configuration errors. -Patch: 0001-gdm-Work-around-failing-fingerprint-auth.patch - -Patch: 0001-status-keyboard-Add-a-catch-around-reload-call.patch -Patch: 0002-status-keyboard-Load-keyboard-from-system-settings-i.patch -Patch: 0003-status-keyboard-Use-gnome-desktop-API-for-getting-de.patch - -# shell-app: improve discrete GPU detection -# https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3193 -Patch: 3193.patch - -%define eds_version 3.45.1 -%define gnome_desktop_version 44.0-7 -%define glib2_version 2.79.2 -%define gobject_introspection_version 1.49.1 -%define gjs_version 1.73.1 -%define gtk4_version 4.0.0 -%define adwaita_version 1.5.0 -%define mutter_version 47.0 -%define polkit_version 0.100 -%define gsettings_desktop_schemas_version 47~alpha -%define ibus_version 1.5.2 -%define gnome_bluetooth_version 1:42.3 -%define gstreamer_version 1.4.5 -%define pipewire_version 0.3.0 -%define gnome_settings_daemon_version 3.37.1 - -BuildRequires: pkgconfig(bash-completion) -BuildRequires: gcc -BuildRequires: meson -BuildRequires: git -BuildRequires: pkgconfig(ibus-1.0) >= %{ibus_version} -BuildRequires: desktop-file-utils -BuildRequires: pkgconfig(libedataserver-1.2) >= %{eds_version} -BuildRequires: pkgconfig(gcr-4) -BuildRequires: pkgconfig(gjs-1.0) >= %{gjs_version} -BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} -BuildRequires: pkgconfig(gnome-autoar-0) -BuildRequires: pkgconfig(gnome-desktop-4) >= %{gnome_desktop_version} -BuildRequires: pkgconfig(gobject-introspection-1.0) >= %{gobject_introspection_version} -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libEGL-devel -BuildRequires: pkgconfig(libnm) -BuildRequires: pkgconfig(polkit-agent-1) >= %{polkit_version} -BuildRequires: pkgconfig(libstartup-notification-1.0) -BuildRequires: pkgconfig(libsystemd) -# for screencast recorder functionality -BuildRequires: pkgconfig(gstreamer-base-1.0) >= %{gstreamer_version} -BuildRequires: pkgconfig(libpipewire-0.3) >= %{pipewire_version} -BuildRequires: pkgconfig(gtk4) >= %{gtk4_version} -BuildRequires: gettext >= 0.19.6 -BuildRequires: python3 - -# for rst2man -BuildRequires: python3-docutils -# for barriers -BuildRequires: libXfixes-devel >= 5.0 -# used in unused BigThemeImage -BuildRequires: librsvg2-devel -BuildRequires: mutter-devel >= %{mutter_version} -BuildRequires: pkgconfig(libpulse) -%ifnarch s390 s390x ppc ppc64 ppc64p7 -BuildRequires: gnome-bluetooth-libs-devel >= %{gnome_bluetooth_version} -%endif -# Bootstrap requirements -BuildRequires: gtk-doc -%ifnarch s390 s390x -Recommends: gnome-bluetooth%{?_isa} >= %{gnome_bluetooth_version} -%endif -Requires: gnome-desktop3%{?_isa} >= %{gnome_desktop_version} -Requires: gcr%{?_isa} -Requires: gobject-introspection%{?_isa} >= %{gobject_introspection_version} -Requires: gjs%{?_isa} >= %{gjs_version} -Requires: gtk4%{?_isa} >= %{gtk4_version} -Requires: libadwaita%{_isa} >= %{adwaita_version} -Requires: libnma-gtk4%{?_isa} -# needed for loading SVG's via gdk-pixbuf -Requires: librsvg2%{?_isa} -Requires: mutter%{?_isa} >= %{mutter_version} -Requires: upower%{?_isa} -Requires: polkit%{?_isa} >= %{polkit_version} -Requires: gnome-desktop4%{?_isa} >= %{gnome_desktop_version} -Requires: glib2%{?_isa} >= %{glib2_version} -Requires: gsettings-desktop-schemas%{?_isa} >= %{gsettings_desktop_schemas_version} -Requires: gnome-settings-daemon%{?_isa} >= %{gnome_settings_daemon_version} -Requires: gstreamer1%{?_isa} >= %{gstreamer_version} -# needed for screen recorder -Requires: gstreamer1-plugins-good%{?_isa} -Requires: pipewire-gstreamer%{?_isa} -Requires: xdg-user-dirs-gtk -# needed for schemas -Requires: at-spi2-atk%{?_isa} -# needed for on-screen keyboard -Requires: ibus%{?_isa} >= %{ibus_version} -# needed for "show keyboard layout" -Requires: tecla -# needed for the user menu -Requires: accountsservice-libs%{?_isa} -Requires: gdm-libs%{?_isa} -# needed for settings items in menus -Requires: gnome-control-center -# needed by some utilities -Requires: python3%{_isa} -# needed for the dual-GPU launch menu -Requires: switcheroo-control -# needed for clocks/weather integration -Requires: geoclue2-libs%{?_isa} -Requires: libgweather4%{?_isa} -# for gnome-extensions CLI tool -Requires: gettext -# needed for thunderbolt support -Recommends: bolt%{?_isa} -# Needed for launching flatpak apps etc -# 1.8.0 is needed for source type support in the screencast portal. -Requires: xdg-desktop-portal-gtk >= 1.8.0 -Requires: xdg-desktop-portal-gnome -# needed by the welcome dialog -Recommends: gnome-tour - -%if %{portal_helper} -# needed for captive portal helper -Requires: webkitgtk6.0%{?_isa} -%endif - -# https://github.com/containers/composefs/pull/229#issuecomment-1838735764 -%if 0%{?rhel} >= 10 -ExcludeArch: %{ix86} -%endif - -Provides: desktop-notification-daemon = %{version}-%{release} -Provides: PolicyKit-authentication-agent = %{version}-%{release} -Provides: bundled(gvc) -Provides: bundled(libcroco) = 0.6.13 - -%if 0%{?rhel} -# In Fedora, fedora-obsolete-packages obsoletes caribou -Obsoletes: caribou < 0.4.21-10 -Obsoletes: caribou-antler < 0.4.21-10 -Obsoletes: caribou-devel < 0.4.21-10 -Obsoletes: caribou-gtk2-module < 0.4.21-10 -Obsoletes: caribou-gtk3-module < 0.4.21-10 -Obsoletes: python-caribou < 0.4.21-10 -Obsoletes: python2-caribou < 0.4.21-10 -Obsoletes: python3-caribou < 0.4.21-10 -%endif - -# https://bugzilla.redhat.com/show_bug.cgi?id=1740897 -Conflicts: gnome-shell-extension-background-logo < 3.34.0 - -%description -GNOME Shell provides core user interface functions for the GNOME 3 desktop, -like switching to windows and launching applications. GNOME Shell takes -advantage of the capabilities of modern graphics hardware and introduces -innovative user interface concepts to provide a visually attractive and -easy to use experience. - -%prep -%autosetup -S git -n %{name}-%{tarball_version} - -%build -%meson \ - -Dextensions_app=false \ -%if %{portal_helper} - -Dportal_helper=true \ -%else - -Dportal_helper=false \ -%endif - %{nil} -%meson_build - -%install -%meson_install - -# Create empty directories where other packages can drop extensions -mkdir -p %{buildroot}%{_datadir}/gnome-shell/extensions -mkdir -p %{buildroot}%{_datadir}/gnome-shell/search-providers - -%find_lang %{name} - -%check -desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.desktop -desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.Extensions.desktop - -%if %{portal_helper} -desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.PortalHelper.desktop -%endif - -%files -f %{name}.lang -%license COPYING -%doc NEWS README.md -%{_bindir}/gnome-shell -%{_bindir}/gnome-extensions -%{_bindir}/gnome-shell-extension-tool -%{_bindir}/gnome-shell-test-tool -%{_datadir}/glib-2.0/schemas/*.xml -%{_datadir}/glib-2.0/schemas/00_org.gnome.shell.gschema.override -%{_datadir}/applications/org.gnome.Shell.Extensions.desktop -%{_datadir}/applications/org.gnome.Shell.desktop -%{_datadir}/bash-completion/completions/gnome-extensions -%{_datadir}/gnome-control-center/keybindings/50-gnome-shell-launchers.xml -%{_datadir}/gnome-control-center/keybindings/50-gnome-shell-screenshots.xml -%{_datadir}/gnome-control-center/keybindings/50-gnome-shell-system.xml -%{_datadir}/gnome-shell/ -%{_datadir}/dbus-1/services/org.gnome.ScreenSaver.service -%{_datadir}/dbus-1/services/org.gnome.Shell.CalendarServer.service -%{_datadir}/dbus-1/services/org.gnome.Shell.Extensions.service -%{_datadir}/dbus-1/services/org.gnome.Shell.HotplugSniffer.service -%{_datadir}/dbus-1/services/org.gnome.Shell.Notifications.service -%{_datadir}/dbus-1/services/org.gnome.Shell.Screencast.service -%{_datadir}/dbus-1/interfaces/org.gnome.Shell.Extensions.xml -%{_datadir}/dbus-1/interfaces/org.gnome.Shell.Introspect.xml -%{_datadir}/dbus-1/interfaces/org.gnome.Shell.PadOsd.xml -%{_datadir}/dbus-1/interfaces/org.gnome.Shell.Screencast.xml -%{_datadir}/dbus-1/interfaces/org.gnome.Shell.Screenshot.xml -%{_datadir}/dbus-1/interfaces/org.gnome.ShellSearchProvider.xml -%{_datadir}/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml -%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Shell.Extensions.svg -%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Shell.Extensions-symbolic.svg -%{_userunitdir}/org.gnome.Shell-disable-extensions.service -%{_userunitdir}/org.gnome.Shell.target -%{_userunitdir}/org.gnome.Shell@wayland.service -%{_userunitdir}/org.gnome.Shell@x11.service -%{_libdir}/gnome-shell/ -%{_libexecdir}/gnome-shell-calendar-server -%{_libexecdir}/gnome-shell-perf-helper -%{_libexecdir}/gnome-shell-hotplug-sniffer -%{_mandir}/man1/gnome-extensions.1* -%{_mandir}/man1/gnome-shell.1* - -%if %{portal_helper} -%{_datadir}/applications/org.gnome.Shell.PortalHelper.desktop -%{_datadir}/dbus-1/services/org.gnome.Shell.PortalHelper.service -%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Shell.CaptivePortal.svg -%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Shell.CaptivePortal-symbolic.svg -%{_libexecdir}/gnome-shell-portal-helper -%endif - -%changelog -%autochangelog diff --git a/anda/desktops/gnome/gnome-shell/update.rhai b/anda/desktops/gnome/gnome-shell/update.rhai deleted file mode 100644 index 684341be34..0000000000 --- a/anda/desktops/gnome/gnome-shell/update.rhai +++ /dev/null @@ -1,25 +0,0 @@ -import "andax/bump_extras.rhai" as bump; - -let pkg = "gnome-shell"; -let branch = bump::as_bodhi_ver(labels.branch); - -let url = `https://bodhi.fedoraproject.org/updates/?search=${pkg}&status=stable&releases=${branch}&rows_per_page=10&page=1`; - -let done = false; - -for entry in get(url).json().updates { - for entry in entry.title.split(' ') { - let matches = find_all(`${pkg}-([\d.]+)-(\d+)\.[\w\d]+$`, entry); - if matches.len() == 0 { continue; } - let majminv = matches[0][1].split('.'); - if majminv.len() != 2 { - print(`gnome-shell: ${matches[0][1]} has invalid version?`); - terminate(); - } - rpm.global("major_version", majminv[0]); - rpm.global("minor_version", majminv[1]); - rpm.f = sub(`Release:(\s+)(.+?)\n`, "Release:${1}" + matches[0][2] + "%{?dist}.switcheroo\n", rpm.f); - done = true; - } - if done { break; } -} diff --git a/anda/desktops/kde/kf6-kio/0001-Give-the-kuriikwsfiltereng_private-a-VERSION-and-SOV.patch b/anda/desktops/kde/kf6-kio/0001-Give-the-kuriikwsfiltereng_private-a-VERSION-and-SOV.patch deleted file mode 100644 index 6f1529a5ba..0000000000 --- a/anda/desktops/kde/kf6-kio/0001-Give-the-kuriikwsfiltereng_private-a-VERSION-and-SOV.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0cc287336b32e601e70b26d60d9335abde538a18 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Mon, 16 Oct 2023 17:57:16 -0700 -Subject: [PATCH] Give the kuriikwsfiltereng_private a VERSION and SOVERSION - (#26) - -Signed-off-by: Adam Williamson ---- - src/urifilters/ikws/CMakeLists.txt | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/urifilters/ikws/CMakeLists.txt b/src/urifilters/ikws/CMakeLists.txt -index 7d42584c3..393588993 100644 ---- a/src/urifilters/ikws/CMakeLists.txt -+++ b/src/urifilters/ikws/CMakeLists.txt -@@ -1,6 +1,11 @@ - add_subdirectory(searchproviders) - - add_library(kuriikwsfiltereng_private kuriikwsfiltereng.cpp searchprovider.cpp searchproviderregistry.cpp) -+set_target_properties(kuriikwsfiltereng_private PROPERTIES -+ VERSION ${KIO_VERSION} -+ SOVERSION ${KIO_SOVERSION} -+ EXPORT_NAME kuriikwsfiltereng_private -+) - generate_export_header(kuriikwsfiltereng_private) # We need this to be a shared lib, because otherwise we have duplicate Q_GLOBAL_STATICs - target_link_libraries(kuriikwsfiltereng_private PUBLIC KF6::KIOGui) - install(TARGETS kuriikwsfiltereng_private ${KF_INSTALL_TARGETS_DEFAULT_ARGS}) --- -2.41.0 - diff --git a/anda/desktops/kde/kf6-kio/1556.patch b/anda/desktops/kde/kf6-kio/1556.patch deleted file mode 100644 index 60270100ab..0000000000 --- a/anda/desktops/kde/kf6-kio/1556.patch +++ /dev/null @@ -1,290 +0,0 @@ -From 7b1154d235f752b9fd1797f87861f11ef89d5d7a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20Dr=C3=B6gehoff?= -Date: Thu, 15 Feb 2024 14:38:21 +0100 -Subject: [PATCH 1/7] Improve discrete GPU detection using switcheroo-control - ---- - src/gui/gpudetection.cpp | 34 ++++++++++++++++++++++++++++++++++ - 1 file changed, 34 insertions(+) - -diff --git a/src/gui/gpudetection.cpp b/src/gui/gpudetection.cpp -index ef246d3936..695bf27a1e 100644 ---- a/src/gui/gpudetection.cpp -+++ b/src/gui/gpudetection.cpp -@@ -62,6 +62,40 @@ static bool checkGpuWithSwitcheroo() - QList gpus; - arg >> gpus; - -+ if (gpus.length() < 2) { -+ // Skip checking for Default or Discrete GPUs when 1 or no GPU is available -+ return false; -+ } -+ -+ // Check if the Default GPU is Discrete -+ for (const auto &gpu : gpus) { -+ bool defaultGpu = qvariant_cast(gpu[QStringLiteral("Default")]); -+ if (defaultGpu) { -+ bool discreteGpu = qvariant_cast(gpu.value(QStringLiteral("Discrete"), false)); -+ if (discreteGpu) { -+ // If the default GPU is Discret there is no need to apply the env vars -+ s_gpuCheck = GpuCheck::Present; -+ return true; -+ } -+ break; -+ } -+ } -+ -+ // Find the first Discrete GPU -+ for (const auto &gpu : gpus) { -+ bool discreteGpu = qvariant_cast(gpu.value(QStringLiteral("Discrete"), false)); -+ if (!discreteGpu) { -+ s_gpuCheck = GpuCheck::Present; -+ QStringList envList = qvariant_cast(gpu[QStringLiteral("Environment")]); -+ for (int i = 0; i + 1 < envList.size(); i += 2) { -+ s_gpuEnv.insert(envList[i], envList[i + 1]); -+ } -+ return true; -+ } -+ } -+ -+ // fallback to old behavior -+ // find the first non-Default GPU - for (const auto &gpu : gpus) { - bool defaultGpu = qvariant_cast(gpu[QStringLiteral("Default")]); - if (!defaultGpu) { --- -GitLab - - -From 29c056a6a71b0de226369c03d02f47ab56a7877a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20Dr=C3=B6gehoff?= -Date: Wed, 21 Feb 2024 15:57:28 +0100 -Subject: [PATCH 2/7] make gpus length comparison easier to reade - ---- - src/gui/gpudetection.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gui/gpudetection.cpp b/src/gui/gpudetection.cpp -index 695bf27a1e..dfe6a9982b 100644 ---- a/src/gui/gpudetection.cpp -+++ b/src/gui/gpudetection.cpp -@@ -62,7 +62,7 @@ static bool checkGpuWithSwitcheroo() - QList gpus; - arg >> gpus; - -- if (gpus.length() < 2) { -+ if (gpus.length() <= 1) { - // Skip checking for Default or Discrete GPUs when 1 or no GPU is available - return false; - } --- -GitLab - - -From afc22129301ac2e33673ce9415b1e0d329a57c59 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20Dr=C3=B6gehoff?= -Date: Wed, 21 Feb 2024 16:27:05 +0100 -Subject: [PATCH 3/7] lookup needed GPU entries in a single loop - ---- - src/gui/gpudetection.cpp | 56 +++++++++++++++++----------------------- - 1 file changed, 23 insertions(+), 33 deletions(-) - -diff --git a/src/gui/gpudetection.cpp b/src/gui/gpudetection.cpp -index dfe6a9982b..57436e4789 100644 ---- a/src/gui/gpudetection.cpp -+++ b/src/gui/gpudetection.cpp -@@ -67,45 +67,35 @@ static bool checkGpuWithSwitcheroo() - return false; - } - -- // Check if the Default GPU is Discrete -- for (const auto &gpu : gpus) { -- bool defaultGpu = qvariant_cast(gpu[QStringLiteral("Default")]); -- if (defaultGpu) { -- bool discreteGpu = qvariant_cast(gpu.value(QStringLiteral("Discrete"), false)); -- if (discreteGpu) { -- // If the default GPU is Discret there is no need to apply the env vars -- s_gpuCheck = GpuCheck::Present; -- return true; -- } -- break; -+ QVariantMap defaultGpu; -+ QVariantMap firstDiscreteGpu; -+ QVariantMap firstNonDefaultGpu; -+ -+ for (const auto &gpu : std::as_const(gpus)) { -+ if (defaultGpu.isEmpty() && qvariant_cast(gpu[QStringLiteral("Default")])) { -+ defaultGpu = gpu; -+ } else if (firstNonDefaultGpu.isEmpty()) { -+ firstNonDefaultGpu = gpu; -+ } -+ if (firstDiscreteGpu.isEmpty() && qvariant_cast(gpu[QStringLiteral("Discrete")])) { -+ firstDiscreteGpu = gpu; - } - } - -- // Find the first Discrete GPU -- for (const auto &gpu : gpus) { -- bool discreteGpu = qvariant_cast(gpu.value(QStringLiteral("Discrete"), false)); -- if (!discreteGpu) { -- s_gpuCheck = GpuCheck::Present; -- QStringList envList = qvariant_cast(gpu[QStringLiteral("Environment")]); -- for (int i = 0; i + 1 < envList.size(); i += 2) { -- s_gpuEnv.insert(envList[i], envList[i + 1]); -- } -- return true; -- } -+ if (!defaultGpu.isEmpty() && defaultGpu[QStringLiteral("Discrete")].toBool()) { -+ // If the default GPU is discrete we don't need to check for another device or apply special env vars -+ s_gpuCheck = GpuCheck::Present; -+ return true; - } - -- // fallback to old behavior -- // find the first non-Default GPU -- for (const auto &gpu : gpus) { -- bool defaultGpu = qvariant_cast(gpu[QStringLiteral("Default")]); -- if (!defaultGpu) { -- s_gpuCheck = GpuCheck::Present; -- QStringList envList = qvariant_cast(gpu[QStringLiteral("Environment")]); -- for (int i = 0; i + 1 < envList.size(); i += 2) { -- s_gpuEnv.insert(envList[i], envList[i + 1]); -- } -- return true; -+ // Otherwise prefer the discrete GPU over any other random non-default GPU (legacy behavior) -+ for (const auto &gpu : {firstDiscreteGpu, firstNonDefaultGpu}) { -+ s_gpuCheck = GpuCheck::Present; -+ auto envList = qvariant_cast(gpu[QStringLiteral("Environment")]); -+ for (int i = 0; i + 1 < envList.size(); i += 2) { -+ s_gpuEnv.insert(envList[i], envList[i + 1]); - } -+ return true; - } - #endif - --- -GitLab - - -From d05cabb8e3e4aa60c8453edc0f6231d9bcb6d64e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20Dr=C3=B6gehoff?= -Date: Wed, 21 Feb 2024 16:27:25 +0100 -Subject: [PATCH 4/7] correct absent gpu comment - ---- - src/gui/gpudetection.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gui/gpudetection.cpp b/src/gui/gpudetection.cpp -index 57436e4789..bbef5ba8f2 100644 ---- a/src/gui/gpudetection.cpp -+++ b/src/gui/gpudetection.cpp -@@ -99,7 +99,7 @@ static bool checkGpuWithSwitcheroo() - } - #endif - -- // No non-default GPU found -+ // No discrete or non-default GPU found - s_gpuCheck = GpuCheck::Absent; - return true; - } --- -GitLab - - -From 7f9f76ce9bb472b54bf7297b8b5c078eb0c194c9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20Dr=C3=B6gehoff?= -Date: Thu, 22 Feb 2024 08:33:19 +0100 -Subject: [PATCH 5/7] check exact GPU count and fallback to solid when none are - found - ---- - src/gui/gpudetection.cpp | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/gui/gpudetection.cpp b/src/gui/gpudetection.cpp -index bbef5ba8f2..d3bf895ea5 100644 ---- a/src/gui/gpudetection.cpp -+++ b/src/gui/gpudetection.cpp -@@ -62,9 +62,15 @@ static bool checkGpuWithSwitcheroo() - QList gpus; - arg >> gpus; - -- if (gpus.length() <= 1) { -- // Skip checking for Default or Discrete GPUs when 1 or no GPU is available -+ auto gpu_count = gpus.length(); -+ -+ if (gpu_count == 0) { -+ // No GPUs? Something might have gone wrong on the other end - return false; -+ } else if (gpu_count == 1) { -+ // There is only one GPU, no need to check for others -+ s_gpuCheck = GpuCheck::Absent; -+ return true; - } - - QVariantMap defaultGpu; --- -GitLab - - -From 87ca7b125be15963c45867705f4b75e40b379437 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20Dr=C3=B6gehoff?= -Date: Wed, 4 Sep 2024 23:58:18 +0000 -Subject: [PATCH 6/7] Simplify GPU count check - ---- - src/gui/gpudetection.cpp | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/src/gui/gpudetection.cpp b/src/gui/gpudetection.cpp -index d3bf895ea5..5e8450f2f9 100644 ---- a/src/gui/gpudetection.cpp -+++ b/src/gui/gpudetection.cpp -@@ -62,12 +62,10 @@ static bool checkGpuWithSwitcheroo() - QList gpus; - arg >> gpus; - -- auto gpu_count = gpus.length(); -- -- if (gpu_count == 0) { -+ if (gpus.isEmpty()) { - // No GPUs? Something might have gone wrong on the other end - return false; -- } else if (gpu_count == 1) { -+ } else if (gpus.size() == 1) { - // There is only one GPU, no need to check for others - s_gpuCheck = GpuCheck::Absent; - return true; --- -GitLab - - -From 1920a2ea3b67331b419fc19a377b57a36466fb9f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20Dr=C3=B6gehoff?= -Date: Thu, 5 Sep 2024 02:01:41 +0200 -Subject: [PATCH 7/7] Fix non default GPU fallback - ---- - src/gui/gpudetection.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/gui/gpudetection.cpp b/src/gui/gpudetection.cpp -index 5e8450f2f9..2f5547ab8f 100644 ---- a/src/gui/gpudetection.cpp -+++ b/src/gui/gpudetection.cpp -@@ -94,6 +94,9 @@ static bool checkGpuWithSwitcheroo() - - // Otherwise prefer the discrete GPU over any other random non-default GPU (legacy behavior) - for (const auto &gpu : {firstDiscreteGpu, firstNonDefaultGpu}) { -+ if (gpu.isEmpty()) { -+ continue; -+ } - s_gpuCheck = GpuCheck::Present; - auto envList = qvariant_cast(gpu[QStringLiteral("Environment")]); - for (int i = 0; i + 1 < envList.size(); i += 2) { --- -GitLab - diff --git a/anda/desktops/kde/kf6-kio/6e7775d315f389df0a440ed62b842ce83dc9a27e.patch b/anda/desktops/kde/kf6-kio/6e7775d315f389df0a440ed62b842ce83dc9a27e.patch deleted file mode 100644 index 2c9b594b33..0000000000 --- a/anda/desktops/kde/kf6-kio/6e7775d315f389df0a440ed62b842ce83dc9a27e.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6e7775d315f389df0a440ed62b842ce83dc9a27e Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Fri, 1 Mar 2024 22:16:07 +0100 -Subject: [PATCH] [kterminallauncherjob] Inherit default process environment - from parent - -Before Qt 6.3, an empty (default constructed) QProcessEnvironment caused -QProcess to incorrectly inherit the environment variables from the parent -process. This was fixed in qtbase 5fc9c02a695. - -CommandLauncherJob was adjusted for this in 916984940f64e07db9b4d152be9f2a87dda0cfb4, -however here we are overriding its default env with our own default-constructed one - -BUG: 482107 ---- - src/gui/kterminallauncherjob.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gui/kterminallauncherjob.cpp b/src/gui/kterminallauncherjob.cpp -index c4e83fb11b..edd99327bd 100644 ---- a/src/gui/kterminallauncherjob.cpp -+++ b/src/gui/kterminallauncherjob.cpp -@@ -22,7 +22,7 @@ public: - QString m_fullCommand; // "xterm -e ls" - QString m_desktopName; - QByteArray m_startupId; -- QProcessEnvironment m_environment; -+ QProcessEnvironment m_environment{QProcessEnvironment::InheritFromParent}; - }; - - KTerminalLauncherJob::KTerminalLauncherJob(const QString &command, QObject *parent) --- -GitLab - diff --git a/anda/desktops/kde/kf6-kio/anda.hcl b/anda/desktops/kde/kf6-kio/anda.hcl deleted file mode 100644 index 24de21b76f..0000000000 --- a/anda/desktops/kde/kf6-kio/anda.hcl +++ /dev/null @@ -1,9 +0,0 @@ -project pkg { - rpm { - spec = "kf6-kio.spec" - } - labels { - subrepo = "extras" - updbranch = 1 - } -} diff --git a/anda/desktops/kde/kf6-kio/kf6-kio.spec b/anda/desktops/kde/kf6-kio/kf6-kio.spec deleted file mode 100644 index 24e9687244..0000000000 --- a/anda/desktops/kde/kf6-kio/kf6-kio.spec +++ /dev/null @@ -1,340 +0,0 @@ -%global framework kio - -%global stable_kf6 stable -%global majmin_ver_kf6 6.9 - -Name: kf6-%{framework} -Version: %{majmin_ver_kf6}.0 -Release: 1%{?dist}.switcheroo -Summary: KDE Frameworks 6 Tier 3 solution for filesystem abstraction - -License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT -URL: https://invent.kde.org/frameworks/%{framework} - -Source0: https://download.kde.org/%{stable_kf6}/frameworks/%{majmin_ver_kf6}/%{framework}-%{version}.tar.xz - -# https://invent.kde.org/frameworks/kio/-/issues/26 -# I'm not sending this upstream because I'm not sure it's really -# exactly what upstream will want, but it solves the practical -# issue for us for now -Patch0: 0001-Give-the-kuriikwsfiltereng_private-a-VERSION-and-SOV.patch - -%if 0%{?flatpak} -# Disable the help: and ghelp: protocol for Flatpak builds, to avoid depending -# on the docbook stack. -Patch101: kio-no-help-protocol.patch -%endif - -# https://invent.kde.org/frameworks/kio/-/merge_requests/1556 -Patch201: 1556.patch - -BuildRequires: extra-cmake-modules -BuildRequires: gcc-c++ -BuildRequires: kf6-rpm-macros -BuildRequires: cmake -BuildRequires: cmake(KF6Archive) -BuildRequires: cmake(KF6Crash) -BuildRequires: cmake(KF6Solid) -BuildRequires: switcheroo-control -BuildRequires: cmake(KF6ColorScheme) -BuildRequires: cmake(KF6Config) -BuildRequires: cmake(KF6CoreAddons) -BuildRequires: cmake(KF6DBusAddons) -BuildRequires: cmake(KF6DocTools) -BuildRequires: cmake(KF6GuiAddons) -BuildRequires: cmake(KF6I18n) -BuildRequires: cmake(KF6Service) -BuildRequires: qt6-qtbase-private-devel -BuildRequires: cmake(KF6Bookmarks) -BuildRequires: cmake(KF6Completion) -BuildRequires: cmake(KF6ConfigWidgets) -BuildRequires: cmake(KF6IconThemes) -BuildRequires: cmake(KF6ItemViews) -BuildRequires: cmake(KF6JobWidgets) -BuildRequires: cmake(KF6WindowSystem) -BuildRequires: cmake(KF6Notifications) -BuildRequires: cmake(KF6Wallet) -BuildRequires: cmake(KF6WidgetsAddons) -BuildRequires: cmake(KF6XmlGui) - -BuildRequires: libacl-devel -%if !0%{?flatpak} -BuildRequires: libxml2-devel -BuildRequires: libxslt-devel -%endif -BuildRequires: pkgconfig(blkid) -BuildRequires: pkgconfig(mount) -BuildRequires: pkgconfig(xkbcommon) -BuildRequires: zlib-devel - -BuildRequires: qt6-qtbase-devel -BuildRequires: cmake(Qt6UiPlugin) -BuildRequires: cmake(Qt6Qml) - -BuildRequires: cmake(KF6KDED) -BuildRequires: cmake(Qt6Core5Compat) - -Requires: %{name}-core%{?_isa} = %{version}-%{release} -Requires: %{name}-widgets%{?_isa} = %{version}-%{release} -Requires: %{name}-file-widgets%{?_isa} = %{version}-%{release} -Requires: %{name}-gui%{?_isa} = %{version}-%{release} - -Requires: kf6-kded - -%description -KDE Frameworks 6 Tier 3 solution for filesystem abstraction - -%package devel -Summary: Development files for %{name} -Requires: %{name} = %{version}-%{release} -Requires: kf6-kbookmarks-devel -Requires: cmake(KF6Completion) -Requires: cmake(KF6Config) -Requires: cmake(KF6CoreAddons) -Requires: cmake(KF6ItemViews) -Requires: cmake(KF6JobWidgets) -Requires: cmake(KF6Service) -Requires: cmake(KF6Solid) -Requires: cmake(KF6XmlGui) -Requires: cmake(KF6WindowSystem) -Requires: qt6-qtbase-devel -%description devel -The %{name}-devel package contains libraries and header files for -developing applications that use %{name}. - -%package doc -Summary: Documentation files for %{name} -Requires: %{name}-core = %{version}-%{release} -BuildArch: noarch -%description doc -Documentation for %{name}. - -%package core -Summary: Core components of the KIO Framework -%{?kf6_kinit_requires} -Requires: %{name}-core-libs%{?_isa} = %{version}-%{release} -Requires: %{name}-doc = %{version}-%{release} -Requires: kf6-filesystem -Recommends: switcheroo-control -%description core -KIOCore library provides core non-GUI components for working with KIO. - -%package core-libs -Summary: Runtime libraries for KIO Core -Requires: %{name}-core%{?_isa} = %{version}-%{release} -%description core-libs -%{summary}. - -%package widgets -Summary: Widgets for KIO Framework -## org.kde.klauncher6 service referenced from : widgets/krun.cpp -## included here for completeness, even those -core already has a dependency. -%{?kf6_kinit_requires} -Requires: %{name}-core%{?_isa} = %{version}-%{release} -%description widgets -KIOWidgets contains classes that provide generic job control, progress -reporting, etc. - -%package widgets-libs -Summary: Runtime libraries for KIO Widgets library -Requires: %{name}-widgets%{?_isa} = %{version}-%{release} -%description widgets-libs -%{summary}. - -%package file-widgets -Summary: Widgets for file-handling for KIO Framework -Requires: %{name}-widgets%{?_isa} = %{version}-%{release} -%description file-widgets -The KIOFileWidgets library provides the file selection dialog and -its components. - -%package gui -Summary: Gui components for the KIO Framework -Requires: %{name}-core%{?_isa} = %{version}-%{release} -%description gui -%{summary}. - -%package qch-doc -Summary: Developer Documentation files for %{name} -BuildArch: noarch -%description qch-doc -Developer Documentation files for %{name} for use with KDevelop or QtCreator. - - -%prep -%autosetup -n %{framework}-%{version} -p1 - - -%build -%cmake_kf6 -%cmake_build - - -%install -%cmake_install -%find_lang %{name} --all-name --with-man --with-html - -%files -%license LICENSES/*.txt -%doc README.md - -%files core -%{_kf6_libexecdir}/kioexec -%{_kf6_libexecdir}/kiod6 -%{_kf6_libexecdir}/kioworker -%{_kf6_bindir}/ktelnetservice6 -%{_kf6_bindir}/ktrash6 -%{_kf6_plugindir}/kio/ -%{_kf6_plugindir}/kded/ -%{_kf6_plugindir}/kiod/ -%{_kf6_datadir}/kf6/searchproviders/*.desktop -%{_kf6_datadir}/applications/*.desktop -%{_datadir}/dbus-1/services/org.kde.*.service -%{_kf6_datadir}/qlogging-categories6/*categories - -%files core-libs -%{_kf6_libdir}/libKF6KIOCore.so.* - -%files doc -f %{name}.lang - -%files gui -%{_kf6_libdir}/libKF6KIOGui.so.* - -%files widgets -%dir %{_kf6_plugindir}/urifilters/ -%{_kf6_plugindir}/urifilters/*.so -%{_kf6_libdir}/libkuriikwsfiltereng_private.so.* - -%files widgets-libs -%{_kf6_libdir}/libKF6KIOWidgets.so.* - -%files file-widgets -%{_kf6_libdir}/libKF6KIOFileWidgets.so.* - -%files devel -%{_kf6_includedir}/* -%{_kf6_libdir}/*.so -%{_kf6_libdir}/cmake/KF6KIO/ -%{_kf6_datadir}/kdevappwizard/templates/kioworker6.tar.bz2 -%{_kf6_qtplugindir}/designer/kio6widgets.so -%{_qt6_docdir}/*.tags - -%files qch-doc -%{_qt6_docdir}/*.qch - -%changelog -* Fri Jan 17 2025 Fedora Release Engineering - 6.10.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Tue Jan 07 2025 Steve Cossette - 6.10.0-2 -- File Picker: Fix 'All supported files' for more than 3 - filters - -* Fri Jan 03 2025 Steve Cossette - 6.10.0-1 -- 6.10.0 - -* Sat Dec 14 2024 Steve Cossette - 6.9.0-1 -- 6.9.0 - -* Sat Nov 02 2024 Marc Deop i Argemí - 6.8.0-1 -- 6.8.0 - -* Mon Oct 14 2024 Jan Grulich - 6.7.0-2 -- Rebuild (qt6) - -* Fri Oct 04 2024 Steve Cossette - 6.7.0-1 -- 6.7.0 - -* Mon Sep 16 2024 Steve Cossette - 6.6.0-1 -- 6.6.0 - -* Sat Aug 10 2024 Steve Cossette - 6.5.0-1 -- 6.5.0 - -* Fri Jul 19 2024 Steve Cossette - 6.4.1-1 -- 6.4.1 - -* Thu Jul 18 2024 Steve Cossette - 6.4.0-3 -- Fix for a regression in Frameworks 6.4.0 - -* Thu Jul 18 2024 Fedora Release Engineering - 6.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jul 06 2024 Marc Deop i Argemí - 6.4.0-1 -- 6.4.0 - -* Sat Jun 01 2024 Marc Deop i Argemí - 6.3.0-1 -- 6.3.0 - -* Sat May 04 2024 Marc Deop i Argemí - 6.2.0-1 -- 6.2.0 - -* Wed Apr 10 2024 Marc Deop i Argemí - 6.1.0-1 -- 6.1.0 - -* Thu Apr 04 2024 Jan Grulich - 6.0.0-7 -- Re-enable docs - -* Thu Apr 04 2024 Jan Grulich - 6.0.0-6 -- Rebuild (qt6) - -* Fri Mar 15 2024 Marie Loise Nolden - 6.0.0-5 -- add 6e7775d315f389df0a440ed62b842ce83dc9a27e.patch -[kterminallauncherjob] Inherit default process environment from parent - -* Mon Mar 11 2024 Yaakov Selkowitz - 6.0.0-4 -- Soften switcheroo-control dependency - -* Sat Mar 09 2024 Marie Loise Nolden - 6.0.0-3 -- add missing BuildArch: noarch to -doc package - -* Sat Mar 2 2024 Marie Loise Nolden - 6.0.0-2 -- move qt designer plugin to -devel - -* Wed Feb 21 2024 Marc Deop i Argemí - 6.0.0-1 -- 6.0.0 - -* Fri Feb 16 2024 Jan Grulich - 5.249.0-2 -- Rebuild (qt6) - -* Wed Jan 31 2024 Marc Deop i Argemí - 5.249.0-1 -- 5.249.0 - -* Thu Jan 25 2024 Fedora Release Engineering - 5.248.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 5.248.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jan 10 2024 Marc Deop i Argemí - 5.248.0-1 -- 5.248.0 - -* Tue Jan 09 2024 Marie Loise Nolden - 5.247.0-2 -- add doc package for KF6 API - -* Wed Dec 20 2023 Marc Deop i Argemí - 5.247.0-1 -- 5.247.0 - -* Sat Dec 02 2023 Justin Zobel - 5.246.0-1 -- Update to 5.246.0 - -* Wed Nov 29 2023 Jan Grulich - 5.245.0-3 -- Rebuild (qt6) - -* Mon Nov 20 2023 Alessandro Astone - 5.245.0-2 -- Add back kuriikwsfiltereng SOVERSION patch - -* Thu Nov 09 2023 Steve Cossette - 5.245.0-1 -- 5.245.0 - -* Tue Oct 17 2023 Jan Grulich - 5.240.0^20231010.060359.1c34fd4-4 -- Rebuild (qt6) - -* Mon Oct 16 2023 Adam Williamson - 5.240.0^20231010.060359.1c34fd4-3 -- Give kuriikwsfiltereng_private library a proper soname to fix deps - -* Mon Oct 09 2023 Steve Cossette - 5.240.0^20231010.060359.1c34fd4-2 -- Fixed a problem with the -doc subpackage building differently on different arches. - -* Mon Oct 09 2023 Steve Cossette - 5.240.0^20231010.060359.1c34fd4-1 -- Initial Release diff --git a/anda/desktops/kde/kf6-kio/update.rhai b/anda/desktops/kde/kf6-kio/update.rhai deleted file mode 100644 index 5825442cbd..0000000000 --- a/anda/desktops/kde/kf6-kio/update.rhai +++ /dev/null @@ -1,16 +0,0 @@ -import "andax/bump_extras.rhai" as bump; - -let pkg = "kf6-kio"; -let branch = bump::as_bodhi_ver(labels.branch); - -let url = `https://bodhi.fedoraproject.org/updates/?search=${pkg}&status=stable&releases=${branch}&rows_per_page=1&page=1`; - -for entry in get(url).json().updates[0].title.split(' ') { - let matches = find_all(`${pkg}-([\d.]+)-(\d+)\.[\w\d]+$`, entry); - if matches.len() == 0 { continue; } - if matches[0][1].ends_with(".0") { - rpm.global("majmin_ver_kf6", matches[0][1][0..matches[0][1].len()-2]); - rpm.f = sub(`Release: (.+?)\n`, "Release: " + matches[0][2] + "%{?dist}.switcheroo\n", rpm.f); - } - break; -}