Update to 0.8.1

Signed-off-by: Michel Lind <salimma@fedoraproject.org>
Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
2026-08-21 15:44:32 +01:00 · 2026-07-17 08:51:35 +00:00 · 2026-02-07 23:02:23 +00:00 · 2026-01-17 20:17:33 +00:00
4 changed files with 93 additions and 26 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,3 +2,7 @@
 /wlmaker-0.2.tar.gz
 /libbase-69a87c3c476c73683c9b12e3ac099ac464bd562e.tar.gz
 /wlmaker-0.4.1.tar.gz
+/wlmaker-0.7.tar.gz
+/libbase-aa0da7a355b04b1dd8572a94261a0b0c497e1a85.tar.gz
+/wlmaker-0.8.1.tar.gz
+/libbase-2663444797981b11ade10e23813ada407e3b24b4.tar.gz
--- a/remove-google-chrome-chromium.patch
+++ b/remove-google-chrome-chromium.patch
@ -0,0 +1,52 @@
+From abdf0e9b4e914c67c8f28af68c0de95a81161463 Mon Sep 17 00:00:00 2001
+From: Michel Lind <salimma@fedoraproject.org>
+Date: Fri, 21 Aug 2026 15:25:01 +0100
+Subject: [PATCH] Remove Google Chrome and Chromium from the menu and dock
+
+Redoing the patch we carried in Fedora for 0.7 because the originals
+have changed
+
+Signed-off-by: Michel Lind <salimma@fedoraproject.org>
+---
+ etc/RootMenu.plist | 2 +-
+ etc/State.plist    | 6 +-----
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/etc/RootMenu.plist b/etc/RootMenu.plist
+index 0190af8..fc0d4b6 100644
+--- a/etc/RootMenu.plist
+++ b/etc/RootMenu.plist
+@@ -6,7 +6,7 @@
+ ("Root Menu",
+  ("Applications",
+   ("Terminal", Execute, "/usr/bin/foot"),
+-  ("Chrome", ShellExecute, "/usr/bin/google-chrome --enable-features=UseOzonePlatform --ozone-platform=wayland --user-data-dir=/tmp/chrome-wayland")),
+  ("Firefox", ShellExecute, "MOZ_ENABLE_WAYLAND=1 /usr/bin/firefox")),
+  ("Outputs...",
+   ("Magnify", OutputMagnify),
+   ("Reduce", OutputReduce),
+diff --git a/etc/State.plist b/etc/State.plist
+index 6fc9f9b..2ff9592 100644
+--- a/etc/State.plist
+++ b/etc/State.plist
+@@ -10,10 +10,6 @@
+         CommandLine = "/usr/bin/foot";
+         Icon = "terminal-56x56.png";
+       },
+-      {
+-        CommandLine = "/usr/bin/chromium --enable-features=UseOzonePlatform --ozone-platform=wayland";
+-        Icon = "chromium-56x56.png";
+-      },
+       {
+         CommandLine = "MOZ_ENABLE_WAYLAND=1 /usr/bin/firefox";
+         Icon = "firefox-56x56.png";
+@@ -40,4 +36,4 @@
+         Color = "argb32:ff508050";
+     },
+   );
+-}
+\ No newline at end of file
+}
+-- 
+2.55.0
+
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (libbase-69a87c3c476c73683c9b12e3ac099ac464bd562e.tar.gz) = cc62502ec15b2bdbec8be09ae2a5ba63237e8512861865f5a4f1d7d5513e8b18cf70b679d2798526817e60534fbddd03dabe1a779c8d617df37c458e31471462
-SHA512 (wlmaker-0.4.1.tar.gz) = dd57677a78a528e86faee6538f3f14615ccf0d3fde5160d9df465821793afd2bfd6d2e8e0c9f67142e2a23d23ca363c88cfe5669b80ad60fcc768e910b84bdc6
+SHA512 (wlmaker-0.8.1.tar.gz) = 6eb8280bb2bf407625101922f5969833b39b1b40075bf7c43513751bb0d9dfaf84bb0b698b1c92943731af927b0e2033f3549821ab0d2c981a6165a22762f08a
+SHA512 (libbase-2663444797981b11ade10e23813ada407e3b24b4.tar.gz) = df5ad26a08e10479c262158e5c374ad44d1ca4319214e2e840827f7a52caaf3432a8baf942c65fc03ee7a40f64d3f7c5bffee3ef82b601447f5b63c08df082bf
--- a/wlmaker.spec
+++ b/wlmaker.spec
@ -1,6 +1,6 @@
 # libbase is a utility library from the same upstream that is only used by this
 # project and is statically linked into the build
-%global libbase_commit 69a87c3c476c73683c9b12e3ac099ac464bd562e
+%global libbase_commit 2663444797981b11ade10e23813ada407e3b24b4
 %global libbase_url https://github.com/phkaeser/libbase

 %bcond docs 1
@ -9,15 +9,19 @@
 %global toolchain clang

 Name:           wlmaker
-Version:        0.4.1
+Version:        0.8.1
 Release:        %autorelease
 Summary:        Wayland compositor inspired by Window Maker

 License:        Apache-2.0
 URL:            https://github.com/phkaeser/wlmaker
-Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+Source0:        %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz
 Source1:        %{libbase_url}/archive/%{libbase_commit}/libbase-%{libbase_commit}.tar.gz

