From nobody Fri Dec 17 12:22:33 2021 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 CEEC018F95E5; Fri, 17 Dec 2021 12:22:33 +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 4JFp5j31Rvz3C9F; Fri, 17 Dec 2021 12:22:33 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 495341BE93; Fri, 17 Dec 2021 12:22:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BHCMXUh040162; Fri, 17 Dec 2021 12:22:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BHCMXCQ040161; Fri, 17 Dec 2021 12:22:33 GMT (envelope-from git) Date: Fri, 17 Dec 2021 12:22:33 GMT Message-Id: <202112171222.1BHCMXCQ040161@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 9224581a101e - main - x11-toolkits/qt5-declarative: fix testlib-build-failures 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: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9224581a101ea6aa9cfc84002ec344d49b1ee259 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639743753; 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=i23jc9s9F1JlasFvJPdGgUN2OHLax8UFxZHgsbxM3/I=; b=UMnpBUmbcGMIMp1FzwjUPCNShsE4BZCUpqNMPLg7b+e5lfYhM7QrztJ0kEmO7Du+yYd1YW ZHFsi7yLbF/SYOkivVzA4SklmXqnKIp7wqY6NCNvyoXaXeP21JhkyB3Tud1PRHuhxrfopO 5CkDkJrJ9B5z7a5JTSFdJRSpRWCTYBBuSv6UBSb+kh7u/GmB5EkYtTUo/nIQoYlsBd/lHh kRUZ/W/NfmtyhUXeRgqBk+w6d/DS93PhtaLBjrNxlSFL9ZTx1moxbjh7tx58mlgus/ZLg3 9E4j1emWicPkXwI8sl+BpKw9Chcp967jHmel7+suCG79q+1YogOgqZCWDZocsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639743753; a=rsa-sha256; cv=none; b=ATTBcxZGCgJWlCdNi4oRsAxnrpGI+vqdOiVCmdda80PheyZ0zVuv5yVygDfCrco63pyPHO Ue9ZldYwF0LXl7nfaECfdiw0Lvl5WmeCSaUN/ftY35OhWQ8kGrKo8BnaouwqK0NgMdvrjy t8EZJb62Ye0Ohk8Gsfe+AAde5M+f27DYw4itS7F29aK28hV8o87O9pnBKPf43GPDOyZ8Yj 6EXZR4ZurksSJkTqU5AJC4g6vGQn2pHO7ij3Ei6TGaUUumCOJDeMWR1pE5ESxaKqA3IqFk To2DmpQDZ+4FOMyfFK68+I75UyUzR0DlzRZi3VyIht7DNGRsxl9fCYKjrbiwuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=9224581a101ea6aa9cfc84002ec344d49b1ee259 commit 9224581a101ea6aa9cfc84002ec344d49b1ee259 Author: Adriaan de Groot AuthorDate: 2021-12-17 12:01:36 +0000 Commit: Adriaan de Groot CommitDate: 2021-12-17 12:01:36 +0000 x11-toolkits/qt5-declarative: fix testlib-build-failures Since Qt5 testlib tries to be a build-dependency only when needed, and since we build the QML bits without installing the corresponding test-tools, declarative had the following problem: - without testlib installed, would build fine - with testlib installed, would assume the QML test bits are available, and then fail in the build. This is basically our split-up-packaging without subpackages shooting us in the foot; fix the build by removing one more place where testlib leads to the building-of-tests. (The existing patch files/patch-src_src.pro does something similar) PR: 257102 260433 Reported by: Frank Reisert, Philipp Ost --- x11-toolkits/qt5-declarative/Makefile | 2 +- .../qt5-declarative/files/patch-src_imports_imports.pro | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/x11-toolkits/qt5-declarative/Makefile b/x11-toolkits/qt5-declarative/Makefile index 870c24bfe5ab..afad220bb9a6 100644 --- a/x11-toolkits/qt5-declarative/Makefile +++ b/x11-toolkits/qt5-declarative/Makefile @@ -1,6 +1,6 @@ PORTNAME= declarative DISTVERSION= ${QT5_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- diff --git a/x11-toolkits/qt5-declarative/files/patch-src_imports_imports.pro b/x11-toolkits/qt5-declarative/files/patch-src_imports_imports.pro new file mode 100644 index 000000000000..339fd43b4524 --- /dev/null +++ b/x11-toolkits/qt5-declarative/files/patch-src_imports_imports.pro @@ -0,0 +1,10 @@ +--- src/imports/imports.pro.orig 2021-12-17 11:51:57 UTC ++++ src/imports/imports.pro +@@ -24,7 +24,6 @@ qtHaveModule(quick) { + + qtConfig(quick-shadereffect): SUBDIRS += wavefrontmesh + +- qtHaveModule(testlib): SUBDIRS += testlib + qtConfig(systemsemaphore): SUBDIRS += sharedimage + qtConfig(quick-particles): \ + SUBDIRS += particles