[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [craft-blueprints-kde] libs/freetype: Fix shared windows build
From:       Hannah von Reth <null () kde ! org>
Date:       2018-09-25 22:36:19
Message-ID: E1g4vwJ-0004c7-Ba () code ! kde ! org
[Download RAW message or body]

Git commit 378c1dce1e0709348d554b288d5689158b91b51e by Hannah von Reth.
Committed on 25/09/2018 at 22:35.
Pushed by vonreth into branch 'master'.

Fix shared windows build

A  +34   -0    libs/freetype/freetype-2.9.1-20180926.diff
M  +7    -2    libs/freetype/freetype.py

https://commits.kde.org/craft-blueprints-kde/378c1dce1e0709348d554b288d5689158b91b51e

diff --git a/libs/freetype/freetype-2.9.1-20180926.diff \
b/libs/freetype/freetype-2.9.1-20180926.diff new file mode 100644
index 0000000..5da636d
--- /dev/null
+++ b/libs/freetype/freetype-2.9.1-20180926.diff
@@ -0,0 +1,34 @@
+diff -Nrub -x '*~' -x '*\.rej' -x '*\.orig' -x '*\.o' -x '*\.pyc' \
freetype-2.9.1.orig/CMakeLists.txt freetype-2.9.1/CMakeLists.txt +--- \
freetype-2.9.1.orig/CMakeLists.txt	2018-09-26 00:34:46.786315300 +0200 ++++ \
freetype-2.9.1/CMakeLists.txt	2018-09-26 00:34:31.885969800 +0200 +@@ -328,7 +328,7 \
@@ + endif()
+ 
+ 
+-add_library(freetype
++add_library(freetype SHARED
+   ${PUBLIC_HEADERS}
+   ${PUBLIC_CONFIG_HEADERS}
+   ${PRIVATE_HEADERS}
+@@ -344,7 +344,7 @@
+ 
+ if (WIN32)
+   target_compile_definitions(
+-    freetype PRIVATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS)
++    freetype PRIVATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS DLL_EXPORT)
+ endif ()
+ 
+ if (BUILD_SHARED_LIBS)
+@@ -463,10 +463,10 @@
+   install(
+     TARGETS freetype
+       EXPORT freetype-targets
++      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+       LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-      FRAMEWORK DESTINATION Library/Frameworks
+-      COMPONENT libraries)
++      FRAMEWORK DESTINATION Library/Frameworks)
+   install(
+     EXPORT freetype-targets
+       DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype
diff --git a/libs/freetype/freetype.py b/libs/freetype/freetype.py
index da7c65b..f3611f7 100644
--- a/libs/freetype/freetype.py
+++ b/libs/freetype/freetype.py
@@ -10,23 +10,28 @@ class subinfo(info.infoclass):
             self.targetInstSrc[ver] = "freetype-" + ver
         self.patchToApply['2.3.12'] = ('freetype-2.3.12.diff', 1)
         self.patchToApply['2.5.0.1'] = ('freetype-2.5.0.1.diff', 1)
-        self.patchToApply['2.9.1'] = [("freetype-2.9.1-20180925.diff", 1)]
+        self.patchToApply['2.9.1'] = [("freetype-2.9.1-20180925.diff", 1),
+                                      ("freetype-2.9.1-20180926.diff", 1)# TODO: \
cleanup the shared build +                                      ]
         self.targetDigests['2.3.12'] = 'ebf0438429c0bedd310059326d91646c3c91016b'
         self.targetDigests['2.5.0.1'] = '4bbd8357b4b723e1ff38414a9eaf50bf99dacb84'
         self.targetDigests['2.9.1'] = \
(['db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d'], \
                CraftHash.HashAlgorithm.SHA256)
-
+        self.patchLevel['2.9.1'] = 1
         self.defaultTarget = '2.9.1'
         self.description = "A Free, High-Quality, and Portable Font Engine"
 
     def setDependencies(self):
         self.runtimeDependencies["virtual/base"] = "default"
         self.runtimeDependencies["libs/libpng"] = "default"
+        self.runtimeDependencies["libs/libbzip2"] = "default"
+        self.runtimeDependencies["libs/zlib"] = "default"
         self.buildDependencies["dev-utils/msys"] = "default"
         self.buildDependencies["dev-utils/pkg-config"] = "default"
 
 class PackageCMake(CMakePackageBase):
     def __init__(self, **args):
         CMakePackageBase.__init__(self)
+        self.subinfo.options.configure.args += " -DBUILD_SHARED_LIBS=ON"
 
 
 class PackageMSys(AutoToolsPackageBase):


[prev in list] [next in list] [prev in thread] [next in thread]