git: 1fdc2a021a58 - main - print/miktex: Fix build with CMake >= 3.28.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 28 Dec 2023 23:03:47 UTC
The branch main has been updated by jhale:
URL: https://cgit.FreeBSD.org/ports/commit/?id=1fdc2a021a58396af932a598616d5be6bf256ae4
commit 1fdc2a021a58396af932a598616d5be6bf256ae4
Author: Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2023-12-28 20:21:11 +0000
Commit: Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2023-12-28 23:03:33 +0000
print/miktex: Fix build with CMake >= 3.28.0
PR: 275730
Approved by: portmgr (blanket)
---
print/miktex/files/patch-CMakeLists.txt | 32 ++++++++++++++++++++++++++++----
1 file changed, 28 insertions(+), 4 deletions(-)
diff --git a/print/miktex/files/patch-CMakeLists.txt b/print/miktex/files/patch-CMakeLists.txt
index d51fc4a348ee..2d1300097fbc 100644
--- a/print/miktex/files/patch-CMakeLists.txt
+++ b/print/miktex/files/patch-CMakeLists.txt
@@ -1,4 +1,10 @@
---- CMakeLists.txt.orig 2023-09-23 11:56:30 UTC
+Fix build with CMake >= 3.28.0. FREETYPE_LIBRARY has not officially been
+part of the user-facing interface of the FindFreetype module since CMake
+2.6.0 [1] and has only been coincidentally defined up until this point.
+
+[1] https://gitlab.kitware.com/cmake/cmake/-/commit/d18fb61c76c720ec5b1ac2cc4f30a5beaf071c33
+
+--- CMakeLists.txt.orig 2023-09-17 19:36:53 UTC
+++ CMakeLists.txt
@@ -1,7 +1,7 @@
## CMakeLists.txt
@@ -9,7 +15,7 @@
## This file is free software; the copyright holder gives
## unlimited permission to copy and/or distribute it, with or
## without modifications, as long as this notice is preserved.
-@@ -598,7 +598,7 @@ if(WITH_ASYMPTOTE AND MIKTEX_NATIVE_WINDOWS)
+@@ -598,7 +598,7 @@ set(QT_SERIES "5" CACHE STRING "The Qt series to be us
endif()
set(QT_SERIES "5" CACHE STRING "The Qt series to be used.")
@@ -18,7 +24,7 @@
###############################################################################
## fixed values
-@@ -655,7 +655,7 @@ elseif(MIKTEX_MONTH_VERSION EQUAL 11)
+@@ -655,7 +655,7 @@ elseif(MIKTEX_MONTH_VERSION EQUAL 12)
set(MIKTEX_MONTH_NAME_VERSION "November")
elseif(MIKTEX_MONTH_VERSION EQUAL 12)
set(MIKTEX_MONTH_NAME_VERSION "December")
@@ -27,7 +33,7 @@
if(MIKTEX_LINUX)
set(MIKTEX_LINUX_DIST
-@@ -1249,6 +1249,10 @@ if(USE_SYSTEM_ZZIP)
+@@ -1249,6 +1249,10 @@ endif()
find_package(ZZIP REQUIRED)
endif()
@@ -47,3 +53,21 @@
add_subdirectory(${MIKTEX_REL_BZIP2_DIR})
endif()
+@@ -1609,7 +1613,7 @@ if(USE_SYSTEM_FREETYPE2)
+ endif()
+
+ if(USE_SYSTEM_FREETYPE2)
+- get_filename_component(suffix ${FREETYPE_LIBRARY} EXT)
++ get_filename_component(suffix ${FREETYPE_LIBRARIES} EXT)
+ if (suffix STREQUAL CMAKE_SHARED_LIBRARY_SUFFIX)
+ add_library(MiKTeX::Imported::FREETYPE2 SHARED IMPORTED)
+ else()
+@@ -1617,7 +1621,7 @@ if(USE_SYSTEM_FREETYPE2)
+ endif()
+ set_target_properties(MiKTeX::Imported::FREETYPE2
+ PROPERTIES
+- IMPORTED_LOCATION "${FREETYPE_LIBRARY}"
++ IMPORTED_LOCATION "${FREETYPE_LIBRARIES}"
+ INTERFACE_COMPILE_DEFINITIONS "HAVE_FT2BUILD_H=1;HAVE_LIBFREETYPE=1"
+ INTERFACE_INCLUDE_DIRECTORIES "${FREETYPE_INCLUDE_DIRS}"
+ )