pool/budgie-desktop
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1251131 from X11:Solus

Browse Source 
Budgie on Wayland

OBS-URL: https://build.opensuse.org/request/show/1251131
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/budgie-desktop?expand=0&rev=49
This commit is contained in:
Ana Guerrero 2025-03-07 15:40:11 +00:00 committed by Git OBS Bridge
commit d5a1a78982
9 changed files with 138 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_service
View File

@ -2,7 +2,7 @@
<service name="obs_scm" mode="manual">
<param name="scm">git</param>
<param name="url">https://github.com/BuddiesOfBudgie/budgie-desktop.git</param>
<param name="revision">a23ff6ab25e9def5810aab68d8901d0525d65864</param>
<param name="revision">0b8a8dd3daceebf355ddf18f487eac7e2d2812f9</param>
<param name="versionformat">10.9.2+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">v?(.*)|\+0</param>
<param name="parent-tag">3f38b1e344941a0f1d5065be1f04fe533dbe3ecf</param>

2
_servicedata
View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/BuddiesOfBudgie/budgie-desktop.git</param>
<param name="changesrevision">a23ff6ab25e9def5810aab68d8901d0525d65864</param></service></servicedata>
<param name="changesrevision">0b8a8dd3daceebf355ddf18f487eac7e2d2812f9</param></service></servicedata>

3
budgie-desktop-10.9.2+24.obscpio Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4549e64d411430494b1ca12c70a251bafe778e7544ebc98dacf5b9a3a0ba759a
size 11433997

3
budgie-desktop-10.9.2+5.obscpio
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e2443ef7ff73b96ce4bd1c219db449d48126b7c6f3a73258a656376d635afb31
size 11376141

26
budgie-desktop.changes
View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Wed Jan 29 14:52:00 UTC 2025 - gmbr3@opensuse.org
- Update to version 10.9.2+24:
* icon-tasklist: Remove last references to xid
* Switch session files, leave magpie session in the code
for a future release
* Center the polkit dialog
* Rejig notifications to work with layer-shell positioning
* Screen Dimming
* Add a root menu for the desktop
* Add our wayland compatible screenlocker
* Add a bridge between gsettings and labwc
* Change our Desktop Current Session ID to Budgie
from Budgie:GNOME
* Session management
* fix: gicon resulting in extremely bright or dim icons when
no icon was found (used fallback)
* windowing: Remove window mapper class since we don't need
it on Wayland
* Add support for background handling via swaybg
- Move everything to wayland
- Add patches to fix minor issues:
* user-config-path.patch
* wrong-typelib-version.patch
-------------------------------------------------------------------
Mon Jan 27 09:25:24 UTC 2025 - gmbr3@opensuse.org

6
budgie-desktop.obsinfo
View File

@ -1,4 +1,4 @@
name: budgie-desktop
version: 10.9.2+5
mtime: 1731352162
commit: a23ff6ab25e9def5810aab68d8901d0525d65864
version: 10.9.2+24
mtime: 1738075077
commit: 0b8a8dd3daceebf355ddf18f487eac7e2d2812f9

95
budgie-desktop.spec
View File