+# Replace google-chrome with firefox in the application menu
+# Drop chromium from the default dock placement
+Patch:          remove-google-chrome-chromium.patch
+
 # i686: https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch:    %{ix86}

@ -26,6 +30,8 @@ BuildRequires:  bison
 BuildRequires:  clang
 BuildRequires:  desktop-file-utils
 BuildRequires:  flex
+BuildRequires:  hicolor-icon-theme
+BuildRequires:  libappstream-glib
 BuildRequires:  sed
 %if %{with docs}
 BuildRequires:  doxygen
@ -38,17 +44,20 @@ BuildRequires:  pkgconfig(cairo) >= 1.16.0

 # For wlmaker
 BuildRequires:  pkgconfig(wayland-client) >= 1.22.0
-BuildRequires:  pkgconfig(wayland-protocols) >= 1.31
+BuildRequires:  pkgconfig(wayland-protocols) >= 1.32
 BuildRequires:  pkgconfig(wayland-server) >= 1.22.0
-BuildRequires:  pkgconfig(wlroots) >= 0.17.4
+BuildRequires:  pkgconfig(wlroots-0.20) >= 0.20
 BuildRequires:  pkgconfig(xcb) >= 1.15
+BuildRequires:  pkgconfig(libxdg-basedir) >= 1.2
 BuildRequires:  pkgconfig(xkbcommon) >= 1.5.0
 BuildRequires:  pkgconfig(xwayland) >= 22.1.9

+Requires:       hicolor-icon-theme
+
 # These are hardcoded in the stock config
-Recommends:     chromium
 Recommends:     firefox
 Recommends:     foot
+Recommends:     wdisplays

 %if %{with docs}
 Suggests:       %{name}-doc = %{version}-%{release}
@ -85,11 +94,10 @@ mv ../libbase-%{libbase_commit}/ submodules/libbase
 # Do not abort on warnings
 sed -i 's/-Werror//' CMakeLists.txt submodules/libbase/CMakeLists.txt

-# Use chromium instead of google-chrome
-sed -i 's/google-chrome/chromium-browser/' etc/wlmaker-state.plist
+%conf
+%cmake -Dconfig_OPTIM=ON

 %build
-%cmake -Dconfig_OPTIM=ON
 %cmake_build
 %if %{with docs}
 %cmake_build --target doc
@ -98,31 +106,34 @@ sed -i 's/google-chrome/chromium-browser/' etc/wlmaker-state.plist
 %install
 %cmake_install

-# Drop useless example
-rm %{buildroot}%{_bindir}/example_toplevel
-
-# Relocate desktop files
-mkdir %{buildroot}%{_datadir}/applications/
-mv %{buildroot}%{_datadir}/{wlmaker,wlmclock}.desktop %{buildroot}%{_datadir}/applications/
-
 %check
 %ctest
-desktop-file-validate %{buildroot}/%{_datadir}/applications/{wlmaker,wlmclock}.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/{%{name},%{name}.wlmclock,%{name}.wlmeyes}.desktop
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.wlmaker.wlmaker.metainfo.xml

 %files
 %license LICENSE
-%doc README.md CODE_OF_CONDUCT.md CONTRIBUTING.md doc/ROADMAP.md
-%{_bindir}/wlmaker
+%doc README.md
+%{_bindir}/%{name}
+%{_bindir}/wlmbattery
+%{_bindir}/wlmcpugraph
 %{_bindir}/wlmclock
-%{_bindir}/wrap-wlmaker.sh
-%{_datadir}/applications/wlmaker.desktop
-%{_datadir}/applications/wlmclock.desktop
-%{_datadir}/icons/%{name}/
+%{_bindir}/wlmeyes
+%{_bindir}/wlmmemgraph
+%{_bindir}/wlmnetgraph
+%{_bindir}/wlmtool
+%{_sysconfdir}/xdg/%{name}/
+%{_datadir}/applications/
+%{_datadir}/icons/hicolor/*/apps/*
+%{_metainfodir}/org.wlmaker.wlmaker.metainfo.xml
+%{_datadir}/wayland-sessions/
+%{_datadir}/%{name}/icons/
+%{_datadir}/%{name}/Themes/

 %if %{with docs}
 %files doc
 %license LICENSE
-%doc %{_vpath_builddir}/doc/html/
+%doc CODE_OF_CONDUCT.md CONTRIBUTING.md doc/ROADMAP.md %{_vpath_builddir}/doc/html/
 %endif

 %changelog
Author	SHA1	Message	Date
Michel Lind	f77ce58f80	Update to 0.8.1 Signed-off-by: Michel Lind <salimma@fedoraproject.org>	2026-08-21 15:44:32 +01:00
Fedora Release Engineering	a099a3b978	Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild	2026-07-17 08:51:35 +00:00
Shawn W Dunn	02d0b2bb01	Update to 0.7 - Add 0001-fix-config-path.patch to put configs in the correct place - Add 0002-remove-google-chrome.patch to remove Google Chrome and enable Firefox as default browser - Update to libbase-aa0da7a355b04b1dd8572a94261a0b0c497e1a85 - Change Recommends: to firefox, foot, and wdisplays for functionality	2026-02-07 23:02:23 +00:00
Fedora Release Engineering	6a57d3d38f	Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild	2026-01-17 20:17:33 +00:00