[gentoo-commits] repo/proj/libressl:master commit in: app-text/mupdf/

2024-03-15 Thread orbea
commit: a212cbf992c7c0f2fe0fce49d2c34368ec999808
Author: orbea  riseup  net>
AuthorDate: Fri Mar 15 07:44:53 2024 +
Commit: orbea  riseup  net>
CommitDate: Fri Mar 15 07:44:53 2024 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=a212cbf9

app-text/mupdf: stabilize 1.23.7-r1

Signed-off-by: orbea  riseup.net>

 app-text/mupdf/mupdf-1.23.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/mupdf/mupdf-1.23.7-r1.ebuild 
b/app-text/mupdf/mupdf-1.23.7-r1.ebuild
index f2f5248..931128e 100644
--- a/app-text/mupdf/mupdf-1.23.7-r1.ebuild
+++ b/app-text/mupdf/mupdf-1.23.7-r1.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="+javascript opengl ssl X"
 REQUIRED_USE="opengl? ( javascript )"
 



[gentoo-commits] repo/proj/libressl:master commit in: app-text/mupdf/files/, app-text/mupdf/

2024-03-10 Thread orbea
commit: f53a38c35fb954c8a7fa05b3984daa0af0868a8c
Author: orbea  riseup  net>
AuthorDate: Sun Mar 10 21:29:30 2024 +
Commit: orbea  riseup  net>
CommitDate: Sun Mar 10 21:29:30 2024 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=f53a38c3

app-text/mupdf: new package, add 1.22.0-r1, 1.23.3-r1, 1.23.7-r1

Signed-off-by: orbea  riseup.net>

 app-text/mupdf/Manifest|   3 +
 app-text/mupdf/files/mupdf-1.15-CFLAGS.patch   |  13 ++
 app-text/mupdf/files/mupdf-1.15-openssl-x11.patch  |  18 +++
 app-text/mupdf/files/mupdf-1.19.0-Makefile.patch   |  37 +
 .../mupdf/files/mupdf-1.19.0-cross-fixes.patch | 130 
 app-text/mupdf/files/mupdf-1.19.0-darwin.patch |  39 +
 .../files/mupdf-1.21.0-add-desktop-pc-files.patch  |  33 
 .../mupdf-1.21.1-fix-aliasing-violation.patch  |  63 
 app-text/mupdf/files/mupdf-1.21.1-no-drm.patch |  18 +++
 .../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.22.0-r1.ebuild  | 165 
 app-text/mupdf/mupdf-1.23.3-r1.ebuild  | 165 
 app-text/mupdf/mupdf-1.23.7-r1.ebuild  | 166 +
 17 files changed, 1064 insertions(+)

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
new file mode 100644
index 000..a835f7c
--- /dev/null
+++ b/app-text/mupdf/Manifest
@@ -0,0 +1,3 @@
+DIST mupdf-1.22.0-source.tar.gz 55043552 BLAKE2B 
745a2fd1d0406acf4fa696585bcd21a4ff36e7539c1d45f886dfe5c9bbf966169e5183e89940d81e88db3014f1ebb0446ae1732b6c2fa25a135251853b71f1f7
 SHA512 
ba073b977306420343c969e6fec37cca4559031ad06cfdee2356edfdfa013ebe7654175aff931684fa48a935bf87f68537754b5e83f767517bc428ac07709a59
+DIST mupdf-1.23.3-source.tar.gz 55144800 BLAKE2B 
816e2bf46c2431df9726976efeaa0d7ebd8809cbdd9331a747cca32088aaf21b70e9522614d1dc20c856cc597003be6285f866eae8bbde3098e702acfdea8465
 SHA512 
37fbebd07680d79a38d289264a4028396ee58fad52c541efa37463e63a45ed8bab71188d6c05eb15e602964d89ee6633575dceb972f7bd8b0b5efdde5af9b737
+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
new file mode 100644
index 000..a7de530
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.15-CFLAGS.patch
@@ -0,0 +1,13 @@
+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.15-openssl-x11.patch 
b/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch
new file mode 100644
index 000..3f3aac4
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch
@@ -0,0 +1,18 @@
+--- 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-Makefile.patch 
b/app-text/mupdf/files/mupdf-1.19.0-Makefile.patch
new file mode 100644
index 000..b266655
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.19.0-Makefile.patch
@@ -0,0 +1,37 @@
+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 

[gentoo-commits] repo/proj/libressl:master commit in: app-text/mupdf/files/, app-text/mupdf/

