diff options
Diffstat (limited to 'app-text/mupdf/files')
-rw-r--r-- | app-text/mupdf/files/mupdf-1.15-openssl-x11.patch | 18 | ||||
-rw-r--r-- | app-text/mupdf/files/mupdf-1.19.0-darwin.patch | 39 | ||||
-rw-r--r-- | app-text/mupdf/files/mupdf-1.21.1-no-drm.patch | 18 | ||||
-rw-r--r-- | app-text/mupdf/files/mupdf-1.24.1-cross-fixes.patch (renamed from app-text/mupdf/files/mupdf-1.19.0-cross-fixes.patch) | 74 | ||||
-rw-r--r-- | app-text/mupdf/files/mupdf-1.24.1-darwin.patch | 20 | ||||
-rw-r--r-- | app-text/mupdf/files/mupdf-1.24.1-openssl-x11.patch | 19 |
6 files changed, 88 insertions, 100 deletions
diff --git a/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch b/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch deleted file mode 100644 index 3f3aac4c933a..000000000000 --- a/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/Makerules -+++ b/Makerules -@@ -119,13 +119,13 @@ else ifeq ($(OS),Linux) - SYS_GLUT_LIBS := -lglut -lGL - endif - -- HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes) -+ HAVE_X11 := not-unless-portage-tells-me - ifeq ($(HAVE_X11),yes) - X11_CFLAGS := $(shell pkg-config --cflags x11 xext) - X11_LIBS := $(shell pkg-config --libs x11 xext) - endif - -- HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes) -+ HAVE_LIBCRYPTO := not-unless-portage-tells-me - ifeq ($(HAVE_LIBCRYPTO),yes) - LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO - LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) diff --git a/app-text/mupdf/files/mupdf-1.19.0-darwin.patch b/app-text/mupdf/files/mupdf-1.19.0-darwin.patch deleted file mode 100644 index a81c7a008e44..000000000000 --- a/app-text/mupdf/files/mupdf-1.19.0-darwin.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/Makerules -+++ b/Makerules -@@ -139,11 +139,11 @@ ifeq ($(OS),MINGW) - else ifeq ($(OS),MACOS) - HAVE_GLUT := yes - SYS_GLUT_CFLAGS := -Wno-deprecated-declarations -- SYS_GLUT_LIBS := -framework GLUT -framework OpenGL -- CC = xcrun cc -- AR = xcrun ar -- LD = xcrun ld -- RANLIB = xcrun ranlib -+ SYS_GLUT_LIBS ?= -framework GLUT -framework OpenGL -+ CC ?= xcrun cc -+ AR ?= xcrun ar -+ LD ?= xcrun ld -+ RANLIB ?= xcrun ranlib - - ifeq (, $(shell which pkg-config)) - $(warning "No pkg-config found, install it for proper integration of libcrypto") -@@ -154,9 +154,7 @@ else ifeq ($(OS),MACOS) - LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) - endif - endif -- --else ifeq ($(OS),Linux) -- HAVE_OBJCOPY := yes -+endif - - ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes) - SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2) -@@ -229,8 +227,6 @@ else ifeq ($(OS),Linux) - PTHREAD_LIBS := -lpthread - endif - --endif -- - # The following section has various cross compilation configurations. - # - # Invoke these as: diff --git a/app-text/mupdf/files/mupdf-1.21.1-no-drm.patch b/app-text/mupdf/files/mupdf-1.21.1-no-drm.patch deleted file mode 100644 index 9f2b9d692f4e..000000000000 --- a/app-text/mupdf/files/mupdf-1.21.1-no-drm.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/source/html/epub-doc.c b/source/html/epub-doc.c -index f764242..83888dc 100644 ---- a/source/html/epub-doc.c -+++ b/source/html/epub-doc.c -@@ -692,10 +692,12 @@ epub_parse_header(fz_context *ctx, epub_document *doc) - epub_chapter **tailp; - int i; - -+ #ifdef GENTOO_MUPDF_DRM - if (fz_has_archive_entry(ctx, zip, "META-INF/rights.xml")) - fz_throw(ctx, FZ_ERROR_GENERIC, "EPUB is locked by DRM"); - if (fz_has_archive_entry(ctx, zip, "META-INF/encryption.xml")) - fz_throw(ctx, FZ_ERROR_GENERIC, "EPUB is locked by DRM"); -+ #endif - - fz_var(buf); - fz_var(container_xml); - diff --git a/app-text/mupdf/files/mupdf-1.19.0-cross-fixes.patch b/app-text/mupdf/files/mupdf-1.24.1-cross-fixes.patch index 643b6d2c8b1e..6d87798c2e66 100644 --- a/app-text/mupdf/files/mupdf-1.19.0-cross-fixes.patch +++ b/app-text/mupdf/files/mupdf-1.24.1-cross-fixes.patch @@ -1,33 +1,36 @@ -Refreshed patches based on: -https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0004-MuPDF-crossbuild-use-target-arch-pkg-config.patch/ -https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use-host-cc-for-utils.patch/ ---- a/Makefile -+++ b/Makefile -@@ -147,6 +147,9 @@ PKCS7_OBJ := $(PKCS7_SRC:%.c=$(OUT)/%.o) - - HEXDUMP_EXE := $(OUT)/scripts/hexdump.exe - -+$(HEXDUMP_EXE): scripts/hexdump.c -+ $(QUIET_CC) $(MKTGTDIR) ; $(CC_FOR_BUILD) $(CFLAGS) -o $@ $< -+ - FONT_BIN := $(sort $(wildcard resources/fonts/urw/*.cff)) - FONT_BIN += $(sort $(wildcard resources/fonts/han/*.ttc)) - FONT_BIN += $(sort $(wildcard resources/fonts/droid/*.ttf)) +# Fix cross compilation issue with pkg-config --- a/Makerules +++ b/Makerules -@@ -6,6 +6,9 @@ OS := $(OS:MSYS%=MINGW) - OS := $(OS:Windows_NT=MINGW) - OS := $(OS:Darwin=MACOS) +@@ -9,6 +9,8 @@ ifeq ($(OS),) + OS := $(OS:Darwin=MACOS) + endif +PKG_CONFIG ?= pkg-config +CC_FOR_BUILD ?= $(CC) -+ WARNING_CFLAGS := -Wall -Wsign-compare # Feature configuration options -@@ -156,51 +159,51 @@ else ifeq ($(OS),MACOS) +@@ -194,13 +196,13 @@ else ifeq ($(OS),MACOS) + ifneq ($(ARCHFLAGS),) + $(warning "MacOS with ARCHFLAGS set. Assuming we are building for arm64, and setting HAVE_LIBCRYPTO to no.") + HAVE_LIBCRYPTO := no +- else ifeq (, $(shell command -v pkg-config)) ++ else ifeq (, $(shell command -v $(PKG_CONFIG))) + $(warning "No pkg-config found, install it for proper integration of libcrypto") + else +- HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes) ++ HAVE_LIBCRYPTO := $(shell $(PKG_CONFIG) --exists 'libcrypto >= 1.1.0' && echo yes) + ifeq ($(HAVE_LIBCRYPTO),yes) +- LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO +- LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) ++ LIBCRYPTO_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcrypto) -DHAVE_LIBCRYPTO ++ LIBCRYPTO_LIBS := $(shell $(PKG_CONFIG) --libs libcrypto) + endif + endif + +@@ -210,82 +212,82 @@ else ifeq ($(LINUX_OR_OPENBSD),yes) + HAVE_OBJCOPY := yes endif - endif - ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes) - SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2) @@ -97,6 +100,15 @@ https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use- + SYS_TESSERACT_LIBS := $(shell $(PKG_CONFIG) --libs tesseract) endif +- HAVE_SYS_LIBARCHIVE := $(shell pkg-config --exists 'libarchive' && echo yes) ++ HAVE_SYS_LIBARCHIVE := $(shell $(PKG_CONFIG) --exists 'libarchive' && echo yes) + ifeq ($(HAVE_SYS_LIBARCHIVE),yes) +- SYS_LIBARCHIVE_CFLAGS := $(shell pkg-config --cflags libarchive) +- SYS_LIBARCHIVE_LIBS := $(shell pkg-config --libs libarchive) ++ SYS_LIBARCHIVE_CFLAGS := $(shell $(PKG_CONFIG) --cflags libarchive) ++ SYS_LIBARCHIVE_LIBS := $(shell $(PKG_CONFIG) --libs libarchive) + endif + - HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes) + HAVE_SYS_CURL := $(shell $(PKG_CONFIG) --exists libcurl && echo yes) ifeq ($(HAVE_SYS_CURL),yes) @@ -107,11 +119,20 @@ https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use- endif HAVE_GLUT := yes -@@ -209,16 +212,16 @@ endif - SYS_GLUT_LIBS := -lglut -lGL + ifeq ($(HAVE_GLUT),yes) + ifeq ($(OS),OpenBSD) +- SYS_GLUT_CFLAGS := $(shell pkg-config --cflags glut gl) +- SYS_GLUT_LIBS := $(shell pkg-config --libs glut gl) ++ SYS_GLUT_CFLAGS := $(shell $(PKG_CONFIG) --cflags glut gl) ++ SYS_GLUT_LIBS := $(shell $(PKG_CONFIG) --libs glut gl) + else + SYS_GLUT_CFLAGS := + SYS_GLUT_LIBS := -lglut -lGL + endif endif - HAVE_X11 := not-unless-portage-tells-me +- HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes) ++ HAVE_X11 := $(shell $(PKG_CONFIG) --exists x11 xext && echo yes) ifeq ($(HAVE_X11),yes) - X11_CFLAGS := $(shell pkg-config --cflags x11 xext) - X11_LIBS := $(shell pkg-config --libs x11 xext) @@ -119,7 +140,10 @@ https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use- + X11_LIBS := $(shell $(PKG_CONFIG) --libs x11 xext) endif - HAVE_LIBCRYPTO := not-unless-portage-tells-me + ifeq ($(HAVE_LIBCRYPTO),) +- HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes) ++ HAVE_LIBCRYPTO := $(shell $(PKG_CONFIG) --exists 'libcrypto >= 1.1.0' && echo yes) + endif ifeq ($(HAVE_LIBCRYPTO),yes) - LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO - LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) diff --git a/app-text/mupdf/files/mupdf-1.24.1-darwin.patch b/app-text/mupdf/files/mupdf-1.24.1-darwin.patch new file mode 100644 index 000000000000..9a699fc98209 --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.24.1-darwin.patch @@ -0,0 +1,20 @@ +# Fix configuration on darwin +--- a/Makerules ++++ b/Makerules +@@ -185,11 +185,11 @@ ifeq ($(OS),MINGW) + else ifeq ($(OS),MACOS) + HAVE_GLUT := yes + SYS_GLUT_CFLAGS := -Wno-deprecated-declarations +- SYS_GLUT_LIBS := -framework GLUT -framework OpenGL +- CC = xcrun cc +- AR = xcrun ar +- LD = xcrun ld +- RANLIB = xcrun ranlib ++ SYS_GLUT_LIBS ?= -framework GLUT -framework OpenGL ++ CC ?= xcrun cc ++ AR ?= xcrun ar ++ LD ?= xcrun ld ++ RANLIB ?= xcrun ranlib + + ifneq ($(ARCHFLAGS),) + $(warning "MacOS with ARCHFLAGS set. Assuming we are building for arm64, and setting HAVE_LIBCRYPTO to no.") diff --git a/app-text/mupdf/files/mupdf-1.24.1-openssl-x11.patch b/app-text/mupdf/files/mupdf-1.24.1-openssl-x11.patch new file mode 100644 index 000000000000..77710a6d51a4 --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.24.1-openssl-x11.patch @@ -0,0 +1,19 @@ +--- a/Makerules ++++ b/Makerules +@@ -274,14 +274,14 @@ else ifeq ($(LINUX_OR_OPENBSD),yes) + endif + endif + +- HAVE_X11 := $(shell $(PKG_CONFIG) --exists x11 xext && echo yes) ++ HAVE_X11 := not-unless-portage-tells-me + ifeq ($(HAVE_X11),yes) + X11_CFLAGS := $(shell $(PKG_CONFIG) --cflags x11 xext) + X11_LIBS := $(shell $(PKG_CONFIG) --libs x11 xext) + endif + + ifeq ($(HAVE_LIBCRYPTO),) +- HAVE_LIBCRYPTO := $(shell $(PKG_CONFIG) --exists 'libcrypto >= 1.1.0' && echo yes) ++ HAVE_LIBCRYPTO := not-unless-portage-tells-me + endif + ifeq ($(HAVE_LIBCRYPTO),yes) + LIBCRYPTO_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcrypto) -DHAVE_LIBCRYPTO |