PR#1: Update to 3.6.2 and remove BR of tcp_wrappers - rpms/dcmtk

rpms / dcmtk

#1 Update to 3.6.2 and remove BR of tcp_wrappers

Merged 5 years ago by ignatenkobrain. Opened 5 years ago by jenslody.

Unknown source update_to_3.6.2_no_lwrap into master

Update to 3.6.2, fixes rhbz #1440439.

Jens Lody • 5 years ago

6acf72b

dcmtk-3.6.0-0005-Fixed-includes-for-CharLS-1.0.patch

file modified

+3 -3

		`@@ -13,7 +13,7 @@`
		`index 8a11515..8da8d7a 100644`
		`--- a/dcmjpls/libsrc/djcodecd.cc`
		`+++ b/dcmjpls/libsrc/djcodecd.cc`
		`- @@ -44,7 +44,7 @@`
		`+ @@ -37,7 +37,7 @@`
		`#include "djerror.h" /* for private class DJLSError */`

		`// JPEG-LS library (CharLS) includes`
		`@@ -26,7 +26,7 @@`
		`index 9d6e1d8..8148b31 100644`
		`--- a/dcmjpls/libsrc/djcodece.cc`
		`+++ b/dcmjpls/libsrc/djcodece.cc`
		`- @@ -62,7 +62,7 @@`
		`+ @@ -55,7 +55,7 @@`
		`#include "dcmtk/dcmimgle/dcmimage.h" /* for class DicomImage */`

		`// JPEG-LS library (CharLS) includes`
		`@@ -39,7 +39,7 @@`
		`index 68ebae1..d3cd2ad 100644`
		`--- a/dcmjpls/libsrc/djerror.h`
		`+++ b/dcmjpls/libsrc/djerror.h`
		`- @@ -31,7 +31,7 @@`
		`+ @@ -24,7 +24,7 @@`

		`#include "dcmtk/config/osconfig.h"`
		`#include "dcmtk/dcmjpls/djlsutil.h" /* For the OFCondition codes */`

dcmtk-3.6.1-0002-Find-and-include-CharLS.patch

file modified

+2 -2

		`@@ -11,7 +11,7 @@`
		`index 9fcca77..2ccda35 100755`
		`--- a/CMake/3rdparty.cmake`
		`+++ b/CMake/3rdparty.cmake`
		`- @@ -267,6 +267,20 @@ ELSE(WIN32)`
		`+ @@ -269,6 +269,20 @@ ELSE(WIN32)`
		`ENDIF(NOT WRAP_FOUND)`
		`ENDIF(DCMTK_WITH_WRAP)`

		`@@ -31,7 +31,7 @@`
		`+`
		`ENDIF()`

		`- # Find doxygen`
		`+ IF(NOT DEFINED DCMTK_WITH_STDLIBC_ICONV)`
		`--`
		`1.9.3`

dcmtk-3.6.2-0006-libcharls-changed-api.patch

file added

+20

		`@@ -0,0 +1,20 @@`
		`+ --- a/dcmjpls/libsrc/djcodece.cc 2017-12-10 11:53:04.128184499 +0100`
		`+ +++ b/dcmjpls/libsrc/djcodece.cc 2017-12-10 11:53:54.752173632 +0100`
		`+ @@ -664,7 +664,7 @@`
		`+`
		`+ size_t bytesWritten = 0;`
		`+`
		`+ - JLS_ERROR err = JpegLsEncode(&buffer, &size, &bytesWritten, framePointer, frameSize, &jls_params);`
		`+ + JLS_ERROR err = JpegLsEncode(buffer, size, &bytesWritten, framePointer, frameSize, &jls_params);`
		`+ result = DJLSError::convert(err);`
		`+`
		`+ if (result.good())`
		`+ @@ -1055,7 +1055,7 @@`
		`+`
		`+ size_t bytesWritten = 0;`
		`+`
		`+ - JLS_ERROR err = JpegLsEncode(&compressed_buffer, &compressed_buffer_size, &bytesWritten, framePointer, buffer_size, &jls_params);`
		`+ + JLS_ERROR err = JpegLsEncode(compressed_buffer, compressed_buffer_size, &bytesWritten, framePointer, buffer_size, &jls_params);`
		`+ result = DJLSError::convert(err);`
		`+`
		`+ if (result.good())`

