From nobody Fri Jul 5 12:06:02 2024 X-Original-To: dev-commits-ports-all@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 4WFsfz0XJBz5PCN1; Fri, 05 Jul 2024 12:06:03 +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 4WFsfy6m1vz573M; Fri, 5 Jul 2024 12:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720181162; 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=c5DEec75CjNl+Qw7wq/keja58DzSZ/vI5NrUGH3qrcI=; b=AM1xfeRlE+iOKw8Bau8Kg9X1WKpamtRrOU/BERXuFYbL5E3792owmfa/TXfoepO4YQQKS3 4TzAAVN2oAv8fUoJhTC7AOM9Wu8cgAJdqRBcAVTpJ7p2YRUnnd9O9QAbsFxti6sEKD6HYO adSL7l5W05w7HMfWb33PMShzuWP50BGow5GqSaZ+waaocIRIzJPcKOd33XhFrLZn4pItZ0 MNPOkrAFR/vTYOLqxFpt247W302jlfWFWkxRcWGrIUkqdYX498lXKVch4wFVKB3Qgx6KBt TmiKsR6qU3G205wTPK3imx4nXkYVHO7Z6WB4uTGm6d3H2rdPNvrlCoSkBCbE/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720181162; a=rsa-sha256; cv=none; b=rVfwbBivxno5l5EKKvPeqla9Z2PQT+DtpfFo6nK+EBgz4LwsofzKT4dZ5pJTnzUtmn59ii firEDLcxDA+2febKwyBWPTUIfwAnxif2nviXB91ZMnwcyfRHfzbJA0YbYezwMBo2XUq4us UogbcrC+c9rdf4+5W4OXDX4kbAgOla9gs6w+meRFVz+pk0Q1irckt5Uy2t9pGcSC5lriD4 W+ypytyb06r6gST3/9uNZX1qmDF4lIUWWhbDiqG/B0SE1EPxo5mdFMznWbQ04U7rzucyMu VLxZgiKxeaRehseDW35QZXRpSmnyOws2n0nk4SB/rEY7y9+5s+fKsgbZM1XqVQ== 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=1720181162; 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=c5DEec75CjNl+Qw7wq/keja58DzSZ/vI5NrUGH3qrcI=; b=KoVS3nqJ7PLkOhCSPGz9csXgsiJxhOXsx0y2L0MsYsaBoE4zxcddjAH1+z5dcEaiFBV34r 8kmjxOUCeoXZVDU22qOmMLVnlxZDVfi2rfrifdLVM00A5kBjyuyES5v0OrOXU28MpNSRtu rQ2kP6SVRRj4/x2nR0pKycROjfMZ/G5av66mE2ZJc/FudBWs84sMYEicIC/OEv9z5iH96i ngWij6q4CwH6G/aQhjTgF/g+Tq67cNE4SPMvfaYKGaNHiWNgBC7QCZ5QTOv5KQLMETlhd2 Jy1vcNVim0S9oYa/FHwCLBlVQl/5gMbLKFoenaOVFFWIRTqnJDAC9itlHPKjVw== 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 4WFsfy6MsFzwFN; Fri, 5 Jul 2024 12:06:02 +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 465C62j5079194; Fri, 5 Jul 2024 12:06:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 465C62lp079190; Fri, 5 Jul 2024 12:06:02 GMT (envelope-from git) Date: Fri, 5 Jul 2024 12:06:02 GMT Message-Id: <202407051206.465C62lp079190@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 422eb4a86d1b - 2024Q3 - x11-wm/wlmaker: update to 0.3 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/2024Q3 X-Git-Reftype: branch X-Git-Commit: 422eb4a86d1beabe99dcc733ac146e3c2322483d Auto-Submitted: auto-generated The branch 2024Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=422eb4a86d1beabe99dcc733ac146e3c2322483d commit 422eb4a86d1beabe99dcc733ac146e3c2322483d Author: Jan Beich AuthorDate: 2024-07-04 07:20:06 +0000 Commit: Jan Beich CommitDate: 2024-07-05 12:05:31 +0000 x11-wm/wlmaker: update to 0.3 Changes: https://github.com/phkaeser/wlmaker/releases/tag/v0.3 Reported by: GitHub (watch releases) (cherry picked from commit 6be13aff2d27eaebd3c7709c2385839f9d68a378) --- 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