From nobody Mon Apr 11 04:28:04 2022 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 404C71A9237C; Mon, 11 Apr 2022 04:28:05 +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 4KcG791FX2z4XFq; Mon, 11 Apr 2022 04:28:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649651285; 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=bQSwvASToI1oGAcBX0y5cmixlBndRIzpMhBj5obu0lw=; b=hs1CuuRsfNKVUA4XpAnlvjn1np9ENxB0hmWQ/jqeTjOkwSc188LLgTJj/pQDHfZOvohALF MV86gfLcOJOn/haJrbq65q1Plm2GD4bNxq7NcHpWbUKadHN0WwaJXmp5CfqYBT9J7Yx85r fBnXZNV1ci4KDQbspZf70HOAraGCpHqma4CpJsjeDpApo2+5hS25se1aeOD5Jrztq/PCc5 cGPNnU9J57b7vf3LICNQNEioQ4h2Fgn6sichTN3y2XTwjrAg2RswzCtZx7oUtaqVnlN5Uv H9H38YWspzaVhakk36UjJ39wPCFdkFCe9twfDqQdw87Q0CzfBXKXAx/4Li6aqA== 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 0B2D61C3D5; Mon, 11 Apr 2022 04:28:05 +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 23B4S4Do075764; Mon, 11 Apr 2022 04:28:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23B4S4Cl075763; Mon, 11 Apr 2022 04:28:04 GMT (envelope-from git) Date: Mon, 11 Apr 2022 04:28:04 GMT Message-Id: <202204110428.23B4S4Cl075763@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: ae97718afabd - main - print/freetype2: update to 2.12.0 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: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae97718afabd8459b4e7f79190bcac9338f233c0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649651285; 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=bQSwvASToI1oGAcBX0y5cmixlBndRIzpMhBj5obu0lw=; b=AieGxzlSHOR3QBrWdXwi8UYS2EShVf6qjCcZs6ON71MNBFbDtYQU7ulipABrX5BESL5AeU 4JdmjzXwYLfQGUijJfyuH+7D2DGyc5TtnT4ksSasF4wZAAh2tMDlFlcOkMSRUPo/n6nJVu Wu4I6/I+ceVVtGDKdSqJTYuFe/z5r8OhQPjZj4fsgXSSAebOy6lddRatAMcXit10NUv/nr cPmc2pGgdJpnZyxRi0HCTuWzpE7QnnwuNq+IyiLD1CqK/s40Aju9wlJB8TWZjNcsBhmzRc r5SyToPSrXaDHKwnZGGRWWEcVQIpuI/PnuDnepLgrphZj74LjyF5rIdVT6Wtsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649651285; a=rsa-sha256; cv=none; b=OuROXY0x8U7rPTZkpP+nCgMyPAGHZI6hcL4g7DLcnOu+WqNnH65eQhHFTNP84+H1DOVbEb gmRWqoM/8df4Eqnb6AIVz4p/xlt6teBfE6xxnkXpZGgK/5f5iWwXgofHk+lT3B93VFBc2h AE5zx82wpxf0qr7ddU98iVETD2DVCB5wbzju33X8YCZufH093TtF2OsC0rIAQW1x5xNRa/ Z6dPZLRod/jfht/Ao5FpWtNlYrMsFDvENeLZJvQQ7ZuiErBH5feYMFMxibcelBkteV+Q/Y KE7tP+tCucAzo5KSw+GOrW961VzhcXzEKpOCDnOMIph4Ob37HoqO2PWBueUvzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=ae97718afabd8459b4e7f79190bcac9338f233c0 commit ae97718afabd8459b4e7f79190bcac9338f233c0 Author: Tobias C. Berner AuthorDate: 2022-04-01 12:43:52 +0000 Commit: Tobias C. Berner CommitDate: 2022-04-11 04:26:27 +0000 print/freetype2: update to 2.12.0 Exp-run by: antoine PR: 262979 --- print/freetype2/Makefile | 2 +- print/freetype2/distinfo | 6 ++-- print/freetype2/files/patch-CMakeLists.txt | 46 ++++++++++++++++++++++++++++++ print/freetype2/pkg-plist | 3 +- 4 files changed, 52 insertions(+), 5 deletions(-) diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile index 8a27cf57fccd..93589bfff4f2 100644 --- a/print/freetype2/Makefile +++ b/print/freetype2/Makefile @@ -1,7 +1,7 @@ # Created by: jseger@FreeBSD.org PORTNAME= freetype2 -DISTVERSION= 2.11.1 +DISTVERSION= 2.12.0 CATEGORIES= print MASTER_SITES= SAVANNAH/${PORTNAME:S/2//} \ SF/freetype/${PORTNAME}/${DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ diff --git a/print/freetype2/distinfo b/print/freetype2/distinfo index 9de170a62db8..909fccfe50dd 100644 --- a/print/freetype2/distinfo +++ b/print/freetype2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1638605794 -SHA256 (freetype-2.11.1.tar.xz) = 3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8 -SIZE (freetype-2.11.1.tar.xz) = 2270728 +TIMESTAMP = 1648812053 +SHA256 (freetype-2.12.0.tar.xz) = ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033 +SIZE (freetype-2.12.0.tar.xz) = 2340352 diff --git a/print/freetype2/files/patch-CMakeLists.txt b/print/freetype2/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..64d4245b83d1 --- /dev/null +++ b/print/freetype2/files/patch-CMakeLists.txt @@ -0,0 +1,46 @@ +Backport of + https://gitlab.freedesktop.org/freetype/freetype/-/commit/385345037e04f9ee6ffc8b14318f1a079520c41d + +--- CMakeLists.txt.orig 2022-04-04 15:57:19 UTC ++++ CMakeLists.txt +@@ -497,8 +497,9 @@ endif () + ) + endif () + +- ++set(PKGCONFIG_REQUIRES "") + set(PKG_CONFIG_REQUIRED_PRIVATE "") ++set(PKGCONFIG_LIBS "-L\${libdir} -lfreetype") + set(PKG_CONFIG_LIBS_PRIVATE "") + + if (ZLIB_FOUND) +@@ -569,10 +570,25 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_AL + FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) + string(REPLACE "%ft_version%" "${LIBTOOL_CURRENT}.${LIBTOOL_REVISION}.${LIBTOOL_AGE}" + FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) +- string(REPLACE "%REQUIRES_PRIVATE%" "${PKG_CONFIG_REQUIRED_PRIVATE}" +- FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) +- string(REPLACE "%LIBS_PRIVATE%" "${PKG_CONFIG_LIBS_PRIVATE}" +- FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) ++ if (BUILD_SHARED_LIBS) ++ string(REPLACE "%PKGCONFIG_REQUIRES%" "${PKGCONFIG_REQUIRES}" ++ FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) ++ string(REPLACE "%PKGCONFIG_REQUIRES_PRIVATE%" "${PKGCONFIG_REQUIRES_PRIVATE}" ++ FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) ++ string(REPLACE "%PKGCONFIG_LIBS%" "${PKGCONFIG_LIBS}" ++ FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) ++ string(REPLACE "%PKGCONFIG_LIBS_PRIVATE%" "${PKGCONFIG_LIBS_PRIVATE}" ++ FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) ++ else () ++ string(REPLACE "%PKGCONFIG_REQUIRES%" "${PKGCONFIG_REQUIRES} ${PKGCONFIG_REQUIRES_PRIVATE}" ++ FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) ++ string(REPLACE "%PKGCONFIG_REQUIRES_PRIVATE%" "" ++ FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) ++ string(REPLACE "%PKGCONFIG_LIBS%" "${PKGCONFIG_LIBS} ${PKGCONFIG_LIBS_PRIVATE}" ++ FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) ++ string(REPLACE "%PKGCONFIG_LIBS_PRIVATE%" "" ++ FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) ++ endif () + + set(FREETYPE2_PC_IN_NAME "${PROJECT_BINARY_DIR}/freetype2.pc") + if (EXISTS "${FREETYPE2_PC_IN_NAME}") diff --git a/print/freetype2/pkg-plist b/print/freetype2/pkg-plist index 30ad31f7f347..07f7fbb41d81 100644 --- a/print/freetype2/pkg-plist +++ b/print/freetype2/pkg-plist @@ -49,6 +49,7 @@ include/freetype2/freetype/ftsystem.h include/freetype2/freetype/fttrigon.h include/freetype2/freetype/fttypes.h include/freetype2/freetype/ftwinfnt.h +include/freetype2/freetype/otsvg.h include/freetype2/freetype/t1tables.h include/freetype2/freetype/ttnameid.h include/freetype2/freetype/tttables.h @@ -59,5 +60,5 @@ lib/cmake/freetype/freetype-config-version.cmake lib/cmake/freetype/freetype-config.cmake lib/libfreetype.so lib/libfreetype.so.6 -lib/libfreetype.so.6.18.1 +lib/libfreetype.so.6.18.2 libdata/pkgconfig/freetype2.pc