From nobody Sat Jan 27 23:05:17 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 4TMqsT3wJxz595wt; Sat, 27 Jan 2024 23:05:17 +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 4TMqsT3R58z4KmX; Sat, 27 Jan 2024 23:05:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706396717; 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=ZIUGg8unItfORONe/LD7sgeN+oiVKzUdCbGtM6y5R3c=; b=yX3k7w2X2Js/548thUa/7hxs/q+xPiMNpOG6PoPk6Q2EjyBkkAxuT4WEG7jlYLK6FshGdf UZ75dxwFoETTvHpTt34hQ9eDliw57iGKio/eTzqBEOMvRvCYQrs0xtIQADcT8btTJchzE+ jwcSrnIhQV2/hdwrxCESHJgGMy+8Tmw7AbKCosqoFpjhuoBgBCvtd1mQoJg2dicvC9B/QE KMMQf3WftfGXjtKERAB6pA8vGM+oOBa6N1cdumi+7xs47R+AnKoHPGPvPH0BunEB5WWzy8 E6JpLCMEQgcPTwTgxXAXtNpl7nKMiuJcHvtASR6216KojH2QElXPvXVvbVhPXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706396717; 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=ZIUGg8unItfORONe/LD7sgeN+oiVKzUdCbGtM6y5R3c=; b=fFYLApYN2N2l9HEF3JKAyrb07akEvR0lorp+yt2JHH01kEh7nuPzMP1P6Wd4y3TSOq0rJl YXyJbFjpvMFUGns4sHNVhWZG4LKuNvooc5TjjxCYBQul20Q43M+ToA/gfVxdz7Ynuj1dVG LAPH6oJOkxLNAsDA3wVXxsSFCRDTi7NJFhZEwWFOldVFH+DiGPXBWkXc6CXbQlUHisap2a 9sZtaDaNF824aZyGLdl1E2aJdbE/9r+G7ikKstlUyGbSv5iXare+a4gndd/9BcGT74j1eB nWyaIoxqBWH5NJqQiJNS96KQ/7S9flJs3nM29O/xap2vN0fIlygQKB0E6fycFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706396717; a=rsa-sha256; cv=none; b=IngUxoPl7a14cxNnXw5FsjKd9jjom2VZ0wiF7D7XiwND3xp7aG5gMGXvJUOjbv4RjvSJBD fU2xF9wttKn5xohnA7oF8JTzhEk+nZnOPeND6jFb261b8yhbylPYSwgJWmQ21at1DkkVzP UUVTfPiuCPjJI3M2WUvrni9OO6xh66bKTub2rbURY/Yh4dcXO48Xloy3g9MdnnzGCatZeT AaEdOZk5fNaBopmJLzx4DbXIoveX8b+sZ8v+QFGzPyqWlhR54b6hfLnL4/NKGet57pMToX 6YEzoyRmqMo+4OZfgz4S8S9sfZfZ7x9N5Iprl3xpvWikN8otsFbK28jjfPBIbQ== 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 4TMqsT2DTKzk1f; Sat, 27 Jan 2024 23:05:17 +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 40RN5Huf011397; Sat, 27 Jan 2024 23:05:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40RN5HIa011394; Sat, 27 Jan 2024 23:05:17 GMT (envelope-from git) Date: Sat, 27 Jan 2024 23:05:17 GMT Message-Id: <202401272305.40RN5HIa011394@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: 6a7543959a1d - main - x11-wm/wlmaker: update to 0.1.441 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: 6a7543959a1d62dacb3e76d59c509dadfcec82bf Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=6a7543959a1d62dacb3e76d59c509dadfcec82bf commit 6a7543959a1d62dacb3e76d59c509dadfcec82bf Author: Jan Beich AuthorDate: 2024-01-27 21:35:52 +0000 Commit: Jan Beich CommitDate: 2024-01-27 22:49:37 +0000 x11-wm/wlmaker: update to 0.1.441 Changes: https://github.com/phkaeser/wlmaker/compare/a4483c1...f183a22 --- x11-wm/wlmaker/Makefile | 10 ++++++---- x11-wm/wlmaker/distinfo | 10 +++++----- x11-wm/wlmaker/files/patch-CMakeLists.txt | 18 ++++++++++++++++++ 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/x11-wm/wlmaker/Makefile b/x11-wm/wlmaker/Makefile index 0aa792491da4..be05f3785585 100644 --- a/x11-wm/wlmaker/Makefile +++ b/x11-wm/wlmaker/Makefile @@ -1,7 +1,7 @@ PORTNAME= wlmaker DISTVERSIONPREFIX= v -DISTVERSION= 0.1-439 -DISTVERSIONSUFFIX= -ga4483c1 +DISTVERSION= 0.1-441 +DISTVERSIONSUFFIX= -gf183a22 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org @@ -22,8 +22,7 @@ USES= cmake compiler:c11 gnome pkgconfig USE_GITHUB= yes USE_GNOME= cairo GH_ACCOUNT= phkaeser -GH_TUPLE= phkaeser:libbase:722571f:libbase/submodules/libbase -CFLAGS+= -ffile-prefix-map="${WRKSRC}"= +GH_TUPLE= phkaeser:libbase:66a3992:libbase/submodules/libbase PLIST_FILES= bin/${PORTNAME} \ bin/wlmclock \ share/icons/${PORTNAME}/chrome-48x48.png \ @@ -36,6 +35,9 @@ post-patch: # Drop dependency on unreleased version of libwayland @${REINPLACE_CMD} -e 's/1\.22\.90/1.22.0/' \ ${WRKSRC}/CMakeLists.txt +# Respect PREFIX for icons + @${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \ + ${WRKSRC}/src/decorations.c # Respect LOCALBASE for apps and use open source Chrome @${REINPLACE_CMD} -e 's,/usr/bin,${LOCALBASE}/bin,' \ -e 's/google-chrome/chrome/' \ diff --git a/x11-wm/wlmaker/distinfo b/x11-wm/wlmaker/distinfo index 68352ed9d313..6b00db70096e 100644 --- a/x11-wm/wlmaker/distinfo +++ b/x11-wm/wlmaker/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1706324453 -SHA256 (phkaeser-wlmaker-v0.1-439-ga4483c1_GH0.tar.gz) = 57d1d36555feab21ec52e8547f6b7a89098d8fe12d4238c4a1d3cfad76646b7b -SIZE (phkaeser-wlmaker-v0.1-439-ga4483c1_GH0.tar.gz) = 249851 -SHA256 (phkaeser-libbase-722571f_GH0.tar.gz) = a085299099b8e9addc7c8601fbe32a912922dde4c322c72abdeab9e32a4fe91a -SIZE (phkaeser-libbase-722571f_GH0.tar.gz) = 94478 +TIMESTAMP = 1706391352 +SHA256 (phkaeser-wlmaker-v0.1-441-gf183a22_GH0.tar.gz) = b01c66a4cf95d753fd7ce9505da14cbf97d86f5e86717eeea58405be7eac5180 +SIZE (phkaeser-wlmaker-v0.1-441-gf183a22_GH0.tar.gz) = 249788 +SHA256 (phkaeser-libbase-66a3992_GH0.tar.gz) = afbcc20e370221a8821a043d572e7d00bd57fd33bca24879a54127ffae2ebaad +SIZE (phkaeser-libbase-66a3992_GH0.tar.gz) = 94622 diff --git a/x11-wm/wlmaker/files/patch-CMakeLists.txt b/x11-wm/wlmaker/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..fab638a2fd27 --- /dev/null +++ b/x11-wm/wlmaker/files/patch-CMakeLists.txt @@ -0,0 +1,18 @@ +https://github.com/phkaeser/wlmaker/issues/28 + +--- CMakeLists.txt.orig 2024-01-27 20:11:04 UTC ++++ CMakeLists.txt +@@ -50,8 +50,12 @@ OPTION(config_DOXYGEN_CRITICAL "Whether to fail on dox + OPTION(config_DOXYGEN_CRITICAL "Whether to fail on doxygen warnings" OFF) + + # Toplevel compile options, for GCC. +-IF(CMAKE_C_COMPILER_ID STREQUAL "GNU") ++IF(CMAKE_C_COMPILER_ID MATCHES "Clang|GNU") + ADD_COMPILE_OPTIONS(-Wall -Wextra -Werror) ++ ++ IF(CMAKE_C_COMPILER_ID MATCHES "Clang") ++ ADD_COMPILE_OPTIONS(-Wno-self-assign) ++ ENDIF(CMAKE_C_COMPILER_ID MATCHES "Clang") + + IF(config_DEBUG) + ADD_COMPILE_OPTIONS(-ggdb -DDEBUG)