[med-svn] r17543 - in trunk/packages/gdcm/trunk/debian: . patches
Mathieu Malaterre
malat at moszumanska.debian.org
Tue Jul 29 13:09:48 UTC 2014
Author: malat
Date: 2014-07-29 13:09:47 +0000 (Tue, 29 Jul 2014)
New Revision: 17543
Added:
trunk/packages/gdcm/trunk/debian/patches/upstream_cmake-proper-handle-the-extra-poppler-CFLAGS.patch
trunk/packages/gdcm/trunk/debian/patches/upstream_gdcminfo-support-poppler-0.25.1.patch
Removed:
trunk/packages/gdcm/trunk/debian/patches/0001-cmake-proper-handle-the-extra-poppler-CFLAGS.patch
trunk/packages/gdcm/trunk/debian/patches/0002-gdcminfo-support-poppler-0.25.1.patch
Modified:
trunk/packages/gdcm/trunk/debian/changelog
trunk/packages/gdcm/trunk/debian/patches/series
Log:
import proper
Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog 2014-07-29 12:53:02 UTC (rev 17542)
+++ trunk/packages/gdcm/trunk/debian/changelog 2014-07-29 13:09:47 UTC (rev 17543)
@@ -1,11 +1,13 @@
-gdcm (2.4.2-1.1) unstable; urgency=medium
+gdcm (2.4.2-1.1) sid; urgency=medium
* Non-maintainer upload.
- * Apply 0001-cmake-proper-handle-the-extra-poppler-CFLAGS.patch and
- 0002-gdcminfo-support-poppler-0.25.1.patch from Pino Toscano,
- fixing incompatibility with poppler 0.26.x (Closes: #751432)
+ * Backport upstream commits 096e5b84d9e241b6e5203904846454f7d7058e01 and
+ 1da0cab121782f1a63a84a9bcc90da6c337dc2e3 to support building with
+ Poppler 0.26.x; patches
+ upstream_cmake-proper-handle-the-extra-poppler-CFLAGS.patch and
+ upstream_gdcminfo-support-poppler-0.25.1.patch. (Closes: #751432)
- -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Thu, 03 Jul 2014 09:27:19 +0200
+ -- Pino Toscano <pino at debian.org> Thu, 03 Jul 2014 22:34:02 +0200
gdcm (2.4.2-1) sid; urgency=low
Deleted: trunk/packages/gdcm/trunk/debian/patches/0001-cmake-proper-handle-the-extra-poppler-CFLAGS.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/0001-cmake-proper-handle-the-extra-poppler-CFLAGS.patch 2014-07-29 12:53:02 UTC (rev 17542)
+++ trunk/packages/gdcm/trunk/debian/patches/0001-cmake-proper-handle-the-extra-poppler-CFLAGS.patch 2014-07-29 13:09:47 UTC (rev 17543)
@@ -1,35 +0,0 @@
->From 096e5b84d9e241b6e5203904846454f7d7058e01 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <toscano.pino at tiscali.it>
-Date: Sun, 6 Apr 2014 06:20:43 +0000
-Subject: [PATCH] cmake: proper handle the extra poppler CFLAGS
-
-Make sure to join the extra CFLAGS with a space, otherwise they are
-passed as list to set_source_files_properties; also make sure to quote
-the string.
----
- Applications/Cxx/CMakeLists.txt | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Applications/Cxx/CMakeLists.txt b/Applications/Cxx/CMakeLists.txt
-index 1c83bc3..714f5bc 100644
---- a/Applications/Cxx/CMakeLists.txt
-+++ b/Applications/Cxx/CMakeLists.txt
-@@ -79,12 +79,13 @@ if(GDCM_USE_SYSTEM_POPPLER)
- list(APPEND libpoppler_flags -DLIBPOPPLER_PDFDOC_HAS_PDFVERSION)
- endif()
- if(libpoppler_flags)
-+ string(REPLACE ";" " " libpoppler_flags_string "${libpoppler_flags}")
- set_source_files_properties(
- ${CMAKE_CURRENT_SOURCE_DIR}/gdcminfo.cxx
-- PROPERTIES COMPILE_FLAGS ${libpoppler_flags})
-+ PROPERTIES COMPILE_FLAGS "${libpoppler_flags_string}")
- set_source_files_properties(
- ${CMAKE_CURRENT_SOURCE_DIR}/gdcmpdf.cxx
-- PROPERTIES COMPILE_FLAGS ${libpoppler_flags})
-+ PROPERTIES COMPILE_FLAGS "${libpoppler_flags_string}")
- endif()
- include_directories(${POPPLER_INCLUDE_DIRS})
- set(GDCM_EXECUTABLE_NAME
---
-2.0.0
-
Deleted: trunk/packages/gdcm/trunk/debian/patches/0002-gdcminfo-support-poppler-0.25.1.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/0002-gdcminfo-support-poppler-0.25.1.patch 2014-07-29 12:53:02 UTC (rev 17542)
+++ trunk/packages/gdcm/trunk/debian/patches/0002-gdcminfo-support-poppler-0.25.1.patch 2014-07-29 13:09:47 UTC (rev 17543)
@@ -1,49 +0,0 @@
->From 1da0cab121782f1a63a84a9bcc90da6c337dc2e3 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <toscano.pino at tiscali.it>
-Date: Sun, 6 Apr 2014 06:23:46 +0000
-Subject: [PATCH] gdcminfo: support poppler 0.25.1
-
-Check for the new API of StructTreeRoot, adapting the check for a
-tagged PDF accordingly. Now Catalog::getStructTreeRoot() returns NULL
-if StructTreeRoot is not a dictionary.
----
- Applications/Cxx/CMakeLists.txt | 6 ++++++
- Applications/Cxx/gdcminfo.cxx | 4 ++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/Applications/Cxx/CMakeLists.txt b/Applications/Cxx/CMakeLists.txt
-index 714f5bc..9b4dd0e 100644
---- a/Applications/Cxx/CMakeLists.txt
-+++ b/Applications/Cxx/CMakeLists.txt
-@@ -78,6 +78,12 @@ if(GDCM_USE_SYSTEM_POPPLER)
- if(LIBPOPPLER_PDFDOC_HAS_PDFVERSION)
- list(APPEND libpoppler_flags -DLIBPOPPLER_PDFDOC_HAS_PDFVERSION)
- endif()
-+ CHECK_CXX_SOURCE_COMPILES(
-+ "\#include <poppler/PDFDoc.h>\n#include <poppler/StructTreeRoot.h>\nint main() { Catalog c(NULL); c.getStructTreeRoot()->getDoc(); return 0;}"
-+ LIBPOPPLER_CATALOG_HAS_STRUCTTREEROOT)
-+ if(LIBPOPPLER_CATALOG_HAS_STRUCTTREEROOT)
-+ list(APPEND libpoppler_flags -DLIBPOPPLER_CATALOG_HAS_STRUCTTREEROOT)
-+ endif()
- if(libpoppler_flags)
- string(REPLACE ";" " " libpoppler_flags_string "${libpoppler_flags}")
- set_source_files_properties(
-diff --git a/Applications/Cxx/gdcminfo.cxx b/Applications/Cxx/gdcminfo.cxx
-index 6f52cd9..9288ea6 100644
---- a/Applications/Cxx/gdcminfo.cxx
-+++ b/Applications/Cxx/gdcminfo.cxx
-@@ -471,7 +471,11 @@ static int ProcessOneFile( std::string const & filename, gdcm::Defs const & defs
- moddate = getInfoDate( info.getDict(), "ModDate" );
- info.free();
- }
-+#ifdef LIBPOPPLER_CATALOG_HAS_STRUCTTREEROOT
-+ const char *tagged = doc->getStructTreeRoot() ? "yes" : "no";
-+#else
- const char *tagged = doc->getStructTreeRoot()->isDict() ? "yes" : "no";
-+#endif
- int pages = doc->getNumPages();
- const char *encrypted = doc->isEncrypted() ? "yes" : "no";
- // printf("yes (print:%s copy:%s change:%s addNotes:%s)\n",
---
-2.0.0
-
Modified: trunk/packages/gdcm/trunk/debian/patches/series
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/series 2014-07-29 12:53:02 UTC (rev 17542)
+++ trunk/packages/gdcm/trunk/debian/patches/series 2014-07-29 13:09:47 UTC (rev 17543)
@@ -1,5 +1,5 @@
toplevelskip.patch
fixhurd.patch
linkvtkdoc.patch
-0001-cmake-proper-handle-the-extra-poppler-CFLAGS.patch
-0002-gdcminfo-support-poppler-0.25.1.patch
+upstream_cmake-proper-handle-the-extra-poppler-CFLAGS.patch
+upstream_gdcminfo-support-poppler-0.25.1.patch
Copied: trunk/packages/gdcm/trunk/debian/patches/upstream_cmake-proper-handle-the-extra-poppler-CFLAGS.patch (from rev 17542, trunk/packages/gdcm/trunk/debian/patches/0001-cmake-proper-handle-the-extra-poppler-CFLAGS.patch)
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/upstream_cmake-proper-handle-the-extra-poppler-CFLAGS.patch (rev 0)
+++ trunk/packages/gdcm/trunk/debian/patches/upstream_cmake-proper-handle-the-extra-poppler-CFLAGS.patch 2014-07-29 13:09:47 UTC (rev 17543)
@@ -0,0 +1,35 @@
+>From 096e5b84d9e241b6e5203904846454f7d7058e01 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <toscano.pino at tiscali.it>
+Date: Sun, 6 Apr 2014 06:20:43 +0000
+Subject: [PATCH] cmake: proper handle the extra poppler CFLAGS
+
+Make sure to join the extra CFLAGS with a space, otherwise they are
+passed as list to set_source_files_properties; also make sure to quote
+the string.
+---
+ Applications/Cxx/CMakeLists.txt | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Applications/Cxx/CMakeLists.txt b/Applications/Cxx/CMakeLists.txt
+index 1c83bc3..714f5bc 100644
+--- a/Applications/Cxx/CMakeLists.txt
++++ b/Applications/Cxx/CMakeLists.txt
+@@ -79,12 +79,13 @@ if(GDCM_USE_SYSTEM_POPPLER)
+ list(APPEND libpoppler_flags -DLIBPOPPLER_PDFDOC_HAS_PDFVERSION)
+ endif()
+ if(libpoppler_flags)
++ string(REPLACE ";" " " libpoppler_flags_string "${libpoppler_flags}")
+ set_source_files_properties(
+ ${CMAKE_CURRENT_SOURCE_DIR}/gdcminfo.cxx
+- PROPERTIES COMPILE_FLAGS ${libpoppler_flags})
++ PROPERTIES COMPILE_FLAGS "${libpoppler_flags_string}")
+ set_source_files_properties(
+ ${CMAKE_CURRENT_SOURCE_DIR}/gdcmpdf.cxx
+- PROPERTIES COMPILE_FLAGS ${libpoppler_flags})
++ PROPERTIES COMPILE_FLAGS "${libpoppler_flags_string}")
+ endif()
+ include_directories(${POPPLER_INCLUDE_DIRS})
+ set(GDCM_EXECUTABLE_NAME
+--
+2.0.0
+
Copied: trunk/packages/gdcm/trunk/debian/patches/upstream_gdcminfo-support-poppler-0.25.1.patch (from rev 17542, trunk/packages/gdcm/trunk/debian/patches/0002-gdcminfo-support-poppler-0.25.1.patch)
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/upstream_gdcminfo-support-poppler-0.25.1.patch (rev 0)
+++ trunk/packages/gdcm/trunk/debian/patches/upstream_gdcminfo-support-poppler-0.25.1.patch 2014-07-29 13:09:47 UTC (rev 17543)
@@ -0,0 +1,49 @@
+>From 1da0cab121782f1a63a84a9bcc90da6c337dc2e3 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <toscano.pino at tiscali.it>
+Date: Sun, 6 Apr 2014 06:23:46 +0000
+Subject: [PATCH] gdcminfo: support poppler 0.25.1
+
+Check for the new API of StructTreeRoot, adapting the check for a
+tagged PDF accordingly. Now Catalog::getStructTreeRoot() returns NULL
+if StructTreeRoot is not a dictionary.
+---
+ Applications/Cxx/CMakeLists.txt | 6 ++++++
+ Applications/Cxx/gdcminfo.cxx | 4 ++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/Applications/Cxx/CMakeLists.txt b/Applications/Cxx/CMakeLists.txt
+index 714f5bc..9b4dd0e 100644
+--- a/Applications/Cxx/CMakeLists.txt
++++ b/Applications/Cxx/CMakeLists.txt
+@@ -78,6 +78,12 @@ if(GDCM_USE_SYSTEM_POPPLER)
+ if(LIBPOPPLER_PDFDOC_HAS_PDFVERSION)
+ list(APPEND libpoppler_flags -DLIBPOPPLER_PDFDOC_HAS_PDFVERSION)
+ endif()
++ CHECK_CXX_SOURCE_COMPILES(
++ "\#include <poppler/PDFDoc.h>\n#include <poppler/StructTreeRoot.h>\nint main() { Catalog c(NULL); c.getStructTreeRoot()->getDoc(); return 0;}"
++ LIBPOPPLER_CATALOG_HAS_STRUCTTREEROOT)
++ if(LIBPOPPLER_CATALOG_HAS_STRUCTTREEROOT)
++ list(APPEND libpoppler_flags -DLIBPOPPLER_CATALOG_HAS_STRUCTTREEROOT)
++ endif()
+ if(libpoppler_flags)
+ string(REPLACE ";" " " libpoppler_flags_string "${libpoppler_flags}")
+ set_source_files_properties(
+diff --git a/Applications/Cxx/gdcminfo.cxx b/Applications/Cxx/gdcminfo.cxx
+index 6f52cd9..9288ea6 100644
+--- a/Applications/Cxx/gdcminfo.cxx
++++ b/Applications/Cxx/gdcminfo.cxx
+@@ -471,7 +471,11 @@ static int ProcessOneFile( std::string const & filename, gdcm::Defs const & defs
+ moddate = getInfoDate( info.getDict(), "ModDate" );
+ info.free();
+ }
++#ifdef LIBPOPPLER_CATALOG_HAS_STRUCTTREEROOT
++ const char *tagged = doc->getStructTreeRoot() ? "yes" : "no";
++#else
+ const char *tagged = doc->getStructTreeRoot()->isDict() ? "yes" : "no";
++#endif
+ int pages = doc->getNumPages();
+ const char *encrypted = doc->isEncrypted() ? "yes" : "no";
+ // printf("yes (print:%s copy:%s change:%s addNotes:%s)\n",
+--
+2.0.0
+
More information about the debian-med-commit
mailing list