Date: Mon, 21 Oct 2024 06:55:25 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 7b602d199cf9 - 2024Q4 - x11-wm/wlmaker: update to 0.4 Message-ID: <202410210655.49L6tPgZ032051@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=7b602d199cf9c22f98989ad22c5288417373f1f3 commit 7b602d199cf9c22f98989ad22c5288417373f1f3 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2024-10-20 11:16:38 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2024-10-21 06:53:41 +0000 x11-wm/wlmaker: update to 0.4 Changes: https://github.com/phkaeser/wlmaker/releases/tag/v0.4 Reported by: GitHub (watch releases) (cherry picked from commit a2b8594899865e63a4247981486ce15b262333fb) --- x11-wm/wlmaker/Makefile | 10 +++++++--- x11-wm/wlmaker/distinfo | 10 +++++----- x11-wm/wlmaker/files/patch-session | 13 +++++++++++-- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/x11-wm/wlmaker/Makefile b/x11-wm/wlmaker/Makefile index 921a6beae122..fd8a8f6752f1 100644 --- a/x11-wm/wlmaker/Makefile +++ b/x11-wm/wlmaker/Makefile @@ -1,7 +1,6 @@ PORTNAME= wlmaker DISTVERSIONPREFIX= v -DISTVERSION= 0.3 -PORTREVISION= 2 +DISTVERSION= 0.4 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org @@ -23,18 +22,23 @@ USE_GITHUB= yes USE_GNOME= cairo USE_XORG= xcb GH_ACCOUNT= phkaeser -GH_TUPLE= phkaeser:libbase:df7ce2a:libbase/submodules/libbase +GH_TUPLE= phkaeser:libbase:69a87c3: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 \ share/icons/${PORTNAME}/terminal-48x48.png \ + share/icons/${PORTNAME}/wlmclock-64x64.png \ + share/applications/wlmclock.desktop \ share/wayland-sessions/${PORTNAME}.desktop \ ${NULL} post-patch: +# Temporarily force wlroots 0.17 + @${REINPLACE_CMD} '/PKG.*wlroots-0.18/d' ${WRKSRC}/CMakeLists.txt # Respect -O level from global CFLAGS or CMAKE_BUILD_TYPE @${REINPLACE_CMD} '/-O[0-9]/d' \ ${WRKSRC}/submodules/libbase/CMakeLists.txt \ diff --git a/x11-wm/wlmaker/distinfo b/x11-wm/wlmaker/distinfo index 9736af504226..3650e8ce0978 100644 --- a/x11-wm/wlmaker/distinfo +++ b/x11-wm/wlmaker/distinfo @@ -1,5 +1,5 @@ -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 +TIMESTAMP = 1729422998 +SHA256 (phkaeser-wlmaker-v0.4_GH0.tar.gz) = 814bb1caf536e6a443cef79bbb0c9722a3866fee5d5c89ccf76504abff9051d2 +SIZE (phkaeser-wlmaker-v0.4_GH0.tar.gz) = 356667 +SHA256 (phkaeser-libbase-69a87c3_GH0.tar.gz) = d34c704c787e50506e282880fbf0027edc7f76eb7f3c2eacef7563b2fca4e5ef +SIZE (phkaeser-libbase-69a87c3_GH0.tar.gz) = 100236 diff --git a/x11-wm/wlmaker/files/patch-session b/x11-wm/wlmaker/files/patch-session index 5c130bcd9763..5434bb648974 100644 --- a/x11-wm/wlmaker/files/patch-session +++ b/x11-wm/wlmaker/files/patch-session @@ -1,8 +1,8 @@ Avoid Debian specifics when starting from a GUI login manager ---- share/CMakeLists.txt.orig 2024-07-04 07:20:06 UTC +--- share/CMakeLists.txt.orig 2024-08-30 23:53:51 UTC +++ share/CMakeLists.txt -@@ -18,17 +18,10 @@ CONFIGURE_FILE( +@@ -18,20 +18,13 @@ CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/wrap-wlmaker.sh.in ${CMAKE_CURRENT_BINARY_DIR}/wrap-wlmaker.sh @ONLY) @@ -21,6 +21,15 @@ Avoid Debian specifics when starting from a GUI login manager FILES ${CMAKE_CURRENT_BINARY_DIR}/wlmaker.desktop - TYPE DATA) + DESTINATION "share/wayland-sessions") + + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/wlmclock.desktop.in +@@ -39,4 +32,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 @@ -1,5 +1,5 @@ Comment=A Wayland compositor inspired by Window Maker
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410210655.49L6tPgZ032051>