[packages/plplot] - rediff patches

[baggins]

commit 6ac88262e73d3ea2f818dd9de68068a186261938
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Mar 25 22:40:46 2021 +0100

    - rediff patches

 plplot-d.patch      | 24 +++++++++++++-----------
 plplot-plmeta.patch |  9 +++++----
 2 files changed, 18 insertions(+), 15 deletions(-)
---
diff --git a/plplot-d.patch b/plplot-d.patch
index e3ee630..72fb07c 100644
--- a/plplot-d.patch
+++ b/plplot-d.patch
@@ -1,26 +1,28 @@
---- plplot-5.10.0/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake.orig	2014-02-12 23:19:33.000000000 +0100
-+++ plplot-5.10.0/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake	2014-03-22 15:08:43.608106139 +0100
-@@ -97,7 +97,7 @@
- 	OUTPUT_VARIABLE OUTPUT) 
+diff -urNp -x '*.orig' plplot-5.15.0.org/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake plplot-5.15.0/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake
+--- plplot-5.15.0.org/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake	2019-06-02 01:24:33.000000000 +0200
++++ plplot-5.15.0/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake	2021-03-25 22:39:33.538470918 +0100
+@@ -98,7 +98,7 @@ IF(NOT CMAKE_D_PHOBOS_WORKS)
+ 	OUTPUT_VARIABLE OUTPUT)
      ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
        TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
 -	CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libphobos.a"
 +	CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib${LIB_SUFFIX}/libphobos2.a"
  	COMPILE_DEFINITIONS "-I${D_PATH}/include -I${D_PATH}/import"
- 	OUTPUT_VARIABLE OUTPUT) 
+ 	OUTPUT_VARIABLE OUTPUT)
      ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-@@ -137,7 +136,7 @@
- 	OUTPUT_VARIABLE OUTPUT) 
+@@ -138,7 +138,7 @@ IF(NOT CMAKE_D_TANGO_WORKS)
+ 	OUTPUT_VARIABLE OUTPUT)
      ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
        TRY_COMPILE(CMAKE_D_TANGO_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
 -	CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libtango.a;${D_PATH}/lib/libphobos.a"
 +	CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib${LIB_SUFFIX}/libtango.a;${D_PATH}/lib${LIB_SUFFIX}/libphobos2.a"
  	COMPILE_DEFINITIONS "-I${D_PATH}/include -I${D_PATH}/import"
- 	OUTPUT_VARIABLE OUTPUT) 
+ 	OUTPUT_VARIABLE OUTPUT)
      ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
---- plplot-5.10.0/cmake/modules/language_support/cmake/Platform/Linux-dmd.cmake.orig	2014-03-22 15:16:28.518086629 +0100
-+++ plplot-5.10.0/cmake/modules/language_support/cmake/Platform/Linux-dmd.cmake	2014-03-22 15:10:21.461435366 +0100
-@@ -25,7 +25,7 @@
+diff -urNp -x '*.orig' plplot-5.15.0.org/cmake/modules/language_support/cmake/Platform/Linux-dmd.cmake plplot-5.15.0/cmake/modules/language_support/cmake/Platform/Linux-dmd.cmake
+--- plplot-5.15.0.org/cmake/modules/language_support/cmake/Platform/Linux-dmd.cmake	2019-06-02 01:24:33.000000000 +0200
++++ plplot-5.15.0/cmake/modules/language_support/cmake/Platform/Linux-dmd.cmake	2021-03-25 22:39:33.538470918 +0100
+@@ -25,7 +25,7 @@ IF(CMAKE_D_BUILD_DOCS)
  	#ENDFOREACH(item)
  ENDIF(CMAKE_D_BUILD_DOCS)
  
diff --git a/plplot-plmeta.patch b/plplot-plmeta.patch
index fdd5dee..6867191 100644
--- a/plplot-plmeta.patch
+++ b/plplot-plmeta.patch
@@ -1,10 +1,11 @@
---- plplot-5.11.1/include/plDevs.h.in.orig	2015-08-12 19:35:28.000000000 +0200
-+++ plplot-5.11.1/include/plDevs.h.in	2016-04-21 18:55:03.511791340 +0200
-@@ -61,6 +61,7 @@
+diff -urNp -x '*.orig' plplot-5.15.0.org/include/plDevs.h.in plplot-5.15.0/include/plDevs.h.in
+--- plplot-5.15.0.org/include/plDevs.h.in	2019-06-02 01:24:33.000000000 +0200
++++ plplot-5.15.0/include/plDevs.h.in	2021-03-25 22:39:32.521808129 +0100
+@@ -63,6 +63,7 @@
  #cmakedefine PLD_null
  #cmakedefine PLD_pdf
  #cmakedefine PLD_plm
 +#cmakedefine PLD_plmeta
  #cmakedefine PLD_ps
+ #cmakedefine PLD_psc
  #cmakedefine PLD_pstex
- #cmakedefine PLD_psttf
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/plplot.git/commitdiff/6ac88262e73d3ea2f818dd9de68068a186261938