[med-svn] [Git][med-team/dcmtk][master] 2 commits: d/patches: Fix compilation of dicomscope. Closes: #1000220
Mathieu Malaterre (@malat)
gitlab at salsa.debian.org
Tue Nov 23 07:28:01 GMT 2021
Mathieu Malaterre pushed to branch master at Debian Med / dcmtk
Commits:
48c24b0f by Mathieu Malaterre at 2021-11-23T08:14:00+01:00
d/patches: Fix compilation of dicomscope. Closes: #1000220
- - - - -
54e57226 by Mathieu Malaterre at 2021-11-23T08:14:55+01:00
d/control: Add myself as Uploader
Also run wrap-and-sort for consistency
- - - - -
6 changed files:
- debian/control
- debian/copyright
- debian/dcmtk.install
- debian/libdcmtk-dev.install
- + debian/patches/bug1000220.patch
- debian/patches/series
Changes:
=====================================
debian/control
=====================================
@@ -1,10 +1,11 @@
Source: dcmtk
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Gert Wollny <gewo at debian.org>
+Uploaders: Gert Wollny <gewo at debian.org>, Mathieu Malaterre <malat at debian.org>
Section: science
Priority: optional
Build-Depends: cmake,
debhelper-compat (= 13),
+ gettext,
help2man,
libpng-dev,
libsndfile1-dev,
@@ -12,10 +13,8 @@ Build-Depends: cmake,
libtiff-dev,
libwrap0-dev,
libxml2-dev,
- gettext,
zlib1g-dev
-Build-Depends-Indep: doxygen,
- graphviz
+Build-Depends-Indep: doxygen, graphviz
Standards-Version: 4.5.0
Vcs-Browser: https://salsa.debian.org/med-team/dcmtk
Vcs-Git: https://salsa.debian.org/med-team/dcmtk.git
@@ -23,9 +22,7 @@ Homepage: http://dicom.offis.de/dcmtk
Package: dcmtk
Architecture: any
-Depends: adduser,
- ${misc:Depends},
- ${shlibs:Depends}
+Depends: adduser, ${misc:Depends}, ${shlibs:Depends}
Description: OFFIS DICOM toolkit command line utilities
DCMTK includes a collection of libraries and applications for examining,
constructing and converting DICOM image files, handling offline media,
@@ -39,12 +36,9 @@ Description: OFFIS DICOM toolkit command line utilities
Package: libdcmtk16
Architecture: any
Section: libs
-Depends: ${misc:Depends},
- ${shlibs:Depends}
-Conflicts: libdcmtk4,
- libdcmtk3
-Replaces: libdcmtk4,
- libdcmtk3
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Conflicts: libdcmtk3, libdcmtk4
+Replaces: libdcmtk3, libdcmtk4
Description: OFFIS DICOM toolkit runtime libraries
DCMTK includes a collection of libraries and applications for examining,
constructing and converting DICOM image files, handling offline media,
@@ -59,20 +53,18 @@ Description: OFFIS DICOM toolkit runtime libraries
Package: libdcmtk-dev
Architecture: any
Section: libdevel
-Depends: libxml2-dev,
- libssl-dev,
+Depends: libdcmtk16 (= ${binary:Version}),
libpng-dev,
- libwrap0-dev,
+ libssl-dev,
libtiff-dev,
- libdcmtk16 (= ${binary:Version}),
+ libwrap0-dev,
+ libxml2-dev,
${misc:Depends}
Suggests: dcmtk-doc
Breaks: libinsighttoolkit4-dev (<< 4.9.0)
-Conflicts: libdcmtk2-dev,
- libdcmtk4-dev
+Conflicts: libdcmtk2-dev, libdcmtk4-dev
Provides: libdcmtk2-dev
-Replaces: libdcmtk2-dev,
- libdcmtk4-dev
+Replaces: libdcmtk2-dev, libdcmtk4-dev
Description: OFFIS DICOM toolkit development libraries and headers
DCMTK includes a collection of libraries and applications for examining,
constructing and converting DICOM image files, handling offline media,
@@ -89,8 +81,7 @@ Package: dcmtk-doc
Architecture: all
Section: doc
Depends: ${misc:Depends}
-Suggests: dcmtk,
- libdcmtk-dev
+Suggests: dcmtk, libdcmtk-dev
Description: OFFIS DICOM toolkit documentation
DCMTK includes a collection of libraries and applications for examining,
constructing and converting DICOM image files, handling offline media,
=====================================
debian/copyright
=====================================
@@ -335,7 +335,7 @@ License: GPL-2.0+
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
- along with this library; see the file COPYING, if not, see
+ along with this library; see the file COPYING, if not, see
<http://www.gnu.org/licenses/>.
.
On Debian systems, the complete text of the GNU General Public License
@@ -481,8 +481,8 @@ License: Apache-2.0
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- .
- On Debian GNU/Linux systems you can find this license under
+ .
+ On Debian GNU/Linux systems you can find this license under
/usr/share/common-licenses/Apache-2.0
License: BSD-3-clause
=====================================
debian/dcmtk.install
=====================================
@@ -1,7 +1,7 @@
-usr/bin/*
etc/dcmtk/*
+usr/bin/*
usr/share/dcmtk/*.css
usr/share/dcmtk/*.lut
-usr/share/dcmtk/dsr2xml.xsd
usr/share/dcmtk/dcm2xml.dtd
+usr/share/dcmtk/dsr2xml.xsd
usr/share/dcmtk/dumppat.txt
=====================================
debian/libdcmtk-dev.install
=====================================
@@ -1,4 +1,3 @@
usr/include/dcmtk/*
usr/lib/*/*.so
usr/lib/*/cmake/
-
=====================================
debian/patches/bug1000220.patch
=====================================
@@ -0,0 +1,44 @@
+From 8f6c9ba05eb146310a6325fb8ab18dfb14c1a291 Mon Sep 17 00:00:00 2001
+From: Joerg Riesmeier <dicom at jriesmeier.com>
+Date: Mon, 22 Nov 2021 18:54:35 +0100
+Subject: [PATCH] Replaced OFListIterator by OFListConstIterator.
+
+Replaced type of iterator variable to OFListConstIterator to avoid
+compiler errors reported by gcc when compiling DICOMscope with STL
+and C++14 support enabled.
+
+Thanks to GitHub user "malaterre" for the report and suggested fix.
+---
+ dcmsr/include/dcmtk/dcmsr/dsrtlist.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/dcmsr/include/dcmtk/dcmsr/dsrtlist.h b/dcmsr/include/dcmtk/dcmsr/dsrtlist.h
+index 5ec109aca..31759b851 100644
+--- a/dcmsr/include/dcmtk/dcmsr/dsrtlist.h
++++ b/dcmsr/include/dcmtk/dcmsr/dsrtlist.h
+@@ -1,6 +1,6 @@
+ /*
+ *
+- * Copyright (C) 2000-2018, OFFIS e.V.
++ * Copyright (C) 2000-2021, OFFIS e.V.
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation were developed by
+@@ -282,7 +282,7 @@ template<class T> class DSRListOfItems
+ ItemList.push_back(item);
+ result = EC_Normal;
+ } else {
+- OFLIST_TYPENAME OFListIterator(T) iterator = ItemList.begin();
++ OFLIST_TYPENAME OFListConstIterator(T) iterator = ItemList.begin();
+ if (gotoItemPos(idx, iterator))
+ {
+ ItemList.insert(iterator, 1, item);
+@@ -299,7 +299,7 @@ template<class T> class DSRListOfItems
+ OFCondition removeItem(const size_t idx)
+ {
+ OFCondition result = EC_IllegalParameter;
+- OFLIST_TYPENAME OFListIterator(T) iterator = ItemList.begin();
++ OFLIST_TYPENAME OFListConstIterator(T) iterator = ItemList.begin();
+ if (gotoItemPos(idx, iterator))
+ {
+ ItemList.erase(iterator);
=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@
03_datadic_install.patch
07_dont_export_all_executables.patch
bigendian.patch
+bug1000220.patch
View it on GitLab: https://salsa.debian.org/med-team/dcmtk/-/compare/411da1f25057c6c13817e6fc3101aabbf59ecbb4...54e57226ab277c0ff4d1d9ff6855e7156f944da3
--
View it on GitLab: https://salsa.debian.org/med-team/dcmtk/-/compare/411da1f25057c6c13817e6fc3101aabbf59ecbb4...54e57226ab277c0ff4d1d9ff6855e7156f944da3
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20211123/65ee6dc1/attachment-0001.htm>
More information about the debian-med-commit
mailing list