git: 767b2d8097ca - main - x11-wm/wlmaker: update to 0.5
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 08 Mar 2025 00:22:23 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=767b2d8097ca85eabb6c6270e749a8405939f196
commit 767b2d8097ca85eabb6c6270e749a8405939f196
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2025-03-07 22:11:50 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2025-03-08 00:19:24 +0000
x11-wm/wlmaker: update to 0.5
Changes: https://github.com/phkaeser/wlmaker/releases/tag/v0.5
Reported by: GitHub (watch releases)
---
x11-wm/wlmaker/Makefile | 16 ++++++++++------
x11-wm/wlmaker/distinfo | 10 +++++-----
x11-wm/wlmaker/files/patch-session | 23 +++++------------------
3 files changed, 20 insertions(+), 29 deletions(-)
diff --git a/x11-wm/wlmaker/Makefile b/x11-wm/wlmaker/Makefile
index 69030f32cbe0..5c55704e0170 100644
--- a/x11-wm/wlmaker/Makefile
+++ b/x11-wm/wlmaker/Makefile
@@ -1,7 +1,6 @@
PORTNAME= wlmaker
DISTVERSIONPREFIX= v
-DISTVERSION= 0.4.1
-PORTREVISION= 1
+DISTVERSION= 0.5
CATEGORIES= x11-wm wayland
MAINTAINER= jbeich@FreeBSD.org
@@ -23,11 +22,10 @@ USE_GITHUB= yes
USE_GNOME= cairo
USE_XORG= xcb
GH_ACCOUNT= phkaeser
-GH_TUPLE= phkaeser:libbase:69a87c3:libbase/submodules/libbase
+GH_TUPLE= phkaeser:libbase:114022f:libbase/submodules/libbase
CMAKE_OFF= ${WITH_DEBUG:D:Uconfig_DEBUG}
PLIST_FILES= bin/${PORTNAME} \
bin/wlmclock \
- @comment\ bin/example_toplevel \
share/icons/${PORTNAME}/chrome-48x48.png \
share/icons/${PORTNAME}/clip-48x48.png \
share/icons/${PORTNAME}/firefox-48x48.png \
@@ -35,6 +33,10 @@ PLIST_FILES= bin/${PORTNAME} \
share/icons/${PORTNAME}/wlmclock-64x64.png \
share/applications/wlmclock.desktop \
share/wayland-sessions/${PORTNAME}.desktop \
+ ${DATADIR}/root-menu.plist \
+ ${DATADIR}/style.plist \
+ ${DATADIR}/wlmaker-state.plist \
+ ${DATADIR}/wlmaker.plist \
${NULL}
post-patch:
@@ -42,10 +44,12 @@ post-patch:
@${REINPLACE_CMD} '/-O[0-9]/d' \
${WRKSRC}/submodules/libbase/CMakeLists.txt \
${WRKSRC}/CMakeLists.txt
-# Respect PREFIX for icons
+# Respect PREFIX for icons and system-wide config
@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
${WRKSRC}/src/clip.c \
- ${WRKSRC}/src/launcher.c
+ ${WRKSRC}/src/config.c \
+ ${WRKSRC}/src/launcher.c \
+ ${WRKSRC}/src/${PORTNAME}.c
# Respect LOCALBASE for apps and use open source Chrome
@${REINPLACE_CMD} -e 's,/usr/bin,${LOCALBASE}/bin,' \
-e 's/google-chrome/chrome/' \
diff --git a/x11-wm/wlmaker/distinfo b/x11-wm/wlmaker/distinfo
index 3a9aacfa6f0c..7fc3503caec0 100644
--- a/x11-wm/wlmaker/distinfo
+++ b/x11-wm/wlmaker/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1731081904
-SHA256 (phkaeser-wlmaker-v0.4.1_GH0.tar.gz) = 674dc7d5043d7855200c4708bcb07f93333bd27ec528cf46172ecd9aff32200d
-SIZE (phkaeser-wlmaker-v0.4.1_GH0.tar.gz) = 356537
-SHA256 (phkaeser-libbase-69a87c3_GH0.tar.gz) = d34c704c787e50506e282880fbf0027edc7f76eb7f3c2eacef7563b2fca4e5ef
-SIZE (phkaeser-libbase-69a87c3_GH0.tar.gz) = 100236
+TIMESTAMP = 1741385510
+SHA256 (phkaeser-wlmaker-v0.5_GH0.tar.gz) = 2d06c92fbfb1bc543610692fc9460373b4ead479c0cff2212628cb64999fa7a5
+SIZE (phkaeser-wlmaker-v0.5_GH0.tar.gz) = 377926
+SHA256 (phkaeser-libbase-114022f_GH0.tar.gz) = 4542215b9cd044440e1115ea789bf14280be5c803b7a40b845fd9e3400dfbad0
+SIZE (phkaeser-libbase-114022f_GH0.tar.gz) = 100728
diff --git a/x11-wm/wlmaker/files/patch-session b/x11-wm/wlmaker/files/patch-session
index 5434bb648974..bd47593ae79a 100644
--- a/x11-wm/wlmaker/files/patch-session
+++ b/x11-wm/wlmaker/files/patch-session
@@ -1,21 +1,8 @@
Avoid Debian specifics when starting from a GUI login manager
---- share/CMakeLists.txt.orig 2024-08-30 23:53:51 UTC
+--- share/CMakeLists.txt.orig 2025-03-07 20:59:09 UTC
+++ share/CMakeLists.txt
-@@ -18,20 +18,13 @@ CONFIGURE_FILE(
- ${CMAKE_CURRENT_SOURCE_DIR}/wrap-wlmaker.sh.in
- ${CMAKE_CURRENT_BINARY_DIR}/wrap-wlmaker.sh
- @ONLY)
--INSTALL(
-- FILES ${CMAKE_CURRENT_BINARY_DIR}/wrap-wlmaker.sh
-- TYPE BIN
-- PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE
-- GROUP_READ GROUP_EXECUTE
-- WORLD_READ WORLD_EXECUTE)
--
- CONFIGURE_FILE(
- ${CMAKE_CURRENT_SOURCE_DIR}/wlmaker.desktop.in
- ${CMAKE_CURRENT_BINARY_DIR}/wlmaker.desktop
+@@ -20,7 +20,7 @@ INSTALL(
@ONLY)
INSTALL(
FILES ${CMAKE_CURRENT_BINARY_DIR}/wlmaker.desktop
@@ -24,18 +11,18 @@ Avoid Debian specifics when starting from a GUI login manager
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/wlmclock.desktop.in
-@@ -39,4 +32,4 @@ INSTALL(
+@@ -28,4 +28,4 @@ INSTALL(
@ONLY)
INSTALL(
FILES ${CMAKE_CURRENT_BINARY_DIR}/wlmclock.desktop
- TYPE DATA)
+ DESTINATION "share/applications")
---- share/wlmaker.desktop.in.orig 2024-07-04 07:20:06 UTC
+--- share/wlmaker.desktop.in.orig 2025-03-07 20:59:09 UTC
+++ share/wlmaker.desktop.in
@@ -1,5 +1,5 @@ Comment=A Wayland compositor inspired by Window Maker
[Desktop Entry]
Name=WaylandMaker
Comment=A Wayland compositor inspired by Window Maker
--Exec=@CMAKE_INSTALL_PREFIX@/bin/wrap-wlmaker.sh
+-Exec=@CMAKE_INSTALL_PREFIX@/bin/wlmaker.sh
+Exec=wlmaker
Type=Application