From nobody Fri Dec 17 14:29:47 2021 X-Original-To: dev-commits-ports-branches@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 7FC6718E6825; Fri, 17 Dec 2021 14:29:48 +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 4JFrwX1nqPz3jB5; Fri, 17 Dec 2021 14:29:48 +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 19E891D4E9; Fri, 17 Dec 2021 14:29:48 +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 1BHETlnA000931; Fri, 17 Dec 2021 14:29:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BHETlbR000930; Fri, 17 Dec 2021 14:29:47 GMT (envelope-from git) Date: Fri, 17 Dec 2021 14:29:47 GMT Message-Id: <202112171429.1BHETlbR000930@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Tobias C. Berner" Subject: git: 4c2c034e2148 - 2021Q4 - x11-toolkits/qt5-declarative: fix testlib-build-failures List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 4c2c034e2148bcdb088b0618115efd406ea186ce Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639751388; 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=Iy2QzvIceDSvVPsy+9P4hOeEmkLDgmk5GN1+kikCECE=; b=iOgkf6UCoX4mjnuvuyQ+Oviz1k++jNWbUHAH/mlIquA6Fi0RPhLg2NV5mNq/KaMZVuZYN9 nUy7kmkez3Y+9DKlayQfPzt01/23/r6XFhobLq6tfG3t+zLdZ96+6pE/Nq1F39kMvarDQc S45yGSfAUsKPxg7xfviXeYs6sYE/dyqfK1Qo99AqSrfpRfMnptbl2TSiXod1BU/Daup1FP rs9AxeWM7xtvQXDeFDAfpqNoEPImyYnbgBgEWGG0lbYNDEHlWy11KcIf/tqjhw8h6yXW+i hbmSt7cVdskZlOy1p2USRzvFn2tvIjKWPH6azmwmFe7AtBcv//iSDXdo+UEphw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639751388; a=rsa-sha256; cv=none; b=slSius9+YuO3m0ym95t2wH+e+9XHqIRw9SsLnFUicZLls15ZxkEa1Rgw0KqHKzwRuC6KID 3FGrWUvkqKGd67Pn8vO1DlLvJ5oOc5z3fy+KuVaGSLNzz+qwqeqYcpiH7EUHpCvdu1tspt gpVXARbKq3wTTORhP1B5ouHoFuI3TqUDdbIoDfbdCGoprKDxvqmWihTpatVjULNfaW/gdN 9hLOr36RgWpVMH78Zkm5L//VYhxUpwijz/27wkgbbIr8A65BqCf5yge9iUIraLjDTB1FTF iTwgMvQqBXdrB3CaRL3JAX0app6HGh+04mw9+5s2Z6Bo4VQIErpIBeoQ6ProCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=4c2c034e2148bcdb088b0618115efd406ea186ce commit 4c2c034e2148bcdb088b0618115efd406ea186ce Author: Adriaan de Groot AuthorDate: 2021-12-17 12:01:36 +0000 Commit: Tobias C. Berner CommitDate: 2021-12-17 13:13:47 +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 (cherry picked from commit 9224581a101ea6aa9cfc84002ec344d49b1ee259) --- 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