diffstat for deepin-log-viewer-6.5.10+ds1 deepin-log-viewer-6.5.10+ds1

 changelog               |    7 +++++++
 patches/series          |    1 +
 patches/zlib1.3.2.patch |   39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+)

diff -Nru deepin-log-viewer-6.5.10+ds1/debian/changelog deepin-log-viewer-6.5.10+ds1/debian/changelog
--- deepin-log-viewer-6.5.10+ds1/debian/changelog	2026-01-17 23:05:55.000000000 +0200
+++ deepin-log-viewer-6.5.10+ds1/debian/changelog	2026-04-16 22:30:14.000000000 +0300
@@ -1,3 +1,10 @@
+deepin-log-viewer (6.5.10+ds1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with zlib 1.3.2. (Closes: #1133852)
+
+ -- Adrian Bunk <bunk@debian.org>  Thu, 16 Apr 2026 22:30:14 +0300
+
 deepin-log-viewer (6.5.10+ds1-1) unstable; urgency=medium
 
   * Team upload.
diff -Nru deepin-log-viewer-6.5.10+ds1/debian/patches/series deepin-log-viewer-6.5.10+ds1/debian/patches/series
--- deepin-log-viewer-6.5.10+ds1/debian/patches/series	2026-01-17 23:00:27.000000000 +0200
+++ deepin-log-viewer-6.5.10+ds1/debian/patches/series	2026-04-16 22:30:14.000000000 +0300
@@ -1,2 +1,3 @@
 0001-use-system-minizip-lib.patch
 0002-use-system-libxlsxwriter.patch
+zlib1.3.2.patch
diff -Nru deepin-log-viewer-6.5.10+ds1/debian/patches/zlib1.3.2.patch deepin-log-viewer-6.5.10+ds1/debian/patches/zlib1.3.2.patch
--- deepin-log-viewer-6.5.10+ds1/debian/patches/zlib1.3.2.patch	1970-01-01 02:00:00.000000000 +0200
+++ deepin-log-viewer-6.5.10+ds1/debian/patches/zlib1.3.2.patch	2026-04-16 22:30:14.000000000 +0300
@@ -0,0 +1,39 @@
+Description: Fix FTBFS with zlib 1.3.2
+Author: Adrian Bunk <bunk@debian.org>
+Bug-Debian: https://bugs.debian.org/1133852
+
+--- deepin-log-viewer-6.5.10+ds1.orig/3rdparty/DocxFactory/include/DocxFactory/zip/UnzipFile.h
++++ deepin-log-viewer-6.5.10+ds1/3rdparty/DocxFactory/include/DocxFactory/zip/UnzipFile.h
+@@ -5,7 +5,7 @@
+ #include "DocxFactory/zip/ZipFunc.h"
+ #include "DocxFactory/util/DocxFactoryDefs.h"
+ 
+-#include "unzip.h"
++#include "minizip/unzip.h"
+ 
+ #include "boost/type_traits.hpp"
+ #include "boost/utility/enable_if.hpp"
+--- deepin-log-viewer-6.5.10+ds1.orig/3rdparty/DocxFactory/include/DocxFactory/zip/ZipFile.h
++++ deepin-log-viewer-6.5.10+ds1/3rdparty/DocxFactory/include/DocxFactory/zip/ZipFile.h
+@@ -5,8 +5,8 @@
+ #include "DocxFactory/zip/ZipFunc.h"
+ #include "DocxFactory/util/DocxFactoryDefs.h"
+ 
+-#include "zip.h"
+-#include "unzip.h"
++#include "minizip/zip.h"
++#include "minizip/unzip.h"
+ 
+ #include "boost/type_traits.hpp"
+ #include "boost/utility/enable_if.hpp"
+--- deepin-log-viewer-6.5.10+ds1.orig/3rdparty/DocxFactory/include/DocxFactory/zip/ZipFunc.h
++++ deepin-log-viewer-6.5.10+ds1/3rdparty/DocxFactory/include/DocxFactory/zip/ZipFunc.h
+@@ -4,7 +4,7 @@
+ 
+ #include "DocxFactory/util/DocxFactoryDefs.h"
+ 
+-#include "zip.h"
++#include "minizip/zip.h"
+ 
+ #include <string>
+ #include <ctime>