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

2020-10-20 Thread Sergei Trofimovich
commit: 592d118d5b743b6cfe32bf30979178d8902552e3
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Oct 20 16:22:53 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Oct 20 17:41:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=592d118d

app-text/mupdf: keyworded 1.18.0 for hppa, bug #748558

Package-Manager: Portage-3.0.8, Repoman-3.0.1
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.18.0.ebuild 
b/app-text/mupdf/mupdf-1.18.0.ebuild
index a6d949e9d5d..3b66988d057 100644
--- a/app-text/mupdf/mupdf-1.18.0.ebuild
+++ b/app-text/mupdf/mupdf-1.18.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P}-source"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 arm arm64 ~ia64 ppc ppc64 x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86"
 IUSE="X +javascript libressl opengl ssl static-libs"
 
 # Although we use the bundled, patched version of freeglut in mupdf (because of



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

2020-10-18 Thread Sam James
commit: be702c381b44155953eeec0cab0e96bebbba662d
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 19 03:14:09 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 19 03:14:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be702c38

app-text/mupdf: Stabilize 1.18.0 arm64, #747151

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.18.0.ebuild 
b/app-text/mupdf/mupdf-1.18.0.ebuild
index 752fd7c389e..a6d949e9d5d 100644
--- a/app-text/mupdf/mupdf-1.18.0.ebuild
+++ b/app-text/mupdf/mupdf-1.18.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P}-source"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 arm ~arm64 ~ia64 ppc ppc64 x86"
+KEYWORDS="~amd64 arm arm64 ~ia64 ppc ppc64 x86"
 IUSE="X +javascript libressl opengl ssl static-libs"
 
 # Although we use the bundled, patched version of freeglut in mupdf (because of



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

2020-10-18 Thread Sam James
commit: e8b3ef91b111eefc5afdbadb8c17a9c8c7d374c6
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 18 23:53:26 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 18 23:55:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8b3ef91

app-text/mupdf: Stabilize 1.18.0 arm, #747151

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.18.0.ebuild 
b/app-text/mupdf/mupdf-1.18.0.ebuild
index 294eb05575d..752fd7c389e 100644
--- a/app-text/mupdf/mupdf-1.18.0.ebuild
+++ b/app-text/mupdf/mupdf-1.18.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P}-source"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
+KEYWORDS="~amd64 arm ~arm64 ~ia64 ppc ppc64 x86"
 IUSE="X +javascript libressl opengl ssl static-libs"
 
 # Although we use the bundled, patched version of freeglut in mupdf (because of



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

2020-10-18 Thread Thomas Deutschmann
commit: ea5f39c6d0ae7f80b7a6871698be92c0008c0177
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Oct 18 15:11:06 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Oct 18 15:11:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea5f39c6

app-text/mupdf: x86 stable (bug #747151)

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.18.0.ebuild 
b/app-text/mupdf/mupdf-1.18.0.ebuild
index eeb1dd7cad2..294eb05575d 100644
--- a/app-text/mupdf/mupdf-1.18.0.ebuild
+++ b/app-text/mupdf/mupdf-1.18.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P}-source"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
 IUSE="X +javascript libressl opengl ssl static-libs"
 
 # Although we use the bundled, patched version of freeglut in mupdf (because of



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

2020-10-15 Thread Sergei Trofimovich
commit: 238c89964f302e390388b5beb86e231708876e30
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Oct 15 22:33:20 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Oct 15 22:33:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=238c8996

app-text/mupdf: stable 1.18.0 for ppc64

stable wrt bug #747151

Package-Manager: Portage-3.0.8, Repoman-3.0.1
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.18.0.ebuild 
b/app-text/mupdf/mupdf-1.18.0.ebuild
index 7ec702675be..eeb1dd7cad2 100644
--- a/app-text/mupdf/mupdf-1.18.0.ebuild
+++ b/app-text/mupdf/mupdf-1.18.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P}-source"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~x86"
 IUSE="X +javascript libressl opengl ssl static-libs"
 
 # Although we use the bundled, patched version of freeglut in mupdf (because of



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

2020-10-15 Thread Sergei Trofimovich
commit: 6510f06c1528b0b077f9f17759c9f9c2e7957382
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Oct 15 22:29:30 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Oct 15 22:29:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6510f06c

app-text/mupdf: stable 1.18.0 for ppc

stable wrt bug #747151

Package-Manager: Portage-3.0.8, Repoman-3.0.1
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.18.0.ebuild 
b/app-text/mupdf/mupdf-1.18.0.ebuild
index c05ca22e22b..7ec702675be 100644
--- a/app-text/mupdf/mupdf-1.18.0.ebuild
+++ b/app-text/mupdf/mupdf-1.18.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P}-source"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~x86"
 IUSE="X +javascript libressl opengl ssl static-libs"
 
 # Although we use the bundled, patched version of freeglut in mupdf (because of



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

2020-10-15 Thread Sergei Trofimovich
commit: 8df1b983e0ec3dea1c85875bffbb45beb5a5419e
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Oct 15 22:23:52 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Oct 15 22:23:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8df1b983

app-text/mupdf: keyworded 1.18.0 for ia64

keyworded wrt bug #748558

Package-Manager: Portage-3.0.8, Repoman-3.0.1
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.18.0.ebuild 
b/app-text/mupdf/mupdf-1.18.0.ebuild
index 3a24c9280d2..c05ca22e22b 100644
--- a/app-text/mupdf/mupdf-1.18.0.ebuild
+++ b/app-text/mupdf/mupdf-1.18.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P}-source"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="X +javascript libressl opengl ssl static-libs"
 
 # Although we use the bundled, patched version of freeglut in mupdf (because of



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

2020-10-14 Thread Sam James
commit: 2d47ee79a949eb7014e630270c17a9a1340b7a55
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct 14 19:52:34 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 14 19:52:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d47ee79

app-text/mupdf: Keyword 1.18.0 arm64, #748558

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.18.0.ebuild 
b/app-text/mupdf/mupdf-1.18.0.ebuild
index e5c0da4..3a24c9280d2 100644
--- a/app-text/mupdf/mupdf-1.18.0.ebuild
+++ b/app-text/mupdf/mupdf-1.18.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P}-source"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="X +javascript libressl opengl ssl static-libs"
 
 # Although we use the bundled, patched version of freeglut in mupdf (because of



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

2020-10-14 Thread Sam James
commit: 3b38905a4331ebd44c213ac4845792f264b55c33
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct 14 19:29:53 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 14 19:30:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b38905a

app-text/mupdf: Keyword 1.18.0 arm, #748558

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.18.0.ebuild 
b/app-text/mupdf/mupdf-1.18.0.ebuild
index de1165c548a..e5c0da4 100644
--- a/app-text/mupdf/mupdf-1.18.0.ebuild
+++ b/app-text/mupdf/mupdf-1.18.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P}-source"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="X +javascript libressl opengl ssl static-libs"
 
 # Although we use the bundled, patched version of freeglut in mupdf (because of



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

2020-10-14 Thread Sam James
commit: e86a408ac0884487c99d61cfd67c798e9408e62c
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct 14 18:30:57 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 14 18:30:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e86a408a

app-text/mupdf: ppc keyworded (bug #748558)

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.18.0.ebuild 
b/app-text/mupdf/mupdf-1.18.0.ebuild
index c7cab5a41c8..b7fbe574b47 100644
--- a/app-text/mupdf/mupdf-1.18.0.ebuild
+++ b/app-text/mupdf/mupdf-1.18.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P}-source"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="X +javascript libressl opengl ssl static-libs"
 
 # Although we use the bundled, patched version of freeglut in mupdf (because of



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

2020-10-14 Thread Sam James
commit: 577d23d63ae949bb07a8f2da0cffbb8e0a75fdef
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct 14 18:32:08 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 14 18:32:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=577d23d6

app-text/mupdf: ppc64 keyworded (bug #748558)

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.18.0.ebuild 
b/app-text/mupdf/mupdf-1.18.0.ebuild
index b7fbe574b47..de1165c548a 100644
--- a/app-text/mupdf/mupdf-1.18.0.ebuild
+++ b/app-text/mupdf/mupdf-1.18.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P}-source"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="X +javascript libressl opengl ssl static-libs"
 
 # Although we use the bundled, patched version of freeglut in mupdf (because of



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

2020-10-13 Thread Sam James
commit: a986634efb6c5c0842444e989d86e10472412699
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Mon Oct 12 10:51:19 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 13 23:21:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a986634e

app-text/mupdf: bump to 1.18.0 (CVE-2020-26519)

Bug: https://bugs.gentoo.org/747151
Removing some keywords (RDEPEND dev-libs/gumbo)

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/17898
Signed-off-by: Sam James  gentoo.org>

 app-text/mupdf/Manifest|   1 +
 app-text/mupdf/files/mupdf-1.18-Makefile.patch |  42 ++
 .../mupdf/files/mupdf-1.18.0-cross-fixes.patch | 128 ++
 app-text/mupdf/mupdf-1.18.0.ebuild | 150 +
 4 files changed, 321 insertions(+)

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 7d709695072..7c07b736ec9 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,2 +1,3 @@
 DIST mupdf-1.16.1-source.tar.xz 45800404 BLAKE2B 
bc4158a457056c55db52a518efc13c289cca537c29a6b563046297dc225f3ce0add781adb8520c4d0829d653ed0539042597e341cb21c4fb4c462ed422bf735b
 SHA512 
fa657e6b9251aff91c25e91b335ea829b797dd91a759505bfd7259f8236613f590a044bc741e9b0587da55817a1ab8c1499c067d65d683d099259d06d91a8f50
 DIST mupdf-1.17.0-source.tar.xz 48559964 BLAKE2B 
f46b09a6d288054da79bea356df4d7d98fe2759cf82bea1f0df2e961b94acebbab58826f7a731c4c68e8b086fd9367fddcabea6c7d2838f25ed84ddc1a0c2bd9
 SHA512 
39188e6ce3eaefb525b2c32767c4bf52ed881b41889edef086aa64bfe1c38e6f3cb853450c8284d175ef8854f32e9bc67415a692048ead26cf31c35645f9e0e5
+DIST mupdf-1.18.0-source.tar.xz 53621544 BLAKE2B 
d0057f4240bd4f6b4b6d9381ae1c3871c56b97604d5c6ea6438a8bde72d4696c10a9f0e8e2ed8f43d63a04bb1d973bade8a708327c00b0d0c6802b28af697a55
 SHA512 
7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8

diff --git a/app-text/mupdf/files/mupdf-1.18-Makefile.patch 
b/app-text/mupdf/files/mupdf-1.18-Makefile.patch
new file mode 100644
index 000..32ee7e57c49
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.18-Makefile.patch
@@ -0,0 +1,42 @@
+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-cross-fixes.patch 
b/app-text/mupdf/files/mupdf-1.18.0-cross-fixes.patch
new file mode 100644
index 000..0576033a03a
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.18.0-cross-fixes.patch
@@ -0,0 +1,128 @@
+Refreshed patches based on:
+https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0004-MuPDF-crossbuild-use-target-arch-pkg-config.patch/
+https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use-host-cc-for-utils.patch/
+--- a/Makefile
 b/Makefile
