PR#6: Readd gdcm-2.8.8-dont_use_EOF.patch and disable Documentation temporarily to allow to build in rawhide - rpms/gdcm

rpms / gdcm

#6 Readd gdcm-2.8.8-dont_use_EOF.patch and disable Documentation temporarily to allow to build in rawhide

Merged 4 years ago by ankursinha. Opened 4 years ago by sergiomb.

Unknown source master into master

Readd gdcm-2.8.8-dont_use_EOF.patch and disable Documentation

Sérgio M. Basto • 4 years ago

64bd724

gdcm-2.8.8-dont_use_EOF.patch

file added

+41

		`@@ -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 <iostream>`
		`+`
		`+ #include <string.h> // strlen`
		`+ -#include <stdio.h> // 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<EOF,64,0> s3 = "coucou";`
		`+ + gdcm::String<'\0',64,0> s3 = "coucou";`
		`+ std::cout << s3.c_str() << " -> " << s3.size() << std::endl;`
		`+`
		`+ - gdcm::String<EOF,64,0> s4 = "coucou!";`
		`+ + gdcm::String<'\0',64,0> s4 = "coucou!";`
		`+ std::cout << s4.c_str() << " -> " << s4.size() << std::endl;`
		`+`
		`+ const char *s = "coucou!";`
		`+ - gdcm::String<EOF,64,0> 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<EOF,64,0> s6( ss );`
		`+ + gdcm::String<'\0',64,0> s6( ss );`
		`+ std::cout << s6.c_str() << " -> " << s6.size() << std::endl;`
		`+`
		`+ - gdcm::String<EOF,64,0> s7( ss, 1, 5 );`
		`+ + gdcm::String<'\0',64,0> s7( ss, 1, 5 );`
		`+ std::cout << s7.c_str() << " -> " << s7.size() << std::endl;`
		`+`
		`+ - gdcm::String<EOF,64,0> s8( ss, 1, 6 );`
		`+ + gdcm::String<'\0',64,0> s8( ss, 1, 6 );`
		`+ std::cout << s8.c_str() << " -> " << s8.size() << std::endl;`
		`+`
		`+ return 0;`

gdcm.spec

file modified

+3 -2

		`@@ -12,6 +12,7 @@`
		`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 @@`
		`-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 @@`
		`%exclude %{_docdir}/%{name}/Examples/`

		`%files doc`
		`- %doc %{_docdir}/%{name}/html/`
		`+ #doc %{_docdir}/%{name}/html/`

		`%files applications`
		`%{_bindir}/gdcmanon`