diff options
Diffstat (limited to 'app-text/mupdf')
-rw-r--r-- | app-text/mupdf/Manifest | 11 | ||||
-rw-r--r-- | app-text/mupdf/files/mupdf-1.14-CFLAGS.patch | 13 | ||||
-rw-r--r-- | app-text/mupdf/files/mupdf-1.14-Makefile.patch | 46 | ||||
-rw-r--r-- | app-text/mupdf/files/mupdf-1.14-fix-big-endian.patch | 125 | ||||
-rw-r--r-- | app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch | 35 | ||||
-rw-r--r-- | app-text/mupdf/files/mupdf-1.3-zoom-2.patch | 10 | ||||
-rw-r--r-- | app-text/mupdf/mupdf-1.14.0-r3.ebuild | 129 | ||||
-rw-r--r-- | app-text/mupdf/mupdf-1.15.0.ebuild | 130 | ||||
-rw-r--r-- | app-text/mupdf/mupdf-1.16.1.ebuild | 2 |
9 files changed, 2 insertions, 499 deletions
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index 4d8647e403f2..cc4fe4a583f1 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -1,17 +1,8 @@ AUX mupdf-1.10a-add-desktop-pc-xpm-files.patch 13387 BLAKE2B e0100380b328cfd8ce6099c35886a6f2e9508f6d08c678dbc1386e88998d01bdacd160020dc6ceefffbe09f4cf2b64d08acfb76f8535ffcc0dc93c65a3a2da78 SHA512 1d6ccfccf785cca01b1a607e94f90a5e31c748154e9fa7664b9863c7b26951f17a584ffc7cd23dd83d1e547498e22c902067e9695006824017e69d33dbf25a5b -AUX mupdf-1.14-CFLAGS.patch 395 BLAKE2B cc841dc186ac09892789664395bf632a33af3fd1e979e6f23809be0de74181004714b7352d52f3e4414147fe565e73ae9a6fe6b35a6674445e88a3d67ef640c8 SHA512 a5029fca7665e417f16062dcad22e084d6d99cd9ff9a6f1ad853d3ba182c8f565c75469d77edda521f7e777e14a55d4126ddd7631e70290c340d9c7411974c47 -AUX mupdf-1.14-Makefile.patch 1294 BLAKE2B 228ab49a5814e24b0fb1995c5137ce513a303f495973699a370a13a2af17e436ad67ecb47bab739740f7593b71087e167461ff188ef0fe8edf3980450d54984a SHA512 33be7134f8f469a4c72daf59d705de2ed2952ba4ff518ab54f5dc44279d4af8c5d05919bd19d4c6b84085f47f3713a752d678e708aa736e703d2f47d94391b84 -AUX mupdf-1.14-fix-big-endian.patch 4086 BLAKE2B c5104e808a83f122f1c1e80fd57b5aabadc017458e1d2383b09eef457ff6bd8809a42efac01d1f5fdfcbc55789696a2ab62dfd7f6f83150a1016e4c07c4fdfea SHA512 2519b33703976465f1411cad10daebe7646c2830ac385df642b326e82ca608bb4662f824ff98a1cc434994191f222ee02f56b296cac526abaa9e69d5786d50be AUX mupdf-1.14-libressl.patch 1362 BLAKE2B b52ccec0a03d97b357d5329317143595e0cf3029179b91f3d6134f6b59e313ed71063aee97d1192630fb64bd237997b1a56a6a55461b5e434297756e234990ef SHA512 3094d427a7beedc756e47a367423ffe7c8221f9078bd7bef5e8dddba615e918824778cc8118cd656b2dd1d8c235c770631241eb84a46551c96c32906a7986281 -AUX mupdf-1.14-r3-openssl-curl-x11.patch 1256 BLAKE2B 49bfda1f434fbfcf85c7b38b714b3c471d8d4ce02d625a6716582e0a9b3d1d0f623d401a0e9f4fc8ce4a1a6109925199c9c2b188be8739f274804217fb829efb SHA512 387f282fdd2e450585743de7fa297c24685d12c199c801f930da37795c6406aa9ee0bee335c54ca6ccef46726ebf6b49b389753f061542cf7e5381c979e0786d AUX mupdf-1.15-CFLAGS.patch 376 BLAKE2B ace255a4110df9200d627ac68f5950218eeaa993bbd37fa7fe2d676572cad02d50a632750e6a9bdf6269cd97501f709d075a79d7db8b9832909b59b33251b594 SHA512 c00cd5cb30d33a9cbc55557cab3c4e2be1ae86121c5b1b28b6e35f97f93751aa2e96e106f13b7f365a56ebcce8e1c5e4163a440e8c85a48130803f5a7aec63ed AUX mupdf-1.15-Makefile.patch 1189 BLAKE2B 21447e2fd8ca7c396b9b2bd5e1e70ac6ebff5dc8dcbde273e0b23e17281cf2fe16f7a53587f9b0a3b2af1837f3ed5fc4a19666a4cdfa5d491e8b9be71519e1a8 SHA512 6c696b5a522116d075ee1a4759cdf3cae2e8836315f2898a51c15e227d4d57b44095a9927e7d66ab7d522ba6e0c65eed10a379d9e80b791ee8b6022933f615ab AUX mupdf-1.15-openssl-x11.patch 735 BLAKE2B 03e53970a145db913bad9c03de899ffeb7eed3abfad4d3db15819d5e101ba03e376fc0faea9c4939b7167b276fffe022975bae2e99238d5b4bee92edfb924fd5 SHA512 028930d5e6c86a9052de6e1e0f3e937d89a3f22e10b7fb71f1dba998c480c9914520e4248c21d68291c6fd7684c627b5068c1bb2e027ff6a518d1ca5533eb677 -AUX mupdf-1.3-zoom-2.patch 214 BLAKE2B b9d15ecf6978c4f5c865be0b913448a25852b4a768f8be99b8feb68b1511b203cd22cb7020ccb6447d31082d02a9f3ee80e3ac0153408f3b36db2bdfb68c9f6b SHA512 95bb2d68246dc22eb0fb6e8a312c0f02476f356ee219c417dfa06473b5944d9e63ae6778cd967c70e60fb933eee1aac337efd2476b0bc791df1c69f7b7b822b3 -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 -EBUILD mupdf-1.14.0-r3.ebuild 3229 BLAKE2B cea1f272cbf41f3fd1bf7b576124cb279e0f6cd9aa52c3ced218c09d77f6f1968bce066288afba74666d6bbe20cdf61958f5b721ed347b1667811900fb852069 SHA512 292695fe366b7f1688b90841d7d1cf5cf11a4d56ad0b6ea8fb3b87bde92c6a21183d42a1ae0baf4ef017d748be6d3a31d3616daa22ca17f797ac86ffa994fbb1 -EBUILD mupdf-1.15.0.ebuild 3505 BLAKE2B be357aae0944fda68a0e95cf12e2936ec94428d5baa645399add9f87ca5127de85898f22fb56762d7fb88d6ed3e61874723f7668fb9c4a2ac942585e3ddbde6f SHA512 41209dd40db318acaa224a031672fb9281dd674a6803b789da1cd673ab18af08c4fcdd2f5d82ccc5076026fec056986d2b67f1adc4b4cf3a7a0aca56787d7b75 -EBUILD mupdf-1.16.1.ebuild 3424 BLAKE2B ad93a4bff578984a1bde0c9cdbd4984e9ff1c574eff56a824d13b17a0fa20d51db23e1a1a38c7f9c59233ebf7ad723c4a9ff4ecd53b13f011f27f5cd47b78c3d SHA512 49238caf871ca374e4e6efb96311632fbe487edd49db4a3cea8074be7a701c07314b42e866379b8df1ebdd7baa30bd8cae03affeb853df528c48685552c61746 +EBUILD mupdf-1.16.1.ebuild 3423 BLAKE2B 617b555931b62636135ca23945b18970063b735ad2dc25b79e0b22600bfc21bacac94ad3a729fa41506246a9d8ab5189911664494370d76812b43639ced8df2c SHA512 fe78c972cca044632fed80a591d101e9ab42e3faabc190ce68fb564ec3b725b8a155030670b6c652c954a9d23db232f8a453ee57025d94ff859ac0f7e25167e8 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 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 90972e8c53ea..000000000000 --- 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 a8c4ef770dce..000000000000 --- 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 dc472153ca6b..000000000000 --- a/app-text/mupdf/files/mupdf-1.14-fix-big-endian.patch +++ /dev/null @@ -1,125 +0,0 @@ -vdupras note: exact same patch as in -https://bugs.ghostscript.com/show_bug.cgi?id=699395 except for tweaked -diff paths. -From 5fb79e6ccb805b3d94c8bb8eb0990d9944ae7602 Mon Sep 17 00:00:00 2001 -Message-Id: <5fb79e6ccb805b3d94c8bb8eb0990d9944ae7602.1528041417.git.mjg@fedoraproject.org> -From: Michael J Gruber <mjg@fedoraproject.org> -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 <mjg@fedoraproject.org> ---- - src/cmsmd5.c | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -diff --git a/src/cmsmd5.c b/src/cmsmd5.c -index 4b8f7f9..dd0925a 100644 ---- a/thirdparty/lcms2/src/cmsmd5.c -+++ b/thirdparty/lcms2/src/cmsmd5.c -@@ -29,7 +29,7 @@ - #ifdef CMS_USE_BIG_ENDIAN - - static --void byteReverse(cmsUInt8Number * buf, cmsUInt32Number longs) -+void byteReverse(cmsContext ContextID, cmsUInt8Number * buf, cmsUInt32Number longs) - { - do { - -@@ -42,7 +42,7 @@ void byteReverse(cmsUInt8Number * buf, cmsUInt32Number longs) - } - - #else --#define byteReverse(buf, len) -+#define byteReverse(ContextID, buf, len) - #endif - - -@@ -172,7 +172,7 @@ cmsHANDLE MD5alloc(cmsContext ContextID) - - - static --void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len) -+void MD5add(cmsContext ContextID, cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len) - { - _cmsMD5* ctx = (_cmsMD5*) Handle; - cmsUInt32Number t; -@@ -196,7 +196,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len) - } - - memmove(p, buf, t); -- byteReverse(ctx->in, 16); -+ byteReverse(ContextID, ctx->in, 16); - - MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in); - buf += t; -@@ -205,7 +205,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len) - - while (len >= 64) { - memmove(ctx->in, buf, 64); -- byteReverse(ctx->in, 16); -+ byteReverse(ContextID, ctx->in, 16); - MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in); - buf += 64; - len -= 64; -@@ -216,7 +216,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len) - - // Destroy the object and return the checksum - static --void MD5finish(cmsProfileID* ProfileID, cmsHANDLE Handle) -+void MD5finish(cmsContext ContextID, cmsProfileID* ProfileID, cmsHANDLE Handle) - { - _cmsMD5* ctx = (_cmsMD5*) Handle; - cmsUInt32Number count; -@@ -232,21 +232,21 @@ void MD5finish(cmsProfileID* ProfileID, cmsHANDLE Handle) - if (count < 8) { - - memset(p, 0, count); -- byteReverse(ctx->in, 16); -+ byteReverse(ContextID, ctx->in, 16); - MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in); - - memset(ctx->in, 0, 56); - } else { - memset(p, 0, count - 8); - } -- byteReverse(ctx->in, 14); -+ byteReverse(ContextID, ctx->in, 14); - - ((cmsUInt32Number *) ctx->in)[14] = ctx->bits[0]; - ((cmsUInt32Number *) ctx->in)[15] = ctx->bits[1]; - - MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in); - -- byteReverse((cmsUInt8Number *) ctx->buf, 4); -+ byteReverse(ContextID, (cmsUInt8Number *) ctx->buf, 4); - memmove(ProfileID ->ID8, ctx->buf, 16); - - _cmsFree(ctx ->ContextID, ctx); -@@ -291,7 +291,7 @@ cmsBool CMSEXPORT cmsMD5computeID(cmsContext ContextID, cmsHPROFILE hProfile) - if (MD5 == NULL) goto Error; - - // Add all bytes -- MD5add(MD5, Mem, BytesNeeded); -+ MD5add(ContextID,MD5, Mem, BytesNeeded); - - // Temp storage is no longer needed - _cmsFree(ContextID, Mem); -@@ -300,7 +300,7 @@ cmsBool CMSEXPORT cmsMD5computeID(cmsContext ContextID, cmsHPROFILE hProfile) - memmove(Icc, &Keep, sizeof(_cmsICCPROFILE)); - - // And store the ID -- MD5finish(&Icc ->ProfileID, MD5); -+ MD5finish(ContextID, &Icc ->ProfileID, MD5); - return TRUE; - - Error: --- -2.18.0.rc0.294.g786209a621 - 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 deleted file mode 100644 index 79efe32c0e41..000000000000 --- a/app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch +++ /dev/null @@ -1,35 +0,0 @@ -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/files/mupdf-1.3-zoom-2.patch b/app-text/mupdf/files/mupdf-1.3-zoom-2.patch deleted file mode 100644 index 353912450236..000000000000 --- a/app-text/mupdf/files/mupdf-1.3-zoom-2.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- mupdf-1.3/platform/x11/pdfapp.c -+++ mupdf-1.3/platform/x11/pdfapp.c -@@ -866,6 +867,7 @@ - break; - - case ' ': -+ case 'F': - panto = DONT_PAN; - if (app->numberlen > 0) - app->pageno += atoi(app->number); diff --git a/app-text/mupdf/mupdf-1.14.0-r3.ebuild b/app-text/mupdf/mupdf-1.14.0-r3.ebuild deleted file mode 100644 index fca81cfa02fd..000000000000 --- a/app-text/mupdf/mupdf-1.14.0-r3.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# 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 ~ppc-macos ~x64-macos ~x86-macos" -IUSE="X curl +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?] - media-libs/libpng:0=[static-libs?] - >=media-libs/openjpeg-2.1:2=[static-libs?] - virtual/jpeg[static-libs?] - curl? ( net-misc/curl[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 ) - curl? ( X )" - -S=${WORKDIR}/${P}-source - -PATCHES=( - "${FILESDIR}"/${PN}-1.14-CFLAGS.patch - "${FILESDIR}"/${PN}-1.14-Makefile.patch - "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch - # See bugs #662352 - "${FILESDIR}"/${PN}-1.14-r3-openssl-curl-x11.patch - # bug #672998 - "${FILESDIR}"/${PN}-1.14-fix-big-endian.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 - - use vanilla || eapply \ - "${FILESDIR}"/${PN}-1.3-zoom-2.patch - - # 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. - emake \ - GENTOO_PV=${PV} \ - HAVE_GLUT=$(usex opengl) \ - HAVE_CURL=$(usex curl) \ - HAVE_LIBCRYPTO=$(usex ssl) \ - HAVE_X11=$(usex X) \ - USE_SYSTEM_LIBS=yes \ - USE_SYSTEM_MUJS=yes \ - HAVE_OBJCOPY=no \ - "$@" -} - -src_compile() { - _emake XCFLAGS="-fpic" - - use curl && _emake extra-apps - - use static-libs && \ - _emake build/debug/lib${PN}.a -} - -src_install() { - if use X || use opengl ; then - domenu platform/debian/${PN}.desktop - doicon platform/debian/${PN}.xpm - else - rm docs/man/${PN}.1 - fi - - _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 - einfo "mupdf symlink points to mupdf-gl (bug 616654)" - dosym ${PN}-gl /usr/bin/${PN} - elif use X ; then - einfo "mupdf symlink points to mupdf-x11 (bug 616654)" - dosym ${PN}-x11 /usr/bin/${PN} - fi - use curl && dobin build/debug/${PN}-x11-curl - insinto /usr/$(get_libdir)/pkgconfig - doins platform/debian/${PN}.pc - - dodoc README CHANGES CONTRIBUTORS -} diff --git a/app-text/mupdf/mupdf-1.15.0.ebuild b/app-text/mupdf/mupdf-1.15.0.ebuild deleted file mode 100644 index 7d1f75d3ee14..000000000000 --- a/app-text/mupdf/mupdf-1.15.0.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# 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 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] - 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 - - use vanilla || eapply \ - "${FILESDIR}"/${PN}-1.3-zoom-2.patch - - # 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) \ - HAVE_LIBCRYPTO=$(usex ssl) \ - HAVE_X11=$(usex X) \ - USE_SYSTEM_LIBS=yes \ - USE_SYSTEM_MUJS=no \ - USE_SYSTEM_GLUT=no \ - HAVE_OBJCOPY=no \ - "$@" -} - -src_compile() { - _emake XCFLAGS="-fpic" - - use static-libs && \ - _emake build/debug/lib${PN}.a -} - -src_install() { - if use X || use opengl ; then - domenu platform/debian/${PN}.desktop - doicon platform/debian/${PN}.xpm - else - rm docs/man/${PN}.1 - fi - - _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 - einfo "mupdf symlink points to mupdf-gl (bug 616654)" - dosym ${PN}-gl /usr/bin/${PN} - elif use X ; then - einfo "mupdf symlink points to mupdf-x11 (bug 616654)" - dosym ${PN}-x11 /usr/bin/${PN} - fi - insinto /usr/$(get_libdir)/pkgconfig - doins platform/debian/${PN}.pc - - dodoc README CHANGES CONTRIBUTORS -} diff --git a/app-text/mupdf/mupdf-1.16.1.ebuild b/app-text/mupdf/mupdf-1.16.1.ebuild index 80ab08f54cbf..117de7bc1999 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 |