Date: Sat, 18 Jan 2025 17:11:47 GMT From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: eadee0a66b7b - 2025Q1 - x11-toolkits/qt6-declarative: Add upstream patches Message-ID: <202501181711.50IHBlwO020159@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2025Q1 has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=eadee0a66b7b04ffec5f37f864b443cf0d466479 commit eadee0a66b7b04ffec5f37f864b443cf0d466479 Author: Jason E. Hale <jhale@FreeBSD.org> AuthorDate: 2025-01-18 17:01:01 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> CommitDate: 2025-01-18 17:11:41 +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 (cherry picked from commit fed1c8ad74290637dcd57b0f623c5a96fd82106d) --- 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501181711.50IHBlwO020159>