diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2022-04-01 14:43:52 +0200 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2022-04-11 06:26:27 +0200 |
| commit | ae97718afabd8459b4e7f79190bcac9338f233c0 (patch) | |
| tree | cf8be64a0abf2a14c354687e9c9583766f1e935d | |
| parent | d1ccfc2fd715dc5b2b30036452894d3e1a95b83b (diff) | |
| download | freebsd-ports-ae97718afabd8459b4e7f79190bcac9338f233c0.zip | |
print/freetype2: update to 2.12.0
Exp-run by: antoine
PR: 262979
| -rw-r--r-- | print/freetype2/Makefile | 2 | ||||
| -rw-r--r-- | print/freetype2/distinfo | 6 | ||||
| -rw-r--r-- | print/freetype2/files/patch-CMakeLists.txt | 46 | ||||
| -rw-r--r-- | 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 |