+@@ -147,6 +147,9 @@ PKCS7_OBJ := $(PKCS7_SRC:%.c=$(OUT)/%.o)
+ 
+ HEXDUMP_EXE := $(OUT)/scripts/hexdump.exe
+ 
++$(HEXDUMP_EXE): scripts/hexdump.c
++  $(QUIET_CC) $(MKTGTDIR) ; $(CC_FOR_BUILD) $(CFLAGS) -o $@ $<
++
+ FONT_BIN := $(sort $(wildcard resources/fonts/urw/*.cff))
+ FONT_BIN += $(sort $(wildcard resources/fonts/han/*.ttc))
+ FONT_BIN += $(sort $(wildcard resources/fonts/droid/*.ttf))
+--- a/Makerules
 b/Makerules
+@@ -6,6 +6,9 @@ OS := $(OS:MSYS%=MINGW)
+ OS := $(OS:Windows_NT=MINGW)
+ OS := $(OS:Darwin=MACOS)
+ 
++PKG_CONFIG ?= pkg-config
++CC_FOR_BUILD ?= $(CC)
++
+ ifeq ($(findstring -fembed-bitcode,$(XCFLAGS)),)
+   # clang does not support these in combination with -fembed-bitcode
+   CFLAGS += -ffunction-sections -fdata-sections
+@@ -128,51 +128,51 @@ else ifeq ($(OS),MACOS)
+ else 

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

2020-10-13 Thread 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 >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 = 

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

2020-10-13 Thread Sam James
commit: 0bcbb95a8070ba3dfe636bdb274345766d150929
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 13 23:06:23 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 13 23:21:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bcbb95a

app-text/mupdf: capitalise DESCRIPTION

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 app-text/mupdf/mupdf-1.16.1.ebuild | 2 +-
 app-text/mupdf/mupdf-1.17.0.ebuild | 2 +-
 app-text/mupdf/mupdf-1.18.0.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-text/mupdf/mupdf-1.16.1.ebuild 
b/app-text/mupdf/mupdf-1.16.1.ebuild
index d93fa2a0f2e..a073710586e 100644
--- a/app-text/mupdf/mupdf-1.16.1.ebuild
+++ b/app-text/mupdf/mupdf-1.16.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit flag-o-matic toolchain-funcs xdg desktop
 
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
 HOMEPAGE="https://mupdf.com/;
 SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 

diff --git a/app-text/mupdf/mupdf-1.17.0.ebuild 
b/app-text/mupdf/mupdf-1.17.0.ebuild
index 73a2ee99223..f195aa31885 100644
--- a/app-text/mupdf/mupdf-1.17.0.ebuild
+++ b/app-text/mupdf/mupdf-1.17.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit desktop flag-o-matic toolchain-funcs xdg
 
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
 HOMEPAGE="https://mupdf.com/;
 SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 S="${WORKDIR}/${P}-source"

diff --git a/app-text/mupdf/mupdf-1.18.0.ebuild 
b/app-text/mupdf/mupdf-1.18.0.ebuild
index 2a7b35539b9..05c1261e442 100644
--- a/app-text/mupdf/mupdf-1.18.0.ebuild
+++ b/app-text/mupdf/mupdf-1.18.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit desktop flag-o-matic toolchain-funcs xdg
 
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
 HOMEPAGE="https://mupdf.com/;
 SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 S="${WORKDIR}/${P}-source"



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

2020-08-14 Thread Aaron Bauman
commit: 30fc228f731e480aaef3d357936c0c7768acfadd
Author: Aaron Bauman  gentoo  org>
AuthorDate: Fri Aug 14 23:51:42 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri Aug 14 23:53:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30fc228f

app-text/mupdf: drop libressl patch and bump min version

* Upstream has included LibreSSL support
* Bump minimum version to 3.2.0 for latest APIs.

Closes: https://bugs.gentoo.org/737126
Signed-off-by: Aaron Bauman  gentoo.org>

 app-text/mupdf/mupdf-1.17.0.ebuild | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app-text/mupdf/mupdf-1.17.0.ebuild 
b/app-text/mupdf/mupdf-1.17.0.ebuild
index 61f7125c382..73a2ee99223 100644
--- a/app-text/mupdf/mupdf-1.17.0.ebuild
+++ b/app-text/mupdf/mupdf-1.17.0.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
virtual/jpeg[static-libs?]
opengl? ( >=media-libs/freeglut-3.0.0:= )
ssl? (
-   libressl? ( >=dev-libs/libressl-2.8:0=[static-libs?] )
+   libressl? ( >=dev-libs/libressl-3.2.0:0=[static-libs?] )
!libressl? ( >=dev-libs/openssl-1.1:0=[static-libs?] )
)
X? (
@@ -60,9 +60,6 @@ src_prepare() {
sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
-i include/mupdf/fitz/config.h || die
 
-   # See bug #670832
-   use ssl && use libressl && eapply 
"${FILESDIR}"/${PN}-1.14-libressl.patch
-
sed -e "1iOS = Linux" \
-e "1iCC = $(tc-getCC)" \
-e "1iLD = $(tc-getLD)" \



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

2020-08-13 Thread Sam James
commit: 0985c4811a165c289d7cde5a81ea960077d7a235
Author: Sam James  gentoo  org>
AuthorDate: Fri Aug 14 04:09:42 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Aug 14 04:21:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0985c481

app-text/mupdf: security bump to 1.17.0

* Debundle dev-lang/mujs again for the
  security bug (bundled copy is probably OK
  in terms of release mujs, but not a new bug
  (CVE-2020-24343).

* Document bundled libs with references
  to check when bumping. Useful for both
  security@ and the maintainer.

* Include extra Debian patches for improved
  cross-compilation support (mostly pkg-config).

* Fix existing patch to respect libdir in pkgconfig
  file.

* Fix missing || dies.

Bug: https://bugs.gentoo.org/737034
Bug: https://bugs.gentoo.org/737020
Closes: https://bugs.gentoo.org/725672
Closes: https://bugs.gentoo.org/734898
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 app-text/mupdf/Manifest|   1 +
 .../mupdf/files/mupdf-1.17.0-cross-fixes.patch | 103 ++
 app-text/mupdf/mupdf-1.17.0.ebuild | 153 +
 3 files changed, 257 insertions(+)

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 964f9c13501..7d709695072 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1 +1,2 @@
 DIST mupdf-1.16.1-source.tar.xz 45800404 BLAKE2B 
bc4158a457056c55db52a518efc13c289cca537c29a6b563046297dc225f3ce0add781adb8520c4d0829d653ed0539042597e341cb21c4fb4c462ed422bf735b
 SHA512 
fa657e6b9251aff91c25e91b335ea829b797dd91a759505bfd7259f8236613f590a044bc741e9b0587da55817a1ab8c1499c067d65d683d099259d06d91a8f50
+DIST mupdf-1.17.0-source.tar.xz 48559964 BLAKE2B 
f46b09a6d288054da79bea356df4d7d98fe2759cf82bea1f0df2e961b94acebbab58826f7a731c4c68e8b086fd9367fddcabea6c7d2838f25ed84ddc1a0c2bd9
 SHA512 
39188e6ce3eaefb525b2c32767c4bf52ed881b41889edef086aa64bfe1c38e6f3cb853450c8284d175ef8854f32e9bc67415a692048ead26cf31c35645f9e0e5

diff --git a/app-text/mupdf/files/mupdf-1.17.0-cross-fixes.patch 
b/app-text/mupdf/files/mupdf-1.17.0-cross-fixes.patch
new file mode 100644
index 000..ae14f9bb5e4
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.17.0-cross-fixes.patch
@@ -0,0 +1,103 @@
+Refreshed patches based on:
+https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0004-MuPDF-crossbuild-use-target-arch-pkg-config.patch/
+https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use-host-cc-for-utils.patch/
+--- a/Makefile
 b/Makefile
+@@ -134,6 +134,9 @@ PKCS7_OBJ := $(PKCS7_SRC:%.c=$(OUT)/%.o)
+ 
+ HEXDUMP_EXE := $(OUT)/scripts/hexdump.exe
+ 
++$(HEXDUMP_EXE): scripts/hexdump.c
++  $(QUIET_CC) $(MKTGTDIR) ; $(CC_FOR_BUILD) $(CFLAGS) -o $@ $<
++
+ FONT_BIN := $(sort $(wildcard resources/fonts/urw/*.cff))
+ FONT_BIN += $(sort $(wildcard resources/fonts/han/*.ttc))
+ FONT_BIN += $(sort $(wildcard resources/fonts/droid/*.ttf))
+--- a/Makerules
 b/Makerules
+@@ -15,6 +15,9 @@ OS := $(OS:MSYS%=MINGW)
+ OS := $(OS:Windows_NT=MINGW)
+ OS := $(OS:Darwin=MACOS)
+ 
++PKG_CONFIG ?= pkg-config
++CC_FOR_BUILD ?= $(CC)
++
+ ifeq ($(findstring -fembed-bitcode,$(XCFLAGS)),)
+   # clang does not support these in combination with -fembed-bitcode
+   CFLAGS += -ffunction-sections -fdata-sections
+@@ -101,35 +104,35 @@ else ifeq ($(OS),MACOS)
+ else ifeq ($(OS),Linux)
+   HAVE_OBJCOPY := yes
+ 
+-  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 harfbuzz && echo yes),yes)
+-  SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
+-  SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz)
++  ifeq ($(shell $(PKG_CONFIG) --exists harfbuzz && echo yes),yes)
++  SYS_HARFBUZZ_CFLAGS := $(shell $(PKG_CONFIG) --cflags harfbuzz)
++  SYS_HARFBUZZ_LIBS := $(shell $(PKG_CONFIG) --libs harfbuzz)
+   endif
+-  ifeq ($(shell pkg-config --exists lcms2 && echo yes),yes)
+-  SYS_LCMS2_CFLAGS := $(shell pkg-config --cflags lcms2)
+-  SYS_LCMS2_LIBS := $(shell pkg-config --libs lcms2)
++  ifeq ($(shell $(PKG_CONFIG) --exists lcms2 && echo yes),yes)
++  SYS_LCMS2_CFLAGS := $(shell $(PKG_CONFIG) --cflags lcms2)
++  SYS_LCMS2_LIBS := $(shell $(PKG_CONFIG) --libs lcms2)
+   endif
+-  ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes)
+-  SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg)
+-  SYS_LIBJPEG_LIBS := $(shell pkg-config --libs libjpeg)
++  ifeq ($(shell $(PKG_CONFIG) --exists libjpeg && echo yes),yes)
++  SYS_LIBJPEG_CFLAGS := 

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

2020-01-26 Thread Johannes Huber
commit: bd0aad7fdcc028542fc36e4f91b05c4ce561f3ff
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Jan 26 13:39:03 2020 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Jan 26 13:39:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd0aad7f

app-text/mupdf: Add myself as maintainer

Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Johannes Huber  gentoo.org>

 app-text/mupdf/metadata.xml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml
index 7a38bb90096..15fd2f3a22b 100644
--- a/app-text/mupdf/metadata.xml
+++ b/app-text/mupdf/metadata.xml
@@ -1,5 +1,8 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
+   
+   j...@gentoo.org
+   Johannes Huber
+   
 



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

2020-01-21 Thread Sergei Trofimovich
commit: b65f37dd215869eae0bc6fd367a515281e301f6a
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Jan 21 23:04:19 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Jan 21 23:04:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b65f37dd

app-text/mupdf: tweak for gcc-10

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich  gentoo.org>

 .../mupdf-1.16.1-freeglut-fg_gl2-gcc-10.patch  | 80 ++
 app-text/mupdf/mupdf-1.16.1.ebuild |  3 +-
 2 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/app-text/mupdf/files/mupdf-1.16.1-freeglut-fg_gl2-gcc-10.patch 
b/app-text/mupdf/files/mupdf-1.16.1-freeglut-fg_gl2-gcc-10.patch
new file mode 100644
index 000..c9c37e2efac
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.16.1-freeglut-fg_gl2-gcc-10.patch
@@ -0,0 +1,80 @@
+From 5791564dd934d193df771a0a7c52013e9f456aa1 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich 
+Date: Tue, 21 Jan 2020 22:33:49 +
+Subject: [PATCH] fg_gl2: fix build failure against gcc-10
+
+On gcc-10 (and gcc-9 -fno-common) build fails as:
+
+```
+[ 31%] Linking C executable bin/Lorenz_static
+/usr/bin/cmake -E cmake_link_script CMakeFiles/Lorenz_static.dir/link.txt 
--verbose=1
+/usr/lib/ccache/bin/cc  -Wall -pedantic  -rdynamic 
CMakeFiles/Lorenz_static.dir/progs/demos/Lorenz/lorenz.c.o \
+   -o bin/Lorenz_static  -lGLU -lGL -lm -lX11 -lXrandr -lXxf86vm -lXi -lm 
lib/libglut.a -lGL -lm -lX11 -lXrandr -lXxf86vm -lXi
+ld: lib/libglut.a(fg_gl2.c.o):(.bss+0x0):
+  multiple definition of `fghGenBuffers'; 
lib/libglut.a(fg_window.c.o):(.bss+0x0): first defined here
+ld: lib/libglut.a(fg_gl2.c.o):(.bss+0x8):
+  multiple definition of `fghDeleteBuffers'; 
lib/libglut.a(fg_window.c.o):(.bss+0x8): first defined here
+```
+
+Note: duplicate definition comes here from 'fg_gl2.h'.
+The fix is to move declaration to a 'fg_gl2.c' file.
+
+gcc-10 will change the default from -fcommon to fno-common:
+https://gcc.gnu.org/PR85678.
+
+The error also happens if CFLAGS=-fno-common passed explicitly.
+
+Bug: https://bugs.gentoo.org/705840
+Signed-off-by: Sergei Trofimovich 
+---
+ freeglut/freeglut/src/fg_gl2.c | 12 
+ freeglut/freeglut/src/fg_gl2.h | 14 +++---
+ 2 files changed, 19 insertions(+), 7 deletions(-)
+
+--- a/thirdparty/freeglut/src/fg_gl2.c
 b/thirdparty/freeglut/src/fg_gl2.c
+@@ -27,6 +27,18 @@
+ #include "fg_internal.h"
+ #include "fg_gl2.h"
+ 
++#ifdef GL_ES_VERSION_2_0
++/* Use existing functions on GLES 2.0 */
++#else
++FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
++FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
++FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
++FGH_PFNGLBUFFERDATAPROC fghBufferData;
++FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
++FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
++FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
++#endif
++
+ void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) {
+   if (fgStructure.CurrentWindow != NULL)
+ fgStructure.CurrentWindow->Window.attribute_v_coord = attrib;
+--- a/thirdparty/freeglut/src/fg_gl2.h
 b/thirdparty/freeglut/src/fg_gl2.h
+@@ -67,13 +67,13 @@ typedef void (APIENTRY 
*FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+ typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint);
+ typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, 
GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid 
*pointer);
+ 
+-FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
+-FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
+-FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
+-FGH_PFNGLBUFFERDATAPROC fghBufferData;
+-FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
+-FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
+-FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
++extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
++extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
++extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
++extern FGH_PFNGLBUFFERDATAPROC fghBufferData;
++extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
++extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
++extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
+ 
+ #endif
+ 
+-- 
+2.25.0
+

diff --git a/app-text/mupdf/mupdf-1.16.1.ebuild 
b/app-text/mupdf/mupdf-1.16.1.ebuild
index 117de7bc199..a7b99956515 100644
--- a/app-text/mupdf/mupdf-1.16.1.ebuild
+++ b/app-text/mupdf/mupdf-1.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -46,6 +46,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
# See bugs #662352
"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
+   "${FILESDIR}"/${PN}-1.16.1-freeglut-fg_gl2-gcc-10.patch
 )
 
 

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

