On Sat, 14 Nov 2020 13:24:21 +0100 Bastian Germann
wrote:
Source: mupdf
Severity: normal
Please package the new upstream version 1.18.0.
Patch series enclosed. Please consider importing 1.18.0 soon so that it
can be released with bullseye.
>From 039dafded6dfae0059c4d2a3783ff0de643fe3c3 Mon Sep 17 00:00:00 2001
From: Bastian Germann
Date: Sat, 24 Oct 2020 09:58:28 +0200
Subject: [PATCH 1/4] Refresh patches for v1.18.0
---
...atic-library-to-make-the-build-repro.patch | 6 ++---
...0003-use-debian-flavor-build-options.patch | 4 ++--
...rossbuild-use-target-arch-pkg-config.patch | 19 ++-
...PDF-crossbuild-use-host-cc-for-utils.patch | 6 ++---
.../0006-Allow-disabling-objcopy.patch| 4 ++--
...1-does-not-need-to-link-to-libcrypto.patch | 4 ++--
...Build-mupdf-without-executable-stack.patch | 23 ---
...010-Prevent-thirdparty-archive-build.patch | 8 +++
debian/patches/series | 1 -
9 files changed, 29 insertions(+), 46 deletions(-)
delete mode 100644 debian/patches/0008-Build-mupdf-without-executable-stack.patch
diff --git a/debian/patches/0003-Sort-files-in-static-library-to-make-the-build-repro.patch b/debian/patches/0003-Sort-files-in-static-library-to-make-the-build-repro.patch
index 5624c9ea..498baf21 100644
--- a/debian/patches/0003-Sort-files-in-static-library-to-make-the-build-repro.patch
+++ b/debian/patches/0003-Sort-files-in-static-library-to-make-the-build-repro.patch
@@ -7,13 +7,13 @@ Subject: Sort files in static library to make the build reproducible
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index 814a592..58698dc 100644
+index b0fb617..a33d5c1 100644
--- a/Makefile
+++ b/Makefile
-@@ -53,7 +53,7 @@ endif
+@@ -57,7 +57,7 @@ endif
MKTGTDIR = mkdir -p $(dir $@)
CC_CMD = $(QUIET_CC) $(MKTGTDIR) ; $(CC) $(CFLAGS) -MMD -MP -o $@ -c $<
- CXX_CMD = $(QUIET_CXX) $(MKTGTDIR) ; $(CXX) $(CFLAGS) -MMD -MP -o $@ -c $<
+ CXX_CMD = $(QUIET_CXX) $(MKTGTDIR) ; $(CXX) $(CFLAGS) $(XCXXFLAGS) -MMD -MP -o $@ -c $<
-AR_CMD = $(QUIET_AR) $(MKTGTDIR) ; $(AR) cr $@ $^
+AR_CMD = $(QUIET_AR) $(MKTGTDIR) ; $(AR) cr $@ `LC_ALL=C ls $^ 2>/dev/null`
ifdef RANLIB
diff --git a/debian/patches/0003-use-debian-flavor-build-options.patch b/debian/patches/0003-use-debian-flavor-build-options.patch
index 3b081122..b29f393e 100644
--- a/debian/patches/0003-use-debian-flavor-build-options.patch
+++ b/debian/patches/0003-use-debian-flavor-build-options.patch
@@ -8,10 +8,10 @@ Do not strip binaries by default and use Debian LDFLAGS
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Makerules b/Makerules
-index b96fc71..44d1bd1 100644
+index 9b82b55..93b5ca4 100644
--- a/Makerules
+++ b/Makerules
-@@ -24,7 +24,10 @@ SANITIZE_FLAGS += -fsanitize=leak
+@@ -38,7 +38,10 @@ endif
ifeq ($(build),debug)
CFLAGS += -pipe -g
diff --git a/debian/patches/0004-MuPDF-crossbuild-use-target-arch-pkg-config.patch b/debian/patches/0004-MuPDF-crossbuild-use-target-arch-pkg-config.patch
index 59d4d0b7..592409a7 100644
--- a/debian/patches/0004-MuPDF-crossbuild-use-target-arch-pkg-config.patch
+++ b/debian/patches/0004-MuPDF-crossbuild-use-target-arch-pkg-config.patch
@@ -5,11 +5,11 @@ Subject: MuPDF crossbuild use target arch pkg-config
mupdf fails to cross build, because it uses the build architecture
pkg-config and thus fails to find a pile of .pc files.
---
- Makerules | 52
- 1 file changed, 28 insertions(+), 24 deletions(-)
+ Makerules | 58 +++---
+ 1 file changed, 31 insertions(+), 27 deletions(-)
diff --git a/Makerules b/Makerules
-index 44d1bd1..63a81ab 100644
+index 93b5ca4..e776ed7 100644
--- a/Makerules
+++ b/Makerules
@@ -6,6 +6,10 @@ OS := $(OS:MSYS%=MINGW)
@@ -23,7 +23,7 @@ index 44d1bd1..63a81ab 100644
ifeq ($(findstring -fembed-bitcode,$(XCFLAGS)),)
# clang does not support these in combination with -fembed-bitcode
CFLAGS += -ffunction-sections -fdata-sections
-@@ -97,29 +101,29 @@ else ifeq ($(OS),MACOS)
+@@ -121,33 +125,33 @@ else ifeq ($(OS),MACOS)
else ifeq ($(OS),Linux)
HAVE_OBJCOPY := yes
@@ -34,6 +34,13 @@ index 44d1bd1..63a81ab 100644
+ SYS_FREETYPE_CFLAGS := $(shell $(PKG_CONFIG) --cflags freetype2)
+ SYS_FREETYPE_LIBS := $(shell $(PKG_CONFIG) --libs freetype2)
endif
+- ifeq ($(shell pkg-config --exists gumbo && echo yes),yes)
+- SYS_GUMBO_CFLAGS := $(shell pkg-config --cflags gumbo)
+- SYS_GUMBO_LIBS := $(shell pkg-config --libs gumbo)
++ ifeq ($(shell $(PKG_CONFIG) --exists gumbo && echo yes),yes)
++ SYS_GUMBO_CFLAGS := $(shell $(PKG_CONFIG) --cflags gumbo)
++ SYS_GUMBO_LIBS := $(shell $(PKG_CONFIG) --libs gumbo)
+ endif
- ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes)
- SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
- SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz)
@@ -70,8 +77,8 @@ index
