From nobody Sat Jan 18 17:11:10 2025 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 4Yb3664J8sz5kby7; Sat, 18 Jan 2025 17:11:10 +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 4Yb3663dKXz3nt6; Sat, 18 Jan 2025 17:11:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737220270; 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=v6ymrlxVrVs6/+vt+GN3n9PXDkZX3LlZP5vYDKJW6Z8=; b=carBXUtXryW21/LTFfA7R4rcMVUc7r3IV91erZ2JldjQCtz0+kIlv/4UQ1EED2sPfQlRKN bna6aFR0GdqpaTnmuAEdVBFXO70p1CyNX+Lke+iiIv2CH/FP0TLSlkn0asP3z3frEDzn/I vEh72koC2yE7PHjf3CA4Rn+cgO4xDffAuz9A0KuHqw4mYQLkclIm56dajqjARhbdxjr3hK qPBTfB17rbyat0h146KXmOHJMZO4eN0Z92TGSrnR8UB14LUScxZj8kK91iWcRxi1w+Oru4 GRwlYn1Avp9pQbrSc8mn5CjP6t3AlbyMpP/gCTmQlZcY/Vh0/6oWykpXOMFYGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737220270; 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=v6ymrlxVrVs6/+vt+GN3n9PXDkZX3LlZP5vYDKJW6Z8=; b=EJdDOHP8StIgAYFJIuCylLQa2MdgnrzEqhUAVTxFW/TP4RvZZINhYDww2AjSoRZD4x8yGF OglnX4yzint3rj4naX0jiC4onvqtjsMBzB1kbjeUMZlzoY7zTGAqNyJkQ/ObEnExkGFjBG Tus0LoLAVf1krxHQDDgbzFhrlLjviv2Okys9yO+sDSHQ0UlF0wo1HnJBC1b88adWZ614m5 Q4UHI1Ctjjio74cnvkuFJWAVJMZl18H0/gzd7OIBi+U4vxUo8SklSn3vHYLOsDcAHmrR2A GwZv+ToAejT5EOzmmQSexiByfaroUUYA+T/FuJ6P7sfWFrJFaHITyo0jxTU2Dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737220270; a=rsa-sha256; cv=none; b=dL9GwEOFbGBJZbE+rbxLenPIiHzNPKgl+dyiRiGyh+j52j1ORZLG9p4mi5niehhAH12c58 BQNy0T3OmX5v1ue0GOG9Rgc8UJMz+9Wmcn5KzoTETF3YChUpcR7pZ2syVAXTRtDnStl1uS yPq8aFnymKBkGS7kxwZacwkOvcaj5+EstdlvzNtC7Vs9Et/3WromKFA5LSNYpvZqcvXeek i1XbO8D59owCxtih0LBJDO3zAGuTmOGVuMWzCo+I7WLt/v1eao5gg38uPkhd4YGzBqMqm8 2kxw9vOLpzPWAne60uNNcSm72vAqSZSAQg1ACJBCwGnork8s+UkFUW/PO27EBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yb3663CXCz1Bm6; Sat, 18 Jan 2025 17:11:10 +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 50IHBAIE017644; Sat, 18 Jan 2025 17:11:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50IHBA8C017641; Sat, 18 Jan 2025 17:11:10 GMT (envelope-from git) Date: Sat, 18 Jan 2025 17:11:10 GMT Message-Id: <202501181711.50IHBA8C017641@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: fed1c8ad7429 - main - x11-toolkits/qt6-declarative: Add upstream patches 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fed1c8ad74290637dcd57b0f623c5a96fd82106d Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=fed1c8ad74290637dcd57b0f623c5a96fd82106d commit fed1c8ad74290637dcd57b0f623c5a96fd82106d Author: Jason E. Hale AuthorDate: 2025-01-18 17:01:01 +0000 Commit: Jason E. Hale CommitDate: 2025-01-18 17:10:53 +0000 x11-toolkits/qt6-declarative: Add upstream patches Fix crashes when using popup windows. (QTBUG-131898) Use Qt version in Qt6QmlFindQmlscInternal.cmake instead of user-project- defined PROJECT_VERSION. (QTBUG-132421) MFH: 2025Q1 --- x11-toolkits/qt6-declarative/Makefile | 7 ++++++- x11-toolkits/qt6-declarative/distinfo | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/x11-toolkits/qt6-declarative/Makefile b/x11-toolkits/qt6-declarative/Makefile index 61d1ba6dd042..7a2f1d65c57c 100644 --- a/x11-toolkits/qt6-declarative/Makefile +++ b/x11-toolkits/qt6-declarative/Makefile @@ -1,8 +1,13 @@ PORTNAME= declarative DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt6- +PATCH_SITES= https://invent.kde.org/qt/qt/qtdeclarative/-/commit/ +PATCHFILES+= 6e6add5406eb5d8daca0992fa3f2362d34b002e5.patch:-p1 # QTBUG-131898 +PATCHFILES+= eff776c676b042bd75604105a3876f999b9808d5.patch:-p1 # QTBUG-132421 + MAINTAINER= kde@FreeBSD.org COMMENT= Qt declarative framework for dynamic user interfaces @@ -12,9 +17,9 @@ LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon USES= cmake compiler:c++17-lang gl pkgconfig python \ qt-dist:6 USE_GL= opengl +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} USE_QT= base svg \ languageserver:build shadertools:build -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_LTTngUST diff --git a/x11-toolkits/qt6-declarative/distinfo b/x11-toolkits/qt6-declarative/distinfo index 5df65a5f8ca2..8e9499d343f8 100644 --- a/x11-toolkits/qt6-declarative/distinfo +++ b/x11-toolkits/qt6-declarative/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1733205760 +TIMESTAMP = 1737216934 SHA256 (KDE/Qt/6.8.1/qtdeclarative-everywhere-src-6.8.1.tar.xz) = 95d15d5c1b6adcedb1df6485219ad13b8dc1bb5168b5151f2f1f7246a4c039fc SIZE (KDE/Qt/6.8.1/qtdeclarative-everywhere-src-6.8.1.tar.xz) = 36463572 +SHA256 (KDE/Qt/6.8.1/6e6add5406eb5d8daca0992fa3f2362d34b002e5.patch) = a6cdb13d81689a2fd7760b852700fc349b1b33803489dc6e2ad120247ce0f461 +SIZE (KDE/Qt/6.8.1/6e6add5406eb5d8daca0992fa3f2362d34b002e5.patch) = 12966 +SHA256 (KDE/Qt/6.8.1/eff776c676b042bd75604105a3876f999b9808d5.patch) = b882ad9ebce40d393c9d01ebafaf65b409f67fc5aabd2e264edca4582e5d3443 +SIZE (KDE/Qt/6.8.1/eff776c676b042bd75604105a3876f999b9808d5.patch) = 1696