2019-11-26 Thread Jory Pratt
commit: b451e991a41390d90b59e558ba77ce0efc0e1950
Author: Jory Pratt  gentoo  org>
AuthorDate: Tue Nov 26 14:24:28 2019 +
Commit: Jory Pratt  gentoo  org>
CommitDate: Tue Nov 26 14:24:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b451e991

Revert "app-text/mupdf: cleanup"

This reverts commit a89743c14b67fa2507926ad8d0aea43b5b8712b0.

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 
 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 insertions(+)

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 964f9c13501..9142b4ccaf0 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1 +1,3 @@
+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
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-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-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: 

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

2019-11-26 Thread 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: 

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

2019-11-22 Thread 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: 

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

2019-11-22 Thread Mikle Kolyada
commit: 6e350066c3761374b2536da07e66409552ff0a34
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Nov 22 09:43:28 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Nov 22 09:43:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e350066

app-text/mupdf: arm stable wrt bug #699980

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.16.1.ebuild 
b/app-text/mupdf/mupdf-1.16.1.ebuild
index 80ab08f54cb..117de7bc199 100644
--- a/app-text/mupdf/mupdf-1.16.1.ebuild
+++ b/app-text/mupdf/mupdf-1.16.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X +javascript libressl opengl ssl static-libs"
 
 # Although we use the bundled, patched version of freeglut in mupdf (because of



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

2019-11-16 Thread Matt Turner
commit: 219b266e7a97798a0e20a1ce36ab12267f0dfd9a
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Nov 17 07:21:35 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Nov 17 07:21:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=219b266e

app-text/mupdf-1.16.1: alpha stable, bug 699980

Signed-off-by: Matt Turner  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.16.1.ebuild 
b/app-text/mupdf/mupdf-1.16.1.ebuild
index cf24e2fd164..80ab08f54cb 100644
--- a/app-text/mupdf/mupdf-1.16.1.ebuild
+++ b/app-text/mupdf/mupdf-1.16.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X +javascript libressl opengl ssl static-libs"
 
 # Although we use the bundled, patched version of freeglut in mupdf (because of



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

2019-11-14 Thread Agostino Sarubbo
commit: 610bc6595e993c6a9312305a6b8c3cc3d91e7e2e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Nov 14 11:55:26 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Nov 14 11:55:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=610bc659

app-text/mupdf: ia64 stable wrt bug #699980

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.16.1.ebuild 
b/app-text/mupdf/mupdf-1.16.1.ebuild
index 51c796384b3..cf24e2fd164 100644
--- a/app-text/mupdf/mupdf-1.16.1.ebuild
+++ b/app-text/mupdf/mupdf-1.16.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 s390 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X +javascript libressl opengl ssl static-libs"
 
 # Although we use the bundled, patched version of freeglut in mupdf (because of



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

2019-11-13 Thread Aaron Bauman
commit: 76763ab2144b1c8447a7f524ebf49cd75f1aa196
Author: Aaron Bauman  gentoo  org>
AuthorDate: Wed Nov 13 22:45:04 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Wed Nov 13 22:45:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76763ab2

