From nobody Fri Jul 05 12:04:26 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 4WFsd663fdz5PCMX; Fri, 05 Jul 2024 12:04:26 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WFsd62PLdz56tc; Fri, 5 Jul 2024 12:04:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720181066; 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=ZbnGE21HYMjxDmBzCcyov84NhYOOuLM94dnqQ78Leok=; b=ajVGorG3oDmEKiZxT8dn7jzlH3kbKVhJZytcFeVI6trPlljc/5r208euCTJ3qdzLcgQ8C8 c+/5/8IALJYXUsjdKf6NU+3GyB7pfo60KaTZRcAkXMtpAMgSYSa3TftxJjn8Zxt4s2bzta NGp0uTJjkylO6iqkO9c7iKRJw7fhW6gjzlmSYq5WWLtKNT9NHwm743mhXW8Bqm8nN5eut4 ZH5UlryRufa72hpHZbM+N3gca6l8bFZyq6bJJdXRG6u34nyIuCn5h9gmVL9p7DAUv820bF 6j5ewsCsiNKbA2wPrhgsQv9vRCwmRXUhTdoq/mZ4npJ5DHSIoDjWJ87czREIYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720181066; a=rsa-sha256; cv=none; b=PPuxLUz+Gaqhhiw/YPDZEFj1OZrtSgTDFjQIopjLIWQ1JuXVBo+srOlR3Znnkxlj3tQNSh z+lO9258wYhwGKuz8xbUF7jINEW1LTmQFpA4zvYPpGz+46Vprzxu9ybsAfemAgbC6JPZZm hDYbqoKBqe65nFkpct+mO5umSwg5m+I8N+6UYp8/rLIUxe4jvYtea91lB/d/arURldB8LX YaoxJ2kJRPURLXHFXAMu4Md7whkWetigwn0TzwOm9gVSbzpIfryGUsGgTr8G/DOyYV2Ghi +xHYzeKSW4FUQfT2V1qJ8d9sc01ccZBV6/Mdyu/7G4exIzuVEKzwL3HQq+Dzwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720181066; 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=ZbnGE21HYMjxDmBzCcyov84NhYOOuLM94dnqQ78Leok=; b=l3Vg/RlN8x7QYnb57hyjAF2doGYhi3KzCY4mMzwLBsVtDmKmvHG5U6XrZTHXdtw6RJiAR5 Cz1Pn1bgSwYjGzMHZUnDXpQJyq608brZvFVjPe029fmXDscoV37rpHbNipKyKf3cZuf66v JokWq0YsuF3whSJdOm6axdxKx+S2Jpf5yQ26OZYrHH4wlt2RLQcFRDczOTVhfBESMGBPUM 8k5KMW+cqP4vnSpM+29BpDqTqTljrqWVUlp3mVTCu/seDyMWtUVLCbo9Uu2Y4OqEDoOAfM vq+htjracR1W6DblHqVPP/JNPUHffWPLVPk7OiiVGWMOGbR8gRJqNHJe7MJuPw== 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 4WFsd61xxTzwTh; Fri, 5 Jul 2024 12:04:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 465C4QZX078647; Fri, 5 Jul 2024 12:04:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 465C4Qu3078644; Fri, 5 Jul 2024 12:04:26 GMT (envelope-from git) Date: Fri, 5 Jul 2024 12:04:26 GMT Message-Id: <202407051204.465C4Qu3078644@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: 6be13aff2d27 - main - x11-wm/wlmaker: update to 0.3 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 6be13aff2d27eaebd3c7709c2385839f9d68a378 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=6be13aff2d27eaebd3c7709c2385839f9d68a378 commit 6be13aff2d27eaebd3c7709c2385839f9d68a378 Author: Jan Beich AuthorDate: 2024-07-04 07:20:06 +0000 Commit: Jan Beich CommitDate: 2024-07-05 12:02:43 +0000 x11-wm/wlmaker: update to 0.3 Changes: https://github.com/phkaeser/wlmaker/releases/tag/v0.3 Reported by: GitHub (watch releases) --- x11-wm/wlmaker/Makefile | 14 ++++++++------ x11-wm/wlmaker/distinfo | 10 +++++----- x11-wm/wlmaker/files/patch-session | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 11 deletions(-) diff --git a/x11-wm/wlmaker/Makefile b/x11-wm/wlmaker/Makefile index 1487bab53bcf..67af60321dc6 100644 --- a/x11-wm/wlmaker/Makefile +++ b/x11-wm/wlmaker/Makefile @@ -1,6 +1,6 @@ PORTNAME= wlmaker DISTVERSIONPREFIX= v -DISTVERSION= 0.2 +DISTVERSION= 0.3 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org @@ -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' diff --git a/x11-wm/wlmaker/distinfo b/x11-wm/wlmaker/distinfo index 50b13ac1b6ca..9736af504226 100644 --- a/x11-wm/wlmaker/distinfo +++ b/x11-wm/wlmaker/distinfo @@ -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 diff --git a/x11-wm/wlmaker/files/patch-session b/x11-wm/wlmaker/files/patch-session new file mode 100644 index 000000000000..5c130bcd9763 --- /dev/null +++ b/x11-wm/wlmaker/files/patch-session @@ -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