View | Details | Raw Unified | Return to bug 262979 | Differences between
and this patch

Collapse All | Expand All

(-)b/print/freetype2/Makefile (-1 / +1 lines)
Lines 1-7 Link Here
1
# Created by: jseger@FreeBSD.org
1
# Created by: jseger@FreeBSD.org
2
2
3
PORTNAME=	freetype2
3
PORTNAME=	freetype2
4
DISTVERSION=	2.11.1
4
DISTVERSION=	2.12.0
5
CATEGORIES=	print
5
CATEGORIES=	print
6
MASTER_SITES=	SAVANNAH/${PORTNAME:S/2//} \
6
MASTER_SITES=	SAVANNAH/${PORTNAME:S/2//} \
7
		SF/freetype/${PORTNAME}/${DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/
7
		SF/freetype/${PORTNAME}/${DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/
(-)b/print/freetype2/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1638605794
1
TIMESTAMP = 1648812053
2
SHA256 (freetype-2.11.1.tar.xz) = 3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8
2
SHA256 (freetype-2.12.0.tar.xz) = ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033
3
SIZE (freetype-2.11.1.tar.xz) = 2270728
3
SIZE (freetype-2.12.0.tar.xz) = 2340352
(-)b/print/freetype2/files/patch-CMakeLists.txt (+46 lines)
Added Link Here
1
Backport of
2
   https://gitlab.freedesktop.org/freetype/freetype/-/commit/385345037e04f9ee6ffc8b14318f1a079520c41d
3
4
--- CMakeLists.txt.orig	2022-04-04 15:57:19 UTC
5
+++ CMakeLists.txt
6
@@ -497,8 +497,9 @@ endif ()
7
   )
8
 endif ()
9
 
10
-
11
+set(PKGCONFIG_REQUIRES "")
12
 set(PKG_CONFIG_REQUIRED_PRIVATE "")
13
+set(PKGCONFIG_LIBS "-L\${libdir} -lfreetype")
14
 set(PKG_CONFIG_LIBS_PRIVATE "")
15
 
16
 if (ZLIB_FOUND)
17
@@ -569,10 +570,25 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_AL
18
           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
19
   string(REPLACE "%ft_version%" "${LIBTOOL_CURRENT}.${LIBTOOL_REVISION}.${LIBTOOL_AGE}"
20
           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
21
-  string(REPLACE "%REQUIRES_PRIVATE%" "${PKG_CONFIG_REQUIRED_PRIVATE}"
22
-          FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
23
-  string(REPLACE "%LIBS_PRIVATE%" "${PKG_CONFIG_LIBS_PRIVATE}"
24
-          FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
25
+  if (BUILD_SHARED_LIBS)
26
+    string(REPLACE "%PKGCONFIG_REQUIRES%" "${PKGCONFIG_REQUIRES}"
27
+            FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
28
+    string(REPLACE "%PKGCONFIG_REQUIRES_PRIVATE%" "${PKGCONFIG_REQUIRES_PRIVATE}"
29
+            FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
30
+    string(REPLACE "%PKGCONFIG_LIBS%" "${PKGCONFIG_LIBS}"
31
+            FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
32
+    string(REPLACE "%PKGCONFIG_LIBS_PRIVATE%" "${PKGCONFIG_LIBS_PRIVATE}"
33
+            FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
34
+  else ()
35
+    string(REPLACE "%PKGCONFIG_REQUIRES%" "${PKGCONFIG_REQUIRES} ${PKGCONFIG_REQUIRES_PRIVATE}"
36
+            FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
37
+    string(REPLACE "%PKGCONFIG_REQUIRES_PRIVATE%" ""
38
+            FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
39
+    string(REPLACE "%PKGCONFIG_LIBS%" "${PKGCONFIG_LIBS} ${PKGCONFIG_LIBS_PRIVATE}"
40
+            FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
41
+    string(REPLACE "%PKGCONFIG_LIBS_PRIVATE%" ""
42
+            FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
43
+  endif ()
44
 
45
   set(FREETYPE2_PC_IN_NAME "${PROJECT_BINARY_DIR}/freetype2.pc")
46
   if (EXISTS "${FREETYPE2_PC_IN_NAME}")
(-)b/print/freetype2/pkg-plist (-2 / +2 lines)
Lines 49-54 include/freetype2/freetype/ftsystem.h Link Here
49
include/freetype2/freetype/fttrigon.h
49
include/freetype2/freetype/fttrigon.h
50
include/freetype2/freetype/fttypes.h
50
include/freetype2/freetype/fttypes.h
51
include/freetype2/freetype/ftwinfnt.h
51
include/freetype2/freetype/ftwinfnt.h
52
include/freetype2/freetype/otsvg.h
52
include/freetype2/freetype/t1tables.h
53
include/freetype2/freetype/t1tables.h
53
include/freetype2/freetype/ttnameid.h
54
include/freetype2/freetype/ttnameid.h
54
include/freetype2/freetype/tttables.h
55
include/freetype2/freetype/tttables.h
Lines 59-63 lib/cmake/freetype/freetype-config-version.cmake Link Here
59
lib/cmake/freetype/freetype-config.cmake
60
lib/cmake/freetype/freetype-config.cmake
60
lib/libfreetype.so
61
lib/libfreetype.so
61
lib/libfreetype.so.6
62
lib/libfreetype.so.6
62
lib/libfreetype.so.6.18.1
63
lib/libfreetype.so.6.18.2
63
libdata/pkgconfig/freetype2.pc
64
libdata/pkgconfig/freetype2.pc
64
- 

Return to bug 262979