git: ab651f0b141a - main - print/freetype2: update to 2.21.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 19 May 2022 17:26:34 UTC
The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=ab651f0b141abf759069325fdb1d38426dc3c949 commit ab651f0b141abf759069325fdb1d38426dc3c949 Author: Baptiste Daroussin <bapt@FreeBSD.org> AuthorDate: 2022-05-19 17:21:20 +0000 Commit: Baptiste Daroussin <bapt@FreeBSD.org> CommitDate: 2022-05-19 17:21:20 +0000 print/freetype2: update to 2.21.1 --- print/freetype2/Makefile | 2 +- print/freetype2/distinfo | 6 ++-- print/freetype2/files/patch-CMakeLists.txt | 46 ------------------------------ print/freetype2/pkg-plist | 2 +- 4 files changed, 5 insertions(+), 51 deletions(-) diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile index 93589bfff4f2..95083ef1f053 100644 --- a/print/freetype2/Makefile +++ b/print/freetype2/Makefile @@ -1,7 +1,7 @@ # Created by: jseger@FreeBSD.org PORTNAME= freetype2 -DISTVERSION= 2.12.0 +DISTVERSION= 2.12.1 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 909fccfe50dd..3621d502371a 100644 --- a/print/freetype2/distinfo +++ b/print/freetype2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1648812053 -SHA256 (freetype-2.12.0.tar.xz) = ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033 -SIZE (freetype-2.12.0.tar.xz) = 2340352 +TIMESTAMP = 1652980561 +SHA256 (freetype-2.12.1.tar.xz) = 4766f20157cc4cf0cd292f80bf917f92d1c439b243ac3018debf6b9140c41a7f +SIZE (freetype-2.12.1.tar.xz) = 2471916 diff --git a/print/freetype2/files/patch-CMakeLists.txt b/print/freetype2/files/patch-CMakeLists.txt deleted file mode 100644 index 64d4245b83d1..000000000000 --- a/print/freetype2/files/patch-CMakeLists.txt +++ /dev/null @@ -1,46 +0,0 @@ -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 07f7fbb41d81..7993dcdbed10 100644 --- a/print/freetype2/pkg-plist +++ b/print/freetype2/pkg-plist @@ -60,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.2 +lib/libfreetype.so.6.18.3 libdata/pkgconfig/freetype2.pc