dcmtk.spec

file modified

+10 -5

		`@@ -1,10 +1,10 @@`
		`Name: dcmtk`
		`Summary: Offis DICOM Toolkit (DCMTK)`
		`- Version: 3.6.1`
		`- Release: 8%{?dist}`
		`+ Version: 3.6.2`
		`+ Release: 1%{?dist}`
		`License: BSD`
		`Group: Development/Libraries`
		`- Source: http://dicom.offis.de/download/dcmtk/snapshot/dcmtk-3.6.1_20140617.tar.gz`
		`+ Source: http://dicom.offis.de/download/dcmtk/dcmtk362/dcmtk-3.6.2.tar.gz`
		`URL: http://dicom.offis.de/dcmtk.php.en`

		`Patch1: dcmtk-3.6.1-0001-Removed-reference-to-bundled-libcharls.patch`
		`@@ -12,6 +12,7 @@`
		`Patch3: dcmtk-3.6.1-0003-Create-FindCharLS.cmake.patch`
		`Patch4: dcmtk-3.6.1-0004-Use-cmake-suggested-location-for-CharLS.patch`
		`Patch5: dcmtk-3.6.0-0005-Fixed-includes-for-CharLS-1.0.patch`
		`+ Patch6: dcmtk-3.6.2-0006-libcharls-changed-api.patch`


		`BuildRequires: cmake`
		`@@ -20,7 +21,6 @@`
		`BuildRequires: libtiff-devel`
		`BuildRequires: libxml2-devel`
		`BuildRequires: openssl-devel`
		`- BuildRequires: tcp_wrappers-devel`
		`BuildRequires: zlib-devel`
		`BuildRequires: CharLS-devel`
		`BuildRequires: doxygen`
		`@@ -50,12 +50,13 @@`
		`this if you are developing programs that use the dcmtk libraries.`

		`%prep`
		`- %setup -q -n dcmtk-3.6.1_20140617`
		`+ %setup -q -n dcmtk-3.6.2`
		`%patch1 -p1`
		`%patch2 -p1`
		`%patch3 -p1`
		`%patch4 -p1`
		`%patch5 -p1`
		`+ %patch6 -p1`

		`#Remove bundled libraries`
		`rm -rf dcmjpls/libcharls/`
		`@@ -125,6 +126,10 @@`
		`%postun -p /sbin/ldconfig`

		`%changelog`
		`+ * Sun Dec 10 2017 Jens Lody <fedora@jenslody.de> - 3.6.2-1`
		`+ - Update to 3.6.2, fixes rhbz #1440439.`
		`+ - Do not use deprecated tcp-wrappers, fixes rhbz #1518760.`
		`+`
		`* Sun Aug 06 2017 Björn Esser <besser82@fedoraproject.org> - 3.6.1-8`
		`- Rebuilt for AutoReq cmake-filesystem`

sources

file modified

+1 -2

		`@@ -1,2 +1,1 @@`
		`- 19409e039e29a330893caea98715390e dcmtk-3.6.0.tar.gz`
		`- e07652e18ec1a90b901b3976bb1e810e dcmtk-3.6.1_20140617.tar.gz`
		`+ SHA512 (dcmtk-3.6.2.tar.gz) = a3190287b068ae17984909dd9e8d920ddea3b590fc3888c42fc33fca4a3cdcf7dcc9bd64d994620303eef7c7ab7b4184ac21ebd1167ae2c17e4a88f641d7ef94`

jenslody commented 5 years ago

This pull-request updates the source to the stable 3.6.2 (newer than latest snapshot).
This fixes rhbz #1440439.
It also fixes rhbz #1518760 by removing the BR to the deprecated tcp_wrappers-devel.
Two patches are fixed for 3.6.2 one is added, due to a change in CharLS.
Builds on Rawhide, therefore also fixes the actual FTBFS'.

I need dcmtk as dependency of aeskulap, which I maintain.

Jens