[packages/3DLDF] - added gcc6 patch (avoid ambiguity with std::conditional) - release 6 (rebuild with gsl 2.4)

[qboosh]

commit 983e210034847c14f508cc72002f56676a9e220c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Jun 26 17:41:00 2017 +0200

    - added gcc6 patch (avoid ambiguity with std::conditional)
    - release 6 (rebuild with gsl 2.4)

 3DLDF-gcc6.patch | 29 +++++++++++++++++++++++++++++
 3DLDF.spec       |  4 +++-
 2 files changed, 32 insertions(+), 1 deletion(-)
---
diff --git a/3DLDF.spec b/3DLDF.spec
index 6449dea..b5d7033 100644
--- a/3DLDF.spec
+++ b/3DLDF.spec
@@ -2,7 +2,7 @@ Summary:	Three-dimensional drawing with MetaPost output
 Summary(pl.UTF-8):	Tworzenie trójwymiarowej grafiki z wyjściem w formacie MetaPost
 Name:		3DLDF
 Version:	2.0.3
-Release:	5
+Release:	6
 License:	GPL v2+
 Group:		Applications/Graphics
 Source0:	http://ftp.gnu.org/gnu/3dldf/%{name}-%{version}.tar.gz
@@ -12,6 +12,7 @@ Patch1:		upstream-cleanup-permissive_cxx_code.patch
 Patch2:		upstream-gcc-init_priority.patch
 Patch3:		upstream-sys-std_numeric_limits.patch
 Patch4:		upstream-w2help2man.patch
+Patch5:		%{name}-gcc6.patch
 URL:		http://www.gnu.org/software/3dldf/
 # ps2pdf
 BuildRequires:	ghostscript
@@ -41,6 +42,7 @@ w TeXu.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 # only 3dlfb binary uses libs, symbols are messed - no sense in building shared libs
diff --git a/3DLDF-gcc6.patch b/3DLDF-gcc6.patch
new file mode 100644
index 0000000..07ab7b3
--- /dev/null
+++ b/3DLDF-gcc6.patch
@@ -0,0 +1,29 @@
+--- 3DLDF-2.0.3/src/pcondit.w.orig	2013-11-11 19:43:06.000000000 +0100
++++ 3DLDF-2.0.3/src/pcondit.w	2017-06-26 17:20:52.038628531 +0200
+@@ -180,7 +180,7 @@
+  
+     int i = (*b) ? 1 : 0;
+ 
+-    int status = conditional(scanner_node, i); 
++    int status = Scan_Parse::conditional(scanner_node, i); 
+ 
+   
+ @q ****** (6) Error handling: |status != 0|.@> 
+@@ -244,7 +244,7 @@
+ 
+     int discard = 2;
+ 
+-    int status = conditional(static_cast<Scanner_Node>(parameter), discard);
++    int status = Scan_Parse::conditional(static_cast<Scanner_Node>(parameter), discard);
+ 
+ @q ****** (6) Error handling: |status != 0|.@> 
+ 
+@@ -303,7 +303,7 @@
+ 
+   int discard = 2;
+ 
+-  int status = conditional(static_cast<Scanner_Node>(parameter), discard);
++  int status = Scan_Parse::conditional(static_cast<Scanner_Node>(parameter), discard);
+ 
+ @q ****** (6) Error handling: |status != 0|.@> 
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/3DLDF.git/commitdiff/983e210034847c14f508cc72002f56676a9e220c