From 64bd724cd465593c316d5a9b56e2090c31cb3307 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 14 Sep 2019 05:03:10 +0100 Subject: [PATCH] Readd gdcm-2.8.8-dont_use_EOF.patch and disable Documentation temporarily to allow to build in rawhide --- gdcm-2.8.8-dont_use_EOF.patch | 41 +++++++++++++++++++++++++++++++++++ gdcm.spec | 5 +++-- 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 gdcm-2.8.8-dont_use_EOF.patch diff --git a/gdcm-2.8.8-dont_use_EOF.patch b/gdcm-2.8.8-dont_use_EOF.patch new file mode 100644 index 0000000..d915674 --- /dev/null +++ b/gdcm-2.8.8-dont_use_EOF.patch @@ -0,0 +1,41 @@ +--- ./Testing/Source/Common/Cxx/TestString2.cxx.orig 2019-02-26 22:01:26.738230841 +0000 ++++ ./Testing/Source/Common/Cxx/TestString2.cxx 2019-02-26 22:59:07.751826144 +0000 +@@ -16,7 +16,6 @@ + #include + + #include // strlen +-#include // EOF + + int TestString2(int , char *[]) + { +@@ -26,24 +25,24 @@ int TestString2(int , char *[]) + gdcm::String<> s2 = "coucou!"; + std::cout << s2 << " -> " << s2.size() << std::endl; + +- gdcm::String s3 = "coucou"; ++ gdcm::String<'\0',64,0> s3 = "coucou"; + std::cout << s3.c_str() << " -> " << s3.size() << std::endl; + +- gdcm::String s4 = "coucou!"; ++ gdcm::String<'\0',64,0> s4 = "coucou!"; + std::cout << s4.c_str() << " -> " << s4.size() << std::endl; + + const char *s = "coucou!"; +- gdcm::String s5( s, strlen(s) ); ++ gdcm::String<'\0',64,0> s5( s, strlen(s) ); + std::cout << s5.c_str() << " -> " << s5.size() << std::endl; + + std::string ss = "coucou!"; +- gdcm::String s6( ss ); ++ gdcm::String<'\0',64,0> s6( ss ); + std::cout << s6.c_str() << " -> " << s6.size() << std::endl; + +- gdcm::String s7( ss, 1, 5 ); ++ gdcm::String<'\0',64,0> s7( ss, 1, 5 ); + std::cout << s7.c_str() << " -> " << s7.size() << std::endl; + +- gdcm::String s8( ss, 1, 6 ); ++ gdcm::String<'\0',64,0> s8( ss, 1, 6 ); + std::cout << s8.c_str() << " -> " << s8.size() << std::endl; + + return 0; diff --git a/gdcm.spec b/gdcm.spec index 1f306ca..d248023 100644 --- a/gdcm.spec +++ b/gdcm.spec @@ -12,6 +12,7 @@ Source0: https://github.com/malaterre/%{name}/archive/v%{version}/%{name}-%{v Source1: http://downloads.sourceforge.net/project/gdcm/gdcmData/gdcmData/gdcmData.tar.gz Patch1: 0001-3.0.1-Use-copyright.patch +Patch2: gdcm-2.8.8-dont_use_EOF.patch BuildRequires: CharLS-devel >= 2.0 BuildRequires: cmake @@ -145,7 +146,7 @@ pushd %{_target_platform} -DGDCM_BUILD_TESTING:BOOL=ON \ -DGDCM_DATA_ROOT=../gdcmData/ \ -DGDCM_BUILD_EXAMPLES:BOOL=OFF \ - -DGDCM_DOCUMENTATION:BOOL=ON \ + -DGDCM_DOCUMENTATION:BOOL=OFF \ -DGDCM_WRAP_PYTHON:BOOL=ON \ -DPYTHON_EXECUTABLE=%{__python3} \ -DGDCM_INSTALL_PYTHONMODULE_DIR=%{python3_sitearch} \ @@ -221,7 +222,7 @@ make test -C %{_target_platform} || exit 0 %exclude %{_docdir}/%{name}/Examples/ %files doc -%doc %{_docdir}/%{name}/html/ +#doc %{_docdir}/%{name}/html/ %files applications %{_bindir}/gdcmanon