git: 09f8a54e50d5 - main - x11-wm/wlmaker: don't hardcode WRKSRC in debug log

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Wed, 17 Jan 2024 17:54:48 UTC
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=09f8a54e50d5ac06256d35b771af79c973efc0b3

commit 09f8a54e50d5ac06256d35b771af79c973efc0b3
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-01-17 16:59:42 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-01-17 17:54:30 +0000

    x11-wm/wlmaker: don't hardcode WRKSRC in debug log
    
    $ wlmaker
    [...]
    (INFO) backend/wayland/backend.c:436 Starting Wayland backend
    (INFO) wrkdirs/usr/ports/x11-wm/wlmaker/work/wlmaker-0.1-430-ged7a302/src/server.c:731 Output layout change: Pos 0, 0 (1280 x 720).
    (INFO) wrkdirs/usr/ports/x11-wm/wlmaker/work/wlmaker-0.1-430-ged7a302/src/server.c:618 Server 0x3489a2c74000: Added output 0x3489a4acfb80
    (INFO) wrkdirs/usr/ports/x11-wm/wlmaker/work/wlmaker-0.1-430-ged7a302/src/wlmaker.c:282 Starting Wayland compositor for server 0x3489a2c74000 at wayland-0 ...
    (ERROR) wrkdirs/usr/ports/x11-wm/wlmaker/work/wlmaker-0.1-430-ged7a302/submodules/libbase/file.c:125 Failed realpath(/wrkdirs/usr/ports/x11-wm/wlmaker/work/wlmaker-0.1-430-ged7a302/icons/chrome-48x48.png, 0x820d1df10): errno(2): No such file or directory
    (ERROR) wrkdirs/usr/ports/x11-wm/wlmaker/work/wlmaker-0.1-430-ged7a302/submodules/libbase/file.c:125 Failed realpath(/wrkdirs/usr/ports/x11-wm/wlmaker/work/wlmaker-0.1-430-ged7a302/icons/terminal-48x48.png, 0x820d1df10): errno(2): No such file or directory
    (ERROR) wrkdirs/usr/ports/x11-wm/wlmaker/work/wlmaker-0.1-430-ged7a302/submodules/libbase/file.c:125 Failed realpath(/wrkdirs/usr/ports/x11-wm/wlmaker/work/wlmaker-0.1-430-ged7a302/icons/firefox-48x48.png, 0x820d1df10): errno(2): No such file or directory
    (INFO) wrkdirs/usr/ports/x11-wm/wlmaker/work/wlmaker-0.1-430-ged7a302/src/dock.c:141 Created dock view 0x3489a2c9a000
    (ERROR) wrkdirs/usr/ports/x11-wm/wlmaker/work/wlmaker-0.1-430-ged7a302/submodules/libbase/file.c:125 Failed realpath(/wrkdirs/usr/ports/x11-wm/wlmaker/work/wlmaker-0.1-430-ged7a302/icons/clip-48x48.png, 0x820d1df10): errno(2): No such file or directory
    (INFO) wrkdirs/usr/ports/x11-wm/wlmaker/work/wlmaker-0.1-430-ged7a302/src/clip.c:262 Created clip view 0x3489a2c5c540
    (INFO) wrkdirs/usr/ports/x11-wm/wlmaker/work/wlmaker-0.1-430-ged7a302/src/xdg_toplevel.c:183 Created window 0x3489a4ad0000 for wlmtk XDG toplevel surface 0x3489a474a800
    (INFO) wrkdirs/usr/ports/x11-wm/wlmaker/work/wlmaker-0.1-430-ged7a302/src/xdg_shell.c:122 XDG shell: Toolkit window 0x3489a4ad0000 for surface 0x3489a2c5d300
    (INFO) wrkdirs/usr/ports/x11-wm/wlmaker/work/wlmaker-0.1-430-ged7a302/src/xdg_decoration.c:268 XDG decoration request_mode for XDG surface 0x3489a474a400, content 0x3489a474a910: Current 0, pending 0, scheduled 2, requested 2. Set: 2
    (INFO) wrkdirs/usr/ports/x11-wm/wlmaker/work/wlmaker-0.1-430-ged7a302/src/toolkit/window.c:309 Set server side decoration for window 0x3489a4ad0000: 1
    (INFO) wrkdirs/usr/ports/x11-wm/wlmaker/work/wlmaker-0.1-430-ged7a302/src/server.c:731 Output layout change: Pos 0, 0 (0 x 0).
    ^C
---
 x11-wm/wlmaker/Makefile                       |  1 +
 x11-wm/wlmaker/files/patch-src_CMakeLists.txt | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/x11-wm/wlmaker/Makefile b/x11-wm/wlmaker/Makefile
index fb929358f3e1..6ede9a25dd47 100644
--- a/x11-wm/wlmaker/Makefile
+++ b/x11-wm/wlmaker/Makefile
@@ -29,6 +29,7 @@ USE_GITHUB=	yes
 USE_GNOME=	cairo
 GH_ACCOUNT=	phkaeser
 GH_TUPLE=	phkaeser:libbase:c215f7d:libbase/submodules/libbase
+CFLAGS+=	-ffile-prefix-map="${WRKSRC}"=
 LDFLAGS+=	-Wl,--as-needed # https://github.com/phkaeser/wlmaker/issues/12
 PLIST_FILES=	bin/${PORTNAME} \
 		bin/wlmclock \
diff --git a/x11-wm/wlmaker/files/patch-src_CMakeLists.txt b/x11-wm/wlmaker/files/patch-src_CMakeLists.txt
new file mode 100644
index 000000000000..3c7f0846bff4
--- /dev/null
+++ b/x11-wm/wlmaker/files/patch-src_CMakeLists.txt
@@ -0,0 +1,13 @@
+https://github.com/phkaeser/wlmaker/issues/14
+
+--- src/CMakeLists.txt.orig	2024-01-14 14:29:59 UTC
++++ src/CMakeLists.txt
+@@ -81,8 +81,6 @@ TARGET_COMPILE_DEFINITIONS(
+ 
+ TARGET_COMPILE_DEFINITIONS(
+   wlmaker PRIVATE WLMAKER_ICON_DATA_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/wlmaker")
+-TARGET_COMPILE_DEFINITIONS(
+-  wlmaker PRIVATE WLMAKER_SOURCE_DIR="${PROJECT_SOURCE_DIR}")
+ 
+ TARGET_COMPILE_OPTIONS(
+   wlmaker PRIVATE