@ -21,21 +21,16 @@
%if 0%{?suse_version} < 1550
%define _distconfdir %{_sysconfdir}
%endif
%if 0%{?suse_version} >= 1600 || 0%{?sle_version} >= 150600
%bcond_without magpie
%else
%bcond_with magpie
%endif
Name: budgie-desktop
Version: 10.9.2+5
Version: 10.9.2+24
Release: 0
Summary: GTK3 Desktop Environment
License: GPL-2.0-or-later AND LGPL-2.1-or-later
Group: System/GUI/Other
URL: https://github.com/BuddiesOfBudgie/budgie-desktop
Source0: %{name}-%{version}.tar.xz
# Solus stupid 1000
BuildRequires: budgie-screensaver
Patch0: user-config-path.patch
Patch1: wrong-typelib-version.patch
BuildRequires: intltool
BuildRequires: meson
BuildRequires: pkgconfig
@ -53,11 +48,6 @@ BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(gtk-doc)
BuildRequires: pkgconfig(ibus-1.0)
BuildRequires: pkgconfig(libgnome-menu-3.0)
%if %{with magpie}
BuildRequires: pkgconfig(libmagpie-0)
%else
BuildRequires: (pkgconfig(libmutter-11) or pkgconfig(libmutter-10))
%endif
BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(libpeas-gtk-1.0)
BuildRequires: pkgconfig(libpulse)
@ -73,29 +63,30 @@ BuildRequires: pkgconfig(libcanberra)
BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: pkgconfig(libxfce4windowing-0) >= 4.19.7
BuildRequires: pkgconfig(upower-glib) >= 1.0
BuildRequires: pkgconfig(gtk-layer-shell-0)
BuildRequires: pkgconfig(gtk-layer-shell-0) >= 0.9.0
# remove old applet
Provides: budgie-trash-applet = 1.7.0
Obsoletes: budgie-trash-applet
# remove X11 stuff
Obsoletes: budgie-screensaver
# flatpak/snap
BuildRequires: xdg-desktop-portal
Requires: xdg-desktop-portal
Requires: xdg-desktop-portal-gtk
# https://discuss.getsol.us/d/6970-cant-lock-my-screen/3
Conflicts: gnome-shell
#
# rebrand and gnome porting
Requires: (budgie-desktop-view >= 1.3+0 or nemo or desktopfolder)
Suggests: budgie-desktop-view >= 1.3+0
Requires: budgie-screensaver >= 5.1.0+0
Requires: (budgie-desktop-view >= 1.3+4 or nemo or desktopfolder)
Suggests: budgie-desktop-view >= 1.3+4
Requires: gtklock
Requires: swaybg
Requires: wlopm
Requires: swayidle
Requires: budgie-session-manager
Suggests: budgie-wayland-session
Requires: typelib-1_0-Budgie-2_0 >= %{version}
Requires: typelib-1_0-BudgieRaven-1_0 >= %{version}
Requires: budgie-desktop-branding >= 20240412.1
Requires: budgie-desktop-branding >= 20250305.1
Requires: budgie-control-center >= 1.4.0+2
Requires: budgie-session >= 0.9.1
%if %{with magpie}
Requires: magpie >= 0.9.3+0
%endif
Requires: budgie-backgrounds >= 3.0
#
# unchanged SOVER but new APIs
@ -116,11 +107,10 @@ Requires: libgnomesu
Requires: xdg-user-dirs-gtk
Requires: zenity
Requires: NetworkManager-applet
Requires(post): update-alternatives
Requires(postun):update-alternatives
%description
Budgie Desktop is the flagship desktop for the Solus Operating System.
The Budgie Desktop is a feature-rich, modern desktop designed to keep out the way of the user.
%package -n typelib-1_0-Budgie-2_0
Summary: Main Introspection bindings for the Budgie Desktop
@ -207,14 +197,28 @@ Group: System/Libraries
%description -n libbudgie-raven-plugin0
Shared library for budgie raven plugins to link against.
%package -n budgie-labwc-session
Summary: Labwc session files for Budgie
Group: System/GUI/Other
Requires: python3-systemd
Requires: labwc
Requires: (sddm or lightdm or gdm)
Suggests: sddm
Provides: budgie-session-manager = %{version}
Requires(post): update-alternatives
Requires(postun):update-alternatives
%description -n budgie-labwc-session
Provides the labwc session files for Budgie
%lang_package
%prep
%autosetup
%autosetup -p1
%build
export CFLAGS="%{optflags} -Wno-pedantic"
%meson -Dc_std=none -Dxdg-appdir=%{_distconfdir}/xdg/autostart
%meson -Dc_std=none -Dxdg-appdir=%{_distconfdir}/xdg/autostart -Dwith-runtime-dependencies=false
%meson_build
%install
@ -222,21 +226,18 @@ export CFLAGS="%{optflags} -Wno-pedantic"
# update-alternatives
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop
ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop
# handled by budgie-screensaver
rm %{buildroot}%{_distconfdir}/xdg/autostart/org.buddiesofbudgie.BudgieDesktopScreensaver.desktop
touch %{buildroot}%{_sysconfdir}/alternatives/default-waylandsession.desktop
ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_datadir}/wayland-sessions/default.desktop
%find_lang %{name}
%post
%{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \
default-xsession.desktop %{_datadir}/xsessions/budgie-desktop.desktop 20
%post -n budgie-labwc-session
%{_sbindir}/update-alternatives --install %{_datadir}/wayland-sessions/default.desktop \
default-waylandsession.desktop %{_datadir}/wayland-sessions/budgie-desktop.desktop 20
%postun
[ -f %{_datadir}/xsessions/budgie-desktop.desktop ] || %{_sbindir}/update-alternatives \
--remove default-xsession.desktop %{_datadir}/xsessions/budgie-desktop.desktop
%postun -n budgie-labwc-session
[ -f %{_datadir}/wayland-sessions/budgie-desktop.desktop ] || %{_sbindir}/update-alternatives \
--remove default-waylandsession.desktop %{_datadir}/wayland-sessions/budgie-desktop.desktop
%ldconfig_scriptlets -n libraven0
%ldconfig_scriptlets -n libbudgietheme0
@ -252,6 +253,7 @@ rm %{buildroot}%{_distconfdir}/xdg/autostart/org.buddiesofbudgie.BudgieDesktopSc
%{_libexecdir}/budgie-desktop
%{_mandir}/man1/*%{?ext_man}
%{_datadir}/budgie
%{_datadir}/%{name}
%{_datadir}/applications/*.desktop
%{_datadir}/backgrounds
%{_datadir}/glib-2.0/schemas/*.gschema.xml
@ -259,13 +261,10 @@ rm %{buildroot}%{_distconfdir}/xdg/autostart/org.buddiesofbudgie.BudgieDesktopSc
%{_datadir}/icons/hicolor/scalable/*/*.svg
%{_datadir}/icons/hicolor/symbolic/*/*.svg
%{_datadir}/gnome-session
%{_datadir}/xsessions/default.desktop
%{_datadir}/xsessions/budgie-desktop.desktop
%{_datadir}/xdg-desktop-portal/budgie-portals.conf
%{_libdir}/budgie-desktop
%{_distconfdir}/xdg/autostart/*.desktop
%ghost %{_sysconfdir}/alternatives/default-xsession.desktop
%ghost %{_sysconfdir}/alternatives/default.desktop
%exclude %{_distconfdir}/xdg/autostart/org.buddiesofbudgie.labwc-bridge.desktop
%files -n libraven0
%{_libdir}/libraven.so.*
@ -302,6 +301,14 @@ rm %{buildroot}%{_distconfdir}/xdg/autostart/org.buddiesofbudgie.BudgieDesktopSc
%files -n typelib-1_0-BudgieRaven-1_0
%{_libdir}/girepository-1.0/BudgieRaven-1.0.typelib
%files -n budgie-labwc-session
%{_distconfdir}/xdg/autostart/org.buddiesofbudgie.labwc-bridge.desktop
%dir %{_datadir}/wayland-sessions
%{_datadir}/wayland-sessions/default.desktop
%{_datadir}/wayland-sessions/budgie-desktop.desktop
%ghost %{_sysconfdir}/alternatives/default-waylandsession.desktop
%ghost %{_sysconfdir}/alternatives/default.desktop
%files doc
%{_datadir}/gtk-doc/html/budgie-desktop

31
user-config-path.patch Normal file
View File

@ -0,0 +1,31 @@
0From bf26ad006f8d41a04eaa98c1076d33b0c99678ba Mon Sep 17 00:00:00 2001
From: Callum Farmer <gmbr3@opensuse.org>
Date: Thu, 30 Jan 2025 10:38:35 +0000
Subject: [PATCH] [labwc bridge] Path not updated after user config created
Causes permission denied error as it'll try to write to /usr
(Issue occurs on firstboot only)
---
src/bridges/labwc/labwc_bridge.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/bridges/labwc/labwc_bridge.py b/src/bridges/labwc/labwc_bridge.py
index 17281f52d..b7f5ade65 100644
--- a/src/bridges/labwc/labwc_bridge.py
+++ b/src/bridges/labwc/labwc_bridge.py
@@ -110,6 +110,7 @@ def __init__(self):
folder = self.user_config("")
os.makedirs(folder, exist_ok=True)
shutil.copy(path, search_path[0])
+ path = search_path[0]
except Exception as e:
self.log.critical("Failed to copy " + path + " to " + search_path[0])
self.log.critical(e)
@@ -122,6 +123,7 @@ def __init__(self):
try:
if path != search_path[0]:
shutil.copy(path, search_path[0])
+ path = search_path[0]
except Exception as e:
self.log.critical("Failed to copy " + path + " to " + search_path[0])
self.log.critical(e)

22
wrong-typelib-version.patch Normal file
View File

@ -0,0 +1,22 @@
From c28e3b4dd483013130bead08e21d93b77aa942c8 Mon Sep 17 00:00:00 2001
From: Callum Farmer <gmbr3@opensuse.org>
Date: Sun, 2 Feb 2025 19:32:35 +0000
Subject: [PATCH] [plugin_manager.vala] Load Budgie typelib v2
---
src/panel/plugin_manager.vala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/panel/plugin_manager.vala b/src/panel/plugin_manager.vala
index f4f2e4daf..de1689cd3 100644
--- a/src/panel/plugin_manager.vala
+++ b/src/panel/plugin_manager.vala
@@ -34,7 +34,7 @@ namespace Budgie {
var repo = GI.Repository.get_default();
repo.require("Peas", "1.0", 0);
repo.require("PeasGtk", "1.0", 0);
- repo.require("Budgie", "1.0", 0);
+ repo.require("Budgie", "2.0", 0);
} catch (Error e) {
message("Error loading typelibs: %s", e.message);
}