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

[Viorel Munteanu]

commit: c2d5f763e01c478515a9b6d416b1b68a3858672c
Author: Philipp Rösner  protonmail  com>
AuthorDate: Thu Sep 14 14:36:37 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Sun Oct 15 08:47:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2d5f763

app-text/mupdf: add 1.23.3

Signed-off-by: Philipp Rösner  protonmail.com>
Signed-off-by: Viorel Munteanu  gentoo.org>

 app-text/mupdf/Manifest|   1 +
 .../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/mupdf-1.23.3.ebuild | 164 +
 5 files changed, 349 insertions(+)

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index add0b2b8ea22..8380bb69f1e2 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -2,3 +2,4 @@ DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B 
a0dc3783c70cee1b7eb48d1658eb481
 DIST mupdf-1.21.0-source.tar.gz 54753613 BLAKE2B 
bb531f165a9dd8af22aa6e1d65b57d7900bb5128d0c8ad235518ed0b1e446234b147fdd3937f3dd49f627ed2cfb49c4e325baf320f698adbbde68de466f61660
 SHA512 
a711489e236437e4e7c21373d8624118a5308941148be31cd57a0bbed708b44b1d4030aed71ccb82143159fc3a23e5524738e7fc6177058e6bdaf94a36beaf64
 DIST mupdf-1.21.1-source.tar.gz 57243762 BLAKE2B 
9ec79e380af40020d37e4a2a6372175f19b63a47e9f6f55cff777a827f0fba89507d19d4f86394e13209ca8eb9d812c2fc4664f44ed012c91727c9c442bce97c
 SHA512 
