- release 3, buildfix and icu-65 rebuild

diff --git a/dcmtk-fixes.patch b/dcmtk-fixes.patch
new file mode 100644 (file)
index 0000000..5f7db0d
--- /dev/null
+++ b/dcmtk-fixes.patch
@@ -0,0 +1,11 @@
+--- dcmtk-3.6.3/ofstd/include/dcmtk/ofstd/variadic/helpers.h   2018-02-05 18:58:12.000000000 +0100
++++ dcmtk-3.6.4/ofstd/include/dcmtk/ofstd/variadic/helpers.h   2018-11-29 13:14:03.000000000 +0100
+@@ -54,7 +54,7 @@
+ 
+ template<size_t Index,typename T>
+ struct OFvariadic_find_type_t<Index,T>
+-: OFintegral_constant<size_t,-1> {};
++: OFintegral_constant<size_t,~OFstatic_cast(size_t,0)> {};
+ 
+ template<typename T,typename T0=OFvariadic_nil,typename T1=OFvariadic_nil,typename T2=OFvariadic_nil,typename T3=OFvariadic_nil,typename T4=OFvariadic_nil,typename T5=OFvariadic_nil,typename T6=OFvariadic_nil,typename T7=OFvariadic_nil,typename T8=OFvariadic_nil,typename T9=OFvariadic_nil,typename T10=OFvariadic_nil,typename T11=OFvariadic_nil,typename T12=OFvariadic_nil,typename T13=OFvariadic_nil,typename T14=OFvariadic_nil,typename T15=OFvariadic_nil,typename T16=OFvariadic_nil,typename T17=OFvariadic_nil,typename T18=OFvariadic_nil,typename T19=OFvariadic_nil,typename T20=OFvariadic_nil,typename T21=OFvariadic_nil,typename T22=OFvariadic_nil,typename T23=OFvariadic_nil,typename T24=OFvariadic_nil,typename T25=OFvariadic_nil,typename T26=OFvariadic_nil,typename T27=OFvariadic_nil,typename T28=OFvariadic_nil,typename T29=OFvariadic_nil,typename T30=OFvariadic_nil,typename T31=OFvariadic_nil,typename T32=OFvariadic_nil,typename T33=OFvariadic_nil,typename T34=OFvariadic_nil,typename T35=OFvariadic_nil,typename T36=OFvariadic_nil,typename T37=OFvariadic_nil,typename T38=OFvariadic_nil,typename T39=OFvariadic_nil,typename T40=OFvariadic_nil,typename T41=OFvariadic_nil,typename T42=OFvariadic_nil,typename T43=OFvariadic_nil,typename T44=OFvariadic_nil,typename T45=OFvariadic_nil,typename T46=OFvariadic_nil,typename T47=OFvariadic_nil,typename T48=OFvariadic_nil,typename T49=OFvariadic_nil>
+ struct OFvariadic_find_type

diff --git a/dcmtk.spec b/dcmtk.spec
index 94f645ba887a39b084de691ad3e304fbba9a784e..e914386660880d789323f676fffbb554800108d6 100644 (file)
--- a/dcmtk.spec
+++ b/dcmtk.spec
@@ -7,7 +7,7 @@ Summary:        DICOM To:olkit - implementation of DICOM/MEDICOM standard
 Summary(pl.UTF-8):     Narzędzia DICOM - implementacja standardu DICOM/MEDICOM
 Name:          dcmtk
 Version:       3.6.3
-Release:       2
+Release:       3
 License:       BSD
 Group:         Libraries
 Source0:       ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk363/%{name}-%{version}.tar.gz
@@ -19,6 +19,7 @@ Patch3:               %{name}-3.6.1-0003-Create-FindCharLS.cmake.patch
 Patch4:                %{name}-3.6.1-0004-Use-cmake-suggested-location-for-CharLS.patch
 Patch5:                %{name}-etc.patch
 Patch6:                CharLS.patch
+Patch7:                %{name}-fixes.patch
 URL:           http://dicom.offis.de/dcmtk
 BuildRequires: CharLS-devel < 2.0
 BuildRequires: cmake >= 2.4
@@ -75,6 +76,7 @@ Pliki nagłówkowe bibliotek DCMTK.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 # enforce system CharLS
 %{__rm} -r dcmjpls/libcharls