From nobody Thu Dec 28 23:03:47 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1PFc6ZlJz54rN3; Thu, 28 Dec 2023 23:03:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1PFc1kDXz3KRZ; Thu, 28 Dec 2023 23:03:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703804628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BNfYdjMkPO4Z3HQR5rmclZ19QEPjxg/GzXSIBLq5FLM=; b=Q6NUfBJWVSJq4cv1Y9gytXQJKG8C4bbX7VZuPOqVaAvFgf3Frx9cjbR9gteRgVx6OB+D0k /HW6WyVaSy1bXmMVtWdmzjX+piRGnmrXqKs/wROufxSnjOGRr2sr5U2GdeXQSoxv6N5Gaw 2wzeRZ5xbBlPvFVvW0ih6tY9dJUcS39cdjcXBqaS4wMNL95IPjeIqdKSf8bIfseKm+XeDg 58MFWDXtIYh4GEfkojeRM1fYzVR2nbiVKuOFXZVcTLiBt2YYGxlF/lV9XOYFxokC3FiueR APBhhN2VxmYpmiKgIkn8zlbaKA7QJPjOTc7z1mqYjgTzdYKl3vkKYqf1jPtzeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703804628; a=rsa-sha256; cv=none; b=WfF6fvQgJUWunK68FKWVnALE01rFtzaOGrX4qyhkECLAfxB1jFoomp6wnsFukJFR9bKJKF L9jF5DZtCwufIZmdLy5av3JYJ3Icoeg8y3ZYwBfPKZxuQxo6UQK6jmg4MeW3RTHFwGcu4W ZAKcKMWGBBCLRr+x15JB20orEjaklIfTP2YmZO8S5eMxlS2awIdOQjLcMxvJ4BMu72AhMN FX11yOQb4azg+w2tXANWCk5o5rBiTyxp1UVJ19AX1uh5tXRypLDg9tWiJlDNokRX6G4Irh 4FM9JmaXtQ2iagq+zGfjwHUxNTDP921f7ZrE1thC5zsf7IJQAKzkC4JPEXwWFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703804628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BNfYdjMkPO4Z3HQR5rmclZ19QEPjxg/GzXSIBLq5FLM=; b=fvCY/RXTqKh0p6FNblChAdEc+TE8c32kVOEVymfgPgoJf0gsNnJnyPizfyeGnNDtJaK7Cp M52bB2qDF8j/sNtGn3AyFbey68z171P61zsLSvjm8oslDDrNTwAKdQRbYbjNkV+jPgZxRR N9Hwzi1+fEBUj2rpjF8Ftp2RJNT4cwHpREJ47QA+49aVYgMZoTEWjfhFWAqWvE8UTANyOn q8DSMHpdNKJipyshtZpi9EovX+gV8hYmWAIZqo1yApAMZ+6F2rYC4LeVhaz4d6fn1NaEQ5 qZqFQCBPh6dB15a3kmcs57RELwAhvysSvGg8FKpGihL0hnnYsWwgyisOoFndKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1PFc0XvQzhxW; Thu, 28 Dec 2023 23:03:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSN3lxR059660; Thu, 28 Dec 2023 23:03:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSN3l1O059657; Thu, 28 Dec 2023 23:03:47 GMT (envelope-from git) Date: Thu, 28 Dec 2023 23:03:47 GMT Message-Id: <202312282303.3BSN3l1O059657@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 1fdc2a021a58 - main - print/miktex: Fix build with CMake >= 3.28.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1fdc2a021a58396af932a598616d5be6bf256ae4 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=1fdc2a021a58396af932a598616d5be6bf256ae4 commit 1fdc2a021a58396af932a598616d5be6bf256ae4 Author: Jason E. Hale AuthorDate: 2023-12-28 20:21:11 +0000 Commit: Jason E. Hale 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}" + )