From eb183171d257f4b3dd49b9f919627d2d54071f66 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 20 Oct 2020 02:18:39 +0200 Subject: [cmake] upgrade to 3.18 (#12612) Co-authored-by: JackBoosY Co-authored-by: Billy Robert O'Neal III --- ports/plplot/CONTROL | 3 ++- ports/plplot/fix-pkg-config.patch | 17 +++++++++++++++++ ports/plplot/portfile.cmake | 1 + 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 ports/plplot/fix-pkg-config.patch (limited to 'ports/plplot') diff --git a/ports/plplot/CONTROL b/ports/plplot/CONTROL index fe5ea0b19..67a70e365 100644 --- a/ports/plplot/CONTROL +++ b/ports/plplot/CONTROL @@ -1,5 +1,6 @@ Source: plplot -Version: 5.13.0-8 +Version: 5.13.0 +Port-Version: 9 Build-Depends: freetype, zlib, libpng, bzip2 Description: PLplot is a cross-platform software package for creating scientific plots whose (UTF-8) plot symbols and text are limited in practice only by what Unicode-aware system fonts are installed on a user's computer. diff --git a/ports/plplot/fix-pkg-config.patch b/ports/plplot/fix-pkg-config.patch new file mode 100644 index 000000000..dd2601dbf --- /dev/null +++ b/ports/plplot/fix-pkg-config.patch @@ -0,0 +1,17 @@ +diff --git a/cmake/modules/psttf.cmake b/cmake/modules/psttf.cmake +index 950f41b..6c20af5 100644 +--- a/cmake/modules/psttf.cmake ++++ b/cmake/modules/psttf.cmake +@@ -56,7 +56,11 @@ if(PLD_psttf) + endif(PLD_psttf) + + if(PLD_psttf) +- pkg_check_pkgconfig("lasi;pango;pangoft2" includedir libdir linkflags cflags version _PSTTF) ++ set(PKG_LIST lasi pango pangoft2) ++ foreach (SELECTED_PKG ${PKG_LIST}) ++ pkg_check_pkgconfig("${SELECTED_PKG}" includedir libdir linkflags cflags version _PSTTF) ++ endforeach() ++ + if(linkflags) + #blank-separated required. + string(REGEX REPLACE ";" " " psttf_COMPILE_FLAGS "${cflags}") diff --git a/ports/plplot/portfile.cmake b/ports/plplot/portfile.cmake index 97efa2568..4e7a55799 100644 --- a/ports/plplot/portfile.cmake +++ b/ports/plplot/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_from_sourceforge( install-interface-include-directories.patch use-math-h-nan.patch fix_utils.patch + fix-pkg-config.patch ) set(BUILD_with_wxwidgets OFF) -- cgit v1.2.3