2023-11-07 Thread orbea
commit: 8996e2a6f25c6039962521ec64706dffa037f7ba
Author: orbea  riseup  net>
AuthorDate: Tue Nov  7 23:49:05 2023 +
Commit: orbea  riseup  net>
CommitDate: Tue Nov  7 23:49:05 2023 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=8996e2a6

app-text/mupdf: treeclean

Signed-off-by: orbea  riseup.net>

 app-text/mupdf/Manifest|   1 -
 .../mupdf-1.10a-add-desktop-pc-xpm-files.patch | 533 -
 app-text/mupdf/files/mupdf-1.15-CFLAGS.patch   |  13 -
 app-text/mupdf/files/mupdf-1.15-openssl-x11.patch  |  18 -
 app-text/mupdf/files/mupdf-1.19.0-Makefile.patch   |  37 --
 .../mupdf/files/mupdf-1.19.0-cross-fixes.patch | 130 -
 app-text/mupdf/files/mupdf-1.19.0-darwin.patch |  39 --
 app-text/mupdf/files/mupdf-1.20.3-libressl.patch   |  15 -
 app-text/mupdf/metadata.xml|  15 -
 app-text/mupdf/mupdf-1.19.1.ebuild | 154 --
 10 files changed, 955 deletions(-)

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
deleted file mode 100644
index 34a0dc1..000
--- a/app-text/mupdf/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B 
a0dc3783c70cee1b7eb48d1658eb48186e35a42513aa9e98f7155bb82ed771ed0c5d5032013d09d93cdca4f49deda65553fe0e1af7645893722dafa855b2c958
 SHA512 
d6bc5b6adb6a418de50021864f4b3a75da653fa534eeedbfe9875cb202efeb13efdec66b4d108ca8fa6b0dc76733468b214e5fdf331bebc35fc6f722203fa3f7

diff --git a/app-text/mupdf/files/mupdf-1.10a-add-desktop-pc-xpm-files.patch 
b/app-text/mupdf/files/mupdf-1.10a-add-desktop-pc-xpm-files.patch
deleted file mode 100644
index decab50..000
--- a/app-text/mupdf/files/mupdf-1.10a-add-desktop-pc-xpm-files.patch
+++ /dev/null
@@ -1,533 +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=mupdf
-+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}
 /dev/null
