From 7998a99c1ab6a7b4077dad7ec65bb34f5a2b7a3c Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Tue, 26 May 2026 21:10:54 -0500 Subject: [PATCH 01/10] fix: budgie-extras Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/desktops/budgie/budgie-extras/budgie-extras.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/budgie/budgie-extras/budgie-extras.spec b/anda/desktops/budgie/budgie-extras/budgie-extras.spec index 76339346192..f6de479a7f8 100644 --- a/anda/desktops/budgie/budgie-extras/budgie-extras.spec +++ b/anda/desktops/budgie/budgie-extras/budgie-extras.spec @@ -14,7 +14,7 @@ BuildRequires: meson BuildRequires: vala BuildRequires: intltool -BuildRequires: pkgconfig(budgie-1.0) +BuildRequires: budgie-desktop-devel BuildRequires: pkgconfig(gee-0.8) BuildRequires: pkgconfig(gnome-settings-daemon) BuildRequires: pkgconfig(json-glib-1.0) From 704d7f510907be7e5e458819a698c9bace57bea7 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Tue, 26 May 2026 21:13:38 -0500 Subject: [PATCH 02/10] this? Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/desktops/budgie/budgie-extras/budgie-extras.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/budgie/budgie-extras/budgie-extras.spec b/anda/desktops/budgie/budgie-extras/budgie-extras.spec index f6de479a7f8..7d233532b14 100644 --- a/anda/desktops/budgie/budgie-extras/budgie-extras.spec +++ b/anda/desktops/budgie/budgie-extras/budgie-extras.spec @@ -14,7 +14,7 @@ BuildRequires: meson BuildRequires: vala BuildRequires: intltool -BuildRequires: budgie-desktop-devel +BuildRequires: pkgconfig(budgie-3.0) BuildRequires: pkgconfig(gee-0.8) BuildRequires: pkgconfig(gnome-settings-daemon) BuildRequires: pkgconfig(json-glib-1.0) From 01e23d8e5d40c853a40a367003b991d291d92eb7 Mon Sep 17 00:00:00 2001 From: Owen-sz Date: Tue, 26 May 2026 21:24:11 -0500 Subject: [PATCH 03/10] add dep patch Signed-off-by: Owen-sz --- .../budgie/budgie-extras/budgie-extras.spec | 1 + .../budgie/budgie-extras/fix-budgie-3.0-name.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 anda/desktops/budgie/budgie-extras/fix-budgie-3.0-name.patch diff --git a/anda/desktops/budgie/budgie-extras/budgie-extras.spec b/anda/desktops/budgie/budgie-extras/budgie-extras.spec index 7d233532b14..f9e79b72ea9 100644 --- a/anda/desktops/budgie/budgie-extras/budgie-extras.spec +++ b/anda/desktops/budgie/budgie-extras/budgie-extras.spec @@ -7,6 +7,7 @@ Summary: Additional Budgie Desktop enhancements for user experience URL: https://ubuntubudgie.org/ Source0: https://github.com/UbuntuBudgie/budgie-extras/releases/download/v%{version}/budgie-extras-%{version}.tar.xz +Patch0: fix-budgie-3.0-name.patch BuildRequires: rpm_macro(fdupes) BuildRequires: cmake diff --git a/anda/desktops/budgie/budgie-extras/fix-budgie-3.0-name.patch b/anda/desktops/budgie/budgie-extras/fix-budgie-3.0-name.patch new file mode 100644 index 00000000000..393fe48894e --- /dev/null +++ b/anda/desktops/budgie/budgie-extras/fix-budgie-3.0-name.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index cd709410..3c00cec7 100644 +--- a/meson.build ++++ b/meson.build +@@ -72,7 +72,7 @@ conf.set_quoted('PACKAGE_SHAREDIR', datadir) + for_wayland = get_option('for-wayland') + + if for_wayland == false +- budgie_dep = dependency('budgie-1.0') ++ budgie_dep = dependency('budgie-3.0') + peas_dep = dependency('libpeas-1.0') + python_loader = 'python3' + else From 75a5d3633ff1f7795cde7fada77bee5f7713bc92 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Tue, 26 May 2026 21:27:07 -0500 Subject: [PATCH 04/10] another bdep Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/desktops/budgie/budgie-extras/budgie-extras.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/desktops/budgie/budgie-extras/budgie-extras.spec b/anda/desktops/budgie/budgie-extras/budgie-extras.spec index f9e79b72ea9..affe91b370c 100644 --- a/anda/desktops/budgie/budgie-extras/budgie-extras.spec +++ b/anda/desktops/budgie/budgie-extras/budgie-extras.spec @@ -26,6 +26,7 @@ BuildRequires: pkgconfig(libnma) BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libwnck-3.0) +BuildRequires: pkgconfig(libpeas-1.0) BuildRequires: pkgconfig(appstream) BuildRequires: pkgconfig(granite) From 301cc8db64ae73f148eb772b2fec5feffe3d0cd5 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Tue, 26 May 2026 21:30:15 -0500 Subject: [PATCH 05/10] another Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/desktops/budgie/budgie-extras/budgie-extras.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/desktops/budgie/budgie-extras/budgie-extras.spec b/anda/desktops/budgie/budgie-extras/budgie-extras.spec index affe91b370c..f8812ef2353 100644 --- a/anda/desktops/budgie/budgie-extras/budgie-extras.spec +++ b/anda/desktops/budgie/budgie-extras/budgie-extras.spec @@ -27,6 +27,7 @@ BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libwnck-3.0) BuildRequires: pkgconfig(libpeas-1.0) +BuildRequire: pkgconfig(libxfce4windowing-0) BuildRequires: pkgconfig(appstream) BuildRequires: pkgconfig(granite) From c6a7fdd77543c6fc58c1d329e083bb5a23294973 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Tue, 26 May 2026 21:30:41 -0500 Subject: [PATCH 06/10] grrr Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/desktops/budgie/budgie-extras/budgie-extras.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/budgie/budgie-extras/budgie-extras.spec b/anda/desktops/budgie/budgie-extras/budgie-extras.spec index f8812ef2353..e9788dd11b9 100644 --- a/anda/desktops/budgie/budgie-extras/budgie-extras.spec +++ b/anda/desktops/budgie/budgie-extras/budgie-extras.spec @@ -27,7 +27,7 @@ BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libwnck-3.0) BuildRequires: pkgconfig(libpeas-1.0) -BuildRequire: pkgconfig(libxfce4windowing-0) +BuildRequires: pkgconfig(libxfce4windowing-0) BuildRequires: pkgconfig(appstream) BuildRequires: pkgconfig(granite) From 9aa5fbb63a94369c77ce5840db1ea37575a58876 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Tue, 26 May 2026 21:35:52 -0500 Subject: [PATCH 07/10] its everywhere... also use %conf! Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/desktops/budgie/budgie-extras/budgie-extras.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/anda/desktops/budgie/budgie-extras/budgie-extras.spec b/anda/desktops/budgie/budgie-extras/budgie-extras.spec index e9788dd11b9..381744890bc 100644 --- a/anda/desktops/budgie/budgie-extras/budgie-extras.spec +++ b/anda/desktops/budgie/budgie-extras/budgie-extras.spec @@ -269,8 +269,12 @@ workspaces. %prep %autosetup -p1 -%build +find . -name "meson.build" -exec sed -i "s/dependency('budgie-1.0')/dependency('budgie-3.0')/g" {} + + +%conf %meson + +%build %meson_build %install From fae1c61717591cd8279e296c14f2f55ad6348b49 Mon Sep 17 00:00:00 2001 From: Owen-sz Date: Tue, 26 May 2026 21:40:54 -0500 Subject: [PATCH 08/10] some stuff Signed-off-by: Owen-sz --- .../budgie/budgie-extras/budgie-extras.spec | 2 +- .../budgie/budgie-extras/fix-budgie-3.0-name.patch | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 anda/desktops/budgie/budgie-extras/fix-budgie-3.0-name.patch diff --git a/anda/desktops/budgie/budgie-extras/budgie-extras.spec b/anda/desktops/budgie/budgie-extras/budgie-extras.spec index 381744890bc..2f212458970 100644 --- a/anda/desktops/budgie/budgie-extras/budgie-extras.spec +++ b/anda/desktops/budgie/budgie-extras/budgie-extras.spec @@ -7,7 +7,6 @@ Summary: Additional Budgie Desktop enhancements for user experience URL: https://ubuntubudgie.org/ Source0: https://github.com/UbuntuBudgie/budgie-extras/releases/download/v%{version}/budgie-extras-%{version}.tar.xz -Patch0: fix-budgie-3.0-name.patch BuildRequires: rpm_macro(fdupes) BuildRequires: cmake @@ -28,6 +27,7 @@ BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libwnck-3.0) BuildRequires: pkgconfig(libpeas-1.0) BuildRequires: pkgconfig(libxfce4windowing-0) +BuildRequires: pkgconfig(gtk-layer-shell-0) BuildRequires: pkgconfig(appstream) BuildRequires: pkgconfig(granite) diff --git a/anda/desktops/budgie/budgie-extras/fix-budgie-3.0-name.patch b/anda/desktops/budgie/budgie-extras/fix-budgie-3.0-name.patch deleted file mode 100644 index 393fe48894e..00000000000 --- a/anda/desktops/budgie/budgie-extras/fix-budgie-3.0-name.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -index cd709410..3c00cec7 100644 ---- a/meson.build -+++ b/meson.build -@@ -72,7 +72,7 @@ conf.set_quoted('PACKAGE_SHAREDIR', datadir) - for_wayland = get_option('for-wayland') - - if for_wayland == false -- budgie_dep = dependency('budgie-1.0') -+ budgie_dep = dependency('budgie-3.0') - peas_dep = dependency('libpeas-1.0') - python_loader = 'python3' - else From 385166ce3866a6d77a39f4dcd334012814bc95f5 Mon Sep 17 00:00:00 2001 From: Owen-sz Date: Tue, 26 May 2026 21:45:25 -0500 Subject: [PATCH 09/10] i hate this Signed-off-by: Owen-sz --- anda/desktops/budgie/budgie-extras/budgie-extras.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/budgie/budgie-extras/budgie-extras.spec b/anda/desktops/budgie/budgie-extras/budgie-extras.spec index 2f212458970..9490d084423 100644 --- a/anda/desktops/budgie/budgie-extras/budgie-extras.spec +++ b/anda/desktops/budgie/budgie-extras/budgie-extras.spec @@ -272,7 +272,7 @@ workspaces. find . -name "meson.build" -exec sed -i "s/dependency('budgie-1.0')/dependency('budgie-3.0')/g" {} + %conf -%meson +%meson -Dwith-libpeas2=false %build %meson_build From 96fe793e38ca44462723273a6247a98d7a41e6f7 Mon Sep 17 00:00:00 2001 From: Owen-sz Date: Tue, 26 May 2026 21:48:29 -0500 Subject: [PATCH 10/10] i hate this Signed-off-by: Owen-sz --- anda/desktops/budgie/budgie-extras/budgie-extras.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/budgie/budgie-extras/budgie-extras.spec b/anda/desktops/budgie/budgie-extras/budgie-extras.spec index 9490d084423..2f212458970 100644 --- a/anda/desktops/budgie/budgie-extras/budgie-extras.spec +++ b/anda/desktops/budgie/budgie-extras/budgie-extras.spec @@ -272,7 +272,7 @@ workspaces. find . -name "meson.build" -exec sed -i "s/dependency('budgie-1.0')/dependency('budgie-3.0')/g" {} + %conf -%meson -Dwith-libpeas2=false +%meson %build %meson_build