[med-svn] [Git][med-team/gdcm][master] Adjust patch metadata to be "pq" friendly
Michael R. Crusoe (@crusoe)
gitlab at salsa.debian.org
Sat Sep 14 12:04:41 BST 2024
Michael R. Crusoe pushed to branch master at Debian Med / gdcm
Commits:
f4330c95 by Michael R. Crusoe at 2024-09-14T13:04:25+02:00
Adjust patch metadata to be "pq" friendly
- - - - -
9 changed files:
- debian/changelog
- debian/patches/02_fixhurd.patch
- debian/patches/03_linkvtkdoc.patch
- debian/patches/04_multiarch.patch
- debian/patches/3be6c2fa0945c91889bcf06e8c20e88f69692dd5.patch
- debian/patches/cxx-standard-20.patch
- debian/patches/de650849a1f294dda8401e2925c40daec51d0d3b.patch
- debian/patches/dircos_rev.patch
- debian/patches/rename-pdf.patch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+gdcm (3.0.24-5) UNRELEASED; urgency=medium
+
+ * Adjust patch metadata to be "pq" friendly
+
+ -- Michael R. Crusoe <crusoe at debian.org> Sat, 14 Sep 2024 10:59:38 +0200
+
gdcm (3.0.24-4) unstable; urgency=medium
* Team upload.
=====================================
debian/patches/02_fixhurd.patch
=====================================
@@ -1,11 +1,19 @@
-Description: Fix compilation on GNU/Hurd
- According to explanation from:
- http://www.gnu.org/software/hurd/hurd/porting/guidelines.html#GNU_specific_define_tt_
-Author: Mathieu Malaterre <malat at debian.org>
+From: Mathieu Malaterre <malat at debian.org>
+Date: Sat, 14 Sep 2024 10:59:43 +0200
+Subject: Fix compilation on GNU/Hurd
---- gdcm.orig/Source/Common/gdcmSystem.cxx
-+++ gdcm/Source/Common/gdcmSystem.cxx
-@@ -460,6 +460,10 @@
+According to explanation from:
+http://www.gnu.org/software/hurd/hurd/porting/guidelines.html#GNU_specific_define_tt_
+---
+ Source/Common/gdcmSystem.cxx | 4 ++++
+ Source/DataDictionary/gdcmGlobal.cxx | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/Source/Common/gdcmSystem.cxx b/Source/Common/gdcmSystem.cxx
+index 5d31526..b27ed13 100644
+--- a/Source/Common/gdcmSystem.cxx
++++ b/Source/Common/gdcmSystem.cxx
+@@ -460,6 +460,10 @@ std::wstring System::ConvertToUNC(const char *utf8path)
#endif
}
@@ -16,9 +24,11 @@ Author: Mathieu Malaterre <malat at debian.org>
// return size of file; also returns zero if no file exists
size_t System::FileSize(const char* filename)
{
---- gdcm.orig/Source/DataDictionary/gdcmGlobal.cxx
-+++ gdcm/Source/DataDictionary/gdcmGlobal.cxx
-@@ -138,6 +138,10 @@
+diff --git a/Source/DataDictionary/gdcmGlobal.cxx b/Source/DataDictionary/gdcmGlobal.cxx
+index 60051a1..e0f8dfe 100644
+--- a/Source/DataDictionary/gdcmGlobal.cxx
++++ b/Source/DataDictionary/gdcmGlobal.cxx
+@@ -138,6 +138,10 @@ bool Global::Prepend(const char *path)
#define PATH_MAX 4096
#endif
=====================================
debian/patches/03_linkvtkdoc.patch
=====================================
@@ -1,13 +1,23 @@
-Description: Correct use of scripts from vtk7-doc
- In vtk7-doc these scripts are installed uncompressed.
- In addition the patch changes the vtk doxygen source directory and
- incorporates an patch to link to the VTK doc and replace PNG by SVG,
- Merged to one patch because they overlap partially.
-Author: Gert Wollny <gw.fossdev at gmail.com>, Mathieu Malaterre <malat at debian.org>
+From: "Gert Wollny" <gw.fossdev at gmail.com>
+From: "Mathieu Malaterre" <malat at debian.org>
+Date: Sat, 14 Sep 2024 10:59:43 +0200
+Subject: Correct use of scripts from vtk7-doc
+In vtk7-doc these scripts are installed uncompressed.
+In addition the patch changes the vtk doxygen source directory and
+incorporates an patch to link to the VTK doc and replace PNG by SVG,
+Merged to one patch because they overlap partially.
+---
+ Utilities/doxygen/vtk/CMakeLists.txt | 8 ++++----
+ Utilities/doxygen/vtk/doc_makeall.sh.in | 13 ++++++++-----
+ Utilities/doxygen/vtk/doxyfile.in | 1 +
+ 3 files changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/Utilities/doxygen/vtk/CMakeLists.txt b/Utilities/doxygen/vtk/CMakeLists.txt
+index 2173ea4..f70d1b8 100644
--- a/Utilities/doxygen/vtk/CMakeLists.txt
+++ b/Utilities/doxygen/vtk/CMakeLists.txt
-@@ -22,7 +22,7 @@
+@@ -22,7 +22,7 @@ mark_as_advanced(VTK_DIR)
set (QT_TAG_FILE "${CMAKE_CURRENT_BINARY_DIR}/Qt.tag")
endif ()
set(BUILD_DOXYGEN ON)
@@ -16,7 +26,7 @@ Author: Gert Wollny <gw.fossdev at gmail.com>, Mathieu Malaterre <malat at debian.org>
set(DOCUMENTATION_HTML_TARZ ON)
set(DOXYGEN_PROJECT_NAME "vtkgdcm")
if(VTK_SOURCE_DIR)
-@@ -35,8 +35,8 @@
+@@ -35,8 +35,8 @@ mark_as_advanced(VTK_DIR)
# sudo apt-get install vtk-doc
if(EXISTS "/usr/share/doc/vtk-doc/html")
set(DOXYGEN_SOURCE_DIR "/usr/share/doc/vtk-doc/html")
@@ -27,7 +37,7 @@ Author: Gert Wollny <gw.fossdev at gmail.com>, Mathieu Malaterre <malat at debian.org>
else()
message(ERROR "DOXYGEN_SOURCE_DIR need to be set.")
endif()
-@@ -97,7 +97,7 @@
+@@ -97,7 +97,7 @@ mark_as_advanced(VTK_DIR)
get_filename_component(DOT_PATH ${DOT} PATH)
endif()
@@ -36,9 +46,11 @@ Author: Gert Wollny <gw.fossdev at gmail.com>, Mathieu Malaterre <malat at debian.org>
if(INCLUDE_QT_DOCUMENTATION)
set (TAGFILES "${TAGFILES} \"${QT_TAG_FILE}=http://doc.trolltech.com/4.2\"")
endif()
+diff --git a/Utilities/doxygen/vtk/doc_makeall.sh.in b/Utilities/doxygen/vtk/doc_makeall.sh.in
+index fc2d59f..df76fbc 100644
--- a/Utilities/doxygen/vtk/doc_makeall.sh.in
+++ b/Utilities/doxygen/vtk/doc_makeall.sh.in
-@@ -42,7 +42,7 @@
+@@ -42,7 +42,7 @@ export PROJECT_NAME=@DOXYGEN_PROJECT_NAME@
# Example:
# PATH_TO_VTK_DOX_SCRIPTS=@CMAKE_CURRENT_SOURCE_DIR@
#
@@ -47,7 +59,7 @@ Author: Gert Wollny <gw.fossdev at gmail.com>, Mathieu Malaterre <malat at debian.org>
export PATH_TO_VTKGDCM_FINAL_PATH="@VTKGDCM_FINAL_PATH@"
-@@ -169,12 +169,12 @@
+@@ -169,12 +169,12 @@ cd "${DOXTEMP}" || echoexit "Cannot find Doxygen output directory: ${DOXTEMP}"
# Convert the VTK headers to the Doxygen format.
echo "Convert the VTK headers to the Doxygen format."
if test "x$PERL_PROG" != "xNOTFOUND" ; then
@@ -62,7 +74,7 @@ Author: Gert Wollny <gw.fossdev at gmail.com>, Mathieu Malaterre <malat at debian.org>
--to "$INTERMEDIATE_DOX_DIR" \
--relativeto "@DOXYGEN_BINARY_LOCATIONS_DIR@" \
@DOXYGEN_BINARY_LOCATIONS@ || echoexit "Problem converting VTK headers"
-@@ -186,13 +186,16 @@
+@@ -186,13 +186,16 @@ echo "Convert the VTK headers to the Doxygen format - done"
# Build the full-text index.
echo "Build the full-text index."
if test "x$PERL_PROG" != "xNOTFOUND" ; then
@@ -80,7 +92,7 @@ Author: Gert Wollny <gw.fossdev at gmail.com>, Mathieu Malaterre <malat at debian.org>
fi
echo "Build the full-text index - done"
-@@ -201,7 +204,7 @@
+@@ -201,7 +204,7 @@ echo "Build the full-text index - done"
# # demos that use that class.
# if test "x$PERL_PROG" != "xNOTFOUND" ; then
@@ -89,9 +101,11 @@ Author: Gert Wollny <gw.fossdev at gmail.com>, Mathieu Malaterre <malat at debian.org>
# --datamatch "\W((VTK|ParaView)_DATA_ROOT|(VTK|MedVIP)Data|(vtk)?GetDataRoot|ExpandDataFileName)\W" \
# --dataicon "paper-clip.gif" \
# --dirmatch "^demos$" \
+diff --git a/Utilities/doxygen/vtk/doxyfile.in b/Utilities/doxygen/vtk/doxyfile.in
+index 20c47da..a4d308c 100644
--- a/Utilities/doxygen/vtk/doxyfile.in
+++ b/Utilities/doxygen/vtk/doxyfile.in
-@@ -23,6 +23,7 @@
+@@ -23,6 +23,7 @@ PDF_HYPERLINKS = YES
HAVE_DOT = YES
#HAVE_DOT = NO
DOT_PATH = "@DOT_PATH@"
=====================================
debian/patches/04_multiarch.patch
=====================================
@@ -1,9 +1,17 @@
-Description: fix relative links now that gdcm is multi-arched
+From: Mathieu Malaterre <malat at debian.org>
+Date: Sat, 14 Sep 2024 10:59:43 +0200
+Subject: fix relative links now that gdcm is multi-arched
+
Bug-Debian: https://bugs.debian.org/764029
-Author: Mathieu Malaterre <malat at debian.org>
+---
+ CMake/ExportConfiguration/GDCMConfig.cmake.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMake/ExportConfiguration/GDCMConfig.cmake.in b/CMake/ExportConfiguration/GDCMConfig.cmake.in
+index f8e9d0b..3f553f6 100644
--- a/CMake/ExportConfiguration/GDCMConfig.cmake.in
+++ b/CMake/ExportConfiguration/GDCMConfig.cmake.in
-@@ -37,9 +37,9 @@
+@@ -37,9 +37,9 @@ get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
if(EXISTS ${SELF_DIR}/GDCMTargets.cmake)
# This is an install tree
include(${SELF_DIR}/GDCMTargets.cmake)
=====================================
debian/patches/3be6c2fa0945c91889bcf06e8c20e88f69692dd5.patch
=====================================
@@ -1,4 +1,3 @@
-From 3be6c2fa0945c91889bcf06e8c20e88f69692dd5 Mon Sep 17 00:00:00 2001
From: Nicklas Larsson <n_larsson at yahoo.com>
Date: Tue, 18 Jun 2024 08:06:20 +0200
Subject: [PATCH] Problem compiling with VTK 9.3.0 support
@@ -9,15 +8,15 @@ Fixes #552
---
CMakeLists.txt | 1 +
Utilities/VTK/vtkGDCMTesting.cxx | 1 -
- Utilities/VTK/vtkImageColorViewer.cxx | 28 ---------------------------
- Utilities/VTK/vtkImageColorViewer.h | 16 ---------------
+ Utilities/VTK/vtkImageColorViewer.cxx | 28 ----------------------------
+ Utilities/VTK/vtkImageColorViewer.h | 16 ----------------
4 files changed, 1 insertion(+), 45 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f1083c5fcd..758a60e68d 100644
+index 7345372..c218aad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -707,6 +707,7 @@ if(GDCM_STANDALONE)
+@@ -704,6 +704,7 @@ if(GDCM_STANDALONE)
HEADERS_DESTINATION "${GDCM_INSTALL_INCLUDE_DIR}/vtk${vtk_version_suffix}"
CMAKE_DESTINATION "${GDCM_INSTALL_PACKAGE_DIR}"
LICENSE_DESTINATION "${GDCM_INSTALL_DATA_DIR}/vtkgdcm-${GDCM_SHORT_VERSION}"
@@ -26,7 +25,7 @@ index f1083c5fcd..758a60e68d 100644
LIBRARY_NAME_SUFFIX "${vtkgdcm_library_suffix}"
VERSION "${GDCM_VERSION}"
diff --git a/Utilities/VTK/vtkGDCMTesting.cxx b/Utilities/VTK/vtkGDCMTesting.cxx
-index 3d74802f0a..a4e4ef1f23 100644
+index 3d74802..a4e4ef1 100644
--- a/Utilities/VTK/vtkGDCMTesting.cxx
+++ b/Utilities/VTK/vtkGDCMTesting.cxx
@@ -14,7 +14,6 @@
@@ -38,7 +37,7 @@ index 3d74802f0a..a4e4ef1f23 100644
#include "gdcmFilename.h"
diff --git a/Utilities/VTK/vtkImageColorViewer.cxx b/Utilities/VTK/vtkImageColorViewer.cxx
-index 909d21fceb..175d634e46 100644
+index 909d21f..175d634 100644
--- a/Utilities/VTK/vtkImageColorViewer.cxx
+++ b/Utilities/VTK/vtkImageColorViewer.cxx
@@ -918,34 +918,6 @@ void vtkImageColorViewer::SetOverlayVisibility(double vis)
@@ -77,10 +76,10 @@ index 909d21fceb..175d634e46 100644
void vtkImageColorViewer::PrintSelf(ostream& os, vtkIndent indent)
{
diff --git a/Utilities/VTK/vtkImageColorViewer.h b/Utilities/VTK/vtkImageColorViewer.h
-index ad03febb0d..8542cd99c9 100644
+index ad03feb..8542cd9 100644
--- a/Utilities/VTK/vtkImageColorViewer.h
+++ b/Utilities/VTK/vtkImageColorViewer.h
-@@ -199,22 +199,6 @@ class VTKGDCM_EXPORT vtkImageColorViewer : public vtkObject
+@@ -199,22 +199,6 @@ public:
virtual int GetOffScreenRendering();
vtkBooleanMacro(OffScreenRendering,int);
=====================================
debian/patches/cxx-standard-20.patch
=====================================
@@ -1,13 +1,19 @@
-Description: set CXX standard to 20, following poppler's change[1]
- 1. https://gitlab.freedesktop.org/poppler/poppler/-/commit/d8ae3ba#9a2aa4db38d3115ed60da621e012c0efc0172aae
-Author: Andreas Hasenack <andreas.hasenack at canonical.com>
+From: Andreas Hasenack <andreas.hasenack at canonical.com>
+Date: Sat, 14 Sep 2024 10:59:43 +0200
+Subject: set CXX standard to 20, following poppler's change[1]
+
Bug: https://sourceforge.net/p/gdcm/bugs/561/
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gdcm/+bug/2070303
Last-Update: 2024-06-24
+
+1. https://gitlab.freedesktop.org/poppler/poppler/-/commit/d8ae3ba#9a2aa4db38d3115ed60da621e012c0efc0172aae
+Last-Update: 2024-06-24
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 38c65d11..41345485 100644
+index c218aad..b78ec4b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,9 @@ project(GDCM
=====================================
debian/patches/de650849a1f294dda8401e2925c40daec51d0d3b.patch
=====================================
@@ -1,4 +1,3 @@
-From de650849a1f294dda8401e2925c40daec51d0d3b Mon Sep 17 00:00:00 2001
From: Adrien Nader <adrien at notk.org>
Date: Tue, 18 Jun 2024 08:01:50 +0200
Subject: [PATCH] include(GNUInstallDirs) in CMakeLists.txt
@@ -14,7 +13,7 @@ corresponding patch.
1 file changed, 4 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 33a40349d..f1083c5fc 100644
+index 38c65d1..7345372 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,6 +187,10 @@ macro(CHECK_INCLUDE_FILE_CONCAT FILE VARIABLE)
=====================================
debian/patches/dircos_rev.patch
=====================================
@@ -1,14 +1,22 @@
-Description: Revert gdcmDirectionCosines destructor change
-Author: Gianfranco Costamagna <locutusofborg at debian.org>
+From: Gianfranco Costamagna <locutusofborg at debian.org>
+Date: Sat, 14 Sep 2024 10:59:43 +0200
+Subject: Revert gdcmDirectionCosines destructor change
+
Bug-Debian: https://bugs.debian.org/1056953
Origin: upstream
Forwarded: no
Reviewed-By: Mathieu Malaterre <malat at debian.org>
Last-Update: 2023-12-07
+---
+ Source/MediaStorageAndFileFormat/gdcmDirectionCosines.cxx | 2 ++
+ Source/MediaStorageAndFileFormat/gdcmDirectionCosines.h | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
---- gdcm-3.0.22.orig/Source/MediaStorageAndFileFormat/gdcmDirectionCosines.cxx
-+++ gdcm-3.0.22/Source/MediaStorageAndFileFormat/gdcmDirectionCosines.cxx
-@@ -40,6 +40,8 @@ DirectionCosines::DirectionCosines(const
+diff --git a/Source/MediaStorageAndFileFormat/gdcmDirectionCosines.cxx b/Source/MediaStorageAndFileFormat/gdcmDirectionCosines.cxx
+index 119a7b4..ea5a462 100644
+--- a/Source/MediaStorageAndFileFormat/gdcmDirectionCosines.cxx
++++ b/Source/MediaStorageAndFileFormat/gdcmDirectionCosines.cxx
+@@ -40,6 +40,8 @@ DirectionCosines::DirectionCosines(const double dircos[6])
Values[5] = dircos[5];
}
@@ -17,8 +25,10 @@ Last-Update: 2023-12-07
void DirectionCosines::Print(std::ostream &os) const
{
os << Values[0] << ",";
---- gdcm-3.0.22.orig/Source/MediaStorageAndFileFormat/gdcmDirectionCosines.h
-+++ gdcm-3.0.22/Source/MediaStorageAndFileFormat/gdcmDirectionCosines.h
+diff --git a/Source/MediaStorageAndFileFormat/gdcmDirectionCosines.h b/Source/MediaStorageAndFileFormat/gdcmDirectionCosines.h
+index 1313146..7ff28ad 100644
+--- a/Source/MediaStorageAndFileFormat/gdcmDirectionCosines.h
++++ b/Source/MediaStorageAndFileFormat/gdcmDirectionCosines.h
@@ -29,7 +29,7 @@ public:
DirectionCosines(const double dircos[6]);
// Cannot get the following signature to be wrapped with swig...
=====================================
debian/patches/rename-pdf.patch
=====================================
@@ -1,6 +1,16 @@
+From: Gert Wollny <gw.fossdev at gmail.com>
+Date: Sat, 8 Aug 2020 09:46:02 +0200
+Subject: rename pdf based on major version
+
+---
+ Utilities/doxygen/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Utilities/doxygen/CMakeLists.txt b/Utilities/doxygen/CMakeLists.txt
+index c53a877..9eea710 100644
--- a/Utilities/doxygen/CMakeLists.txt
+++ b/Utilities/doxygen/CMakeLists.txt
-@@ -160,6 +160,7 @@
+@@ -160,6 +160,7 @@ if(GDCM_DOCUMENTATION)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/latex/gdcm-${GDCM_VERSION}.pdf
DESTINATION ${GDCM_INSTALL_DOC_DIR}
View it on GitLab: https://salsa.debian.org/med-team/gdcm/-/commit/f4330c951b3a20e7c4c3b58eb31ade6710530e1a
--
View it on GitLab: https://salsa.debian.org/med-team/gdcm/-/commit/f4330c951b3a20e7c4c3b58eb31ade6710530e1a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20240914/f64a25eb/attachment-0001.htm>
More information about the debian-med-commit
mailing list