From nobody Sat Dec 09 13:16:11 2023 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 4SnT6M6jwXz540gH; Sat, 9 Dec 2023 13:16:11 +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 4SnT6M6K1Lz3PpK; Sat, 9 Dec 2023 13:16:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702127771; 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=iuI39SZ3pV5Rez92A12x9OhMgQV7yN2vI64nnWVuHL4=; b=k5xxRSwogyqmM+kC5G3ilRsuntYujpVQTB6pCFkot53PXqKa9nsFQgcLMlKYytIlUSiduF hRU3wbYjLmcZG/4hHwjOgdUAHXkWik2ZUC66p/zG4S+IWL+dFXwZMGiAUgU0L5W1LYuiYL yJL/nKSsyu9G620lrk4UYv8SVFhkmiAMdpavgeUIz6/mxW6wZryfJKaEuLkquw4DPbZy1j GORVnrxec5j9WmJemnFZGMONuzeUxUQOkv1qPKABQaq4XNOI11MHXEky+DBFo8odZTtumv yKV4vSEYlK/23uNZPsz0u0n+Nksm+15liV8goOhqw2l957edKiT/IXMSQ6bqvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702127771; a=rsa-sha256; cv=none; b=Z0/Kd9kLqs4e4+h9rufmgK850V9a023wgI/S4uw2pSFEwghZ4xhEGYpA6yu+Xud/cVvSS5 8Fow9h4fNnvMO1SzUVOBZVg+OwVT8cE68TGjS/ppXZeA+kFTdN6Ex9WNuLsOmbFbAnpPWK Hgl6l8COx8dBz3d7Rw7OSMaR973/6ka6dmGImN26fZV2pvsva7m2Xs0lJV0Dgoo++QF9a3 kYLF0lfrL/CHKjjBzHArLYgl9+9x2GD8NpKhrU76I/tzbRR8zim5ekJHUhghZx9PLOzJla X32Fkdccq94/w9BA3haf/83J1ajL3kit4FIc+FUTkDA/D6iCN7vAwa0Bss3hKg== 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=1702127771; 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=iuI39SZ3pV5Rez92A12x9OhMgQV7yN2vI64nnWVuHL4=; b=fcjRaOPfy/xsPbQ3vVNHapVcTCPFHowqu1Fb2NSHhFbEgC7wY0SeYYrfOPrtC7UxhfUVAD X50LJHrwLvvkOrqZrguP7zGAABxHsgZFhydZPrWG5BT/97XNYIb1epZOesUi/DLn4Ntxki xRn6cQl7MZpfcU5Z2muQC1nRPmoZf4iLflKfyTNO/cXexq7ksDgnmwlQDNdM72ppytw8LM JF7IMPlAosEbEpAisnSi+aBjC4F/pnp5ifJDiwl0D3lT6GxmrOlIC/IrJU6H5EcqtsDfBM sA2lhP7veSyi0E18AU5/9QbYMFoikQkNeLFmJpAw4a/TtSCnQXNwuTD3/vwxfQ== 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 4SnT6M58B1z15Mv; Sat, 9 Dec 2023 13:16:11 +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 3B9DGBrN047991; Sat, 9 Dec 2023 13:16:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B9DGBTM047988; Sat, 9 Dec 2023 13:16:11 GMT (envelope-from git) Date: Sat, 9 Dec 2023 13:16:11 GMT Message-Id: <202312091316.3B9DGBTM047988@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: 6157d4430109 - main - x11-wm/wayfire: pass --skip-subprojects from within ninja 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 6157d44301090840a16057fc6117950c6e33a1a7 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=6157d44301090840a16057fc6117950c6e33a1a7 commit 6157d44301090840a16057fc6117950c6e33a1a7 Author: Jan Beich AuthorDate: 2023-12-09 11:37:56 +0000 Commit: Jan Beich CommitDate: 2023-12-09 13:13:20 +0000 x11-wm/wayfire: pass --skip-subprojects from within ninja --- x11-wm/wayfire/Makefile | 8 +++- x11-wm/wayfire/files/patch-private-libs | 79 --------------------------------- 2 files changed, 7 insertions(+), 80 deletions(-) diff --git a/x11-wm/wayfire/Makefile b/x11-wm/wayfire/Makefile index 34993c4b05e6..187dc2614d3e 100644 --- a/x11-wm/wayfire/Makefile +++ b/x11-wm/wayfire/Makefile @@ -40,7 +40,7 @@ USE_XORG= pixman GH_ACCOUNT= WayfireWM GH_TUPLE= WayfireWM:wf-touch:8974eb0:wftouch/subprojects/wf-touch \ WayfireWM:wf-utils:15f8e16:wfutils/subprojects/wf-utils -MESON_ARGS= -Dtests=disabled +MESON_ARGS= -Dtests=disabled -Dwf-touch:tests=disabled OPTIONS_DEFINE= X11 OPTIONS_DEFAULT=X11 @@ -54,6 +54,12 @@ post-patch: -e '/project_version/s/@0@/${DISTVERSIONFULL}/' \ ${WRKSRC}/meson.build +.ifdef GH_TUPLE +post-configure: + @${REINPLACE_CMD} 's/meson install/& \ + --skip-subprojects/' ${BUILD_WRKSRC}/build.ninja +.endif + post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.ini ${STAGEDIR}${EXAMPLESDIR} diff --git a/x11-wm/wayfire/files/patch-private-libs b/x11-wm/wayfire/files/patch-private-libs deleted file mode 100644 index fe4665abebbf..000000000000 --- a/x11-wm/wayfire/files/patch-private-libs +++ /dev/null @@ -1,79 +0,0 @@ -wf-touch and wf-utils are untagged and have no other consumers. Keep -it private to wayfire package for now. - ---- meson.build.orig 2023-10-07 08:36:28 UTC -+++ meson.build -@@ -69,8 +69,8 @@ endif - endif - endif - --wfutils = subproject('wf-utils').get_variable('wfutils') --wftouch = subproject('wf-touch').get_variable('wftouch') -+wfutils = subproject('wf-utils', default_options: ['default_library=static']).get_variable('wfutils') -+wftouch = subproject('wf-touch', default_options: ['default_library=static']).get_variable('wftouch') - - needs_libinotify = ['freebsd', 'dragonfly'].contains(host_machine.system()) - libinotify = dependency('libinotify', required: needs_libinotify) ---- subprojects/wf-utils/meson.build.orig 2020-05-11 09:28:45 UTC -+++ subprojects/wf-utils/meson.build -@@ -34,9 +34,10 @@ lib_wfutils = library('wf-utils', - sources, - dependencies: [], - include_directories: wfutils_inc, -- install: true, -+ install: not meson.is_subproject(), - version: meson.project_version()) - -+if not meson.is_subproject() - pkgconfig = import('pkgconfig') - pkgconfig.generate( - libraries: lib_wfutils, -@@ -44,6 +45,7 @@ pkgconfig.generate( - filebase: meson.project_name(), - name: meson.project_name(), - description: 'Utilities library for Wayfire') -+endif - - install_headers([], subdir: 'wayfire/utils') - -@@ -85,12 +87,14 @@ headers_root = [ - 'wayfire/variant.hpp', - ] - -+if not meson.is_subproject() - install_headers(headers_action, subdir: 'wayfire/action') - install_headers(headers_condition, subdir: 'wayfire/condition') - install_headers(headers_lexer, subdir: 'wayfire/lexer') - install_headers(headers_parser, subdir: 'wayfire/parser') - install_headers(headers_rule, subdir: 'wayfire/rule') - install_headers(headers_root, subdir: 'wayfire') -+endif - - # ------------------------------------------------------------------------------------------------- - # Unit tests ---- subprojects/wf-touch/meson.build.orig 2021-03-19 14:56:39 UTC -+++ subprojects/wf-touch/meson.build -@@ -6,18 +6,22 @@ project('wf-touch', ['cpp'], - glm = dependency('glm') - - wf_touch_inc_dirs = include_directories('.') -+if not meson.is_subproject() - install_headers([ - 'wayfire/touch/touch.hpp'], - subdir: 'wayfire/touch') -+endif - - wftouch_lib = static_library('wftouch', ['src/touch.cpp', 'src/actions.cpp', 'src/math.cpp'], -- dependencies: glm, install: true) -+ dependencies: glm, install: not meson.is_subproject()) - - wftouch = declare_dependency(link_with: wftouch_lib, - include_directories: wf_touch_inc_dirs, dependencies: glm) - -+if not meson.is_subproject() - doctest = dependency('doctest', required: get_option('tests')) - - if doctest.found() - subdir('test') -+endif - endif