public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/wlmaker] f45: Update to 0.8.1
@ 2026-08-21 15:43 Michel Lind
0 siblings, 0 replies; only message in thread
From: Michel Lind @ 2026-08-21 15:43 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/wlmaker
Branch : f45
Commit : f77ce58f803e561997ffbdd29c3eb482628db8a7
Author : Michel Lind <salimma@fedoraproject.org>
Date : 2026-08-21T15:44:32+01:00
Stats : +73/-98 in 6 file(s)
URL : https://src.fedoraproject.org/rpms/wlmaker/c/f77ce58f803e561997ffbdd29c3eb482628db8a7?branch=f45
Log:
Update to 0.8.1
Signed-off-by: Michel Lind <salimma@fedoraproject.org>
---
diff --git a/.gitignore b/.gitignore
index fa60c05..1c0d53e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
/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
diff --git a/0001-fix-config-path.patch b/0001-fix-config-path.patch
deleted file mode 100644
index b851b40..0000000
--- a/0001-fix-config-path.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From a9206d4ddff7257c0d16a014bdff3e8a6359479a Mon Sep 17 00:00:00 2001
-From: Philipp Kaeser <kaeser@gubbe.ch>
-Date: Sat, 24 Jan 2026 15:14:22 +0100
-Subject: [PATCH] build: Forces /etc only for /usr, and irrespective of
- CMAKE_INSTALL_SYSCONFDIR.
-
----
- CMakeLists.txt | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1cd3bbe4..47b6a34a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,8 +13,8 @@
- # limitations under the License.
- #
- # Default arguments:
--# cmake -DCMAKE_INSTALL_PREFIX:PATH=${HOME}/.local -DCMAKE_INSTALL_SYSCONFDIR=/etc -Dconfig_DOXYGEN_CRITICAL=ON -Dconfig_WERROR=ON -DIWYU_MODE=FAIL -B build
--# CC=clang cmake -DCMAKE_INSTALL_PREFIX:PATH="${HOME}/.local" -DCMAKE_INSTALL_SYSCONFDIR=/etc -Dconfig_DOXYGEN_CRITICAL=ON -Dconfig_WERROR=ON -DIWYU_MODE=FAIL -B build-clang
-+# cmake -DCMAKE_INSTALL_PREFIX:PATH=${HOME}/.local -Dconfig_DOXYGEN_CRITICAL=ON -Dconfig_WERROR=ON -DIWYU_MODE=FAIL -B build
-+# CC=clang cmake -DCMAKE_INSTALL_PREFIX:PATH="${HOME}/.local" -Dconfig_DOXYGEN_CRITICAL=ON -Dconfig_WERROR=ON -DIWYU_MODE=FAIL -B build-clang
- #
- # Useor "/etc".
-
-@@ -70,10 +70,9 @@ ENDIF()
-
- # Defaults to /usr/local/lib for installation.
- INCLUDE(GNUInstallDirs)
--# Override: If using a non-standard prefix, install the config files beneath
--# the prefix. Otherwise, fall back to use ${CMAKE_INSTALL_SYSCONFDIR} (/etc/).
--IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr" AND NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr/local")
-- SET(WLMAKER_INSTALL_CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/etc/xdg/wlmaker")
-+IF(CMAKE_INSTALL_PREFIX STREQUAL "/usr")
-+ # For targets /usr, forces configurations into XDG config default path.
-+ SET(WLMAKER_INSTALL_CONFIG_DIR "/etc/xdg/wlmaker")
- ELSE()
- SET(WLMAKER_INSTALL_CONFIG_DIR "${CMAKE_INSTALL_SYSCONFDIR}/xdg/wlmaker")
- ENDIF()
diff --git a/0002-remove-google-chrome.patch b/0002-remove-google-chrome.patch
deleted file mode 100644
index eba8b59..0000000
--- a/0002-remove-google-chrome.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From fc0e97b3765575d3eb7c61962314f92211812393 Mon Sep 17 00:00:00 2001
-From: Shawn W Dunn <sfalken@opensuse.org>
-Date: Sat, 24 Jan 2026 13:41:00 -0800
-Subject: [PATCH] remove google chrome
-
----
- 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 abda0e1..53f3724 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 33cdf72..92d0f67 100644
---- a/etc/State.plist
-+++ b/etc/State.plist
-@@ -10,10 +10,6 @@
- CommandLine = "/usr/bin/foot";
- Icon = "terminal-48x48.png";
- },
-- {
-- CommandLine = "/usr/bin/google-chrome --enable-features=UseOzonePlatform --ozone-platform=wayland";
-- Icon = "chrome-48x48.png";
-- },
- {
- CommandLine = "MOZ_ENABLE_WAYLAND=1 /usr/bin/firefox";
- Icon = "firefox-48x48.png";
-@@ -40,4 +36,4 @@
- Color = "argb32:ff508050";
- },
- );
--}
-\ No newline at end of file
-+}
---
-2.52.0
-
diff --git a/remove-google-chrome-chromium.patch b/remove-google-chrome-chromium.patch
new file mode 100644
index 0000000..3edb496
--- /dev/null
+++ 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
+
diff --git a/sources b/sources
index 5dbf8d9..ca4b72c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (wlmaker-0.7.tar.gz) = c6844b3483c39342dbb9192a95962ddd3cfdc7761f6b5a08f411b8c8696b0e64cb0255f7d718e7dc50a87ef5ef02d9ec594a4662f3e6c83fbdeebbc3e530c6f3
-SHA512 (libbase-aa0da7a355b04b1dd8572a94261a0b0c497e1a85.tar.gz) = c9d108260e151be6950bcfb18facb486e3aa6089d05b25f787aae711b0d770623b9b3051fd51ba523738416725c1d8ddf5a0d84d2a20e8477712270455d89e6e
+SHA512 (wlmaker-0.8.1.tar.gz) = 6eb8280bb2bf407625101922f5969833b39b1b40075bf7c43513751bb0d9dfaf84bb0b698b1c92943731af927b0e2033f3549821ab0d2c981a6165a22762f08a
+SHA512 (libbase-2663444797981b11ade10e23813ada407e3b24b4.tar.gz) = df5ad26a08e10479c262158e5c374ad44d1ca4319214e2e840827f7a52caaf3432a8baf942c65fc03ee7a40f64d3f7c5bffee3ef82b601447f5b63c08df082bf
diff --git a/wlmaker.spec b/wlmaker.spec
index 050c3f8..ae55395 100644
--- 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 aa0da7a355b04b1dd8572a94261a0b0c497e1a85
+%global libbase_commit 2663444797981b11ade10e23813ada407e3b24b4
%global libbase_url https://github.com/phkaeser/libbase
%bcond docs 1
@@ -9,7 +9,7 @@
%global toolchain clang
Name: wlmaker
-Version: 0.7
+Version: 0.8.1
Release: %autorelease
Summary: Wayland compositor inspired by Window Maker
@@ -18,10 +18,9 @@ URL: https://github.com/phkaeser/wlmaker
Source0: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz
Source1: %{libbase_url}/archive/%{libbase_commit}/libbase-%{libbase_commit}.tar.gz
-# Corrects path to configs https://github.com/phkaeser/wlmaker/pull/429
-Patch0: 0001-fix-config-path.patch
-# Drops google-chrome from default dock placement, and application menu, adds Firefox
-Patch1: 0002-remove-google-chrome.patch
+# 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}
@@ -32,6 +31,7 @@ BuildRequires: clang
BuildRequires: desktop-file-utils
BuildRequires: flex
BuildRequires: hicolor-icon-theme
+BuildRequires: libappstream-glib
BuildRequires: sed
%if %{with docs}
BuildRequires: doxygen
@@ -44,11 +44,11 @@ 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.19)
+BuildRequires: pkgconfig(wlroots-0.20) >= 0.20
BuildRequires: pkgconfig(xcb) >= 1.15
-BuildRequires: pkgconfig(libxdg-basedir)
+BuildRequires: pkgconfig(libxdg-basedir) >= 1.2
BuildRequires: pkgconfig(xkbcommon) >= 1.5.0
BuildRequires: pkgconfig(xwayland) >= 22.1.9
@@ -109,18 +109,26 @@ sed -i 's/-Werror//' CMakeLists.txt submodules/libbase/CMakeLists.txt
%check
%ctest
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
%{_bindir}/%{name}
+%{_bindir}/wlmbattery
+%{_bindir}/wlmcpugraph
%{_bindir}/wlmclock
%{_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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-21 15:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-21 15:43 [rpms/wlmaker] f45: Update to 0.8.1 Michel Lind
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox