Merge branch 'master' into vcpkg_nuget

4 files changed, 54 insertions, 1 deletions

diff --git a/ports/plplot/0005-wxwidgets-fix-rel-lib-dir.patch b/ports/plplot/0005-wxwidgets-fix-rel-lib-dir.patch
new file mode 100644
index 000000000..7ebe79f11
--- /dev/null
+++ b/ports/plplot/0005-wxwidgets-fix-rel-lib-dir.patch
@@ -0,0 +1,23 @@
+diff --git a/cmake/modules/FindwxWidgets.cmake b/cmake/modules/FindwxWidgets.cmake

+index eaaa358..a68683c 100644

+--- a/cmake/modules/FindwxWidgets.cmake

++++ b/cmake/modules/FindwxWidgets.cmake

+@@ -516,13 +516,11 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")

+       endif()

+     endif()

+     if(VCPKG_TARGET_TRIPLET)

+-          find_library(wxWidgets_LIB_DIR

+-        NAMES

+-          wxmsw31ud_core.lib

+-          wxmsw31u_core.lib

+-        PATHS

+-        DOC "Path to wxWidgets libraries"

+-        )

++      if(CMAKE_BUILD_TYPE STREQUAL "Debug")

++        find_library(wxWidgets_LIB_DIR NAMES wxmsw31ud_core.lib DOC "Path to wxWidgets libraries")

++      else()

++        find_library(wxWidgets_LIB_DIR NAMES wxmsw31u_core.lib  DOC "Path to wxWidgets libraries")

++      endif()

+       get_filename_component(wxWidgets_LIB_DIR ${wxWidgets_LIB_DIR} DIRECTORY)

+     elseif(BUILD_SHARED_LIBS)

+       find_path(wxWidgets_LIB_DIR

diff --git a/ports/plplot/CONTROL b/ports/plplot/CONTROL
index 71bdb1a51..b70c5d176 100644
--- a/ports/plplot/CONTROL
+++ b/ports/plplot/CONTROL
@@ -1,5 +1,5 @@
 Source: plplot

-Version: 5.13.0-2

+Version: 5.13.0-3

 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/portfile.cmake b/ports/plplot/portfile.cmake
index c98c8253b..46781da07 100644
--- a/ports/plplot/portfile.cmake
+++ b/ports/plplot/portfile.cmake
@@ -17,6 +17,8 @@ vcpkg_extract_source_archive_ex(
       "${CMAKE_CURRENT_LIST_DIR}/0001-findwxwidgets-fixes.patch"

       "${CMAKE_CURRENT_LIST_DIR}/0002-wxwidgets-dev-fixes.patch"

       "${CMAKE_CURRENT_LIST_DIR}/install-interface-include-directories.patch"

+      "${CMAKE_CURRENT_LIST_DIR}/use-math-h-nan.patch"

+      "0005-wxwidgets-fix-rel-lib-dir.patch"

 )

 

 set(BUILD_with_wxwidgets OFF)

diff --git a/ports/plplot/use-math-h-nan.patch b/ports/plplot/use-math-h-nan.patch
new file mode 100644
index 000000000..1f3987730
--- /dev/null
+++ b/ports/plplot/use-math-h-nan.patch
@@ -0,0 +1,28 @@
+diff --git "a/lib/csa/nan.h" "b/lib/csa/nan.h"
+index 29fd3d2f..7f16e8c8 100644
+--- "a/lib/csa/nan.h"
++++ "b/lib/csa/nan.h"
+@@ -19,6 +19,16 @@
+ #if !defined ( _NAN_H )
+ #define _NAN_H
+
++// Try to use the implementation-provided NAN constant:
++
++#include <math.h>
++
++#if defined(NAN)
++
++#define NaN ((double)NAN)
++
++#else // ^^^ implementation provides NAN // implementation does not provide NAN vvv
++
+ #if ( defined ( __GNUC__ ) && !defined ( __ICC ) ) || defined ( __BORLANDC__ )
+
+ static const double NaN = 0.0 / 0.0;
+@@ -63,4 +73,6 @@ static const long long lNaN = ( (unsigned long long) 1 << 63 ) - 1;
+
+ #endif
+
++#endif // defined(NAN)
++
+ #endif