commit gdcm for openSUSE:Factory
Hello community,
here is the log from the commit of package gdcm for openSUSE:Factory checked in
at 2020-11-05 21:56:14
Comparing /work/SRC/openSUSE:Factory/gdcm (Old)
and /work/SRC/openSUSE:Factory/.gdcm.new.11331 (New)
Package is "gdcm"
Thu Nov 5 21:56:14 2020 rev:8 rq:846269 version:3.0.8
Changes:
--- /work/SRC/openSUSE:Factory/gdcm/gdcm.changes2020-10-20
16:14:25.214123718 +0200
+++ /work/SRC/openSUSE:Factory/.gdcm.new.11331/gdcm.changes 2020-11-05
21:56:40.187948121 +0100
@@ -1,0 +2,12 @@
+Thu Nov 5 09:38:14 UTC 2020 - Axel Braun
+
+- typo corrected: fix_charls_2.patch removed
+
+---
+Tue Nov 3 15:45:11 UTC 2020 - Axel Braun
+
+- fixed build system
+ fix_charls2_patch removed
+ 0001-Fix-build-with-CharLS-2.1.0.patch added
+
+---
Old:
fix_charls_2.patch
New:
0001-Fix-build-with-CharLS-2.1.0.patch
Other differences:
--
++ gdcm.spec ++
--- /var/tmp/diff_new_pack.icQHss/_old 2020-11-05 21:56:40.739946880 +0100
+++ /var/tmp/diff_new_pack.icQHss/_new 2020-11-05 21:56:40.739946880 +0100
@@ -27,8 +27,8 @@
Group: Productivity/Graphics/Other
URL:http://gdcm.sourceforge.net/wiki/index.php/Main_Page
Source0:
http://sourceforge.net/projects/gdcm/files/gdcm%203.x/GDCM%20%{version}/%{name}-%{version}.tar.bz2
-Patch1: gdcm-2.4.0-usecopyright.patch
-Patch2: fix_charls_2.patch
+Patch1: 0001-Fix-build-with-CharLS-2.1.0.patch
+Patch2: gdcm-2.4.0-usecopyright.patch
BuildRequires: CharLS-devel >= 2.0
BuildRequires: cmake
BuildRequires: docbook5-xsl-stylesheets
++ 0001-Fix-build-with-CharLS-2.1.0.patch ++
>From a979663a2cece68f5e42e5271a4bd9966cfe502a Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux
Date: Tue, 3 Nov 2020 16:03:42 +0100
Subject: [PATCH] Fix build with CharLS 2.1.0
The gdcm build system has multiple issues that prevented finding
charls 2.1.0 but also didn't report failures correctly.
It then also failed to build due to an #include statement
wrongly assuming the charls directory casing.
---
CMake/FindCharLS.cmake | 42 ++--
Utilities/gdcm_charls.h | 2 +-
3 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/CMake/FindCharLS.cmake b/CMake/FindCharLS.cmake
index 8f6bf19..a0ea08b 100644
--- a/CMake/FindCharLS.cmake
+++ b/CMake/FindCharLS.cmake
@@ -6,35 +6,31 @@
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
-find_path(CHARLS_INCLUDE_DIR CharLS/charls.h
-/usr/local/include
-/usr/include
+find_path(CHARLS_INCLUDE_DIR charls.h
+ PATH_SUFFIXES
+CharLS
+charls
)
find_library(CHARLS_LIBRARY
- NAMES CharLS
- PATHS /usr/lib /usr/local/lib
- )
+ NAMES CharLS charls
+)
+
+include(FindPackageHandleStandardArgs)
-if (CHARLS_LIBRARY AND CHARLS_INCLUDE_DIR)
-set(CHARLS_LIBRARIES${CHARLS_LIBRARY})
-set(CHARLS_INCLUDE_DIRS ${CHARLS_INCLUDE_DIR})
-set(CHARLS_FOUND "YES")
-else ()
- set(CHARLS_FOUND "NO")
-endif ()
+find_package_handle_standard_args(CharLS
+ FOUND_VAR CharLS_FOUND
+ REQUIRED_VARS CHARLS_INCLUDE_DIR CHARLS_LIBRARY
+)
-if (CHARLS_FOUND)
- if (NOT CHARLS_FIND_QUIETLY)
- message(STATUS "Found CHARLS: ${CHARLS_LIBRARIES}")
- endif ()
-else ()
- if (CHARLS_FIND_REQUIRED)
- message(FATAL_ERROR "Could not find CHARLS library")
- endif ()
-endif ()
+# Legacy compatibility variables
+set(CHARLS_FOUND ${CharLS_FOUND})
+set(CHARLS_LIBRARIES ${CHARLS_LIBRARY})
+set(CHARLS_INCLUDE_DIRS ${CHARLS_INCLUDE_DIR})
mark_as_advanced(
CHARLS_LIBRARY
CHARLS_INCLUDE_DIR
- )
+ CHARLS_LIBRARIES
+ CHARLS_INCLUDE_DIRS
+)
diff --git a/Utilities/gdcm_charls.h b/Utilities/gdcm_charls.h
index b80451c..bdb108f 100644
--- a/Utilities/gdcm_charls.h
+++ b/Utilities/gdcm_charls.h
@@ -18,7 +18,7 @@
#include "gdcmTypes.h"
#ifdef GDCM_USE_SYSTEM_CHARLS
// It is expected that version 2.0.0 is used
-# include
+# include
#else
#include "gdcmcharls/charls.h"
#endif
--
2.29.1
commit gdcm for openSUSE:Factory
Hello community, here is the log from the commit of package gdcm for openSUSE:Factory checked in at 2020-10-20 16:05:26 Comparing /work/SRC/openSUSE:Factory/gdcm (Old) and /work/SRC/openSUSE:Factory/.gdcm.new.3486 (New) Package is "gdcm" Tue Oct 20 16:05:26 2020 rev:7 rq:842383 version:3.0.8 Changes: --- /work/SRC/openSUSE:Factory/gdcm/gdcm.changes2020-07-03 00:15:39.760712300 +0200 +++ /work/SRC/openSUSE:Factory/.gdcm.new.3486/gdcm.changes 2020-10-20 16:14:25.214123718 +0200 @@ -1,0 +2,6 @@ +Sat Oct 17 12:29:26 UTC 2020 - Axel Braun + +- version 3.0.8 + * Fix TestScanner1 test + +--- Old: gdcm-3.0.7.tar.bz2 New: gdcm-3.0.8.tar.bz2 Other differences: -- ++ gdcm.spec ++ --- /var/tmp/diff_new_pack.g2hu5D/_old 2020-10-20 16:14:29.090125554 +0200 +++ /var/tmp/diff_new_pack.g2hu5D/_new 2020-10-20 16:14:29.094125556 +0200 @@ -20,7 +20,7 @@ %define soname 3_0 %define libsocksoname libsocketxx1_2 Name: gdcm -Version:3.0.7 +Version:3.0.8 Release:0 Summary:Grassroots DiCoM is a C++ library to parse DICOM medical files License:BSD-3-Clause ++ gdcm-3.0.7.tar.bz2 -> gdcm-3.0.8.tar.bz2 ++ 2883 lines of diff (skipped)
commit gdcm for openSUSE:Factory
Hello community,
here is the log from the commit of package gdcm for openSUSE:Factory checked in
at 2020-07-03 00:12:18
Comparing /work/SRC/openSUSE:Factory/gdcm (Old)
and /work/SRC/openSUSE:Factory/.gdcm.new.3060 (New)
Package is "gdcm"
Fri Jul 3 00:12:18 2020 rev:6 rq:818300 version:3.0.7
Changes:
--- /work/SRC/openSUSE:Factory/gdcm/gdcm.changes2020-06-15
20:30:23.794350628 +0200
+++ /work/SRC/openSUSE:Factory/.gdcm.new.3060/gdcm.changes 2020-07-03
00:15:39.760712300 +0200
@@ -1,0 +2,7 @@
+Tue Jun 30 17:00:33 UTC 2020 - Axel Braun
+
+- version 3.0.7
+ * no changelog available
+ * gdcm-2.8.8-dont_use_EOF.patch removed (included in 3.0.7)
+
+---
Old:
gdcm-2.8.8-dont_use_EOF.patch
gdcm-3.0.6.tar.bz2
New:
gdcm-3.0.7.tar.bz2
Other differences:
--
++ gdcm.spec ++
--- /var/tmp/diff_new_pack.0EMwHu/_old 2020-07-03 00:15:43.408724400 +0200
+++ /var/tmp/diff_new_pack.0EMwHu/_new 2020-07-03 00:15:43.416724427 +0200
@@ -20,7 +20,7 @@
%define soname 3_0
%define libsocksoname libsocketxx1_2
Name: gdcm
-Version:3.0.6
+Version:3.0.7
Release:0
Summary:Grassroots DiCoM is a C++ library to parse DICOM medical files
License:BSD-3-Clause
@@ -29,7 +29,6 @@
Source0:
http://sourceforge.net/projects/gdcm/files/gdcm%203.x/GDCM%20%{version}/%{name}-%{version}.tar.bz2
Patch1: gdcm-2.4.0-usecopyright.patch
Patch2: fix_charls_2.patch
-Patch3: gdcm-2.8.8-dont_use_EOF.patch
BuildRequires: CharLS-devel >= 2.0
BuildRequires: cmake
BuildRequires: docbook5-xsl-stylesheets
++ gdcm-3.0.6.tar.bz2 -> gdcm-3.0.7.tar.bz2 ++
3373 lines of diff (skipped)
commit gdcm for openSUSE:Factory
Hello community,
here is the log from the commit of package gdcm for openSUSE:Factory checked in
at 2020-06-15 20:29:57
Comparing /work/SRC/openSUSE:Factory/gdcm (Old)
and /work/SRC/openSUSE:Factory/.gdcm.new.3606 (New)
Package is "gdcm"
Mon Jun 15 20:29:57 2020 rev:5 rq:814644 version:3.0.6
Changes:
--- /work/SRC/openSUSE:Factory/gdcm/gdcm.changes2020-06-10
00:48:55.907025919 +0200
+++ /work/SRC/openSUSE:Factory/.gdcm.new.3606/gdcm.changes 2020-06-15
20:30:23.794350628 +0200
@@ -1,0 +2,7 @@
+Tue Jun 9 15:31:56 UTC 2020 - Axel Braun
+
+- version 3.0.6
+ * no changelog available
+ * poppler_api.patch removed (included in source)
+
+---
@@ -16 +23 @@
-- poppler_api.patch added to fix API changes in poppler
+- poppler_api.patch added to fix API changes in poppler in TW
Old:
gdcm-3.0.5.tar.bz2
poppler_api.patch
New:
gdcm-3.0.6.tar.bz2
Other differences:
--
++ gdcm.spec ++
--- /var/tmp/diff_new_pack.BLUebw/_old 2020-06-15 20:30:26.382359594 +0200
+++ /var/tmp/diff_new_pack.BLUebw/_new 2020-06-15 20:30:26.386359607 +0200
@@ -1,8 +1,8 @@
#
# spec file for package gdcm
#
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
-# Copyright (c) 2019 Dr. Axel Braun
+# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2019-2020 Dr. Axel Braun
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
%define soname 3_0
%define libsocksoname libsocketxx1_2
Name: gdcm
-Version:3.0.5
+Version:3.0.6
Release:0
Summary:Grassroots DiCoM is a C++ library to parse DICOM medical files
License:BSD-3-Clause
@@ -29,8 +29,7 @@
Source0:
http://sourceforge.net/projects/gdcm/files/gdcm%203.x/GDCM%20%{version}/%{name}-%{version}.tar.bz2
Patch1: gdcm-2.4.0-usecopyright.patch
Patch2: fix_charls_2.patch
-Patch3: poppler_api.patch
-Patch4: gdcm-2.8.8-dont_use_EOF.patch
+Patch3: gdcm-2.8.8-dont_use_EOF.patch
BuildRequires: CharLS-devel >= 2.0
BuildRequires: cmake
BuildRequires: docbook5-xsl-stylesheets
++ fix_charls_2.patch ++
--- /var/tmp/diff_new_pack.BLUebw/_old 2020-06-15 20:30:26.414359705 +0200
+++ /var/tmp/diff_new_pack.BLUebw/_new 2020-06-15 20:30:26.414359705 +0200
@@ -5,7 +5,7 @@
diff -ur gdcm/CMakeLists.txt gdcm-2.8.8/CMakeLists.txt
--- gdcm/CMakeLists.txt2019-01-13 08:57:04.807970487 +0100
+++ gdcm-2.8.8/CMakeLists.txt 2019-01-13 08:51:36.459974494 +0100
-@@ -358,7 +358,7 @@
+@@ -357,7 +357,7 @@
if(GDCM_USE_SYSTEM_CHARLS)
find_package(CharLS 2.0.0 REQUIRED)
++ gdcm-3.0.5.tar.bz2 -> gdcm-3.0.6.tar.bz2 ++
2708 lines of diff (skipped)
commit gdcm for openSUSE:Factory
Hello community,
here is the log from the commit of package gdcm for openSUSE:Factory checked in
at 2020-06-10 00:48:49
Comparing /work/SRC/openSUSE:Factory/gdcm (Old)
and /work/SRC/openSUSE:Factory/.gdcm.new.3606 (New)
Package is "gdcm"
Wed Jun 10 00:48:49 2020 rev:4 rq:812770 version:3.0.5
Changes:
--- /work/SRC/openSUSE:Factory/gdcm/gdcm.changes2020-04-15
19:54:59.285612331 +0200
+++ /work/SRC/openSUSE:Factory/.gdcm.new.3606/gdcm.changes 2020-06-10
00:48:55.907025919 +0200
@@ -1,0 +2,6 @@
+Mon Jun 8 18:55:02 UTC 2020 - Guillaume GARDET
+
+- Add patch to fix build on aarch64:
+ * gdcm-2.8.8-dont_use_EOF.patch
+
+---
New:
gdcm-2.8.8-dont_use_EOF.patch
Other differences:
--
++ gdcm.spec ++
--- /var/tmp/diff_new_pack.y4Ufev/_old 2020-06-10 00:48:57.159029194 +0200
+++ /var/tmp/diff_new_pack.y4Ufev/_new 2020-06-10 00:48:57.163029205 +0200
@@ -1,7 +1,7 @@
#
# spec file for package gdcm
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 Dr. Axel Braun
#
# All modifications and additions to the file contributed by third parties
@@ -30,6 +30,7 @@
Patch1: gdcm-2.4.0-usecopyright.patch
Patch2: fix_charls_2.patch
Patch3: poppler_api.patch
+Patch4: gdcm-2.8.8-dont_use_EOF.patch
BuildRequires: CharLS-devel >= 2.0
BuildRequires: cmake
BuildRequires: docbook5-xsl-stylesheets
++ gdcm-2.8.8-dont_use_EOF.patch ++
--- ./Testing/Source/Common/Cxx/TestString2.cxx.orig2019-02-26
22:01:26.738230841 +
+++ ./Testing/Source/Common/Cxx/TestString2.cxx 2019-02-26 22:59:07.751826144
+
@@ -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;
commit gdcm for openSUSE:Factory
Hello community,
here is the log from the commit of package gdcm for openSUSE:Factory checked in
at 2020-04-15 19:54:51
Comparing /work/SRC/openSUSE:Factory/gdcm (Old)
and /work/SRC/openSUSE:Factory/.gdcm.new.2738 (New)
Package is "gdcm"
Wed Apr 15 19:54:51 2020 rev:3 rq:793956 version:3.0.5
Changes:
--- /work/SRC/openSUSE:Factory/gdcm/gdcm.changes2020-03-30
23:02:40.284151497 +0200
+++ /work/SRC/openSUSE:Factory/.gdcm.new.2738/gdcm.changes 2020-04-15
19:54:59.285612331 +0200
@@ -1,0 +2,6 @@
+Tue Apr 14 18:59:21 UTC 2020 - Ismail Dönmez
+
+- Update poppler_api.patch to make UnicodeMap* const.
+- Compile with -fpermissive so that this works on Leap 15.2 too
+
+---
Other differences:
--
++ gdcm.spec ++
--- /var/tmp/diff_new_pack.rUpYmj/_old 2020-04-15 19:55:01.517613337 +0200
+++ /var/tmp/diff_new_pack.rUpYmj/_new 2020-04-15 19:55:01.517613337 +0200
@@ -135,6 +135,7 @@
%build
%cmake .. \
+-DCMAKE_CXX_FLAGS="%{optflags} -fpermissive" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DGDCM_INSTALL_PACKAGE_DIR=%{_libdir}/cmake/%{name} \
-DGDCM_INSTALL_INCLUDE_DIR=%{_includedir}/%{name} \
++ poppler_api.patch ++
--- /var/tmp/diff_new_pack.rUpYmj/_old 2020-04-15 19:55:01.553613353 +0200
+++ /var/tmp/diff_new_pack.rUpYmj/_new 2020-04-15 19:55:01.553613353 +0200
@@ -1,10 +1,25 @@
# Patch to fix new poppler API on gdcm 3.0.5
# Axel Braun
-diff -U 3 -dHrN -- a/Applications/Cxx/gdcminfo.cxx
b/Applications/Cxx/gdcminfo.cxx
a/Applications/Cxx/gdcminfo.cxx2020-02-18 14:11:04.0 +0100
-+++ b/Applications/Cxx/gdcminfo.cxx2020-03-29 15:00:39.398419657 +0200
-@@ -513,7 +513,7 @@
+Index: gdcm-3.0.5/Applications/Cxx/gdcminfo.cxx
+===
+--- gdcm-3.0.5.orig/Applications/Cxx/gdcminfo.cxx
gdcm-3.0.5/Applications/Cxx/gdcminfo.cxx
+@@ -258,7 +258,7 @@ static std::string getInfoDate(Dict *inf
+ return out;
+ }
+
+-static std::string getInfoString(Dict *infoDict, const char *key, UnicodeMap
*uMap)
++static std::string getInfoString(Dict *infoDict, const char *key, const
UnicodeMap *uMap)
+ {
+ Object obj;
+ #ifdef LIBPOPPLER_GOOSTRING_HAS_CONSTGETCHAR
+@@ -509,11 +509,11 @@ static int ProcessOneFile( std::string c
+ std::string creationdate;
+ std::string moddate;
+
+-UnicodeMap *uMap;
++const UnicodeMap *uMap;
#ifdef LIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM
globalParams = new GlobalParams(0);
#else
@@ -13,10 +28,27 @@
#endif
uMap = globalParams->getTextEncoding();
-diff -U 3 -dHrN -- a/Applications/Cxx/gdcmpdf.cxx
b/Applications/Cxx/gdcmpdf.cxx
a/Applications/Cxx/gdcmpdf.cxx 2020-02-18 14:11:04.0 +0100
-+++ b/Applications/Cxx/gdcmpdf.cxx 2020-03-29 14:52:23.374400551 +0200
-@@ -339,7 +339,7 @@
+Index: gdcm-3.0.5/Applications/Cxx/gdcmpdf.cxx
+===
+--- gdcm-3.0.5.orig/Applications/Cxx/gdcmpdf.cxx
gdcm-3.0.5/Applications/Cxx/gdcmpdf.cxx
+@@ -106,7 +106,7 @@ static std::string getInfoDate(Dict *inf
+ return out;
+ }
+
+-static std::string getInfoString(Dict *infoDict, const char *key, UnicodeMap
*uMap, bool & unicode)
++static std::string getInfoString(Dict *infoDict, const char *key, const
UnicodeMap *uMap, bool & unicode)
+ {
+ Object obj;
+ #ifdef LIBPOPPLER_GOOSTRING_HAS_CONSTGETCHAR
+@@ -333,13 +333,13 @@ int main (int argc, char *argv[])
+ GooString *fileName;
+ PDFDoc *doc;
+ Object info;
+- UnicodeMap *uMap;
++ const UnicodeMap *uMap;
+ ownerPW = NULL;
+ userPW = NULL;
#ifdef LIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM
globalParams = new GlobalParams(0);
#else
commit gdcm for openSUSE:Factory
Hello community,
here is the log from the commit of package gdcm for openSUSE:Factory checked in
at 2020-03-30 23:02:37
Comparing /work/SRC/openSUSE:Factory/gdcm (Old)
and /work/SRC/openSUSE:Factory/.gdcm.new.3160 (New)
Package is "gdcm"
Mon Mar 30 23:02:37 2020 rev:2 rq:789544 version:3.0.5
Changes:
--- /work/SRC/openSUSE:Factory/gdcm/gdcm.changes2019-12-04
14:19:17.158382797 +0100
+++ /work/SRC/openSUSE:Factory/.gdcm.new.3160/gdcm.changes 2020-03-30
23:02:40.284151497 +0200
@@ -1,0 +2,11 @@
+Sun Mar 29 14:24:37 UTC 2020 - Axel Braun
+
+- poppler_api.patch added to fix API changes in poppler
+
+---
+Tue Feb 18 20:51:19 UTC 2020 - Axel Braun
+
+- version 3.0.5
+ * fix for API change in poppler
+
+---
Old:
gdcm-3.0.4.tar.gz
New:
gdcm-3.0.5.tar.bz2
poppler_api.patch
Other differences:
--
++ gdcm.spec ++
--- /var/tmp/diff_new_pack.EOUK4S/_old 2020-03-30 23:02:41.904152420 +0200
+++ /var/tmp/diff_new_pack.EOUK4S/_new 2020-03-30 23:02:41.916152427 +0200
@@ -1,7 +1,7 @@
#
# spec file for package gdcm
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2019 Dr. Axel Braun
#
# All modifications and additions to the file contributed by third parties
@@ -20,15 +20,16 @@
%define soname 3_0
%define libsocksoname libsocketxx1_2
Name: gdcm
-Version:3.0.4
+Version:3.0.5
Release:0
Summary:Grassroots DiCoM is a C++ library to parse DICOM medical files
License:BSD-3-Clause
-URL:http://gdcm.sourceforge.net/wiki/index.php/Main_Page
-Source0:
http://sourceforge.net/projects/gdcm/files/gdcm%203.x/GDCM%20%{version}/%{name}-%{version}.tar.gz
Group: Productivity/Graphics/Other
+URL:http://gdcm.sourceforge.net/wiki/index.php/Main_Page
+Source0:
http://sourceforge.net/projects/gdcm/files/gdcm%203.x/GDCM%20%{version}/%{name}-%{version}.tar.bz2
Patch1: gdcm-2.4.0-usecopyright.patch
Patch2: fix_charls_2.patch
+Patch3: poppler_api.patch
BuildRequires: CharLS-devel >= 2.0
BuildRequires: cmake
BuildRequires: docbook5-xsl-stylesheets
@@ -77,6 +78,7 @@
%packageapplications
Summary:Includes command line programs for GDCM
+Group: Productivity/Graphics/Other
Requires: %{name}-libgdcm%{soname}
%descriptionapplications
@@ -97,6 +99,7 @@
%packageexamples
Summary:GDCM examples
+Group: Productivity/Graphics/Other
Requires: %{name}-libgdcm%{soname}
%descriptionexamples
@@ -104,6 +107,7 @@
%package -n python3-gdcm
Summary:Python binding for GDCM
+Group: Productivity/Graphics/Other
%{?python_provide:%python_provide python3-gdcm}
Requires: %{name}-libgdcm%{soname}
++ gdcm-3.0.4.tar.gz -> gdcm-3.0.5.tar.bz2 ++
1961 lines of diff (skipped)
++ poppler_api.patch ++
# Patch to fix new poppler API on gdcm 3.0.5
# Axel Braun
diff -U 3 -dHrN -- a/Applications/Cxx/gdcminfo.cxx
b/Applications/Cxx/gdcminfo.cxx
--- a/Applications/Cxx/gdcminfo.cxx 2020-02-18 14:11:04.0 +0100
+++ b/Applications/Cxx/gdcminfo.cxx 2020-03-29 15:00:39.398419657 +0200
@@ -513,7 +513,7 @@
#ifdef LIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM
globalParams = new GlobalParams(0);
#else
-globalParams = new GlobalParams();
+globalParams.reset(new GlobalParams());
#endif
uMap = globalParams->getTextEncoding();
diff -U 3 -dHrN -- a/Applications/Cxx/gdcmpdf.cxx b/Applications/Cxx/gdcmpdf.cxx
--- a/Applications/Cxx/gdcmpdf.cxx 2020-02-18 14:11:04.0 +0100
+++ b/Applications/Cxx/gdcmpdf.cxx 2020-03-29 14:52:23.374400551 +0200
@@ -339,7 +339,7 @@
#ifdef LIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM
globalParams = new GlobalParams(0);
#else
- globalParams = new GlobalParams();
+ globalParams.reset(new GlobalParams());
#endif
uMap = globalParams->getTextEncoding();
