From 7f9c183d4c0a068d0339df0446e0bc76b64d2d80 Mon Sep 17 00:00:00 2001
From: Tee KOBAYASHI <xtkoba@gmail.com>
Date: Sat, 19 Nov 2022 14:15:51 +0900
Subject: [PATCH] libzxing-cpp: Bump to 1.4.0

---
 packages/libzxing-cpp/build.sh                |  8 ++--
 ...4.0-install-required-private-headers.patch | 43 +++++++++++++++++++
 2 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 packages/libzxing-cpp/zxing-cpp-1.4.0-install-required-private-headers.patch

diff --git a/packages/libzxing-cpp/build.sh b/packages/libzxing-cpp/build.sh
index 2180dea31f..24315d9f7f 100644
--- a/packages/libzxing-cpp/build.sh
+++ b/packages/libzxing-cpp/build.sh
@@ -1,13 +1,13 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/nu-book/zxing-cpp
 TERMUX_PKG_DESCRIPTION="An open-source, multi-format 1D/2D barcode image processing library implemented in C++"
-TERMUX_PKG_LICENSE="Apache-2.0, LGPL-3.0"
+TERMUX_PKG_LICENSE="Apache-2.0, LGPL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=1.3.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=1.4.0
 TERMUX_PKG_SRCURL=https://github.com/nu-book/zxing-cpp/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=bfd8fc706def30e34f96088b5a7afdbe0917831e57a774d34e3ee864b01c6891
+TERMUX_PKG_SHA256=126767bb56f8a1f25ae84d233db2e9b9be50d71f5776092d0e170ca0f0ed1862
 TERMUX_PKG_DEPENDS="libc++"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+-DINSTALL_PRIVATE_HEADERS=ON
 -DBUILD_EXAMPLES=OFF
 -DBUILD_BLACKBOX_TESTS=OFF
 "
diff --git a/packages/libzxing-cpp/zxing-cpp-1.4.0-install-required-private-headers.patch b/packages/libzxing-cpp/zxing-cpp-1.4.0-install-required-private-headers.patch
new file mode 100644
index 0000000000..2a85252f54
--- /dev/null
+++ b/packages/libzxing-cpp/zxing-cpp-1.4.0-install-required-private-headers.patch
@@ -0,0 +1,43 @@
+From 4159a44bdc785b27013bc6be1d32b2e442c73b74 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 14 Jul 2022 12:04:27 +0200
+Subject: [PATCH] Add INSTALL_PRIVATE_HEADERS switch to unbreak LibreOffice
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt      | 1 +
+ core/CMakeLists.txt | 6 ++++++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e947ce8d..2e41e773 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,6 +9,7 @@ option (BUILD_BLACKBOX_TESTS "Build the black box reader/writer tests" OFF)
+ option (BUILD_UNIT_TESTS "Build the unit tests (don't enable for production builds)" OFF)
+ option (BUILD_PYTHON_MODULE "Build the python module" OFF)
+ set(BUILD_DEPENDENCIES "AUTO" CACHE STRING "Fetch from github or use locally installed (AUTO/GITHUB/LOCAL)")
++option (INSTALL_PRIVATE_HEADERS "Install (some) private headers to unbreak (some) revdeps broken by 1.4.0 cleanup" OFF)
+ 
+ if (WIN32)
+     option (BUILD_SHARED_LIBS "Build and link as shared library" OFF)
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index 7382bcae..575e696b 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -174,6 +174,12 @@ if (BUILD_WRITERS)
+     )
+ endif()
+ # end of public header set
++if (INSTALL_PRIVATE_HEADERS)
++    set (PUBLIC_HEADERS ${PUBLIC_HEADERS}
++        src/BitArray.h
++    )
++endif()
++# end of 'private' public header set
+ 
+ set (AZTEC_FILES
+ )
+-- 
+2.35.1
+