From 9e68dd42364057709877efdb5bb476314ec59d23 Mon Sep 17 00:00:00 2001
From: luoyaoming <luoyaoming@kylinos.cn>
Date: Wed, 24 Apr 2024 16:34:28 +0800
Subject: [PATCH] format patches

---
 debian/patches/issue878.patch | 24 ++++++++++----
 debian/patches/man_fix.patch  | 61 +++++++++++++++++++----------------
 2 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/debian/patches/issue878.patch b/debian/patches/issue878.patch
index 54890aa..830fb1d 100644
--- a/debian/patches/issue878.patch
+++ b/debian/patches/issue878.patch
@@ -1,10 +1,18 @@
-Description: openjpeg2 viewer fails to build
-Author: Mathieu Malaterre <malat@debian.org>
+From: Mathieu Malaterre <malat@debian.org>
+Date: Wed, 24 Apr 2024 16:34:27 +0800
+Subject: openjpeg2 viewer fails to build
+
 Bug: https://github.com/uclouvain/openjpeg/issues/878#issuecomment-722037293
 Last-Update: 2021-02-08
+---
+ src/bin/wx/OPJViewer/source/imagjpeg2000.cpp | 3 ++-
+ src/bin/wx/OPJViewer/source/imagjpeg2000.h   | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
 
---- openjpeg2-2.4.0.orig/src/bin/wx/OPJViewer/source/imagjpeg2000.cpp
-+++ openjpeg2-2.4.0/src/bin/wx/OPJViewer/source/imagjpeg2000.cpp
+diff --git a/src/bin/wx/OPJViewer/source/imagjpeg2000.cpp b/src/bin/wx/OPJViewer/source/imagjpeg2000.cpp
+index 9e1ab90..93d845d 100644
+--- a/src/bin/wx/OPJViewer/source/imagjpeg2000.cpp
++++ b/src/bin/wx/OPJViewer/source/imagjpeg2000.cpp
 @@ -56,6 +56,7 @@
  #include "wx/module.h"
  #endif
@@ -13,7 +21,7 @@ Last-Update: 2021-02-08
  #include "openjp2/openjpeg.h"
  
  #include "wx/filefn.h"
-@@ -1204,7 +1205,7 @@ bool wxJPEG2000Handler::SaveFile(wxImage
+@@ -1204,7 +1205,7 @@ bool wxJPEG2000Handler::SaveFile(wxImage *wimage, wxOutputStream& stream,
      if (m_prsize != wxT("")) {
          char sep;
          int res_spec = 0;
@@ -22,8 +30,10 @@ Last-Update: 2021-02-08
          do {
              sep = 0;
              sscanf(s, "[%d,%d]%c", &parameters.prcw_init[res_spec],
---- openjpeg2-2.4.0.orig/src/bin/wx/OPJViewer/source/imagjpeg2000.h
-+++ openjpeg2-2.4.0/src/bin/wx/OPJViewer/source/imagjpeg2000.h
+diff --git a/src/bin/wx/OPJViewer/source/imagjpeg2000.h b/src/bin/wx/OPJViewer/source/imagjpeg2000.h
+index ca7f7f2..60770e3 100644
+--- a/src/bin/wx/OPJViewer/source/imagjpeg2000.h
++++ b/src/bin/wx/OPJViewer/source/imagjpeg2000.h
 @@ -49,6 +49,7 @@
  #if wxUSE_LIBOPENJPEG
  
diff --git a/debian/patches/man_fix.patch b/debian/patches/man_fix.patch
index dfdf226..682bae2 100644
--- a/debian/patches/man_fix.patch
+++ b/debian/patches/man_fix.patch
@@ -1,30 +1,20 @@
-Description: Add install rules for man page even when not building DOC
-Author: Mathieu Malaterre <malat@debian.org>
+From: Mathieu Malaterre <malat@debian.org>
+Date: Wed, 24 Apr 2024 16:34:27 +0800
+Subject: Add install rules for man page even when not building DOC
+
 Origin: upstream
 Forwarded: no
 Last-Update: 2022-01-14
+---
+ CMakeLists.txt                 | 2 +-
+ src/bin/jp2/CMakeLists.txt     | 2 --
+ src/lib/openjp2/CMakeLists.txt | 2 --
+ 3 files changed, 1 insertion(+), 5 deletions(-)
 
-Index: openjpeg2/src/bin/jp2/CMakeLists.txt
-===================================================================
---- openjpeg2.orig/src/bin/jp2/CMakeLists.txt
-+++ openjpeg2/src/bin/jp2/CMakeLists.txt
-@@ -77,7 +77,6 @@ foreach(exe opj_decompress opj_compress
-   endif()
- endforeach()
- 
--if(BUILD_DOC)
- # Install man pages
- install(
-   FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_compress.1
-@@ -85,4 +84,3 @@ install(
-               ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_dump.1
-   DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1)
- #
--endif()
-Index: openjpeg2/CMakeLists.txt
-===================================================================
---- openjpeg2.orig/CMakeLists.txt
-+++ openjpeg2/CMakeLists.txt
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8f89df7..f063cc7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -131,10 +131,10 @@ if(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
    set(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}")
  endif()
@@ -37,10 +27,27 @@ Index: openjpeg2/CMakeLists.txt
  
  if(NOT OPENJPEG_INSTALL_DOC_DIR)
    set(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}")
-Index: openjpeg2/src/lib/openjp2/CMakeLists.txt
-===================================================================
---- openjpeg2.orig/src/lib/openjp2/CMakeLists.txt
-+++ openjpeg2/src/lib/openjp2/CMakeLists.txt
+diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt
+index 4d4bd95..f352aee 100644
+--- a/src/bin/jp2/CMakeLists.txt
++++ b/src/bin/jp2/CMakeLists.txt
+@@ -77,7 +77,6 @@ foreach(exe opj_decompress opj_compress opj_dump)
+   endif()
+ endforeach()
+ 
+-if(BUILD_DOC)
+ # Install man pages
+ install(
+   FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_compress.1
+@@ -85,4 +84,3 @@ install(
+               ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_dump.1
+   DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1)
+ #
+-endif()
+diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
+index ea4131a..8948945 100644
+--- a/src/lib/openjp2/CMakeLists.txt
++++ b/src/lib/openjp2/CMakeLists.txt
 @@ -127,12 +127,10 @@ install(FILES openjpeg.h opj_stdint.h
    DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers
  )