Date: Sat, 15 Apr 2023 18:04:01 GMT From: Daniel Engberg <diizzy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 93865c964d29 - main - devel/qt6-base: Prefer shared library for libzstd Message-ID: <202304151804.33FI41J1057811@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=93865c964d29fb5d49b7b2651735f955ead4d019 commit 93865c964d29fb5d49b7b2651735f955ead4d019 Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2023-04-15 17:57:41 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2023-04-15 18:03:57 +0000 devel/qt6-base: Prefer shared library for libzstd Backport upstream commit 3f45905953d57e0174059d7d9d6bc75c3c1c406c as without this patch QT by default pulls in (lib)zstd's static library when CMake files are available which causes build failure unless (lib)zstd is compiled with -fPIC (non standard option) and is inconsistent with behaviour using pkgconfig PR: 270664 Approved by: kde (tcberner) --- devel/qt6-base/Makefile | 3 +++ devel/qt6-base/distinfo | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile index 4dd1225b49a5..0c45cbbf94b2 100644 --- a/devel/qt6-base/Makefile +++ b/devel/qt6-base/Makefile @@ -4,6 +4,9 @@ PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt6- +PATCH_SITES= https://github.com/qt/qtbase/commit/ +PATCHFILES= 3f45905953d57e0174059d7d9d6bc75c3c1c406c.patch:-p1 + MAINTAINER= kde@FreeBSD.org COMMENT= Qt base (core, gui, widgets, network,...) WWW= https://www.qt.io/ diff --git a/devel/qt6-base/distinfo b/devel/qt6-base/distinfo index 7ec303605788..32ffe38b4e78 100644 --- a/devel/qt6-base/distinfo +++ b/devel/qt6-base/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1672934696 +TIMESTAMP = 1680729396 SHA256 (KDE/Qt/6.4.2/qtbase-everywhere-src-6.4.2.tar.xz) = a88bc6cedbb34878a49a622baa79cace78cfbad4f95fdbd3656ddb21c705525d SIZE (KDE/Qt/6.4.2/qtbase-everywhere-src-6.4.2.tar.xz) = 47987188 +SHA256 (KDE/Qt/6.4.2/3f45905953d57e0174059d7d9d6bc75c3c1c406c.patch) = 61e345f12c6283792e230d3572756e6093d1be0c80d1f3dc0745e19532e28ebc +SIZE (KDE/Qt/6.4.2/3f45905953d57e0174059d7d9d6bc75c3c1c406c.patch) = 1326
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304151804.33FI41J1057811>