-+++ ./platform/debian/mupdf.xpm
-@@ -0,0 +1,497 @@
-+/* XPM */
-+static char *mupdf[] = {
-+/* width height ncolors chars_per_pixel */
-+"48 48 442 2",
-+/* colors */
-+"   c #00",
-+" . c #2E4558",
-+" X c #252121",
-+" o c #AFAFAF",
-+" O c #28313B",
-+" + c #231F1F",
-+" @ c #68",
-+" # c #98BDD7",
-+" $ c #201B1C",
-+" % c #7CABCC",
-+" & c #4487B6",
-+" * c #DFDEDE",
-+" = c #4285B4",
-+" - c #615E5F",
-+" ; c #605E5E",
-+" : c #23262C",
-+" > c #D9D8D8",
-+" , c #F7FAFC",
-+" < c #D7D6D6",
-+" 1 c #BFD6E6",
-+" 2 c #6BA0C5",
-+" 3 c #232122",
-+" 4 c #555253",
-+" 5 c #CD",
-+" 6 c #E7EFF6",
-+" 7 c #4786B2",
-+" 8 c #CADDEA",
-+" 9 c #4085B5",
-+" 0 c #AECBDF",
-+" q c #CBCACA",
-+" w c #92B9D4",
-+" e c #365F7D",
-+" r c #5A95BE",
-+" t c #3E83B3",
-+" y c #304B60",
-+" u c #C7C6C6",
-+" i c #4D8EBB",
-+" p c #F1F6F9",
-+" a c #C1C0C0",
-+" s c #454243",
-+" d c #669CC3",
-+" f c #81AECD",
-+" g c #7A",
-+" h c #434041",
-+" j c #3E779F",
-+" k c #272E36",
-+" l c #413E3F",
-+" z c #3F3C3D",
-+" x c #5895BF",
-+" c c #3D3A3B",
-+" v c #C6DBE9",
-+" b c #B8B6B7",
-+" n c #4282B0",
-+" m c #FDFDFE",
-+" M c #B7B6B6",
-+" N c #8DB5D2",
-+" B c #242529",
-+" V c #B3B2B2",
-+" C c #222327",
-+" Z c #B0AEAF",
-+" A c #EDF4F8",
-+" S c #686565",
-+" D c #488AB9",
-+" F c #9ABED8",
-+" G c #7EACCD",
-+" H c #ECF2F7",
-+" J c #211C1C",
-+" K c #666363",
-+" L c #F1F1F2",
-+" P c #AB",
-+" I c #4588B6",
-+" U c #A9A8A8",
-+" Y c #2D2A2B",
-+" T c #A7A6A6",
-+" R c #615D5E",
-+" E c #2B2829",
-+" W c #8DB7D5",
-+" Q c #F9FBFD",
-+" ! c #DDE9F2",
-+" ~ c #F8FBFC",
-+" ^ c #DCE9F1",
-+" / c #A5C5DC",
-+" ( c #89B3D1",
-+" ) c #5C5959",
-+" _ c #A4C5DB",
-+" ` c #335A76",
-+" ' c #518FBB",
-+" ] c #E6E7E7",
-+" [ c #5A5757",
-+" { c #232021",
-+" } c #33536C",
-+" | c #98BED9",
-+".  c #E0E1E1",
-+".. c #7CACCE",
-+".X c #4488B8",
-+".o c #2D3F4F",
-+".O c #999898",
-+".+ c #4388B7",
-+".@ c #5E98C1",
-+".# c #CDCDCB",
-+".$ c #524F4F",
-+".% c #B0CCE0",
-+".& c #979696",
-+".* c #78A8CA",
-+".= c #5C96BF",
-+".- c #969495",
-+".; c #4084B4",
-+".: c #252930",
-+".> c #949293",
-+"., c #929091",
-+".< c #417FAB",
-+".1 c #4F8FBC",
-+".2 c #F3F7FA",
-+".3 c #D3D3D4",
-+".4 c #D7E5EF",
-+".5 c #222023",
-+".6 c #9FC1D9",
-+".7 c #679DC3",
-+".8 c #37678A",
-+".9 c 

[gentoo-commits] repo/proj/libressl:master commit in: app-text/mupdf/, app-text/mupdf/files/

2023-04-12 Thread orbea
commit: 6f759040d6a00cb55391e07d9bcb039f7d0f8473
Author: orbea  riseup  net>
AuthorDate: Thu Apr 13 01:04:45 2023 +
Commit: orbea  riseup  net>
CommitDate: Thu Apr 13 01:04:45 2023 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=6f759040

app-text/mupdf: drop 1.20.0, 1.20.3

Signed-off-by: orbea  riseup.net>

 app-text/mupdf/Manifest   |   2 -
 app-text/mupdf/files/mupdf-1.20.0-lcms2.patch |  69 ---
 app-text/mupdf/metadata.xml   |   3 +
 app-text/mupdf/mupdf-1.20.0.ebuild| 160 -
 app-text/mupdf/mupdf-1.20.3.ebuild| 161 --
 5 files changed, 3 insertions(+), 392 deletions(-)

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index f87bb21..34a0dc1 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,3 +1 @@
 DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B 
a0dc3783c70cee1b7eb48d1658eb48186e35a42513aa9e98f7155bb82ed771ed0c5d5032013d09d93cdca4f49deda65553fe0e1af7645893722dafa855b2c958
 SHA512 
d6bc5b6adb6a418de50021864f4b3a75da653fa534eeedbfe9875cb202efeb13efdec66b4d108ca8fa6b0dc76733468b214e5fdf331bebc35fc6f722203fa3f7
-DIST mupdf-1.20.0-source.tar.gz 88455853 BLAKE2B 
686d8b02972fc6cb7fa4541e4f0561c11e616f800decd20a79f23b577977785633bd3e17e2007f621db97dab6db1fcf500ac8e283984fbe675a25e7a4301b75b
 SHA512 
6837299c589ece9cc443b027433fa3eee545f5155aeb6359b7a43da239d2e99195e9ae3950ddec6cb6ebae77bc877573c6f89a90754c58723d7e87d9739ed1f4
-DIST mupdf-1.20.3-source.tar.gz 88457290 BLAKE2B 
b16abfd4d9ac8123f1be60350d6124b8f36b6e8260f266d4dc7798610819128519944de8179a9e5453bc28da695ef8557fd8d755439113e520a8cad19039e52f
 SHA512 
ed3fe09971223c500fb85558bb3f8c4a605c82fca3cd2217cdf4758e44bdfe3ef4106c95037d7a8ea536117414e5acbfa14aa736bfb7e33e591050c12c07a0ee

diff --git a/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch 
b/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch
deleted file mode 100644
index a5cb30e..000
--- a/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From d98de0bb0b627772625c1acf050ba0dd4b5ac9df Mon Sep 17 00:00:00 2001
-From: David Seifert 
-Date: Tue, 5 Jul 2022 11:35:28 +0200
-Subject: [PATCH] Perform type punning via union without undefined behavior
-
-* The previous code from c3d7f491e2daebda2413fb3d2935c51df1c50ac7
-  still contains undefined behavior, since it just creates
-  temporary pointer variables.

- src/cmsplugin.c | 31 +++
- 1 file changed, 15 insertions(+), 16 deletions(-)
-
-This patch slightly differs from the upstream commit, because
-the lcms2 version used in mupdf is slightly behind the upstream
-version.
-
-See: 
https://github.com/mm2/Little-CMS/commit/d98de0bb0b627772625c1acf050ba0dd4b5ac9df.patch
-
-diff --git a/src/cmsplugin.c b/src/cmsplugin.c
-index 556fbc28..b34e3aab 100644
 a/thirdparty/lcms2/src/cmsplugin.c
-+++ b/thirdparty/lcms2/src/cmsplugin.c
-@@ -167,17 +167,20 @@ cmsBool CMSEXPORT  _cmsReadUInt32Number(cmsContext 
ContextID, cmsIOHANDLER* io,
- 
- cmsBool CMSEXPORT  _cmsReadFloat32Number(cmsContext ContextID, cmsIOHANDLER* 
io, cmsFloat32Number* n)
- {
--cmsUInt32Number tmp;
-+union typeConverter {
-+cmsUInt32Number integer;
-+cmsFloat32Number floating_point;
-+} tmp;
- 
- _cmsAssert(io != NULL);
- 
--if (io->Read(ContextID, io, , sizeof(cmsUInt32Number), 1) != 1)
-+if (io->Read(ContextID, io, , sizeof(cmsUInt32Number), 1) != 
1)
- return FALSE;
- 
- if (n != NULL) {
- 
--tmp = _cmsAdjustEndianess32(tmp);
--*n = *(cmsFloat32Number*)(void*)
-+tmp.integer = _cmsAdjustEndianess32(tmp.integer);
-+*n = tmp.floating_point;
- 
- // Safeguard which covers against absurd values
- if (*n > 1E+20 || *n < -1E+20) return FALSE;
-@@ -304,13 +307,14 @@ cmsBool CMSEXPORT  _cmsWriteUInt32Number(cmsContext 
ContextID, cmsIOHANDLER* io,
- 
- cmsBool CMSEXPORT  _cmsWriteFloat32Number(cmsContext ContextID, cmsIOHANDLER* 
io, cmsFloat32Number n)
- {
--cmsUInt32Number tmp;
--
--_cmsAssert(io != NULL);
--
--tmp = *(cmsUInt32Number*) (void*) 
--tmp = _cmsAdjustEndianess32(tmp);
--if (io -> Write(ContextID, io, sizeof(cmsUInt32Number), ) != 1)
-+union typeConverter {
-+cmsUInt32Number integer;
-+cmsFloat32Number floating_point;
-+} tmp;
-+
-+tmp.floating_point = n;
-+tmp.integer = _cmsAdjustEndianess32(tmp.integer);
-+if (io -> Write(ContextID, io, sizeof(cmsUInt32Number), ) != 
1)
- return FALSE;
- 
- return TRUE;

diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml
index 5d2f87c..c0d6177 100644
--- a/app-text/mupdf/metadata.xml
+++ b/app-text/mupdf/metadata.xml
@@ -9,4 +9,7 @@
proxy-ma...@gentoo.org
Proxy Maintainers

+   
+   Enable support for Digital rights management 
(DRM)
+   
 

diff 

[gentoo-commits] repo/proj/libressl:master commit in: app-text/mupdf/files/, app-text/mupdf/

2022-12-08 Thread Quentin Retornaz
commit: cfde5b6a4a1b9620af9702fc62230054828a163b
Author: orbea  riseup  net>
AuthorDate: Thu Dec  8 16:32:56 2022 +
Commit: Quentin Retornaz  retornaz  com>
CommitDate: Thu Dec  8 18:31:23 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=cfde5b6a

app-text/mupdf: Merge ::gentoo changes

Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/libressl/pull/480
Signed-off-by: Quentin Retornaz  retornaz.com>

 app-text/mupdf/files/mupdf-1.18-Makefile.patch |  42 ---
 .../mupdf/files/mupdf-1.18.0-CVE-2021-3407.patch   |  51 
 .../mupdf/files/mupdf-1.18.0-cross-fixes.patch | 128 -
 app-text/mupdf/files/mupdf-1.18.0-darwin.patch |  41 ---
 .../files/mupdf-1.18.0-fix-oob-in-pdf-layer.c  | 102 
 .../mupdf/files/mupdf-1.18.0-fix-oob-in-pixmap.c   |  41 ---
 app-text/mupdf/mupdf-1.20.3.ebuild |   2 +-
 7 files changed, 1 insertion(+), 406 deletions(-)

diff --git a/app-text/mupdf/files/mupdf-1.18-Makefile.patch 
b/app-text/mupdf/files/mupdf-1.18-Makefile.patch
deleted file mode 100644
index 32ee7e5..000
--- a/app-text/mupdf/files/mupdf-1.18-Makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/Makefile b/Makefile
-index b0fb617..528e117 100644
 a/Makefile
-+++ b/Makefile
-@@ -3,7 +3,7 @@
- -include user.make
- 
- ifndef build
--  build := release
-+  build := debug
- endif
- 
- ifndef OUT
-@@ -214,13 +214,15 @@ MUPDF_LIB = $(OUT)/libmupdf.$(SO)
- 
- $(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ) $(THREAD_OBJ) $(PKCS7_OBJ)
- else
--MUPDF_LIB = $(OUT)/libmupdf.a
--THIRD_LIB = $(OUT)/libmupdf-third.a
-+MUPDF_LIB = libmupdf.so.$(GENTOO_PV)
-+MUPDF_STATIC = $(OUT)/libmupdf.a
-+THIRD_LIB = 
- 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)
- $(THREAD_LIB) : $(THREAD_OBJ)
- $(PKCS7_LIB) : $(PKCS7_OBJ)
- endif
-@@ -374,7 +376,7 @@ install: libs apps
- 
-   install -d $(DESTDIR)$(docdir)
-   install -d $(DESTDIR)$(docdir)/examples
--  install -m 644 README COPYING CHANGES $(DESTDIR)$(docdir)
-+  install -m 644 README CHANGES $(DESTDIR)$(docdir)
-   install -m 644 docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir)
-   install -m 644 docs/examples/* $(DESTDIR)$(docdir)/examples
- 

diff --git a/app-text/mupdf/files/mupdf-1.18.0-CVE-2021-3407.patch 
b/app-text/mupdf/files/mupdf-1.18.0-CVE-2021-3407.patch
deleted file mode 100644
index 566ee56..000
--- a/app-text/mupdf/files/mupdf-1.18.0-CVE-2021-3407.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-https://bugs.gentoo.org/772311
-
-From cee7cefc610d42fd383b3c80c12cbc675443176a Mon Sep 17 00:00:00 2001
-From: Robin Watts 
-Date: Fri, 22 Jan 2021 17:05:15 +
-Subject: [PATCH 1/1] Bug 703366: Fix double free of object during
- linearization.
-
-This appears to happen because we parse an illegal object from
-a broken file and assign it to object 0, which is defined to
-be free.
-
-Here, we fix the parsing code so this can't happen.

- source/pdf/pdf-parse.c | 6 ++
- source/pdf/pdf-xref.c  | 2 ++
- 2 files changed, 8 insertions(+)
-
-diff --git a/source/pdf/pdf-parse.c b/source/pdf/pdf-parse.c
-index 7abc8c3d4..5761c3351 100644
 a/source/pdf/pdf-parse.c
-+++ b/source/pdf/pdf-parse.c
-@@ -749,6 +749,12 @@ pdf_parse_ind_obj(fz_context *ctx, pdf_document *doc,
-   fz_throw(ctx, FZ_ERROR_SYNTAX, "expected generation number (%d 
? obj)", num);
-   }
-   gen = buf->i;
-+  if (gen < 0 || gen >= 65536)
-+  {
-+  if (try_repair)
-+  *try_repair = 1;
-+  fz_throw(ctx, FZ_ERROR_SYNTAX, "invalid generation number 
(%d)", gen);
-+  }
- 
-   tok = pdf_lex(ctx, file, buf);
-   if (tok != PDF_TOK_OBJ)
-diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c
-index 1b2bdcd59..30197b4b8 100644
 a/source/pdf/pdf-xref.c
-+++ b/source/pdf/pdf-xref.c
-@@ -1190,6 +1190,8 @@ pdf_read_new_xref(fz_context *ctx, pdf_document *doc, 
pdf_lexbuf *buf)
-   {
-   ofs = fz_tell(ctx, doc->file);
-   trailer = pdf_parse_ind_obj(ctx, doc, doc->file, buf, , 
, _ofs, NULL);
-+  if (num == 0)
-+  fz_throw(ctx, FZ_ERROR_GENERIC, "Trailer object number 
cannot be 0\n");
-   }
-   fz_catch(ctx)
-   {
--- 
-2.17.1
-

diff --git a/app-text/mupdf/files/mupdf-1.18.0-cross-fixes.patch 
b/app-text/mupdf/files/mupdf-1.18.0-cross-fixes.patch
deleted file mode 100644
index 0576033..000
--- a/app-text/mupdf/files/mupdf-1.18.0-cross-fixes.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-Refreshed patches based on:

[gentoo-commits] repo/proj/libressl:master commit in: app-text/mupdf/files/, app-text/mupdf/

2022-10-07 Thread Quentin Retornaz
commit: e267d98ca8a3ff4d238255946114b0d6f9a74989
Author: orbea  riseup  net>
AuthorDate: Fri Oct  7 14:55:11 2022 +
Commit: Quentin Retornaz  retornaz  com>
CommitDate: Fri Oct  7 21:11:14 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=e267d98c

app-text/mupdf: Added

Signed-off-by: orbea  riseup.net>
Signed-off-by: Quentin Retornaz  retornaz.com>

 app-text/mupdf/Manifest|   3 +
 .../mupdf-1.10a-add-desktop-pc-xpm-files.patch | 533 +
 app-text/mupdf/files/mupdf-1.15-CFLAGS.patch   |  13 +
 app-text/mupdf/files/mupdf-1.15-openssl-x11.patch  |  18 +
 app-text/mupdf/files/mupdf-1.18-Makefile.patch |  42 ++
 .../mupdf/files/mupdf-1.18.0-CVE-2021-3407.patch   |  51 ++
 .../mupdf/files/mupdf-1.18.0-cross-fixes.patch | 128 +
 app-text/mupdf/files/mupdf-1.18.0-darwin.patch |  41 ++
 .../files/mupdf-1.18.0-fix-oob-in-pdf-layer.c  | 102 
 .../mupdf/files/mupdf-1.18.0-fix-oob-in-pixmap.c   |  41 ++
 app-text/mupdf/files/mupdf-1.19.0-Makefile.patch   |  37 ++
 .../mupdf/files/mupdf-1.19.0-cross-fixes.patch | 130 +
 app-text/mupdf/files/mupdf-1.19.0-darwin.patch |  39 ++
 app-text/mupdf/files/mupdf-1.20.0-lcms2.patch  |  69 +++
 app-text/mupdf/files/mupdf-1.20.3-libressl.patch   |  15 +
 app-text/mupdf/metadata.xml|  12 +
 app-text/mupdf/mupdf-1.19.1.ebuild | 154 ++
 app-text/mupdf/mupdf-1.20.0.ebuild | 160 +++
 app-text/mupdf/mupdf-1.20.3.ebuild | 161 +++
 19 files changed, 1749 insertions(+)

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
new file mode 100644
index 000..f87bb21
--- /dev/null
+++ b/app-text/mupdf/Manifest
@@ -0,0 +1,3 @@
+DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B 
a0dc3783c70cee1b7eb48d1658eb48186e35a42513aa9e98f7155bb82ed771ed0c5d5032013d09d93cdca4f49deda65553fe0e1af7645893722dafa855b2c958
 SHA512 
d6bc5b6adb6a418de50021864f4b3a75da653fa534eeedbfe9875cb202efeb13efdec66b4d108ca8fa6b0dc76733468b214e5fdf331bebc35fc6f722203fa3f7
+DIST mupdf-1.20.0-source.tar.gz 88455853 BLAKE2B 
686d8b02972fc6cb7fa4541e4f0561c11e616f800decd20a79f23b577977785633bd3e17e2007f621db97dab6db1fcf500ac8e283984fbe675a25e7a4301b75b
 SHA512 
6837299c589ece9cc443b027433fa3eee545f5155aeb6359b7a43da239d2e99195e9ae3950ddec6cb6ebae77bc877573c6f89a90754c58723d7e87d9739ed1f4
+DIST mupdf-1.20.3-source.tar.gz 88457290 BLAKE2B 
b16abfd4d9ac8123f1be60350d6124b8f36b6e8260f266d4dc7798610819128519944de8179a9e5453bc28da695ef8557fd8d755439113e520a8cad19039e52f
 SHA512 
ed3fe09971223c500fb85558bb3f8c4a605c82fca3cd2217cdf4758e44bdfe3ef4106c95037d7a8ea536117414e5acbfa14aa736bfb7e33e591050c12c07a0ee

diff --git a/app-text/mupdf/files/mupdf-1.10a-add-desktop-pc-xpm-files.patch 
b/app-text/mupdf/files/mupdf-1.10a-add-desktop-pc-xpm-files.patch
new file mode 100644
index 000..decab50
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.10a-add-desktop-pc-xpm-files.patch
@@ -0,0 +1,533 @@
+--- /dev/null
 ./platform/debian/mupdf.desktop
+@@ -0,0 +1,15 @@
++[Desktop Entry]
++Name=MuPDF
++GenericName=PDF file viewer
++Exec=mupdf %f
++TryExec=mupdf
++Icon=mupdf
++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}
+--- /dev/null
 ./platform/debian/mupdf.xpm
+@@ -0,0 +1,497 @@
++/* XPM */
++static char *mupdf[] = {
++/* width height ncolors chars_per_pixel */
++"48 48 442 2",
++/* colors */
++"   c #00",
++" . c #2E4558",
++" X c #252121",
++" o c #AFAFAF",
++" O c #28313B",
++" + c #231F1F",
++" @ c #68",
++" # c #98BDD7",
++" $ c #201B1C",
++" % c #7CABCC",
++" & c #4487B6",
++" * c #DFDEDE",
++" = c #4285B4",
++" - c #615E5F",
++" ; c #605E5E",
++" : c #23262C",
++" > c #D9D8D8",
++" , c #F7FAFC",
++" < c #D7D6D6",
++" 1 c #BFD6E6",
++" 2 c #6BA0C5",
++" 3 c #232122",
++" 4 c #555253",
++" 5 c #CD",
++" 6 c #E7EFF6",
++" 7 c #4786B2",
++" 8 c #CADDEA",
++" 9 c #4085B5",
++" 0 c #AECBDF",
++" q c #CBCACA",
++" w c #92B9D4",
++" e c #365F7D",
++" r c #5A95BE",
++" t c #3E83B3",
++" y c #304B60",
++" u c #C7C6C6",
++" i c #4D8EBB",
++" p c #F1F6F9",
++" a c #C1C0C0",
++" s c #454243",
++" d c #669CC3",
++" f c #81AECD",
++" g c #7A",
++" h c #434041",
++" j c #3E779F",
++" k c #272E36",
++" l c #413E3F",
++" z c #3F3C3D",
++" x c #5895BF",
++" c c 

[gentoo-commits] repo/proj/libressl:master commit in: app-text/mupdf/, app-text/mupdf/files/

2019-02-20 Thread Aaron Bauman
commit: a57a5d663fd0665a4070691d7244074263148c79
Author: Aaron Bauman  gentoo  org>
AuthorDate: Wed Feb 20 19:00:44 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Wed Feb 20 19:00:44 2019 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=a57a5d66

app-text/mupdf: drop as changes are in gentoo.git

Signed-off-by: Aaron Bauman  gentoo.org>

 app-text/mupdf/Manifest|   2 -
 .../mupdf-1.10a-add-desktop-pc-xpm-files.patch | 533 -
 .../files/mupdf-1.11-drop-libmupdfthird.patch  |  22 -
 app-text/mupdf/files/mupdf-1.12-CFLAGS.patch   |  11 -
 app-text/mupdf/files/mupdf-1.13-libressl.patch |  23 -
 .../mupdf/files/mupdf-1.13-openssl-curl-x11.patch  |  39 --
 app-text/mupdf/files/mupdf-1.14-CFLAGS.patch   |  13 -
 app-text/mupdf/files/mupdf-1.14-Makefile.patch |  46 --
 app-text/mupdf/files/mupdf-1.14-libressl.patch |  14 -
 .../mupdf/files/mupdf-1.14-openssl-curl-x11.patch  |  52 --
 app-text/mupdf/files/mupdf-1.3-zoom-2.patch|  10 -
 app-text/mupdf/files/mupdf-1.9a-debug-build.patch  |  10 -
 app-text/mupdf/metadata.xml|  11 -
 app-text/mupdf/mupdf-1.13.0-r1.ebuild  | 169 ---
 app-text/mupdf/mupdf-1.13.0.ebuild | 167 ---
 app-text/mupdf/mupdf-1.14.0-r2.ebuild  | 123 -
 16 files changed, 1245 deletions(-)

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
deleted file mode 100644
index f5f8f29..000
--- a/app-text/mupdf/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST mupdf-1.13.0-source.tar.gz 51425034 BLAKE2B 
7f4a1c84b5840991cc7879f3617165579f4db1f7a010a8313b0eaf94ad59af60bb3d0e4a0f2acc14d2c7511dd0f8b96c89c51e360ab379ba32590b887dd3be6a
 SHA512 
d7fca7292e612959893a728d35964cf7b4e607385bdd72e81b8ca1de6ab642f999b734afbbf32d75400cd29b7e178ec360e65c91d7b1e1a53c2a04ff0adbd707
-DIST mupdf-1.14.0-source.tar.xz 41602372 BLAKE2B 
bb680038344af16c7231a18a009c0d04c5f50b3fcbaf061c9f5907f35d79eea93eeced7c2a43a06a963b93b39c74d0246c5fdad35655953d1aa5efb79737265a
 SHA512 
bd41125dac1a81b7dbbfbb5f5e06e70bb601854731e0945983688da5d8d7c0bca9771fff2e4b6d9c36dbead6146f0a866ed7427d58e13d02ed6dfd94dcfe54bf

diff --git a/app-text/mupdf/files/mupdf-1.10a-add-desktop-pc-xpm-files.patch 
b/app-text/mupdf/files/mupdf-1.10a-add-desktop-pc-xpm-files.patch
deleted file mode 100644
index decab50..000
--- a/app-text/mupdf/files/mupdf-1.10a-add-desktop-pc-xpm-files.patch
+++ /dev/null
@@ -1,533 +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=mupdf
-+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}
 /dev/null
-+++ ./platform/debian/mupdf.xpm
-@@ -0,0 +1,497 @@
-+/* XPM */
-+static char *mupdf[] = {
-+/* width height ncolors chars_per_pixel */
-+"48 48 442 2",
-+/* colors */
-+"   c #00",
-+" . c #2E4558",
-+" X c #252121",
-+" o c #AFAFAF",
-+" O c #28313B",
-+" + c #231F1F",
-+" @ c #68",
-+" # c #98BDD7",
-+" $ c #201B1C",
-+" % c #7CABCC",
-+" & c #4487B6",
-+" * c #DFDEDE",
-+" = c #4285B4",
-+" - c #615E5F",
-+" ; c #605E5E",
-+" : c #23262C",
-+" > c #D9D8D8",
-+" , c #F7FAFC",
-+" < c #D7D6D6",
-+" 1 c #BFD6E6",
-+" 2 c #6BA0C5",
-+" 3 c #232122",
-+" 4 c #555253",
-+" 5 c #CD",
-+" 6 c #E7EFF6",
-+" 7 c #4786B2",
-+" 8 c #CADDEA",
-+" 9 c #4085B5",
-+" 0 c #AECBDF",
-+" q c #CBCACA",
-+" w c #92B9D4",
-+" e c #365F7D",
-+" r c #5A95BE",
-+" t c #3E83B3",
-+" y c #304B60",
-+" u c #C7C6C6",
-+" i c #4D8EBB",
-+" p c #F1F6F9",
-+" a c #C1C0C0",
-+" s c #454243",
-+" d c #669CC3",
-+" f c #81AECD",
-+" g c #7A",
-+" h c #434041",
-+" j c #3E779F",
-+" k c #272E36",
-+" l c #413E3F",
-+" z c #3F3C3D",
-+" x c #5895BF",
-+" c c #3D3A3B",
-+" v c #C6DBE9",
-+" b c #B8B6B7",
-+" n c #4282B0",
-+" m c #FDFDFE",
-+" M c #B7B6B6",
-+" N c #8DB5D2",
-+" B c #242529",
-+" V c #B3B2B2",
-+" C c #222327",
-+" Z c #B0AEAF",
-+" A c #EDF4F8",
-+" S c #686565",
-+" D c #488AB9",
-+" F c #9ABED8",
-+" G c #7EACCD",
-+" H c #ECF2F7",
-+" J c #211C1C",
-+" K c #666363",
-+" L c #F1F1F2",
-+" P c #AB",
-+" I c #4588B6",
-+" U c #A9A8A8",
-+" Y c #2D2A2B",
-+" T c #A7A6A6",
-+" R c #615D5E",
-+" E c #2B2829",
-+" W c #8DB7D5",
-+" Q c #F9FBFD",
-+" ! c