app-text/mupdf: arm64 stable (bug #699980)

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.79, Repoman-2.3.18

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

diff --git a/app-text/mupdf/mupdf-1.16.1.ebuild 
b/app-text/mupdf/mupdf-1.16.1.ebuild
index cfe3adb3196..51c796384b3 100644
--- a/app-text/mupdf/mupdf-1.16.1.ebuild
+++ b/app-text/mupdf/mupdf-1.16.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 s390 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X +javascript libressl opengl ssl static-libs"
 
 # Although we use the bundled, patched version of freeglut in mupdf (because of



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

2019-11-13 Thread Agostino Sarubbo
commit: f0013f6ec3e2208528385321497a796b51f827e1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Nov 13 16:07:52 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Nov 13 16:07:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0013f6e

app-text/mupdf: ppc stable wrt bug #699980

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.16.1.ebuild 
b/app-text/mupdf/mupdf-1.16.1.ebuild
index ad5baa4c0ee..08866cb8b44 100644
--- a/app-text/mupdf/mupdf-1.16.1.ebuild
+++ b/app-text/mupdf/mupdf-1.16.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 s390 x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X +javascript libressl opengl ssl static-libs"
 
 # Although we use the bundled, patched version of freeglut in mupdf (because of



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

2019-11-13 Thread Agostino Sarubbo
commit: 44c15fc9280444858321a2d9c181a89baa63463f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Nov 13 16:08:15 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Nov 13 16:08:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44c15fc9

app-text/mupdf: ppc64 stable wrt bug #699980

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.16.1.ebuild 
b/app-text/mupdf/mupdf-1.16.1.ebuild
index 08866cb8b44..cfe3adb3196 100644
--- a/app-text/mupdf/mupdf-1.16.1.ebuild
+++ b/app-text/mupdf/mupdf-1.16.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 s390 x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X +javascript libressl opengl ssl static-libs"
 
 # Although we use the bundled, patched version of freeglut in mupdf (because of



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

2019-11-13 Thread Agostino Sarubbo
commit: f605ebd8e674fb39cd19c6288075d7036f1e66c3
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Nov 13 16:06:42 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Nov 13 16:06:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f605ebd8

app-text/mupdf: amd64 stable wrt bug #699980

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.16.1.ebuild 
b/app-text/mupdf/mupdf-1.16.1.ebuild
index fab104695c0..7479d1e6f61 100644
--- a/app-text/mupdf/mupdf-1.16.1.ebuild
+++ b/app-text/mupdf/mupdf-1.16.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X +javascript libressl opengl ssl static-libs"
 
 # Although we use the bundled, patched version of freeglut in mupdf (because of



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

2019-11-13 Thread Agostino Sarubbo
commit: 0593dc9dd39178e756cc66f80c473b562f0eb305
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Nov 13 16:07:17 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Nov 13 16:07:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0593dc9d

app-text/mupdf: s390 stable wrt bug #699980

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="s390"
Signed-off-by: Agostino Sarubbo  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.16.1.ebuild 
b/app-text/mupdf/mupdf-1.16.1.ebuild
index 7479d1e6f61..ad5baa4c0ee 100644
--- a/app-text/mupdf/mupdf-1.16.1.ebuild
+++ b/app-text/mupdf/mupdf-1.16.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X +javascript libressl opengl ssl static-libs"
 
 # Although we use the bundled, patched version of freeglut in mupdf (because of



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

2019-11-13 Thread Agostino Sarubbo
commit: 5c794555b0d34af61cd372870a16f347d28bcb77
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Nov 13 08:43:43 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Nov 13 08:43:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c794555

app-text/mupdf: x86 stable wrt bug #699980

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.16.1.ebuild 
b/app-text/mupdf/mupdf-1.16.1.ebuild
index 58fd2c47499..fab104695c0 100644
--- a/app-text/mupdf/mupdf-1.16.1.ebuild
+++ b/app-text/mupdf/mupdf-1.16.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X +javascript libressl opengl ssl static-libs"
 
 # Although we use the bundled, patched version of freeglut in mupdf (because of



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

2019-10-13 Thread Mikle Kolyada
commit: 5a8a2dbab290e587f63bcfa352082a94816b8b11
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Oct 13 10:50:54 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Oct 13 10:51:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a8a2dba

app-text/mupdf: Version bump (v1.16.1)

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

 app-text/mupdf/Manifest|   1 +
 app-text/mupdf/mupdf-1.16.1.ebuild | 127 +
 2 files changed, 128 insertions(+)

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index c8ad1a8bd31..9142b4ccaf0 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,2 +1,3 @@
 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/mupdf-1.16.1.ebuild 
b/app-text/mupdf/mupdf-1.16.1.ebuild
new file mode 100644
index 000..58fd2c47499
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.16.1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs xdg desktop
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/;
+SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X +javascript libressl opengl ssl static-libs"
+
+# Although we use the bundled, patched version of freeglut in mupdf (because of
+# bug #653298), the best way to ensure that its dependencies are present is to
+# install system's freeglut.
+RDEPEND="
+   media-libs/freetype:2=[static-libs?]
+   media-libs/harfbuzz:=[static-libs?,truetype]
+   media-libs/jbig2dec:=[static-libs?]
+   media-libs/libpng:0=[static-libs?]
+   >=media-libs/openjpeg-2.1:2=[static-libs?]
+   virtual/jpeg[static-libs?]
+   opengl? ( >=media-libs/freeglut-3.0.0:= )
+   ssl? (
+   libressl? ( >=dev-libs/libressl-2.8:0=[static-libs?] )
+   !libressl? ( >=dev-libs/openssl-1.1:0=[static-libs?] )
+   )
+   X? (
+   x11-libs/libX11[static-libs?]
+   x11-libs/libXext[static-libs?]
+   )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+REQUIRED_USE="opengl? ( !static-libs )"
+
+S=${WORKDIR}/${P}-source
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.15-CFLAGS.patch
+   "${FILESDIR}"/${PN}-1.15-Makefile.patch
+   "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+   # See bugs #662352
+   "${FILESDIR}"/${PN}-1.15-openssl-x11.patch
+)
+
+src_prepare() {
+   xdg_src_prepare
+   use hppa && append-cflags -ffunction-sections
+
+   use javascript || \
+   sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
+   -i include/mupdf/fitz/config.h
+
+   # See bug #670832
+   use ssl && use libressl && eapply 
"${FILESDIR}"/${PN}-1.14-libressl.patch
+
+   sed -e "1iOS = Linux" \
+   -e "1iCC = $(tc-getCC)" \
+   -e "1iLD = $(tc-getLD)" \
+   -e "1iAR = $(tc-getAR)" \
+   -e "1iverbose = yes" \
+   -e "1ibuild = debug" \
+   -e "1iprefix = ${ED}/usr" \
+   -e "1ilibdir = ${ED}/usr/$(get_libdir)" \
+   -e "1idocdir = ${ED}/usr/share/doc/${PF}" \
+   -i Makerules || die
+}
+
+_emake() {
+   # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
+
+   # We don't use system's freeglut because upstream has a special modified
+   # version of it that gives mupdf clipboard support. See bug #653298
+
+   # As of v1.15.0, mupdf started using symbols in mujs that were not part
+   # of any release. We thus go back to using the bundled version of it.
+   # Bug #685244
+   emake \
+   GENTOO_PV=${PV} \
+   HAVE_GLUT=$(usex opengl) \
+

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

2019-07-29 Thread Mikle Kolyada
commit: 2c1af99d12cb8a26f5d867a2e29198eeb19dd53c
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Jul 29 14:49:26 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Jul 29 14:49:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c1af99d

app-text/mupdf: arm stable wrt bug #684972

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.14.0-r3.ebuild 
b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
index c18f588a1d7..fca81cfa02f 100644
--- a/app-text/mupdf/mupdf-1.14.0-r3.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X curl +javascript libressl opengl ssl static-libs +vanilla"
 
 RDEPEND="



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

2019-07-05 Thread Virgil Dupras
commit: 38d8ae5f86230f99d73862ab2306bdf6b56a4732
Author: Virgil Dupras  gentoo  org>
AuthorDate: Fri Jul  5 18:52:45 2019 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Fri Jul  5 18:52:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38d8ae5f

app-text/mupdf: remove myself as maintainer

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

 app-text/mupdf/metadata.xml | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml
index 88de5fc462b..7a38bb90096 100644
--- a/app-text/mupdf/metadata.xml
+++ b/app-text/mupdf/metadata.xml
@@ -1,8 +1,5 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   vdup...@gentoo.org
-   Virgil Dupras
-   
+   
 



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

2019-06-06 Thread Agostino Sarubbo
commit: b2f7e3f3cac86b3aa58f73508de7603465e74b4a
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jun  6 06:58:39 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jun  6 06:58:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2f7e3f3

app-text/mupdf: ppc stable wrt bug #684972

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="ppc"

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

diff --git a/app-text/mupdf/mupdf-1.14.0-r3.ebuild 
b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
index 265f9751c42..c18f588a1d7 100644
--- a/app-text/mupdf/mupdf-1.14.0-r3.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~ppc ppc64 s390 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X curl +javascript libressl opengl ssl static-libs +vanilla"
 
 RDEPEND="



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

2019-06-05 Thread Agostino Sarubbo
commit: 70e9ea5a87bada05ae69b1c9747b2f0550628899
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jun  5 13:10:20 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jun  5 13:10:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70e9ea5a

app-text/mupdf: ia64 stable wrt bug #684972

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="ia64"

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

diff --git a/app-text/mupdf/mupdf-1.14.0-r3.ebuild 
b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
index 19c9e02c1a8..265f9751c42 100644
--- a/app-text/mupdf/mupdf-1.14.0-r3.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 s390 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~ppc ppc64 s390 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X curl +javascript libressl opengl ssl static-libs +vanilla"
 
 RDEPEND="



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

2019-06-04 Thread Agostino Sarubbo
commit: dda9e405e57965d8efa26ffb569a057f31421884
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jun  4 21:02:48 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jun  4 21:02:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dda9e405

app-text/mupdf: s390 stable wrt bug #684972

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="s390"

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

diff --git a/app-text/mupdf/mupdf-1.14.0-r3.ebuild 
b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
index f310b3ee636..19c9e02c1a8 100644
--- a/app-text/mupdf/mupdf-1.14.0-r3.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 s390 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X curl +javascript libressl opengl ssl static-libs +vanilla"
 
 RDEPEND="



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

2019-06-04 Thread Agostino Sarubbo
commit: 4f4dd6d49bc51f4e46899a47ce8355090d0e85a9
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jun  4 14:36:19 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jun  4 14:36:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f4dd6d4

app-text/mupdf: ppc64 stable wrt bug #684972

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="ppc64"

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

diff --git a/app-text/mupdf/mupdf-1.14.0-r3.ebuild 
b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
index 1dea03a5d6c..f310b3ee636 100644
--- a/app-text/mupdf/mupdf-1.14.0-r3.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X curl +javascript libressl opengl ssl static-libs +vanilla"
 
 RDEPEND="



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

2019-06-04 Thread Tobias Klausmann
commit: 7c6fe7c5f1b38d3d090c151c08601596ea46374b
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Tue Jun  4 07:52:22 2019 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Tue Jun  4 07:52:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c6fe7c5

app-text/mupdf-1.14.0-r3: alpha stable

Bug: http://bugs.gentoo.org/684972
Signed-off-by: Tobias Klausmann  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.14.0-r3.ebuild 
b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
index c414dd71161..1dea03a5d6c 100644
--- a/app-text/mupdf/mupdf-1.14.0-r3.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X curl +javascript libressl opengl ssl static-libs +vanilla"
 
 RDEPEND="



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

2019-05-19 Thread Thomas Deutschmann
commit: e908e125f78fde2953601ba27285e79f6927ccdd
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun May 19 13:05:26 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun May 19 13:05:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e908e125

app-text/mupdf: x86 stable (bug #684972)

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.14.0-r3.ebuild 
b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
index cc0d347167e..c414dd71161 100644
--- a/app-text/mupdf/mupdf-1.14.0-r3.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X curl +javascript libressl opengl ssl static-libs +vanilla"
 
 RDEPEND="



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

2019-05-16 Thread Aaron Bauman
commit: ab6ed4b38aaf1dd0a28d252d4831310d373830f7
Author: Aaron Bauman  gentoo  org>
AuthorDate: Fri May 17 02:47:03 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri May 17 02:47:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab6ed4b3

app-text/mupdf: arm64 stable

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="arm64"

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

diff --git a/app-text/mupdf/mupdf-1.14.0-r3.ebuild 
b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
index 680e94ce7a7..cc0d347167e 100644
--- a/app-text/mupdf/mupdf-1.14.0-r3.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X curl +javascript libressl opengl ssl static-libs +vanilla"
 
 RDEPEND="



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

2019-05-13 Thread Mikle Kolyada
commit: 14b30584f2c9f591f3ad918c2dc78da733736776
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon May 13 17:05:45 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon May 13 17:05:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14b30584

app-text/mupdf: amd64 stable wrt bug #684972

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

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

diff --git a/app-text/mupdf/mupdf-1.14.0-r3.ebuild 
b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
index 34e7a6e9d18..680e94ce7a7 100644
--- a/app-text/mupdf/mupdf-1.14.0-r3.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X curl +javascript libressl opengl ssl static-libs +vanilla"
 
 RDEPEND="



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

2019-05-11 Thread Virgil Dupras
commit: d64194b301be4f86377379a7b52e71fb657f2c4e
Author: Virgil Dupras  gentoo  org>
AuthorDate: Sat May 11 19:16:51 2019 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Sat May 11 19:16:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d64194b3

app-text/mupdf: fix opengl dependencies

It was a very bad idea from me to remove dependency on freeglut
on the account that we use the bundled version. I completely forgot
about freeglut dependencies themselves. Bad me.

These dependencies, however, are a bit complex and I find it fragile to
copy-paste them in mupdf. At the cost of installing an extra system
library (freeglut) that is rather small and probably already installed
anyways, we potentially save ourselves tricky problems down the road.

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

 app-text/mupdf/mupdf-1.15.0.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/app-text/mupdf/mupdf-1.15.0.ebuild 
b/app-text/mupdf/mupdf-1.15.0.ebuild
index 440a343441f..7d1f75d3ee1 100644
--- a/app-text/mupdf/mupdf-1.15.0.ebuild
+++ b/app-text/mupdf/mupdf-1.15.0.ebuild
@@ -14,6 +14,9 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X +javascript libressl opengl ssl static-libs vanilla"
 
+# Although we use the bundled, patched version of freeglut in mupdf (because of
+# bug #653298), the best way to ensure that its dependencies are present is to
+# install system's freeglut.
 RDEPEND="
media-libs/freetype:2=[static-libs?]
media-libs/harfbuzz:=[static-libs?,truetype]
@@ -21,6 +24,7 @@ RDEPEND="
media-libs/libpng:0=[static-libs?]
>=media-libs/openjpeg-2.1:2=[static-libs?]
virtual/jpeg[static-libs?]
+   opengl? ( >=media-libs/freeglut-3.0.0:= )
ssl? (
libressl? ( >=dev-libs/libressl-2.8:0=[static-libs?] )
!libressl? ( >=dev-libs/openssl-1.1:0=[static-libs?] )



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

2019-05-07 Thread Virgil Dupras
commit: e417f177e13442dae204548c4f25bb9b8142ea12
Author: Virgil Dupras  gentoo  org>
AuthorDate: Tue May  7 11:30:20 2019 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Tue May  7 11:31:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e417f177

app-text/mupdf: use bundled mujs

Fixes broken building process.

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

 app-text/mupdf/mupdf-1.15.0.ebuild | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app-text/mupdf/mupdf-1.15.0.ebuild 
b/app-text/mupdf/mupdf-1.15.0.ebuild
index 258ffd76802..440a343441f 100644
--- a/app-text/mupdf/mupdf-1.15.0.ebuild
+++ b/app-text/mupdf/mupdf-1.15.0.ebuild
@@ -15,7 +15,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 
~s390 ~x86 ~amd64-li
 IUSE="X +javascript libressl opengl ssl static-libs vanilla"
 
 RDEPEND="
-   >=dev-lang/mujs-1.0.4
media-libs/freetype:2=[static-libs?]
media-libs/harfbuzz:=[static-libs?,truetype]
media-libs/jbig2dec:=[static-libs?]
@@ -73,15 +72,20 @@ src_prepare() {
 
 _emake() {
# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
+
# We don't use system's freeglut because upstream has a special modified
# version of it that gives mupdf clipboard support. See bug #653298
+
+   # As of v1.15.0, mupdf started using symbols in mujs that were not part
+   # of any release. We thus go back to using the bundled version of it.
+   # Bug #685244
emake \
GENTOO_PV=${PV} \
HAVE_GLUT=$(usex opengl) \
HAVE_LIBCRYPTO=$(usex ssl) \
HAVE_X11=$(usex X) \
USE_SYSTEM_LIBS=yes \
-   USE_SYSTEM_MUJS=yes \
+   USE_SYSTEM_MUJS=no \
USE_SYSTEM_GLUT=no \
HAVE_OBJCOPY=no \
"$@"



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

2019-05-06 Thread Virgil Dupras
commit: 6e0b3e7722417649362c3909fbf1fc0b5c80eb93
Author: Virgil Dupras  gentoo  org>
AuthorDate: Tue May  7 02:37:54 2019 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Tue May  7 02:38:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e0b3e77

app-text/mupdf: bump to 1.15.0

We remove the "curl" USE flag because upstream stopped depending on it
with its removal of "progressive loading code".

Closes: https://bugs.gentoo.org/653298
Closes: https://bugs.gentoo.org/683490
Closes: https://bugs.gentoo.org/595190
Signed-off-by: Virgil Dupras  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 app-text/mupdf/Manifest   |   1 +
 app-text/mupdf/files/mupdf-1.15-CFLAGS.patch  |  13 +++
 app-text/mupdf/files/mupdf-1.15-Makefile.patch|  42 
 app-text/mupdf/files/mupdf-1.15-openssl-x11.patch |  20 
 app-text/mupdf/mupdf-1.15.0.ebuild| 122 ++
 5 files changed, 198 insertions(+)

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 3c5ff516a7a..c8ad1a8bd31 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1 +1,2 @@
 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

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..a7de530909b
--- /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-Makefile.patch 
b/app-text/mupdf/files/mupdf-1.15-Makefile.patch
new file mode 100644
index 000..cff348d95e4
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.15-Makefile.patch
@@ -0,0 +1,42 @@
+diff --git a/Makefile b/Makefile
+index a9539342..e76b2c61 100644
+--- a/Makefile
 b/Makefile
+@@ -3,7 +3,7 @@
+ -include user.make
+ 
+ ifndef build
+-  build := release
++  build := debug
+ endif
+ 
+ ifndef OUT
+@@ -187,13 +187,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) -o 
$@ $^ $(THIRD_LIBS) $(LIBS)
++$(MUPDF_STATIC): $(MUPDF_OBJ) $(THIRD_OBJ)
+ $(THREAD_LIB) : $(THREAD_OBJ)
+ $(PKCS7_LIB) : $(PKCS7_OBJ)
+ 
+@@ -322,7 +324,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.15-openssl-x11.patch 
b/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch
new file mode 100644
index 000..22829279e14
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch
@@ -0,0 +1,20 @@
+diff --git a/Makerules b/Makerules
+index 298b5737..b2079435 100644
+--- 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 

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

2019-04-27 Thread David Seifert
commit: ffc9ba4599520152fa99797cd291b3d7b624f4e7
Author: David Seifert  gentoo  org>
AuthorDate: Sat Apr 27 16:35:03 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Apr 27 20:27:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffc9ba45

app-text/mupdf: [QA] Fix USE=libressl semantics

Closes: https://bugs.gentoo.org/683986
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: David Seifert  gentoo.org>

 app-text/mupdf/metadata.xml   |  3 ---
 app-text/mupdf/mupdf-1.14.0-r2.ebuild | 10 ++
 app-text/mupdf/mupdf-1.14.0-r3.ebuild | 17 +++--
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml
index 5866930fdf0..88de5fc462b 100644
--- a/app-text/mupdf/metadata.xml
+++ b/app-text/mupdf/metadata.xml
@@ -5,7 +5,4 @@
vdup...@gentoo.org
Virgil Dupras

-
-   Use dev-libs/openssl crypto backend
-
 

diff --git a/app-text/mupdf/mupdf-1.14.0-r2.ebuild 
b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
index 0200aa416b3..8e081a7e46a 100644
--- a/app-text/mupdf/mupdf-1.14.0-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
 KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X curl +javascript libressl opengl +openssl static-libs +vanilla"
+IUSE="X curl +javascript libressl opengl +ssl static-libs +vanilla"
 
 RDEPEND="
>=dev-lang/mujs-1.0.4
@@ -23,9 +23,11 @@ RDEPEND="
>=media-libs/openjpeg-2.1:2=[static-libs?]
virtual/jpeg[static-libs?]
curl? ( net-misc/curl[static-libs?] )
-   !libressl? ( dev-libs/openssl:0=[static-libs?] )
-   libressl? ( dev-libs/libressl:0=[static-libs?] )
opengl? ( >=media-libs/freeglut-3.0.0:= )
+   ssl? (
+   libressl? ( dev-libs/libressl:0=[static-libs?] )
+   !libressl? ( dev-libs/openssl:0=[static-libs?] )
+   )
X? (
x11-libs/libX11[static-libs?]
x11-libs/libXext[static-libs?]
@@ -78,7 +80,7 @@ _emake() {
GENTOO_PV=${PV} \
HAVE_GLUT=$(usex opengl yes no) \
WANT_CURL=$(usex curl) \
-   WANT_OPENSSL=$(usex openssl) \
+   WANT_OPENSSL=$(usex ssl) \
WANT_X11=$(usex X) \
USE_SYSTEM_LIBS=yes \
USE_SYSTEM_MUJS=yes \

diff --git a/app-text/mupdf/mupdf-1.14.0-r3.ebuild 
b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
index 1b153620923..34e7a6e9d18 100644
--- a/app-text/mupdf/mupdf-1.14.0-r3.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X curl +javascript libressl opengl openssl static-libs +vanilla"
+IUSE="X curl +javascript libressl opengl ssl static-libs +vanilla"
 
 RDEPEND="
>=dev-lang/mujs-1.0.4
@@ -23,9 +23,11 @@ RDEPEND="
>=media-libs/openjpeg-2.1:2=[static-libs?]
virtual/jpeg[static-libs?]
curl? ( net-misc/curl[static-libs?] )
-   libressl? ( >=dev-libs/libressl-2.8:0=[static-libs?] )
opengl? ( >=media-libs/freeglut-3.0.0:= )
-   openssl? ( >=dev-libs/openssl-1.1:0=[static-libs?] )
+   ssl? (
+   libressl? ( >=dev-libs/libressl-2.8:0=[static-libs?] )
+   !libressl? ( >=dev-libs/openssl-1.1:0=[static-libs?] )
+   )
X? (
x11-libs/libX11[static-libs?]
x11-libs/libXext[static-libs?]
@@ -34,7 +36,6 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
 
 REQUIRED_USE="
-   libressl? ( !openssl )
opengl? ( !static-libs )
curl? ( X )"
 
@@ -62,7 +63,7 @@ src_prepare() {
"${FILESDIR}"/${PN}-1.3-zoom-2.patch
 
# See bug #670832
-   use libressl && eapply "${FILESDIR}"/${PN}-1.14-libressl.patch
+   use ssl && use libressl && eapply 
"${FILESDIR}"/${PN}-1.14-libressl.patch
 
sed -e "1iOS = Linux" \
-e "1iCC = $(tc-getCC)" \
@@ -78,15 +79,11 @@ src_prepare() {
 
 _emake() {
# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
-   local have_libcrypto=no
-   if use openssl || use libressl ; then
-   have_libcrypto=yes
-   fi
emake \
GENTOO_PV=${PV} \
HAVE_GLUT=$(usex opengl) \
HAVE_CURL=$(usex curl) \
-   HAVE_LIBCRYPTO=$have_libcrypto \
+   HAVE_LIBCRYPTO=$(usex ssl) \
HAVE_X11=$(usex X) \
USE_SYSTEM_LIBS=yes \
USE_SYSTEM_MUJS=yes \



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

2019-03-20 Thread Mikle Kolyada
commit: c5811a4424e1de0bb7f3ad4f6a4f2f8883bfc92c
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed Mar 20 19:04:23 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed Mar 20 19:06:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5811a44

app-text/mupdf: mark s390 stable

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

 app-text/mupdf/mupdf-1.14.0-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-text/mupdf/mupdf-1.14.0-r2.ebuild 
b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
index d6f2331ad66..0200aa416b3 100644
--- a/app-text/mupdf/mupdf-1.14.0-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X curl +javascript libressl opengl +openssl static-libs +vanilla"
 
 RDEPEND="



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

2019-02-19 Thread Virgil Dupras
commit: a5247eb5569e7573eba63db4cf5e6012607e1a6d
Author: Virgil Dupras  gentoo  org>
AuthorDate: Tue Feb 19 20:22:34 2019 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Tue Feb 19 21:01:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5247eb5

app-text/mupdf: fix libressl and openssl

openssl's requirements is actually 1.1+. prior to this change, mupdf
compiled with openssl support unless openssl 1.1+ was installed.

libressl support requires a patch to work properly.

Also, other minor fixes. See closed bugs.

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

 app-text/mupdf/files/mupdf-1.14-libressl.patch |  45 +++
 .../files/mupdf-1.14-r3-openssl-curl-x11.patch |  35 ++
 app-text/mupdf/mupdf-1.14.0-r3.ebuild  | 132 +
 3 files changed, 212 insertions(+)

diff --git a/app-text/mupdf/files/mupdf-1.14-libressl.patch 
b/app-text/mupdf/files/mupdf-1.14-libressl.patch
new file mode 100644
index 000..fcc0a7205c1
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.14-libressl.patch
@@ -0,0 +1,45 @@
+From 8561b744ac95ab6145a1163fa1d7c490a3329465 Mon Sep 17 00:00:00 2001
+From: William 
+Date: Mon, 12 Nov 2018 16:50:07 +0100
+Subject: [PATCH] hardcode missing ssl functions
+
+---
+ source/helpers/pkcs7/pkcs7-openssl.c | 22 ++
+ 1 file changed, 22 insertions(+)
+
+diff --git a/source/helpers/pkcs7/pkcs7-openssl.c 
b/source/helpers/pkcs7/pkcs7-openssl.c
+index 58dbf65..2b1f9e9 100644
+--- a/source/helpers/pkcs7/pkcs7-openssl.c
 b/source/helpers/pkcs7/pkcs7-openssl.c
+@@ -511,6 +511,28 @@ static void signer_drop_designated_name(pdf_pkcs7_signer 
*signer, pdf_pkcs7_desi
+   fz_free(osigner->ctx, dn);
+ }
+ 
++int
++PKCS12_SAFEBAG_get_nid(const PKCS12_SAFEBAG *bag)
++{
++return OBJ_obj2nid(bag->type);
++}
++
++const STACK_OF(PKCS12_SAFEBAG) *
++PKCS12_SAFEBAG_get0_safes(const PKCS12_SAFEBAG *bag)
++{
++if (OBJ_obj2nid(bag->type) != NID_safeContentsBag)
++return NULL;
++return bag->value.safes;
++}
++
++const PKCS8_PRIV_KEY_INFO *
++PKCS12_SAFEBAG_get0_p8inf(const PKCS12_SAFEBAG *bag)
++{
++if (PKCS12_SAFEBAG_get_nid(bag) != NID_keyBag)
++return NULL;
++return bag->value.keybag;
++}
++
+ static void add_from_bags(X509 **pX509, EVP_PKEY **pPkey, const 
STACK_OF(PKCS12_SAFEBAG) *bags, const char *pw);
+ 
+ static void add_from_bag(X509 **pX509, EVP_PKEY **pPkey, PKCS12_SAFEBAG *bag, 
const char *pw)
+-- 
+2.19.1
+

diff --git a/app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch 
b/app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch
new file mode 100644
index 000..79efe32c0e4
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch
@@ -0,0 +1,35 @@
+diff --git a/Makerules b/Makerules
+index fc9bf998..f1fd93cb 100644
+--- a/Makerules
 b/Makerules
+@@ -113,10 +113,11 @@ else ifeq ($(OS),Linux)
+   SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
+   endif
+ 
+-  HAVE_CURL := $(shell pkg-config --exists libcurl && echo yes)
++  HAVE_CURL ?= not-unless-portage-tells-me
+   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
+ 
+   HAVE_GLUT := yes
+@@ -125,13 +126,14 @@ else ifeq ($(OS),Linux)
+   SYS_GLUT_LIBS := -lglut -lGL
+   endif
+ 
+-  HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
++  HAVE_X11 ?= not-unless-portage-tells-me
+   ifeq ($(HAVE_X11),yes)
+   X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
+   X11_LIBS := $(shell pkg-config --libs x11 xext)
+   endif
+ 
+-  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/mupdf-1.14.0-r3.ebuild 
b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
new file mode 100644
index 000..1b153620923
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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/archive/${P}-source.tar.xz;
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 
~amd64-linux 

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

2018-12-20 Thread 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, , sizeof(_cmsICCPROFILE));
+ 
+ // And store the ID
+-MD5finish( ->ProfileID,  MD5);
++MD5finish(ContextID,  

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

2018-12-16 Thread Virgil Dupras
commit: fad8415f7c9b2f9d626ac6b2b23d1a238def1763
Author: Virgil Dupras  gentoo  org>
AuthorDate: Sun Dec 16 20:24:24 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Sun Dec 16 20:24:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fad8415f

app-text/mupdf: remove old

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

 app-text/mupdf/Manifest|   1 -
 .../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.9a-debug-build.patch  |  10 --
 app-text/mupdf/mupdf-1.13.0-r1.ebuild  | 168 -
 app-text/mupdf/mupdf-1.13.0.ebuild | 166 
 8 files changed, 440 deletions(-)

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index f5f8f290123..3c5ff516a7a 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,2 +1 @@
-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.11-drop-libmupdfthird.patch 
b/app-text/mupdf/files/mupdf-1.11-drop-libmupdfthird.patch
deleted file mode 100644
index e5600c00cd8..000
--- a/app-text/mupdf/files/mupdf-1.11-drop-libmupdfthird.patch
+++ /dev/null
@@ -1,22 +0,0 @@
 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)
 mupdf-1.12.0-source/Makefile
-+++ mupdf-1.12.0-source/Makefile
-@@ -343,7 +343,7 @@
- 
- THREAD_OBJ := $(THREAD_OBJ)
- 
--$(MUPDF_LIB) : $(MUPDF_OBJ)
-+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ)
- $(THIRD_LIB) : $(THIRD_OBJ)
- $(THREAD_LIB) : $(THREAD_OBJ)
- 

diff --git a/app-text/mupdf/files/mupdf-1.12-CFLAGS.patch 
b/app-text/mupdf/files/mupdf-1.12-CFLAGS.patch
deleted file mode 100644
index 796d127263a..000
--- a/app-text/mupdf/files/mupdf-1.12-CFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 mupdf-1.12.0-source/Makerules
-+++ mupdf-1.12.0-source/Makerules
-@@ -22,8 +22,6 @@
- endif
- 
- 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.13-libressl.patch 
b/app-text/mupdf/files/mupdf-1.13-libressl.patch
deleted file mode 100644
index 396a0e5b5db..000
--- a/app-text/mupdf/files/mupdf-1.13-libressl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/Makerules b/Makerules
-index f9b25d6..6c91c6c 100644
 a/Makerules
-+++ b/Makerules
-@@ -106,11 +106,17 @@ SYS_GLUT_LIBS := -lglut -lGL
- 
- WANT_OPENSSL ?= yes
- ifeq "$(WANT_OPENSSL)" "yes"
--ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes"
-+ifeq "$(shell pkg-config --exists 'libcrypto >= 2.0.0' && echo libre)" "libre"
-+ifeq "$(shell pkg-config --exists 'libcrypto >= 2.7.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
-+else 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

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
deleted file mode 100644
index 6db51a083ed..000
--- a/app-text/mupdf/files/mupdf-1.13-openssl-curl-x11.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
- 

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

2018-12-12 Thread Mikle Kolyada
commit: b3d239d99f238953b72f5943da3fc127dbd60dd0
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed Dec 12 12:59:03 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed Dec 12 12:59:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3d239d9

app-text/mupdf: Add ~s390 keyword

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

 app-text/mupdf/mupdf-1.13.0-r1.ebuild | 2 +-
 app-text/mupdf/mupdf-1.13.0.ebuild| 2 +-
 app-text/mupdf/mupdf-1.14.0-r2.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-text/mupdf/mupdf-1.13.0-r1.ebuild 
b/app-text/mupdf/mupdf-1.13.0-r1.ebuild
index e24a2812a4d..938dffbbb78 100644
--- a/app-text/mupdf/mupdf-1.13.0-r1.ebuild
+++ b/app-text/mupdf/mupdf-1.13.0-r1.ebuild
@@ -11,7 +11,7 @@ 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 ~x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X +curl javascript lcms libressl opengl +openssl static static-libs 
vanilla"
 
 LIB_DEPEND="

diff --git a/app-text/mupdf/mupdf-1.13.0.ebuild 
b/app-text/mupdf/mupdf-1.13.0.ebuild
index 45887a2ebd6..bd884bbe03c 100644
--- a/app-text/mupdf/mupdf-1.13.0.ebuild
+++ b/app-text/mupdf/mupdf-1.13.0.ebuild
@@ -11,7 +11,7 @@ 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 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X +curl javascript lcms libressl opengl +openssl static static-libs 
vanilla"
 
 LIB_DEPEND="

diff --git a/app-text/mupdf/mupdf-1.14.0-r2.ebuild 
b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
index c477f99dfe2..74cadb6f860 100644
--- a/app-text/mupdf/mupdf-1.14.0-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X curl +javascript libressl opengl +openssl static-libs +vanilla"
 
 RDEPEND="



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

2018-12-07 Thread Mikle Kolyada
commit: 4492fc08041affcc2dd8a43096db275958016100
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Dec  7 09:41:15 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Dec  7 09:43:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4492fc08

app-text/mupdf: ppc/ppc64 stable wrt bug #671376

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

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

diff --git a/app-text/mupdf/mupdf-1.14.0-r2.ebuild 
b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
index 7e697cc05e1..c477f99dfe2 100644
--- a/app-text/mupdf/mupdf-1.14.0-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X curl +javascript libressl opengl +openssl static-libs +vanilla"
 
 RDEPEND="



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

2018-11-29 Thread Tobias Klausmann
commit: 7add487f49bdc35b6fda1dccd305adc842cd2d92
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Thu Nov 29 17:43:49 2018 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Thu Nov 29 17:43:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7add487f

app-text/mupdf-1.14.0-r2: alpha stable

Bug: http://bugs.gentoo.org/671376
Signed-off-by: Tobias Klausmann  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.14.0-r2.ebuild 
b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
index d444a1a6fe0..7e697cc05e1 100644
--- a/app-text/mupdf/mupdf-1.14.0-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X curl +javascript libressl opengl +openssl static-libs +vanilla"
 
 RDEPEND="



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

2018-11-28 Thread Sergei Trofimovich
commit: c2e75a1f2c6e5eea1526fc578caa6d497ce99b45
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Nov 28 22:27:20 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Nov 28 22:27:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2e75a1f

app-text/mupdf: stable 1.14.0-r2 for ia64, bug #671376

Package-Manager: Portage-2.3.52, Repoman-2.3.12
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.14.0-r2.ebuild 
b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
index 27a3741c3dc..d444a1a6fe0 100644
--- a/app-text/mupdf/mupdf-1.14.0-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X curl +javascript libressl opengl +openssl static-libs +vanilla"
 
 RDEPEND="



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

2018-11-27 Thread Mikle Kolyada
commit: bec23900fa49e31b7a00944990548a3714a0a0ac
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed Nov 28 06:47:38 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed Nov 28 06:47:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bec23900

app-text/mupdf: arm stable wrt bug #671376

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

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

diff --git a/app-text/mupdf/mupdf-1.14.0-r2.ebuild 
b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
index 73f58e35bd0..27a3741c3dc 100644
--- a/app-text/mupdf/mupdf-1.14.0-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X curl +javascript libressl opengl +openssl static-libs +vanilla"
 
 RDEPEND="



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

2018-11-27 Thread Thomas Deutschmann
commit: 90ad5421683a40b4a61c84ea306e6ca0af60c215
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Nov 27 21:47:32 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Nov 27 21:55:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90ad5421

app-text/mupdf: x86 stable (bug #671376)

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.14.0-r2.ebuild 
b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
index 8f7cfdc5a22..73f58e35bd0 100644
--- a/app-text/mupdf/mupdf-1.14.0-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X curl +javascript libressl opengl +openssl static-libs +vanilla"
 
 RDEPEND="



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

2018-11-25 Thread Mikle Kolyada
commit: 11ae22d1341fe5f38d010be502c9a28cad9e2499
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Nov 25 18:07:24 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Nov 25 18:07:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11ae22d1

app-text/mupdf: amd64 stable wrt bug #671376

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

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

diff --git a/app-text/mupdf/mupdf-1.14.0-r2.ebuild 
b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
index 3ce32300c17..8f7cfdc5a22 100644
--- a/app-text/mupdf/mupdf-1.14.0-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X curl +javascript libressl opengl +openssl static-libs +vanilla"
 
 RDEPEND="



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

2018-10-15 Thread Virgil Dupras
commit: 31214043d0b07fc7c917073cc48bd46d2747171f
Author: Virgil Dupras  gentoo  org>
AuthorDate: Mon Oct 15 20:09:33 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Mon Oct 15 20:09:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31214043

app-text/mupdf: fix shared library build (again)

Urg, I'm bad.

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/{mupdf-1.14.0-r1.ebuild => mupdf-1.14.0-r2.ebuild} | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app-text/mupdf/mupdf-1.14.0-r1.ebuild 
b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
similarity index 98%
rename from app-text/mupdf/mupdf-1.14.0-r1.ebuild
rename to app-text/mupdf/mupdf-1.14.0-r2.ebuild
index f12cf699e38..3ce32300c17 100644
--- a/app-text/mupdf/mupdf-1.14.0-r1.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
@@ -103,6 +103,8 @@ src_install() {
 
_emake install
 
+   dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+
use static-libs && \
dolib.a build/debug/lib${PN}.a
if use opengl ; then



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

2018-10-15 Thread 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/

2018-10-08 Thread Virgil Dupras
commit: 3fdb6a4636768465bba3df9da04b84705db2d9e3
Author: Virgil Dupras  gentoo  org>
AuthorDate: Mon Oct  8 20:01:57 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Mon Oct  8 20:01:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fdb6a46

app-text/mupdf: drop ~sparc keyword

It seems that mupdf is durably broken on sparc.

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

 app-text/mupdf/mupdf-1.13.0-r1.ebuild | 4 ++--
 app-text/mupdf/mupdf-1.13.0.ebuild| 4 ++--
 app-text/mupdf/mupdf-1.14.0.ebuild| 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-text/mupdf/mupdf-1.13.0-r1.ebuild 
b/app-text/mupdf/mupdf-1.13.0-r1.ebuild
index 3f522e8dc86..e24a2812a4d 100644
--- a/app-text/mupdf/mupdf-1.13.0-r1.ebuild
+++ b/app-text/mupdf/mupdf-1.13.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X +curl javascript lcms libressl opengl +openssl static static-libs 
vanilla"
 
 LIB_DEPEND="

diff --git a/app-text/mupdf/mupdf-1.13.0.ebuild 
b/app-text/mupdf/mupdf-1.13.0.ebuild
index 4c5c9d0cca8..45887a2ebd6 100644
--- a/app-text/mupdf/mupdf-1.13.0.ebuild
+++ b/app-text/mupdf/mupdf-1.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X +curl javascript lcms libressl opengl +openssl static static-libs 
vanilla"
 
 LIB_DEPEND="

diff --git a/app-text/mupdf/mupdf-1.14.0.ebuild 
b/app-text/mupdf/mupdf-1.14.0.ebuild
index 8c23107fc6d..3bafaab5d0b 100644
--- a/app-text/mupdf/mupdf-1.14.0.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
 
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X curl +javascript libressl opengl +openssl static-libs +vanilla"
 
 RDEPEND="



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

2018-10-07 Thread 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 @@ 

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

2018-10-07 Thread Virgil Dupras
commit: af402aa4ea9e96802d55162cbb60ec52abd960ec
Author: Virgil Dupras  gentoo  org>
AuthorDate: Sun Oct  7 17:39:28 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Sun Oct  7 17:40:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af402aa4

app-text/mupdf: add myself as maintainer

This package seems ill-maintained.

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

 app-text/mupdf/metadata.xml | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml
index 96d29f2af06..38351433e8b 100644
--- a/app-text/mupdf/metadata.xml
+++ b/app-text/mupdf/metadata.xml
@@ -1,10 +1,14 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
-x...@gentoo.org
-Michael Weber
-
+   
+   x...@gentoo.org
+   Michael Weber
+   
+   
+   vdup...@gentoo.org
+   Virgil Dupras
+   
 
Use dev-libs/openssl crypto backend
 



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

2018-09-17 Thread Matt Turner
commit: fe17cdf997b3c29f6e43a9b9f81471bf6f51659a
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Sep 17 23:13:15 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Sep 17 23:13:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe17cdf9

app-text/mupdf-1.13.0: ppc stable, bug 634678

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

diff --git a/app-text/mupdf/mupdf-1.13.0.ebuild 
b/app-text/mupdf/mupdf-1.13.0.ebuild
index 731ec1534b1..ffc63f156fa 100644
--- a/app-text/mupdf/mupdf-1.13.0.ebuild
+++ b/app-text/mupdf/mupdf-1.13.0.ebuild
@@ -11,7 +11,7 @@ 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"
+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="



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

2018-09-17 Thread Matt Turner
commit: 3f02c4c9b2420e6f18e94ab5d8eb24bef34da45e
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Sep 17 23:13:18 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Sep 17 23:13:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f02c4c9

app-text/mupdf-1.13.0: ppc64 stable, bug 634678

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

diff --git a/app-text/mupdf/mupdf-1.13.0.ebuild 
b/app-text/mupdf/mupdf-1.13.0.ebuild
index ffc63f156fa..4c5c9d0cca8 100644
--- a/app-text/mupdf/mupdf-1.13.0.ebuild
+++ b/app-text/mupdf/mupdf-1.13.0.ebuild
@@ -11,7 +11,7 @@ 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"
+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="



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

2018-08-27 Thread Virgil Dupras
commit: faf6b578bd55a8010c3957e03901cc1dab35a328
Author: Virgil Dupras  gentoo  org>
AuthorDate: Mon Aug 27 19:50:49 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Mon Aug 27 19:53:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faf6b578

app-text/mupdf: fix compilation with libressl

Patch from Jouni Kosonen

Closes: https://bugs.gentoo.org/662352
Package-Manager: Portage-2.3.48, Repoman-2.3.10

 app-text/mupdf/files/mupdf-1.13-libressl.patch |  23 
 app-text/mupdf/mupdf-1.13.0-r1.ebuild  | 168 +
 2 files changed, 191 insertions(+)

diff --git a/app-text/mupdf/files/mupdf-1.13-libressl.patch 
b/app-text/mupdf/files/mupdf-1.13-libressl.patch
new file mode 100644
index 000..396a0e5b5db
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.13-libressl.patch
@@ -0,0 +1,23 @@
+diff --git a/Makerules b/Makerules
+index f9b25d6..6c91c6c 100644
+--- a/Makerules
 b/Makerules
+@@ -106,11 +106,17 @@ SYS_GLUT_LIBS := -lglut -lGL
+ 
+ WANT_OPENSSL ?= yes
+ ifeq "$(WANT_OPENSSL)" "yes"
+-ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes"
++ifeq "$(shell pkg-config --exists 'libcrypto >= 2.0.0' && echo libre)" "libre"
++ifeq "$(shell pkg-config --exists 'libcrypto >= 2.7.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
++else 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

diff --git a/app-text/mupdf/mupdf-1.13.0-r1.ebuild 
b/app-text/mupdf/mupdf-1.13.0-r1.ebuild
new file mode 100644
index 000..3f522e8dc86
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.13.0-r1.ebuild
@@ -0,0 +1,168 @@
+# 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]
+   x11-libs/libxcb[static-libs] )"
+
+REQUIRED_USE="opengl? ( !static !static-libs )"
+
+S=${WORKDIR}/${P}-source
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.12-CFLAGS.patch
+   "${FILESDIR}"/${PN}-1.9a-debug-build.patch
+   "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+   "${FILESDIR}"/${PN}-1.13-openssl-curl-x11.patch
+   "${FILESDIR}"/${PN}-1.11-drop-libmupdfthird.patch
+   # See bug #662352
+   "${FILESDIR}"/${PN}-1.13-libressl.patch
+)
+
+src_prepare() {
+   xdg_src_prepare
+   use hppa && append-cflags -ffunction-sections
+
+   # specialized lcms2, keep it if wanted inside lubmupdfthird
+   if ! use lcms ; then
+   rm -rf thirdparty/lcms2
+   fi
+
+   rm -rf 
thirdparty/{README,curl,freeglut,freetype,harfbuzz,jbig2dec,libjpeg,mujs,openjpeg,zlib}
 || die
+   for my_third in thirdparty/* ; do
+   ewarn "Bundled thirdparty lib: ${my_third}"
+   done
+
+   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 

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

2018-08-18 Thread 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(, "OPEN"))
-   {
--  char path[1024];
-+  char path[LONGLINE];
-   if (file_open)
-   pdfapp_close();
-   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/

2018-07-30 Thread Mikle Kolyada
commit: 782cbf7b6d0a46648c4f48ba65c3b6b0d00b203f
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Jul 31 00:00:27 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Jul 31 00:00:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=782cbf7b

app-text/mupdf: arm stable wrt bug #658618

Package-Manager: Portage-2.3.40, Repoman-2.3.9

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

diff --git a/app-text/mupdf/mupdf-1.13.0.ebuild 
b/app-text/mupdf/mupdf-1.13.0.ebuild
index 7b139fcb94c..731ec1534b1 100644
--- a/app-text/mupdf/mupdf-1.13.0.ebuild
+++ b/app-text/mupdf/mupdf-1.13.0.ebuild
@@ -11,7 +11,7 @@ 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"
+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="



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

2018-07-28 Thread Thomas Deutschmann
commit: cfcab842282a4b6734986ce05331a22d798dd5cb
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Jul 28 13:17:06 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Jul 28 13:24:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfcab842

app-text/mupdf: x86 stable (bug #658618)

Package-Manager: Portage-2.3.43, Repoman-2.3.10

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

diff --git a/app-text/mupdf/mupdf-1.13.0.ebuild 
b/app-text/mupdf/mupdf-1.13.0.ebuild
index 05d77b7b6cb..7b139fcb94c 100644
--- a/app-text/mupdf/mupdf-1.13.0.ebuild
+++ b/app-text/mupdf/mupdf-1.13.0.ebuild
@@ -11,7 +11,7 @@ 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"
+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="



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

2018-07-27 Thread Sergei Trofimovich
commit: f1b0bc97b3f16d5d1799ff4d9ab2479fa89ef02c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Jul 27 06:34:42 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Jul 27 06:35:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1b0bc97

app-text/mupdf: stable 1.13.0 for ia64, bug #658618

Bug: https://bugs.gentoo.org/658618
Package-Manager: Portage-2.3.43, Repoman-2.3.10
RepoMan-Options: --include-arches="ia64"

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

diff --git a/app-text/mupdf/mupdf-1.13.0.ebuild 
b/app-text/mupdf/mupdf-1.13.0.ebuild
index 845e4ac3f85..05d77b7b6cb 100644
--- a/app-text/mupdf/mupdf-1.13.0.ebuild
+++ b/app-text/mupdf/mupdf-1.13.0.ebuild
@@ -11,7 +11,7 @@ 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"
+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="



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

2018-07-25 Thread Agostino Sarubbo
commit: edb2c5e54a4bd0fa73a504a6a393897464111a2f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jul 25 08:24:26 2018 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jul 25 08:24:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edb2c5e5

app-text/mupdf: amd64 stable wrt bug #658618

Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --include-arches="amd64"

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

diff --git a/app-text/mupdf/mupdf-1.13.0.ebuild 
b/app-text/mupdf/mupdf-1.13.0.ebuild
index 413d97b408e..845e4ac3f85 100644
--- a/app-text/mupdf/mupdf-1.13.0.ebuild
+++ b/app-text/mupdf/mupdf-1.13.0.ebuild
@@ -11,7 +11,7 @@ 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"
+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="



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

2018-07-24 Thread 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/

2018-05-14 Thread Tobias Klausmann
commit: 7b7195cd1475bbd79886ff58c2d63d1049f914b9
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Mon May 14 11:49:12 2018 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Mon May 14 11:49:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b7195cd

app-text/mupdf-1.12.0-r2: alpha stable

Gentoo-Bug: http://bugs.gentoo.org/634678

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

diff --git a/app-text/mupdf/mupdf-1.12.0-r2.ebuild 
b/app-text/mupdf/mupdf-1.12.0-r2.ebuild
index 332a932e6d2..8810e2deaf0 100644
--- a/app-text/mupdf/mupdf-1.12.0-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.12.0-r2.ebuild
@@ -11,7 +11,7 @@ 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"
+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="



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

2018-04-16 Thread Mikle Kolyada
commit: 9f6db227caaa95e72b1e8c8ff167272c300b5a73
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Apr 16 21:57:13 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Apr 16 21:57:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f6db227

app-text/mupdf: arm stable wrt bug #634678

Package-Manager: Portage-2.3.24, Repoman-2.3.6

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

diff --git a/app-text/mupdf/mupdf-1.12.0-r2.ebuild 
b/app-text/mupdf/mupdf-1.12.0-r2.ebuild
index e9e48938d09..332a932e6d2 100644
--- a/app-text/mupdf/mupdf-1.12.0-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.12.0-r2.ebuild
@@ -11,7 +11,7 @@ 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"
+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="



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

2018-04-14 Thread Aaron Bauman
commit: bcf75b3917cca220a320e7e8917c0fc8eea9428f
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sat Apr 14 14:45:38 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sat Apr 14 14:54:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcf75b39

app-text/mupdf: amd64 stable

Bug: https://bugs.gentoo.org/634678
Package-Manager: Portage-2.3.28, Repoman-2.3.9

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

diff --git a/app-text/mupdf/mupdf-1.12.0-r2.ebuild 
b/app-text/mupdf/mupdf-1.12.0-r2.ebuild
index 174dc9eac6c..e9e48938d09 100644
--- a/app-text/mupdf/mupdf-1.12.0-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.12.0-r2.ebuild
@@ -11,7 +11,7 @@ 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"
+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="



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

2018-04-14 Thread Sergei Trofimovich
commit: dc550bf8838907cf5845e4dd3746974dcc8b0a28
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Apr 14 09:15:46 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Apr 14 09:16:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc550bf8

app-text/mupdf: stable 1.12.0-r2 for ia64, bug #634678

Package-Manager: Portage-2.3.28, Repoman-2.3.9
RepoMan-Options: --include-arches="ia64"

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

diff --git a/app-text/mupdf/mupdf-1.12.0-r2.ebuild 
b/app-text/mupdf/mupdf-1.12.0-r2.ebuild
index 24fbe8ee0af..174dc9eac6c 100644
--- a/app-text/mupdf/mupdf-1.12.0-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.12.0-r2.ebuild
@@ -11,7 +11,7 @@ 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"
+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="



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

2018-04-11 Thread Thomas Deutschmann
commit: 705f826fcfadb81b301ad61589ea585bc58c8849
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Apr 12 01:03:40 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Apr 12 01:03:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=705f826f

app-text/mupdf: Fix typo in mupdf-1.11-openssl-curl-x11.patch

Reported-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Package-Manager: Portage-2.3.28, Repoman-2.3.9
RepoMan-Options: --force

 .../files/mupdf-1.11-openssl-curl-x11-r1.patch | 37 ++
 ...pdf-1.12.0-r1.ebuild => mupdf-1.12.0-r2.ebuild} |  2 +-
 2 files changed, 38 insertions(+), 1 deletion(-)

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
new file mode 100644
index 000..92845a0eef2
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11-r1.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_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.12.0-r1.ebuild 
b/app-text/mupdf/mupdf-1.12.0-r2.ebuild
similarity index 98%
rename from app-text/mupdf/mupdf-1.12.0-r1.ebuild
rename to app-text/mupdf/mupdf-1.12.0-r2.ebuild
index 0511828741f..24fbe8ee0af 100644
--- a/app-text/mupdf/mupdf-1.12.0-r1.ebuild
+++ b/app-text/mupdf/mupdf-1.12.0-r2.ebuild
@@ -46,7 +46,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.12-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-openssl-curl-x11-r1.patch
"${FILESDIR}"/${PN}-1.11-drop-libmupdfthird.patch
 )
 



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

2018-04-11 Thread Thomas Deutschmann
commit: 1ccbe7f9b5f47b77cf68cbbe120ad50b2020b543
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Apr 12 00:48:37 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Apr 12 00:54:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ccbe7f9

app-text/mupdf: x86 stable (bug #634678)

Package-Manager: Portage-2.3.28, Repoman-2.3.9

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

diff --git a/app-text/mupdf/mupdf-1.12.0-r1.ebuild 
b/app-text/mupdf/mupdf-1.12.0-r1.ebuild
index 4aa5e0b3133..0511828741f 100644
--- a/app-text/mupdf/mupdf-1.12.0-r1.ebuild
+++ b/app-text/mupdf/mupdf-1.12.0-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+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="



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

2018-04-11 Thread Thomas Deutschmann
commit: 68602054995f198e5b0a4b591afa7fd1c2aa7799
Author: Holger Hoffstätte  applied-asynchrony  com>
AuthorDate: Wed Apr 11 20:21:33 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Apr 11 20:23:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68602054

app-text/mupdf: Use freeglut instead of glfw

Closes: https://bugs.gentoo.org/645948
Package-Manager: Portage-2.3.28, Repoman-2.3.9
Signed-off-by: Thomas Deutschmann  gentoo.org>

 app-text/mupdf/mupdf-1.12.0-r1.ebuild | 166 ++
 1 file changed, 166 insertions(+)

diff --git a/app-text/mupdf/mupdf-1.12.0-r1.ebuild 
b/app-text/mupdf/mupdf-1.12.0-r1.ebuild
new file mode 100644
index 000..4aa5e0b3133
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.12.0-r1.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]
+   x11-libs/libxcb[static-libs] )"
+
+REQUIRED_USE="opengl? ( !static !static-libs )"
+
+S=${WORKDIR}/${P}-source
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.12-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-drop-libmupdfthird.patch
+)
+
+src_prepare() {
+   xdg_src_prepare
+   use hppa && append-cflags -ffunction-sections
+
+   # specialized lcms2, keep it if wanted inside lubmupdfthird
+   if ! use lcms ; then
+   rm -rf thirdparty/lcms2
+   fi
+
+   rm -rf 
thirdparty/{README,curl,freeglut,freetype,harfbuzz,jbig2dec,libjpeg,mujs,openjpeg,zlib}
 || die
+   for my_third in thirdparty/* ; do
+   ewarn "Bundled thirdparty lib: ${my_third}"
+   done
+
+   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" \
+   -e "1ibuild = debug" \
+   -e "1iprefix = ${ED}usr" \
+   -e "1ilibdir = ${ED}usr/$(get_libdir)" \
+   -e "1idocdir = ${ED}usr/share/doc/${PF}" \
+   -i Makerules || die
+
+   if use static-libs || use static ; then
+   cp -a "${S}" "${S}"-static || die
+   #add missing Libs.private for xcb and freetype
+   sed -e 's:\(pkg-config --libs\):\1 --static:' \
+   -e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
+   -e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
+   -i "${S}"-static/Makerules || die
+   fi
+
+   my_soname=libmupdf.so.${PV}
+   my_soname_js_none=libmupdf-js-none.so.${PV}
+   sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
+   -e 

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

2018-02-04 Thread Patrice Clement
commit: c1bd96e789bde43f593bdc6057f55640de04aa57
Author: Francesco Turco  fastmail  fm>
AuthorDate: Fri Feb  2 13:50:31 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Feb  4 22:49:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1bd96e7

app-text/mupdf: use HTTPS instead of HTTP.

Closes: https://github.com/gentoo/gentoo/pull/7022

 app-text/mupdf/mupdf-1.11-r1.ebuild | 10 +-
 app-text/mupdf/mupdf-1.11-r2.ebuild | 10 +-
 app-text/mupdf/mupdf-1.12.0.ebuild  |  8 
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app-text/mupdf/mupdf-1.11-r1.ebuild 
b/app-text/mupdf/mupdf-1.11-r1.ebuild
index eb9d06b4a3a..0b2990cc8b2 100644
--- a/app-text/mupdf/mupdf-1.11-r1.ebuild
+++ b/app-text/mupdf/mupdf-1.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ 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;
+HOMEPAGE="https://mupdf.com/;
+SRC_URI="https://mupdf.com/downloads/${P}-source.tar.gz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
@@ -96,8 +96,8 @@ src_prepare() {
cp -a "${S}" "${S}"-static || die
#add missing Libs.private for xcb and freetype
sed -e 's:\(pkg-config --libs\):\1 --static:' \
-   -e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
-   -e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
+   -e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
+   -e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
-i "${S}"-static/Makerules || die
fi
 

diff --git a/app-text/mupdf/mupdf-1.11-r2.ebuild 
b/app-text/mupdf/mupdf-1.11-r2.ebuild
index ba45032f219..da582f3a291 100644
--- a/app-text/mupdf/mupdf-1.11-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.11-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ 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;
+HOMEPAGE="https://mupdf.com/;
+SRC_URI="https://mupdf.com/downloads/${P}-source.tar.gz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
@@ -97,8 +97,8 @@ src_prepare() {
cp -a "${S}" "${S}"-static || die
#add missing Libs.private for xcb and freetype
sed -e 's:\(pkg-config --libs\):\1 --static:' \
-   -e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
-   -e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
+   -e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
+   -e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
-i "${S}"-static/Makerules || die
fi
 

diff --git a/app-text/mupdf/mupdf-1.12.0.ebuild 
b/app-text/mupdf/mupdf-1.12.0.ebuild
index bb542060cd7..9f1100e51cb 100644
--- a/app-text/mupdf/mupdf-1.12.0.ebuild
+++ b/app-text/mupdf/mupdf-1.12.0.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit flag-o-matic toolchain-funcs xdg
 
 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;
+HOMEPAGE="https://mupdf.com/;
+SRC_URI="https://mupdf.com/downloads/${P}-source.tar.gz;
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
@@ -104,8 +104,8 @@ src_prepare() {
cp -a "${S}" "${S}"-static || die
#add missing Libs.private for xcb and freetype
sed -e 's:\(pkg-config --libs\):\1 --static:' \
-   -e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
-   -e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
+   -e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
+   -e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
-i "${S}"-static/Makerules || die
fi
 



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

2018-01-28 Thread Michael Weber
commit: a4a4dfe71cde92b2eaa38c774d19eeb002d00236
Author: Michael Weber  gentoo  org>
AuthorDate: Sun Jan 28 09:52:34 2018 +
Commit: Michael Weber  gentoo  org>
CommitDate: Sun Jan 28 09:52:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4a4dfe7

app-text/mupdf: Version bump (thanks Hadrien Lacour), add USE=lcms for 
bundled/modified lcms2.

Closes: https://bugs.gentoo.org/641862
Package-Manager: Portage-2.3.20, Repoman-2.3.6

 app-text/mupdf/Manifest|   1 +
 .../files/mupdf-1.11-drop-libmupdfthird.patch  |  11 ++
 app-text/mupdf/files/mupdf-1.12-CFLAGS.patch   |  11 ++
 app-text/mupdf/mupdf-1.12.0.ebuild | 160 +
 4 files changed, 183 insertions(+)

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index a0a8c315fa4..1367f972efc 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1 +1,2 @@
 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

diff --git a/app-text/mupdf/files/mupdf-1.11-drop-libmupdfthird.patch 
b/app-text/mupdf/files/mupdf-1.11-drop-libmupdfthird.patch
index eaf11678868..e5600c00cd8 100644
--- a/app-text/mupdf/files/mupdf-1.11-drop-libmupdfthird.patch
+++ b/app-text/mupdf/files/mupdf-1.11-drop-libmupdfthird.patch
@@ -9,3 +9,14 @@
  THREAD_LIB = $(OUT)/libmuthreads.a
  
  MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(SVG_OBJ) 
$(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ)
+--- mupdf-1.12.0-source/Makefile
 mupdf-1.12.0-source/Makefile
+@@ -343,7 +343,7 @@
+ 
+ THREAD_OBJ := $(THREAD_OBJ)
+ 
+-$(MUPDF_LIB) : $(MUPDF_OBJ)
++$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ)
+ $(THIRD_LIB) : $(THIRD_OBJ)
+ $(THREAD_LIB) : $(THREAD_OBJ)
+ 

diff --git a/app-text/mupdf/files/mupdf-1.12-CFLAGS.patch 
b/app-text/mupdf/files/mupdf-1.12-CFLAGS.patch
new file mode 100644
index 000..796d127263a
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.12-CFLAGS.patch
@@ -0,0 +1,11 @@
+--- mupdf-1.12.0-source/Makerules
 mupdf-1.12.0-source/Makerules
+@@ -22,8 +22,6 @@
+ endif
+ 
+ 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/mupdf-1.12.0.ebuild 
b/app-text/mupdf/mupdf-1.12.0.ebuild
new file mode 100644
index 000..bb542060cd7
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.12.0.ebuild
@@ -0,0 +1,160 @@
+# 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="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 lcms 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? ( !static !static-libs )"
+
+S=${WORKDIR}/${P}-source
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.12-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
+   

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

2017-09-16 Thread Andreas Sturmlechner
commit: 57974ffe838e3a92ded896ad52e8873af95a28eb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Sep 13 14:35:59 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Sep 16 12:27:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57974ffe

app-text/mupdf: De-stabilise hppa

Package-Manager: Portage-2.3.8, Repoman-2.3.3

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

diff --git a/app-text/mupdf/mupdf-1.11-r1.ebuild 
b/app-text/mupdf/mupdf-1.11-r1.ebuild
index bc98cb12bac..eb9d06b4a3a 100644
--- a/app-text/mupdf/mupdf-1.11-r1.ebuild
+++ b/app-text/mupdf/mupdf-1.11-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+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/

2017-06-22 Thread 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/

2017-06-22 Thread Michael Weber
commit: 7eedd5c3b84a3b83525dfed536735be99c1382b0
Author: Michael Weber  gentoo  org>
AuthorDate: Thu Jun 22 23:22:11 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Thu Jun 22 23:22:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eedd5c3

app-text/mupdf: fix executable bit on CHANGES (bug 622076).

Package-Manager: Portage-2.3.6, Repoman-2.3.2

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

diff --git a/app-text/mupdf/mupdf-1.11-r2.ebuild 
b/app-text/mupdf/mupdf-1.11-r2.ebuild
index e7a4fef0f02..53319aa7581 100644
--- a/app-text/mupdf/mupdf-1.11-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.11-r2.ebuild
@@ -147,5 +147,5 @@ src_install() {
insinto /usr/$(get_libdir)/pkgconfig
doins platform/debian/${PN}.pc
 
-   dodoc README docs/*.{txt,c}
+   dodoc README CHANGES docs/*.{txt,c}
 }



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

2017-06-22 Thread Michael Weber
commit: 49e8f195b53830a62dad0c3632798b0357a4c376
Author: Michael Weber  gentoo  org>
AuthorDate: Thu Jun 22 23:18:18 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Thu Jun 22 23:18:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49e8f195

app-text/mupdf: allow USE=-X,opengl and cleanup .desktop and symlink mess.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-text/mupdf/mupdf-1.11-r2.ebuild | 151 
 1 file changed, 151 insertions(+)

diff --git a/app-text/mupdf/mupdf-1.11-r2.ebuild 
b/app-text/mupdf/mupdf-1.11-r2.ebuild
new file mode 100644
index 000..e7a4fef0f02
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.11-r2.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="
+   !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? ( !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" \
+   -e "1ibuild = debug" \
+   -e "1iprefix = ${ED}usr" \
+   -e "1ilibdir = ${ED}usr/$(get_libdir)" \
+   -e "1idocdir = ${ED}usr/share/doc/${PF}" \
+   -e "1iWANT_X11 = $(usex X)" \
+   -e "1iWANT_OPENSSL = $(usex openssl)" \
+   -e "1iWANT_CURL = $(usex curl)" \
+   -e "1iHAVE_MUJS = $(usex javascript)" \
+   -e "1iMUJS_LIBS = $(usex javascript -lmujs '')" \
+   -e "1iMUJS_CFLAGS =" \
+   -e "1iHAVE_GLFW = $(usex opengl yes no)" \
+   -i Makerules || die
+
+   if use static-libs || use static ; then
+   cp -a "${S}" "${S}"-static || die
+   #add missing Libs.private for xcb and freetype
+   sed -e 's:\(pkg-config --libs\):\1 --static:' \
+   -e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
+   -e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
+   -i "${S}"-static/Makerules || die
+   fi
+
+   my_soname=libmupdf.so.${PV}
+   my_soname_js_none=libmupdf-js-none.so.${PV}
+   sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
+   -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) 

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

2017-05-23 Thread Tobias Klausmann
commit: 44feab8e9ba3891d2a2a4f158a0489f58df954c6
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Tue May 23 13:36:38 2017 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Tue May 23 13:36:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44feab8e

app-text/mupdf-1.11-r1: add alpha keyword

Gentoo-Bug: 619426

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

diff --git a/app-text/mupdf/mupdf-1.11-r1.ebuild 
b/app-text/mupdf/mupdf-1.11-r1.ebuild
index d76fb3883fe..52e586357be 100644
--- a/app-text/mupdf/mupdf-1.11-r1.ebuild
+++ b/app-text/mupdf/mupdf-1.11-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+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/

2017-05-13 Thread 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/

2017-05-13 Thread Michael Weber
commit: 7f5cdbf8c02406eb2970b62481090682f428188d
Author: Michael Weber  gentoo  org>
AuthorDate: Sat May 13 22:42:06 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Sat May 13 22:46:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f5cdbf8

app-text/mupdf: ppc ppc64 stable (bug 614044).

Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --include-arches="ppc ppc64"

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

diff --git a/app-text/mupdf/mupdf-1.11-r1.ebuild 
b/app-text/mupdf/mupdf-1.11-r1.ebuild
index 999e166ee8f..d76fb3883fe 100644
--- a/app-text/mupdf/mupdf-1.11-r1.ebuild
+++ b/app-text/mupdf/mupdf-1.11-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+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/

2017-05-13 Thread Markus Meier
commit: fc16ae5b3b2a24728df5b0681c02a319f3611264
Author: Markus Meier  gentoo  org>
AuthorDate: Sat May 13 06:24:44 2017 +
Commit: Markus Meier  gentoo  org>
CommitDate: Sat May 13 06:24:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc16ae5b

app-text/mupdf: arm stable, bug #614044

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"

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

diff --git a/app-text/mupdf/mupdf-1.11-r1.ebuild 
b/app-text/mupdf/mupdf-1.11-r1.ebuild
index 60557c05336..999e166ee8f 100644
--- a/app-text/mupdf/mupdf-1.11-r1.ebuild
+++ b/app-text/mupdf/mupdf-1.11-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+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/

2017-05-10 Thread Agostino Sarubbo
commit: 673f0e21156b11f6307b1cf04f28dcd63d09afe0
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed May 10 15:44:32 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed May 10 15:44:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=673f0e21

app-text/mupdf: x86 stable wrt bug #614044

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.11-r1.ebuild 
b/app-text/mupdf/mupdf-1.11-r1.ebuild
index 51bdc52..60557c05336 100644
--- a/app-text/mupdf/mupdf-1.11-r1.ebuild
+++ b/app-text/mupdf/mupdf-1.11-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+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/

2017-05-10 Thread Agostino Sarubbo
commit: 6b60409b40c0cb336e0735a9f80bbc75dabe8a7e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed May 10 09:32:29 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed May 10 09:32:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b60409b

app-text/mupdf: amd64 stable wrt bug #614044

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.11-r1.ebuild 
b/app-text/mupdf/mupdf-1.11-r1.ebuild
index 237fdfec448..51bdc52 100644
--- a/app-text/mupdf/mupdf-1.11-r1.ebuild
+++ b/app-text/mupdf/mupdf-1.11-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+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/

2017-05-08 Thread Jeroen Roovers
commit: 11384923917d349bcaa15584e7e6bf366e14b4e1
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon May  8 16:24:42 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon May  8 16:24:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11384923

app-text/mupdf: Stable for HPPA (bug #614044).

Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --ignore-arches

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

diff --git a/app-text/mupdf/mupdf-1.11-r1.ebuild 
b/app-text/mupdf/mupdf-1.11-r1.ebuild
index f2bd343e789..237fdfec448 100644
--- a/app-text/mupdf/mupdf-1.11-r1.ebuild
+++ b/app-text/mupdf/mupdf-1.11-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+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/

2017-05-08 Thread 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(, "OPEN"))
+   {
+-  char path[1024];
++  char path[LONGLINE];
+   if (file_open)
+   pdfapp_close();
+   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/

2017-05-07 Thread Agostino Sarubbo
commit: 841de2f6a5fbaca9bc8682257af420e43cda64a9
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun May  7 10:36:40 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun May  7 10:36:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=841de2f6

app-text/mupdf: x86 stable wrt bug #614852

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.11.ebuild b/app-text/mupdf/mupdf-1.11.ebuild
index 2271e549786..dd647117670 100644
--- a/app-text/mupdf/mupdf-1.11.ebuild
+++ b/app-text/mupdf/mupdf-1.11.ebuild
@@ -11,7 +11,7 @@ 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"
+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/

2017-05-06 Thread Agostino Sarubbo
commit: 8ac25e38eb81c60168cb158d7edb7933b1e81de0
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat May  6 13:25:20 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat May  6 13:25:20 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ac25e38

app-text/mupdf: amd64 stable wrt bug #614852

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

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

diff --git a/app-text/mupdf/mupdf-1.11.ebuild b/app-text/mupdf/mupdf-1.11.ebuild
index fced7ca758f..2271e549786 100644
--- a/app-text/mupdf/mupdf-1.11.ebuild
+++ b/app-text/mupdf/mupdf-1.11.ebuild
@@ -11,7 +11,7 @@ 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"
+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/

2017-05-06 Thread Jeroen Roovers
commit: aae6e212679ab92984368fd091f42eb7eb10f38d
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat May  6 10:11:21 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat May  6 10:11:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aae6e212

app-text/mupdf: Stable for HPPA (bug #614852).

Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --ignore-arches

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

diff --git a/app-text/mupdf/mupdf-1.11.ebuild b/app-text/mupdf/mupdf-1.11.ebuild
index 8a78ab2fbee..fced7ca758f 100644
--- a/app-text/mupdf/mupdf-1.11.ebuild
+++ b/app-text/mupdf/mupdf-1.11.ebuild
@@ -11,7 +11,7 @@ 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"
+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/

2017-04-29 Thread Jeroen Roovers
commit: 358ceac654377f4a33e3b58c50d10065d194db54
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Apr 29 09:09:27 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Apr 29 09:09:27 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=358ceac6

app-text/mupdf: Depend on >=media-libs/glfw-3.2 (bug #616826 by Hadrien Lacour).

Package-Manager: Portage-2.3.5, Repoman-2.3.2

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

diff --git a/app-text/mupdf/mupdf-1.11.ebuild b/app-text/mupdf/mupdf-1.11.ebuild
index 0369b675c19..8a78ab2fbee 100644
--- a/app-text/mupdf/mupdf-1.11.ebuild
+++ b/app-text/mupdf/mupdf-1.11.ebuild
@@ -27,7 +27,7 @@ LIB_DEPEND="
virtual/jpeg[static-libs?]
X? ( x11-libs/libX11[static-libs?]
x11-libs/libXext[static-libs?] )
-   opengl? ( >=media-libs/glfw-3 )"
+   opengl? ( >=media-libs/glfw-3.2 )"
 RDEPEND="${LIB_DEPEND}"
 DEPEND="${RDEPEND}
virtual/pkgconfig



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

2017-04-28 Thread 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/

2017-03-10 Thread Michael Weber
commit: 4f904b100300943c22586e4844d65e813c79e95e
Author: Michael Weber  gentoo  org>
AuthorDate: Fri Mar 10 12:29:34 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Fri Mar 10 12:35:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f904b10

app-text/mupdf: Remove old version (bug 611444).

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 app-text/mupdf/mupdf-1.10a-r1.ebuild | 147 ---
 1 file changed, 147 deletions(-)

diff --git a/app-text/mupdf/mupdf-1.10a-r1.ebuild 
b/app-text/mupdf/mupdf-1.10a-r1.ebuild
deleted file mode 100644
index e7538b77985..000
--- a/app-text/mupdf/mupdf-1.10a-r1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# 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 )"
-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.9a-CFLAGS.patch
-   "${FILESDIR}"/${PN}-1.9a-debug-build.patch
-   "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
-   "${FILESDIR}"/${PN}-1.10a-Makerules-openssl-curl.patch
-   "${FILESDIR}"/${PN}-1.8-system-glfw.patch
-   "${FILESDIR}"/${PN}-1.10a-heap-overflow.patch
-   "${FILESDIR}"/${PN}-1.10a-null-pointer.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" \
-   -e "1ibuild = debug" \
-   -e "1iprefix = ${ED}usr" \
-   -e "1ilibdir = ${ED}usr/$(get_libdir)" \
-   -e "1idocdir = ${ED}usr/share/doc/${PF}" \
-   -e "1iHAVE_X11 = $(usex X)" \
-   -e "1iWANT_OPENSSL = $(usex openssl)" \
-   -e "1iWANT_CURL = $(usex curl)" \
-   -e "1iHAVE_MUJS = $(usex javascript)" \
-   -e "1iMUJS_LIBS = $(usex javascript -lmujs '')" \
-   -e "1iMUJS_CFLAGS =" \
-   -e "1iHAVE_GLFW = $(usex opengl yes no)" \
-   -i Makerules || die
-
-   if use static-libs || use static ; then
-   cp -a "${S}" "${S}"-static || die
-   #add missing Libs.private for xcb and freetype
-   sed -e 's:\(pkg-config --libs\):\1 --static:' \
-   -e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
-   -e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
-   -i "${S}"-static/Makerules || die
-   fi
-
-   my_soname=libmupdf.so.${PV}
-   my_soname_js_none=libmupdf-js-none.so.${PV}
-   sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
-   -e 

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

2017-03-10 Thread Michael Weber
commit: 393c97a056216f7a4be689dccaeb1939a26bda25
Author: Michael Weber  gentoo  org>
AuthorDate: Fri Mar 10 12:28:40 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Fri Mar 10 12:35:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=393c97a0

app-text/mupdf: arm ppc ppc64 stable (bug 611444).

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 app-text/mupdf/mupdf-1.10a-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/mupdf/mupdf-1.10a-r2.ebuild 
b/app-text/mupdf/mupdf-1.10a-r2.ebuild
index d4d914676cc..099dfb0605b 100644
--- a/app-text/mupdf/mupdf-1.10a-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.10a-r2.ebuild
@@ -11,7 +11,7 @@ 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"
+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/

2017-03-10 Thread Agostino Sarubbo
commit: 8c8a7d05ab77204e25edbdb15a5058148922b8fe
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Mar 10 10:57:01 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Mar 10 10:59:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c8a7d05

app-text/mupdf: x86 stable wrt bug #611444

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-text/mupdf/mupdf-1.10a-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/mupdf/mupdf-1.10a-r2.ebuild 
b/app-text/mupdf/mupdf-1.10a-r2.ebuild
index d7fc13c6f4e..d4d914676cc 100644
--- a/app-text/mupdf/mupdf-1.10a-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.10a-r2.ebuild
@@ -11,7 +11,7 @@ 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"
+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/

2017-03-10 Thread Agostino Sarubbo
commit: aef4d76a66d60fa6c02b6b854275ea59547c511f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Mar 10 09:08:13 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Mar 10 09:08:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aef4d76a

app-text/mupdf: amd64 stable wrt bug #611444

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-text/mupdf/mupdf-1.10a-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/mupdf/mupdf-1.10a-r2.ebuild 
b/app-text/mupdf/mupdf-1.10a-r2.ebuild
index 8ebd30eb91a..d7fc13c6f4e 100644
--- a/app-text/mupdf/mupdf-1.10a-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.10a-r2.ebuild
@@ -11,7 +11,7 @@ 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"
+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="



  1   2   >