Skip to content

Commit

Permalink
x11-wm/wlmaker: update to 0.3
Browse files Browse the repository at this point in the history
Changes:	https://github.com/phkaeser/wlmaker/releases/tag/v0.3
Reported by:	GitHub (watch releases)
  • Loading branch information
jbeich committed Jul 5, 2024
1 parent b2a03fd commit 6be13af
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 11 deletions.
14 changes: 8 additions & 6 deletions x11-wm/wlmaker/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PORTNAME= wlmaker
DISTVERSIONPREFIX= v
DISTVERSION= 0.2
DISTVERSION= 0.3
CATEGORIES= x11-wm wayland

MAINTAINER= jbeich@FreeBSD.org
Expand All @@ -17,29 +17,31 @@ LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \
libxkbcommon.so:x11/libxkbcommon
RUN_DEPENDS= foot:x11/foot

USES= cmake compiler:c11 gnome pkgconfig xorg
USES= bison cmake compiler:c11 gnome pkgconfig xorg
USE_GITHUB= yes
USE_GNOME= cairo
USE_XORG= xcb
GH_ACCOUNT= phkaeser
GH_TUPLE= phkaeser:libbase:27aae18:libbase/submodules/libbase
GH_TUPLE= phkaeser:libbase:df7ce2a:libbase/submodules/libbase
PLIST_FILES= bin/${PORTNAME} \
bin/wlmclock \
share/icons/${PORTNAME}/chrome-48x48.png \
share/icons/${PORTNAME}/clip-48x48.png \
share/icons/${PORTNAME}/firefox-48x48.png \
share/icons/${PORTNAME}/terminal-48x48.png \
share/wayland-sessions/${PORTNAME}.desktop \
${NULL}

post-patch:
# Respect PREFIX for icons
@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
${WRKSRC}/src/decorations.c
${WRKSRC}/src/clip.c \
${WRKSRC}/src/launcher.c
# Respect LOCALBASE for apps and use open source Chrome
@${REINPLACE_CMD} -e 's,/usr/bin,${LOCALBASE}/bin,' \
-e 's/google-chrome/chrome/' \
${WRKSRC}/src/dock.c \
${WRKSRC}/src/${PORTNAME}.c
${WRKSRC}/src/action.c \
${WRKSRC}/etc/*.plist
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=276743
@${GREP} -Flr _POSIX_C_SOURCE ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
'/_POSIX_C_SOURCE/d'
Expand Down
10 changes: 5 additions & 5 deletions x11-wm/wlmaker/distinfo
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TIMESTAMP = 1712511915
SHA256 (phkaeser-wlmaker-v0.2_GH0.tar.gz) = 9b42a8f476ff183f636d508fa219eef425a35811fa463d5fdf11297061461455
SIZE (phkaeser-wlmaker-v0.2_GH0.tar.gz) = 267451
SHA256 (phkaeser-libbase-27aae18_GH0.tar.gz) = 06116d10a633451d27ee72daed666afc3cc0ec939c7b8a33d85c0614f91619af
SIZE (phkaeser-libbase-27aae18_GH0.tar.gz) = 97255
TIMESTAMP = 1720077606
SHA256 (phkaeser-wlmaker-v0.3_GH0.tar.gz) = bae426bcc8d9c77bfe0c7e452d0f6ee9b73aeb30b6b276c46212ebf6ede954e6
SIZE (phkaeser-wlmaker-v0.3_GH0.tar.gz) = 280776
SHA256 (phkaeser-libbase-df7ce2a_GH0.tar.gz) = 2aefe449869cf9824e6150ba924d81bd9cc8a369232ad89060c2607fbbb9ba19
SIZE (phkaeser-libbase-df7ce2a_GH0.tar.gz) = 99929
32 changes: 32 additions & 0 deletions x11-wm/wlmaker/files/patch-session
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
Avoid Debian specifics when starting from a GUI login manager

--- share/CMakeLists.txt.orig 2024-07-04 07:20:06 UTC
+++ share/CMakeLists.txt
@@ -18,17 +18,10 @@ 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
@ONLY)
INSTALL(
FILES ${CMAKE_CURRENT_BINARY_DIR}/wlmaker.desktop
- TYPE DATA)
+ DESTINATION "share/wayland-sessions")
--- share/wlmaker.desktop.in.orig 2024-07-04 07:20:06 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=wlmaker
Type=Application

0 comments on commit 6be13af

Please sign in to comment.