11eeea409e0b44d3f754a44b00b15522c2ae2d94171b8c7067efa7acbb1d597eefe1e27607fab90a56bf6c73579bbfb77b7599080fc2504a5881aaf7cc1957c7
 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

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
new file mode 100644
index ..02fa3bfdd45c
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.23.3-cross-fixes.patch
@@ -0,0 +1,120 @@
+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 ($(sh

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

[Viorel Munteanu]

commit: 0c858240680739e3a08b1957340afe8f6c7eef6a
Author: Philipp Rösner  protonmail  com>
AuthorDate: Fri Oct 13 19:42:20 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Sun Oct 15 08:47:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c858240

app-text/mupdf: drop 1.21.0, 1.21.1-r1

Signed-off-by: Philipp Rösner  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32779
Signed-off-by: Viorel Munteanu  gentoo.org>

 app-text/mupdf/Manifest|   2 -
 .../mupdf-1.10a-add-desktop-pc-xpm-files.patch | 533 -
 .../files/mupdf-1.21.1-fix-url-processing.patch|  25 -
 app-text/mupdf/mupdf-1.21.0.ebuild | 159 --
 app-text/mupdf/mupdf-1.21.1-r1.ebuild  | 167 ---
 5 files changed, 886 deletions(-)

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 8380bb69f1e2..5898141302e2 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,5 +1,3 @@
 DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B 
a0dc3783c70cee1b7eb48d1658eb48186e35a42513aa9e98f7155bb82ed771ed0c5d5032013d09d93cdca4f49deda65553fe0e1af7645893722dafa855b2c958
 SHA512 
d6bc5b6adb6a418de50021864f4b3a75da653fa534eeedbfe9875cb202efeb13efdec66b4d108ca8fa6b0dc76733468b214e5fdf331bebc35fc6f722203fa3f7
-DIST mupdf-1.21.0-source.tar.gz 54753613 BLAKE2B 
bb531f165a9dd8af22aa6e1d65b57d7900bb5128d0c8ad235518ed0b1e446234b147fdd3937f3dd49f627ed2cfb49c4e325baf320f698adbbde68de466f61660
 SHA512 
a711489e236437e4e7c21373d8624118a5308941148be31cd57a0bbed708b44b1d4030aed71ccb82143159fc3a23e5524738e7fc6177058e6bdaf94a36beaf64
-DIST mupdf-1.21.1-source.tar.gz 57243762 BLAKE2B 
9ec79e380af40020d37e4a2a6372175f19b63a47e9f6f55cff777a827f0fba89507d19d4f86394e13209ca8eb9d812c2fc4664f44ed012c91727c9c442bce97c
 SHA512 
11eeea409e0b44d3f754a44b00b15522c2ae2d94171b8c7067efa7acbb1d597eefe1e27607fab90a56bf6c73579bbfb77b7599080fc2504a5881aaf7cc1957c7
 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

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 decab5015bf5..
--- 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 #2425

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

[Pacho Ramos]

commit: 68a51347c5983bdddb0f1c8a5f748528e8e9996b
Author: Philipp Rösner  protonmail  com>
AuthorDate: Mon Nov 28 20:18:46 2022 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Dec  4 14:49:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68a51347

app-text/mupdf: add high resolution icon

As pointed out by  gentoo.org> a high resolution
icon for MuPDF is available at docs/logo.

Closes: https://bugs.gentoo.org/882701
Signed-off-by: Philipp Rösner  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28467
Signed-off-by: Pacho Ramos  gentoo.org>

 .../files/mupdf-1.21.0-add-desktop-pc-files.patch  | 33 ++
 app-text/mupdf/mupdf-1.21.0.ebuild |  4 +--
 2 files changed, 35 insertions(+), 2 deletions(-)

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
new file mode 100644
index ..4d449a2fec15
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch
@@ -0,0 +1,33 @@
+--- /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/mupdf-1.21.0.ebuild 
b/app-text/mupdf/mupdf-1.21.0.ebuild
index 0eaa99a07eba..c2d55d2bd989 100644
--- a/app-text/mupdf/mupdf-1.21.0.ebuild
+++ b/app-text/mupdf/mupdf-1.21.0.ebuild
@@ -46,7 +46,7 @@ BDEPEND="X? ( x11-base/xorg-proto )
 PATCHES=(
"${FILESDIR}"/${PN}-1.15-CFLAGS.patch
"${FILESDIR}"/${PN}-1.19.0-Makefile.patch
-   "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+   "${FILESDIR}"/${P}-add-desktop-pc-files.patch
"${FILESDIR}"/${PN}-1.19.0-darwin.patch
# See bugs #662352
"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
@@ -126,7 +126,7 @@ src_compile() {
 src_install() {
if use opengl || use X ; then
domenu platform/debian/${PN}.desktop
-   doicon platform/debian/${PN}.xpm
+   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

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

[Florian Schmaus]

commit: e69ffe486e072430217eb921a1886f93d8d74534
Author: Philipp Rösner  protonmail  com>
AuthorDate: Wed Jun 29 19:36:48 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Thu Jun 30 12:43:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e69ffe48

app-text/mupdf: fix strict-aliasing violations

Fix two issues in thirdparty/lcms2/src/cmsplugin.c regarding
strinct-aliasing rule violations.

Closes: https://bugs.gentoo.org/855020
Signed-off-by: Philipp Rösner  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26152
Signed-off-by: Florian Schmaus  gentoo.org>

 app-text/mupdf/files/mupdf-1.20.0-lcms2.patch | 20 
 app-text/mupdf/mupdf-1.20.0.ebuild|  1 +
 2 files changed, 21 insertions(+)

diff --git a/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch 
b/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch
new file mode 100644
index ..a975d42d15e9
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch
@@ -0,0 +1,20 @@
+--- a/thirdparty/lcms2/src/cmsplugin.c
 b/thirdparty/lcms2/src/cmsplugin.c
+@@ -177,7 +177,7 @@ cmsBool CMSEXPORT  _cmsReadFloat32Number(cmsContext 
ContextID, cmsIOHANDLER* io,
+ if (n != NULL) {
+ 
+ tmp = _cmsAdjustEndianess32(tmp);
+-*n = *(cmsFloat32Number*)(void*)&tmp;
++*n = (cmsFloat32Number)tmp;
+ 
+ // Safeguard which covers against absurd values
+ if (*n > 1E+20 || *n < -1E+20) return FALSE;
+@@ -308,7 +308,7 @@ cmsBool CMSEXPORT  _cmsWriteFloat32Number(cmsContext 
ContextID, cmsIOHANDLER* io
+ 
+ _cmsAssert(io != NULL);
+ 
+-tmp = *(cmsUInt32Number*) (void*) &n;
++tmp = (cmsUInt32Number)n;
+ tmp = _cmsAdjustEndianess32(tmp);
+ if (io -> Write(ContextID, io, sizeof(cmsUInt32Number), &tmp) != 1)
+ return FALSE;

diff --git a/app-text/mupdf/mupdf-1.20.0.ebuild 
b/app-text/mupdf/mupdf-1.20.0.ebuild
index 3d7f8f3e2946..216bbfaa79e7 100644
--- a/app-text/mupdf/mupdf-1.20.0.ebuild
+++ b/app-text/mupdf/mupdf-1.20.0.ebuild
@@ -51,6 +51,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
# General cross fixes from Debian (refreshed)
"${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch
+   "${FILESDIR}"/${P}-lcms2.patch
 )
 
 src_prepare() {

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

[Sam James]

commit: 6f8610d53861f805bf4c4b6e1366935ad660b141
Author: Sam James  gentoo  org>
AuthorDate: Wed Feb 24 16:09:26 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 24 16:21:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f8610d5

app-text/mupdf: patch CVE-2021-3407

Bug: https://bugs.gentoo.org/772311
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 .../mupdf/files/mupdf-1.18.0-CVE-2021-3407.patch   |  51 
 app-text/mupdf/mupdf-1.18.0-r3.ebuild  | 145 +
 2 files changed, 196 insertions(+)

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
new file mode 100644
index 000..566ee562389
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.18.0-CVE-2021-3407.patch
@@ -0,0 +1,51 @@
+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, &num, 
&gen, &stm_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/mupdf-1.18.0-r3.ebuild 
b/app-text/mupdf/mupdf-1.18.0-r3.ebuild
new file mode 100644
index 000..4e67ceb7f20
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.18.0-r3.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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.xz";
+S="${WORKDIR}/${P}-source"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86"
+IUSE="X +javascript libressl opengl ssl"
+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.
+BDEPEND="virtual/pkgconfig"
+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=
+   virtual/jpeg
+   javascript? ( >=dev-lang/mujs-1.0.7:= )
+   opengl? ( >=media-libs/freeglut-3.0.0 )
+   ssl? (
+   libressl? ( >=dev-libs/libressl-3.1.4:0= )
+   !libressl? ( >=dev-libs/openssl-1.1:0= )
+   )
+   X? (
+   x11-libs/libX11
+   x11-libs/libXext
+   )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.15-CFLAGS.patch
+   "${FILESDIR}"/${PN}-1.18-Makefile.patch
+   "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+   # See bugs #662352
+   "${FILESDIR}"/${PN}-1.15-openssl-x11.patch
+   # General cross fixes from Debian (refreshed)
+   "${FILESDIR}"/${PN}-1.18.0-cross-fixes.patch
+   # Additional security patches post-1.18.0
+   "${FILESDIR}"/${P}-fix-oob-in-pdf-layer.c
+   "${FILESDIR}"/${P}-fix-oob-in-pixmap.c
+   "${FILESDIR}"/${P}-CVE-2021-3407.patch
+)
+
+src_prepare() {
+   xdg_src_prepare
+
+   use hppa && append-cflags -ffunction-sections
+
+   append-cflags "-DFZ_ENABLE_JS=$(u

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

[Sam James]

commit: 197b4aee35918341c66b38a761b111d978b00fa6
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 13 23:21:32 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 13 23:21:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=197b4aee

app-text/mupdf: add additional security patches

* Harden populate_ui against unexpected repairs [0]
* Fix overflow in fz_clear_pixmap_with_value [1]

Both patches were committed post-1.18.0 upstream.

[0] https://github.com/ArtifexSoftware/mupdf/commit/b82e9b6d6b46877e5c376.patch
[1] https://github.com/ArtifexSoftware/mupdf/commit/32e4e8b4bcbacbf92af7c.patch

Bug: https://bugs.gentoo.org/747151
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 .../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.18.0.ebuild |   3 +
 3 files changed, 146 insertions(+)

diff --git a/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pdf-layer.c 
b/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pdf-layer.c
new file mode 100644
index 000..dc4000b4cde
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pdf-layer.c
@@ -0,0 +1,102 @@
+From b82e9b6d6b46877e5c3763cc3bc641c66fa7eb54 Mon Sep 17 00:00:00 2001
+From: Robin Watts 
+Date: Thu, 8 Oct 2020 16:15:40 +0100
+Subject: [PATCH] Bug 701297: Harden populate_ui against unexpected repairs.
+
+We count the number of layers, and allocate space for them in
+an array. We then walk the tree reading details of those layers
+in. If we hit a problem that causes a repair while reading the
+information, the number of layers can magically increase. In
+the existing code we run off the end of the array.
+
+In the new code we watch for hitting the end of the array and
+realloc as required.
+---
+ source/pdf/pdf-layer.c | 32 +---
+ 1 file changed, 25 insertions(+), 7 deletions(-)
+
+diff --git a/source/pdf/pdf-layer.c b/source/pdf/pdf-layer.c
+index 177f0c947..b8e9d7cad 100644
+--- a/source/pdf/pdf-layer.c
 b/source/pdf/pdf-layer.c
+@@ -104,10 +104,27 @@ count_entries(fz_context *ctx, pdf_obj *obj)
+ }
+ 
+ static pdf_ocg_ui *
+-populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_ocg_ui *ui, 
pdf_obj *order, int depth, pdf_obj *rbgroups, pdf_obj *locked)
++get_ocg_ui(fz_context *ctx, pdf_ocg_descriptor *desc, int fill)
++{
++  if (fill == desc->num_ui_entries)
++  {
++  /* Number of layers changed while parsing;
++   * probably due to a repair. */
++  int newsize = desc->num_ui_entries * 2;
++  if (newsize == 0)
++  newsize = 4; /* Arbitrary non-zero */
++  desc->ui = fz_realloc_array(ctx, desc->ui, newsize, pdf_ocg_ui);
++  desc->num_ui_entries = newsize;
++  }
++  return &desc->ui[fill];
++}
++
++static int
++populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, int fill, pdf_obj 
*order, int depth, pdf_obj *rbgroups, pdf_obj *locked)
+ {
+   int len = pdf_array_len(ctx, order);
+   int i, j;
++  pdf_ocg_ui *ui;
+ 
+   for (i = 0; i < len; i++)
+   {
+@@ -118,7 +135,7 @@ populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, 
pdf_ocg_ui *ui, pdf_obj *
+   continue;
+ 
+   fz_try(ctx)
+-  ui = populate_ui(ctx, desc, ui, o, depth+1, 
rbgroups, locked);
++  fill = populate_ui(ctx, desc, fill, o, depth+1, 
rbgroups, locked);
+   fz_always(ctx)
+   pdf_unmark_obj(ctx, o);
+   fz_catch(ctx)
+@@ -126,14 +143,14 @@ populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, 
pdf_ocg_ui *ui, pdf_obj *
+ 
+   continue;
+   }
+-  ui->depth = depth;
+   if (pdf_is_string(ctx, o))
+   {
++  ui = get_ocg_ui(ctx, desc, fill++);
++  ui->depth = depth;
+   ui->ocg = -1;
+   ui->name = pdf_to_str_buf(ctx, o);
+   ui->button_flags = PDF_LAYER_UI_LABEL;
+   ui->locked = 1;
+-  ui++;
+   continue;
+   }
+ 
+@@ -144,13 +161,14 @@ populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, 
pdf_ocg_ui *ui, pdf_obj *
+   }
+   if (j == desc->len)
+   continue; /* OCG not found in main list! Just ignore it 
*/
++  ui = get_ocg_ui(ctx, desc, fill++);
++  ui->depth = depth;
+   ui->ocg = j;
+   ui->name = pdf_dict_get_string(ctx, o, PDF_NAME(Name), NULL);
+   ui->button_flags = pdf_array_contains(ctx, o, rbgroups) ? 
PDF_LAYER_UI_RADIOBOX : PDF_LAYER_UI_CHECKBOX;
+   ui->locked = pdf_arr

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

[Jory Pratt]

commit: 8f02d9eb7b96d30a41ee5303f83b61591b17b880
Author: Jory Pratt  gentoo  org>
AuthorDate: Tue Nov 26 14:18:39 2019 +
Commit: Jory Pratt  gentoo  org>
CommitDate: Tue Nov 26 14:25:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f02d9eb

app-text/mupdf: Fix libressl patch that was removed

Closes: https://bugs.gentoo.org/701014
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Jory Pratt  gentoo.org>

 app-text/mupdf/Manifest|   2 -
 app-text/mupdf/files/mupdf-1.14-CFLAGS.patch   |  13 ---
 app-text/mupdf/files/mupdf-1.14-Makefile.patch |  46 
 .../mupdf/files/mupdf-1.14-fix-big-endian.patch| 125 
 .../files/mupdf-1.14-r3-openssl-curl-x11.patch |  35 --
 app-text/mupdf/files/mupdf-1.3-zoom-2.patch|  10 --
 app-text/mupdf/mupdf-1.14.0-r3.ebuild  | 129 
 app-text/mupdf/mupdf-1.15.0.ebuild | 130 -
 8 files changed, 490 deletions(-)

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 9142b4ccaf0..964f9c13501 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,3 +1 @@
-DIST mupdf-1.14.0-source.tar.xz 41602372 BLAKE2B 
bb680038344af16c7231a18a009c0d04c5f50b3fcbaf061c9f5907f35d79eea93eeced7c2a43a06a963b93b39c74d0246c5fdad35655953d1aa5efb79737265a
 SHA512 
bd41125dac1a81b7dbbfbb5f5e06e70bb601854731e0945983688da5d8d7c0bca9771fff2e4b6d9c36dbead6146f0a866ed7427d58e13d02ed6dfd94dcfe54bf
-DIST mupdf-1.15.0-source.tar.xz 39828864 BLAKE2B 
15d0e4244062a91c7055b98fa61f2b02e0e3effbcf5374fe589f5a0d2ba2a2d4a59318ae3c0f28d866c6b07554e4b1e65ee9264c26a5f4524ef34e998d6c3320
 SHA512 
ef19362e8b6c2843e214fd2fcdcc9ba91017884383f7e1cfe08ef1f528a233820475ddfdd8aef481e6e37ae69e8b64324eb4b30699baa8055e99e47c2fab31dd
 DIST mupdf-1.16.1-source.tar.xz 45800404 BLAKE2B 
bc4158a457056c55db52a518efc13c289cca537c29a6b563046297dc225f3ce0add781adb8520c4d0829d653ed0539042597e341cb21c4fb4c462ed422bf735b
 SHA512 
fa657e6b9251aff91c25e91b335ea829b797dd91a759505bfd7259f8236613f590a044bc741e9b0587da55817a1ab8c1499c067d65d683d099259d06d91a8f50

diff --git a/app-text/mupdf/files/mupdf-1.14-CFLAGS.patch 
b/app-text/mupdf/files/mupdf-1.14-CFLAGS.patch
deleted file mode 100644
index 90972e8c53e..000
--- a/app-text/mupdf/files/mupdf-1.14-CFLAGS.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makerules b/Makerules
-index fc9bf998..82f10b28 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 $(LDREMOVEUNREACH)
- else ifeq ($(build),release)
-   CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer
-   LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s

diff --git a/app-text/mupdf/files/mupdf-1.14-Makefile.patch 
b/app-text/mupdf/files/mupdf-1.14-Makefile.patch
deleted file mode 100644
index a8c4ef770dc..000
--- a/app-text/mupdf/files/mupdf-1.14-Makefile.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-1. debug build (not sure why...)
-2. build shared library
-3. add optional static lib target
-4. Don't install COPYING
-diff --git a/Makefile b/Makefile
-index 37fc48e6..4303e9fa 100644
 a/Makefile
-+++ b/Makefile
-@@ -3,7 +3,7 @@
- -include user.make
- 
- ifndef build
--  build := release
-+  build := debug
- endif
- 
- ifndef OUT
-@@ -190,13 +190,15 @@ generate: source/pdf/js/util.js.h
- 
- # --- Library ---
- 
--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) 
-Wl,--no-undefined -o $@ $^ $(THIRD_LIBS) $(LIBS)
-+$(MUPDF_STATIC): $(MUPDF_OBJ) $(THIRD_OBJ)
- $(THREAD_LIB) : $(THREAD_OBJ)
- $(PKCS7_LIB) : $(PKCS7_OBJ)
- 
-@@ -355,7 +357,7 @@ install: libs apps
- 
-   install -d $(DESTDIR)$(docdir)
-   install -d $(DESTDIR)$(docdir)/examples
--  install README COPYING CHANGES $(DESTDIR)$(docdir)
-+  install README CHANGES $(DESTDIR)$(docdir)
-   install docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir)
-   install docs/examples/* $(DESTDIR)$(docdir)/examples
- 

diff --git a/app-text/mupdf/files/mupdf-1.14-fix-big-endian.patch 
b/app-text/mupdf/files/mupdf-1.14-fix-big-endian.patch
deleted file mode 100644
index dc472153ca6..000
--- a/app-text/mupdf/files/mupdf-1.14-fix-big-endian.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-vdupras note: exact same patch as in
-https://bugs.ghostscript.com/show_bug.cgi?id=699395 except for tweaked
-diff paths.
-From 5fb79e6ccb805b3d94c8bb8eb0990d9944ae7602 Mon Sep 17 00:00:00 2001
-Message-Id: 
<5fb79e6ccb805b3d94c8bb8eb0990d9944ae7602.1528041417.g

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

[Mikle Kolyada]

commit: a89743c14b67fa2507926ad8d0aea43b5b8712b0
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Nov 22 09:47:17 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Nov 22 09:47:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a89743c1

app-text/mupdf: cleanup

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Mikle Kolyada  gentoo.org>

 app-text/mupdf/Manifest|   2 -
 app-text/mupdf/files/mupdf-1.14-CFLAGS.patch   |  13 ---
 app-text/mupdf/files/mupdf-1.14-Makefile.patch |  46 
 .../mupdf/files/mupdf-1.14-fix-big-endian.patch| 125 
 app-text/mupdf/files/mupdf-1.14-libressl.patch |  45 ---
 .../files/mupdf-1.14-r3-openssl-curl-x11.patch |  35 --
 app-text/mupdf/files/mupdf-1.3-zoom-2.patch|  10 --
 app-text/mupdf/mupdf-1.14.0-r3.ebuild  | 129 
 app-text/mupdf/mupdf-1.15.0.ebuild | 130 -
 9 files changed, 535 deletions(-)

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 9142b4ccaf0..964f9c13501 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,3 +1 @@
-DIST mupdf-1.14.0-source.tar.xz 41602372 BLAKE2B 
bb680038344af16c7231a18a009c0d04c5f50b3fcbaf061c9f5907f35d79eea93eeced7c2a43a06a963b93b39c74d0246c5fdad35655953d1aa5efb79737265a
 SHA512 
bd41125dac1a81b7dbbfbb5f5e06e70bb601854731e0945983688da5d8d7c0bca9771fff2e4b6d9c36dbead6146f0a866ed7427d58e13d02ed6dfd94dcfe54bf
-DIST mupdf-1.15.0-source.tar.xz 39828864 BLAKE2B 
15d0e4244062a91c7055b98fa61f2b02e0e3effbcf5374fe589f5a0d2ba2a2d4a59318ae3c0f28d866c6b07554e4b1e65ee9264c26a5f4524ef34e998d6c3320
 SHA512 
ef19362e8b6c2843e214fd2fcdcc9ba91017884383f7e1cfe08ef1f528a233820475ddfdd8aef481e6e37ae69e8b64324eb4b30699baa8055e99e47c2fab31dd
 DIST mupdf-1.16.1-source.tar.xz 45800404 BLAKE2B 
bc4158a457056c55db52a518efc13c289cca537c29a6b563046297dc225f3ce0add781adb8520c4d0829d653ed0539042597e341cb21c4fb4c462ed422bf735b
 SHA512 
fa657e6b9251aff91c25e91b335ea829b797dd91a759505bfd7259f8236613f590a044bc741e9b0587da55817a1ab8c1499c067d65d683d099259d06d91a8f50

diff --git a/app-text/mupdf/files/mupdf-1.14-CFLAGS.patch 
b/app-text/mupdf/files/mupdf-1.14-CFLAGS.patch
deleted file mode 100644
index 90972e8c53e..000
--- a/app-text/mupdf/files/mupdf-1.14-CFLAGS.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makerules b/Makerules
-index fc9bf998..82f10b28 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 $(LDREMOVEUNREACH)
- else ifeq ($(build),release)
-   CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer
-   LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s

diff --git a/app-text/mupdf/files/mupdf-1.14-Makefile.patch 
b/app-text/mupdf/files/mupdf-1.14-Makefile.patch
deleted file mode 100644
index a8c4ef770dc..000
--- a/app-text/mupdf/files/mupdf-1.14-Makefile.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-1. debug build (not sure why...)
-2. build shared library
-3. add optional static lib target
-4. Don't install COPYING
-diff --git a/Makefile b/Makefile
-index 37fc48e6..4303e9fa 100644
 a/Makefile
-+++ b/Makefile
-@@ -3,7 +3,7 @@
- -include user.make
- 
- ifndef build
--  build := release
-+  build := debug
- endif
- 
- ifndef OUT
-@@ -190,13 +190,15 @@ generate: source/pdf/js/util.js.h
- 
- # --- Library ---
- 
--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) 
-Wl,--no-undefined -o $@ $^ $(THIRD_LIBS) $(LIBS)
-+$(MUPDF_STATIC): $(MUPDF_OBJ) $(THIRD_OBJ)
- $(THREAD_LIB) : $(THREAD_OBJ)
- $(PKCS7_LIB) : $(PKCS7_OBJ)
- 
-@@ -355,7 +357,7 @@ install: libs apps
- 
-   install -d $(DESTDIR)$(docdir)
-   install -d $(DESTDIR)$(docdir)/examples
--  install README COPYING CHANGES $(DESTDIR)$(docdir)
-+  install README CHANGES $(DESTDIR)$(docdir)
-   install docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir)
-   install docs/examples/* $(DESTDIR)$(docdir)/examples
- 

diff --git a/app-text/mupdf/files/mupdf-1.14-fix-big-endian.patch 
b/app-text/mupdf/files/mupdf-1.14-fix-big-endian.patch
deleted file mode 100644
index dc472153ca6..000
--- a/app-text/mupdf/files/mupdf-1.14-fix-big-endian.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-vdupras note: exact same patch as in
-https://bugs.ghostscript.com/show_bug.cgi?id=699395 except for tweaked
-diff paths.
-From 5fb79e6ccb805b3d94c8bb8eb0990d9944ae7602 Mon Sep 17 00:00:00 2001
-Message-Id: 
<5fb79e6ccb805b3d94c8bb8eb0990d9944ae7602.1528

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

[Virgil Dupras]

commit: a1b87a4250380f9fbc024147fa32eb679bd76848
Author: Virgil Dupras  gentoo  org>
AuthorDate: Fri Dec 21 01:10:18 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Fri Dec 21 01:10:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1b87a42

app-text/mupdf: fix build errors on big endian arches

Closes: https://bugs.gentoo.org/672998
Signed-off-by: Virgil Dupras  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../mupdf/files/mupdf-1.14-fix-big-endian.patch| 125 +
 app-text/mupdf/mupdf-1.14.0-r2.ebuild  |   2 +
 2 files changed, 127 insertions(+)

diff --git a/app-text/mupdf/files/mupdf-1.14-fix-big-endian.patch 
b/app-text/mupdf/files/mupdf-1.14-fix-big-endian.patch
new file mode 100644
index 000..dc472153ca6
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.14-fix-big-endian.patch
@@ -0,0 +1,125 @@
+vdupras note: exact same patch as in
+https://bugs.ghostscript.com/show_bug.cgi?id=699395 except for tweaked
+diff paths.
+From 5fb79e6ccb805b3d94c8bb8eb0990d9944ae7602 Mon Sep 17 00:00:00 2001
+Message-Id: 
<5fb79e6ccb805b3d94c8bb8eb0990d9944ae7602.1528041417.git@fedoraproject.org>
+From: Michael J Gruber 
+Date: Sun, 3 Jun 2018 17:55:46 +0200
+Subject: [PATCH] fix build on big endian
+
+0dc1153 ("Spread of context into all procedures and removal from
+structures", 2017-04-26) missed a few spots that are relevant on big
+endian only.
+
+Add the missing ContextIDs in the call chain so that the build succeeds
+again.
+
+Signed-off-by: Michael J Gruber 
+---
+ src/cmsmd5.c | 22 +++---
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/src/cmsmd5.c b/src/cmsmd5.c
+index 4b8f7f9..dd0925a 100644
+--- a/thirdparty/lcms2/src/cmsmd5.c
 b/thirdparty/lcms2/src/cmsmd5.c
+@@ -29,7 +29,7 @@
+ #ifdef CMS_USE_BIG_ENDIAN
+ 
+ static
+-void byteReverse(cmsUInt8Number * buf, cmsUInt32Number longs)
++void byteReverse(cmsContext ContextID, cmsUInt8Number * buf, cmsUInt32Number 
longs)
+ {
+ do {
+ 
+@@ -42,7 +42,7 @@ void byteReverse(cmsUInt8Number * buf, cmsUInt32Number longs)
+ }
+ 
+ #else
+-#define byteReverse(buf, len)
++#define byteReverse(ContextID, buf, len)
+ #endif
+ 
+ 
+@@ -172,7 +172,7 @@ cmsHANDLE  MD5alloc(cmsContext ContextID)
+ 
+ 
+ static
+-void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len)
++void MD5add(cmsContext ContextID, cmsHANDLE Handle, cmsUInt8Number* buf, 
cmsUInt32Number len)
+ {
+ _cmsMD5* ctx = (_cmsMD5*) Handle;
+ cmsUInt32Number t;
+@@ -196,7 +196,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, 
cmsUInt32Number len)
+ }
+ 
+ memmove(p, buf, t);
+-byteReverse(ctx->in, 16);
++byteReverse(ContextID, ctx->in, 16);
+ 
+ MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);
+ buf += t;
+@@ -205,7 +205,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, 
cmsUInt32Number len)
+ 
+ while (len >= 64) {
+ memmove(ctx->in, buf, 64);
+-byteReverse(ctx->in, 16);
++byteReverse(ContextID, ctx->in, 16);
+ MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);
+ buf += 64;
+ len -= 64;
+@@ -216,7 +216,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, 
cmsUInt32Number len)
+ 
+ // Destroy the object and return the checksum
+ static
+-void MD5finish(cmsProfileID* ProfileID,  cmsHANDLE Handle)
++void MD5finish(cmsContext ContextID, cmsProfileID* ProfileID,  cmsHANDLE 
Handle)
+ {
+ _cmsMD5* ctx = (_cmsMD5*) Handle;
+ cmsUInt32Number count;
+@@ -232,21 +232,21 @@ void MD5finish(cmsProfileID* ProfileID,  cmsHANDLE 
Handle)
+ if (count < 8) {
+ 
+ memset(p, 0, count);
+-byteReverse(ctx->in, 16);
++byteReverse(ContextID, ctx->in, 16);
+ MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);
+ 
+ memset(ctx->in, 0, 56);
+ } else {
+ memset(p, 0, count - 8);
+ }
+-byteReverse(ctx->in, 14);
++byteReverse(ContextID, ctx->in, 14);
+ 
+ ((cmsUInt32Number *) ctx->in)[14] = ctx->bits[0];
+ ((cmsUInt32Number *) ctx->in)[15] = ctx->bits[1];
+ 
+ MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);
+ 
+-byteReverse((cmsUInt8Number *) ctx->buf, 4);
++byteReverse(ContextID, (cmsUInt8Number *) ctx->buf, 4);
+ memmove(ProfileID ->ID8, ctx->buf, 16);
+ 
+ _cmsFree(ctx ->ContextID, ctx);
+@@ -291,7 +291,7 @@ cmsBool CMSEXPORT cmsMD5computeID(cmsContext ContextID, 
cmsHPROFILE hProfile)
+ if (MD5 == NULL) goto Error;
+ 
+ // Add all bytes
+-MD5add(MD5, Mem, BytesNeeded);
++MD5add(ContextID,MD5, Mem, BytesNeeded);
+ 
+ // Temp storage is no longer needed
+ _cmsFree(ContextID, Mem);
+@@ -300,7 +300,7 @@ cmsBool CMSEXPORT cmsMD5computeID(cmsContext ContextID, 
cmsHPROFILE hProfile)
+ memmove(Icc, &Keep, sizeof(_cmsICCPROFILE));
+ 
+ // And store the ID
+-MD5finish(&Icc ->ProfileID,  MD5);
++MD5finish(Conte

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

[Virgil Dupras]

commit: 84450c429203901c5de4e786b4413fbb5f25d731
Author: Virgil Dupras  gentoo  org>
AuthorDate: Mon Oct 15 14:41:38 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Mon Oct 15 14:41:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84450c42

app-text/mupdf: fix shared library build

Closes: https://bugs.gentoo.org/668684
Signed-off-by: Virgil Dupras  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-text/mupdf/files/mupdf-1.14-Makefile.patch | 46 ++
 app-text/mupdf/files/mupdf-1.14-debug-build.patch  | 13 --
 ...{mupdf-1.14.0.ebuild => mupdf-1.14.0-r1.ebuild} | 11 ++
 3 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/app-text/mupdf/files/mupdf-1.14-Makefile.patch 
b/app-text/mupdf/files/mupdf-1.14-Makefile.patch
new file mode 100644
index 000..a8c4ef770dc
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.14-Makefile.patch
@@ -0,0 +1,46 @@
+1. debug build (not sure why...)
+2. build shared library
+3. add optional static lib target
+4. Don't install COPYING
+diff --git a/Makefile b/Makefile
+index 37fc48e6..4303e9fa 100644
+--- a/Makefile
 b/Makefile
+@@ -3,7 +3,7 @@
+ -include user.make
+ 
+ ifndef build
+-  build := release
++  build := debug
+ endif
+ 
+ ifndef OUT
+@@ -190,13 +190,15 @@ generate: source/pdf/js/util.js.h
+ 
+ # --- Library ---
+ 
+-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) 
-Wl,--no-undefined -o $@ $^ $(THIRD_LIBS) $(LIBS)
++$(MUPDF_STATIC): $(MUPDF_OBJ) $(THIRD_OBJ)
+ $(THREAD_LIB) : $(THREAD_OBJ)
+ $(PKCS7_LIB) : $(PKCS7_OBJ)
+ 
+@@ -355,7 +357,7 @@ install: libs apps
+ 
+   install -d $(DESTDIR)$(docdir)
+   install -d $(DESTDIR)$(docdir)/examples
+-  install README COPYING CHANGES $(DESTDIR)$(docdir)
++  install README CHANGES $(DESTDIR)$(docdir)
+   install docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir)
+   install docs/examples/* $(DESTDIR)$(docdir)/examples
+ 

diff --git a/app-text/mupdf/files/mupdf-1.14-debug-build.patch 
b/app-text/mupdf/files/mupdf-1.14-debug-build.patch
deleted file mode 100644
index 6f8b5b96a97..000
--- a/app-text/mupdf/files/mupdf-1.14-debug-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 37fc48e6..bd8c6049 100644
 a/Makefile
-+++ b/Makefile
-@@ -3,7 +3,7 @@
- -include user.make
- 
- ifndef build
--  build := release
-+  build := debug
- endif
- 
- ifndef OUT

diff --git a/app-text/mupdf/mupdf-1.14.0.ebuild 
b/app-text/mupdf/mupdf-1.14.0-r1.ebuild
similarity index 92%
rename from app-text/mupdf/mupdf-1.14.0.ebuild
rename to app-text/mupdf/mupdf-1.14.0-r1.ebuild
index 3bafaab5d0b..f12cf699e38 100644
--- a/app-text/mupdf/mupdf-1.14.0.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r1.ebuild
@@ -41,7 +41,7 @@ S=${WORKDIR}/${P}-source
 
 PATCHES=(
"${FILESDIR}"/${PN}-1.14-CFLAGS.patch
-   "${FILESDIR}"/${PN}-1.14-debug-build.patch
+   "${FILESDIR}"/${PN}-1.14-Makefile.patch
"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
# See bug #662352
"${FILESDIR}"/${PN}-1.14-openssl-curl-x11.patch
@@ -68,15 +68,12 @@ src_prepare() {
-e "1ilibdir = ${ED}usr/$(get_libdir)" \
-e "1idocdir = ${ED}usr/share/doc/${PF}" \
-i Makerules || die
-
-   if use static-libs; then
-   cp -a "${S}" "${S}"-static || die
-   fi
 }
 
 _emake() {
# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
emake \
+   GENTOO_PV=${PV} \
HAVE_GLUT=$(usex opengl yes no) \
WANT_CURL=$(usex curl) \
WANT_OPENSSL=$(usex openssl) \
@@ -93,7 +90,7 @@ src_compile() {
use curl && _emake extra-apps
 
use static-libs && \
-   _emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
+   _emake build/debug/lib${PN}.a
 }
 
 src_install() {
@@ -107,7 +104,7 @@ src_install() {
_emake install
 
use static-libs && \
-   dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
+   dolib.a build/debug/lib${PN}.a
if use opengl ; then
einfo "mupdf symlink points to mupdf-gl (bug 616654)"
dosym ${PN}-gl /usr/bin/${PN}

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

[Virgil Dupras]

commit: da7c28ccf0ad7b3a35d0adbd0ed2ad50640e718f
Author: Virgil Dupras  gentoo  org>
AuthorDate: Sun Oct  7 13:39:48 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Sun Oct  7 17:40:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da7c28cc

app-text/mupdf: bump to 1.14.0

Many things changed upstream in this release, which prompts many changes
in the ebuild.

1. Drop the "static" USE flag. It was already broken in 1.13 because
options weren't passed to the static `emake` call like is was in the
main `emake` invocation. In addition to that, building a static binary
requires "media-gfx/graphite2[+static-libs]" which doesn't exist.

2. Drop "lcms" USE flag. See bug #667788.

3. Always link to dev-lang/mujs. mupdf can't build without being linked
to mujs now. The best we can do it to disable JS with the "FZ_ENABLE_JS"
flag, which is what the "javascript" USE flag does.

4. Make "javascript" USE flag enabled by default, which is in line with
upstream's behavior.

5. Make "vanilla" USE flag enabled by default. The patch it enables
doesn't seem very useful and I couldn't track it's *raison d'être* in
git/cvs history: it's been there since the first commit.

6. Simplify ebuild and remove obsolete seds. The "sed" invocations I've
removed have been verified and either point to absent files or replace
nothing.

7. Don't remove third party libs. The new "USE_SYSTEM_LIBS" flag being
used is a reliable way to ensure that the correct libraries are used.

8. Fix "curl" USE flag. See bug #664646

Closes: https://bugs.gentoo.org/664646
Closes: https://bugs.gentoo.org/667788

Signed-off-by: Virgil Dupras  gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 app-text/mupdf/Manifest|   1 +
 app-text/mupdf/files/mupdf-1.14-CFLAGS.patch   |  13 +++
 app-text/mupdf/files/mupdf-1.14-debug-build.patch  |  13 +++
 .../mupdf/files/mupdf-1.14-openssl-curl-x11.patch  |  52 +
 app-text/mupdf/mupdf-1.14.0.ebuild | 123 +
 5 files changed, 202 insertions(+)

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 6e813b10936..f5f8f290123 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1 +1,2 @@
 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.14-CFLAGS.patch 
b/app-text/mupdf/files/mupdf-1.14-CFLAGS.patch
new file mode 100644
index 000..90972e8c53e
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.14-CFLAGS.patch
@@ -0,0 +1,13 @@
+diff --git a/Makerules b/Makerules
+index fc9bf998..82f10b28 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 $(LDREMOVEUNREACH)
+ else ifeq ($(build),release)
+   CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer
+   LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s

diff --git a/app-text/mupdf/files/mupdf-1.14-debug-build.patch 
b/app-text/mupdf/files/mupdf-1.14-debug-build.patch
new file mode 100644
index 000..6f8b5b96a97
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.14-debug-build.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 37fc48e6..bd8c6049 100644
+--- a/Makefile
 b/Makefile
+@@ -3,7 +3,7 @@
+ -include user.make
+ 
+ ifndef build
+-  build := release
++  build := debug
+ endif
+ 
+ ifndef OUT

diff --git a/app-text/mupdf/files/mupdf-1.14-openssl-curl-x11.patch 
b/app-text/mupdf/files/mupdf-1.14-openssl-curl-x11.patch
new file mode 100644
index 000..a1284a63d67
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.14-openssl-curl-x11.patch
@@ -0,0 +1,52 @@
+diff --git a/Makerules b/Makerules
+index fc9bf998..5c0fffa4 100644
+--- a/Makerules
 b/Makerules
+@@ -113,10 +113,14 @@ else ifeq ($(OS),Linux)
+   SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
+   endif
+ 
++  WANT_CURL ?= yes
++  ifeq "$(WANT_CURL)" "yes"
+   HAVE_CURL := $(shell pkg-config --exists libcurl && echo yes)
+   ifeq ($(HAVE_CURL),yes)
+   SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
+-  SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
++# We have to forcibly add -lpthread to avoid linking errors.
++  SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) -lpthread
++  endif
+   endif
+ 
+   HAVE_GLUT := yes
+@@ -125,17 +129,29 @@ els

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

[Virgil Dupras]

commit: 0f5d484ee208b2c918e0778c6d259bd97ee77475
Author: Virgil Dupras  gentoo  org>
AuthorDate: Sat Aug 18 20:57:03 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Sat Aug 18 20:59:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f5d484e

app-text/mupdf: drop old and vulnerable

We have to drop alpha, ppc, ppc64 and sparc due to slow stabilization.
We've already missed our target delay for resolving the security bug by
a lot.

Bug: https://bugs.gentoo.org/658618
Package-Manager: Portage-2.3.47, Repoman-2.3.10

 app-text/mupdf/Manifest|   2 -
 app-text/mupdf/files/mupdf-1.11-CFLAGS.patch   |  10 --
 .../mupdf/files/mupdf-1.11-CVE-2017-6060.patch |  15 --
 .../files/mupdf-1.11-openssl-curl-x11-r1.patch |  37 -
 .../mupdf/files/mupdf-1.11-openssl-curl-x11.patch  |  37 -
 app-text/mupdf/files/mupdf-1.11-system-glfw.patch  |  11 --
 app-text/mupdf/mupdf-1.11-r1.ebuild| 152 ---
 app-text/mupdf/mupdf-1.11-r2.ebuild| 152 ---
 app-text/mupdf/mupdf-1.12.0-r2.ebuild  | 166 -
 app-text/mupdf/mupdf-1.12.0.ebuild | 160 
 10 files changed, 742 deletions(-)

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index a37226db36a..6e813b10936 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,3 +1 @@
-DIST mupdf-1.11-source.tar.gz 40156070 BLAKE2B 
2a9991a11355a449b91955bd897b5da175d3a89943277345779ea52c74f57c58226ee4087b23e3f434c0a45ae7a39df95c81c26c55d959f362bd1a0d0216716d
 SHA512 
501670f540e298a8126806ebbd9db8b29866f663b7bbf26c9ade1933e42f0c00ad410b9d93f3ddbfb3e45c38722869095de28d832fe3fb3703c55cc9a01dbf63
-DIST mupdf-1.12.0-source.tar.gz 51508917 BLAKE2B 
c34df17f0df7a200897d678514ff4012e02b1cef71189fe48740948c88cb544c6ce80f52a5dc335d70002806a7b413e5f79a1edee88865e42daf76e49416d9bf
 SHA512 
11ae620e55e9ebd5844abd7decacc0dafc90dd1f4907ba6ed12f5c725d3920187fc730a7fc33979bf3ff9451da7dbb51f34480a878083e2064f345f47d96
 DIST mupdf-1.13.0-source.tar.gz 51425034 BLAKE2B 
7f4a1c84b5840991cc7879f3617165579f4db1f7a010a8313b0eaf94ad59af60bb3d0e4a0f2acc14d2c7511dd0f8b96c89c51e360ab379ba32590b887dd3be6a
 SHA512 
d7fca7292e612959893a728d35964cf7b4e607385bdd72e81b8ca1de6ab642f999b734afbbf32d75400cd29b7e178ec360e65c91d7b1e1a53c2a04ff0adbd707

diff --git a/app-text/mupdf/files/mupdf-1.11-CFLAGS.patch 
b/app-text/mupdf/files/mupdf-1.11-CFLAGS.patch
deleted file mode 100644
index 2ffd326e5e4..000
--- a/app-text/mupdf/files/mupdf-1.11-CFLAGS.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 mupdf-1.11-source/Makerules
-+++ mupdf-1.11-source/Makerules
-@@ -23,7 +23,6 @@
- endif
- 
- ifeq "$(build)" "debug"
--CFLAGS += -pipe -g
- LDFLAGS += -g
- else ifeq "$(build)" "release"
- CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer

diff --git a/app-text/mupdf/files/mupdf-1.11-CVE-2017-6060.patch 
b/app-text/mupdf/files/mupdf-1.11-CVE-2017-6060.patch
deleted file mode 100644
index a595253e864..000
--- a/app-text/mupdf/files/mupdf-1.11-CVE-2017-6060.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-X-Git-Url: 
http://git.ghostscript.com/?p=user%2Fsebras%2Fmupdf.git;a=blobdiff_plain;f=platform%2Fx11%2Fjstest_main.c;h=f158d9628ed0c0a84e37fe128277679e8334422a;hp=13c3a0a3ba3ff4aae29f6882d23740833c1d842f;hb=06a012a42c9884e3cd653e7826cff1ddec04eb6e;hpb=34e18d127a02146e3415b33c4b67389ce1ddb614
-
-diff --git a/platform/x11/jstest_main.c b/platform/x11/jstest_main.c
-index 13c3a0a..f158d96 100644
 a/platform/x11/jstest_main.c
-+++ b/platform/x11/jstest_main.c
-@@ -346,7 +346,7 @@ main(int argc, char *argv[])
-   }
-   else if (match(&line, "OPEN"))
-   {
--  char path[1024];
-+  char path[LONGLINE];
-   if (file_open)
-   pdfapp_close(&gapp);
-   if (prefix)

diff --git a/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11-r1.patch 
b/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11-r1.patch
deleted file mode 100644
index 92845a0eef2..000
--- a/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11-r1.patch
+++ /dev/null
@@ -1,37 +0,0 @@
 mupdf-1.11-source/Makerules
-+++ mupdf-1.11-source/Makerules
-@@ -116,12 +116,17 @@
- SYS_PTHREAD_CFLAGS :=
- SYS_PTHREAD_LIBS := -lpthread
- 
-+WANT_OPENSSL ?= yes
-+ifeq "$(WANT_OPENSSL)" "yes"
- ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes"
- HAVE_LIBCRYPTO := yes
- SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags 
libcrypto)
- SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
- endif
-+endif
- 
-+WANT_CURL ?= yes
-+ifeq "$(WANT_CURL)" "yes"
- ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes"
- HAVE_CURL := yes
- 

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

[Virgil Dupras]

commit: 856a6ad1fd3dfe1ab67a2976edc3f5dedd694fa3
Author: Jouni Kosonen  tukesoft  com>
AuthorDate: Wed Jun 27 07:03:42 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Wed Jul 25 01:31:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=856a6ad1

app-text/mupdf: version bump to 1.13.0

Bug: https://bugs.gentoo.org/646010
Bug: https://bugs.gentoo.org/651828
Bug: https://bugs.gentoo.org/658618

 app-text/mupdf/Manifest|   1 +
 .../mupdf/files/mupdf-1.13-openssl-curl-x11.patch  |  39 +
 app-text/mupdf/mupdf-1.13.0.ebuild | 166 +
 3 files changed, 206 insertions(+)

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 1367f972efc..a37226db36a 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,2 +1,3 @@
 DIST mupdf-1.11-source.tar.gz 40156070 BLAKE2B 
2a9991a11355a449b91955bd897b5da175d3a89943277345779ea52c74f57c58226ee4087b23e3f434c0a45ae7a39df95c81c26c55d959f362bd1a0d0216716d
 SHA512 
501670f540e298a8126806ebbd9db8b29866f663b7bbf26c9ade1933e42f0c00ad410b9d93f3ddbfb3e45c38722869095de28d832fe3fb3703c55cc9a01dbf63
 DIST mupdf-1.12.0-source.tar.gz 51508917 BLAKE2B 
c34df17f0df7a200897d678514ff4012e02b1cef71189fe48740948c88cb544c6ce80f52a5dc335d70002806a7b413e5f79a1edee88865e42daf76e49416d9bf
 SHA512 
11ae620e55e9ebd5844abd7decacc0dafc90dd1f4907ba6ed12f5c725d3920187fc730a7fc33979bf3ff9451da7dbb51f34480a878083e2064f345f47d96
+DIST mupdf-1.13.0-source.tar.gz 51425034 BLAKE2B 
7f4a1c84b5840991cc7879f3617165579f4db1f7a010a8313b0eaf94ad59af60bb3d0e4a0f2acc14d2c7511dd0f8b96c89c51e360ab379ba32590b887dd3be6a
 SHA512 
d7fca7292e612959893a728d35964cf7b4e607385bdd72e81b8ca1de6ab642f999b734afbbf32d75400cd29b7e178ec360e65c91d7b1e1a53c2a04ff0adbd707

diff --git a/app-text/mupdf/files/mupdf-1.13-openssl-curl-x11.patch 
b/app-text/mupdf/files/mupdf-1.13-openssl-curl-x11.patch
new file mode 100644
index 000..6db51a083ed
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.13-openssl-curl-x11.patch
@@ -0,0 +1,39 @@
+diff --git a/Makerules b/Makerules
+index ef2b6b0..f9b25d6 100644
+--- a/Makerules
 b/Makerules
+@@ -104,12 +104,17 @@ HAVE_GLUT := yes
+ SYS_GLUT_CFLAGS :=
+ SYS_GLUT_LIBS := -lglut -lGL
+ 
++WANT_OPENSSL ?= yes
++ifeq "$(WANT_OPENSSL)" "yes"
+ ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes"
+ HAVE_LIBCRYPTO := yes
+ SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags 
libcrypto)
+ SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
+ endif
++endif
+ 
++WANT_CURL ?= yes
++ifeq "$(WANT_CURL)" "yes"
+ ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes"
+ HAVE_CURL := yes
+ SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
+@@ -121,12 +126,16 @@ SYS_CURL_DEPS += $(shell pkg-config --libs openssl)
+ endif
+ endif
+ SYS_CURL_DEPS += -lpthread -lrt
++endif
+ 
++WANT_X11 ?= yes
++ifeq "$(WANT_X11)" "yes"
+ ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes"
+ HAVE_X11 := yes
+ SYS_X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
+ SYS_X11_LIBS := $(shell pkg-config --libs x11 xext)
+ endif
++endif
+ 
+ ifeq "$(shell pkg-config --exists harfbuzz && echo yes)" "yes"
+ SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)

diff --git a/app-text/mupdf/mupdf-1.13.0.ebuild 
b/app-text/mupdf/mupdf-1.13.0.ebuild
new file mode 100644
index 000..413d97b408e
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.13.0.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/";
+SRC_URI="https://mupdf.com/downloads/${P}-source.tar.gz";
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X +curl javascript lcms libressl opengl +openssl static static-libs 
vanilla"
+
+LIB_DEPEND="
+   !libressl? ( dev-libs/openssl:0=[static-libs?] )
+   libressl? ( dev-libs/libressl:0=[static-libs?] )
+   javascript? ( >=dev-lang/mujs-0_p20160504 )
+   media-libs/freetype:2=[static-libs?]
+   media-libs/harfbuzz:=[static-libs?]
+   media-libs/jbig2dec:=[static-libs?]
+   media-libs/libpng:0=[static-libs?]
+   >=media-libs/openjpeg-2.1:2=[static-libs?]
+   net-misc/curl[static-libs?]
+   virtual/jpeg[static-libs?]
+   X? ( x11-libs/libX11[static-libs?]
+   x11-libs/libXext[static-libs?] )
+   opengl? ( >=media-libs/freeglut-3.0.0:= )"
+RDEPEND="${LIB_DEPEND}"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   static-libs? ( ${LIB_DEPEND} )
+   static? ( ${LIB_DEPEND//?}
+   app-arch/bzip2[static-libs]
+   x11-libs/libXau[static-libs]
+   x11-libs/libXdmcp[static-libs]
+

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

[Michael Weber]

commit: 3be187616f2921e36c9bf82cb95d97f00cb12ad2
Author: Michael Weber  gentoo  org>
AuthorDate: Thu Jun 22 23:30:06 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Thu Jun 22 23:30:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3be18761

app-text/mupdf: drop empty libmupdfthird.a file (bug 620874, thanks Cddr).

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-text/mupdf/files/mupdf-1.11-drop-libmupdfthird.patch | 11 +++
 app-text/mupdf/mupdf-1.11-r2.ebuild  |  1 +
 2 files changed, 12 insertions(+)

diff --git a/app-text/mupdf/files/mupdf-1.11-drop-libmupdfthird.patch 
b/app-text/mupdf/files/mupdf-1.11-drop-libmupdfthird.patch
new file mode 100644
index 000..eaf11678868
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.11-drop-libmupdfthird.patch
@@ -0,0 +1,11 @@
+--- mupdf-1.11-source/Makefile
 mupdf-1.11-source/Makefile
+@@ -301,7 +301,7 @@
+ # --- Library ---
+ 
+ MUPDF_LIB = $(OUT)/libmupdf.a
+-THIRD_LIB = $(OUT)/libmupdfthird.a
++THIRD_LIB =
+ THREAD_LIB = $(OUT)/libmuthreads.a
+ 
+ MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(SVG_OBJ) 
$(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ)

diff --git a/app-text/mupdf/mupdf-1.11-r2.ebuild 
b/app-text/mupdf/mupdf-1.11-r2.ebuild
index 53319aa7581..ba45032f219 100644
--- a/app-text/mupdf/mupdf-1.11-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.11-r2.ebuild
@@ -49,6 +49,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.11-openssl-curl-x11.patch
"${FILESDIR}"/${PN}-1.11-system-glfw.patch
"${FILESDIR}"/${PN}-1.11-CVE-2017-6060.patch
+   "${FILESDIR}"/${PN}-1.11-drop-libmupdfthird.patch
 )
 
 src_prepare() {

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

[Michael Weber]

commit: 8e97b8c1e02d7b8313779001d2dcd8b10f691f18
Author: Michael Weber  gentoo  org>
AuthorDate: Sat May 13 22:45:46 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Sat May 13 22:46:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e97b8c1

app-text/mupdf: Remove security affected versions (bug 614044).

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-text/mupdf/Manifest|   1 -
 .../files/mupdf-1.10a-Makerules-openssl-curl.patch |  32 -
 .../mupdf/files/mupdf-1.10a-heap-overflow.patch|  40 --
 .../mupdf/files/mupdf-1.10a-null-pointer-2.patch   |  88 
 .../mupdf/files/mupdf-1.10a-null-pointer.patch |  21 ---
 app-text/mupdf/files/mupdf-1.8-system-glfw.patch   |  11 --
 app-text/mupdf/files/mupdf-1.9a-CFLAGS.patch   |  11 --
 app-text/mupdf/mupdf-1.10a-r2.ebuild   | 148 
 app-text/mupdf/mupdf-1.11.ebuild   | 151 -
 9 files changed, 503 deletions(-)

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index a18278adef1..9b45f8ce985 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,2 +1 @@
-DIST mupdf-1.10a-source.tar.gz 42264707 SHA256 
aacc1f36b9180f562022ef1ab3439b009369d944364f3cff8a2a898834e3a836 SHA512 
8c735963364985e74ceb38242afae555a3d2ee7c69abe3fe5c485e8613a83d996a58f231cb689a156019d431fa67d565503247d010b0a404054850483aed9fec
 WHIRLPOOL 
f3dc7fbddd2ee140226f17b444f184138dbff5d626033a295a7b335119fae5eb49eae680fb392068935610cdbed21267016af8afaa080fffba4f320b82209fbb
 DIST mupdf-1.11-source.tar.gz 40156070 SHA256 
209474a80c56a035ce3f4958a63373a96fad75c927c7b1acdc553fc85855f00a SHA512 
501670f540e298a8126806ebbd9db8b29866f663b7bbf26c9ade1933e42f0c00ad410b9d93f3ddbfb3e45c38722869095de28d832fe3fb3703c55cc9a01dbf63
 WHIRLPOOL 
91ee829b7b39b31c21cda324925e70a52139515c9cd2ef6fb3d903493c96af22d2c2bf19017dfc6d58842c8ebd7896faef34b73d94822977f10300c916fe1352

diff --git a/app-text/mupdf/files/mupdf-1.10a-Makerules-openssl-curl.patch 
b/app-text/mupdf/files/mupdf-1.10a-Makerules-openssl-curl.patch
deleted file mode 100644
index 3fdc20426c1..000
--- a/app-text/mupdf/files/mupdf-1.10a-Makerules-openssl-curl.patch
+++ /dev/null
@@ -1,32 +0,0 @@
 mupdf-1.10a/Makerules
-+++ mupdf-1.10a/Makerules
-@@ -107,12 +107,17 @@
- 
- HAVE_PTHREADS ?= yes
- 
-+WANT_OPENSSL ?= yes
-+ifeq "$(WANT_OPENSSL)" "yes"
- ifeq "$(shell pkg-config --exists libcrypto && echo yes)" "yes"
- HAVE_LIBCRYPTO = yes
- SYS_LIBCRYPTO_CFLAGS = -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
- SYS_LIBCRYPTO_LIBS = $(shell pkg-config --libs libcrypto)
- endif
-+endif
- 
-+WANT_CURL ?= yes
-+ifeq "$(WANT_CURL)" "yes"
- ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes"
- HAVE_CURL = yes
- SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl)
-@@ -122,8 +127,10 @@
- SYS_CURL_CFLAGS += $(shell pkg-config --cflags openssl)
- SYS_CURL_DEPS += $(shell pkg-config --libs openssl)
- endif
--endif
- SYS_CURL_DEPS += -lpthread -lrt
-+endif
-+endif
-+
- 
- ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes"
- HAVE_X11 = yes

diff --git a/app-text/mupdf/files/mupdf-1.10a-heap-overflow.patch 
b/app-text/mupdf/files/mupdf-1.10a-heap-overflow.patch
deleted file mode 100644
index 8b350ea8590..000
--- a/app-text/mupdf/files/mupdf-1.10a-heap-overflow.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-X-Git-Url: 
http://git.ghostscript.com/?p=mupdf.git;a=blobdiff_plain;f=source%2Ffitz%2Fpixmap.c;h=f1291dc29d49ead44c10785fd014a0d995e45a91;hp=a8317127da7af6d39eb86fe3ca02cb4106a9b262;hb=2c4e5867ee699b1081527bc6c6ea0e99a35a5c27;hpb=90fa6203ad032fe161d85a3e580941ce3d1216f0
-
-diff --git a/source/fitz/pixmap.c b/source/fitz/pixmap.c
-index a831712..f1291dc 100644
 a/source/fitz/pixmap.c
-+++ b/source/fitz/pixmap.c
-@@ -1104,6 +1104,7 @@ fz_subsample_pixmap_ARM(unsigned char *ptr, int w, int 
h, int f, int factor,
-   
"@STACK:r1,<9>,factor,n,fwd,back,back2,fwd2,divX,back4,fwd4,fwd3,divY,back5,divXY\n"
-   "ldrr4, [r13,#4*22] @ r4 = divXY\n"
-   "ldrr5, [r13,#4*11] @ for (nn = n; nn > 0; n--) {   \n"
-+  "ldrr8, [r13,#4*17] @ r8 = back4\n"
-   "18:@   \n"
-   "movr14,#0  @ r14= v = 0\n"
-   "subr5, r5, r1, LSL #8  @ for (xx = x; xx > 0; x--) {   \n"
-@@ -1120,7 +1121,7 @@ fz_subsample_pixmap_ARM(unsigned char *ptr, int w, int 
h, int f, int factor,
-   "mulr14,r4, r14 @ r14= v *= divX\n"
-   "movr14,r14,LSR #16 @ r14= v >>= 16 \n"
-   "strb   r14,[r9], #1@ *d++ = r14\n"
--  "subr0, r0, r8  @ s -= back2\n"
-+  "subr0, r0, r8  @ s -= back4\

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

[Michael Weber]

commit: d08384446c68c67ba03615b921f35b7d4929580d
Author: Michael Weber  gentoo  org>
AuthorDate: Mon May  8 13:23:42 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Mon May  8 13:23:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0838444

app-text/mupdf: Revbump for security patch (bug 614044).

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 .../mupdf/files/mupdf-1.11-CVE-2017-6060.patch |  15 ++
 app-text/mupdf/mupdf-1.11-r1.ebuild| 152 +
 2 files changed, 167 insertions(+)

diff --git a/app-text/mupdf/files/mupdf-1.11-CVE-2017-6060.patch 
b/app-text/mupdf/files/mupdf-1.11-CVE-2017-6060.patch
new file mode 100644
index 000..a595253e864
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.11-CVE-2017-6060.patch
@@ -0,0 +1,15 @@
+X-Git-Url: 
http://git.ghostscript.com/?p=user%2Fsebras%2Fmupdf.git;a=blobdiff_plain;f=platform%2Fx11%2Fjstest_main.c;h=f158d9628ed0c0a84e37fe128277679e8334422a;hp=13c3a0a3ba3ff4aae29f6882d23740833c1d842f;hb=06a012a42c9884e3cd653e7826cff1ddec04eb6e;hpb=34e18d127a02146e3415b33c4b67389ce1ddb614
+
+diff --git a/platform/x11/jstest_main.c b/platform/x11/jstest_main.c
+index 13c3a0a..f158d96 100644
+--- a/platform/x11/jstest_main.c
 b/platform/x11/jstest_main.c
+@@ -346,7 +346,7 @@ main(int argc, char *argv[])
+   }
+   else if (match(&line, "OPEN"))
+   {
+-  char path[1024];
++  char path[LONGLINE];
+   if (file_open)
+   pdfapp_close(&gapp);
+   if (prefix)

diff --git a/app-text/mupdf/mupdf-1.11-r1.ebuild 
b/app-text/mupdf/mupdf-1.11-r1.ebuild
new file mode 100644
index 000..f2bd343e789
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.11-r1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="http://mupdf.com/";
+SRC_URI="http://mupdf.com/downloads/${P}-source.tar.gz";
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X +curl javascript libressl opengl +openssl static static-libs vanilla"
+
+LIB_DEPEND="
+   !libressl? ( dev-libs/openssl:0[static-libs?] )
+   libressl? ( dev-libs/libressl[static-libs?] )
+   javascript? ( >=dev-lang/mujs-0_p20160504 )
+   media-libs/freetype:2[static-libs?]
+   media-libs/harfbuzz[static-libs?]
+   media-libs/jbig2dec[static-libs?]
+   media-libs/libpng:0[static-libs?]
+   >=media-libs/openjpeg-2.1:2[static-libs?]
+   net-misc/curl[static-libs?]
+   virtual/jpeg[static-libs?]
+   X? ( x11-libs/libX11[static-libs?]
+   x11-libs/libXext[static-libs?] )
+   opengl? ( >=media-libs/glfw-3.2 )"
+RDEPEND="${LIB_DEPEND}"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   static-libs? ( ${LIB_DEPEND} )
+   static? ( ${LIB_DEPEND//?}
+   app-arch/bzip2[static-libs]
+   x11-libs/libXau[static-libs]
+   x11-libs/libXdmcp[static-libs]
+   x11-libs/libxcb[static-libs] )"
+
+REQUIRED_USE="opengl? ( X !static !static-libs )"
+
+S=${WORKDIR}/${P}-source
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.11-CFLAGS.patch
+   "${FILESDIR}"/${PN}-1.9a-debug-build.patch
+   "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+   "${FILESDIR}"/${PN}-1.11-openssl-curl-x11.patch
+   "${FILESDIR}"/${PN}-1.11-system-glfw.patch
+   "${FILESDIR}"/${PN}-1.11-CVE-2017-6060.patch
+)
+
+src_prepare() {
+   default
+   use hppa && append-cflags -ffunction-sections
+
+   rm -rf thirdparty || die
+
+   if has_version ">=media-libs/openjpeg-2.1:2" ; then
+   # Remove a switch, which prevents using shared libraries for 
openjpeg2.
+   # See 
http://www.linuxfromscratch.org/blfs/view/cvs/pst/mupdf.html
+   sed '/OPJ_STATIC$/d' -i source/fitz/load-jpx.c
+   fi
+
+   use javascript || \
+   sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
+   -i include/mupdf/fitz/config.h
+
+   sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
+   -e "/^prefix=/s:=.*:=${EROOT}/usr:" \
+   -i platform/debian/${PN}.pc || die
+
+   use vanilla || eapply \
+   "${FILESDIR}"/${PN}-1.3-zoom-2.patch
+
+   sed -e "1iOS = Linux" \
+   -e "1iCC = $(tc-getCC)" \
+   -e "1iLD = $(tc-getCC)" \
+   -e "1iAR = $(tc-getAR)" \
+   -e "1iverbose = yes" \
+

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

[Michael Weber]

commit: 7e51c0aae90d1611ff7674963a0e3989e6124e5d
Author: Michael Weber  gentoo  org>
AuthorDate: Fri Apr 28 09:33:04 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Fri Apr 28 09:33:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e51c0aa

app-text/mupdf: Version bump (bug 616652), make mupdf-gl default if available 
(bug 616654), thanks Massimo Burcheri.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-text/mupdf/Manifest|   1 +
 app-text/mupdf/files/mupdf-1.11-CFLAGS.patch   |  10 ++
 .../mupdf/files/mupdf-1.11-openssl-curl-x11.patch  |  37 +
 app-text/mupdf/files/mupdf-1.11-system-glfw.patch  |  11 ++
 app-text/mupdf/mupdf-1.11.ebuild   | 151 +
 5 files changed, 210 insertions(+)

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 006624c52d7..a18278adef1 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1 +1,2 @@
 DIST mupdf-1.10a-source.tar.gz 42264707 SHA256 
aacc1f36b9180f562022ef1ab3439b009369d944364f3cff8a2a898834e3a836 SHA512 
8c735963364985e74ceb38242afae555a3d2ee7c69abe3fe5c485e8613a83d996a58f231cb689a156019d431fa67d565503247d010b0a404054850483aed9fec
 WHIRLPOOL 
f3dc7fbddd2ee140226f17b444f184138dbff5d626033a295a7b335119fae5eb49eae680fb392068935610cdbed21267016af8afaa080fffba4f320b82209fbb
+DIST mupdf-1.11-source.tar.gz 40156070 SHA256 
209474a80c56a035ce3f4958a63373a96fad75c927c7b1acdc553fc85855f00a SHA512 
501670f540e298a8126806ebbd9db8b29866f663b7bbf26c9ade1933e42f0c00ad410b9d93f3ddbfb3e45c38722869095de28d832fe3fb3703c55cc9a01dbf63
 WHIRLPOOL 
91ee829b7b39b31c21cda324925e70a52139515c9cd2ef6fb3d903493c96af22d2c2bf19017dfc6d58842c8ebd7896faef34b73d94822977f10300c916fe1352

diff --git a/app-text/mupdf/files/mupdf-1.11-CFLAGS.patch 
b/app-text/mupdf/files/mupdf-1.11-CFLAGS.patch
new file mode 100644
index 000..2ffd326e5e4
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.11-CFLAGS.patch
@@ -0,0 +1,10 @@
+--- mupdf-1.11-source/Makerules
 mupdf-1.11-source/Makerules
+@@ -23,7 +23,6 @@
+ endif
+ 
+ ifeq "$(build)" "debug"
+-CFLAGS += -pipe -g
+ LDFLAGS += -g
+ else ifeq "$(build)" "release"
+ CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer

diff --git a/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11.patch 
b/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11.patch
new file mode 100644
index 000..91fd9f6485d
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11.patch
@@ -0,0 +1,37 @@
+--- mupdf-1.11-source/Makerules
 mupdf-1.11-source/Makerules
+@@ -116,12 +116,17 @@
+ SYS_PTHREAD_CFLAGS :=
+ SYS_PTHREAD_LIBS := -lpthread
+ 
++WANT_OPENSSL ?= yes
++ifeq "$(WANT_OPENSSL)" "yes"
+ ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes"
+ HAVE_LIBCRYPTO := yes
+ SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags 
libcrypto)
+ SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
+ endif
++endif
+ 
++WANT_CURL ?= yes
++ifeq "$(WANT_CURL)" "yes"
+ ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes"
+ HAVE_CURL := yes
+ SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
+@@ -133,12 +138,16 @@
+ endif
+ endif
+ SYS_CURL_DEPS += -lpthread -lrt
++endif
+ 
++WANT_X!! ?= yes
++ifeq "$(WANT_X11)" "yes"
+ ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes"
+ HAVE_X11 := yes
+ SYS_X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
+ SYS_X11_LIBS := $(shell pkg-config --libs x11 xext)
+ endif
++endif
+ 
+ ifeq "$(shell pkg-config --exists harfbuzz && echo yes)" "yes"
+ SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)

diff --git a/app-text/mupdf/files/mupdf-1.11-system-glfw.patch 
b/app-text/mupdf/files/mupdf-1.11-system-glfw.patch
new file mode 100644
index 000..90189f9400b
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.11-system-glfw.patch
@@ -0,0 +1,11 @@
+--- mupdf-1.11-source/Makerules
 mupdf-1.11-source/Makerules
+@@ -158,6 +158,8 @@
+ SYS_JBIG2DEC_LIBS := -ljbig2dec
+ SYS_LIBJPEG_LIBS := -ljpeg
+ SYS_ZLIB_LIBS := -lz
++SYS_GLFW_CFLAGS = $(shell pkg-config --cflags glfw3 gl)
++SYS_GLFW_LIBS = $(shell pkg-config --libs glfw3 gl)
+ 
+ endif
+ 

diff --git a/app-text/mupdf/mupdf-1.11.ebuild b/app-text/mupdf/mupdf-1.11.ebuild
new file mode 100644
index 000..0369b675c19
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.11.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="http://mupdf.com/";
+SRC_URI="http://mupdf.com/downloads/${P}-source.tar.gz";
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X +curl javascript libressl opengl +openssl static static-libs vanilla"
+
+LIB_DEPEND="
+

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

[Michael Weber]

commit: 2af6b2174d988ef90e8178a6c13839d33af70f35
Author: Michael Weber  gentoo  org>
AuthorDate: Sun Feb  5 17:24:55 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Sun Feb  5 17:24:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2af6b217

app-text/mupdf: Remove old versions (bug 600674, 590480, 589826).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-text/mupdf/Manifest|   3 -
 app-text/mupdf/files/mupdf-1.3-CFLAGS.patch|  11 -
 app-text/mupdf/files/mupdf-1.3-pkg-config.patch|  20 -
 .../files/mupdf-1.5-Makerules-openssl-curl.patch   |  27 --
 .../files/mupdf-1.5-format-security-error.patch|  22 -
 .../mupdf/files/mupdf-1.5-old-debian-files.patch   | 533 -
 app-text/mupdf/files/mupdf-1.5-openjpeg-2.1.patch  |  51 --
 app-text/mupdf/files/mupdf-1.7a-system-mujs.patch  |  11 -
 app-text/mupdf/files/mupdf-1.9a-no-thirdlibs.patch | 113 -
 app-text/mupdf/mupdf-1.5-r1.ebuild | 128 -
 app-text/mupdf/mupdf-1.8.ebuild| 141 --
 app-text/mupdf/mupdf-1.9a.ebuild   | 144 --
 12 files changed, 1204 deletions(-)

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 43abae7..006624c 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,4 +1 @@
 DIST mupdf-1.10a-source.tar.gz 42264707 SHA256 
aacc1f36b9180f562022ef1ab3439b009369d944364f3cff8a2a898834e3a836 SHA512 
8c735963364985e74ceb38242afae555a3d2ee7c69abe3fe5c485e8613a83d996a58f231cb689a156019d431fa67d565503247d010b0a404054850483aed9fec
 WHIRLPOOL 
f3dc7fbddd2ee140226f17b444f184138dbff5d626033a295a7b335119fae5eb49eae680fb392068935610cdbed21267016af8afaa080fffba4f320b82209fbb
-DIST mupdf-1.5.tar.gz 7485699 SHA256 
946393c7abf78e50fa9815f18a9e91f275a1a96a7ea14ae39b5237944070d1f5 SHA512 
bfb79838eba629295ab164cf37e49edc8846689598fbad9312409535022a2e747bd062718b899909564c6cf5826fb46a2b4b579ced8c7a3896d6098e7e5ccf40
 WHIRLPOOL 
ebcaf5f677984a78aecf9eeb72e7a79e6e2a6388db5024427d8bf55f31b3690844dd291ada3cd578a5bb9a370ea21cb2a044656c21a0ef47cdf7bfc42c842beb
-DIST mupdf-1.8.tar.gz 7706473 SHA256 
d4e06644caad381d1dc88401dae12ee614809a7b95f6dcbf6fd086d5b594dcc4 SHA512 
6adc30330c61d0bb8c9ee09488ef31701e9a7425cbac76e072eae9816c14a1190a1e2bd1e9155b6892d4198f7d8692661582cc1b82c7caab7b3ba4fddfcc7461
 WHIRLPOOL 
9fceca049cf5eaffd1520a0077c78bd8647d8e5b384eb2c1bc968a16349b46909b592cb8cbd5ee0546e798434afbece39a258e175ba02d0454b8edc35e179dd7
-DIST mupdf-1.9a.tar.gz 13282205 SHA256 
2a7d6d73cd1f6de8f70792dff9936b84c54c127feecd485675e0d0c17debc98d SHA512 
aa268484371597f2082bff61052b3f80e30b8d41018bf0477b8975e4520849090b75e6c4be6be15d6af9cea6d9315deb28f82c6afc8b6f3c5bfc3498eca91140
 WHIRLPOOL 
b552e68d0412e723e23c645516e87d695e00af0c88b14ab1ebc6b65e374f525fab6df2b5f81fe72fc8a61a8a9f616712ef0d215a07327745d33fb0238509eac9

diff --git a/app-text/mupdf/files/mupdf-1.3-CFLAGS.patch 
b/app-text/mupdf/files/mupdf-1.3-CFLAGS.patch
deleted file mode 100644
index 3c44e98..
--- a/app-text/mupdf/files/mupdf-1.3-CFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 mupdf-1.3/Makerules
-+++ mupdf-1.3/Makerules
-@@ -6,7 +6,7 @@
- CFLAGS += -Wall
- 
- ifeq "$(build)" "debug"
--CFLAGS += -pipe -g -DDEBUG
-+CFLAGS += -DDEBUG
- else ifeq "$(build)" "profile"
- CFLAGS += -pipe -O2 -DNDEBUG -pg
- LDFLAGS += -pg

diff --git a/app-text/mupdf/files/mupdf-1.3-pkg-config.patch 
b/app-text/mupdf/files/mupdf-1.3-pkg-config.patch
deleted file mode 100644
index f943014..
--- a/app-text/mupdf/files/mupdf-1.3-pkg-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-no pkgconfig data for jbig2dec and jpeg
-http://bugs.ghostscript.com/show_bug.cgi?id=694301
-
-openjpeg-2
-http://bugs.ghostscript.com/show_bug.cgi?id=693518
-
 mupdf-1.3/platform/debian/mupdf.pc
-+++ mupdf-1.3/platform/debian/mupdf.pc
-@@ -4,9 +4,9 @@
- includedir=${prefix}/include
- 
- Name: mupdf
- Description: Library for rendering PDF documents
--Requires.private: freetype2
-+Requires: freetype2 libopenjp2 libcrypto
- Version: 0.5.0
- Libs: -L${libdir} -lmupdf
--Libs.private: -lopenjpeg -ljbig2dec -ljpeg -lz -lm
-+Libs.private: -lmupdf-js-none
- Cflags: -I${includedir}

diff --git a/app-text/mupdf/files/mupdf-1.5-Makerules-openssl-curl.patch 
b/app-text/mupdf/files/mupdf-1.5-Makerules-openssl-curl.patch
deleted file mode 100644
index bc9312a..
--- a/app-text/mupdf/files/mupdf-1.5-Makerules-openssl-curl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
 mupdf-1.5/Makerules
-+++ mupdf-1.5/Makerules
-@@ -58,17 +58,23 @@
- 
- HAVE_X11 ?= yes
- 
-+WANT_OPENSSL ?= yes
-+ifeq "$(WANT_OPENSSL)" "yes"
- ifeq "$(shell pkg-config --exists libcrypto && echo yes)" "yes"
- SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL $(shell pkg-config --cflags libcrypto)
- SYS_OPENSSL_LIBS = $(shell pkg-config --libs libcrypto)
- endif
-+endif
- 
-+WANT_CURL ?= yes
-+ifeq "$(WANT_CURL)" "yes"
- ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes"
- HAVE_C

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

[Michael Weber]

commit: 8f79eb2c4acb4a2e0a116cc1f7d3257830450b2a
Author: Michael Weber  gentoo  org>
AuthorDate: Fri Jan  8 23:45:40 2016 +
Commit: Michael Weber  gentoo  org>
CommitDate: Fri Jan  8 23:47:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f79eb2c

app-text/mupdf: Version bump, add USE=opengl (thanks Shark, bug 566248).

Package-Manager: portage-2.2.26

 app-text/mupdf/Manifest  |   1 +
 app-text/mupdf/files/mupdf-1.8-system-glfw.patch |  11 ++
 app-text/mupdf/mupdf-1.8.ebuild  | 139 +++
 3 files changed, 151 insertions(+)

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 73cb5f2..3ca01e5 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -2,3 +2,4 @@ DIST mupdf-1.5.tar.gz 7485699 SHA256 
946393c7abf78e50fa9815f18a9e91f275a1a96a7ea
 DIST mupdf-1.6.tar.gz 8188199 SHA256 
ac6f64d5c287b6549d3c26af8fa298c91697f10ebe52b122ba2c1f43e5ccfa52 SHA512 
cda47ef4442bb7de15fc54b87e0e819f80c56c144318b9e953bc36c3da0bb331a10f44016bc89986c317828b7043e737a89556fc51158114b1da58cd8f7977c7
 WHIRLPOOL 
ea14db6f43a70df144f3f70c3421ac7d2096d835fa222f0d5b9c6d64214f5c9156884b6660dda7e1fd2bee83fa9ce66ca25b2f6290ba1588fc55035ad6228413
 DIST mupdf-1.7.tar.gz 7342238 SHA256 
9c79ef0ad3343f8feed8aabfaaad6ba7cbdb3e3398aa380ed505ed71086d0fbc SHA512 
f4c438019285731e5c8bb6f1f9c46ae20b9fd5f720034ab40d4e31ed4b2dd9cd704c45f1b25f68d46c1ed0a9c76d16b01fb26b83aa372497f924a763f9676044
 WHIRLPOOL 
3674a0144fa44c618380f06cba5093016fa6f0aa37ef6cc32e582e4f0a94cedb2e320db0f42007d6096650d42cbc2cc28716adf3371f214728c01332d4120462
 DIST mupdf-1.7a.tar.gz 7345618 SHA256 
1e67196e18e900f8af1799133236afbffe2d8e412052a711eb9f6f9c9d603534 SHA512 
07260bd7d3fa55531bc2a7c1c71990d032725f32675d88c94c978349736c2ba3367934ea0e4f86b52546ce898f36596d14d32ab876dc87eb5290560a28d4b8b9
 WHIRLPOOL 
c307b8169a7e112aade7700acf7abad1528aa048375310ed17112e8ef8dde5f175d9ad1f07bae371d263f573739f92e0cc12659b8a691a3b4992447cebb9f14a
+DIST mupdf-1.8.tar.gz 7706473 SHA256 
d4e06644caad381d1dc88401dae12ee614809a7b95f6dcbf6fd086d5b594dcc4 SHA512 
6adc30330c61d0bb8c9ee09488ef31701e9a7425cbac76e072eae9816c14a1190a1e2bd1e9155b6892d4198f7d8692661582cc1b82c7caab7b3ba4fddfcc7461
 WHIRLPOOL 
9fceca049cf5eaffd1520a0077c78bd8647d8e5b384eb2c1bc968a16349b46909b592cb8cbd5ee0546e798434afbece39a258e175ba02d0454b8edc35e179dd7

diff --git a/app-text/mupdf/files/mupdf-1.8-system-glfw.patch 
b/app-text/mupdf/files/mupdf-1.8-system-glfw.patch
new file mode 100644
index 000..bda8bd8
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.8-system-glfw.patch
@@ -0,0 +1,11 @@
+--- mupdf-1.8/Makerules
 mupdf-1.8/Makerules
+@@ -119,6 +119,8 @@
+ SYS_JBIG2DEC_LIBS = -ljbig2dec
+ SYS_JPEG_LIBS = -ljpeg
+ SYS_ZLIB_LIBS = -lz
++SYS_GLFW_CFLAGS = $(shell pkg-config --cflags glfw3 gl)
++SYS_GLFW_LIBS = $(shell pkg-config --libs glfw3 gl)
+ 
+ endif
+ 

diff --git a/app-text/mupdf/mupdf-1.8.ebuild b/app-text/mupdf/mupdf-1.8.ebuild
new file mode 100644
index 000..04fa8cba
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.8.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs vcs-snapshot
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="http://mupdf.com/";
+SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=179403598244f069b56e60866c13a0b840c5932e;sf=tgz
 -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+MY_SOVER=1.8
+SLOT="0/${MY_SOVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X vanilla +curl javascript libressl opengl +openssl static static-libs"
+
+LIB_DEPEND="
+   !libressl? ( dev-libs/openssl:0[static-libs?] )
+   libressl? ( dev-libs/libressl[static-libs?] )
+   media-libs/freetype:2[static-libs?]
+   media-libs/jbig2dec[static-libs?]
+   media-libs/openjpeg:2[static-libs?]
+   net-misc/curl[static-libs?]
+   virtual/jpeg[static-libs?]
+   X? ( x11-libs/libX11[static-libs?]
+   x11-libs/libXext[static-libs?] )
+   javascript? ( dev-lang/mujs )
+   opengl? ( >=media-libs/glfw-3 )"
+RDEPEND="${LIB_DEPEND}"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   static-libs? ( ${LIB_DEPEND} )
+   static? ( ${LIB_DEPEND//?}
+   app-arch/bzip2[static-libs]
+   x11-libs/libXau[static-libs]
+   x11-libs/libXdmcp[static-libs]
+   x11-libs/libxcb[static-libs] )"
+
+REQUIRED_USE="opengl? ( X !static !static-libs )"
+
+src_prepare() {
+   rm -rf thirdparty || die
+
+   epatch \
+   "${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
+   "${FILESDIR}"/${PN}-1.5-old-debian-files.patch \
+   "${FILESDIR}"/${PN}-1.3-pkg-config.patch \
+   "${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch \

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

[Michael Weber]

commit: def69cb127cae7323d42f05fa9f348112850b6b0
Author: Michael Weber  gentoo  org>
AuthorDate: Tue Aug 11 10:26:28 2015 +
Commit: Michael Weber  gentoo  org>
CommitDate: Tue Aug 11 10:26:28 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=def69cb1

app-text/mupdf: drop old.

Package-Manager: portage-2.2.20

 app-text/mupdf/Manifest|   4 -
 app-text/mupdf/files/mupdf-1.0-zoom.patch  |  18 -
 .../files/mupdf-1.1_p20121127-buildsystem.patch|  24 -
 .../mupdf-1.1_p20121127-desktop-integration.patch  |  20 -
 .../mupdf/files/mupdf-1.1_rc1-buildsystem.patch|  22 -
 app-text/mupdf/files/mupdf-1.1_rc1-zoom-2.patch|  10 -
 .../mupdf/files/mupdf-1.2-mubusy_rename_fix.patch  |  13 -
 app-text/mupdf/files/mupdf-1.2-pkg-config.patch|  17 -
 app-text/mupdf/files/mupdf-1.3-forward_back.patch  |  25 -
 app-text/mupdf/files/mupdf-1.3-openjpeg2.patch |  15 -
 app-text/mupdf/files/mupdf-1.3-sys_curl.patch  |  11 -
 .../mupdf/files/mupdf-1.4-old-debian-files.patch   | 533 -
 app-text/mupdf/mupdf-1.1_p20121127.ebuild  |  61 ---
 app-text/mupdf/mupdf-1.2.ebuild| 117 -
 app-text/mupdf/mupdf-1.3_p20140118.ebuild  | 124 -
 app-text/mupdf/mupdf-1.4-r1.ebuild | 122 -
 16 files changed, 1136 deletions(-)

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 9fd4b83..73cb5f2 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,7 +1,3 @@
-DIST mupdf-1.1_p20121127.tar.gz 6922632 SHA256 
4594bc0473e61200e6d2aba06488ea3127a7d42cd70daa01ea12c3dba5eb654c SHA512 
1dff76502a5cf13e26f0bed30046878334730912ddec12f2674de69f62b173182020566f1ddd341bf3a51b28af1334c0cfcc70cac0ac8b0fb1dceacae6b25418
 WHIRLPOOL 
1597b87b7c53e522a5929b8c0c5c07b0a957084fb4b6974d68feea755d88606930b8a78b998efb94190c00d3d9135a60652f2751c709d49315ae10e30dc9ee0e
-DIST mupdf-1.2-source.zip 13808821 SHA256 
9bc9e31ec27c091dad37f70940bd799e46ab6da4299bc58e803bff3dbb07dc3b SHA512 
49261c5356d4e5648f89bfb783a23a3c3a470e044fe3b234f0906b0f6b71efad557981682e41ce3d754a5a31f1e5518e5e5f5f8dc83d2ca53181dbd3f4726e02
 WHIRLPOOL 
86fb60a2ac94c8ca4495c0891dd2b43ea49c9e212e2961f02914a3aaa5685566201f561c196da7d4c568dcec938eea8676959bbec839e33a7bff4e6410cc1a25
-DIST mupdf-1.3_p20140118.tar.gz 7448663 SHA256 
ed1791966a60be0d8556cf5e0def0e3093867223f0eb4f12fbffd22804520882 SHA512 
c159f58539f1e944608ff7da8f41cef5e955de2f21ab1e37a6fad5577134094186a8b8b7ecdf47a427547e3fde7f04f2d484da6709adf3859c3754e2774b6a56
 WHIRLPOOL 
b24bbbd49921edcea93a80a597bb0139937ac1ef365ae63f83cf7df878586ed2a9ecbef65645b9562627fa2bc2a662991a1af1ffd99e10f10a351bccb951eebe
-DIST mupdf-1.4.tar.gz 7470075 SHA256 
ccac5ad1129f051dbaecbeec01b85f548c8bdb1c97b5e1dd397299bf7f988438 SHA512 
6de95fa02e3ebaf2f268765df7eb4c1b53ef0b3b39b57b8e64097c429727dd483894e3a62c520151197290a8e392b9b1746109fc3eb528b44245040acc82a25e
 WHIRLPOOL 
a43ab9bbaf5cd5e40445ace3fdeb9e0b57e4924c7e9a7669899275da2c8a41725d862fb1cd85d779852ec794be8184b7d21aaee932024d7d0557e076de6611a4
 DIST mupdf-1.5.tar.gz 7485699 SHA256 
946393c7abf78e50fa9815f18a9e91f275a1a96a7ea14ae39b5237944070d1f5 SHA512 
bfb79838eba629295ab164cf37e49edc8846689598fbad9312409535022a2e747bd062718b899909564c6cf5826fb46a2b4b579ced8c7a3896d6098e7e5ccf40
 WHIRLPOOL 
ebcaf5f677984a78aecf9eeb72e7a79e6e2a6388db5024427d8bf55f31b3690844dd291ada3cd578a5bb9a370ea21cb2a044656c21a0ef47cdf7bfc42c842beb
 DIST mupdf-1.6.tar.gz 8188199 SHA256 
ac6f64d5c287b6549d3c26af8fa298c91697f10ebe52b122ba2c1f43e5ccfa52 SHA512 
cda47ef4442bb7de15fc54b87e0e819f80c56c144318b9e953bc36c3da0bb331a10f44016bc89986c317828b7043e737a89556fc51158114b1da58cd8f7977c7
 WHIRLPOOL 
ea14db6f43a70df144f3f70c3421ac7d2096d835fa222f0d5b9c6d64214f5c9156884b6660dda7e1fd2bee83fa9ce66ca25b2f6290ba1588fc55035ad6228413
 DIST mupdf-1.7.tar.gz 7342238 SHA256 
9c79ef0ad3343f8feed8aabfaaad6ba7cbdb3e3398aa380ed505ed71086d0fbc SHA512 
f4c438019285731e5c8bb6f1f9c46ae20b9fd5f720034ab40d4e31ed4b2dd9cd704c45f1b25f68d46c1ed0a9c76d16b01fb26b83aa372497f924a763f9676044
 WHIRLPOOL 
3674a0144fa44c618380f06cba5093016fa6f0aa37ef6cc32e582e4f0a94cedb2e320db0f42007d6096650d42cbc2cc28716adf3371f214728c01332d4120462

diff --git a/app-text/mupdf/files/mupdf-1.0-zoom.patch 
b/app-text/mupdf/files/mupdf-1.0-zoom.patch
deleted file mode 100644
index 8f976b9..000
--- a/app-text/mupdf/files/mupdf-1.0-zoom.patch
+++ /dev/null
@@ -1,18 +0,0 @@
 mupdf-/apps/pdfapp.c
-+++ mupdf-/apps/pdfapp.c
-@@ -858,6 +858,7 @@
-   break;
- 
-   case 'b':
-+  case '\b': //backspace
-   panto = DONT_PAN;
-   if (app->numberlen > 0)
-   app->pageno -= atoi(app->number);
-@@ -866,6 +867,7 @@
-   break;
- 
-   case ' ':
-+  case 'F':
-   panto = DONT_PAN;
-   if (app->numberlen > 0)
-   app->pageno += atoi(app->number);

diff --git a/