repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/
"Sam James" <[email protected]>
| Newsgroups | gmane.linux.gentoo.cvs |
|---|---|
| Message-ID | <1786298604.df71425d1fadea432ef84f6b41bd82cb39577201.sam@gentoo> |
commit: df71425d1fadea432ef84f6b41bd82cb39577201
Author: Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Fri Jul 24 08:54:01 2026 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 9 18:03:24 2026 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df71425d
app-text/mupdf: fix build against system zxing-cpp
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/1518
Merges: https://codeberg.org/gentoo/gentoo/pulls/1518
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/mupdf-1.27.2-fix-system-zxing-cpp.patch | 23 ++++++++++++++++++++++
app-text/mupdf/mupdf-1.27.2.ebuild | 1 +
2 files changed, 24 insertions(+)
diff --git a/app-text/mupdf/files/mupdf-1.27.2-fix-system-zxing-cpp.patch b/app-text/mupdf/files/mupdf-1.27.2-fix-system-zxing-cpp.patch
new file mode 100644
index 000000000000..19f244341503
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.27.2-fix-system-zxing-cpp.patch
@@ -0,0 +1,23 @@
+Cannot be upstreamed as is. It would break upstreams vendored zxing-cpp.
+
+--- a/source/fitz/zxingbarcode.cpp
++++ b/source/fitz/zxingbarcode.cpp
+@@ -28,13 +28,13 @@
+ #error "FZ_ENABLE_BARCODE set without HAVE_ZXINGCPP!"
+ #endif
+
+-#include "ReadBarcode.h"
++#include "ZXing/ReadBarcode.h"
+
+ #ifdef ZXING_EXPERIMENTAL_API
+-#include "WriteBarcode.h"
++#include "ZXing/WriteBarcode.h"
+ #else
+-#include "BitMatrix.h"
+-#include "MultiFormatWriter.h"
++#include "ZXing/BitMatrix.h"
++#include "ZXing/MultiFormatWriter.h"
+ #endif
+
+ using namespace ZXing;
+
diff --git a/app-text/mupdf/mupdf-1.27.2.ebuild b/app-text/mupdf/mupdf-1.27.2.ebuild
index a453f7599716..e74fa2c0bf4c 100644
--- a/app-text/mupdf/mupdf-1.27.2.ebuild
+++ b/app-text/mupdf/mupdf-1.27.2.ebuild
@@ -56,6 +56,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.24.8-add-desktop-pc-files.patch
"${FILESDIR}"/${P}-cross-fixes.patch
"${FILESDIR}"/${PN}-1.24.1-darwin.patch
+ "${FILESDIR}"/${PN}-1.27.2-fix-system-zxing-cpp.patch
# See bug #662352
"${FILESDIR}"/${P}-openssl-x11.patch
# General cross fixes from Debian (refreshed)