From nobody Wed Jan 17 17:54:48 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TFYRr4r2Cz58J8S; Wed, 17 Jan 2024 17:54:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TFYRr4Kp5z4Y9Z; Wed, 17 Jan 2024 17:54:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705514088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b2VfU5psfiH9JhPOKkoyPARQf4yzz70WZ0nC83e1oAo=; b=ox3/8QUrF5FsZoqk97s3BmZDBVC+HU82Tk96Fo3Vfpjp13VTxU2sWsvDFr4yTjEk0g6j88 D/yd4DhRKqxhrTseLC5YX6Vf9dntmCN9swKtSl5piSOdEBIjjN0duef59PPt60gRaiUx5L N7Rzj2GjrXSS5XEPJJZYbnFeQc0iNDFgGAYyVEc7kWXbzirgeTD/ACd0JXWYe4KRP8Wuiy UeNMVnlAVXGX4/8By9ch0pmxZpdWPSLwKttWkXNQTQoQuhlaoDkzMgmv+xn8JM/w8GAbQ7 jnHuOGANqLTc4TaMpp6faskiKR7zaTXd42JDHbNCsAViG6Clvr9jAhSlLJ5cuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705514088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b2VfU5psfiH9JhPOKkoyPARQf4yzz70WZ0nC83e1oAo=; b=AVJ3PhlDrF6wsN33n7BizrcqPc/60Xq3YkxtPYzgzUF8RbAirqjmlMnnCLEn5NIPSkCsC6 tPaE40u5cHGFIov1Hxb7NiZoX6J1x2Mj+824IrlqSh4Jykl13kIqmVlGD88DYmj3OG38id nkPG3bIWIYQYuz9UotlrQcoz08BpdGniP/wI3tIpRE3Jt13ymS+QNlzhEZH2lf8gUF3gp2 SSyoVFDJoHJTSqk8jkutbt9fqxmgNyM3lsT79ujV0EqJi6VbR1CxZsZPa4DMM4mAQeBknr 0Mv6n3zCq0ehERXBafx3PCPjWGeQFqegfqFk9AJuhsYUVaun9TCF3oIWkqQcxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705514088; a=rsa-sha256; cv=none; b=prw6/wCRpgFkEHPLqwJRNodOw+m7GOjdrHQRLCmTgFE7Dhqezq/G5/ctPIqLvekl+GJVfw eEQ2/6bKrpiqC4k+S4XOfdGhic52fLif/CPNnnRH7g0J8KAV02gdv1m1CAhufciwI6RIW4 2Qmk/smGZqfZiuz+EeTkU9v/Xotgesa2q0kr9GzLQJWIk5ly6QjjnRc9j5YHZedweUKsAl uWwRPbGCbVd6c1YiRdWmcuEZC0jnkLfN+j9Io07onxjuuGSozjpYe6XMTG+uIUL3wHbDjI 3bJz3SexJAYFGKXtWu6/Ga8CcRHY78tKhtcJa0oA6486VmZ1NQeD31YvW+5BXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TFYRr2tCkzYvv; Wed, 17 Jan 2024 17:54:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40HHsmlo011352; Wed, 17 Jan 2024 17:54:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40HHsmSO011349; Wed, 17 Jan 2024 17:54:48 GMT (envelope-from git) Date: Wed, 17 Jan 2024 17:54:48 GMT Message-Id: <202401171754.40HHsmSO011349@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 09f8a54e50d5 - main - x11-wm/wlmaker: don't hardcode WRKSRC in debug log List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09f8a54e50d5ac06256d35b771af79c973efc0b3 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=09f8a54e50d5ac06256d35b771af79c973efc0b3 commit 09f8a54e50d5ac06256d35b771af79c973efc0b3 Author: Jan Beich AuthorDate: 2024-01-17 16:59:42 +0000 Commit: Jan Beich 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