From: Andreas Tille Date: Fri, 23 Apr 2021 08:37:31 +0000 (+0200) Subject: Remove patches thanks to a hint by Jörg Riesmeier (see #981326) X-Git-Tag: archive/raspbian/3.6.9-4+rpi1^2~135 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fe8bcbf5b07d6e80f1d498f88f44e0d14e8607d9;p=dcmtk.git Remove patches thanks to a hint by Jörg Riesmeier (see #981326) --- diff --git a/debian/changelog b/debian/changelog index 8b0b8c15..6eb5a564 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +dcmtk (3.6.6-1~ext2) UNRELEASED; urgency=medium + + * Team upload. + * Remove patches thanks to a hint by Jörg Riesmeier (see #981326) + + -- Andreas Tille Fri, 23 Apr 2021 10:36:47 +0200 + dcmtk (3.6.6-1~ext1) experimental; urgency=medium * d/ci: delete some generated files diff --git a/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch b/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch deleted file mode 100644 index 7d7ae7f8..00000000 --- a/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch +++ /dev/null @@ -1,147 +0,0 @@ -From 21142a1d3354b5d4e97a2e160221ae391362e8c1 Mon Sep 17 00:00:00 2001 -From: Jan Schlamelcher -Date: Fri, 4 Jul 2014 12:02:51 +0200 -Subject: [PATCH] Fixed OFoptional by introducing OFalign? ---- a/CMake/osconfig.h.in -+++ b/CMake/osconfig.h.in -@@ -1223,4 +1223,7 @@ - /* Define if the input iterator category is supported */ - #cmakedefine HAVE_CONTIGUOUS_ITERATOR_CATEGORY @HAVE_CONTIGUOUS_ITERATOR_CATEGORY@ - -+/* Define if the compiler supports __declspec(align) */ -+#cmakedefine HAVE_DECLSPEC_ALIGN -+ - #endif /* !OSCONFIG_H*/ ---- a/config/aclocal.m4 -+++ b/config/aclocal.m4 -@@ -1985,6 +1985,47 @@ - fi - ]) - -+AC_DEFUN([AC_CHECK_ALIGNOF], -+[ -+ AC_MSG_CHECKING([for __alignof__]) -+ AC_LINK_IFELSE( -+ [ -+ AC_LANG_SOURCE( -+ [ -+ int main(){char c[__alignof__(int)];return 0;} -+ ]) -+ ], -+ [dcmtk_have_alignof=[yes]], -+ [dcmtk_have_alignof=[no]] -+ ) -+ if test "$dcmtk_have_alignof" = yes; then -+ AC_MSG_RESULT([yes]) -+ AC_DEFINE($1,[1],[Define if __alignof__ is available]) -+ else -+ AC_MSG_RESULT([no]) -+ fi -+]) -+ -+AC_DEFUN([AC_CHECK_ATTRIBUTE_ALIGNED], -+[ -+ AC_MSG_CHECKING([for __attribute__((aligned))]) -+ AC_LINK_IFELSE( -+ [ -+ AC_LANG_SOURCE( -+ [ -+ int main(){__attribute__((aligned(4))) char c[16];return 0;} -+ ]) -+ ], -+ [dcmtk_have_attribute_aligned=[yes]], -+ [dcmtk_have_attribute_aligned=[no]] -+ ) -+ if test "$dcmtk_have_attribute_aligned" = yes; then -+ AC_MSG_RESULT([yes]) -+ AC_DEFINE($1,[1],[Define if __attribute__((aligned)) is available]) -+ else -+ AC_MSG_RESULT([no]) -+ fi -+]) - - dnl - dnl This macro checks if a given preprocessor symbol exists and is a string ---- a/config/configure -+++ b/config/configure -@@ -17103,6 +17103,66 @@ - - - -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __alignof__" >&5 -+$as_echo_n "checking for __alignof__... " >&6; } -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+ int main(){char c__alignof__(int);return 0;} -+ -+ -+_ACEOF -+if ac_fn_cxx_try_link "$LINENO"; then : -+ dcmtk_have_alignof=yes -+else -+ dcmtk_have_alignof=no -+ -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ if test "$dcmtk_have_alignof" = yes; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+ -+$as_echo "#define HAVE_GNU_ALIGNOF 1" >>confdefs.h -+ -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+ fi -+ -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__((aligned))" >&5 -+$as_echo_n "checking for __attribute__((aligned))... " >&6; } -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+ int main(){__attribute__((aligned(4))) char c16;return 0;} -+ -+ -+_ACEOF -+if ac_fn_cxx_try_link "$LINENO"; then : -+ dcmtk_have_attribute_aligned=yes -+else -+ dcmtk_have_attribute_aligned=no -+ -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ if test "$dcmtk_have_attribute_aligned" = yes; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+ -+$as_echo "#define HAVE_ATTRIBUTE_ALIGNED 1" >>confdefs.h -+ -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+ fi -+ -+ - CFLAGS="$DEBUGCFLAGS $CFLAGS" - CXXFLAGS="$DEBUGCXXFLAGS $CXXFLAGS" - ---- a/ofstd/tests/toption.cc -+++ b/ofstd/tests/toption.cc -@@ -38,6 +38,11 @@ - - OFoptional o0( 3 ), o1, o2( OFnullopt ); - -+ COUT << OFalignof(OFoptional) << ' ' << sizeof(OFoptional) << OFendl; -+ COUT << OFalignof(OFoptional) << ' ' << sizeof(OFoptional) << OFendl; -+ COUT << OFalignof(OFoptional) << ' ' << sizeof(OFoptional) << OFendl; -+ COUT << OFalignof(long) << ' ' << sizeof(long) << ' ' << OFalignof(OFoptional) << ' ' << sizeof(OFoptional) << OFendl; -+ - OFCHECK( o0 && *o0 == 3 ); - - OFCHECK( !o1 && !o2 ); diff --git a/debian/patches/05_performance.patch b/debian/patches/05_performance.patch deleted file mode 100644 index 218b95c8..00000000 --- a/debian/patches/05_performance.patch +++ /dev/null @@ -1,27 +0,0 @@ -Description: Fix a DCMTK performance problem - Forwarded-Upstream: yes -Bug-Debian: https://bugs.debian.org/785400 -Author: Sebastien Jodogne -Last-Update: Fri, 15 May 2015 16:39:01 UTC ---- a/dcmnet/libsrc/dul.cc -+++ b/dcmnet/libsrc/dul.cc -@@ -1913,7 +1913,7 @@ - msg += OFStandard::getLastNetworkErrorCode().message(); - return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str()); - } -- setTCPBufferLength(sock); -+ //setTCPBufferLength(sock); - - /* - * Disable the so-called Nagle algorithm (if requested). ---- a/dcmnet/libsrc/dulfsm.cc -+++ b/dcmnet/libsrc/dulfsm.cc -@@ -2476,7 +2476,7 @@ - msg += OFStandard::getLastNetworkErrorCode().message(); - return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str()); - } -- setTCPBufferLength(s); -+ //setTCPBufferLength(s); - - /* - * Disable the so-called Nagle algorithm (if requested). diff --git a/debian/patches/series b/debian/patches/series index 2a9c1f80..419b8202 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,4 @@ 01_dcmtk_3.6.0-1.patch 03_datadic_install.patch -04_Fixed-OFoptional-by-introducing-OFalign.patch -05_performance.patch 07_dont_export_all_executables.patch