From: "orbea" <orbea@riseup.net>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/libressl:master commit in: app-text/mupdf/files/, app-text/mupdf/
Date: Fri, 13 Sep 2024 01:40:37 +0000 (UTC) [thread overview]
Message-ID: <1726190176.a4904bd74fa8dd259d8948039cbe7f45533a6fa8.orbea@gentoo> (raw)
commit: a4904bd74fa8dd259d8948039cbe7f45533a6fa8
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Fri Sep 13 01:16:16 2024 +0000
Commit: orbea <orbea <AT> riseup <DOT> net>
CommitDate: Fri Sep 13 01:16:16 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=a4904bd7
app-text/mupdf: treeclean
Signed-off-by: orbea <orbea <AT> riseup.net>
app-text/mupdf/Manifest | 1 -
app-text/mupdf/files/mupdf-1.15-CFLAGS.patch | 13 --
app-text/mupdf/files/mupdf-1.19.0-Makefile.patch | 37 -----
.../files/mupdf-1.21.0-add-desktop-pc-files.patch | 33 ----
.../mupdf-1.21.1-fix-aliasing-violation.patch | 63 --------
.../mupdf/files/mupdf-1.23.3-cross-fixes.patch | 120 ---------------
app-text/mupdf/files/mupdf-1.23.3-darwin.patch | 45 ------
.../mupdf/files/mupdf-1.23.3-openssl-x11.patch | 19 ---
app-text/mupdf/files/mupdf-1.23.7-libressl.patch | 15 --
app-text/mupdf/metadata.xml | 15 --
app-text/mupdf/mupdf-1.23.7-r1.ebuild | 166 ---------------------
11 files changed, 527 deletions(-)
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
deleted file mode 100644
index dac6798..0000000
--- a/app-text/mupdf/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mupdf-1.23.7-source.tar.gz 55312697 BLAKE2B 7ceb7c1871d33b77d4a3d52ed2d1af514c09349df019a189fa7df8ad09648fae313d63de4c1ce6b0666d17f9a897d5ac788d0be2d8896d9b7e4e6ecf679bad7c SHA512 581a4a5a16041bb405fbd7c1b9fba47da5745f00cbdf30e0e0468bfe67ac542884193b5957b293a4cdfc52f043b4f19612086f294b93dbd242d34735a1088777
diff --git a/app-text/mupdf/files/mupdf-1.15-CFLAGS.patch b/app-text/mupdf/files/mupdf-1.15-CFLAGS.patch
deleted file mode 100644
index a7de530..0000000
--- a/app-text/mupdf/files/mupdf-1.15-CFLAGS.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makerules b/Makerules
-index 298b5737..71c307e6 100644
---- a/Makerules
-+++ b/Makerules
-@@ -21,8 +21,6 @@ SANITIZE_FLAGS += -fsanitize=address
- SANITIZE_FLAGS += -fsanitize=leak
-
- ifeq ($(build),debug)
-- CFLAGS += -pipe -g
-- LDFLAGS += -g
- else ifeq ($(build),release)
- CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer
- LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s
diff --git a/app-text/mupdf/files/mupdf-1.19.0-Makefile.patch b/app-text/mupdf/files/mupdf-1.19.0-Makefile.patch
deleted file mode 100644
index b266655..0000000
--- a/app-text/mupdf/files/mupdf-1.19.0-Makefile.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 7fa74b3..e842374 100644
---- a/Makefile
-+++ b/Makefile
-@@ -3,7 +3,7 @@
- -include user.make
-
- ifndef build
-- build := release
-+ build := debug
- endif
-
- default: all
-@@ -252,17 +252,19 @@ $(THIRD_GLUT_LIB) : $(THIRD_GLUT_OBJ)
- $(THREAD_LIB) : $(THREAD_OBJ)
- $(PKCS7_LIB) : $(PKCS7_OBJ)
- else
--MUPDF_LIB = $(OUT)/libmupdf.a
-+MUPDF_LIB = libmupdf.so.$(GENTOO_PV)
- LIBS_TO_INSTALL_IN_LIB = $(MUPDF_LIB) $(THIRD_LIB)
--THIRD_LIB = $(OUT)/libmupdf-third.a
-+THIRD_LIB =
-+MUPDF_STATIC = $(OUT)/libmupdf.a
- ifneq ($(USE_SYSTEM_GLUT),yes)
- THIRD_GLUT_LIB = $(OUT)/libmupdf-glut.a
- endif
- THREAD_LIB = $(OUT)/libmupdf-threads.a
- PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
-
--$(MUPDF_LIB) : $(MUPDF_OBJ)
--$(THIRD_LIB) : $(THIRD_OBJ)
-+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ)
-+ $(QUIET_LINK) $(CC) $(LDFLAGS) --shared -Wl,-soname -Wl,$(MUPDF_LIB) -o $@ $^ $(THIRD_LIBS) $(LIBS)
-+$(MUPDF_STATIC): $(MUPDF_OBJ) $(THIRD_OBJ)
- $(THIRD_GLUT_LIB) : $(THIRD_GLUT_OBJ)
- $(THREAD_LIB) : $(THREAD_OBJ)
- $(PKCS7_LIB) : $(PKCS7_OBJ)
diff --git a/app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch b/app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch
deleted file mode 100644
index 4d449a2..0000000
--- a/app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- /dev/null
-+++ ./platform/debian/mupdf.desktop
-@@ -0,0 +1,15 @@
-+[Desktop Entry]
-+Name=MuPDF
-+GenericName=PDF file viewer
-+Exec=mupdf %f
-+TryExec=mupdf
-+Icon=new-mupdf-icon
-+Terminal=false
-+Type=Application
-+MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;image/jpeg;image/pjpeg;image/png;image/tiff;image/x-tiff;
-+Categories=Viewer;Graphics;
-+Actions=View;
-+
-+[Desktop Action View]
-+Name=View with mupdf
-+Exec=mupdf %f
---- /dev/null
-+++ ./platform/debian/mupdf.pc
-@@ -0,0 +1,12 @@
-+prefix=/usr
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/lib
-+includedir=${prefix}/include
-+
-+Name: mupdf
-+Description: Library for rendering PDF documents
-+Requires: freetype2 libopenjp2 libcrypto
-+Version: 0.5.0
-+Libs: -L${libdir} -lmupdf
-+Libs.private: -lmupdf-js-none
-+Cflags: -I${includedir}
diff --git a/app-text/mupdf/files/mupdf-1.21.1-fix-aliasing-violation.patch b/app-text/mupdf/files/mupdf-1.21.1-fix-aliasing-violation.patch
deleted file mode 100644
index 4f51f72..0000000
--- a/app-text/mupdf/files/mupdf-1.21.1-fix-aliasing-violation.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-https://bugs.gentoo.org/859847
-
-From 8c6f6bf3ad2fd33d15de6ee96175cd29bf804d9f Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Tue, 26 Jul 2022 15:47:02 -0400
-Subject: [PATCH] Fix aliasing violation
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Noticed when compiling with link-time optimizations.
-
-include/GL/freeglut_std.h:240:18: error: type of `glutBitmapHelvetica18` does not match original declaration [-Werror=lto-type-mismatch]
- 240 | extern void* glutBitmapHelvetica18;
- | ^
-src/x11/fg_glutfont_definitions_x11.c:103:27: note: `glutBitmapHelvetica18` was previously declared here
- 103 | struct freeglutBitmapFont glutBitmapHelvetica18 ;
- | ^
-src/x11/fg_glutfont_definitions_x11.c:103:27: note: code may be misoptimized unless `-fno-strict-aliasing` is used
----
- src/x11/fg_glutfont_definitions_x11.c | 29 ++++++++++++++++++---------
- 1 file changed, 20 insertions(+), 9 deletions(-)
-
---- a/thirdparty/freeglut/src/x11/fg_glutfont_definitions_x11.c
-+++ b/thirdparty/freeglut/src/x11/fg_glutfont_definitions_x11.c
-@@ -91,14 +91,25 @@ struct freeglutBitmapFont
- };
-
-
--struct freeglutStrokeFont glutStrokeRoman ;
--struct freeglutStrokeFont glutStrokeMonoRoman ;
-+static struct freeglutStrokeFont glutStrokeRoman_ ;
-+static struct freeglutStrokeFont glutStrokeMonoRoman_ ;
-
--struct freeglutBitmapFont glutBitmap9By15 ;
--struct freeglutBitmapFont glutBitmap8By13 ;
--struct freeglutBitmapFont glutBitmapTimesRoman10 ;
--struct freeglutBitmapFont glutBitmapTimesRoman24 ;
--struct freeglutBitmapFont glutBitmapHelvetica10 ;
--struct freeglutBitmapFont glutBitmapHelvetica12 ;
--struct freeglutBitmapFont glutBitmapHelvetica18 ;
-+static struct freeglutBitmapFont glutBitmap9By15_ ;
-+static struct freeglutBitmapFont glutBitmap8By13_ ;
-+static struct freeglutBitmapFont glutBitmapTimesRoman10_ ;
-+static struct freeglutBitmapFont glutBitmapTimesRoman24_ ;
-+static struct freeglutBitmapFont glutBitmapHelvetica10_ ;
-+static struct freeglutBitmapFont glutBitmapHelvetica12_ ;
-+static struct freeglutBitmapFont glutBitmapHelvetica18_ ;
-
-+
-+void *glutStrokeRoman = &glutStrokeRoman_ ;
-+void *glutStrokeMonoRoman = &glutStrokeMonoRoman_ ;
-+
-+void *glutBitmap9By15 = &glutBitmap9By15_ ;
-+void *glutBitmap8By13 = &glutBitmap8By13_ ;
-+void *glutBitmapTimesRoman10 = &glutBitmapTimesRoman10_ ;
-+void *glutBitmapTimesRoman24 = &glutBitmapTimesRoman24_ ;
-+void *glutBitmapHelvetica10 = &glutBitmapHelvetica10_ ;
-+void *glutBitmapHelvetica12 = &glutBitmapHelvetica12_ ;
-+void *glutBitmapHelvetica18 = &glutBitmapHelvetica18_ ;
---
-2.35.1
-
diff --git a/app-text/mupdf/files/mupdf-1.23.3-cross-fixes.patch b/app-text/mupdf/files/mupdf-1.23.3-cross-fixes.patch
deleted file mode 100644
index 02fa3bf..0000000
--- a/app-text/mupdf/files/mupdf-1.23.3-cross-fixes.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-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/Makerules
-+++ b/Makerules
-@@ -9,6 +9,9 @@ ifeq ($(OS),)
- OS := $(OS:Darwin=MACOS)
- endif
-
-+PKG_CONFIG ?= pkg-config
-+CC_FOR_BUILD ?= $(CC)
-+
- WARNING_CFLAGS := -Wall -Wsign-compare
-
- # Feature configuration options
-@@ -190,51 +193,51 @@ else ifeq ($(OS),Linux)
- LDFLAGS += -sTOTAL_MEMORY=48MB
- endif
-
-- ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
-- SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
-- SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2)
-+ ifeq ($(shell $(PKG_CONFIG) --exists freetype2 && echo yes),yes)
-+ 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)
-+ 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)
- endif
-- ifeq ($(shell pkg-config --exists lcms2 && echo yes),yes)
-- SYS_LCMS2_CFLAGS := $(shell pkg-config --cflags lcms2)
-- SYS_LCMS2_LIBS := $(shell pkg-config --libs lcms2)
-+ ifeq ($(shell $(PKG_CONFIG) --exists lcms2 && echo yes),yes)
-+ SYS_LCMS2_CFLAGS := $(shell $(PKG_CONFIG) --cflags lcms2)
-+ SYS_LCMS2_LIBS := $(shell $(PKG_CONFIG) --libs lcms2)
- endif
-- ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes)
-- SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg)
-- SYS_LIBJPEG_LIBS := $(shell pkg-config --libs libjpeg)
-+ ifeq ($(shell $(PKG_CONFIG) --exists libjpeg && echo yes),yes)
-+ SYS_LIBJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libjpeg)
-+ SYS_LIBJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libjpeg)
- endif
-- ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes)
-- SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2)
-- SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2)
-+ ifeq ($(shell $(PKG_CONFIG) --exists libopenjp2 && echo yes),yes)
-+ SYS_OPENJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libopenjp2)
-+ SYS_OPENJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libopenjp2)
- endif
-- ifeq ($(shell pkg-config --exists zlib && echo yes),yes)
-- SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib)
-- SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
-+ ifeq ($(shell $(PKG_CONFIG) --exists zlib && echo yes),yes)
-+ SYS_ZLIB_CFLAGS := $(shell $(PKG_CONFIG) --cflags zlib)
-+ SYS_ZLIB_LIBS := $(shell $(PKG_CONFIG) --libs zlib)
- endif
-
-- HAVE_SYS_LEPTONICA := $(shell pkg-config --exists 'lept >= 1.7.4' && echo yes)
-+ HAVE_SYS_LEPTONICA := $(shell $(PKG_CONFIG) --exists 'lept >= 1.7.4' && echo yes)
- ifeq ($(HAVE_SYS_LEPTONICA),yes)
-- SYS_LEPTONICA_CFLAGS := $(shell pkg-config --cflags lept)
-- SYS_LEPTONICA_LIBS := $(shell pkg-config --libs lept)
-+ SYS_LEPTONICA_CFLAGS := $(shell $(PKG_CONFIG) --cflags lept)
-+ SYS_LEPTONICA_LIBS := $(shell $(PKG_CONFIG) --libs lept)
- endif
-
-- HAVE_SYS_TESSERACT := $(shell pkg-config --exists 'tesseract >= 4.0.0' && echo yes)
-+ HAVE_SYS_TESSERACT := $(shell $(PKG_CONFIG) --exists 'tesseract >= 4.0.0' && echo yes)
- ifeq ($(HAVE_SYS_TESSERACT),yes)
-- SYS_TESSERACT_CFLAGS := $(shell pkg-config --cflags tesseract)
-- SYS_TESSERACT_LIBS := $(shell pkg-config --libs tesseract)
-+ SYS_TESSERACT_CFLAGS := $(shell $(PKG_CONFIG) --cflags tesseract)
-+ SYS_TESSERACT_LIBS := $(shell $(PKG_CONFIG) --libs tesseract)
- 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)
-- SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
-- SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
-+ SYS_CURL_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcurl)
-+ SYS_CURL_LIBS := $(shell $(PKG_CONFIG) --libs libcurl)
- endif
-
- HAVE_GLUT := yes
-@@ -243,18 +246,18 @@ else ifeq ($(OS),Linux)
- SYS_GLUT_LIBS := -lglut -lGL
- endif
-
- 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)
-+ X11_CFLAGS := $(shell $(PKG_CONFIG) --cflags x11 xext)
-+ X11_LIBS := $(shell $(PKG_CONFIG) --libs x11 xext)
- endif
-
- ifeq ($(HAVE_LIBCRYPTO),)
- HAVE_LIBCRYPTO := not-unless-portage-tells-me
- endif
- 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
-
- HAVE_PTHREAD := yes
diff --git a/app-text/mupdf/files/mupdf-1.23.3-darwin.patch b/app-text/mupdf/files/mupdf-1.23.3-darwin.patch
deleted file mode 100644
index c151d81..0000000
--- a/app-text/mupdf/files/mupdf-1.23.3-darwin.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/Makerules
-+++ b/Makerules
-@@ -161,11 +161,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.")
-@@ -180,15 +180,7 @@ else ifeq ($(OS),MACOS)
- endif
- endif
-
--else ifeq ($(OS),Linux)
-- ifeq ($(PYODIDE_ROOT),)
-- HAVE_OBJCOPY := yes
-- else
-- # Pyodide's ld does not support -b so we cannot use it to create object
-- # files containing font data, so leave HAVE_OBJCOPY unset. And we need
-- # extra memory when linking.
-- LDFLAGS += -sTOTAL_MEMORY=48MB
-- endif
-+endif
-
- ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
- SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
-@@ -263,8 +255,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.23.3-openssl-x11.patch b/app-text/mupdf/files/mupdf-1.23.3-openssl-x11.patch
deleted file mode 100644
index b91bd9a..0000000
--- a/app-text/mupdf/files/mupdf-1.23.3-openssl-x11.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/Makerules
-+++ b/Makerules
-@@ -243,14 +243,14 @@ 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
-
- 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
diff --git a/app-text/mupdf/files/mupdf-1.23.7-libressl.patch b/app-text/mupdf/files/mupdf-1.23.7-libressl.patch
deleted file mode 100644
index 02c91e3..0000000
--- a/app-text/mupdf/files/mupdf-1.23.7-libressl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-EVP_add_digest is no longer needed with LibreSSL >= 3.9.0
-
---- a/source/helpers/pkcs7/pkcs7-openssl.c
-+++ b/source/helpers/pkcs7/pkcs7-openssl.c
-@@ -793,8 +793,10 @@ pdf_pkcs7_signer *pkcs7_openssl_read_pfx(fz_context *ctx, const char *pfile, con
-
- OpenSSL_add_all_algorithms();
-
-+#if !defined(LIBRESSL_VERSION_NUMBER) || (LIBRESSL_VERSION_NUMBER < 0x3090000fL)
- EVP_add_digest(EVP_md5());
- EVP_add_digest(EVP_sha1());
-+#endif
-
- ERR_load_crypto_strings();
-
diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml
deleted file mode 100644
index 44f3788..0000000
--- a/app-text/mupdf/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>rndxelement@protonmail.com</email>
- <name>Philipp Rösner</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
- <use>
- <flag name="archive">Enable support for CBR and other archive formats using libarchive</flag>
- </use>
-</pkgmetadata>
diff --git a/app-text/mupdf/mupdf-1.23.7-r1.ebuild b/app-text/mupdf/mupdf-1.23.7-r1.ebuild
deleted file mode 100644
index 931128e..0000000
--- a/app-text/mupdf/mupdf-1.23.7-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please check upstream git regularly for relevant security-related commits
-# to backport.
-
-inherit desktop flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git"
-SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.gz"
-S="${WORKDIR}"/${P}-source
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="+javascript opengl ssl X"
-REQUIRED_USE="opengl? ( javascript )"
-
-# Although we use the bundled, patched version of freeglut in mupdf (because of
-# bug #653298), the best way to ensure that its dependencies are present is to
-# install system's freeglut.
-RDEPEND="
- dev-libs/gumbo:=
- media-libs/freetype:2
- media-libs/harfbuzz:=[truetype]
- media-libs/jbig2dec:=
- media-libs/libpng:0=
- >=media-libs/openjpeg-2.1:2=
- >=media-libs/libjpeg-turbo-1.5.3-r2:0=
- net-misc/curl
- javascript? ( >=dev-lang/mujs-1.2.0:= )
- opengl? ( >=media-libs/freeglut-3.0.0 )
- ssl? ( >=dev-libs/openssl-1.1:0= )
- sys-libs/zlib
- X? (
- media-libs/libglvnd[X]
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrandr
- )
-"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.15-CFLAGS.patch
- "${FILESDIR}"/${PN}-1.19.0-Makefile.patch
- "${FILESDIR}"/${PN}-1.21.0-add-desktop-pc-files.patch
- "${FILESDIR}"/${PN}-1.23.3-darwin.patch
- # See bugs #662352
- "${FILESDIR}"/${PN}-1.23.3-openssl-x11.patch
- # General cross fixes from Debian (refreshed)
- "${FILESDIR}"/${PN}-1.23.3-cross-fixes.patch
- "${FILESDIR}"/${PN}-1.21.1-fix-aliasing-violation.patch
- "${FILESDIR}"/${PN}-1.23.7-libressl.patch
-)
-
-src_prepare() {
- default
-
- use hppa && append-cflags -ffunction-sections
-
- append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)"
-
- sed -e "1iOS = Linux" \
- -e "1iCC = $(tc-getCC)" \
- -e "1iCXX = $(tc-getCXX)" \
- -e "1iLD = $(tc-getLD)" \
- -e "1iAR = $(tc-getAR)" \
- -e "1iverbose = yes" \
- -e "1ibuild = debug" \
- -i Makerules || die "Failed adding build variables to Makerules in src_prepare()"
-
- # Adjust MuPDF version in .pc file created by the
- # mupdf-1.21.0-add-desktop-pc-files.patch file
- sed -e "s/Version: \(.*\)/Version: ${PV}/" \
- -i platform/debian/${PN}.pc || die "Failed substituting version in ${PN}.pc"
-}
-
-_emake() {
- # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
- #
- # Bundled libs
- # * General
- # Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's
- # recommendations. It does not mean "always use system libs".
- # See [0] below for what it means in a specific version.
- #
- # * freeglut
- # We don't use system's freeglut because upstream has a special modified
- # version of it that gives mupdf clipboard support. See bug #653298
- #
- # * mujs
- # As of v1.15.0, mupdf started using symbols in mujs that were not part
- # of any release. We then went back to using the bundled version of it.
- # But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk
- # when bumping and check!
- # See bug #685244
- #
- # * lmms2
- # mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1].
- # It is therefore not appropriate for us to unbundle it at this time.
- #
- # [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9
- # [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt
- local myemakeargs=(
- GENTOO_PV=${PV}
- HAVE_GLUT=$(usex opengl)
- HAVE_LIBCRYPTO=$(usex ssl)
- HAVE_X11=$(usex X)
- USE_SYSTEM_LIBS=yes
- USE_SYSTEM_MUJS=$(usex javascript)
- USE_SYSTEM_GLUT=no
- HAVE_OBJCOPY=no
- "$@"
- )
-
- emake "${myemakeargs[@]}"
-}
-
-src_compile() {
- tc-export PKG_CONFIG
-
- _emake XCFLAGS="-fPIC"
-}
-
-src_install() {
- if use opengl || use X ; then
- domenu platform/debian/${PN}.desktop
- doicon -s scalable docs/logo/new-${PN}-icon.svg
- else
- rm docs/man/${PN}.1 || die "Failed to remove man page in src_install()"
- fi
-
- sed -i \
- -e "1iprefix = ${ED}/usr" \
- -e "1ilibdir = ${ED}/usr/$(get_libdir)" \
- -e "1idocdir = ${ED}/usr/share/doc/${PF}" \
- -i Makerules || die "Failed adding liprefix, lilibdir and lidocdir to Makerules in src_install()"
-
- _emake install
-
- dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
-
- if use opengl ; then
- einfo "mupdf symlink points to mupdf-gl (bug 616654)"
- dosym ${PN}-gl /usr/bin/${PN}
- elif use X ; then
- einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
- dosym ${PN}-x11 /usr/bin/${PN}
- fi
-
- # Respect libdir and EPREFIX (bugs #734898, #911965)
- sed -i -e "s:/lib:/$(get_libdir):" \
- -e "s:/usr:${EPREFIX}/usr:" platform/debian/${PN}.pc \
- || die "Failed to sed pkgconfig file to respect libdir and EPREFIX in src_install()"
-
- insinto /usr/$(get_libdir)/pkgconfig
- doins platform/debian/${PN}.pc
-
- dodoc README CHANGES CONTRIBUTORS
-}
next reply other threads:[~2024-09-13 1:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-13 1:40 orbea [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-08-01 18:35 [gentoo-commits] repo/proj/libressl:master commit in: app-text/mupdf/files/, app-text/mupdf/ orbea
2024-03-11 0:42 orbea
2023-11-08 0:16 orbea
2022-12-08 18:31 Quentin Retornaz
2022-10-07 21:11 Quentin Retornaz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1726190176.a4904bd74fa8dd259d8948039cbe7f45533a6fa8.orbea@gentoo \
--to=orbea@riseup.net \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox