From nobody Sat Apr 15 18:04:01 2023 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 4PzLmK2dsQz44mcc; Sat, 15 Apr 2023 18:04:01 +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 4PzLmK273jz3nJf; Sat, 15 Apr 2023 18:04:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681581841; 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=ESkJgcFPyyrSyEiHWL6bNVHwUBJVOQ8XFiHqKWv1URY=; b=uV0Q/R6R9FGZS19WB6dLe+/7F6l1jbXVotXEZirW/l3XoRW66KenUpb8G9aec/BPCFyImf tYNmTTMJvXLn4U7Gs7Abw8UzUJyeMPm4PdRNf3pW2bohwgX0cUk5CO7D5wEbvfQYY5XwIM 38vK4rx1v5FXl05W8dzEayQtOYS+b07wZA5/9hOlRJEOlMnYHeiiFjrL69L4TSqAHzvhIS Hv2OgCIJbNdD/xHd/P4thCYBj94ut6rT0nwx2TdJAxTTCUqx9KwLTLvLRMjWK872h8FjTc XeMgyEOg1LcbUzhYUriE7kik2MUU9lfFsLKueHWae+mIMVcTwEDCCBDLG+q+Ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681581841; 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=ESkJgcFPyyrSyEiHWL6bNVHwUBJVOQ8XFiHqKWv1URY=; b=qJIz6hEsZq7TpoRiUuFkHCPmKWJXkKxIaI/wW0YW3ZqW2Z2bU9WicasjbGOXkhIQLIuHRr GjMkPCo/di99ZRhj6Djr6yF0uGKRCnqiRjU96mTX4pkh2mM/WkVB1OmXo9UjuE8ERwl5Ks QHyLppBldIWmQnJ4AZflXje+oKllKZjAbLkQSaXpQj0t4nXqRZANd07m+VE/D0yhiuowK+ d8axmq+Vjz0tSZJlhovVjJCj+9J30NC46hbJBVeGtZib1Uct/MHTm2Os5BfHP1ayrjnzDq l+YvfQj2cFNxiUYbbIHhXA1xHsyum9L99xr7fngzpk708rFrF5USth5y1IhSQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681581841; a=rsa-sha256; cv=none; b=OZyzurHd+Nu+InY7bIQLJbhByJgaYJu3GDqXD6vYx0SKld1rGpbWTN5MqtEaoH14gtEaeE Ka7ypjkzSC6e+2/2hCql0kHjtz49om+c810AOiCXWfl65MFR4vOXnvbahhqgkDCtARaxZW cvepoxM7SztgvdtirW29cGTE5NWK9z9ehJ0VRLkhfW5fF4cJ/1mONsTdrcx76IMSoGvnZ0 9FzSBVmUHV4vz5OnUDXmdQBKqN9NIbBKXhRk2ptMiBmmOc5j9wStc70k1GT5np+tu58nMt lNPk6l5TWg3+GlY0nhjWq1Du9++LD96r19nb8voOfUc21SpdjL0JTsBWdxfVQw== 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 4PzLmK1DJrzGHv; Sat, 15 Apr 2023 18:04:01 +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 33FI41Y7057812; Sat, 15 Apr 2023 18:04:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33FI41J1057811; Sat, 15 Apr 2023 18:04:01 GMT (envelope-from git) Date: Sat, 15 Apr 2023 18:04:01 GMT Message-Id: <202304151804.33FI41J1057811@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 93865c964d29 - main - devel/qt6-base: Prefer shared library for libzstd 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93865c964d29fb5d49b7b2651735f955ead4d019 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=93865c964d29fb5d49b7b2651735f955ead4d019 commit 93865c964d29fb5d49b7b2651735f955ead4d019 Author: Daniel Engberg AuthorDate: 2023-04-15 17:57:41 +0000 Commit: Daniel Engberg 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