| 1 |
commit: 8f02d9eb7b96d30a41ee5303f83b61591b17b880 |
| 2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 26 14:18:39 2019 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 26 14:25:14 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f02d9eb |
| 7 |
|
| 8 |
app-text/mupdf: Fix libressl patch that was removed |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/701014 |
| 11 |
Package-Manager: Portage-2.3.79, Repoman-2.3.18 |
| 12 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
| 13 |
|
| 14 |
app-text/mupdf/Manifest | 2 - |
| 15 |
app-text/mupdf/files/mupdf-1.14-CFLAGS.patch | 13 --- |
| 16 |
app-text/mupdf/files/mupdf-1.14-Makefile.patch | 46 -------- |
| 17 |
.../mupdf/files/mupdf-1.14-fix-big-endian.patch | 125 -------------------- |
| 18 |
.../files/mupdf-1.14-r3-openssl-curl-x11.patch | 35 ------ |
| 19 |
app-text/mupdf/files/mupdf-1.3-zoom-2.patch | 10 -- |
| 20 |
app-text/mupdf/mupdf-1.14.0-r3.ebuild | 129 -------------------- |
| 21 |
app-text/mupdf/mupdf-1.15.0.ebuild | 130 --------------------- |
| 22 |
8 files changed, 490 deletions(-) |
| 23 |
|
| 24 |
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest |
| 25 |
index 9142b4ccaf0..964f9c13501 100644 |
| 26 |
--- a/app-text/mupdf/Manifest |
| 27 |
+++ b/app-text/mupdf/Manifest |
| 28 |
@@ -1,3 +1 @@ |
| 29 |
-DIST mupdf-1.14.0-source.tar.xz 41602372 BLAKE2B bb680038344af16c7231a18a009c0d04c5f50b3fcbaf061c9f5907f35d79eea93eeced7c2a43a06a963b93b39c74d0246c5fdad35655953d1aa5efb79737265a SHA512 bd41125dac1a81b7dbbfbb5f5e06e70bb601854731e0945983688da5d8d7c0bca9771fff2e4b6d9c36dbead6146f0a866ed7427d58e13d02ed6dfd94dcfe54bf |
| 30 |
-DIST mupdf-1.15.0-source.tar.xz 39828864 BLAKE2B 15d0e4244062a91c7055b98fa61f2b02e0e3effbcf5374fe589f5a0d2ba2a2d4a59318ae3c0f28d866c6b07554e4b1e65ee9264c26a5f4524ef34e998d6c3320 SHA512 ef19362e8b6c2843e214fd2fcdcc9ba91017884383f7e1cfe08ef1f528a233820475ddfdd8aef481e6e37ae69e8b64324eb4b30699baa8055e99e47c2fab31dd |
| 31 |
DIST mupdf-1.16.1-source.tar.xz 45800404 BLAKE2B bc4158a457056c55db52a518efc13c289cca537c29a6b563046297dc225f3ce0add781adb8520c4d0829d653ed0539042597e341cb21c4fb4c462ed422bf735b SHA512 fa657e6b9251aff91c25e91b335ea829b797dd91a759505bfd7259f8236613f590a044bc741e9b0587da55817a1ab8c1499c067d65d683d099259d06d91a8f50 |
| 32 |
|
| 33 |
diff --git a/app-text/mupdf/files/mupdf-1.14-CFLAGS.patch b/app-text/mupdf/files/mupdf-1.14-CFLAGS.patch |
| 34 |
deleted file mode 100644 |
| 35 |
index 90972e8c53e..00000000000 |
| 36 |
--- a/app-text/mupdf/files/mupdf-1.14-CFLAGS.patch |
| 37 |
+++ /dev/null |
| 38 |
@@ -1,13 +0,0 @@ |
| 39 |
-diff --git a/Makerules b/Makerules |
| 40 |
-index fc9bf998..82f10b28 100644 |
| 41 |
---- a/Makerules |
| 42 |
-+++ b/Makerules |
| 43 |
-@@ -21,8 +21,6 @@ SANITIZE_FLAGS += -fsanitize=address |
| 44 |
- SANITIZE_FLAGS += -fsanitize=leak |
| 45 |
- |
| 46 |
- ifeq ($(build),debug) |
| 47 |
-- CFLAGS += -pipe -g |
| 48 |
-- LDFLAGS += -g $(LDREMOVEUNREACH) |
| 49 |
- else ifeq ($(build),release) |
| 50 |
- CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer |
| 51 |
- LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s |
| 52 |
|
| 53 |
diff --git a/app-text/mupdf/files/mupdf-1.14-Makefile.patch b/app-text/mupdf/files/mupdf-1.14-Makefile.patch |
| 54 |
deleted file mode 100644 |
| 55 |
index a8c4ef770dc..00000000000 |
| 56 |
--- a/app-text/mupdf/files/mupdf-1.14-Makefile.patch |
| 57 |
+++ /dev/null |
| 58 |
@@ -1,46 +0,0 @@ |
| 59 |
-1. debug build (not sure why...) |
| 60 |
-2. build shared library |
| 61 |
-3. add optional static lib target |
| 62 |
-4. Don't install COPYING |
| 63 |
-diff --git a/Makefile b/Makefile |
| 64 |
-index 37fc48e6..4303e9fa 100644 |
| 65 |
---- a/Makefile |
| 66 |
-+++ b/Makefile |
| 67 |
-@@ -3,7 +3,7 @@ |
| 68 |
- -include user.make |
| 69 |
- |
| 70 |
- ifndef build |
| 71 |
-- build := release |
| 72 |
-+ build := debug |
| 73 |
- endif |
| 74 |
- |
| 75 |
- ifndef OUT |
| 76 |
-@@ -190,13 +190,15 @@ generate: source/pdf/js/util.js.h |
| 77 |
- |
| 78 |
- # --- Library --- |
| 79 |
- |
| 80 |
--MUPDF_LIB = $(OUT)/libmupdf.a |
| 81 |
--THIRD_LIB = $(OUT)/libmupdf-third.a |
| 82 |
-+MUPDF_LIB = libmupdf.so.$(GENTOO_PV) |
| 83 |
-+MUPDF_STATIC = $(OUT)/libmupdf.a |
| 84 |
-+THIRD_LIB = |
| 85 |
- THREAD_LIB = $(OUT)/libmupdf-threads.a |
| 86 |
- PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a |
| 87 |
- |
| 88 |
--$(MUPDF_LIB) : $(MUPDF_OBJ) |
| 89 |
--$(THIRD_LIB) : $(THIRD_OBJ) |
| 90 |
-+$(MUPDF_LIB): $(MUPDF_OBJ) $(THIRD_OBJ) |
| 91 |
-+ $(QUIET_LINK) $(CC) $(LDFLAGS) --shared -Wl,-soname -Wl,$(MUPDF_LIB) -Wl,--no-undefined -o $@ $^ $(THIRD_LIBS) $(LIBS) |
| 92 |
-+$(MUPDF_STATIC): $(MUPDF_OBJ) $(THIRD_OBJ) |
| 93 |
- $(THREAD_LIB) : $(THREAD_OBJ) |
| 94 |
- $(PKCS7_LIB) : $(PKCS7_OBJ) |
| 95 |
- |
| 96 |
-@@ -355,7 +357,7 @@ install: libs apps |
| 97 |
- |
| 98 |
- install -d $(DESTDIR)$(docdir) |
| 99 |
- install -d $(DESTDIR)$(docdir)/examples |
| 100 |
-- install README COPYING CHANGES $(DESTDIR)$(docdir) |
| 101 |
-+ install README CHANGES $(DESTDIR)$(docdir) |
| 102 |
- install docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir) |
| 103 |
- install docs/examples/* $(DESTDIR)$(docdir)/examples |
| 104 |
- |
| 105 |
|
| 106 |
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 |
| 107 |
deleted file mode 100644 |
| 108 |
index dc472153ca6..00000000000 |
| 109 |
--- a/app-text/mupdf/files/mupdf-1.14-fix-big-endian.patch |
| 110 |
+++ /dev/null |
| 111 |
@@ -1,125 +0,0 @@ |
| 112 |
-vdupras note: exact same patch as in |
| 113 |
-https://bugs.ghostscript.com/show_bug.cgi?id=699395 except for tweaked |
| 114 |
-diff paths. |
| 115 |
-From 5fb79e6ccb805b3d94c8bb8eb0990d9944ae7602 Mon Sep 17 00:00:00 2001 |
| 116 |
-Message-Id: <5fb79e6ccb805b3d94c8bb8eb0990d9944ae7602.1528041417.git.mjg@×××××××××××××.org> |
| 117 |
-From: Michael J Gruber <mjg@×××××××××××××.org> |
| 118 |
-Date: Sun, 3 Jun 2018 17:55:46 +0200 |
| 119 |
-Subject: [PATCH] fix build on big endian |
| 120 |
- |
| 121 |
-0dc1153 ("Spread of context into all procedures and removal from |
| 122 |
-structures", 2017-04-26) missed a few spots that are relevant on big |
| 123 |
-endian only. |
| 124 |
- |
| 125 |
-Add the missing ContextIDs in the call chain so that the build succeeds |
| 126 |
-again. |
| 127 |
- |
| 128 |
-Signed-off-by: Michael J Gruber <mjg@×××××××××××××.org> |
| 129 |
---- |
| 130 |
- src/cmsmd5.c | 22 +++++++++++----------- |
| 131 |
- 1 file changed, 11 insertions(+), 11 deletions(-) |
| 132 |
- |
| 133 |
-diff --git a/src/cmsmd5.c b/src/cmsmd5.c |
| 134 |
-index 4b8f7f9..dd0925a 100644 |
| 135 |
---- a/thirdparty/lcms2/src/cmsmd5.c |
| 136 |
-+++ b/thirdparty/lcms2/src/cmsmd5.c |
| 137 |
-@@ -29,7 +29,7 @@ |
| 138 |
- #ifdef CMS_USE_BIG_ENDIAN |
| 139 |
- |
| 140 |
- static |
| 141 |
--void byteReverse(cmsUInt8Number * buf, cmsUInt32Number longs) |
| 142 |
-+void byteReverse(cmsContext ContextID, cmsUInt8Number * buf, cmsUInt32Number longs) |
| 143 |
- { |
| 144 |
- do { |
| 145 |
- |
| 146 |
-@@ -42,7 +42,7 @@ void byteReverse(cmsUInt8Number * buf, cmsUInt32Number longs) |
| 147 |
- } |
| 148 |
- |
| 149 |
- #else |
| 150 |
--#define byteReverse(buf, len) |
| 151 |
-+#define byteReverse(ContextID, buf, len) |
| 152 |
- #endif |
| 153 |
- |
| 154 |
- |
| 155 |
-@@ -172,7 +172,7 @@ cmsHANDLE MD5alloc(cmsContext ContextID) |
| 156 |
- |
| 157 |
- |
| 158 |
- static |
| 159 |
--void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len) |
| 160 |
-+void MD5add(cmsContext ContextID, cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len) |
| 161 |
- { |
| 162 |
- _cmsMD5* ctx = (_cmsMD5*) Handle; |
| 163 |
- cmsUInt32Number t; |
| 164 |
-@@ -196,7 +196,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len) |
| 165 |
- } |
| 166 |
- |
| 167 |
- memmove(p, buf, t); |
| 168 |
-- byteReverse(ctx->in, 16); |
| 169 |
-+ byteReverse(ContextID, ctx->in, 16); |
| 170 |
- |
| 171 |
- MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in); |
| 172 |
- buf += t; |
| 173 |
-@@ -205,7 +205,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len) |
| 174 |
- |
| 175 |
- while (len >= 64) { |
| 176 |
- memmove(ctx->in, buf, 64); |
| 177 |
-- byteReverse(ctx->in, 16); |
| 178 |
-+ byteReverse(ContextID, ctx->in, 16); |
| 179 |
- MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in); |
| 180 |
- buf += 64; |
| 181 |
- len -= 64; |
| 182 |
-@@ -216,7 +216,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len) |
| 183 |
- |
| 184 |
- // Destroy the object and return the checksum |
| 185 |
- static |
| 186 |
--void MD5finish(cmsProfileID* ProfileID, cmsHANDLE Handle) |
| 187 |
-+void MD5finish(cmsContext ContextID, cmsProfileID* ProfileID, cmsHANDLE Handle) |
| 188 |
- { |
| 189 |
- _cmsMD5* ctx = (_cmsMD5*) Handle; |
| 190 |
- cmsUInt32Number count; |
| 191 |
-@@ -232,21 +232,21 @@ void MD5finish(cmsProfileID* ProfileID, cmsHANDLE Handle) |
| 192 |
- if (count < 8) { |
| 193 |
- |
| 194 |
- memset(p, 0, count); |
| 195 |
-- byteReverse(ctx->in, 16); |
| 196 |
-+ byteReverse(ContextID, ctx->in, 16); |
| 197 |
- MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in); |
| 198 |
- |
| 199 |
- memset(ctx->in, 0, 56); |
| 200 |
- } else { |
| 201 |
- memset(p, 0, count - 8); |
| 202 |
- } |
| 203 |
-- byteReverse(ctx->in, 14); |
| 204 |
-+ byteReverse(ContextID, ctx->in, 14); |
| 205 |
- |
| 206 |
- ((cmsUInt32Number *) ctx->in)[14] = ctx->bits[0]; |
| 207 |
- ((cmsUInt32Number *) ctx->in)[15] = ctx->bits[1]; |
| 208 |
- |
| 209 |
- MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in); |
| 210 |
- |
| 211 |
-- byteReverse((cmsUInt8Number *) ctx->buf, 4); |
| 212 |
-+ byteReverse(ContextID, (cmsUInt8Number *) ctx->buf, 4); |
| 213 |
- memmove(ProfileID ->ID8, ctx->buf, 16); |
| 214 |
- |
| 215 |
- _cmsFree(ctx ->ContextID, ctx); |
| 216 |
-@@ -291,7 +291,7 @@ cmsBool CMSEXPORT cmsMD5computeID(cmsContext ContextID, cmsHPROFILE hProfile) |
| 217 |
- if (MD5 == NULL) goto Error; |
| 218 |
- |
| 219 |
- // Add all bytes |
| 220 |
-- MD5add(MD5, Mem, BytesNeeded); |
| 221 |
-+ MD5add(ContextID,MD5, Mem, BytesNeeded); |
| 222 |
- |
| 223 |
- // Temp storage is no longer needed |
| 224 |
- _cmsFree(ContextID, Mem); |
| 225 |
-@@ -300,7 +300,7 @@ cmsBool CMSEXPORT cmsMD5computeID(cmsContext ContextID, cmsHPROFILE hProfile) |
| 226 |
- memmove(Icc, &Keep, sizeof(_cmsICCPROFILE)); |
| 227 |
- |
| 228 |
- // And store the ID |
| 229 |
-- MD5finish(&Icc ->ProfileID, MD5); |
| 230 |
-+ MD5finish(ContextID, &Icc ->ProfileID, MD5); |
| 231 |
- return TRUE; |
| 232 |
- |
| 233 |
- Error: |
| 234 |
--- |
| 235 |
-2.18.0.rc0.294.g786209a621 |
| 236 |
- |
| 237 |
|
| 238 |
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 |
| 239 |
deleted file mode 100644 |
| 240 |
index 79efe32c0e4..00000000000 |
| 241 |
--- a/app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch |
| 242 |
+++ /dev/null |
| 243 |
@@ -1,35 +0,0 @@ |
| 244 |
-diff --git a/Makerules b/Makerules |
| 245 |
-index fc9bf998..f1fd93cb 100644 |
| 246 |
---- a/Makerules |
| 247 |
-+++ b/Makerules |
| 248 |
-@@ -113,10 +113,11 @@ else ifeq ($(OS),Linux) |
| 249 |
- SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib) |
| 250 |
- endif |
| 251 |
- |
| 252 |
-- HAVE_CURL := $(shell pkg-config --exists libcurl && echo yes) |
| 253 |
-+ HAVE_CURL ?= not-unless-portage-tells-me |
| 254 |
- ifeq ($(HAVE_CURL),yes) |
| 255 |
- SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl) |
| 256 |
-- SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) |
| 257 |
-+ # We have to forcibly add -lpthread to avoid linking errors. |
| 258 |
-+ SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) -lpthread |
| 259 |
- endif |
| 260 |
- |
| 261 |
- HAVE_GLUT := yes |
| 262 |
-@@ -125,13 +126,14 @@ else ifeq ($(OS),Linux) |
| 263 |
- SYS_GLUT_LIBS := -lglut -lGL |
| 264 |
- endif |
| 265 |
- |
| 266 |
-- HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes) |
| 267 |
-+ HAVE_X11 ?= not-unless-portage-tells-me |
| 268 |
- ifeq ($(HAVE_X11),yes) |
| 269 |
- X11_CFLAGS := $(shell pkg-config --cflags x11 xext) |
| 270 |
- X11_LIBS := $(shell pkg-config --libs x11 xext) |
| 271 |
- endif |
| 272 |
- |
| 273 |
-- HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes) |
| 274 |
-+ |
| 275 |
-+ HAVE_LIBCRYPTO ?= not-unless-portage-tells-me |
| 276 |
- ifeq ($(HAVE_LIBCRYPTO),yes) |
| 277 |
- LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO |
| 278 |
- LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) |
| 279 |
|
| 280 |
diff --git a/app-text/mupdf/files/mupdf-1.3-zoom-2.patch b/app-text/mupdf/files/mupdf-1.3-zoom-2.patch |
| 281 |
deleted file mode 100644 |
| 282 |
index 35391245023..00000000000 |
| 283 |
--- a/app-text/mupdf/files/mupdf-1.3-zoom-2.patch |
| 284 |
+++ /dev/null |
| 285 |
@@ -1,10 +0,0 @@ |
| 286 |
---- mupdf-1.3/platform/x11/pdfapp.c |
| 287 |
-+++ mupdf-1.3/platform/x11/pdfapp.c |
| 288 |
-@@ -866,6 +867,7 @@ |
| 289 |
- break; |
| 290 |
- |
| 291 |
- case ' ': |
| 292 |
-+ case 'F': |
| 293 |
- panto = DONT_PAN; |
| 294 |
- if (app->numberlen > 0) |
| 295 |
- app->pageno += atoi(app->number); |
| 296 |
|
| 297 |
diff --git a/app-text/mupdf/mupdf-1.14.0-r3.ebuild b/app-text/mupdf/mupdf-1.14.0-r3.ebuild |
| 298 |
deleted file mode 100644 |
| 299 |
index fca81cfa02f..00000000000 |
| 300 |
--- a/app-text/mupdf/mupdf-1.14.0-r3.ebuild |
| 301 |
+++ /dev/null |
| 302 |
@@ -1,129 +0,0 @@ |
| 303 |
-# Copyright 1999-2019 Gentoo Authors |
| 304 |
-# Distributed under the terms of the GNU General Public License v2 |
| 305 |
- |
| 306 |
-EAPI=6 |
| 307 |
- |
| 308 |
-inherit flag-o-matic toolchain-funcs xdg |
| 309 |
- |
| 310 |
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C" |
| 311 |
-HOMEPAGE="https://mupdf.com/" |
| 312 |
-SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz" |
| 313 |
- |
| 314 |
-LICENSE="AGPL-3" |
| 315 |
-SLOT="0/${PV}" |
| 316 |
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" |
| 317 |
-IUSE="X curl +javascript libressl opengl ssl static-libs +vanilla" |
| 318 |
- |
| 319 |
-RDEPEND=" |
| 320 |
- >=dev-lang/mujs-1.0.4 |
| 321 |
- media-libs/freetype:2=[static-libs?] |
| 322 |
- media-libs/harfbuzz:=[static-libs?,truetype] |
| 323 |
- media-libs/jbig2dec:=[static-libs?] |
| 324 |
- media-libs/libpng:0=[static-libs?] |
| 325 |
- >=media-libs/openjpeg-2.1:2=[static-libs?] |
| 326 |
- virtual/jpeg[static-libs?] |
| 327 |
- curl? ( net-misc/curl[static-libs?] ) |
| 328 |
- opengl? ( >=media-libs/freeglut-3.0.0:= ) |
| 329 |
- ssl? ( |
| 330 |
- libressl? ( >=dev-libs/libressl-2.8:0=[static-libs?] ) |
| 331 |
- !libressl? ( >=dev-libs/openssl-1.1:0=[static-libs?] ) |
| 332 |
- ) |
| 333 |
- X? ( |
| 334 |
- x11-libs/libX11[static-libs?] |
| 335 |
- x11-libs/libXext[static-libs?] |
| 336 |
- )" |
| 337 |
-DEPEND="${RDEPEND} |
| 338 |
- virtual/pkgconfig" |
| 339 |
- |
| 340 |
-REQUIRED_USE=" |
| 341 |
- opengl? ( !static-libs ) |
| 342 |
- curl? ( X )" |
| 343 |
- |
| 344 |
-S=${WORKDIR}/${P}-source |
| 345 |
- |
| 346 |
-PATCHES=( |
| 347 |
- "${FILESDIR}"/${PN}-1.14-CFLAGS.patch |
| 348 |
- "${FILESDIR}"/${PN}-1.14-Makefile.patch |
| 349 |
- "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch |
| 350 |
- # See bugs #662352 |
| 351 |
- "${FILESDIR}"/${PN}-1.14-r3-openssl-curl-x11.patch |
| 352 |
- # bug #672998 |
| 353 |
- "${FILESDIR}"/${PN}-1.14-fix-big-endian.patch |
| 354 |
-) |
| 355 |
- |
| 356 |
-src_prepare() { |
| 357 |
- xdg_src_prepare |
| 358 |
- use hppa && append-cflags -ffunction-sections |
| 359 |
- |
| 360 |
- use javascript || \ |
| 361 |
- sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \ |
| 362 |
- -i include/mupdf/fitz/config.h |
| 363 |
- |
| 364 |
- use vanilla || eapply \ |
| 365 |
- "${FILESDIR}"/${PN}-1.3-zoom-2.patch |
| 366 |
- |
| 367 |
- # See bug #670832 |
| 368 |
- use ssl && use libressl && eapply "${FILESDIR}"/${PN}-1.14-libressl.patch |
| 369 |
- |
| 370 |
- sed -e "1iOS = Linux" \ |
| 371 |
- -e "1iCC = $(tc-getCC)" \ |
| 372 |
- -e "1iLD = $(tc-getLD)" \ |
| 373 |
- -e "1iAR = $(tc-getAR)" \ |
| 374 |
- -e "1iverbose = yes" \ |
| 375 |
- -e "1ibuild = debug" \ |
| 376 |
- -e "1iprefix = ${ED}usr" \ |
| 377 |
- -e "1ilibdir = ${ED}usr/$(get_libdir)" \ |
| 378 |
- -e "1idocdir = ${ED}usr/share/doc/${PF}" \ |
| 379 |
- -i Makerules || die |
| 380 |
-} |
| 381 |
- |
| 382 |
-_emake() { |
| 383 |
- # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings. |
| 384 |
- emake \ |
| 385 |
- GENTOO_PV=${PV} \ |
| 386 |
- HAVE_GLUT=$(usex opengl) \ |
| 387 |
- HAVE_CURL=$(usex curl) \ |
| 388 |
- HAVE_LIBCRYPTO=$(usex ssl) \ |
| 389 |
- HAVE_X11=$(usex X) \ |
| 390 |
- USE_SYSTEM_LIBS=yes \ |
| 391 |
- USE_SYSTEM_MUJS=yes \ |
| 392 |
- HAVE_OBJCOPY=no \ |
| 393 |
- "$@" |
| 394 |
-} |
| 395 |
- |
| 396 |
-src_compile() { |
| 397 |
- _emake XCFLAGS="-fpic" |
| 398 |
- |
| 399 |
- use curl && _emake extra-apps |
| 400 |
- |
| 401 |
- use static-libs && \ |
| 402 |
- _emake build/debug/lib${PN}.a |
| 403 |
-} |
| 404 |
- |
| 405 |
-src_install() { |
| 406 |
- if use X || use opengl ; then |
| 407 |
- domenu platform/debian/${PN}.desktop |
| 408 |
- doicon platform/debian/${PN}.xpm |
| 409 |
- else |
| 410 |
- rm docs/man/${PN}.1 |
| 411 |
- fi |
| 412 |
- |
| 413 |
- _emake install |
| 414 |
- |
| 415 |
- dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so |
| 416 |
- |
| 417 |
- use static-libs && \ |
| 418 |
- dolib.a build/debug/lib${PN}.a |
| 419 |
- if use opengl ; then |
| 420 |
- einfo "mupdf symlink points to mupdf-gl (bug 616654)" |
| 421 |
- dosym ${PN}-gl /usr/bin/${PN} |
| 422 |
- elif use X ; then |
| 423 |
- einfo "mupdf symlink points to mupdf-x11 (bug 616654)" |
| 424 |
- dosym ${PN}-x11 /usr/bin/${PN} |
| 425 |
- fi |
| 426 |
- use curl && dobin build/debug/${PN}-x11-curl |
| 427 |
- insinto /usr/$(get_libdir)/pkgconfig |
| 428 |
- doins platform/debian/${PN}.pc |
| 429 |
- |
| 430 |
- dodoc README CHANGES CONTRIBUTORS |
| 431 |
-} |
| 432 |
|
| 433 |
diff --git a/app-text/mupdf/mupdf-1.15.0.ebuild b/app-text/mupdf/mupdf-1.15.0.ebuild |
| 434 |
deleted file mode 100644 |
| 435 |
index 7d1f75d3ee1..00000000000 |
| 436 |
--- a/app-text/mupdf/mupdf-1.15.0.ebuild |
| 437 |
+++ /dev/null |
| 438 |
@@ -1,130 +0,0 @@ |
| 439 |
-# Copyright 1999-2019 Gentoo Authors |
| 440 |
-# Distributed under the terms of the GNU General Public License v2 |
| 441 |
- |
| 442 |
-EAPI=7 |
| 443 |
- |
| 444 |
-inherit flag-o-matic toolchain-funcs xdg desktop |
| 445 |
- |
| 446 |
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C" |
| 447 |
-HOMEPAGE="https://mupdf.com/" |
| 448 |
-SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz" |
| 449 |
- |
| 450 |
-LICENSE="AGPL-3" |
| 451 |
-SLOT="0/${PV}" |
| 452 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" |
| 453 |
-IUSE="X +javascript libressl opengl ssl static-libs vanilla" |
| 454 |
- |
| 455 |
-# Although we use the bundled, patched version of freeglut in mupdf (because of |
| 456 |
-# bug #653298), the best way to ensure that its dependencies are present is to |
| 457 |
-# install system's freeglut. |
| 458 |
-RDEPEND=" |
| 459 |
- media-libs/freetype:2=[static-libs?] |
| 460 |
- media-libs/harfbuzz:=[static-libs?,truetype] |
| 461 |
- media-libs/jbig2dec:=[static-libs?] |
| 462 |
- media-libs/libpng:0=[static-libs?] |
| 463 |
- >=media-libs/openjpeg-2.1:2=[static-libs?] |
| 464 |
- virtual/jpeg[static-libs?] |
| 465 |
- opengl? ( >=media-libs/freeglut-3.0.0:= ) |
| 466 |
- ssl? ( |
| 467 |
- libressl? ( >=dev-libs/libressl-2.8:0=[static-libs?] ) |
| 468 |
- !libressl? ( >=dev-libs/openssl-1.1:0=[static-libs?] ) |
| 469 |
- ) |
| 470 |
- X? ( |
| 471 |
- x11-libs/libX11[static-libs?] |
| 472 |
- x11-libs/libXext[static-libs?] |
| 473 |
- )" |
| 474 |
-DEPEND="${RDEPEND} |
| 475 |
- virtual/pkgconfig" |
| 476 |
- |
| 477 |
-REQUIRED_USE="opengl? ( !static-libs )" |
| 478 |
- |
| 479 |
-S=${WORKDIR}/${P}-source |
| 480 |
- |
| 481 |
-PATCHES=( |
| 482 |
- "${FILESDIR}"/${PN}-1.15-CFLAGS.patch |
| 483 |
- "${FILESDIR}"/${PN}-1.15-Makefile.patch |
| 484 |
- "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch |
| 485 |
- # See bugs #662352 |
| 486 |
- "${FILESDIR}"/${PN}-1.15-openssl-x11.patch |
| 487 |
-) |
| 488 |
- |
| 489 |
-src_prepare() { |
| 490 |
- xdg_src_prepare |
| 491 |
- use hppa && append-cflags -ffunction-sections |
| 492 |
- |
| 493 |
- use javascript || \ |
| 494 |
- sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \ |
| 495 |
- -i include/mupdf/fitz/config.h |
| 496 |
- |
| 497 |
- use vanilla || eapply \ |
| 498 |
- "${FILESDIR}"/${PN}-1.3-zoom-2.patch |
| 499 |
- |
| 500 |
- # See bug #670832 |
| 501 |
- use ssl && use libressl && eapply "${FILESDIR}"/${PN}-1.14-libressl.patch |
| 502 |
- |
| 503 |
- sed -e "1iOS = Linux" \ |
| 504 |
- -e "1iCC = $(tc-getCC)" \ |
| 505 |
- -e "1iLD = $(tc-getLD)" \ |
| 506 |
- -e "1iAR = $(tc-getAR)" \ |
| 507 |
- -e "1iverbose = yes" \ |
| 508 |
- -e "1ibuild = debug" \ |
| 509 |
- -e "1iprefix = ${ED}/usr" \ |
| 510 |
- -e "1ilibdir = ${ED}/usr/$(get_libdir)" \ |
| 511 |
- -e "1idocdir = ${ED}/usr/share/doc/${PF}" \ |
| 512 |
- -i Makerules || die |
| 513 |
-} |
| 514 |
- |
| 515 |
-_emake() { |
| 516 |
- # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings. |
| 517 |
- |
| 518 |
- # We don't use system's freeglut because upstream has a special modified |
| 519 |
- # version of it that gives mupdf clipboard support. See bug #653298 |
| 520 |
- |
| 521 |
- # As of v1.15.0, mupdf started using symbols in mujs that were not part |
| 522 |
- # of any release. We thus go back to using the bundled version of it. |
| 523 |
- # Bug #685244 |
| 524 |
- emake \ |
| 525 |
- GENTOO_PV=${PV} \ |
| 526 |
- HAVE_GLUT=$(usex opengl) \ |
| 527 |
- HAVE_LIBCRYPTO=$(usex ssl) \ |
| 528 |
- HAVE_X11=$(usex X) \ |
| 529 |
- USE_SYSTEM_LIBS=yes \ |
| 530 |
- USE_SYSTEM_MUJS=no \ |
| 531 |
- USE_SYSTEM_GLUT=no \ |
| 532 |
- HAVE_OBJCOPY=no \ |
| 533 |
- "$@" |
| 534 |
-} |
| 535 |
- |
| 536 |
-src_compile() { |
| 537 |
- _emake XCFLAGS="-fpic" |
| 538 |
- |
| 539 |
- use static-libs && \ |
| 540 |
- _emake build/debug/lib${PN}.a |
| 541 |
-} |
| 542 |
- |
| 543 |
-src_install() { |
| 544 |
- if use X || use opengl ; then |
| 545 |
- domenu platform/debian/${PN}.desktop |
| 546 |
- doicon platform/debian/${PN}.xpm |
| 547 |
- else |
| 548 |
- rm docs/man/${PN}.1 |
| 549 |
- fi |
| 550 |
- |
| 551 |
- _emake install |
| 552 |
- |
| 553 |
- dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so |
| 554 |
- |
| 555 |
- use static-libs && \ |
| 556 |
- dolib.a build/debug/lib${PN}.a |
| 557 |
- if use opengl ; then |
| 558 |
- einfo "mupdf symlink points to mupdf-gl (bug 616654)" |
| 559 |
- dosym ${PN}-gl /usr/bin/${PN} |
| 560 |
- elif use X ; then |
| 561 |
- einfo "mupdf symlink points to mupdf-x11 (bug 616654)" |
| 562 |
- dosym ${PN}-x11 /usr/bin/${PN} |
| 563 |
- fi |
| 564 |
- insinto /usr/$(get_libdir)/pkgconfig |
| 565 |
- doins platform/debian/${PN}.pc |
| 566 |
- |
| 567 |
- dodoc README CHANGES CONTRIBUTORS |
| 568 |
-} |
Archives