* [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/
@ 2015-08-11 10:29 Michael Weber
0 siblings, 0 replies; 20+ messages in thread
From: Michael Weber @ 2015-08-11 10:29 UTC (permalink / raw
To: gentoo-commits
commit: def69cb127cae7323d42f05fa9f348112850b6b0
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 10:26:28 2015 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 10:26:28 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=def69cb1
app-text/mupdf: drop old.
Package-Manager: portage-2.2.20
app-text/mupdf/Manifest | 4 -
app-text/mupdf/files/mupdf-1.0-zoom.patch | 18 -
.../files/mupdf-1.1_p20121127-buildsystem.patch | 24 -
.../mupdf-1.1_p20121127-desktop-integration.patch | 20 -
.../mupdf/files/mupdf-1.1_rc1-buildsystem.patch | 22 -
app-text/mupdf/files/mupdf-1.1_rc1-zoom-2.patch | 10 -
.../mupdf/files/mupdf-1.2-mubusy_rename_fix.patch | 13 -
app-text/mupdf/files/mupdf-1.2-pkg-config.patch | 17 -
app-text/mupdf/files/mupdf-1.3-forward_back.patch | 25 -
app-text/mupdf/files/mupdf-1.3-openjpeg2.patch | 15 -
app-text/mupdf/files/mupdf-1.3-sys_curl.patch | 11 -
.../mupdf/files/mupdf-1.4-old-debian-files.patch | 533 ---------------------
app-text/mupdf/mupdf-1.1_p20121127.ebuild | 61 ---
app-text/mupdf/mupdf-1.2.ebuild | 117 -----
app-text/mupdf/mupdf-1.3_p20140118.ebuild | 124 -----
app-text/mupdf/mupdf-1.4-r1.ebuild | 122 -----
16 files changed, 1136 deletions(-)
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 9fd4b83..73cb5f2 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,7 +1,3 @@
-DIST mupdf-1.1_p20121127.tar.gz 6922632 SHA256 4594bc0473e61200e6d2aba06488ea3127a7d42cd70daa01ea12c3dba5eb654c SHA512 1dff76502a5cf13e26f0bed30046878334730912ddec12f2674de69f62b173182020566f1ddd341bf3a51b28af1334c0cfcc70cac0ac8b0fb1dceacae6b25418 WHIRLPOOL 1597b87b7c53e522a5929b8c0c5c07b0a957084fb4b6974d68feea755d88606930b8a78b998efb94190c00d3d9135a60652f2751c709d49315ae10e30dc9ee0e
-DIST mupdf-1.2-source.zip 13808821 SHA256 9bc9e31ec27c091dad37f70940bd799e46ab6da4299bc58e803bff3dbb07dc3b SHA512 49261c5356d4e5648f89bfb783a23a3c3a470e044fe3b234f0906b0f6b71efad557981682e41ce3d754a5a31f1e5518e5e5f5f8dc83d2ca53181dbd3f4726e02 WHIRLPOOL 86fb60a2ac94c8ca4495c0891dd2b43ea49c9e212e2961f02914a3aaa5685566201f561c196da7d4c568dcec938eea8676959bbec839e33a7bff4e6410cc1a25
-DIST mupdf-1.3_p20140118.tar.gz 7448663 SHA256 ed1791966a60be0d8556cf5e0def0e3093867223f0eb4f12fbffd22804520882 SHA512 c159f58539f1e944608ff7da8f41cef5e955de2f21ab1e37a6fad5577134094186a8b8b7ecdf47a427547e3fde7f04f2d484da6709adf3859c3754e2774b6a56 WHIRLPOOL b24bbbd49921edcea93a80a597bb0139937ac1ef365ae63f83cf7df878586ed2a9ecbef65645b9562627fa2bc2a662991a1af1ffd99e10f10a351bccb951eebe
-DIST mupdf-1.4.tar.gz 7470075 SHA256 ccac5ad1129f051dbaecbeec01b85f548c8bdb1c97b5e1dd397299bf7f988438 SHA512 6de95fa02e3ebaf2f268765df7eb4c1b53ef0b3b39b57b8e64097c429727dd483894e3a62c520151197290a8e392b9b1746109fc3eb528b44245040acc82a25e WHIRLPOOL a43ab9bbaf5cd5e40445ace3fdeb9e0b57e4924c7e9a7669899275da2c8a41725d862fb1cd85d779852ec794be8184b7d21aaee932024d7d0557e076de6611a4
DIST mupdf-1.5.tar.gz 7485699 SHA256 946393c7abf78e50fa9815f18a9e91f275a1a96a7ea14ae39b5237944070d1f5 SHA512 bfb79838eba629295ab164cf37e49edc8846689598fbad9312409535022a2e747bd062718b899909564c6cf5826fb46a2b4b579ced8c7a3896d6098e7e5ccf40 WHIRLPOOL ebcaf5f677984a78aecf9eeb72e7a79e6e2a6388db5024427d8bf55f31b3690844dd291ada3cd578a5bb9a370ea21cb2a044656c21a0ef47cdf7bfc42c842beb
DIST mupdf-1.6.tar.gz 8188199 SHA256 ac6f64d5c287b6549d3c26af8fa298c91697f10ebe52b122ba2c1f43e5ccfa52 SHA512 cda47ef4442bb7de15fc54b87e0e819f80c56c144318b9e953bc36c3da0bb331a10f44016bc89986c317828b7043e737a89556fc51158114b1da58cd8f7977c7 WHIRLPOOL ea14db6f43a70df144f3f70c3421ac7d2096d835fa222f0d5b9c6d64214f5c9156884b6660dda7e1fd2bee83fa9ce66ca25b2f6290ba1588fc55035ad6228413
DIST mupdf-1.7.tar.gz 7342238 SHA256 9c79ef0ad3343f8feed8aabfaaad6ba7cbdb3e3398aa380ed505ed71086d0fbc SHA512 f4c438019285731e5c8bb6f1f9c46ae20b9fd5f720034ab40d4e31ed4b2dd9cd704c45f1b25f68d46c1ed0a9c76d16b01fb26b83aa372497f924a763f9676044 WHIRLPOOL 3674a0144fa44c618380f06cba5093016fa6f0aa37ef6cc32e582e4f0a94cedb2e320db0f42007d6096650d42cbc2cc28716adf3371f214728c01332d4120462
diff --git a/app-text/mupdf/files/mupdf-1.0-zoom.patch b/app-text/mupdf/files/mupdf-1.0-zoom.patch
deleted file mode 100644
index 8f976b9..0000000
--- a/app-text/mupdf/files/mupdf-1.0-zoom.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- mupdf-9999/apps/pdfapp.c
-+++ mupdf-9999/apps/pdfapp.c
-@@ -858,6 +858,7 @@
- break;
-
- case 'b':
-+ case '\b': //backspace
- panto = DONT_PAN;
- if (app->numberlen > 0)
- app->pageno -= atoi(app->number);
-@@ -866,6 +867,7 @@
- break;
-
- case ' ':
-+ case 'F':
- panto = DONT_PAN;
- if (app->numberlen > 0)
- app->pageno += atoi(app->number);
diff --git a/app-text/mupdf/files/mupdf-1.1_p20121127-buildsystem.patch b/app-text/mupdf/files/mupdf-1.1_p20121127-buildsystem.patch
deleted file mode 100644
index d151874..0000000
--- a/app-text/mupdf/files/mupdf-1.1_p20121127-buildsystem.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- mupdf-1.0-source/Makerules
-+++ mupdf-1.0-source/Makerules
-@@ -6,7 +6,7 @@
- CFLAGS += -Wall
-
- ifeq "$(build)" "debug"
--CFLAGS += -pipe -g -DDEBUG
-+CFLAGS += -DDEBUG
- else ifeq "$(build)" "profile"
- CFLAGS += -pipe -O2 -DNDEBUG -pg
- LDFLAGS += -pg
-@@ -21,9 +21,9 @@
- endif
-
- ifeq "$(OS)" "Linux"
--SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
--SYS_OPENJPEG_INC := `pkg-config --cflags libopenjpeg`
--X11_LIBS := -lX11 -lXext
-+SYS_FREETYPE_INC := $(shell pkg-config --cflags freetype2)
-+SYS_OPENJPEG_INC := $(shell pkg-config --cflags libopenjpeg)
-+X11_LIBS := $(shell pkg-config --libs x11 xext)
- endif
-
- ifeq "$(OS)" "FreeBSD"
diff --git a/app-text/mupdf/files/mupdf-1.1_p20121127-desktop-integration.patch b/app-text/mupdf/files/mupdf-1.1_p20121127-desktop-integration.patch
deleted file mode 100644
index e666197..0000000
--- a/app-text/mupdf/files/mupdf-1.1_p20121127-desktop-integration.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mupdf-1.1/debian/mupdf.desktop
-+++ mupdf-1.1/debian/mupdf.desktop
-@@ -1,8 +1,6 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=MuPDF
- GenericName=PDF file viewer
--Comment=PDF file viewer
- Exec=mupdf %f
- TryExec=mupdf
- Icon=mupdf
-@@ -10,6 +8,8 @@
- Type=Application
- MimeType=application/pdf;application/x-pdf;
- Categories=Viewer;Graphics;
-+Actions=View;
-
- [Desktop Action View]
-+Name=View with mupdf
- Exec=mupdf %f
diff --git a/app-text/mupdf/files/mupdf-1.1_rc1-buildsystem.patch b/app-text/mupdf/files/mupdf-1.1_rc1-buildsystem.patch
deleted file mode 100644
index fc7572e..0000000
--- a/app-text/mupdf/files/mupdf-1.1_rc1-buildsystem.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- mupdf-1.0-source/Makerules
-+++ mupdf-1.0-source/Makerules
-@@ -6,7 +6,7 @@
- CFLAGS += -Wall
-
- ifeq "$(build)" "debug"
--CFLAGS += -pipe -g -DDEBUG
-+CFLAGS += -DDEBUG
- else ifeq "$(build)" "profile"
- CFLAGS += -pipe -O2 -DNDEBUG -pg
- LDFLAGS += -pg
-@@ -21,8 +21,8 @@
- endif
-
- ifeq "$(OS)" "Linux"
--SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
--X11_LIBS := -lX11 -lXext
-+SYS_FREETYPE_INC := $(shell pkg-config --cflags freetype2)
-+X11_LIBS := $(shell pkg-config --libs x11 xext)
- endif
-
- ifeq "$(OS)" "FreeBSD"
diff --git a/app-text/mupdf/files/mupdf-1.1_rc1-zoom-2.patch b/app-text/mupdf/files/mupdf-1.1_rc1-zoom-2.patch
deleted file mode 100644
index c62122e..0000000
--- a/app-text/mupdf/files/mupdf-1.1_rc1-zoom-2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mupdf-9999/apps/pdfapp.c
-+++ mupdf-9999/apps/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/files/mupdf-1.2-mubusy_rename_fix.patch b/app-text/mupdf/files/mupdf-1.2-mubusy_rename_fix.patch
deleted file mode 100644
index 7ac486b..0000000
--- a/app-text/mupdf/files/mupdf-1.2-mubusy_rename_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-should be upstream, but not included here http://bugs.ghostscript.com/show_bug.cgi?id=693595#c1
-
---- mupdf-1.2-source/Makefile
-+++ mupdf-1.2-source/Makefile
-@@ -212,7 +212,7 @@
- install -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(incdir) $(DESTDIR)$(mandir)/man1
- install $(FITZ_LIB) $(DESTDIR)$(libdir)
- install fitz/memento.h fitz/fitz.h pdf/mupdf.h xps/muxps.h cbz/mucbz.h $(DESTDIR)$(incdir)
-- install $(MUVIEW) $(MUDRAW) $(MUBUSY) $(DESTDIR)$(bindir)
-+ install $(MUVIEW) $(MUDRAW) $(MUTOOL) $(DESTDIR)$(bindir)
- install $(wildcard apps/man/*.1) $(DESTDIR)$(mandir)/man1
-
- # --- Clean and Default ---
diff --git a/app-text/mupdf/files/mupdf-1.2-pkg-config.patch b/app-text/mupdf/files/mupdf-1.2-pkg-config.patch
deleted file mode 100644
index 2505a73..0000000
--- a/app-text/mupdf/files/mupdf-1.2-pkg-config.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-no pkgconfig data for jbig2dec and jpeg
-http://bugs.ghostscript.com/show_bug.cgi?id=694301
-
---- mupdf-1.2-source/debian/mupdf.pc
-+++ mupdf-1.2-source/debian/mupdf.pc
-@@ -4,9 +4,8 @@
- includedir=${prefix}/include
-
- Name: mupdf
- Description: Library for rendering PDF documents
--Requires.private: freetype2
-+Requires: freetype2 libopenjpeg1
- Version: 0.5.0
--Libs: -L${libdir} -lmupdf
-+Libs: -L${libdir} -lfitz -ljpeg -ljbig2dec
--Libs.private: -lopenjpeg -ljbig2dec -ljpeg -lz -lm
- Cflags: -I${includedir}
diff --git a/app-text/mupdf/files/mupdf-1.3-forward_back.patch b/app-text/mupdf/files/mupdf-1.3-forward_back.patch
deleted file mode 100644
index aafe35a..0000000
--- a/app-text/mupdf/files/mupdf-1.3-forward_back.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Add F86XK_Forward and XF86XK_Back for page switch by muhpdf@binkmail.com
-on http://bugs.ghostscript.com/show_bug.cgi?id=693494
-
---- mupdf-1.3/platform/x11/x11_main.c
-+++ mupdf-1.3/platform/x11/x11_main.c
-@@ -5,6 +5,7 @@
- #include <X11/Xatom.h>
- #include <X11/cursorfont.h>
- #include <X11/keysym.h>
-+#include <X11/XF86keysym.h>
-
- #include <sys/select.h>
- #include <sys/time.h>
-@@ -836,9 +837,11 @@
- break;
-
- case XK_Page_Up:
-+ case XF86XK_Back:
- len = 1; buf[0] = ',';
- break;
- case XK_Page_Down:
-+ case XF86XK_Forward:
- len = 1; buf[0] = '.';
- break;
- }
diff --git a/app-text/mupdf/files/mupdf-1.3-openjpeg2.patch b/app-text/mupdf/files/mupdf-1.3-openjpeg2.patch
deleted file mode 100644
index 789e442..0000000
--- a/app-text/mupdf/files/mupdf-1.3-openjpeg2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.ghostscript.com/show_bug.cgi?id=693518
-
---- mupdf-1.3/Makerules
-+++ mupdf-1.3/Makerules
-@@ -52,8 +52,8 @@
-
- SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2)
- SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2)
--SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjpeg1)
--SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjpeg1)
-+SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjp2)
-+SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjp2)
- SYS_JBIG2DEC_LIBS = -ljbig2dec
- SYS_JPEG_LIBS = -ljpeg
- SYS_ZLIB_LIBS = -lz
diff --git a/app-text/mupdf/files/mupdf-1.3-sys_curl.patch b/app-text/mupdf/files/mupdf-1.3-sys_curl.patch
deleted file mode 100644
index a388c0a..0000000
--- a/app-text/mupdf/files/mupdf-1.3-sys_curl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mupdf-1.3/Makerules
-+++ mupdf-1.3/Makerules
-@@ -63,6 +63,8 @@
- SYS_JBIG2DEC_LIBS = -ljbig2dec
- SYS_JPEG_LIBS = -ljpeg
- SYS_ZLIB_LIBS = -lz
-+SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl)
-+SYS_CURL_LIBS = $(shell pkg-config --libs libcurl) -lpthread
-
- endif
-
diff --git a/app-text/mupdf/files/mupdf-1.4-old-debian-files.patch b/app-text/mupdf/files/mupdf-1.4-old-debian-files.patch
deleted file mode 100644
index cd688cf..0000000
--- a/app-text/mupdf/files/mupdf-1.4-old-debian-files.patch
+++ /dev/null
@@ -1,533 +0,0 @@
---- /dev/null
-+++ platform/debian/mupdf.desktop
-@@ -0,0 +1,15 @@
-+[Desktop Entry]
-+Name=MuPDF
-+GenericName=PDF file viewer
-+Exec=mupdf-select-file %f
-+TryExec=mupdf-select-file
-+Icon=mupdf
-+Terminal=false
-+Type=Application
-+MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;image/jpeg;image/pjpeg;image/png;image/tiff;image/x-tiff
-+Categories=Viewer;Graphics;
-+Actions=View
-+
-+[Desktop Action View]
-+Name=View with mupdf
-+Exec=mupdf %f
---- /dev/null
-+++ platform/debian/mupdf.pc
-@@ -0,0 +1,12 @@
-+prefix=/usr
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/lib
-+includedir=${prefix}/include
-+
-+Name: mupdf
-+Description: Library for rendering PDF documents
-+Requires.private: freetype2
-+Version: 0.5.0
-+Libs: -L${libdir} -lmupdf
-+Libs.private: -lopenjpeg -ljbig2dec -ljpeg -lz -lm
-+Cflags: -I${includedir}
---- /dev/null
-+++ platform/debian/mupdf.xpm
-@@ -0,0 +1,497 @@
-+/* XPM */
-+static char *mupdf[] = {
-+/* width height ncolors chars_per_pixel */
-+"48 48 442 2",
-+/* colors */
-+" c #000000",
-+" . c #2E4558",
-+" X c #252121",
-+" o c #AFAFAF",
-+" O c #28313B",
-+" + c #231F1F",
-+" @ c #686666",
-+" # c #98BDD7",
-+" $ c #201B1C",
-+" % c #7CABCC",
-+" & c #4487B6",
-+" * c #DFDEDE",
-+" = c #4285B4",
-+" - c #615E5F",
-+" ; c #605E5E",
-+" : c #23262C",
-+" > c #D9D8D8",
-+" , c #F7FAFC",
-+" < c #D7D6D6",
-+" 1 c #BFD6E6",
-+" 2 c #6BA0C5",
-+" 3 c #232122",
-+" 4 c #555253",
-+" 5 c #CDCCCC",
-+" 6 c #E7EFF6",
-+" 7 c #4786B2",
-+" 8 c #CADDEA",
-+" 9 c #4085B5",
-+" 0 c #AECBDF",
-+" q c #CBCACA",
-+" w c #92B9D4",
-+" e c #365F7D",
-+" r c #5A95BE",
-+" t c #3E83B3",
-+" y c #304B60",
-+" u c #C7C6C6",
-+" i c #4D8EBB",
-+" p c #F1F6F9",
-+" a c #C1C0C0",
-+" s c #454243",
-+" d c #669CC3",
-+" f c #81AECD",
-+" g c #7A7777",
-+" h c #434041",
-+" j c #3E779F",
-+" k c #272E36",
-+" l c #413E3F",
-+" z c #3F3C3D",
-+" x c #5895BF",
-+" c c #3D3A3B",
-+" v c #C6DBE9",
-+" b c #B8B6B7",
-+" n c #4282B0",
-+" m c #FDFDFE",
-+" M c #B7B6B6",
-+" N c #8DB5D2",
-+" B c #242529",
-+" V c #B3B2B2",
-+" C c #222327",
-+" Z c #B0AEAF",
-+" A c #EDF4F8",
-+" S c #686565",
-+" D c #488AB9",
-+" F c #9ABED8",
-+" G c #7EACCD",
-+" H c #ECF2F7",
-+" J c #211C1C",
-+" K c #666363",
-+" L c #F1F1F2",
-+" P c #ABAAAA",
-+" I c #4588B6",
-+" U c #A9A8A8",
-+" Y c #2D2A2B",
-+" T c #A7A6A6",
-+" R c #615D5E",
-+" E c #2B2829",
-+" W c #8DB7D5",
-+" Q c #F9FBFD",
-+" ! c #DDE9F2",
-+" ~ c #F8FBFC",
-+" ^ c #DCE9F1",
-+" / c #A5C5DC",
-+" ( c #89B3D1",
-+" ) c #5C5959",
-+" _ c #A4C5DB",
-+" ` c #335A76",
-+" ' c #518FBB",
-+" ] c #E6E7E7",
-+" [ c #5A5757",
-+" { c #232021",
-+" } c #33536C",
-+" | c #98BED9",
-+". c #E0E1E1",
-+".. c #7CACCE",
-+".X c #4488B8",
-+".o c #2D3F4F",
-+".O c #999898",
-+".+ c #4388B7",
-+".@ c #5E98C1",
-+".# c #CDCDCB",
-+".$ c #524F4F",
-+".% c #B0CCE0",
-+".& c #979696",
-+".* c #78A8CA",
-+".= c #5C96BF",
-+".- c #969495",
-+".; c #4084B4",
-+".: c #252930",
-+".> c #949293",
-+"., c #929091",
-+".< c #417FAB",
-+".1 c #4F8FBC",
-+".2 c #F3F7FA",
-+".3 c #D3D3D4",
-+".4 c #D7E5EF",
-+".5 c #222023",
-+".6 c #9FC1D9",
-+".7 c #679DC3",
-+".8 c #37678A",
-+".9 c #4B8BB8",
-+".0 c #3E769E",
-+".q c #3C749C",
-+".w c #403D3D",
-+".e c #92BAD6",
-+".r c #C8DCEA",
-+".t c #FEFEFE",
-+".y c #3D393A",
-+".u c #3B3738",
-+".i c #355974",
-+".p c #353132",
-+".a c #7A7879",
-+".s c #498BB9",
-+".d c #9BBFD8",
-+".f c #4E8AB4",
-+".g c #787677",
-+".h c #F2F2F2",
-+".j c #F0F0F0",
-+".k c #2F2B2C",
-+".l c #EEEEEE",
-+".z c #727071",
-+".x c #26282D",
-+".c c #ECECEC",
-+".v c #2B2728",
-+".b c #FAFCFD",
-+".n c #EAEAEA",
-+".m c #DEEAF2",
-+".M c #E9EAE9",
-+".N c #C2D8E7",
-+".B c #6E6C6D",
-+".V c #5390BC",
-+".C c #E8E8E8",
-+".Z c #6EA2C6",
-+".A c #272324",
-+".S c #E7E6E7",
-+".D c #E6E6E6",
-+".F c #252122",
-+".G c #29333D",
-+".H c #E4E4E4",
-+".J c #3F7AA5",
-+".K c #231F20",
-+".L c #E2E2E2",
-+".P c #211D1E",
-+".I c #E0E0E0",
-+".U c #EAF1F7",
-+".Y c #6099C2",
-+".T c #1F1B1C",
-+".R c #E9F1F6",
-+".E c #CDDFEB",
-+".W c #4387B6",
-+".Q c #96BBD6",
-+".! c #B1CDE0",
-+".~ c #DEDEDE",
-+".^ c #79A9CA",
-+"./ c #4285B5",
-+".( c #272A31",
-+".) c #5D97BF",
-+"._ c #4185B4",
-+".` c #DCDCDC",
-+".' c #959393",
-+".] c #DADADA",
-+".[ c #314B5F",
-+".{ c #D8D8D8",
-+".} c #D7D8D7",
-+".| c #D6D6D6",
-+"X c #F5F8FB",
-+"X. c #D4D4D4",
-+"XX c #6AA0C5",
-+"Xo c #BDD4E5",
-+"XO c #3A6A8C",
-+"X+ c #232123",
-+"X@ c #D3D4D3",
-+"X# c #D2D2D2",
-+"X$ c #D0D0D0",
-+"X% c #CECECE",
-+"X& c #CCCCCC",
-+"X* c #CADDEB",
-+"X= c #37617F",
-+"X- c #242A31",
-+"X; c #CACACA",
-+"X: c #C8DBE9",
-+"X> c #90B7D3",
-+"X, c #817F7F",
-+"X< c #3F7EAB",
-+"X1 c #548FB9",
-+"X2 c #355873",
-+"X3 c #7D7B7B",
-+"X4 c #C2C2C2",
-+"X5 c #4B8CBA",
-+"X6 c #C0C0C0",
-+"X7 c #D4E4EE",
-+"X8 c #81AECE",
-+"X9 c #659CC3",
-+"X0 c #787576",
-+"Xq c #4788B6",
-+"Xw c #252C35",
-+"Xe c #757373",
-+"Xr c #BABABA",
-+"Xt c #FCFDFE",
-+"Xy c #B6B6B6",
-+"Xu c #C4D9E8",
-+"Xi c #706D6E",
-+"Xp c #8CB5D2",
-+"Xa c #70A3C7",
-+"Xs c #8BB5D1",
-+"Xd c #5491BC",
-+"Xf c #5391BB",
-+"Xg c #282424",
-+"Xh c #272223",
-+"Xj c #6C696A",
-+"Xk c #2F4659",
-+"Xl c #6B6969",
-+"Xz c #407BA5",
-+"Xx c #6A6768",
-+"Xc c #E4E3E3",
-+"Xv c #3E79A3",
-+"Xb c #231E1F",
-+"Xn c #221E1E",
-+"Xm c #E2E1E1",
-+"XM c #211C1D",
-+"XN c #EBF2F7",
-+"XB c #201C1C",
-+"XV c #CFE0EC",
-+"XC c #4588B7",
-+"XZ c #B3CEE1",
-+"XA c #366384",
-+"XS c #5F98C0",
-+"XD c #4386B5",
-+"XF c #DEDDDD",
-+"XG c #2B3D4B",
-+"XH c #615F5F",
-+"XJ c #5F5D5D",
-+"XK c #5E5B5C",
-+"XL c #DCE9F2",
-+"XP c #407DA8",
-+"XI c #86B1CF",
-+"XU c #D4D3D3",
-+"XY c #3A698B",
-+"XT c #3E7BA6",
-+"XR c #232022",
-+"XE c #545152",
-+"XW c #999899",
-+"XQ c #79AACC",
-+"X! c #524F50",
-+"X~ c #CCCDCB",
-+"X^ c #3D749B",
-+"X/ c #93BAD5",
-+"X( c #77A8CA",
-+"X) c #37607E",
-+"X_ c #5B96BF",
-+"X` c #3F84B4",
-+"X' c #CAC9C9",
-+"X] c #C6C5C5",
-+"X[ c #3F7DAA",
-+"X{ c #F2F7FA",
-+"X} c #C2C1C1",
-+"X| c #212023",
-+"o c #9EC1D9",
-+"o. c #444142",
-+"oX c #3F78A0",
-+"oo c #90B8D5",
-+"oO c #FEFEFF",
-+"o+ c #E2ECF4",
-+"o@ c #2B3A47",
-+"o# c #25262A",
-+"o$ c #B1AFB0",
-+"o% c #28313A",
-+"o& c #221D1D",
-+"o* c #262F38",
-+"o= c #629BC2",
-+"o- c #302D2E",
-+"o; c #6199C1",
-+"o: c #201B1B",
-+"o> c #4587B6",
-+"o, c #F0F0F1",
-+"o< c #2D3E4C",
-+"o1 c #2E2B2C",
-+"o2 c #4385B4",
-+"o3 c #A8A7A7",
-+"o4 c #A7A5A6",
-+"o5 c #3D7197",
-+"o6 c #4183B2",
-+"o7 c #4083B1",
-+"o8 c #A5A3A4",
-+"o9 c #3B6F95",
-+"o0 c #5290BC",
-+"oq c #A4C4DB",
-+"ow c #E9F1F7",
-+"oe c #4387B7",
-+"or c #E7EFF5",
-+"ot c #CBDDEA",
-+"oy c #4185B5",
-+"ou c #5B95BE",
-+"oi c #3F83B3",
-+"op c #939192",
-+"oa c #929191",
-+"os c #2B3743",
-+"od c #4C4849",
-+"of c #2A3742",
-+"og c #F4F8FB",
-+"oh c #D8E6F0",
-+"oj c #4C8CB9",
-+"ok c #211F22",
-+"ol c #CFD0D0",
-+"oz c #444041",
-+"ox c #262C34",
-+"oc c #413E3E",
-+"ov c #403C3D",
-+"ob c #3B739B",
-+"on c #858384",
-+"om c #FFFFFF",
-+"oM c #E3EDF4",
-+"oN c #5995BF",
-+"oB c #3E3A3B",
-+"oV c #C7DBE9",
-+"oC c #2F4B61",
-+"oZ c #5793BD",
-+"oA c #3C3839",
-+"oS c #2A3945",
-+"oD c #7E7D7D",
-+"oF c #345873",
-+"oG c #363233",
-+"oH c #7B797A",
-+"oJ c #EFF4F9",
-+"oK c #EEF4F8",
-+"oL c #F3F3F3",
-+"oP c #9ABED7",
-+"oI c #4788B7",
-+"oU c #629AC1",
-+"oY c #ACAAAA",
-+"oT c #F1F1F1",
-+"oR c #EFEFEF",
-+"oE c #737172",
-+"oW c #EDEDED",
-+"oQ c #A9C9DF",
-+"o! c #FBFDFE",
-+"o~ c #EBEBEB",
-+"o^ c #DFEBF3",
-+"o/ c #4581AB",
-+"o( c #6F6D6E",
-+"o) c #EAE9EA",
-+"o_ c #E9E9E9",
-+"o` c #C1D7E6",
-+"o' c #E7E7E7",
-+"o] c #E6E7E6",
-+"o[ c #E5E5E5",
-+"o{ c #3F7BA5",
-+"o} c #242021",
-+"o| c #E3E3E3",
-+"O c #3E79A4",
-+"O. c #221E1F",
-+"OX c #26303A",
-+"Oo c #9C9A9A",
-+"OO c #E1E1E1",
-+"O+ c #201C1D",
-+"O@ c #4488B7",
-+"O# c #DFDFDF",
-+"O$ c #7BAACC",
-+"O% c #356384",
-+"O& c #1E1A1B",
-+"O* c #4386B6",
-+"O= c #4286B5",
-+"O- c #95BAD5",
-+"O; c #DDDDDD",
-+"O: c #1C1819",
-+"O> c #DBDBDB",
-+"O, c #D9D9D9",
-+"O< c #D7D7D7",
-+"O1 c #417FAA",
-+"O2 c #DAE7F1",
-+"O3 c #F5F9FB",
-+"O4 c #D5D5D5",
-+"O5 c #242224",
-+"O6 c #D4D3D4",
-+"O7 c #85B1CF",
-+"O8 c #D3D3D3",
-+"O9 c #699FC4",
-+"O0 c #4D8DB9",
-+"Oq c #222022",
-+"Ow c #34556F",
-+"Oe c #D1D1D1",
-+"Or c #D0CFD0",
-+"Ot c #8A8888",
-+"Oy c #CFCFCF",
-+"Ou c #CDCDCD",
-+"Oi c #CCCDCC",
-+"Op c #CADEEB",
-+"Oa c #E5EEF5",
-+"Os c #C9DCEA",
-+"Od c #ADCADF",
-+"Of c #C8DCE9",
-+"Og c #91B8D4",
-+"Oh c #5994BE",
-+"Oj c #3D82B3",
-+"Ok c #5894BD",
-+"Ol c #3C82B2",
-+"Oz c #4181AD",
-+"Ox c #3B3737",
-+"Oc c #C5C5C5",
-+"Ov c #293643",
-+"Ob c #3E7DAA",
-+"On c #C1C1C1",
-+"Om c #353131",
-+"OM c #D4E3EE",
-+"ON c #B8D1E3",
-+"OB c #BFBFBF",
-+"OV c #9CBFD8",
-+"OC c #80ADCD",
-+"OZ c #649BC2",
-+"OA c #4889B7",
-+"OS c #BDBDBD",
-+"OD c #2E292A",
-+"OF c #4283B1",
-+"OG c #B7B7B7",
-+"OH c #4183B0",
-+"OJ c #5794BF",
-+"OK c #A7C6DC",
-+"OL c #365B77",
-+"OP c #8BB4D1",
-+"OI c #282324",
-+"OU c #272323",
-+"OY c #6C6A6A",
-+"OT c None",
-+/* pixels */
-+" oToToToT L.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h LoToToToT ",
-+"o,.joToToToToToToToToToToToToToToToToToToToT.h.h.h.hoToToToToToToToToToToToToToToToToToToToT.j.j",
-+".j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.joToLoLoR.D.~ > >.~.DoRoLoLoT.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j",
-+"oRoRoRoRoRoRoRoRoRoRoRoRoRoRoRoT.hXcOBoaXjX!oz c cozX!XjoaOBXc.hoToRoRoRoRoRoRoRoRoRoRoRoRoRoRoR",
-+".l.l.l.l.l.l.l.l.l.l.l.l.loR.j <.'X! Y.P.To: $ J J $o:.T.P YX!.' <.joR.l.l.l.l.l.l.l.l.l.l.l.l.l",
-+".l.l.l.l.l.l.l.l.l.l.l.l.jXm.&oz + $o& 3.x OoSXGXGoS O.x 3o& $ +oz.&Xm.j.l.l.l.l.l.l.l.l.l.l.l.l",
-+"oWoWoWoWoWoWoWoWoWoWoWoR uXK X $XRo% yXA.qo/.fX1X1.fo/.qXA yo%XR $ XXK uoRoWoWoWoWoWoWoWoWoWoWoW",
-+".c.c.c.c.c.c.c.c.c.coW Z z $ {os eXTo0..oQX*XLoMoMXLOpoQ..o0XT eos { $ z ZoW.c.c.c.c.c.c.c.c.c.c",
-+"o~o~o~o~o~o~o~o~o~.co3.p $.(X2X[OJ FOM !Of 0.d wOg.d 0Os.mOM FOJObX2.( $.po3.co~o~o~o~o~o~o~o~o~",
-+".n.n.n.n.n.n.n.noW VoGXMoso9XC G.N.!.^XfXD tOjOlOlOj tXDXd.^.% 1O$O@o9osXMoG VoW.n.n.n.n.n.n.n.n",
-+".n.n.n.n.n.n.n.c qo.XBo<XvX5 No oUO0 fOPXpXpXpXpXpXpXpXpOP ( NOdo^OV.sXvo<XBo. q.c.n.n.n.n.n.n.n",
-+"o_o_o_o_o_o_.M.L @ $o@o{.s.^.Z & t.* ~omomomomomomomomomomomom.toO.b _ D.Jo@ $ @.Lo)o_o_o_o_o_o_",
-+".C.C.C.C.C.Co~o8Xg kX^oeoZXf._XDXD 0omomomomomomomomomomomomomomomom.b #XCX^ kXgo8o~.C.C.C.C.C.C",
-+"o'o'o'o'o'.CO>.$okX=oeXDo>O=XD./Xd.momomomomomomomomomomomomomom pX7.NOK 'oeX=ok.$O>.Co'o'o'o'o'",
-+" ]o'o'o'.So_ TXh.o nXDXDXDXDXD.; %.bomomomomomomomomomomomomoOo`O9ojo>XDXDXD n.oXh To_ ]o'o'o'.S",
-+".D.D.D.D.Do| SX|XY.+XDXDXDXDXDXDXZomomomomomomomomomomomomom.4Xd.;O=XDXDXDXD.+XYX| So|.D.D.D.D.D",
-+"o[o[o[o[.D 5OxOvOzO*XDXDXDXD =oZo+omomomomomomomomomomomomomoP.;XDXDXDXDXDXDO*OzOvOx 5o]o[o[o[o[",
-+".H.H.H.Ho' POU }oeXDXDXDXDXD.;X8o!omomomomomomomomomomomom.bX(.;XDXDXDXDXDXDXDoe }OU Po'.H.H.H.H",
-+"o|o|o|o|.DOt.5XO.+XDXDXDXDXD &ONomomomomomomomomomomomomom.2.7._XDXDXDXDXDXDXD.+XO.5Ot.Do|o|o|o|",
-+"o|o|o|o|o|Xi : j.WXDXDXDXD = rOaomomomomomomomomomomomomom AXS._XDXDXDXDXDXDXD.W j :Xio|o|o|o|o|",
-+".L.L.L.L.I RXwXP.WXDXDXDXD.;XI momomomomomomomomomomomomomXN.=._XDXDXDXDXDXDXD.WXPXw R.I.L.L.L.L",
-+"OOOOOOOOO; [OX.<O*XDXDXDXD IXoomomomomomomomomomomomomomom.UX_._XDXDXDXDXDXDXDO*.<OX [O;OOOOOOOO",
-+".I.I.I.IO; )o*O1O*XDXDXD._.).Romomomomomog ~omomomomomomom.UX_._XDXDXDXDXDXDXDO*O1o* )O;.I.I.I.I",
-+"O#O#O#O#O# KX-Xz.WXDXDXD.;XsoOomomomomom vowomomomomomomom.UX_._XDXDXDXDXDXDXD.WXzX- KO#O#O#O#O#",
-+"O#O#O#O#. g Co5oeXDXDXDXq.Nomomomomom ,X>oromomomomomomom.UX_._XDXDXDXDXDXDXDoeo5 C gOOO#O#O#O#",
-+".~.~.~.~OO.- {X).XXDXD._o; HomomomomomohO9.Romomomomomomom.UX_._XDXDXDXDXDXDXD.XX) {.-OO.~.~.~.~",
-+"O;O;O;O;O#XyOD .o2XDXD.;Ogomomomomomom / r.Uomomomomomomom.UX_._XDXDXDXDXDXDXDo2 .ODXyO#O;O;O;O;",
-+".`.`.`.`O;Oeod.:oX.WXDOAoVomomomomomO3XaOk.Uomomomomomomom.UX_._XDXDXDXDXDXD.WoX.:odOeO;.`.`.`.`",
-+"O>O>O>O>O>O;X,.POw.W._ doJomomomomomOMoj r.Uomomomomomomom.UX_._XDXDXDXDXDXD.WOw.PX,O;O>O>O>O>O>",
-+"O>O>O>O>O>O;XrOmox.0 9X8Xtomomomomom.6X`ou.Uomomomomomomom.UX_._XDXDXDXDXDoe.0oxOmXrO;O>O>O>O>O>",
-+".].].].].].]O,.z JXkOH.VotomomomomX{ 2oiou.Uomomomomomomom.UX_._XDO= &O0 &OFXk J.zO,.].].].].].]",
-+"O,O,O,O,O,O,O>OS.yOq.i._OZ ^omomom.E.9._ou.Uomomomomomomom.UX_._._.9.ZXdO=.iOq.yOSO>O,O,O,O,O,O,",
-+".{.{.{.{.{.{.{.].,.A BX)oyXXO2omom.Q.;._ou.Uomomomomomomom.UOh._ dO-X9O=X) BOI.,.].{.{.{.{.{.{.{",
-+"O<O<O<O<O<O<O<.{O8o(Xno#OLo7.YXuX O7oIoiOk.Romomomomomomom HOCoqOdo=o6OLo#Xno(O8.{O<O<O<O<O<O<O<",
-+"O<O<O<O<O<O<O<O<.{X'XJ.PO5.[O iOgXVX:OVXsoKomomomomomomom.bOMX/.1O .[O5.PXJX'.{O<O<O<O<O<O<O<O<",
-+".|.|.|.|.|.|.|.|.|.}X]XH.KXn.G eX<oN.e 8 6 Qomomomom.bXN.roo xX< e.GXn.KXHX].}.|.|.|.|.|.|.|.|.|",
-+"O4O4O4O4O4O4O4O4O4O4O<X;Xe.vXBX+ofoFob 7.@XQ W | | WXQ.@ 7oboFofX+XB.vXeX;O<O4O4O4O4O4O4O4O4O4O4",
-+"X.X.X.X.X.X.X.X.X.X.X.O4X#XW sO. J.K.xo@oC `O%.8.8O% `oCo@.x.K JO. sXWX#O4X.X.X.X.X.X.X.X.X.X.X.",
-+"O8O8O8O6O8XUXUO8O8XUXUO8X..|OnX,oc.F $ Jo&XbXRO5O5XRXbo& J $.FocX,On.|X.O8XUX@X@O8.3O8O8O8O8O8X@",
-+"O8O8O8O8O8O8O8O8O8O8O8O8O8O8X.X. aop ; c Eo}.PXMXM.Po} E c ;op aX.X.O8O8O8O8O8O8O8O8O8O8O8O8O8O8",
-+"X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#O8O4X$X6 P.-onX3X3on.- PX6X$O4O8X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#",
-+"OeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeO8X4OGOnOcOcX} MOSX#OeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOe",
-+"X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$O8ono-oAov.w.u.koEX#X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$",
-+"X$X$X$X$X$X$X$X$X$olX$X$X$X$X$X$X$X$X$X#oD l.>o1O+.P.T.BOeX$X$X$X$X$X$X$OrOrX$X$X$X$X$X$X$X$X$X$",
-+"OyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyX#oHXEXFoBO&.TO:OYX$OyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOy",
-+"X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%Oy POo.CX0 -Xx.g TOyX%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%",
-+"X%X%OuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuX% oo$.h boYo4.O UX%OuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuX%X%",
-+" Ou.#OuOuOiX&X&X&X&X&X&X&X&X&X&X&X&X&Oy.a 4 * h.K.KO&XlX%X&X&X&X&X&X&X&X&X&X&X&X&X&X&OuOuX~Ou "
-+};
diff --git a/app-text/mupdf/mupdf-1.1_p20121127.ebuild b/app-text/mupdf/mupdf-1.1_p20121127.ebuild
deleted file mode 100644
index 81d9add..0000000
--- a/app-text/mupdf/mupdf-1.1_p20121127.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="http://mupdf.com/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X vanilla"
-
-RDEPEND="media-libs/freetype:2
- media-libs/jbig2dec
- >=media-libs/openjpeg-1.5:0
- virtual/jpeg
- X? ( x11-libs/libX11
- x11-libs/libXext )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-buildsystem.patch \
- "${FILESDIR}"/${P}-desktop-integration.patch
-
- if ! use vanilla ; then
- epatch "${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch
- fi
-}
-
-src_compile() {
- use X || my_nox11="NOX11=yes MUPDF= "
-
- emake CC="$(tc-getCC)" AR="$(tc-getAR)" OS=Linux \
- build=debug verbose=true ${my_nox11}
-}
-
-src_install() {
- emake prefix="${ED}usr" libdir="${ED}usr/$(get_libdir)" \
- build=debug verbose=true ${my_nox11} install
-
- insinto /usr/include
- doins pdf/mupdf{,-internal}.h
- doins fitz/fitz{,-internal}.h
- doins xps/muxps{,-internal}.h
-
- insinto /usr/$(get_libdir)/pkgconfig
- doins debian/mupdf.pc
-
- if use X ; then
- domenu debian/mupdf.desktop
- doicon debian/mupdf.xpm
- fi
- dodoc README doc/{example.c,overview.txt}
-}
diff --git a/app-text/mupdf/mupdf-1.2.ebuild b/app-text/mupdf/mupdf-1.2.ebuild
deleted file mode 100644
index 341f44b..0000000
--- a/app-text/mupdf/mupdf-1.2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="http://mupdf.com/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}-source.zip"
-
-LICENSE="AGPL-3"
-SLOT="0/1.2"
-KEYWORDS="amd64 arm ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X vanilla static static-libs"
-
-LIB_DEPEND="media-libs/freetype:2[static-libs?]
- media-libs/jbig2dec[static-libs?]
- >=media-libs/openjpeg-1.5:0[static-libs?]
- virtual/jpeg[static-libs?]
- X? ( x11-libs/libX11[static-libs?]
- x11-libs/libXext[static-libs?] )"
-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] )"
-
-S=${WORKDIR}/${P}-source
-
-src_prepare() {
- rm -rf thirdparty || die
-
- epatch \
- "${FILESDIR}"/${PN}-1.1_p20121127-buildsystem.patch \
- "${FILESDIR}"/${PN}-1.1_p20121127-desktop-integration.patch \
- "${FILESDIR}"/${PN}-1.2-mubusy_rename_fix.patch \
- "${FILESDIR}"/${PN}-1.2-pkg-config.patch
-
- sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
- -e "/^prefix=/s:=.*:=${EROOT}/usr:" \
- -i debian/mupdf.pc || die
-
- use vanilla || epatch \
- "${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch
-
- sed -e "\$aOS = Linux" \
- -e "\$aCC = $(tc-getCC)" \
- -e "\$aLD = $(tc-getCC)" \
- -e "\$aAR = $(tc-getAR)" \
- -e "\$averbose = true" \
- -e "\$abuild = debug" \
- -e "\$aprefix = ${ED}usr" \
- -e "\$alibdir = ${ED}usr/$(get_libdir)" \
- -i Makerules || die
-
- if ! use X ; then
- sed -e "\$aNOX11 = yes" \
- -i Makerules || die
- fi
-
- 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 '/^X11_LIBS :=/s:\(.*\):\1 -lbz2 -ldl -lpthread:' \
- -i "${S}"-static/Makerules || die
- sed -e '/^LIBS +=/s:\(-lfreetype\):\1 -lbz2:' \
- -i "${S}"-static/Makefile || die
- fi
-
- my_soname=libfitz.so.1.2
- sed -e "\$a\$(FITZ_LIB):" \
- -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
- -e "/^FITZ_LIB :=/s:=.*:= build/debug/${my_soname}:" \
- -i Makefile || die
-}
-
-src_compile() {
- emake XCFLAGS="-fpic"
- use static-libs && \
- emake -C "${S}"-static build/debug/libfitz.a
- use static && \
- emake -C "${S}"-static XLIBS="-static"
-}
-
-src_install() {
- if use X ; then
- domenu debian/mupdf.desktop
- doicon debian/mupdf.xpm
- else
- rm apps/man/mupdf.1
- fi
-
- emake install
- dosym ${my_soname} /usr/$(get_libdir)/libfitz.so
-
- use static-libs && \
- dolib.a "${S}"-static/build/debug/libfitz.a
- if use static ; then
- dobin "${S}"-static/build/debug/mu{tool,draw}
- use X && dobin "${S}"-static/build/debug/mupdf
- fi
-
- insinto /usr/include
- doins pdf/mupdf-internal.h fitz/fitz-internal.h xps/muxps-internal.h
-
- insinto /usr/$(get_libdir)/pkgconfig
- doins debian/mupdf.pc
-
- dodoc CHANGES README doc/{example.c,overview.txt}
-}
diff --git a/app-text/mupdf/mupdf-1.3_p20140118.ebuild b/app-text/mupdf/mupdf-1.3_p20140118.ebuild
deleted file mode 100644
index e03c479..0000000
--- a/app-text/mupdf/mupdf-1.3_p20140118.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs vcs-snapshot
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="http://mupdf.com/"
-SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=01f0a0db15faf4bffaa2556ced74868572dac7f5;sf=tgz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0/1.3"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X vanilla static static-libs"
-
-LIB_DEPEND="dev-libs/openssl[static-libs?]
- media-libs/freetype:2[static-libs?]
- media-libs/jbig2dec[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?] )"
-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] )"
-
-src_prepare() {
- rm -rf thirdparty || die
-
- epatch \
- "${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
- "${FILESDIR}"/${PN}-1.3-openjpeg2.patch \
- "${FILESDIR}"/${PN}-1.3-pkg-config.patch \
- "${FILESDIR}"/${PN}-1.3-sys_curl.patch
-
- sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
- -e "/^prefix=/s:=.*:=${EROOT}/usr:" \
- -i platform/debian/${PN}.pc || die
-
- use vanilla || epatch \
- "${FILESDIR}"/${PN}-1.3-zoom-2.patch \
- "${FILESDIR}"/${PN}-1.3-forward_back.patch
-
- #http://bugs.ghostscript.com/show_bug.cgi?id=693467
- sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \
- -i platform/debian/${PN}.desktop || die
-
- sed -e "\$aOS = Linux" \
- -e "\$aCC = $(tc-getCC)" \
- -e "\$aLD = $(tc-getCC)" \
- -e "\$aAR = $(tc-getAR)" \
- -e "\$averbose = true" \
- -e "\$abuild = debug" \
- -e "\$aprefix = ${ED}usr" \
- -e "\$alibdir = ${ED}usr/$(get_libdir)" \
- -i Makerules || die
-
- if ! use X ; then
- sed -e "\$aNOX11 = yes" \
- -i Makerules || die
- fi
-
- 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.1.3
- my_soname_js_none=libmupdf-js-none.so.1.3
- sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
- -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
- -e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \
- -e "\$a\$(MUPDF_JS_NONE_LIB):" \
- -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
- -e "/^MUPDF_JS_NONE_LIB :=/s:=.*:= \$(OUT)/${my_soname_js_none}:" \
- -i Makefile || die
-}
-
-src_compile() {
- emake XCFLAGS="-fpic"
- use static-libs && \
- emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
- use static && \
- emake -C "${S}"-static XLIBS="-static"
-}
-
-src_install() {
- if use X ; then
- domenu platform/debian/${PN}.desktop
- doicon platform/debian/${PN}.xpm
- dobin platform/debian/${PN}-select-file
- else
- rm docs/man/${PN}.1
- fi
-
- emake install
- dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
-
- use static-libs && \
- dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
- if use static ; then
- dobin "${S}"-static/build/debug/mu{tool,draw}
- use X && dobin "${S}"-static/build/debug/${PN}-x11
- fi
- use X && dosym ${PN}-x11 /usr/bin/${PN}
-
- insinto /usr/$(get_libdir)/pkgconfig
- doins platform/debian/${PN}.pc
-
- dodoc README docs/*.{txt,c}
-}
diff --git a/app-text/mupdf/mupdf-1.4-r1.ebuild b/app-text/mupdf/mupdf-1.4-r1.ebuild
deleted file mode 100644
index 6dfaa97..0000000
--- a/app-text/mupdf/mupdf-1.4-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs vcs-snapshot
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="http://mupdf.com/"
-SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=eebc3385ebfa60574d78cf41badd6622987c1121;sf=tgz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0/1.4"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X vanilla static static-libs"
-
-LIB_DEPEND="dev-libs/openssl[static-libs?]
- media-libs/freetype:2[static-libs?]
- media-libs/jbig2dec[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?] )"
-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] )"
-
-src_prepare() {
- rm -rf thirdparty || die
-
- epatch \
- "${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
- "${FILESDIR}"/${PN}-1.3-openjpeg2.patch \
- "${FILESDIR}"/${PN}-1.3-pkg-config.patch \
- "${FILESDIR}"/${PN}-1.3-sys_curl.patch
-
- sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
- -e "/^prefix=/s:=.*:=${EROOT}/usr:" \
- -i platform/debian/${PN}.pc || die
-
- use vanilla || epatch \
- "${FILESDIR}"/${PN}-1.3-zoom-2.patch \
- "${FILESDIR}"/${PN}-1.3-forward_back.patch
-
- #http://bugs.ghostscript.com/show_bug.cgi?id=693467
- sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \
- -i platform/debian/${PN}.desktop || die
-
- sed -e "\$aOS = Linux" \
- -e "\$aCC = $(tc-getCC)" \
- -e "\$aLD = $(tc-getCC)" \
- -e "\$aAR = $(tc-getAR)" \
- -e "\$averbose = yes" \
- -e "\$abuild = debug" \
- -e "\$aprefix = ${ED}usr" \
- -e "\$alibdir = ${ED}usr/$(get_libdir)" \
- -i Makerules || die
-
- sed -e "\$aHAVE_X11 = $(usex X 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.1.4
- my_soname_js_none=libmupdf-js-none.so.1.4
- sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
- -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
- -e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \
- -e "\$a\$(MUPDF_JS_NONE_LIB):" \
- -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
- -e "/^MUPDF_JS_NONE_LIB :=/s:=.*:= \$(OUT)/${my_soname_js_none}:" \
- -i Makefile || die
-}
-
-src_compile() {
- emake XCFLAGS="-fpic"
- use static-libs && \
- emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
- use static && \
- emake -C "${S}"-static XLIBS="-static"
-}
-
-src_install() {
- if use X ; then
- domenu platform/debian/${PN}.desktop
- doicon platform/debian/${PN}.xpm
- dobin platform/debian/${PN}-select-file
- else
- rm docs/man/${PN}.1
- fi
-
- emake install
- dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
-
- use static-libs && \
- dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
- if use static ; then
- dobin "${S}"-static/build/debug/mu{tool,draw}
- use X && dobin "${S}"-static/build/debug/${PN}-x11
- fi
- use X && dosym ${PN}-x11 /usr/bin/${PN}
-
- insinto /usr/$(get_libdir)/pkgconfig
- doins platform/debian/${PN}.pc
-
- dodoc README docs/*.{txt,c}
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/
@ 2016-01-08 23:48 Michael Weber
0 siblings, 0 replies; 20+ messages in thread
From: Michael Weber @ 2016-01-08 23:48 UTC (permalink / raw
To: gentoo-commits
commit: 8f79eb2c4acb4a2e0a116cc1f7d3257830450b2a
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 8 23:45:40 2016 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Fri Jan 8 23:47:33 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f79eb2c
app-text/mupdf: Version bump, add USE=opengl (thanks Shark, bug 566248).
Package-Manager: portage-2.2.26
app-text/mupdf/Manifest | 1 +
app-text/mupdf/files/mupdf-1.8-system-glfw.patch | 11 ++
app-text/mupdf/mupdf-1.8.ebuild | 139 +++++++++++++++++++++++
3 files changed, 151 insertions(+)
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 73cb5f2..3ca01e5 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -2,3 +2,4 @@ DIST mupdf-1.5.tar.gz 7485699 SHA256 946393c7abf78e50fa9815f18a9e91f275a1a96a7ea
DIST mupdf-1.6.tar.gz 8188199 SHA256 ac6f64d5c287b6549d3c26af8fa298c91697f10ebe52b122ba2c1f43e5ccfa52 SHA512 cda47ef4442bb7de15fc54b87e0e819f80c56c144318b9e953bc36c3da0bb331a10f44016bc89986c317828b7043e737a89556fc51158114b1da58cd8f7977c7 WHIRLPOOL ea14db6f43a70df144f3f70c3421ac7d2096d835fa222f0d5b9c6d64214f5c9156884b6660dda7e1fd2bee83fa9ce66ca25b2f6290ba1588fc55035ad6228413
DIST mupdf-1.7.tar.gz 7342238 SHA256 9c79ef0ad3343f8feed8aabfaaad6ba7cbdb3e3398aa380ed505ed71086d0fbc SHA512 f4c438019285731e5c8bb6f1f9c46ae20b9fd5f720034ab40d4e31ed4b2dd9cd704c45f1b25f68d46c1ed0a9c76d16b01fb26b83aa372497f924a763f9676044 WHIRLPOOL 3674a0144fa44c618380f06cba5093016fa6f0aa37ef6cc32e582e4f0a94cedb2e320db0f42007d6096650d42cbc2cc28716adf3371f214728c01332d4120462
DIST mupdf-1.7a.tar.gz 7345618 SHA256 1e67196e18e900f8af1799133236afbffe2d8e412052a711eb9f6f9c9d603534 SHA512 07260bd7d3fa55531bc2a7c1c71990d032725f32675d88c94c978349736c2ba3367934ea0e4f86b52546ce898f36596d14d32ab876dc87eb5290560a28d4b8b9 WHIRLPOOL c307b8169a7e112aade7700acf7abad1528aa048375310ed17112e8ef8dde5f175d9ad1f07bae371d263f573739f92e0cc12659b8a691a3b4992447cebb9f14a
+DIST mupdf-1.8.tar.gz 7706473 SHA256 d4e06644caad381d1dc88401dae12ee614809a7b95f6dcbf6fd086d5b594dcc4 SHA512 6adc30330c61d0bb8c9ee09488ef31701e9a7425cbac76e072eae9816c14a1190a1e2bd1e9155b6892d4198f7d8692661582cc1b82c7caab7b3ba4fddfcc7461 WHIRLPOOL 9fceca049cf5eaffd1520a0077c78bd8647d8e5b384eb2c1bc968a16349b46909b592cb8cbd5ee0546e798434afbece39a258e175ba02d0454b8edc35e179dd7
diff --git a/app-text/mupdf/files/mupdf-1.8-system-glfw.patch b/app-text/mupdf/files/mupdf-1.8-system-glfw.patch
new file mode 100644
index 0000000..bda8bd8
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.8-system-glfw.patch
@@ -0,0 +1,11 @@
+--- mupdf-1.8/Makerules
++++ mupdf-1.8/Makerules
+@@ -119,6 +119,8 @@
+ SYS_JBIG2DEC_LIBS = -ljbig2dec
+ SYS_JPEG_LIBS = -ljpeg
+ SYS_ZLIB_LIBS = -lz
++SYS_GLFW_CFLAGS = $(shell pkg-config --cflags glfw3 gl)
++SYS_GLFW_LIBS = $(shell pkg-config --libs glfw3 gl)
+
+ endif
+
diff --git a/app-text/mupdf/mupdf-1.8.ebuild b/app-text/mupdf/mupdf-1.8.ebuild
new file mode 100644
index 0000000..04fa8cba
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.8.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs vcs-snapshot
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="http://mupdf.com/"
+SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=179403598244f069b56e60866c13a0b840c5932e;sf=tgz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+MY_SOVER=1.8
+SLOT="0/${MY_SOVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X vanilla +curl javascript libressl opengl +openssl static static-libs"
+
+LIB_DEPEND="
+ !libressl? ( dev-libs/openssl:0[static-libs?] )
+ libressl? ( dev-libs/libressl[static-libs?] )
+ media-libs/freetype:2[static-libs?]
+ media-libs/jbig2dec[static-libs?]
+ media-libs/openjpeg:2[static-libs?]
+ net-misc/curl[static-libs?]
+ virtual/jpeg[static-libs?]
+ X? ( x11-libs/libX11[static-libs?]
+ x11-libs/libXext[static-libs?] )
+ javascript? ( dev-lang/mujs )
+ opengl? ( >=media-libs/glfw-3 )"
+RDEPEND="${LIB_DEPEND}"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ static-libs? ( ${LIB_DEPEND} )
+ static? ( ${LIB_DEPEND//?}
+ app-arch/bzip2[static-libs]
+ x11-libs/libXau[static-libs]
+ x11-libs/libXdmcp[static-libs]
+ x11-libs/libxcb[static-libs] )"
+
+REQUIRED_USE="opengl? ( X !static !static-libs )"
+
+src_prepare() {
+ rm -rf thirdparty || die
+
+ epatch \
+ "${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
+ "${FILESDIR}"/${PN}-1.5-old-debian-files.patch \
+ "${FILESDIR}"/${PN}-1.3-pkg-config.patch \
+ "${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch \
+ "${FILESDIR}"/${PN}-1.7a-system-mujs.patch \
+ "${FILESDIR}"/${PN}-1.8-system-glfw.patch
+
+ if has_version ">=media-libs/openjpeg-2.1:2" ; then
+ epatch \
+ "${FILESDIR}"/${PN}-1.5-openjpeg-2.1.patch
+ fi
+
+ sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
+ -e "/^prefix=/s:=.*:=${EROOT}/usr:" \
+ -i platform/debian/${PN}.pc || die
+
+ use vanilla || epatch \
+ "${FILESDIR}"/${PN}-1.3-zoom-2.patch
+
+ #http://bugs.ghostscript.com/show_bug.cgi?id=693467
+ sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \
+ -i platform/debian/${PN}.desktop || die
+
+ 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 = -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.${MY_SOVER}
+ my_soname_js_none=libmupdf-js-none.so.${MY_SOVER}
+ sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
+ -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
+ -e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \
+ -e "\$a\$(MUPDF_JS_NONE_LIB):" \
+ -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
+ -e "/install/s: COPYING : :" \
+ -i Makefile || die
+}
+
+src_compile() {
+ emake XCFLAGS="-fpic"
+ use static-libs && \
+ emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
+ use static && \
+ emake -C "${S}"-static XLIBS="-static"
+}
+
+src_install() {
+ if use X ; then
+ domenu platform/debian/${PN}.desktop
+ doicon platform/debian/${PN}.xpm
+ else
+ rm docs/man/${PN}.1
+ fi
+
+ emake install
+ dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
+
+ use static-libs && \
+ dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
+ if use static ; then
+ dobin "${S}"-static/build/debug/mu{tool,draw}
+ use X && dobin "${S}"-static/build/debug/${PN}-x11
+ fi
+ use X && dosym ${PN}-x11 /usr/bin/${PN}
+
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins platform/debian/${PN}.pc
+
+ dodoc README docs/*.{txt,c}
+}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/
@ 2017-02-05 17:25 Michael Weber
0 siblings, 0 replies; 20+ messages in thread
From: Michael Weber @ 2017-02-05 17:25 UTC (permalink / raw
To: gentoo-commits
commit: 2af6b2174d988ef90e8178a6c13839d33af70f35
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 5 17:24:55 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sun Feb 5 17:24:55 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2af6b217
app-text/mupdf: Remove old versions (bug 600674, 590480, 589826).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-text/mupdf/Manifest | 3 -
app-text/mupdf/files/mupdf-1.3-CFLAGS.patch | 11 -
app-text/mupdf/files/mupdf-1.3-pkg-config.patch | 20 -
.../files/mupdf-1.5-Makerules-openssl-curl.patch | 27 --
.../files/mupdf-1.5-format-security-error.patch | 22 -
.../mupdf/files/mupdf-1.5-old-debian-files.patch | 533 ---------------------
app-text/mupdf/files/mupdf-1.5-openjpeg-2.1.patch | 51 --
app-text/mupdf/files/mupdf-1.7a-system-mujs.patch | 11 -
app-text/mupdf/files/mupdf-1.9a-no-thirdlibs.patch | 113 -----
app-text/mupdf/mupdf-1.5-r1.ebuild | 128 -----
app-text/mupdf/mupdf-1.8.ebuild | 141 ------
app-text/mupdf/mupdf-1.9a.ebuild | 144 ------
12 files changed, 1204 deletions(-)
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 43abae7..006624c 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,4 +1 @@
DIST mupdf-1.10a-source.tar.gz 42264707 SHA256 aacc1f36b9180f562022ef1ab3439b009369d944364f3cff8a2a898834e3a836 SHA512 8c735963364985e74ceb38242afae555a3d2ee7c69abe3fe5c485e8613a83d996a58f231cb689a156019d431fa67d565503247d010b0a404054850483aed9fec WHIRLPOOL f3dc7fbddd2ee140226f17b444f184138dbff5d626033a295a7b335119fae5eb49eae680fb392068935610cdbed21267016af8afaa080fffba4f320b82209fbb
-DIST mupdf-1.5.tar.gz 7485699 SHA256 946393c7abf78e50fa9815f18a9e91f275a1a96a7ea14ae39b5237944070d1f5 SHA512 bfb79838eba629295ab164cf37e49edc8846689598fbad9312409535022a2e747bd062718b899909564c6cf5826fb46a2b4b579ced8c7a3896d6098e7e5ccf40 WHIRLPOOL ebcaf5f677984a78aecf9eeb72e7a79e6e2a6388db5024427d8bf55f31b3690844dd291ada3cd578a5bb9a370ea21cb2a044656c21a0ef47cdf7bfc42c842beb
-DIST mupdf-1.8.tar.gz 7706473 SHA256 d4e06644caad381d1dc88401dae12ee614809a7b95f6dcbf6fd086d5b594dcc4 SHA512 6adc30330c61d0bb8c9ee09488ef31701e9a7425cbac76e072eae9816c14a1190a1e2bd1e9155b6892d4198f7d8692661582cc1b82c7caab7b3ba4fddfcc7461 WHIRLPOOL 9fceca049cf5eaffd1520a0077c78bd8647d8e5b384eb2c1bc968a16349b46909b592cb8cbd5ee0546e798434afbece39a258e175ba02d0454b8edc35e179dd7
-DIST mupdf-1.9a.tar.gz 13282205 SHA256 2a7d6d73cd1f6de8f70792dff9936b84c54c127feecd485675e0d0c17debc98d SHA512 aa268484371597f2082bff61052b3f80e30b8d41018bf0477b8975e4520849090b75e6c4be6be15d6af9cea6d9315deb28f82c6afc8b6f3c5bfc3498eca91140 WHIRLPOOL b552e68d0412e723e23c645516e87d695e00af0c88b14ab1ebc6b65e374f525fab6df2b5f81fe72fc8a61a8a9f616712ef0d215a07327745d33fb0238509eac9
diff --git a/app-text/mupdf/files/mupdf-1.3-CFLAGS.patch b/app-text/mupdf/files/mupdf-1.3-CFLAGS.patch
deleted file mode 100644
index 3c44e98..00000000
--- a/app-text/mupdf/files/mupdf-1.3-CFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mupdf-1.3/Makerules
-+++ mupdf-1.3/Makerules
-@@ -6,7 +6,7 @@
- CFLAGS += -Wall
-
- ifeq "$(build)" "debug"
--CFLAGS += -pipe -g -DDEBUG
-+CFLAGS += -DDEBUG
- else ifeq "$(build)" "profile"
- CFLAGS += -pipe -O2 -DNDEBUG -pg
- LDFLAGS += -pg
diff --git a/app-text/mupdf/files/mupdf-1.3-pkg-config.patch b/app-text/mupdf/files/mupdf-1.3-pkg-config.patch
deleted file mode 100644
index f943014..00000000
--- a/app-text/mupdf/files/mupdf-1.3-pkg-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-no pkgconfig data for jbig2dec and jpeg
-http://bugs.ghostscript.com/show_bug.cgi?id=694301
-
-openjpeg-2
-http://bugs.ghostscript.com/show_bug.cgi?id=693518
-
---- mupdf-1.3/platform/debian/mupdf.pc
-+++ mupdf-1.3/platform/debian/mupdf.pc
-@@ -4,9 +4,9 @@
- includedir=${prefix}/include
-
- Name: mupdf
- Description: Library for rendering PDF documents
--Requires.private: freetype2
-+Requires: freetype2 libopenjp2 libcrypto
- Version: 0.5.0
- Libs: -L${libdir} -lmupdf
--Libs.private: -lopenjpeg -ljbig2dec -ljpeg -lz -lm
-+Libs.private: -lmupdf-js-none
- Cflags: -I${includedir}
diff --git a/app-text/mupdf/files/mupdf-1.5-Makerules-openssl-curl.patch b/app-text/mupdf/files/mupdf-1.5-Makerules-openssl-curl.patch
deleted file mode 100644
index bc9312a..00000000
--- a/app-text/mupdf/files/mupdf-1.5-Makerules-openssl-curl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- mupdf-1.5/Makerules
-+++ mupdf-1.5/Makerules
-@@ -58,17 +58,23 @@
-
- HAVE_X11 ?= yes
-
-+WANT_OPENSSL ?= yes
-+ifeq "$(WANT_OPENSSL)" "yes"
- ifeq "$(shell pkg-config --exists libcrypto && echo yes)" "yes"
- SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL $(shell pkg-config --cflags libcrypto)
- SYS_OPENSSL_LIBS = $(shell pkg-config --libs libcrypto)
- endif
-+endif
-
-+WANT_CURL ?= yes
-+ifeq "$(WANT_CURL)" "yes"
- ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes"
- HAVE_CURL = yes
- SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl)
- SYS_CURL_LIBS = $(shell pkg-config --libs libcurl)
--endif
- SYS_CURL_DEPS = -lpthread -lrt
-+endif
-+endif
-
- SYS_X11_CFLAGS = $(shell pkg-config --cflags x11 xext)
- SYS_X11_LIBS = $(shell pkg-config --libs x11 xext)
diff --git a/app-text/mupdf/files/mupdf-1.5-format-security-error.patch b/app-text/mupdf/files/mupdf-1.5-format-security-error.patch
deleted file mode 100644
index d0dce97..00000000
--- a/app-text/mupdf/files/mupdf-1.5-format-security-error.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: =?utf-8?q?=22Kan-Ru_Chen_=28=E9=99=B3=E4=BE=83=E5=A6=82=29=22?=
- <koster@debian.org>
-Date: Sat, 20 Sep 2014 13:12:16 +0800
-Subject: Fix -Werror=format-security error
-
----
- source/pdf/pdf-op-run.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/source/pdf/pdf-op-run.c b/source/pdf/pdf-op-run.c
-index 2bea94b..da881b2 100644
---- a/source/pdf/pdf-op-run.c
-+++ b/source/pdf/pdf-op-run.c
-@@ -1729,7 +1729,7 @@ run_xobject(pdf_csi *csi, void *state, pdf_obj *resources, pdf_xobject *xobj, co
-
- /* Rethrow postponed errors */
- if (errmess[0])
-- fz_throw(ctx, FZ_ERROR_GENERIC, errmess);
-+ fz_throw(ctx, FZ_ERROR_GENERIC, "%s", errmess);
- }
-
- static void pdf_run_BDC(pdf_csi *csi, void *state)
diff --git a/app-text/mupdf/files/mupdf-1.5-old-debian-files.patch b/app-text/mupdf/files/mupdf-1.5-old-debian-files.patch
deleted file mode 100644
index 3dd6419..00000000
--- a/app-text/mupdf/files/mupdf-1.5-old-debian-files.patch
+++ /dev/null
@@ -1,533 +0,0 @@
---- /dev/null
-+++ platform/debian/mupdf.desktop
-@@ -0,0 +1,15 @@
-+[Desktop Entry]
-+Name=MuPDF
-+GenericName=PDF file viewer
-+Exec=mupdf %f
-+TryExec=mupdf
-+Icon=mupdf
-+Terminal=false
-+Type=Application
-+MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;image/jpeg;image/pjpeg;image/png;image/tiff;image/x-tiff
-+Categories=Viewer;Graphics;
-+Actions=View
-+
-+[Desktop Action View]
-+Name=View with mupdf
-+Exec=mupdf %f
---- /dev/null
-+++ platform/debian/mupdf.pc
-@@ -0,0 +1,12 @@
-+prefix=/usr
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/lib
-+includedir=${prefix}/include
-+
-+Name: mupdf
-+Description: Library for rendering PDF documents
-+Requires.private: freetype2
-+Version: 0.5.0
-+Libs: -L${libdir} -lmupdf
-+Libs.private: -lopenjpeg -ljbig2dec -ljpeg -lz -lm
-+Cflags: -I${includedir}
---- /dev/null
-+++ platform/debian/mupdf.xpm
-@@ -0,0 +1,497 @@
-+/* XPM */
-+static char *mupdf[] = {
-+/* width height ncolors chars_per_pixel */
-+"48 48 442 2",
-+/* colors */
-+" c #000000",
-+" . c #2E4558",
-+" X c #252121",
-+" o c #AFAFAF",
-+" O c #28313B",
-+" + c #231F1F",
-+" @ c #686666",
-+" # c #98BDD7",
-+" $ c #201B1C",
-+" % c #7CABCC",
-+" & c #4487B6",
-+" * c #DFDEDE",
-+" = c #4285B4",
-+" - c #615E5F",
-+" ; c #605E5E",
-+" : c #23262C",
-+" > c #D9D8D8",
-+" , c #F7FAFC",
-+" < c #D7D6D6",
-+" 1 c #BFD6E6",
-+" 2 c #6BA0C5",
-+" 3 c #232122",
-+" 4 c #555253",
-+" 5 c #CDCCCC",
-+" 6 c #E7EFF6",
-+" 7 c #4786B2",
-+" 8 c #CADDEA",
-+" 9 c #4085B5",
-+" 0 c #AECBDF",
-+" q c #CBCACA",
-+" w c #92B9D4",
-+" e c #365F7D",
-+" r c #5A95BE",
-+" t c #3E83B3",
-+" y c #304B60",
-+" u c #C7C6C6",
-+" i c #4D8EBB",
-+" p c #F1F6F9",
-+" a c #C1C0C0",
-+" s c #454243",
-+" d c #669CC3",
-+" f c #81AECD",
-+" g c #7A7777",
-+" h c #434041",
-+" j c #3E779F",
-+" k c #272E36",
-+" l c #413E3F",
-+" z c #3F3C3D",
-+" x c #5895BF",
-+" c c #3D3A3B",
-+" v c #C6DBE9",
-+" b c #B8B6B7",
-+" n c #4282B0",
-+" m c #FDFDFE",
-+" M c #B7B6B6",
-+" N c #8DB5D2",
-+" B c #242529",
-+" V c #B3B2B2",
-+" C c #222327",
-+" Z c #B0AEAF",
-+" A c #EDF4F8",
-+" S c #686565",
-+" D c #488AB9",
-+" F c #9ABED8",
-+" G c #7EACCD",
-+" H c #ECF2F7",
-+" J c #211C1C",
-+" K c #666363",
-+" L c #F1F1F2",
-+" P c #ABAAAA",
-+" I c #4588B6",
-+" U c #A9A8A8",
-+" Y c #2D2A2B",
-+" T c #A7A6A6",
-+" R c #615D5E",
-+" E c #2B2829",
-+" W c #8DB7D5",
-+" Q c #F9FBFD",
-+" ! c #DDE9F2",
-+" ~ c #F8FBFC",
-+" ^ c #DCE9F1",
-+" / c #A5C5DC",
-+" ( c #89B3D1",
-+" ) c #5C5959",
-+" _ c #A4C5DB",
-+" ` c #335A76",
-+" ' c #518FBB",
-+" ] c #E6E7E7",
-+" [ c #5A5757",
-+" { c #232021",
-+" } c #33536C",
-+" | c #98BED9",
-+". c #E0E1E1",
-+".. c #7CACCE",
-+".X c #4488B8",
-+".o c #2D3F4F",
-+".O c #999898",
-+".+ c #4388B7",
-+".@ c #5E98C1",
-+".# c #CDCDCB",
-+".$ c #524F4F",
-+".% c #B0CCE0",
-+".& c #979696",
-+".* c #78A8CA",
-+".= c #5C96BF",
-+".- c #969495",
-+".; c #4084B4",
-+".: c #252930",
-+".> c #949293",
-+"., c #929091",
-+".< c #417FAB",
-+".1 c #4F8FBC",
-+".2 c #F3F7FA",
-+".3 c #D3D3D4",
-+".4 c #D7E5EF",
-+".5 c #222023",
-+".6 c #9FC1D9",
-+".7 c #679DC3",
-+".8 c #37678A",
-+".9 c #4B8BB8",
-+".0 c #3E769E",
-+".q c #3C749C",
-+".w c #403D3D",
-+".e c #92BAD6",
-+".r c #C8DCEA",
-+".t c #FEFEFE",
-+".y c #3D393A",
-+".u c #3B3738",
-+".i c #355974",
-+".p c #353132",
-+".a c #7A7879",
-+".s c #498BB9",
-+".d c #9BBFD8",
-+".f c #4E8AB4",
-+".g c #787677",
-+".h c #F2F2F2",
-+".j c #F0F0F0",
-+".k c #2F2B2C",
-+".l c #EEEEEE",
-+".z c #727071",
-+".x c #26282D",
-+".c c #ECECEC",
-+".v c #2B2728",
-+".b c #FAFCFD",
-+".n c #EAEAEA",
-+".m c #DEEAF2",
-+".M c #E9EAE9",
-+".N c #C2D8E7",
-+".B c #6E6C6D",
-+".V c #5390BC",
-+".C c #E8E8E8",
-+".Z c #6EA2C6",
-+".A c #272324",
-+".S c #E7E6E7",
-+".D c #E6E6E6",
-+".F c #252122",
-+".G c #29333D",
-+".H c #E4E4E4",
-+".J c #3F7AA5",
-+".K c #231F20",
-+".L c #E2E2E2",
-+".P c #211D1E",
-+".I c #E0E0E0",
-+".U c #EAF1F7",
-+".Y c #6099C2",
-+".T c #1F1B1C",
-+".R c #E9F1F6",
-+".E c #CDDFEB",
-+".W c #4387B6",
-+".Q c #96BBD6",
-+".! c #B1CDE0",
-+".~ c #DEDEDE",
-+".^ c #79A9CA",
-+"./ c #4285B5",
-+".( c #272A31",
-+".) c #5D97BF",
-+"._ c #4185B4",
-+".` c #DCDCDC",
-+".' c #959393",
-+".] c #DADADA",
-+".[ c #314B5F",
-+".{ c #D8D8D8",
-+".} c #D7D8D7",
-+".| c #D6D6D6",
-+"X c #F5F8FB",
-+"X. c #D4D4D4",
-+"XX c #6AA0C5",
-+"Xo c #BDD4E5",
-+"XO c #3A6A8C",
-+"X+ c #232123",
-+"X@ c #D3D4D3",
-+"X# c #D2D2D2",
-+"X$ c #D0D0D0",
-+"X% c #CECECE",
-+"X& c #CCCCCC",
-+"X* c #CADDEB",
-+"X= c #37617F",
-+"X- c #242A31",
-+"X; c #CACACA",
-+"X: c #C8DBE9",
-+"X> c #90B7D3",
-+"X, c #817F7F",
-+"X< c #3F7EAB",
-+"X1 c #548FB9",
-+"X2 c #355873",
-+"X3 c #7D7B7B",
-+"X4 c #C2C2C2",
-+"X5 c #4B8CBA",
-+"X6 c #C0C0C0",
-+"X7 c #D4E4EE",
-+"X8 c #81AECE",
-+"X9 c #659CC3",
-+"X0 c #787576",
-+"Xq c #4788B6",
-+"Xw c #252C35",
-+"Xe c #757373",
-+"Xr c #BABABA",
-+"Xt c #FCFDFE",
-+"Xy c #B6B6B6",
-+"Xu c #C4D9E8",
-+"Xi c #706D6E",
-+"Xp c #8CB5D2",
-+"Xa c #70A3C7",
-+"Xs c #8BB5D1",
-+"Xd c #5491BC",
-+"Xf c #5391BB",
-+"Xg c #282424",
-+"Xh c #272223",
-+"Xj c #6C696A",
-+"Xk c #2F4659",
-+"Xl c #6B6969",
-+"Xz c #407BA5",
-+"Xx c #6A6768",
-+"Xc c #E4E3E3",
-+"Xv c #3E79A3",
-+"Xb c #231E1F",
-+"Xn c #221E1E",
-+"Xm c #E2E1E1",
-+"XM c #211C1D",
-+"XN c #EBF2F7",
-+"XB c #201C1C",
-+"XV c #CFE0EC",
-+"XC c #4588B7",
-+"XZ c #B3CEE1",
-+"XA c #366384",
-+"XS c #5F98C0",
-+"XD c #4386B5",
-+"XF c #DEDDDD",
-+"XG c #2B3D4B",
-+"XH c #615F5F",
-+"XJ c #5F5D5D",
-+"XK c #5E5B5C",
-+"XL c #DCE9F2",
-+"XP c #407DA8",
-+"XI c #86B1CF",
-+"XU c #D4D3D3",
-+"XY c #3A698B",
-+"XT c #3E7BA6",
-+"XR c #232022",
-+"XE c #545152",
-+"XW c #999899",
-+"XQ c #79AACC",
-+"X! c #524F50",
-+"X~ c #CCCDCB",
-+"X^ c #3D749B",
-+"X/ c #93BAD5",
-+"X( c #77A8CA",
-+"X) c #37607E",
-+"X_ c #5B96BF",
-+"X` c #3F84B4",
-+"X' c #CAC9C9",
-+"X] c #C6C5C5",
-+"X[ c #3F7DAA",
-+"X{ c #F2F7FA",
-+"X} c #C2C1C1",
-+"X| c #212023",
-+"o c #9EC1D9",
-+"o. c #444142",
-+"oX c #3F78A0",
-+"oo c #90B8D5",
-+"oO c #FEFEFF",
-+"o+ c #E2ECF4",
-+"o@ c #2B3A47",
-+"o# c #25262A",
-+"o$ c #B1AFB0",
-+"o% c #28313A",
-+"o& c #221D1D",
-+"o* c #262F38",
-+"o= c #629BC2",
-+"o- c #302D2E",
-+"o; c #6199C1",
-+"o: c #201B1B",
-+"o> c #4587B6",
-+"o, c #F0F0F1",
-+"o< c #2D3E4C",
-+"o1 c #2E2B2C",
-+"o2 c #4385B4",
-+"o3 c #A8A7A7",
-+"o4 c #A7A5A6",
-+"o5 c #3D7197",
-+"o6 c #4183B2",
-+"o7 c #4083B1",
-+"o8 c #A5A3A4",
-+"o9 c #3B6F95",
-+"o0 c #5290BC",
-+"oq c #A4C4DB",
-+"ow c #E9F1F7",
-+"oe c #4387B7",
-+"or c #E7EFF5",
-+"ot c #CBDDEA",
-+"oy c #4185B5",
-+"ou c #5B95BE",
-+"oi c #3F83B3",
-+"op c #939192",
-+"oa c #929191",
-+"os c #2B3743",
-+"od c #4C4849",
-+"of c #2A3742",
-+"og c #F4F8FB",
-+"oh c #D8E6F0",
-+"oj c #4C8CB9",
-+"ok c #211F22",
-+"ol c #CFD0D0",
-+"oz c #444041",
-+"ox c #262C34",
-+"oc c #413E3E",
-+"ov c #403C3D",
-+"ob c #3B739B",
-+"on c #858384",
-+"om c #FFFFFF",
-+"oM c #E3EDF4",
-+"oN c #5995BF",
-+"oB c #3E3A3B",
-+"oV c #C7DBE9",
-+"oC c #2F4B61",
-+"oZ c #5793BD",
-+"oA c #3C3839",
-+"oS c #2A3945",
-+"oD c #7E7D7D",
-+"oF c #345873",
-+"oG c #363233",
-+"oH c #7B797A",
-+"oJ c #EFF4F9",
-+"oK c #EEF4F8",
-+"oL c #F3F3F3",
-+"oP c #9ABED7",
-+"oI c #4788B7",
-+"oU c #629AC1",
-+"oY c #ACAAAA",
-+"oT c #F1F1F1",
-+"oR c #EFEFEF",
-+"oE c #737172",
-+"oW c #EDEDED",
-+"oQ c #A9C9DF",
-+"o! c #FBFDFE",
-+"o~ c #EBEBEB",
-+"o^ c #DFEBF3",
-+"o/ c #4581AB",
-+"o( c #6F6D6E",
-+"o) c #EAE9EA",
-+"o_ c #E9E9E9",
-+"o` c #C1D7E6",
-+"o' c #E7E7E7",
-+"o] c #E6E7E6",
-+"o[ c #E5E5E5",
-+"o{ c #3F7BA5",
-+"o} c #242021",
-+"o| c #E3E3E3",
-+"O c #3E79A4",
-+"O. c #221E1F",
-+"OX c #26303A",
-+"Oo c #9C9A9A",
-+"OO c #E1E1E1",
-+"O+ c #201C1D",
-+"O@ c #4488B7",
-+"O# c #DFDFDF",
-+"O$ c #7BAACC",
-+"O% c #356384",
-+"O& c #1E1A1B",
-+"O* c #4386B6",
-+"O= c #4286B5",
-+"O- c #95BAD5",
-+"O; c #DDDDDD",
-+"O: c #1C1819",
-+"O> c #DBDBDB",
-+"O, c #D9D9D9",
-+"O< c #D7D7D7",
-+"O1 c #417FAA",
-+"O2 c #DAE7F1",
-+"O3 c #F5F9FB",
-+"O4 c #D5D5D5",
-+"O5 c #242224",
-+"O6 c #D4D3D4",
-+"O7 c #85B1CF",
-+"O8 c #D3D3D3",
-+"O9 c #699FC4",
-+"O0 c #4D8DB9",
-+"Oq c #222022",
-+"Ow c #34556F",
-+"Oe c #D1D1D1",
-+"Or c #D0CFD0",
-+"Ot c #8A8888",
-+"Oy c #CFCFCF",
-+"Ou c #CDCDCD",
-+"Oi c #CCCDCC",
-+"Op c #CADEEB",
-+"Oa c #E5EEF5",
-+"Os c #C9DCEA",
-+"Od c #ADCADF",
-+"Of c #C8DCE9",
-+"Og c #91B8D4",
-+"Oh c #5994BE",
-+"Oj c #3D82B3",
-+"Ok c #5894BD",
-+"Ol c #3C82B2",
-+"Oz c #4181AD",
-+"Ox c #3B3737",
-+"Oc c #C5C5C5",
-+"Ov c #293643",
-+"Ob c #3E7DAA",
-+"On c #C1C1C1",
-+"Om c #353131",
-+"OM c #D4E3EE",
-+"ON c #B8D1E3",
-+"OB c #BFBFBF",
-+"OV c #9CBFD8",
-+"OC c #80ADCD",
-+"OZ c #649BC2",
-+"OA c #4889B7",
-+"OS c #BDBDBD",
-+"OD c #2E292A",
-+"OF c #4283B1",
-+"OG c #B7B7B7",
-+"OH c #4183B0",
-+"OJ c #5794BF",
-+"OK c #A7C6DC",
-+"OL c #365B77",
-+"OP c #8BB4D1",
-+"OI c #282324",
-+"OU c #272323",
-+"OY c #6C6A6A",
-+"OT c None",
-+/* pixels */
-+" oToToToT L.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h LoToToToT ",
-+"o,.joToToToToToToToToToToToToToToToToToToToT.h.h.h.hoToToToToToToToToToToToToToToToToToToToT.j.j",
-+".j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.joToLoLoR.D.~ > >.~.DoRoLoLoT.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j",
-+"oRoRoRoRoRoRoRoRoRoRoRoRoRoRoRoT.hXcOBoaXjX!oz c cozX!XjoaOBXc.hoToRoRoRoRoRoRoRoRoRoRoRoRoRoRoR",
-+".l.l.l.l.l.l.l.l.l.l.l.l.loR.j <.'X! Y.P.To: $ J J $o:.T.P YX!.' <.joR.l.l.l.l.l.l.l.l.l.l.l.l.l",
-+".l.l.l.l.l.l.l.l.l.l.l.l.jXm.&oz + $o& 3.x OoSXGXGoS O.x 3o& $ +oz.&Xm.j.l.l.l.l.l.l.l.l.l.l.l.l",
-+"oWoWoWoWoWoWoWoWoWoWoWoR uXK X $XRo% yXA.qo/.fX1X1.fo/.qXA yo%XR $ XXK uoRoWoWoWoWoWoWoWoWoWoWoW",
-+".c.c.c.c.c.c.c.c.c.coW Z z $ {os eXTo0..oQX*XLoMoMXLOpoQ..o0XT eos { $ z ZoW.c.c.c.c.c.c.c.c.c.c",
-+"o~o~o~o~o~o~o~o~o~.co3.p $.(X2X[OJ FOM !Of 0.d wOg.d 0Os.mOM FOJObX2.( $.po3.co~o~o~o~o~o~o~o~o~",
-+".n.n.n.n.n.n.n.noW VoGXMoso9XC G.N.!.^XfXD tOjOlOlOj tXDXd.^.% 1O$O@o9osXMoG VoW.n.n.n.n.n.n.n.n",
-+".n.n.n.n.n.n.n.c qo.XBo<XvX5 No oUO0 fOPXpXpXpXpXpXpXpXpOP ( NOdo^OV.sXvo<XBo. q.c.n.n.n.n.n.n.n",
-+"o_o_o_o_o_o_.M.L @ $o@o{.s.^.Z & t.* ~omomomomomomomomomomomom.toO.b _ D.Jo@ $ @.Lo)o_o_o_o_o_o_",
-+".C.C.C.C.C.Co~o8Xg kX^oeoZXf._XDXD 0omomomomomomomomomomomomomomomom.b #XCX^ kXgo8o~.C.C.C.C.C.C",
-+"o'o'o'o'o'.CO>.$okX=oeXDo>O=XD./Xd.momomomomomomomomomomomomomom pX7.NOK 'oeX=ok.$O>.Co'o'o'o'o'",
-+" ]o'o'o'.So_ TXh.o nXDXDXDXDXD.; %.bomomomomomomomomomomomomoOo`O9ojo>XDXDXD n.oXh To_ ]o'o'o'.S",
-+".D.D.D.D.Do| SX|XY.+XDXDXDXDXDXDXZomomomomomomomomomomomomom.4Xd.;O=XDXDXDXD.+XYX| So|.D.D.D.D.D",
-+"o[o[o[o[.D 5OxOvOzO*XDXDXDXD =oZo+omomomomomomomomomomomomomoP.;XDXDXDXDXDXDO*OzOvOx 5o]o[o[o[o[",
-+".H.H.H.Ho' POU }oeXDXDXDXDXD.;X8o!omomomomomomomomomomomom.bX(.;XDXDXDXDXDXDXDoe }OU Po'.H.H.H.H",
-+"o|o|o|o|.DOt.5XO.+XDXDXDXDXD &ONomomomomomomomomomomomomom.2.7._XDXDXDXDXDXDXD.+XO.5Ot.Do|o|o|o|",
-+"o|o|o|o|o|Xi : j.WXDXDXDXD = rOaomomomomomomomomomomomomom AXS._XDXDXDXDXDXDXD.W j :Xio|o|o|o|o|",
-+".L.L.L.L.I RXwXP.WXDXDXDXD.;XI momomomomomomomomomomomomomXN.=._XDXDXDXDXDXDXD.WXPXw R.I.L.L.L.L",
-+"OOOOOOOOO; [OX.<O*XDXDXDXD IXoomomomomomomomomomomomomomom.UX_._XDXDXDXDXDXDXDO*.<OX [O;OOOOOOOO",
-+".I.I.I.IO; )o*O1O*XDXDXD._.).Romomomomomog ~omomomomomomom.UX_._XDXDXDXDXDXDXDO*O1o* )O;.I.I.I.I",
-+"O#O#O#O#O# KX-Xz.WXDXDXD.;XsoOomomomomom vowomomomomomomom.UX_._XDXDXDXDXDXDXD.WXzX- KO#O#O#O#O#",
-+"O#O#O#O#. g Co5oeXDXDXDXq.Nomomomomom ,X>oromomomomomomom.UX_._XDXDXDXDXDXDXDoeo5 C gOOO#O#O#O#",
-+".~.~.~.~OO.- {X).XXDXD._o; HomomomomomohO9.Romomomomomomom.UX_._XDXDXDXDXDXDXD.XX) {.-OO.~.~.~.~",
-+"O;O;O;O;O#XyOD .o2XDXD.;Ogomomomomomom / r.Uomomomomomomom.UX_._XDXDXDXDXDXDXDo2 .ODXyO#O;O;O;O;",
-+".`.`.`.`O;Oeod.:oX.WXDOAoVomomomomomO3XaOk.Uomomomomomomom.UX_._XDXDXDXDXDXD.WoX.:odOeO;.`.`.`.`",
-+"O>O>O>O>O>O;X,.POw.W._ doJomomomomomOMoj r.Uomomomomomomom.UX_._XDXDXDXDXDXD.WOw.PX,O;O>O>O>O>O>",
-+"O>O>O>O>O>O;XrOmox.0 9X8Xtomomomomom.6X`ou.Uomomomomomomom.UX_._XDXDXDXDXDoe.0oxOmXrO;O>O>O>O>O>",
-+".].].].].].]O,.z JXkOH.VotomomomomX{ 2oiou.Uomomomomomomom.UX_._XDO= &O0 &OFXk J.zO,.].].].].].]",
-+"O,O,O,O,O,O,O>OS.yOq.i._OZ ^omomom.E.9._ou.Uomomomomomomom.UX_._._.9.ZXdO=.iOq.yOSO>O,O,O,O,O,O,",
-+".{.{.{.{.{.{.{.].,.A BX)oyXXO2omom.Q.;._ou.Uomomomomomomom.UOh._ dO-X9O=X) BOI.,.].{.{.{.{.{.{.{",
-+"O<O<O<O<O<O<O<.{O8o(Xno#OLo7.YXuX O7oIoiOk.Romomomomomomom HOCoqOdo=o6OLo#Xno(O8.{O<O<O<O<O<O<O<",
-+"O<O<O<O<O<O<O<O<.{X'XJ.PO5.[O iOgXVX:OVXsoKomomomomomomom.bOMX/.1O .[O5.PXJX'.{O<O<O<O<O<O<O<O<",
-+".|.|.|.|.|.|.|.|.|.}X]XH.KXn.G eX<oN.e 8 6 Qomomomom.bXN.roo xX< e.GXn.KXHX].}.|.|.|.|.|.|.|.|.|",
-+"O4O4O4O4O4O4O4O4O4O4O<X;Xe.vXBX+ofoFob 7.@XQ W | | WXQ.@ 7oboFofX+XB.vXeX;O<O4O4O4O4O4O4O4O4O4O4",
-+"X.X.X.X.X.X.X.X.X.X.X.O4X#XW sO. J.K.xo@oC `O%.8.8O% `oCo@.x.K JO. sXWX#O4X.X.X.X.X.X.X.X.X.X.X.",
-+"O8O8O8O6O8XUXUO8O8XUXUO8X..|OnX,oc.F $ Jo&XbXRO5O5XRXbo& J $.FocX,On.|X.O8XUX@X@O8.3O8O8O8O8O8X@",
-+"O8O8O8O8O8O8O8O8O8O8O8O8O8O8X.X. aop ; c Eo}.PXMXM.Po} E c ;op aX.X.O8O8O8O8O8O8O8O8O8O8O8O8O8O8",
-+"X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#O8O4X$X6 P.-onX3X3on.- PX6X$O4O8X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#",
-+"OeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeO8X4OGOnOcOcX} MOSX#OeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOe",
-+"X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$O8ono-oAov.w.u.koEX#X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$",
-+"X$X$X$X$X$X$X$X$X$olX$X$X$X$X$X$X$X$X$X#oD l.>o1O+.P.T.BOeX$X$X$X$X$X$X$OrOrX$X$X$X$X$X$X$X$X$X$",
-+"OyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyX#oHXEXFoBO&.TO:OYX$OyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOy",
-+"X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%Oy POo.CX0 -Xx.g TOyX%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%",
-+"X%X%OuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuX% oo$.h boYo4.O UX%OuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuX%X%",
-+" Ou.#OuOuOiX&X&X&X&X&X&X&X&X&X&X&X&X&Oy.a 4 * h.K.KO&XlX%X&X&X&X&X&X&X&X&X&X&X&X&X&X&OuOuX~Ou "
-+};
diff --git a/app-text/mupdf/files/mupdf-1.5-openjpeg-2.1.patch b/app-text/mupdf/files/mupdf-1.5-openjpeg-2.1.patch
deleted file mode 100644
index f3b09eb..00000000
--- a/app-text/mupdf/files/mupdf-1.5-openjpeg-2.1.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: =?utf-8?q?=22Kan-Ru_Chen_=28=E9=99=B3=E4=BE=83=E5=A6=82=29=22?=
- <koster@debian.org>
-Date: Sat, 20 Sep 2014 12:33:08 +0800
-Subject: Fix build with libopenjp2
-
----
- Makerules | 4 ++--
- source/fitz/load-jpx.c | 10 +---------
- 2 files changed, 3 insertions(+), 11 deletions(-)
-
-diff --git a/Makerules b/Makerules
-index 766ad53..a93b9cf 100644
---- a/Makerules
-+++ b/Makerules
-@@ -105,8 +105,8 @@ SYS_HARFBUZZ_CFLAGS = $(shell pkg-config --cflags harfbuzz)
- SYS_HARFBUZZ_LIBS = $(shell pkg-config --libs harfbuzz)
- SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2)
- SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2)
--SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjp2)
--SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjp2)
-+SYS_OPENJPEG_CFLAGS = -I/usr/include/openjpeg-2.1
-+SYS_OPENJPEG_LIBS = -lopenjp2
- SYS_JBIG2DEC_LIBS = -ljbig2dec
- SYS_JPEG_LIBS = -ljpeg
- SYS_ZLIB_LIBS = -lz
-diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c
-index 6b92e5c..72dea50 100644
---- a/source/fitz/load-jpx.c
-+++ b/source/fitz/load-jpx.c
-@@ -1,13 +1,5 @@
- #include "mupdf/fitz.h"
-
--/* Without the definition of OPJ_STATIC, compilation fails on windows
-- * due to the use of __stdcall. We believe it is required on some
-- * linux toolchains too. */
--#define OPJ_STATIC
--#ifndef _MSC_VER
--#define OPJ_HAVE_STDINT_H
--#endif
--
- #include <openjpeg.h>
-
- static void fz_opj_error_callback(const char *msg, void *client_data)
-@@ -117,7 +109,7 @@ fz_load_jpx(fz_context *ctx, unsigned char *data, int size, fz_colorspace *defcs
- opj_stream_set_read_function(stream, fz_opj_stream_read);
- opj_stream_set_skip_function(stream, fz_opj_stream_skip);
- opj_stream_set_seek_function(stream, fz_opj_stream_seek);
-- opj_stream_set_user_data(stream, &sb);
-+ opj_stream_set_user_data(stream, &sb, NULL);
- /* Set the length to avoid an assert */
- opj_stream_set_user_data_length(stream, size);
\ No newline at end of file
diff --git a/app-text/mupdf/files/mupdf-1.7a-system-mujs.patch b/app-text/mupdf/files/mupdf-1.7a-system-mujs.patch
deleted file mode 100644
index 1ccaf32..00000000
--- a/app-text/mupdf/files/mupdf-1.7a-system-mujs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mupdf-1.7a/Makefile
-+++ mupdf-1.7a/Makefile
-@@ -98,7 +98,7 @@
- ifeq "$(HAVE_MUJS)" "yes"
- PDF_OBJ += $(OUT)/pdf/js/pdf-js.o
- PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-mu.o
--THIRD_LIBS += $(MUJS_LIB)
-+THIRD_LIBS +=
- LIBS += $(MUJS_LIBS)
- CFLAGS += $(MUJS_CFLAGS)
- else ifeq "$(HAVE_JSCORE)" "yes"
diff --git a/app-text/mupdf/files/mupdf-1.9a-no-thirdlibs.patch b/app-text/mupdf/files/mupdf-1.9a-no-thirdlibs.patch
deleted file mode 100644
index 08d2eca..00000000
--- a/app-text/mupdf/files/mupdf-1.9a-no-thirdlibs.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- mupdf-1.9a/Makefile
-+++ mupdf-1.9a/Makefile
-@@ -142,15 +141,12 @@
- # --- Library ---
-
- MUPDF_LIB = $(OUT)/libmupdf.a
--THIRD_LIB = $(OUT)/libmupdfthird.a
-
- MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ)
--THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_OBJ) $(JBIG2DEC_OBJ) $(JPEG_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ)
-
- $(MUPDF_LIB) : $(MUPDF_OBJ)
--$(THIRD_LIB) : $(THIRD_OBJ)
-
--INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
-+INSTALL_LIBS := $(MUPDF_LIB)
-
- # --- Rules ---
-
-@@ -251,19 +247,19 @@
- MUTOOL := $(addprefix $(OUT)/, mutool)
- MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.o mudraw.o murun.o pdfclean.o pdfcreate.o pdfextract.o pdfinfo.o pdfposter.o pdfshow.o pdfpages.o pdfmerge.o)
- $(MUTOOL_OBJ): $(FITZ_HDR) $(PDF_HDR)
--$(MUTOOL) : $(MUPDF_LIB) $(THIRD_LIB)
-+$(MUTOOL) : $(MUPDF_LIB)
- $(MUTOOL) : $(MUTOOL_OBJ)
- $(LINK_CMD)
-
- MJSGEN := $(OUT)/mjsgen
--$(MJSGEN) : $(MUPDF_LIB) $(THIRD_LIB)
-+$(MJSGEN) : $(MUPDF_LIB)
- $(MJSGEN) : $(addprefix $(OUT)/tools/, mjsgen.o)
- $(LINK_CMD)
-
- MUJSTEST := $(OUT)/mujstest
- MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.o pdfapp.o)
- $(MUJSTEST_OBJ) : $(FITZ_HDR) $(PDF_HDR)
--$(MUJSTEST) : $(MUPDF_LIB) $(THIRD_LIB)
-+$(MUJSTEST) : $(MUPDF_LIB)
- $(MUJSTEST) : $(MUJSTEST_OBJ)
- $(LINK_CMD)
-
-@@ -271,7 +267,7 @@
- MUVIEW_X11 := $(OUT)/mupdf-x11
- MUVIEW_X11_OBJ := $(addprefix $(OUT)/platform/x11/, x11_main.o x11_image.o pdfapp.o)
- $(MUVIEW_X11_OBJ) : $(FITZ_HDR) $(PDF_HDR)
--$(MUVIEW_X11) : $(MUPDF_LIB) $(THIRD_LIB)
-+$(MUVIEW_X11) : $(MUPDF_LIB)
- $(MUVIEW_X11) : $(MUVIEW_X11_OBJ)
- $(LINK_CMD) $(X11_LIBS)
-
-@@ -279,7 +275,7 @@
- MUVIEW_GLFW := $(OUT)/mupdf-gl
- MUVIEW_GLFW_OBJ := $(addprefix $(OUT)/platform/gl/, gl-font.o gl-input.o gl-main.o)
- $(MUVIEW_GLFW_OBJ) : $(FITZ_HDR) $(PDF_HDR) platform/gl/gl-app.h
--$(MUVIEW_GLFW) : $(MUPDF_LIB) $(THIRD_LIB) $(GLFW_LIB)
-+$(MUVIEW_GLFW) : $(MUPDF_LIB) $(GLFW_LIB)
- $(MUVIEW_GLFW) : $(MUVIEW_GLFW_OBJ)
- $(LINK_CMD) $(GLFW_LIBS)
- endif
-@@ -288,7 +284,7 @@
- MUVIEW_X11_CURL := $(OUT)/mupdf-x11-curl
- MUVIEW_X11_CURL_OBJ := $(addprefix $(OUT)/platform/x11/curl/, x11_main.o x11_image.o pdfapp.o curl_stream.o)
- $(MUVIEW_X11_CURL_OBJ) : $(FITZ_HDR) $(PDF_HDR)
--$(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(THIRD_LIB) $(CURL_LIB)
-+$(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(CURL_LIB)
- $(MUVIEW_X11_CURL) : $(MUVIEW_X11_CURL_OBJ)
- $(LINK_CMD) $(X11_LIBS) $(CURL_LIBS) $(SYS_CURL_DEPS)
- endif
-@@ -298,7 +294,7 @@
- MUVIEW_WIN32 := $(OUT)/mupdf
- MUVIEW_WIN32_OBJ := $(addprefix $(OUT)/platform/x11/, win_main.o pdfapp.o win_res.o)
- $(MUVIEW_WIN32_OBJ) : $(FITZ_HDR) $(PDF_HDR)
--$(MUVIEW_WIN32) : $(MUPDF_LIB) $(THIRD_LIB)
-+$(MUVIEW_WIN32) : $(MUPDF_LIB)
- $(MUVIEW_WIN32) : $(MUVIEW_WIN32_OBJ)
- $(LINK_CMD) $(WIN32_LIBS)
- endif
-@@ -312,9 +308,9 @@
-
- examples: $(OUT)/example $(OUT)/multi-threaded
-
--$(OUT)/example: docs/example.c $(MUPDF_LIB) $(THIRD_LIB)
-+$(OUT)/example: docs/example.c $(MUPDF_LIB)
- $(LINK_CMD) $(CFLAGS)
--$(OUT)/multi-threaded: docs/multi-threaded.c $(MUPDF_LIB) $(THIRD_LIB)
-+$(OUT)/multi-threaded: docs/multi-threaded.c $(MUPDF_LIB)
- $(LINK_CMD) $(CFLAGS) -lpthread
-
- # --- Update version string header ---
-@@ -343,7 +339,6 @@
- mandir ?= $(prefix)/share/man
- docdir ?= $(prefix)/share/doc/mupdf
-
--third: $(THIRD_LIB)
- extra: $(CURL_LIB) $(GLFW_LIB)
- libs: $(INSTALL_LIBS)
- apps: $(INSTALL_APPS)
-@@ -376,7 +371,7 @@
- java:
- $(MAKE) -C platform/java
-
--tags: $(shell find include source platform thirdparty -name '*.[ch]' -or -name '*.cc' -or -name '*.hh')
-+tags: $(shell find include source platform -name '*.[ch]' -or -name '*.cc' -or -name '*.hh')
- ctags $^
-
- cscope.files: $(shell find include source platform -name '*.[ch]')
-@@ -397,4 +392,4 @@
- debug:
- $(MAKE) build=debug
-
--.PHONY: all clean nuke install third libs apps generate
-+.PHONY: all clean nuke install libs apps generate
diff --git a/app-text/mupdf/mupdf-1.5-r1.ebuild b/app-text/mupdf/mupdf-1.5-r1.ebuild
deleted file mode 100644
index 888af5e..00000000
--- a/app-text/mupdf/mupdf-1.5-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs vcs-snapshot
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="http://mupdf.com/"
-SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=b2f096de23e5341fbbcd7c290f3a144423741906;sf=tgz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-MY_SOVER=1.5
-SLOT="0/${MY_SOVER}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X vanilla +curl +openssl static static-libs"
-
-LIB_DEPEND="dev-libs/openssl[static-libs?]
- media-libs/freetype:2[static-libs?]
- media-libs/jbig2dec[static-libs?]
- media-libs/openjpeg:2[static-libs?]
- net-misc/curl[static-libs?]
- virtual/jpeg[static-libs?]
- X? ( x11-libs/libX11[static-libs?]
- x11-libs/libXext[static-libs?] )"
-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] )"
-
-src_prepare() {
- rm -rf thirdparty || die
-
- epatch \
- "${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
- "${FILESDIR}"/${PN}-1.5-old-debian-files.patch \
- "${FILESDIR}"/${PN}-1.3-pkg-config.patch \
- "${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch \
- "${FILESDIR}"/${PN}-1.5-format-security-error.patch
-
- if has_version ">=media-libs/openjpeg-2.1:2" ; then
- epatch \
- "${FILESDIR}"/${PN}-1.5-openjpeg-2.1.patch
- fi
-
- sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
- -e "/^prefix=/s:=.*:=${EROOT}/usr:" \
- -i platform/debian/${PN}.pc || die
-
- use vanilla || epatch \
- "${FILESDIR}"/${PN}-1.3-zoom-2.patch
-
- #http://bugs.ghostscript.com/show_bug.cgi?id=693467
- sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \
- -i platform/debian/${PN}.desktop || die
-
- 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)" \
- -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.${MY_SOVER}
- my_soname_js_none=libmupdf-js-none.so.${MY_SOVER}
- sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
- -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
- -e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \
- -e "\$a\$(MUPDF_JS_NONE_LIB):" \
- -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
- -e "/install/s: COPYING : :" \
- -i Makefile || die
-}
-
-src_compile() {
- emake XCFLAGS="-fpic"
- use static-libs && \
- emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
- use static && \
- emake -C "${S}"-static XLIBS="-static"
-}
-
-src_install() {
- if use X ; then
- domenu platform/debian/${PN}.desktop
- doicon platform/debian/${PN}.xpm
- else
- rm docs/man/${PN}.1
- fi
-
- emake install
- dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
-
- use static-libs && \
- dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
- if use static ; then
- dobin "${S}"-static/build/debug/mu{tool,draw}
- use X && dobin "${S}"-static/build/debug/${PN}-x11
- fi
- use X && dosym ${PN}-x11 /usr/bin/${PN}
-
- insinto /usr/$(get_libdir)/pkgconfig
- doins platform/debian/${PN}.pc
-
- dodoc README docs/*.{txt,c}
-}
diff --git a/app-text/mupdf/mupdf-1.8.ebuild b/app-text/mupdf/mupdf-1.8.ebuild
deleted file mode 100644
index ad053a0..00000000
--- a/app-text/mupdf/mupdf-1.8.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs vcs-snapshot
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="http://mupdf.com/"
-SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=179403598244f069b56e60866c13a0b840c5932e;sf=tgz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-MY_SOVER=1.8
-SLOT="0/${MY_SOVER}"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X vanilla +curl javascript libressl opengl +openssl static static-libs"
-
-LIB_DEPEND="
- !libressl? ( dev-libs/openssl:0[static-libs?] )
- libressl? ( dev-libs/libressl[static-libs?] )
- media-libs/freetype:2[static-libs?]
- media-libs/jbig2dec[static-libs?]
- media-libs/openjpeg:2[static-libs?]
- net-misc/curl[static-libs?]
- virtual/jpeg[static-libs?]
- X? ( x11-libs/libX11[static-libs?]
- x11-libs/libXext[static-libs?] )
- javascript? ( <dev-lang/mujs-0_p20160504 )
- opengl? ( >=media-libs/glfw-3 )"
-RDEPEND="${LIB_DEPEND}"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- static-libs? ( ${LIB_DEPEND} )
- static? ( ${LIB_DEPEND//?}
- app-arch/bzip2[static-libs]
- x11-libs/libXau[static-libs]
- x11-libs/libXdmcp[static-libs]
- x11-libs/libxcb[static-libs] )"
-
-REQUIRED_USE="opengl? ( X !static !static-libs )"
-
-src_prepare() {
- use hppa && append-cflags -ffunction-sections
-
- rm -rf thirdparty || die
-
- epatch \
- "${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
- "${FILESDIR}"/${PN}-1.5-old-debian-files.patch \
- "${FILESDIR}"/${PN}-1.3-pkg-config.patch \
- "${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch \
- "${FILESDIR}"/${PN}-1.7a-system-mujs.patch \
- "${FILESDIR}"/${PN}-1.8-system-glfw.patch
-
- if has_version ">=media-libs/openjpeg-2.1:2" ; then
- epatch \
- "${FILESDIR}"/${PN}-1.5-openjpeg-2.1.patch
- fi
-
- sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
- -e "/^prefix=/s:=.*:=${EROOT}/usr:" \
- -i platform/debian/${PN}.pc || die
-
- use vanilla || epatch \
- "${FILESDIR}"/${PN}-1.3-zoom-2.patch
-
- #http://bugs.ghostscript.com/show_bug.cgi?id=693467
- sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \
- -i platform/debian/${PN}.desktop || die
-
- 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 = -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.${MY_SOVER}
- my_soname_js_none=libmupdf-js-none.so.${MY_SOVER}
- sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
- -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
- -e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \
- -e "\$a\$(MUPDF_JS_NONE_LIB):" \
- -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
- -e "/install/s: COPYING : :" \
- -i Makefile || die
-}
-
-src_compile() {
- emake XCFLAGS="-fpic"
- use static-libs && \
- emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
- use static && \
- emake -C "${S}"-static XLIBS="-static"
-}
-
-src_install() {
- if use X ; then
- domenu platform/debian/${PN}.desktop
- doicon platform/debian/${PN}.xpm
- else
- rm docs/man/${PN}.1
- fi
-
- emake install
- dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
-
- use static-libs && \
- dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
- if use static ; then
- dobin "${S}"-static/build/debug/mu{tool,draw}
- use X && dobin "${S}"-static/build/debug/${PN}-x11
- fi
- use X && dosym ${PN}-x11 /usr/bin/${PN}
-
- insinto /usr/$(get_libdir)/pkgconfig
- doins platform/debian/${PN}.pc
-
- dodoc README docs/*.{txt,c}
-}
diff --git a/app-text/mupdf/mupdf-1.9a.ebuild b/app-text/mupdf/mupdf-1.9a.ebuild
deleted file mode 100644
index c47d34f..00000000
--- a/app-text/mupdf/mupdf-1.9a.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs vcs-snapshot
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="http://mupdf.com/"
-SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=027860688eafc89ca3d57937a77a43a9bb96f590;sf=tgz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-MY_SOVER=1.9
-SLOT="0/${MY_SOVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X vanilla +curl libressl opengl +openssl static static-libs"
-
-LIB_DEPEND="
- !libressl? ( dev-libs/openssl:0[static-libs?] )
- libressl? ( dev-libs/libressl[static-libs?] )
- >=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[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 )"
-
-src_prepare() {
- use hppa && append-cflags -ffunction-sections
-
- rm -rf thirdparty || die
-
- epatch \
- "${FILESDIR}"/${PN}-1.9a-CFLAGS.patch \
- "${FILESDIR}"/${PN}-1.9a-debug-build.patch \
- "${FILESDIR}"/${PN}-1.5-old-debian-files.patch \
- "${FILESDIR}"/${PN}-1.3-pkg-config.patch \
- "${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch \
- "${FILESDIR}"/${PN}-1.9a-no-thirdlibs.patch \
- "${FILESDIR}"/${PN}-1.8-system-glfw.patch
-
- if has_version ">=media-libs/openjpeg-2.1:2" ; then
- epatch \
- "${FILESDIR}"/${PN}-1.5-openjpeg-2.1.patch
- fi
-
- sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
- -e "/^prefix=/s:=.*:=${EROOT}/usr:" \
- -i platform/debian/${PN}.pc || die
-
- use vanilla || epatch \
- "${FILESDIR}"/${PN}-1.3-zoom-2.patch
-
- #http://bugs.ghostscript.com/show_bug.cgi?id=693467
- sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \
- -i platform/debian/${PN}.desktop || die
-
- 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 = yes" \
- -e "1iMUJS_LIBS = -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.${MY_SOVER}
- my_soname_js_none=libmupdf-js-none.so.${MY_SOVER}
- sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
- -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
- -e "/^MUPDF_LIB =/s:=.*:= \$(OUT)/${my_soname}:" \
- -e "\$a\$(MUPDF_JS_NONE_LIB):" \
- -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
- -e "/install/s: COPYING : :" \
- -i Makefile || die
-}
-
-src_compile() {
- emake XCFLAGS="-fpic"
- use static-libs && \
- emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
- use static && \
- emake -C "${S}"-static XLIBS="-static"
-}
-
-src_install() {
- if use X ; then
- domenu platform/debian/${PN}.desktop
- doicon platform/debian/${PN}.xpm
- else
- rm docs/man/${PN}.1
- fi
-
- emake install
- dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
-
- use static-libs && \
- dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
- if use static ; then
- dobin "${S}"-static/build/debug/mu{tool,draw}
- use X && dobin "${S}"-static/build/debug/${PN}-x11
- fi
- use X && dosym ${PN}-x11 /usr/bin/${PN}
-
- insinto /usr/$(get_libdir)/pkgconfig
- doins platform/debian/${PN}.pc
-
- dodoc README docs/*.{txt,c}
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/
@ 2017-04-28 9:33 Michael Weber
0 siblings, 0 replies; 20+ messages in thread
From: Michael Weber @ 2017-04-28 9:33 UTC (permalink / raw
To: gentoo-commits
commit: 7e51c0aae90d1611ff7674963a0e3989e6124e5d
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 28 09:33:04 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Fri Apr 28 09:33:23 2017 +0000
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 00000000000..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 00000000000..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 00000000000..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 00000000000..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="
+ !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.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
+)
+
+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) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
+ -e "/^MUPDF_LIB =/s:=.*:= \$(OUT)/${my_soname}:" \
+ -e "\$a\$(MUPDF_JS_NONE_LIB):" \
+ -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
+ -e "/install/s: COPYING : :" \
+ -i Makefile || die
+}
+
+src_compile() {
+ emake XCFLAGS="-fpic"
+ use static-libs && \
+ emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
+ use static && \
+ emake -C "${S}"-static XLIBS="-static"
+}
+
+src_install() {
+ if use X ; then
+ domenu platform/debian/${PN}.desktop
+ doicon platform/debian/${PN}.xpm
+ else
+ rm docs/man/${PN}.1
+ fi
+
+ emake install
+ dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
+
+ use static-libs && \
+ dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
+ if use static ; then
+ dobin "${S}"-static/build/debug/mu{tool,draw}
+ use X && dobin "${S}"-static/build/debug/${PN}-x11
+ fi
+ if use X ; then
+ if use opengl ; then
+ dosym ${PN}-gl /usr/bin/${PN}
+ einfo "mupdf symlink points to mupdf-gl (bug 616654)"
+ else
+ dosym ${PN}-x11 /usr/bin/${PN}
+ fi
+ fi
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins platform/debian/${PN}.pc
+
+ dodoc README docs/*.{txt,c}
+}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/
@ 2017-05-08 13:24 Michael Weber
0 siblings, 0 replies; 20+ messages in thread
From: Michael Weber @ 2017-05-08 13:24 UTC (permalink / raw
To: gentoo-commits
commit: d08384446c68c67ba03615b921f35b7d4929580d
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon May 8 13:23:42 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon May 8 13:23:42 2017 +0000
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 00000000000..a595253e864
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.11-CVE-2017-6060.patch
@@ -0,0 +1,15 @@
+X-Git-Url: http://git.ghostscript.com/?p=user%2Fsebras%2Fmupdf.git;a=blobdiff_plain;f=platform%2Fx11%2Fjstest_main.c;h=f158d9628ed0c0a84e37fe128277679e8334422a;hp=13c3a0a3ba3ff4aae29f6882d23740833c1d842f;hb=06a012a42c9884e3cd653e7826cff1ddec04eb6e;hpb=34e18d127a02146e3415b33c4b67389ce1ddb614
+
+diff --git a/platform/x11/jstest_main.c b/platform/x11/jstest_main.c
+index 13c3a0a..f158d96 100644
+--- a/platform/x11/jstest_main.c
++++ b/platform/x11/jstest_main.c
+@@ -346,7 +346,7 @@ main(int argc, char *argv[])
+ }
+ else if (match(&line, "OPEN"))
+ {
+- char path[1024];
++ char path[LONGLINE];
+ if (file_open)
+ pdfapp_close(&gapp);
+ if (prefix)
diff --git a/app-text/mupdf/mupdf-1.11-r1.ebuild b/app-text/mupdf/mupdf-1.11-r1.ebuild
new file mode 100644
index 00000000000..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" \
+ -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) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
+ -e "/^MUPDF_LIB =/s:=.*:= \$(OUT)/${my_soname}:" \
+ -e "\$a\$(MUPDF_JS_NONE_LIB):" \
+ -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
+ -e "/install/s: COPYING : :" \
+ -i Makefile || die
+}
+
+src_compile() {
+ emake XCFLAGS="-fpic"
+ use static-libs && \
+ emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
+ use static && \
+ emake -C "${S}"-static XLIBS="-static"
+}
+
+src_install() {
+ if use X ; then
+ domenu platform/debian/${PN}.desktop
+ doicon platform/debian/${PN}.xpm
+ else
+ rm docs/man/${PN}.1
+ fi
+
+ emake install
+ dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
+
+ use static-libs && \
+ dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
+ if use static ; then
+ dobin "${S}"-static/build/debug/mu{tool,draw}
+ use X && dobin "${S}"-static/build/debug/${PN}-x11
+ fi
+ if use X ; then
+ if use opengl ; then
+ dosym ${PN}-gl /usr/bin/${PN}
+ einfo "mupdf symlink points to mupdf-gl (bug 616654)"
+ else
+ dosym ${PN}-x11 /usr/bin/${PN}
+ fi
+ fi
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins platform/debian/${PN}.pc
+
+ dodoc README docs/*.{txt,c}
+}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/
@ 2017-05-13 22:46 Michael Weber
0 siblings, 0 replies; 20+ messages in thread
From: Michael Weber @ 2017-05-13 22:46 UTC (permalink / raw
To: gentoo-commits
commit: 8e97b8c1e02d7b8313779001d2dcd8b10f691f18
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sat May 13 22:45:46 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sat May 13 22:46:11 2017 +0000
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..00000000000
--- 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..00000000000
--- 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"
- "ldr r4, [r13,#4*22] @ r4 = divXY \n"
- "ldr r5, [r13,#4*11] @ for (nn = n; nn > 0; n--) { \n"
-+ "ldr r8, [r13,#4*17] @ r8 = back4 \n"
- "18: @ \n"
- "mov r14,#0 @ r14= v = 0 \n"
- "sub r5, 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,
- "mul r14,r4, r14 @ r14= v *= divX \n"
- "mov r14,r14,LSR #16 @ r14= v >>= 16 \n"
- "strb r14,[r9], #1 @ *d++ = r14 \n"
-- "sub r0, r0, r8 @ s -= back2 \n"
-+ "sub r0, r0, r8 @ s -= back4 \n"
- "subs r5, r5, #1 @ n-- \n"
- "bgt 18b @ } \n"
- "21: @ \n"
-@@ -1249,6 +1250,7 @@ fz_subsample_pixmap(fz_context *ctx, fz_pixmap *tile, int factor)
- x += f;
- if (x > 0)
- {
-+ int back4 = x * n - 1;
- div = x * y;
- for (nn = n; nn > 0; nn--)
- {
-@@ -1263,7 +1265,7 @@ fz_subsample_pixmap(fz_context *ctx, fz_pixmap *tile, int factor)
- s -= back5;
- }
- *d++ = v / div;
-- s -= back2;
-+ s -= back4;
- }
- }
- }
diff --git a/app-text/mupdf/files/mupdf-1.10a-null-pointer-2.patch b/app-text/mupdf/files/mupdf-1.10a-null-pointer-2.patch
deleted file mode 100644
index a4fefb79ca6..00000000000
--- a/app-text/mupdf/files/mupdf-1.10a-null-pointer-2.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From: Robin Watts <robin.watts@artifex.com>
-Date: Thu, 9 Feb 2017 15:49:15 +0000 (+0000)
-Subject: Bug 697500: Fix NULL ptr access.
-X-Git-Url: http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=1912de5f08e90af1d9d0a9791f58ba3afdb9d465;hp=2c4e5867ee699b1081527bc6c6ea0e99a35a5c27
-
-Bug 697500: Fix NULL ptr access.
-
-Cope better with errors during rendering - avoid letting the
-gstate stack get out of sync.
-
-This avoids us ever getting into the situation of popping
-a clip when we should be popping a mask or a group. This was
-causing an unexpected case in the painting.
----
-
-diff --git a/source/pdf/pdf-op-run.c b/source/pdf/pdf-op-run.c
-index a3ea895..f1eac8d 100644
---- a/source/pdf/pdf-op-run.c
-+++ b/source/pdf/pdf-op-run.c
-@@ -1213,6 +1213,7 @@ pdf_run_xobject(fz_context *ctx, pdf_run_processor *proc, pdf_xobject *xobj, pdf
- pdf_run_processor *pr = (pdf_run_processor *)proc;
- pdf_gstate *gstate = NULL;
- int oldtop = 0;
-+ int oldbot = -1;
- fz_matrix local_transform = *transform;
- softmask_save softmask = { NULL };
- int gparent_save;
-@@ -1232,16 +1233,17 @@ pdf_run_xobject(fz_context *ctx, pdf_run_processor *proc, pdf_xobject *xobj, pdf
- fz_var(cleanup_state);
- fz_var(gstate);
- fz_var(oldtop);
-+ fz_var(oldbot);
-
- gparent_save = pr->gparent;
- pr->gparent = pr->gtop;
-+ oldtop = pr->gtop;
-
- fz_try(ctx)
- {
- pdf_gsave(ctx, pr);
-
- gstate = pr->gstate + pr->gtop;
-- oldtop = pr->gtop;
-
- pdf_xobject_bbox(ctx, xobj, &xobj_bbox);
- pdf_xobject_matrix(ctx, xobj, &xobj_matrix);
-@@ -1302,12 +1304,25 @@ pdf_run_xobject(fz_context *ctx, pdf_run_processor *proc, pdf_xobject *xobj, pdf
-
- doc = pdf_get_bound_document(ctx, xobj->obj);
-
-+ oldbot = pr->gbot;
-+ pr->gbot = pr->gtop;
-+
- pdf_process_contents(ctx, (pdf_processor*)pr, doc, resources, xobj->obj, NULL);
- }
- fz_always(ctx)
- {
-+ /* Undo any gstate mismatches due to the pdf_process_contents call */
-+ if (oldbot != -1)
-+ {
-+ while (pr->gtop > pr->gbot)
-+ {
-+ pdf_grestore(ctx, pr);
-+ }
-+ pr->gbot = oldbot;
-+ }
-+
- if (cleanup_state >= 3)
-- pdf_grestore(ctx, pr); /* Remove the clippath */
-+ pdf_grestore(ctx, pr); /* Remove the state we pushed for the clippath */
-
- /* wrap up transparency stacks */
- if (transparency)
-@@ -1341,13 +1356,8 @@ pdf_run_xobject(fz_context *ctx, pdf_run_processor *proc, pdf_xobject *xobj, pdf
- pr->gstate[pr->gparent].ctm = gparent_save_ctm;
- pr->gparent = gparent_save;
-
-- if (gstate)
-- {
-- while (oldtop < pr->gtop)
-- pdf_grestore(ctx, pr);
--
-+ while (oldtop < pr->gtop)
- pdf_grestore(ctx, pr);
-- }
-
- pdf_unmark_obj(ctx, xobj->obj);
- }
diff --git a/app-text/mupdf/files/mupdf-1.10a-null-pointer.patch b/app-text/mupdf/files/mupdf-1.10a-null-pointer.patch
deleted file mode 100644
index 9a459b28011..00000000000
--- a/app-text/mupdf/files/mupdf-1.10a-null-pointer.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Sebastian Rasmussen <sebras@gmail.com>
-Date: Sat, 4 Feb 2017 05:21:20 +0000 (+0100)
-Subject: Bug 697514: Write SVG output to stdout if no output specified.
-X-Git-Url: http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=40ac85bfb676bb4373bda4b18f9fd90268c9f1e9
-
-Bug 697514: Write SVG output to stdout if no output specified.
----
-
-diff --git a/source/tools/mudraw.c b/source/tools/mudraw.c
-index 95b3440..720e7ff 100644
---- a/source/tools/mudraw.c
-+++ b/source/tools/mudraw.c
-@@ -578,7 +578,7 @@ static void dodrawpage(fz_context *ctx, fz_page *page, fz_display_list *list, in
- char buf[512];
- fz_output *out;
-
-- if (!strcmp(output, "-"))
-+ if (!output || !strcmp(output, "-"))
- out = fz_stdout(ctx);
- else
- {
diff --git a/app-text/mupdf/files/mupdf-1.8-system-glfw.patch b/app-text/mupdf/files/mupdf-1.8-system-glfw.patch
deleted file mode 100644
index bda8bd87e57..00000000000
--- a/app-text/mupdf/files/mupdf-1.8-system-glfw.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mupdf-1.8/Makerules
-+++ mupdf-1.8/Makerules
-@@ -119,6 +119,8 @@
- SYS_JBIG2DEC_LIBS = -ljbig2dec
- SYS_JPEG_LIBS = -ljpeg
- SYS_ZLIB_LIBS = -lz
-+SYS_GLFW_CFLAGS = $(shell pkg-config --cflags glfw3 gl)
-+SYS_GLFW_LIBS = $(shell pkg-config --libs glfw3 gl)
-
- endif
-
diff --git a/app-text/mupdf/files/mupdf-1.9a-CFLAGS.patch b/app-text/mupdf/files/mupdf-1.9a-CFLAGS.patch
deleted file mode 100644
index a6caa30c95c..00000000000
--- a/app-text/mupdf/files/mupdf-1.9a-CFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mupdf-1.9a/Makerules
-+++ mupdf-1.9a/Makerules
-@@ -10,7 +10,7 @@
- CFLAGS += -Wall
-
- ifeq "$(build)" "debug"
--CFLAGS += -pipe -g -DDEBUG
-+CFLAGS += -DDEBUG
- LDFLAGS += -g
- else ifeq "$(build)" "release"
- CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer
diff --git a/app-text/mupdf/mupdf-1.10a-r2.ebuild b/app-text/mupdf/mupdf-1.10a-r2.ebuild
deleted file mode 100644
index 099dfb0605b..00000000000
--- a/app-text/mupdf/mupdf-1.10a-r2.ebuild
+++ /dev/null
@@ -1,148 +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
- "${FILESDIR}"/${PN}-1.10a-null-pointer-2.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 "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
- -e "/^MUPDF_LIB =/s:=.*:= \$(OUT)/${my_soname}:" \
- -e "\$a\$(MUPDF_JS_NONE_LIB):" \
- -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
- -e "/install/s: COPYING : :" \
- -i Makefile || die
-}
-
-src_compile() {
- emake XCFLAGS="-fpic"
- use static-libs && \
- emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
- use static && \
- emake -C "${S}"-static XLIBS="-static"
-}
-
-src_install() {
- if use X ; then
- domenu platform/debian/${PN}.desktop
- doicon platform/debian/${PN}.xpm
- else
- rm docs/man/${PN}.1
- fi
-
- emake install
- dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
-
- use static-libs && \
- dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
- if use static ; then
- dobin "${S}"-static/build/debug/mu{tool,draw}
- use X && dobin "${S}"-static/build/debug/${PN}-x11
- fi
- use X && dosym ${PN}-x11 /usr/bin/${PN}
-
- insinto /usr/$(get_libdir)/pkgconfig
- doins platform/debian/${PN}.pc
-
- dodoc README docs/*.{txt,c}
-}
diff --git a/app-text/mupdf/mupdf-1.11.ebuild b/app-text/mupdf/mupdf-1.11.ebuild
deleted file mode 100644
index dd647117670..00000000000
--- a/app-text/mupdf/mupdf-1.11.ebuild
+++ /dev/null
@@ -1,151 +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.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
-)
-
-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) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
- -e "/^MUPDF_LIB =/s:=.*:= \$(OUT)/${my_soname}:" \
- -e "\$a\$(MUPDF_JS_NONE_LIB):" \
- -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
- -e "/install/s: COPYING : :" \
- -i Makefile || die
-}
-
-src_compile() {
- emake XCFLAGS="-fpic"
- use static-libs && \
- emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
- use static && \
- emake -C "${S}"-static XLIBS="-static"
-}
-
-src_install() {
- if use X ; then
- domenu platform/debian/${PN}.desktop
- doicon platform/debian/${PN}.xpm
- else
- rm docs/man/${PN}.1
- fi
-
- emake install
- dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
-
- use static-libs && \
- dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
- if use static ; then
- dobin "${S}"-static/build/debug/mu{tool,draw}
- use X && dobin "${S}"-static/build/debug/${PN}-x11
- fi
- if use X ; then
- if use opengl ; then
- dosym ${PN}-gl /usr/bin/${PN}
- einfo "mupdf symlink points to mupdf-gl (bug 616654)"
- else
- dosym ${PN}-x11 /usr/bin/${PN}
- fi
- fi
- insinto /usr/$(get_libdir)/pkgconfig
- doins platform/debian/${PN}.pc
-
- dodoc README docs/*.{txt,c}
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/
@ 2017-06-22 23:30 Michael Weber
0 siblings, 0 replies; 20+ messages in thread
From: Michael Weber @ 2017-06-22 23:30 UTC (permalink / raw
To: gentoo-commits
commit: 3be187616f2921e36c9bf82cb95d97f00cb12ad2
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 22 23:30:06 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Thu Jun 22 23:30:06 2017 +0000
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 00000000000..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() {
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/
@ 2018-07-25 1:33 Virgil Dupras
0 siblings, 0 replies; 20+ messages in thread
From: Virgil Dupras @ 2018-07-25 1:33 UTC (permalink / raw
To: gentoo-commits
commit: 856a6ad1fd3dfe1ab67a2976edc3f5dedd694fa3
Author: Jouni Kosonen <jouni.kosonen <AT> tukesoft <DOT> com>
AuthorDate: Wed Jun 27 07:03:42 2018 +0000
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Wed Jul 25 01:31:14 2018 +0000
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 11ae620e55e9ebd5844abd7decacc0dafc90dd1f4907ba6ed12f5c725d3920187fc730a7fc33979bf3ff9451da7dbb51f34480a878083e2064f3455555f47d96
+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 00000000000..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 00000000000..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]
+ 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
+)
+
+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 "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
+ -e "/^MUPDF_LIB =/s:=.*:= \$(OUT)/${my_soname}:" \
+ -e "\$a\$(MUPDF_JS_NONE_LIB):" \
+ -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
+ -e "/install/s: COPYING : :" \
+ -i Makefile || die
+}
+
+src_compile() {
+ use lcms && emake XCFLAGS="-fpic" third
+ emake XCFLAGS="-fpic" \
+ HAVE_GLUT=$(usex opengl yes no) \
+ HAVE_MUJS=$(usex javascript) \
+ MUJS_LIBS=$(usex javascript -lmujs '') \
+ WANT_CURL=$(usex curl) \
+ WANT_OPENSSL=$(usex openssl) \
+ WANT_X11=$(usex X)
+
+ use static-libs && \
+ emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
+ use static && \
+ emake -C "${S}"-static XLIBS="-static"
+}
+
+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 \
+ HAVE_GLUT=$(usex opengl yes no) \
+ HAVE_MUJS=$(usex javascript) \
+ MUJS_LIBS=$(usex javascript -lmujs '') \
+ WANT_CURL=$(usex curl) \
+ WANT_OPENSSL=$(usex openssl) \
+ WANT_X11=$(usex X)
+
+ dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
+
+ use static-libs && \
+ dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
+ if use static ; then
+ dobin "${S}"-static/build/debug/mu{tool,draw}
+ use X && dobin "${S}"-static/build/debug/${PN}-x11
+ fi
+ 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
+}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/
@ 2018-08-18 21:01 Virgil Dupras
0 siblings, 0 replies; 20+ messages in thread
From: Virgil Dupras @ 2018-08-18 21:01 UTC (permalink / raw
To: gentoo-commits
commit: 0f5d484ee208b2c918e0778c6d259bd97ee77475
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 18 20:57:03 2018 +0000
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Sat Aug 18 20:59:59 2018 +0000
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 11ae620e55e9ebd5844abd7decacc0dafc90dd1f4907ba6ed12f5c725d3920187fc730a7fc33979bf3ff9451da7dbb51f34480a878083e2064f3455555f47d96
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..00000000000
--- 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..00000000000
--- a/app-text/mupdf/files/mupdf-1.11-CVE-2017-6060.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-X-Git-Url: http://git.ghostscript.com/?p=user%2Fsebras%2Fmupdf.git;a=blobdiff_plain;f=platform%2Fx11%2Fjstest_main.c;h=f158d9628ed0c0a84e37fe128277679e8334422a;hp=13c3a0a3ba3ff4aae29f6882d23740833c1d842f;hb=06a012a42c9884e3cd653e7826cff1ddec04eb6e;hpb=34e18d127a02146e3415b33c4b67389ce1ddb614
-
-diff --git a/platform/x11/jstest_main.c b/platform/x11/jstest_main.c
-index 13c3a0a..f158d96 100644
---- a/platform/x11/jstest_main.c
-+++ b/platform/x11/jstest_main.c
-@@ -346,7 +346,7 @@ main(int argc, char *argv[])
- }
- else if (match(&line, "OPEN"))
- {
-- char path[1024];
-+ char path[LONGLINE];
- if (file_open)
- pdfapp_close(&gapp);
- if (prefix)
diff --git a/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11-r1.patch b/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11-r1.patch
deleted file mode 100644
index 92845a0eef2..00000000000
--- 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
- 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/files/mupdf-1.11-openssl-curl-x11.patch b/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11.patch
deleted file mode 100644
index 91fd9f6485d..00000000000
--- a/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11.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
- 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
deleted file mode 100644
index 90189f9400b..00000000000
--- a/app-text/mupdf/files/mupdf-1.11-system-glfw.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-r1.ebuild b/app-text/mupdf/mupdf-1.11-r1.ebuild
deleted file mode 100644
index 0b2990cc8b2..00000000000
--- a/app-text/mupdf/mupdf-1.11-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2018 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="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 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" \
- -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) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
- -e "/^MUPDF_LIB =/s:=.*:= \$(OUT)/${my_soname}:" \
- -e "\$a\$(MUPDF_JS_NONE_LIB):" \
- -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
- -e "/install/s: COPYING : :" \
- -i Makefile || die
-}
-
-src_compile() {
- emake XCFLAGS="-fpic"
- use static-libs && \
- emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
- use static && \
- emake -C "${S}"-static XLIBS="-static"
-}
-
-src_install() {
- if use X ; then
- domenu platform/debian/${PN}.desktop
- doicon platform/debian/${PN}.xpm
- else
- rm docs/man/${PN}.1
- fi
-
- emake install
- dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
-
- use static-libs && \
- dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
- if use static ; then
- dobin "${S}"-static/build/debug/mu{tool,draw}
- use X && dobin "${S}"-static/build/debug/${PN}-x11
- fi
- if use X ; then
- if use opengl ; then
- dosym ${PN}-gl /usr/bin/${PN}
- einfo "mupdf symlink points to mupdf-gl (bug 616654)"
- else
- dosym ${PN}-x11 /usr/bin/${PN}
- fi
- fi
- insinto /usr/$(get_libdir)/pkgconfig
- doins platform/debian/${PN}.pc
-
- dodoc README docs/*.{txt,c}
-}
diff --git a/app-text/mupdf/mupdf-1.11-r2.ebuild b/app-text/mupdf/mupdf-1.11-r2.ebuild
deleted file mode 100644
index da582f3a291..00000000000
--- a/app-text/mupdf/mupdf-1.11-r2.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2018 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="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 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
- "${FILESDIR}"/${PN}-1.11-drop-libmupdfthird.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) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
- -e "/^MUPDF_LIB =/s:=.*:= \$(OUT)/${my_soname}:" \
- -e "\$a\$(MUPDF_JS_NONE_LIB):" \
- -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
- -e "/install/s: COPYING : :" \
- -i Makefile || die
-}
-
-src_compile() {
- emake XCFLAGS="-fpic"
- use static-libs && \
- emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
- use static && \
- emake -C "${S}"-static XLIBS="-static"
-}
-
-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 ${my_soname} /usr/$(get_libdir)/lib${PN}.so
-
- use static-libs && \
- dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
- if use static ; then
- dobin "${S}"-static/build/debug/mu{tool,draw}
- use X && dobin "${S}"-static/build/debug/${PN}-x11
- fi
- 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 docs/*.{txt,c}
-}
diff --git a/app-text/mupdf/mupdf-1.12.0-r2.ebuild b/app-text/mupdf/mupdf-1.12.0-r2.ebuild
deleted file mode 100644
index 8810e2deaf0..00000000000
--- a/app-text/mupdf/mupdf-1.12.0-r2.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# 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-r1.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 "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
- -e "/^MUPDF_LIB =/s:=.*:= \$(OUT)/${my_soname}:" \
- -e "\$a\$(MUPDF_JS_NONE_LIB):" \
- -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
- -e "/install/s: COPYING : :" \
- -i Makefile || die
-}
-
-src_compile() {
- use lcms && emake XCFLAGS="-fpic" third
- emake XCFLAGS="-fpic" \
- HAVE_GLUT=$(usex opengl yes no) \
- HAVE_MUJS=$(usex javascript) \
- MUJS_LIBS=$(usex javascript -lmujs '') \
- WANT_CURL=$(usex curl) \
- WANT_OPENSSL=$(usex openssl) \
- WANT_X11=$(usex X)
-
- use static-libs && \
- emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
- use static && \
- emake -C "${S}"-static XLIBS="-static"
-}
-
-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 \
- HAVE_GLUT=$(usex opengl yes no) \
- HAVE_MUJS=$(usex javascript) \
- MUJS_LIBS=$(usex javascript -lmujs '') \
- WANT_CURL=$(usex curl) \
- WANT_OPENSSL=$(usex openssl) \
- WANT_X11=$(usex X)
-
- dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
-
- use static-libs && \
- dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
- if use static ; then
- dobin "${S}"-static/build/debug/mu{tool,draw}
- use X && dobin "${S}"-static/build/debug/${PN}-x11
- fi
- 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.12.0.ebuild b/app-text/mupdf/mupdf-1.12.0.ebuild
deleted file mode 100644
index 9f1100e51cb..00000000000
--- a/app-text/mupdf/mupdf-1.12.0.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# 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[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
- "${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}" \
- -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) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
- -e "/^MUPDF_LIB =/s:=.*:= \$(OUT)/${my_soname}:" \
- -e "\$a\$(MUPDF_JS_NONE_LIB):" \
- -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
- -e "/install/s: COPYING : :" \
- -i Makefile || die
-}
-
-src_compile() {
- use lcms && emake XCFLAGS="-fpic" third
- emake XCFLAGS="-fpic"
- use static-libs && \
- emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
- use static && \
- emake -C "${S}"-static XLIBS="-static"
-}
-
-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 ${my_soname} /usr/$(get_libdir)/lib${PN}.so
-
- use static-libs && \
- dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
- if use static ; then
- dobin "${S}"-static/build/debug/mu{tool,draw}
- use X && dobin "${S}"-static/build/debug/${PN}-x11
- fi
- 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
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/
@ 2018-10-07 17:43 Virgil Dupras
0 siblings, 0 replies; 20+ messages in thread
From: Virgil Dupras @ 2018-10-07 17:43 UTC (permalink / raw
To: gentoo-commits
commit: da7c28ccf0ad7b3a35d0adbd0ed2ad50640e718f
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 7 13:39:48 2018 +0000
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Sun Oct 7 17:40:50 2018 +0000
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 <vdupras <AT> 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 00000000000..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 00000000000..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 00000000000..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 @@ else ifeq ($(OS),Linux)
+ SYS_GLUT_LIBS := -lglut -lGL
+ endif
+
++ WANT_X11 ?= yes
++ ifeq "$(WANT_X11)" "yes"
+ HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
+ ifeq ($(HAVE_X11),yes)
+ X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
+ X11_LIBS := $(shell pkg-config --libs x11 xext)
+ endif
++ endif
+
+- HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
+- ifeq ($(HAVE_LIBCRYPTO),yes)
++ WANT_OPENSSL ?= yes
++ ifeq "$(WANT_OPENSSL)" "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
++ LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
++ LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
++ endif
++ else ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes"
++ HAVE_LIBCRYPTO := yes
+ LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
+ LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
+ endif
++ endif
+
+ HAVE_PTHREAD := yes
+ ifeq ($(HAVE_PTHREAD),yes)
diff --git a/app-text/mupdf/mupdf-1.14.0.ebuild b/app-text/mupdf/mupdf-1.14.0.ebuild
new file mode 100644
index 00000000000..8c23107fc6d
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.14.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2018 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 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X curl +javascript libressl opengl +openssl static-libs +vanilla"
+
+RDEPEND="
+ >=dev-lang/mujs-1.0.4
+ 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?]
+ 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:= )
+ 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-debug-build.patch
+ "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+ # See bug #662352
+ "${FILESDIR}"/${PN}-1.14-openssl-curl-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
+
+ 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
+
+ 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 \
+ HAVE_GLUT=$(usex opengl yes no) \
+ WANT_CURL=$(usex curl) \
+ WANT_OPENSSL=$(usex openssl) \
+ WANT_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 -C "${S}"-static build/debug/lib${PN}{,-js-none}.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
+
+ use static-libs && \
+ dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.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
+}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/
@ 2018-10-15 14:43 Virgil Dupras
0 siblings, 0 replies; 20+ messages in thread
From: Virgil Dupras @ 2018-10-15 14:43 UTC (permalink / raw
To: gentoo-commits
commit: 84450c429203901c5de4e786b4413fbb5f25d731
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 15 14:41:38 2018 +0000
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Mon Oct 15 14:41:38 2018 +0000
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 <vdupras <AT> 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 00000000000..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..00000000000
--- 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}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/
@ 2018-12-21 1:11 Virgil Dupras
0 siblings, 0 replies; 20+ messages in thread
From: Virgil Dupras @ 2018-12-21 1:11 UTC (permalink / raw
To: gentoo-commits
commit: a1b87a4250380f9fbc024147fa32eb679bd76848
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 21 01:10:18 2018 +0000
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Fri Dec 21 01:10:18 2018 +0000
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 <vdupras <AT> 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 00000000000..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.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/mupdf-1.14.0-r2.ebuild b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
index 74cadb6f860..d6f2331ad66 100644
--- a/app-text/mupdf/mupdf-1.14.0-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
@@ -45,6 +45,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
# See bug #662352
"${FILESDIR}"/${PN}-1.14-openssl-curl-x11.patch
+ # bug #672998
+ "${FILESDIR}"/${PN}-1.14-fix-big-endian.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/
@ 2019-11-22 9:47 Mikle Kolyada
0 siblings, 0 replies; 20+ messages in thread
From: Mikle Kolyada @ 2019-11-22 9:47 UTC (permalink / raw
To: gentoo-commits
commit: a89743c14b67fa2507926ad8d0aea43b5b8712b0
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 22 09:47:17 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Nov 22 09:47:17 2019 +0000
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 <zlogene <AT> 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..00000000000
--- 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..00000000000
--- 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..00000000000
--- 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-libressl.patch b/app-text/mupdf/files/mupdf-1.14-libressl.patch
deleted file mode 100644
index fcc0a7205c1..00000000000
--- a/app-text/mupdf/files/mupdf-1.14-libressl.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 8561b744ac95ab6145a1163fa1d7c490a3329465 Mon Sep 17 00:00:00 2001
-From: William <wonko@undefined.re>
-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
deleted file mode 100644
index 79efe32c0e4..00000000000
--- 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 35391245023..00000000000
--- 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 fca81cfa02f..00000000000
--- 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 7d1f75d3ee1..00000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/
@ 2019-11-26 14:25 Jory Pratt
0 siblings, 0 replies; 20+ messages in thread
From: Jory Pratt @ 2019-11-26 14:25 UTC (permalink / raw
To: gentoo-commits
commit: 8f02d9eb7b96d30a41ee5303f83b61591b17b880
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 26 14:18:39 2019 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Tue Nov 26 14:25:14 2019 +0000
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 <anarchy <AT> 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..00000000000
--- 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..00000000000
--- 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..00000000000
--- 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 79efe32c0e4..00000000000
--- 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 35391245023..00000000000
--- 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 fca81cfa02f..00000000000
--- 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 7d1f75d3ee1..00000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/
@ 2020-10-13 23:21 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2020-10-13 23:21 UTC (permalink / raw
To: gentoo-commits
commit: 197b4aee35918341c66b38a761b111d978b00fa6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 23:21:32 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 23:21:39 2020 +0000
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 <sam <AT> 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 00000000000..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 <Robin.Watts@artifex.com>
+Date: Thu, 8 Oct 2020 16:15:40 +0100
+Subject: [PATCH] Bug 701297: Harden populate_ui against unexpected repairs.
+
+We count the number of layers, and allocate space for them in
+an array. We then walk the tree reading details of those layers
+in. If we hit a problem that causes a repair while reading the
+information, the number of layers can magically increase. In
+the existing code we run off the end of the array.
+
+In the new code we watch for hitting the end of the array and
+realloc as required.
+---
+ source/pdf/pdf-layer.c | 32 +++++++++++++++++++++++++-------
+ 1 file changed, 25 insertions(+), 7 deletions(-)
+
+diff --git a/source/pdf/pdf-layer.c b/source/pdf/pdf-layer.c
+index 177f0c947..b8e9d7cad 100644
+--- a/source/pdf/pdf-layer.c
++++ b/source/pdf/pdf-layer.c
+@@ -104,10 +104,27 @@ count_entries(fz_context *ctx, pdf_obj *obj)
+ }
+
+ static pdf_ocg_ui *
+-populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_ocg_ui *ui, pdf_obj *order, int depth, pdf_obj *rbgroups, pdf_obj *locked)
++get_ocg_ui(fz_context *ctx, pdf_ocg_descriptor *desc, int fill)
++{
++ if (fill == desc->num_ui_entries)
++ {
++ /* Number of layers changed while parsing;
++ * probably due to a repair. */
++ int newsize = desc->num_ui_entries * 2;
++ if (newsize == 0)
++ newsize = 4; /* Arbitrary non-zero */
++ desc->ui = fz_realloc_array(ctx, desc->ui, newsize, pdf_ocg_ui);
++ desc->num_ui_entries = newsize;
++ }
++ return &desc->ui[fill];
++}
++
++static int
++populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, int fill, pdf_obj *order, int depth, pdf_obj *rbgroups, pdf_obj *locked)
+ {
+ int len = pdf_array_len(ctx, order);
+ int i, j;
++ pdf_ocg_ui *ui;
+
+ for (i = 0; i < len; i++)
+ {
+@@ -118,7 +135,7 @@ populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_ocg_ui *ui, pdf_obj *
+ continue;
+
+ fz_try(ctx)
+- ui = populate_ui(ctx, desc, ui, o, depth+1, rbgroups, locked);
++ fill = populate_ui(ctx, desc, fill, o, depth+1, rbgroups, locked);
+ fz_always(ctx)
+ pdf_unmark_obj(ctx, o);
+ fz_catch(ctx)
+@@ -126,14 +143,14 @@ populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_ocg_ui *ui, pdf_obj *
+
+ continue;
+ }
+- ui->depth = depth;
+ if (pdf_is_string(ctx, o))
+ {
++ ui = get_ocg_ui(ctx, desc, fill++);
++ ui->depth = depth;
+ ui->ocg = -1;
+ ui->name = pdf_to_str_buf(ctx, o);
+ ui->button_flags = PDF_LAYER_UI_LABEL;
+ ui->locked = 1;
+- ui++;
+ continue;
+ }
+
+@@ -144,13 +161,14 @@ populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_ocg_ui *ui, pdf_obj *
+ }
+ if (j == desc->len)
+ continue; /* OCG not found in main list! Just ignore it */
++ ui = get_ocg_ui(ctx, desc, fill++);
++ ui->depth = depth;
+ ui->ocg = j;
+ ui->name = pdf_dict_get_string(ctx, o, PDF_NAME(Name), NULL);
+ ui->button_flags = pdf_array_contains(ctx, o, rbgroups) ? PDF_LAYER_UI_RADIOBOX : PDF_LAYER_UI_CHECKBOX;
+ ui->locked = pdf_array_contains(ctx, o, locked);
+- ui++;
+ }
+- return ui;
++ return fill;
+ }
+
+ static void
+@@ -188,7 +206,7 @@ load_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_obj *ocprops, pdf_obj *oc
+ desc->ui = Memento_label(fz_calloc(ctx, count, sizeof(pdf_ocg_ui)), "pdf_ocg_ui");
+ fz_try(ctx)
+ {
+- (void)populate_ui(ctx, desc, desc->ui, order, 0, rbgroups, locked);
++ desc->num_ui_entries = populate_ui(ctx, desc, 0, order, 0, rbgroups, locked);
+ }
+ fz_catch(ctx)
+ {
diff --git a/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pixmap.c b/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pixmap.c
new file mode 100644
index 00000000000..d19f0593a11
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pixmap.c
@@ -0,0 +1,41 @@
+From 32e4e8b4bcbacbf92af7c88337efae21986d9603 Mon Sep 17 00:00:00 2001
+From: Robin Watts <Robin.Watts@artifex.com>
+Date: Thu, 8 Oct 2020 18:10:28 +0100
+Subject: [PATCH] Bug 702958: Fix overflow in fz_clear_pixmap_with_value.
+
+---
+ source/fitz/pixmap.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/source/fitz/pixmap.c b/source/fitz/pixmap.c
+index 66873d214..80d8bb62f 100644
+--- a/source/fitz/pixmap.c
++++ b/source/fitz/pixmap.c
+@@ -555,7 +555,8 @@ void
+ fz_clear_pixmap_with_value(fz_context *ctx, fz_pixmap *pix, int value)
+ {
+ unsigned char *s;
+- int w, h, n, stride, len;
++ int w, h, n;
++ ptrdiff_t stride, len;
+ int alpha = pix->alpha;
+
+ w = pix->w;
+@@ -572,7 +573,7 @@ fz_clear_pixmap_with_value(fz_context *ctx, fz_pixmap *pix, int value)
+
+ n = pix->n;
+ stride = pix->stride;
+- len = w * n;
++ len = (ptrdiff_t)w * n;
+
+ s = pix->samples;
+ if (value == 255 || !alpha)
+@@ -584,7 +585,7 @@ fz_clear_pixmap_with_value(fz_context *ctx, fz_pixmap *pix, int value)
+ }
+ while (h--)
+ {
+- memset(s, value, (unsigned int)len);
++ memset(s, value, len);
+ s += stride;
+ }
+ }
diff --git a/app-text/mupdf/mupdf-1.18.0.ebuild b/app-text/mupdf/mupdf-1.18.0.ebuild
index 05c1261e442..c7cab5a41c8 100644
--- a/app-text/mupdf/mupdf-1.18.0.ebuild
+++ b/app-text/mupdf/mupdf-1.18.0.ebuild
@@ -49,6 +49,9 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
# General cross fixes from Debian (refreshed)
"${FILESDIR}"/${PN}-1.18.0-cross-fixes.patch
+ # Additional security patches post-1.18.0
+ "${FILESDIR}"/${P}-fix-oob-in-pdf-layer.c
+ "${FILESDIR}"/${P}-fix-oob-in-pixmap.c
)
src_prepare() {
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/
@ 2021-02-24 16:22 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2021-02-24 16:22 UTC (permalink / raw
To: gentoo-commits
commit: 6f8610d53861f805bf4c4b6e1366935ad660b141
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 24 16:09:26 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 24 16:21:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f8610d5
app-text/mupdf: patch CVE-2021-3407
Bug: https://bugs.gentoo.org/772311
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../mupdf/files/mupdf-1.18.0-CVE-2021-3407.patch | 51 ++++++++
app-text/mupdf/mupdf-1.18.0-r3.ebuild | 145 +++++++++++++++++++++
2 files changed, 196 insertions(+)
diff --git a/app-text/mupdf/files/mupdf-1.18.0-CVE-2021-3407.patch b/app-text/mupdf/files/mupdf-1.18.0-CVE-2021-3407.patch
new file mode 100644
index 00000000000..566ee562389
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.18.0-CVE-2021-3407.patch
@@ -0,0 +1,51 @@
+https://bugs.gentoo.org/772311
+
+From cee7cefc610d42fd383b3c80c12cbc675443176a Mon Sep 17 00:00:00 2001
+From: Robin Watts <Robin.Watts@artifex.com>
+Date: Fri, 22 Jan 2021 17:05:15 +0000
+Subject: [PATCH 1/1] Bug 703366: Fix double free of object during
+ linearization.
+
+This appears to happen because we parse an illegal object from
+a broken file and assign it to object 0, which is defined to
+be free.
+
+Here, we fix the parsing code so this can't happen.
+---
+ source/pdf/pdf-parse.c | 6 ++++++
+ source/pdf/pdf-xref.c | 2 ++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/source/pdf/pdf-parse.c b/source/pdf/pdf-parse.c
+index 7abc8c3d4..5761c3351 100644
+--- a/source/pdf/pdf-parse.c
++++ b/source/pdf/pdf-parse.c
+@@ -749,6 +749,12 @@ pdf_parse_ind_obj(fz_context *ctx, pdf_document *doc,
+ fz_throw(ctx, FZ_ERROR_SYNTAX, "expected generation number (%d ? obj)", num);
+ }
+ gen = buf->i;
++ if (gen < 0 || gen >= 65536)
++ {
++ if (try_repair)
++ *try_repair = 1;
++ fz_throw(ctx, FZ_ERROR_SYNTAX, "invalid generation number (%d)", gen);
++ }
+
+ tok = pdf_lex(ctx, file, buf);
+ if (tok != PDF_TOK_OBJ)
+diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c
+index 1b2bdcd59..30197b4b8 100644
+--- a/source/pdf/pdf-xref.c
++++ b/source/pdf/pdf-xref.c
+@@ -1190,6 +1190,8 @@ pdf_read_new_xref(fz_context *ctx, pdf_document *doc, pdf_lexbuf *buf)
+ {
+ ofs = fz_tell(ctx, doc->file);
+ trailer = pdf_parse_ind_obj(ctx, doc, doc->file, buf, &num, &gen, &stm_ofs, NULL);
++ if (num == 0)
++ fz_throw(ctx, FZ_ERROR_GENERIC, "Trailer object number cannot be 0\n");
+ }
+ fz_catch(ctx)
+ {
+--
+2.17.1
+
diff --git a/app-text/mupdf/mupdf-1.18.0-r3.ebuild b/app-text/mupdf/mupdf-1.18.0-r3.ebuild
new file mode 100644
index 00000000000..4e67ceb7f20
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.18.0-r3.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git"
+SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
+S="${WORKDIR}/${P}-source"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86"
+IUSE="X +javascript libressl opengl ssl"
+REQUIRED_USE="opengl? ( javascript )"
+
+# Although we use the bundled, patched version of freeglut in mupdf (because of
+# bug #653298), the best way to ensure that its dependencies are present is to
+# install system's freeglut.
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+ dev-libs/gumbo
+ media-libs/freetype:2=
+ media-libs/harfbuzz:=[truetype]
+ media-libs/jbig2dec:=
+ media-libs/libpng:0=
+ >=media-libs/openjpeg-2.1:2=
+ virtual/jpeg
+ javascript? ( >=dev-lang/mujs-1.0.7:= )
+ opengl? ( >=media-libs/freeglut-3.0.0 )
+ ssl? (
+ libressl? ( >=dev-libs/libressl-3.1.4:0= )
+ !libressl? ( >=dev-libs/openssl-1.1:0= )
+ )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXext
+ )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.15-CFLAGS.patch
+ "${FILESDIR}"/${PN}-1.18-Makefile.patch
+ "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+ # See bugs #662352
+ "${FILESDIR}"/${PN}-1.15-openssl-x11.patch
+ # General cross fixes from Debian (refreshed)
+ "${FILESDIR}"/${PN}-1.18.0-cross-fixes.patch
+ # Additional security patches post-1.18.0
+ "${FILESDIR}"/${P}-fix-oob-in-pdf-layer.c
+ "${FILESDIR}"/${P}-fix-oob-in-pixmap.c
+ "${FILESDIR}"/${P}-CVE-2021-3407.patch
+)
+
+src_prepare() {
+ xdg_src_prepare
+
+ use hppa && append-cflags -ffunction-sections
+
+ append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)"
+
+ sed -e "1iOS = Linux" \
+ -e "1iCC = $(tc-getCC)" \
+ -e "1iCXX = $(tc-getCXX)" \
+ -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.
+ # Bundled libs
+ # * General
+ # Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's
+ # recommendations. It does not mean "always use system libs".
+ # See [0] below for what it means in a specific version.
+ #
+ # * freeglut
+ # We don't use system's freeglut because upstream has a special modified
+ # version of it that gives mupdf clipboard support. See bug #653298
+ #
+ # * mujs
+ # As of v1.15.0, mupdf started using symbols in mujs that were not part
+ # of any release. We then went back to using the bundled version of it.
+ # But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk
+ # when bumping and check!
+ # See bug #685244
+ #
+ # * lmms2
+ # mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1].
+ # It is therefore not appropriate for us to unbundle it at this time.
+ #
+ # [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9
+ # [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt
+ emake \
+ GENTOO_PV=${PV} \
+ HAVE_GLUT=$(usex opengl) \
+ HAVE_LIBCRYPTO=$(usex ssl) \
+ HAVE_X11=$(usex X) \
+ USE_SYSTEM_LIBS=yes \
+ USE_SYSTEM_MUJS=$(usex javascript) \
+ USE_SYSTEM_GLUT=no \
+ HAVE_OBJCOPY=no \
+ "$@"
+}
+
+src_compile() {
+ _emake XCFLAGS="-fpic"
+}
+
+src_install() {
+ if use X || use opengl ; then
+ domenu platform/debian/${PN}.desktop
+ doicon platform/debian/${PN}.xpm
+ else
+ rm docs/man/${PN}.1 || die
+ fi
+
+ _emake install
+
+ dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+
+ 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
+
+ # Respect libdir (bug #734898)
+ sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die
+
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins platform/debian/${PN}.pc
+
+ dodoc README CHANGES CONTRIBUTORS
+}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/
@ 2022-06-30 12:45 Florian Schmaus
0 siblings, 0 replies; 20+ messages in thread
From: Florian Schmaus @ 2022-06-30 12:45 UTC (permalink / raw
To: gentoo-commits
commit: e69ffe486e072430217eb921a1886f93d8d74534
Author: Philipp Rösner <rndxelement <AT> protonmail <DOT> com>
AuthorDate: Wed Jun 29 19:36:48 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 12:43:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e69ffe48
app-text/mupdf: fix strict-aliasing violations
Fix two issues in thirdparty/lcms2/src/cmsplugin.c regarding
strinct-aliasing rule violations.
Closes: https://bugs.gentoo.org/855020
Signed-off-by: Philipp Rösner <rndxelement <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26152
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
app-text/mupdf/files/mupdf-1.20.0-lcms2.patch | 20 ++++++++++++++++++++
app-text/mupdf/mupdf-1.20.0.ebuild | 1 +
2 files changed, 21 insertions(+)
diff --git a/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch b/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch
new file mode 100644
index 000000000000..a975d42d15e9
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch
@@ -0,0 +1,20 @@
+--- a/thirdparty/lcms2/src/cmsplugin.c
++++ b/thirdparty/lcms2/src/cmsplugin.c
+@@ -177,7 +177,7 @@ cmsBool CMSEXPORT _cmsReadFloat32Number(cmsContext ContextID, cmsIOHANDLER* io,
+ if (n != NULL) {
+
+ tmp = _cmsAdjustEndianess32(tmp);
+- *n = *(cmsFloat32Number*)(void*)&tmp;
++ *n = (cmsFloat32Number)tmp;
+
+ // Safeguard which covers against absurd values
+ if (*n > 1E+20 || *n < -1E+20) return FALSE;
+@@ -308,7 +308,7 @@ cmsBool CMSEXPORT _cmsWriteFloat32Number(cmsContext ContextID, cmsIOHANDLER* io
+
+ _cmsAssert(io != NULL);
+
+- tmp = *(cmsUInt32Number*) (void*) &n;
++ tmp = (cmsUInt32Number)n;
+ tmp = _cmsAdjustEndianess32(tmp);
+ if (io -> Write(ContextID, io, sizeof(cmsUInt32Number), &tmp) != 1)
+ return FALSE;
diff --git a/app-text/mupdf/mupdf-1.20.0.ebuild b/app-text/mupdf/mupdf-1.20.0.ebuild
index 3d7f8f3e2946..216bbfaa79e7 100644
--- a/app-text/mupdf/mupdf-1.20.0.ebuild
+++ b/app-text/mupdf/mupdf-1.20.0.ebuild
@@ -51,6 +51,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
# General cross fixes from Debian (refreshed)
"${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch
+ "${FILESDIR}"/${P}-lcms2.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/
@ 2022-12-04 14:50 Pacho Ramos
0 siblings, 0 replies; 20+ messages in thread
From: Pacho Ramos @ 2022-12-04 14:50 UTC (permalink / raw
To: gentoo-commits
commit: 68a51347c5983bdddb0f1c8a5f748528e8e9996b
Author: Philipp Rösner <rndxelement <AT> protonmail <DOT> com>
AuthorDate: Mon Nov 28 20:18:46 2022 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Dec 4 14:49:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68a51347
app-text/mupdf: add high resolution icon
As pointed out by <pacho <AT> gentoo.org> a high resolution
icon for MuPDF is available at docs/logo.
Closes: https://bugs.gentoo.org/882701
Signed-off-by: Philipp Rösner <rndxelement <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28467
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
.../files/mupdf-1.21.0-add-desktop-pc-files.patch | 33 ++++++++++++++++++++++
app-text/mupdf/mupdf-1.21.0.ebuild | 4 +--
2 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch b/app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch
new file mode 100644
index 000000000000..4d449a2fec15
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch
@@ -0,0 +1,33 @@
+--- /dev/null
++++ ./platform/debian/mupdf.desktop
+@@ -0,0 +1,15 @@
++[Desktop Entry]
++Name=MuPDF
++GenericName=PDF file viewer
++Exec=mupdf %f
++TryExec=mupdf
++Icon=new-mupdf-icon
++Terminal=false
++Type=Application
++MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;image/jpeg;image/pjpeg;image/png;image/tiff;image/x-tiff;
++Categories=Viewer;Graphics;
++Actions=View;
++
++[Desktop Action View]
++Name=View with mupdf
++Exec=mupdf %f
+--- /dev/null
++++ ./platform/debian/mupdf.pc
+@@ -0,0 +1,12 @@
++prefix=/usr
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
++
++Name: mupdf
++Description: Library for rendering PDF documents
++Requires: freetype2 libopenjp2 libcrypto
++Version: 0.5.0
++Libs: -L${libdir} -lmupdf
++Libs.private: -lmupdf-js-none
++Cflags: -I${includedir}
diff --git a/app-text/mupdf/mupdf-1.21.0.ebuild b/app-text/mupdf/mupdf-1.21.0.ebuild
index 0eaa99a07eba..c2d55d2bd989 100644
--- a/app-text/mupdf/mupdf-1.21.0.ebuild
+++ b/app-text/mupdf/mupdf-1.21.0.ebuild
@@ -46,7 +46,7 @@ BDEPEND="X? ( x11-base/xorg-proto )
PATCHES=(
"${FILESDIR}"/${PN}-1.15-CFLAGS.patch
"${FILESDIR}"/${PN}-1.19.0-Makefile.patch
- "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+ "${FILESDIR}"/${P}-add-desktop-pc-files.patch
"${FILESDIR}"/${PN}-1.19.0-darwin.patch
# See bugs #662352
"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
@@ -126,7 +126,7 @@ src_compile() {
src_install() {
if use opengl || use X ; then
domenu platform/debian/${PN}.desktop
- doicon platform/debian/${PN}.xpm
+ doicon -s scalable docs/logo/new-${PN}-icon.svg
else
rm docs/man/${PN}.1 || die "Failed to remove man page in src_install()"
fi
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/
@ 2023-10-15 8:48 Viorel Munteanu
0 siblings, 0 replies; 20+ messages in thread
From: Viorel Munteanu @ 2023-10-15 8:48 UTC (permalink / raw
To: gentoo-commits
commit: 0c858240680739e3a08b1957340afe8f6c7eef6a
Author: Philipp Rösner <rndxelement <AT> protonmail <DOT> com>
AuthorDate: Fri Oct 13 19:42:20 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Oct 15 08:47:50 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c858240
app-text/mupdf: drop 1.21.0, 1.21.1-r1
Signed-off-by: Philipp Rösner <rndxelement <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32779
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
app-text/mupdf/Manifest | 2 -
.../mupdf-1.10a-add-desktop-pc-xpm-files.patch | 533 ---------------------
.../files/mupdf-1.21.1-fix-url-processing.patch | 25 -
app-text/mupdf/mupdf-1.21.0.ebuild | 159 ------
app-text/mupdf/mupdf-1.21.1-r1.ebuild | 167 -------
5 files changed, 886 deletions(-)
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 8380bb69f1e2..5898141302e2 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,5 +1,3 @@
DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B a0dc3783c70cee1b7eb48d1658eb48186e35a42513aa9e98f7155bb82ed771ed0c5d5032013d09d93cdca4f49deda65553fe0e1af7645893722dafa855b2c958 SHA512 d6bc5b6adb6a418de50021864f4b3a75da653fa534eeedbfe9875cb202efeb13efdec66b4d108ca8fa6b0dc76733468b214e5fdf331bebc35fc6f722203fa3f7
-DIST mupdf-1.21.0-source.tar.gz 54753613 BLAKE2B bb531f165a9dd8af22aa6e1d65b57d7900bb5128d0c8ad235518ed0b1e446234b147fdd3937f3dd49f627ed2cfb49c4e325baf320f698adbbde68de466f61660 SHA512 a711489e236437e4e7c21373d8624118a5308941148be31cd57a0bbed708b44b1d4030aed71ccb82143159fc3a23e5524738e7fc6177058e6bdaf94a36beaf64
-DIST mupdf-1.21.1-source.tar.gz 57243762 BLAKE2B 9ec79e380af40020d37e4a2a6372175f19b63a47e9f6f55cff777a827f0fba89507d19d4f86394e13209ca8eb9d812c2fc4664f44ed012c91727c9c442bce97c SHA512 11eeea409e0b44d3f754a44b00b15522c2ae2d94171b8c7067efa7acbb1d597eefe1e27607fab90a56bf6c73579bbfb77b7599080fc2504a5881aaf7cc1957c7
DIST mupdf-1.22.0-source.tar.gz 55043552 BLAKE2B 745a2fd1d0406acf4fa696585bcd21a4ff36e7539c1d45f886dfe5c9bbf966169e5183e89940d81e88db3014f1ebb0446ae1732b6c2fa25a135251853b71f1f7 SHA512 ba073b977306420343c969e6fec37cca4559031ad06cfdee2356edfdfa013ebe7654175aff931684fa48a935bf87f68537754b5e83f767517bc428ac07709a59
DIST mupdf-1.23.3-source.tar.gz 55144800 BLAKE2B 816e2bf46c2431df9726976efeaa0d7ebd8809cbdd9331a747cca32088aaf21b70e9522614d1dc20c856cc597003be6285f866eae8bbde3098e702acfdea8465 SHA512 37fbebd07680d79a38d289264a4028396ee58fad52c541efa37463e63a45ed8bab71188d6c05eb15e602964d89ee6633575dceb972f7bd8b0b5efdde5af9b737
diff --git a/app-text/mupdf/files/mupdf-1.10a-add-desktop-pc-xpm-files.patch b/app-text/mupdf/files/mupdf-1.10a-add-desktop-pc-xpm-files.patch
deleted file mode 100644
index decab5015bf5..000000000000
--- a/app-text/mupdf/files/mupdf-1.10a-add-desktop-pc-xpm-files.patch
+++ /dev/null
@@ -1,533 +0,0 @@
---- /dev/null
-+++ ./platform/debian/mupdf.desktop
-@@ -0,0 +1,15 @@
-+[Desktop Entry]
-+Name=MuPDF
-+GenericName=PDF file viewer
-+Exec=mupdf %f
-+TryExec=mupdf
-+Icon=mupdf
-+Terminal=false
-+Type=Application
-+MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;image/jpeg;image/pjpeg;image/png;image/tiff;image/x-tiff;
-+Categories=Viewer;Graphics;
-+Actions=View;
-+
-+[Desktop Action View]
-+Name=View with mupdf
-+Exec=mupdf %f
---- /dev/null
-+++ ./platform/debian/mupdf.pc
-@@ -0,0 +1,12 @@
-+prefix=/usr
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/lib
-+includedir=${prefix}/include
-+
-+Name: mupdf
-+Description: Library for rendering PDF documents
-+Requires: freetype2 libopenjp2 libcrypto
-+Version: 0.5.0
-+Libs: -L${libdir} -lmupdf
-+Libs.private: -lmupdf-js-none
-+Cflags: -I${includedir}
---- /dev/null
-+++ ./platform/debian/mupdf.xpm
-@@ -0,0 +1,497 @@
-+/* XPM */
-+static char *mupdf[] = {
-+/* width height ncolors chars_per_pixel */
-+"48 48 442 2",
-+/* colors */
-+" c #000000",
-+" . c #2E4558",
-+" X c #252121",
-+" o c #AFAFAF",
-+" O c #28313B",
-+" + c #231F1F",
-+" @ c #686666",
-+" # c #98BDD7",
-+" $ c #201B1C",
-+" % c #7CABCC",
-+" & c #4487B6",
-+" * c #DFDEDE",
-+" = c #4285B4",
-+" - c #615E5F",
-+" ; c #605E5E",
-+" : c #23262C",
-+" > c #D9D8D8",
-+" , c #F7FAFC",
-+" < c #D7D6D6",
-+" 1 c #BFD6E6",
-+" 2 c #6BA0C5",
-+" 3 c #232122",
-+" 4 c #555253",
-+" 5 c #CDCCCC",
-+" 6 c #E7EFF6",
-+" 7 c #4786B2",
-+" 8 c #CADDEA",
-+" 9 c #4085B5",
-+" 0 c #AECBDF",
-+" q c #CBCACA",
-+" w c #92B9D4",
-+" e c #365F7D",
-+" r c #5A95BE",
-+" t c #3E83B3",
-+" y c #304B60",
-+" u c #C7C6C6",
-+" i c #4D8EBB",
-+" p c #F1F6F9",
-+" a c #C1C0C0",
-+" s c #454243",
-+" d c #669CC3",
-+" f c #81AECD",
-+" g c #7A7777",
-+" h c #434041",
-+" j c #3E779F",
-+" k c #272E36",
-+" l c #413E3F",
-+" z c #3F3C3D",
-+" x c #5895BF",
-+" c c #3D3A3B",
-+" v c #C6DBE9",
-+" b c #B8B6B7",
-+" n c #4282B0",
-+" m c #FDFDFE",
-+" M c #B7B6B6",
-+" N c #8DB5D2",
-+" B c #242529",
-+" V c #B3B2B2",
-+" C c #222327",
-+" Z c #B0AEAF",
-+" A c #EDF4F8",
-+" S c #686565",
-+" D c #488AB9",
-+" F c #9ABED8",
-+" G c #7EACCD",
-+" H c #ECF2F7",
-+" J c #211C1C",
-+" K c #666363",
-+" L c #F1F1F2",
-+" P c #ABAAAA",
-+" I c #4588B6",
-+" U c #A9A8A8",
-+" Y c #2D2A2B",
-+" T c #A7A6A6",
-+" R c #615D5E",
-+" E c #2B2829",
-+" W c #8DB7D5",
-+" Q c #F9FBFD",
-+" ! c #DDE9F2",
-+" ~ c #F8FBFC",
-+" ^ c #DCE9F1",
-+" / c #A5C5DC",
-+" ( c #89B3D1",
-+" ) c #5C5959",
-+" _ c #A4C5DB",
-+" ` c #335A76",
-+" ' c #518FBB",
-+" ] c #E6E7E7",
-+" [ c #5A5757",
-+" { c #232021",
-+" } c #33536C",
-+" | c #98BED9",
-+". c #E0E1E1",
-+".. c #7CACCE",
-+".X c #4488B8",
-+".o c #2D3F4F",
-+".O c #999898",
-+".+ c #4388B7",
-+".@ c #5E98C1",
-+".# c #CDCDCB",
-+".$ c #524F4F",
-+".% c #B0CCE0",
-+".& c #979696",
-+".* c #78A8CA",
-+".= c #5C96BF",
-+".- c #969495",
-+".; c #4084B4",
-+".: c #252930",
-+".> c #949293",
-+"., c #929091",
-+".< c #417FAB",
-+".1 c #4F8FBC",
-+".2 c #F3F7FA",
-+".3 c #D3D3D4",
-+".4 c #D7E5EF",
-+".5 c #222023",
-+".6 c #9FC1D9",
-+".7 c #679DC3",
-+".8 c #37678A",
-+".9 c #4B8BB8",
-+".0 c #3E769E",
-+".q c #3C749C",
-+".w c #403D3D",
-+".e c #92BAD6",
-+".r c #C8DCEA",
-+".t c #FEFEFE",
-+".y c #3D393A",
-+".u c #3B3738",
-+".i c #355974",
-+".p c #353132",
-+".a c #7A7879",
-+".s c #498BB9",
-+".d c #9BBFD8",
-+".f c #4E8AB4",
-+".g c #787677",
-+".h c #F2F2F2",
-+".j c #F0F0F0",
-+".k c #2F2B2C",
-+".l c #EEEEEE",
-+".z c #727071",
-+".x c #26282D",
-+".c c #ECECEC",
-+".v c #2B2728",
-+".b c #FAFCFD",
-+".n c #EAEAEA",
-+".m c #DEEAF2",
-+".M c #E9EAE9",
-+".N c #C2D8E7",
-+".B c #6E6C6D",
-+".V c #5390BC",
-+".C c #E8E8E8",
-+".Z c #6EA2C6",
-+".A c #272324",
-+".S c #E7E6E7",
-+".D c #E6E6E6",
-+".F c #252122",
-+".G c #29333D",
-+".H c #E4E4E4",
-+".J c #3F7AA5",
-+".K c #231F20",
-+".L c #E2E2E2",
-+".P c #211D1E",
-+".I c #E0E0E0",
-+".U c #EAF1F7",
-+".Y c #6099C2",
-+".T c #1F1B1C",
-+".R c #E9F1F6",
-+".E c #CDDFEB",
-+".W c #4387B6",
-+".Q c #96BBD6",
-+".! c #B1CDE0",
-+".~ c #DEDEDE",
-+".^ c #79A9CA",
-+"./ c #4285B5",
-+".( c #272A31",
-+".) c #5D97BF",
-+"._ c #4185B4",
-+".` c #DCDCDC",
-+".' c #959393",
-+".] c #DADADA",
-+".[ c #314B5F",
-+".{ c #D8D8D8",
-+".} c #D7D8D7",
-+".| c #D6D6D6",
-+"X c #F5F8FB",
-+"X. c #D4D4D4",
-+"XX c #6AA0C5",
-+"Xo c #BDD4E5",
-+"XO c #3A6A8C",
-+"X+ c #232123",
-+"X@ c #D3D4D3",
-+"X# c #D2D2D2",
-+"X$ c #D0D0D0",
-+"X% c #CECECE",
-+"X& c #CCCCCC",
-+"X* c #CADDEB",
-+"X= c #37617F",
-+"X- c #242A31",
-+"X; c #CACACA",
-+"X: c #C8DBE9",
-+"X> c #90B7D3",
-+"X, c #817F7F",
-+"X< c #3F7EAB",
-+"X1 c #548FB9",
-+"X2 c #355873",
-+"X3 c #7D7B7B",
-+"X4 c #C2C2C2",
-+"X5 c #4B8CBA",
-+"X6 c #C0C0C0",
-+"X7 c #D4E4EE",
-+"X8 c #81AECE",
-+"X9 c #659CC3",
-+"X0 c #787576",
-+"Xq c #4788B6",
-+"Xw c #252C35",
-+"Xe c #757373",
-+"Xr c #BABABA",
-+"Xt c #FCFDFE",
-+"Xy c #B6B6B6",
-+"Xu c #C4D9E8",
-+"Xi c #706D6E",
-+"Xp c #8CB5D2",
-+"Xa c #70A3C7",
-+"Xs c #8BB5D1",
-+"Xd c #5491BC",
-+"Xf c #5391BB",
-+"Xg c #282424",
-+"Xh c #272223",
-+"Xj c #6C696A",
-+"Xk c #2F4659",
-+"Xl c #6B6969",
-+"Xz c #407BA5",
-+"Xx c #6A6768",
-+"Xc c #E4E3E3",
-+"Xv c #3E79A3",
-+"Xb c #231E1F",
-+"Xn c #221E1E",
-+"Xm c #E2E1E1",
-+"XM c #211C1D",
-+"XN c #EBF2F7",
-+"XB c #201C1C",
-+"XV c #CFE0EC",
-+"XC c #4588B7",
-+"XZ c #B3CEE1",
-+"XA c #366384",
-+"XS c #5F98C0",
-+"XD c #4386B5",
-+"XF c #DEDDDD",
-+"XG c #2B3D4B",
-+"XH c #615F5F",
-+"XJ c #5F5D5D",
-+"XK c #5E5B5C",
-+"XL c #DCE9F2",
-+"XP c #407DA8",
-+"XI c #86B1CF",
-+"XU c #D4D3D3",
-+"XY c #3A698B",
-+"XT c #3E7BA6",
-+"XR c #232022",
-+"XE c #545152",
-+"XW c #999899",
-+"XQ c #79AACC",
-+"X! c #524F50",
-+"X~ c #CCCDCB",
-+"X^ c #3D749B",
-+"X/ c #93BAD5",
-+"X( c #77A8CA",
-+"X) c #37607E",
-+"X_ c #5B96BF",
-+"X` c #3F84B4",
-+"X' c #CAC9C9",
-+"X] c #C6C5C5",
-+"X[ c #3F7DAA",
-+"X{ c #F2F7FA",
-+"X} c #C2C1C1",
-+"X| c #212023",
-+"o c #9EC1D9",
-+"o. c #444142",
-+"oX c #3F78A0",
-+"oo c #90B8D5",
-+"oO c #FEFEFF",
-+"o+ c #E2ECF4",
-+"o@ c #2B3A47",
-+"o# c #25262A",
-+"o$ c #B1AFB0",
-+"o% c #28313A",
-+"o& c #221D1D",
-+"o* c #262F38",
-+"o= c #629BC2",
-+"o- c #302D2E",
-+"o; c #6199C1",
-+"o: c #201B1B",
-+"o> c #4587B6",
-+"o, c #F0F0F1",
-+"o< c #2D3E4C",
-+"o1 c #2E2B2C",
-+"o2 c #4385B4",
-+"o3 c #A8A7A7",
-+"o4 c #A7A5A6",
-+"o5 c #3D7197",
-+"o6 c #4183B2",
-+"o7 c #4083B1",
-+"o8 c #A5A3A4",
-+"o9 c #3B6F95",
-+"o0 c #5290BC",
-+"oq c #A4C4DB",
-+"ow c #E9F1F7",
-+"oe c #4387B7",
-+"or c #E7EFF5",
-+"ot c #CBDDEA",
-+"oy c #4185B5",
-+"ou c #5B95BE",
-+"oi c #3F83B3",
-+"op c #939192",
-+"oa c #929191",
-+"os c #2B3743",
-+"od c #4C4849",
-+"of c #2A3742",
-+"og c #F4F8FB",
-+"oh c #D8E6F0",
-+"oj c #4C8CB9",
-+"ok c #211F22",
-+"ol c #CFD0D0",
-+"oz c #444041",
-+"ox c #262C34",
-+"oc c #413E3E",
-+"ov c #403C3D",
-+"ob c #3B739B",
-+"on c #858384",
-+"om c #FFFFFF",
-+"oM c #E3EDF4",
-+"oN c #5995BF",
-+"oB c #3E3A3B",
-+"oV c #C7DBE9",
-+"oC c #2F4B61",
-+"oZ c #5793BD",
-+"oA c #3C3839",
-+"oS c #2A3945",
-+"oD c #7E7D7D",
-+"oF c #345873",
-+"oG c #363233",
-+"oH c #7B797A",
-+"oJ c #EFF4F9",
-+"oK c #EEF4F8",
-+"oL c #F3F3F3",
-+"oP c #9ABED7",
-+"oI c #4788B7",
-+"oU c #629AC1",
-+"oY c #ACAAAA",
-+"oT c #F1F1F1",
-+"oR c #EFEFEF",
-+"oE c #737172",
-+"oW c #EDEDED",
-+"oQ c #A9C9DF",
-+"o! c #FBFDFE",
-+"o~ c #EBEBEB",
-+"o^ c #DFEBF3",
-+"o/ c #4581AB",
-+"o( c #6F6D6E",
-+"o) c #EAE9EA",
-+"o_ c #E9E9E9",
-+"o` c #C1D7E6",
-+"o' c #E7E7E7",
-+"o] c #E6E7E6",
-+"o[ c #E5E5E5",
-+"o{ c #3F7BA5",
-+"o} c #242021",
-+"o| c #E3E3E3",
-+"O c #3E79A4",
-+"O. c #221E1F",
-+"OX c #26303A",
-+"Oo c #9C9A9A",
-+"OO c #E1E1E1",
-+"O+ c #201C1D",
-+"O@ c #4488B7",
-+"O# c #DFDFDF",
-+"O$ c #7BAACC",
-+"O% c #356384",
-+"O& c #1E1A1B",
-+"O* c #4386B6",
-+"O= c #4286B5",
-+"O- c #95BAD5",
-+"O; c #DDDDDD",
-+"O: c #1C1819",
-+"O> c #DBDBDB",
-+"O, c #D9D9D9",
-+"O< c #D7D7D7",
-+"O1 c #417FAA",
-+"O2 c #DAE7F1",
-+"O3 c #F5F9FB",
-+"O4 c #D5D5D5",
-+"O5 c #242224",
-+"O6 c #D4D3D4",
-+"O7 c #85B1CF",
-+"O8 c #D3D3D3",
-+"O9 c #699FC4",
-+"O0 c #4D8DB9",
-+"Oq c #222022",
-+"Ow c #34556F",
-+"Oe c #D1D1D1",
-+"Or c #D0CFD0",
-+"Ot c #8A8888",
-+"Oy c #CFCFCF",
-+"Ou c #CDCDCD",
-+"Oi c #CCCDCC",
-+"Op c #CADEEB",
-+"Oa c #E5EEF5",
-+"Os c #C9DCEA",
-+"Od c #ADCADF",
-+"Of c #C8DCE9",
-+"Og c #91B8D4",
-+"Oh c #5994BE",
-+"Oj c #3D82B3",
-+"Ok c #5894BD",
-+"Ol c #3C82B2",
-+"Oz c #4181AD",
-+"Ox c #3B3737",
-+"Oc c #C5C5C5",
-+"Ov c #293643",
-+"Ob c #3E7DAA",
-+"On c #C1C1C1",
-+"Om c #353131",
-+"OM c #D4E3EE",
-+"ON c #B8D1E3",
-+"OB c #BFBFBF",
-+"OV c #9CBFD8",
-+"OC c #80ADCD",
-+"OZ c #649BC2",
-+"OA c #4889B7",
-+"OS c #BDBDBD",
-+"OD c #2E292A",
-+"OF c #4283B1",
-+"OG c #B7B7B7",
-+"OH c #4183B0",
-+"OJ c #5794BF",
-+"OK c #A7C6DC",
-+"OL c #365B77",
-+"OP c #8BB4D1",
-+"OI c #282324",
-+"OU c #272323",
-+"OY c #6C6A6A",
-+"OT c None",
-+/* pixels */
-+" oToToToT L.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h LoToToToT ",
-+"o,.joToToToToToToToToToToToToToToToToToToToT.h.h.h.hoToToToToToToToToToToToToToToToToToToToT.j.j",
-+".j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.joToLoLoR.D.~ > >.~.DoRoLoLoT.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j",
-+"oRoRoRoRoRoRoRoRoRoRoRoRoRoRoRoT.hXcOBoaXjX!oz c cozX!XjoaOBXc.hoToRoRoRoRoRoRoRoRoRoRoRoRoRoRoR",
-+".l.l.l.l.l.l.l.l.l.l.l.l.loR.j <.'X! Y.P.To: $ J J $o:.T.P YX!.' <.joR.l.l.l.l.l.l.l.l.l.l.l.l.l",
-+".l.l.l.l.l.l.l.l.l.l.l.l.jXm.&oz + $o& 3.x OoSXGXGoS O.x 3o& $ +oz.&Xm.j.l.l.l.l.l.l.l.l.l.l.l.l",
-+"oWoWoWoWoWoWoWoWoWoWoWoR uXK X $XRo% yXA.qo/.fX1X1.fo/.qXA yo%XR $ XXK uoRoWoWoWoWoWoWoWoWoWoWoW",
-+".c.c.c.c.c.c.c.c.c.coW Z z $ {os eXTo0..oQX*XLoMoMXLOpoQ..o0XT eos { $ z ZoW.c.c.c.c.c.c.c.c.c.c",
-+"o~o~o~o~o~o~o~o~o~.co3.p $.(X2X[OJ FOM !Of 0.d wOg.d 0Os.mOM FOJObX2.( $.po3.co~o~o~o~o~o~o~o~o~",
-+".n.n.n.n.n.n.n.noW VoGXMoso9XC G.N.!.^XfXD tOjOlOlOj tXDXd.^.% 1O$O@o9osXMoG VoW.n.n.n.n.n.n.n.n",
-+".n.n.n.n.n.n.n.c qo.XBo<XvX5 No oUO0 fOPXpXpXpXpXpXpXpXpOP ( NOdo^OV.sXvo<XBo. q.c.n.n.n.n.n.n.n",
-+"o_o_o_o_o_o_.M.L @ $o@o{.s.^.Z & t.* ~omomomomomomomomomomomom.toO.b _ D.Jo@ $ @.Lo)o_o_o_o_o_o_",
-+".C.C.C.C.C.Co~o8Xg kX^oeoZXf._XDXD 0omomomomomomomomomomomomomomomom.b #XCX^ kXgo8o~.C.C.C.C.C.C",
-+"o'o'o'o'o'.CO>.$okX=oeXDo>O=XD./Xd.momomomomomomomomomomomomomom pX7.NOK 'oeX=ok.$O>.Co'o'o'o'o'",
-+" ]o'o'o'.So_ TXh.o nXDXDXDXDXD.; %.bomomomomomomomomomomomomoOo`O9ojo>XDXDXD n.oXh To_ ]o'o'o'.S",
-+".D.D.D.D.Do| SX|XY.+XDXDXDXDXDXDXZomomomomomomomomomomomomom.4Xd.;O=XDXDXDXD.+XYX| So|.D.D.D.D.D",
-+"o[o[o[o[.D 5OxOvOzO*XDXDXDXD =oZo+omomomomomomomomomomomomomoP.;XDXDXDXDXDXDO*OzOvOx 5o]o[o[o[o[",
-+".H.H.H.Ho' POU }oeXDXDXDXDXD.;X8o!omomomomomomomomomomomom.bX(.;XDXDXDXDXDXDXDoe }OU Po'.H.H.H.H",
-+"o|o|o|o|.DOt.5XO.+XDXDXDXDXD &ONomomomomomomomomomomomomom.2.7._XDXDXDXDXDXDXD.+XO.5Ot.Do|o|o|o|",
-+"o|o|o|o|o|Xi : j.WXDXDXDXD = rOaomomomomomomomomomomomomom AXS._XDXDXDXDXDXDXD.W j :Xio|o|o|o|o|",
-+".L.L.L.L.I RXwXP.WXDXDXDXD.;XI momomomomomomomomomomomomomXN.=._XDXDXDXDXDXDXD.WXPXw R.I.L.L.L.L",
-+"OOOOOOOOO; [OX.<O*XDXDXDXD IXoomomomomomomomomomomomomomom.UX_._XDXDXDXDXDXDXDO*.<OX [O;OOOOOOOO",
-+".I.I.I.IO; )o*O1O*XDXDXD._.).Romomomomomog ~omomomomomomom.UX_._XDXDXDXDXDXDXDO*O1o* )O;.I.I.I.I",
-+"O#O#O#O#O# KX-Xz.WXDXDXD.;XsoOomomomomom vowomomomomomomom.UX_._XDXDXDXDXDXDXD.WXzX- KO#O#O#O#O#",
-+"O#O#O#O#. g Co5oeXDXDXDXq.Nomomomomom ,X>oromomomomomomom.UX_._XDXDXDXDXDXDXDoeo5 C gOOO#O#O#O#",
-+".~.~.~.~OO.- {X).XXDXD._o; HomomomomomohO9.Romomomomomomom.UX_._XDXDXDXDXDXDXD.XX) {.-OO.~.~.~.~",
-+"O;O;O;O;O#XyOD .o2XDXD.;Ogomomomomomom / r.Uomomomomomomom.UX_._XDXDXDXDXDXDXDo2 .ODXyO#O;O;O;O;",
-+".`.`.`.`O;Oeod.:oX.WXDOAoVomomomomomO3XaOk.Uomomomomomomom.UX_._XDXDXDXDXDXD.WoX.:odOeO;.`.`.`.`",
-+"O>O>O>O>O>O;X,.POw.W._ doJomomomomomOMoj r.Uomomomomomomom.UX_._XDXDXDXDXDXD.WOw.PX,O;O>O>O>O>O>",
-+"O>O>O>O>O>O;XrOmox.0 9X8Xtomomomomom.6X`ou.Uomomomomomomom.UX_._XDXDXDXDXDoe.0oxOmXrO;O>O>O>O>O>",
-+".].].].].].]O,.z JXkOH.VotomomomomX{ 2oiou.Uomomomomomomom.UX_._XDO= &O0 &OFXk J.zO,.].].].].].]",
-+"O,O,O,O,O,O,O>OS.yOq.i._OZ ^omomom.E.9._ou.Uomomomomomomom.UX_._._.9.ZXdO=.iOq.yOSO>O,O,O,O,O,O,",
-+".{.{.{.{.{.{.{.].,.A BX)oyXXO2omom.Q.;._ou.Uomomomomomomom.UOh._ dO-X9O=X) BOI.,.].{.{.{.{.{.{.{",
-+"O<O<O<O<O<O<O<.{O8o(Xno#OLo7.YXuX O7oIoiOk.Romomomomomomom HOCoqOdo=o6OLo#Xno(O8.{O<O<O<O<O<O<O<",
-+"O<O<O<O<O<O<O<O<.{X'XJ.PO5.[O iOgXVX:OVXsoKomomomomomomom.bOMX/.1O .[O5.PXJX'.{O<O<O<O<O<O<O<O<",
-+".|.|.|.|.|.|.|.|.|.}X]XH.KXn.G eX<oN.e 8 6 Qomomomom.bXN.roo xX< e.GXn.KXHX].}.|.|.|.|.|.|.|.|.|",
-+"O4O4O4O4O4O4O4O4O4O4O<X;Xe.vXBX+ofoFob 7.@XQ W | | WXQ.@ 7oboFofX+XB.vXeX;O<O4O4O4O4O4O4O4O4O4O4",
-+"X.X.X.X.X.X.X.X.X.X.X.O4X#XW sO. J.K.xo@oC `O%.8.8O% `oCo@.x.K JO. sXWX#O4X.X.X.X.X.X.X.X.X.X.X.",
-+"O8O8O8O6O8XUXUO8O8XUXUO8X..|OnX,oc.F $ Jo&XbXRO5O5XRXbo& J $.FocX,On.|X.O8XUX@X@O8.3O8O8O8O8O8X@",
-+"O8O8O8O8O8O8O8O8O8O8O8O8O8O8X.X. aop ; c Eo}.PXMXM.Po} E c ;op aX.X.O8O8O8O8O8O8O8O8O8O8O8O8O8O8",
-+"X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#O8O4X$X6 P.-onX3X3on.- PX6X$O4O8X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#",
-+"OeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeO8X4OGOnOcOcX} MOSX#OeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOe",
-+"X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$O8ono-oAov.w.u.koEX#X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$",
-+"X$X$X$X$X$X$X$X$X$olX$X$X$X$X$X$X$X$X$X#oD l.>o1O+.P.T.BOeX$X$X$X$X$X$X$OrOrX$X$X$X$X$X$X$X$X$X$",
-+"OyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyX#oHXEXFoBO&.TO:OYX$OyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOy",
-+"X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%Oy POo.CX0 -Xx.g TOyX%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%",
-+"X%X%OuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuX% oo$.h boYo4.O UX%OuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuX%X%",
-+" Ou.#OuOuOiX&X&X&X&X&X&X&X&X&X&X&X&X&Oy.a 4 * h.K.KO&XlX%X&X&X&X&X&X&X&X&X&X&X&X&X&X&OuOuX~Ou "
-+};
diff --git a/app-text/mupdf/files/mupdf-1.21.1-fix-url-processing.patch b/app-text/mupdf/files/mupdf-1.21.1-fix-url-processing.patch
deleted file mode 100644
index bebdf3909e81..000000000000
--- a/app-text/mupdf/files/mupdf-1.21.1-fix-url-processing.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 37757db262425d793b17b63821d9014d3655e50a Mon Sep 17 00:00:00 2001
-From: Sebastian Rasmussen <sebras@gmail.com>
-Date: Thu, 1 Dec 2022 00:04:40 +0100
-Subject: [PATCH] gl: Use posix_spawnp() in order to search PATH for binaries.
-
----
- platform/gl/gl-main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/platform/gl/gl-main.c b/platform/gl/gl-main.c
-index d5ae69c95..271ac43a6 100644
---- a/platform/gl/gl-main.c
-+++ b/platform/gl/gl-main.c
-@@ -122,7 +122,7 @@ static void open_browser(const char *uri)
- argv[0] = (char*) browser;
- argv[1] = (char*) uri;
- argv[2] = NULL;
-- err = posix_spawn(&pid, browser, NULL, NULL, argv, environ);
-+ err = posix_spawnp(&pid, browser, NULL, NULL, argv, environ);
- if (err)
- fz_warn(ctx, "cannot spawn browser '%s': %s", browser, strerror(err));
-
---
-2.39.1
-
diff --git a/app-text/mupdf/mupdf-1.21.0.ebuild b/app-text/mupdf/mupdf-1.21.0.ebuild
deleted file mode 100644
index cbc4147b439e..000000000000
--- a/app-text/mupdf/mupdf-1.21.0.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please check upstream git regularly for relevant security-related commits
-# to backport.
-
-inherit desktop flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git"
-SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.gz"
-S="${WORKDIR}"/${P}-source
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 x86"
-IUSE="+javascript opengl ssl X"
-REQUIRED_USE="opengl? ( javascript )"
-
-# Although we use the bundled, patched version of freeglut in mupdf (because of
-# bug #653298), the best way to ensure that its dependencies are present is to
-# install system's freeglut.
-RDEPEND="
- dev-libs/gumbo
- media-libs/freetype:2
- media-libs/harfbuzz:=[truetype]
- media-libs/jbig2dec:=
- media-libs/libpng:0=
- >=media-libs/openjpeg-2.1:2=
- >=media-libs/libjpeg-turbo-1.5.3-r2:0=
- javascript? ( >=dev-lang/mujs-1.2.0:= )
- opengl? ( >=media-libs/freeglut-3.0.0 )
- ssl? ( >=dev-libs/openssl-1.1:0= )
- sys-libs/zlib
- X? (
- x11-libs/libX11
- x11-libs/libXext
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="X? ( x11-base/xorg-proto )
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.15-CFLAGS.patch
- "${FILESDIR}"/${PN}-1.19.0-Makefile.patch
- "${FILESDIR}"/${P}-add-desktop-pc-files.patch
- "${FILESDIR}"/${PN}-1.19.0-darwin.patch
- # See bugs #662352
- "${FILESDIR}"/${PN}-1.15-openssl-x11.patch
- # General cross fixes from Debian (refreshed)
- "${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch
-)
-
-src_prepare() {
- default
-
- use hppa && append-cflags -ffunction-sections
-
- append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)"
-
- sed -e "1iOS = Linux" \
- -e "1iCC = $(tc-getCC)" \
- -e "1iCXX = $(tc-getCXX)" \
- -e "1iLD = $(tc-getLD)" \
- -e "1iAR = $(tc-getAR)" \
- -e "1iverbose = yes" \
- -e "1ibuild = debug" \
- -i Makerules || die "Failed adding build variables to Makerules in src_prepare()"
-
- # Adjust MuPDF version in .pc file created by the
- # mupdf-1.10a-add-desktop-pc-xpm-files.patch file
- sed -e "s/Version: \(.*\)/Version: ${PV}/" \
- -i platform/debian/${PN}.pc || die "Failed substituting version in ${PN}.pc"
-}
-
-_emake() {
- # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
- #
- # Bundled libs
- # * General
- # Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's
- # recommendations. It does not mean "always use system libs".
- # See [0] below for what it means in a specific version.
- #
- # * freeglut
- # We don't use system's freeglut because upstream has a special modified
- # version of it that gives mupdf clipboard support. See bug #653298
- #
- # * mujs
- # As of v1.15.0, mupdf started using symbols in mujs that were not part
- # of any release. We then went back to using the bundled version of it.
- # But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk
- # when bumping and check!
- # See bug #685244
- #
- # * lmms2
- # mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1].
- # It is therefore not appropriate for us to unbundle it at this time.
- #
- # [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9
- # [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt
- local myemakeargs=(
- GENTOO_PV=${PV}
- HAVE_GLUT=$(usex opengl)
- HAVE_LIBCRYPTO=$(usex ssl)
- HAVE_X11=$(usex X)
- USE_SYSTEM_LIBS=yes
- USE_SYSTEM_MUJS=$(usex javascript)
- USE_SYSTEM_GLUT=no
- HAVE_OBJCOPY=no
- "$@"
- )
-
- emake "${myemakeargs[@]}"
-}
-
-src_compile() {
- tc-export PKG_CONFIG
-
- _emake XCFLAGS="-fPIC"
-}
-
-src_install() {
- if use opengl || use X ; then
- domenu platform/debian/${PN}.desktop
- doicon -s scalable docs/logo/new-${PN}-icon.svg
- else
- rm docs/man/${PN}.1 || die "Failed to remove man page in src_install()"
- fi
-
- sed -i \
- -e "1iprefix = ${ED}/usr" \
- -e "1ilibdir = ${ED}/usr/$(get_libdir)" \
- -e "1idocdir = ${ED}/usr/share/doc/${PF}" \
- -i Makerules || die "Failed adding liprefix, lilibdir and lidocdir to Makerules in src_install()"
-
- _emake install
-
- dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
-
- 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
-
- # Respect libdir (bug #734898)
- sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die "Failed to sed pkgconfig file to respect libdir in src_install()"
-
- insinto /usr/$(get_libdir)/pkgconfig
- doins platform/debian/${PN}.pc
-
- dodoc README CHANGES CONTRIBUTORS
-}
diff --git a/app-text/mupdf/mupdf-1.21.1-r1.ebuild b/app-text/mupdf/mupdf-1.21.1-r1.ebuild
deleted file mode 100644
index 9917968a7e2e..000000000000
--- a/app-text/mupdf/mupdf-1.21.1-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please check upstream git regularly for relevant security-related commits
-# to backport.
-
-inherit desktop flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git"
-SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.gz"
-S="${WORKDIR}"/${P}-source
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+drm +javascript opengl ssl X"
-REQUIRED_USE="opengl? ( javascript )"
-
-# Although we use the bundled, patched version of freeglut in mupdf (because of
-# bug #653298), the best way to ensure that its dependencies are present is to
-# install system's freeglut.
-RDEPEND="
- dev-libs/gumbo
- media-libs/freetype:2
- media-libs/harfbuzz:=[truetype]
- media-libs/jbig2dec:=
- media-libs/libpng:0=
- >=media-libs/openjpeg-2.1:2=
- >=media-libs/libjpeg-turbo-1.5.3-r2:0=
- javascript? ( >=dev-lang/mujs-1.2.0:= )
- opengl? ( >=media-libs/freeglut-3.0.0 )
- ssl? ( >=dev-libs/openssl-1.1:0= )
- sys-libs/zlib
- X? (
- x11-libs/libX11
- x11-libs/libXext
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="X? ( x11-base/xorg-proto )
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.15-CFLAGS.patch
- "${FILESDIR}"/${PN}-1.19.0-Makefile.patch
- "${FILESDIR}"/${PN}-1.21.0-add-desktop-pc-files.patch
- "${FILESDIR}"/${PN}-1.19.0-darwin.patch
- # See bugs #662352
- "${FILESDIR}"/${PN}-1.15-openssl-x11.patch
- # General cross fixes from Debian (refreshed)
- "${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch
- "${FILESDIR}"/${P}-no-drm.patch
- "${FILESDIR}"/${P}-fix-aliasing-violation.patch
- # See bug 893604
- # Fixed in upcoming release
- "${FILESDIR}"/${P}-fix-url-processing.patch
-)
-
-src_prepare() {
- default
-
- use hppa && append-cflags -ffunction-sections
-
- use drm && append-cflags -DGENTOO_MUPDF_DRM
-
- append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)"
-
- sed -e "1iOS = Linux" \
- -e "1iCC = $(tc-getCC)" \
- -e "1iCXX = $(tc-getCXX)" \
- -e "1iLD = $(tc-getLD)" \
- -e "1iAR = $(tc-getAR)" \
- -e "1iverbose = yes" \
- -e "1ibuild = debug" \
- -i Makerules || die "Failed adding build variables to Makerules in src_prepare()"
-
- # Adjust MuPDF version in .pc file created by the
- # mupdf-1.10a-add-desktop-pc-xpm-files.patch file
- sed -e "s/Version: \(.*\)/Version: ${PV}/" \
- -i platform/debian/${PN}.pc || die "Failed substituting version in ${PN}.pc"
-}
-
-_emake() {
- # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
- #
- # Bundled libs
- # * General
- # Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's
- # recommendations. It does not mean "always use system libs".
- # See [0] below for what it means in a specific version.
- #
- # * freeglut
- # We don't use system's freeglut because upstream has a special modified
- # version of it that gives mupdf clipboard support. See bug #653298
- #
- # * mujs
- # As of v1.15.0, mupdf started using symbols in mujs that were not part
- # of any release. We then went back to using the bundled version of it.
- # But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk
- # when bumping and check!
- # See bug #685244
- #
- # * lmms2
- # mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1].
- # It is therefore not appropriate for us to unbundle it at this time.
- #
- # [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9
- # [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt
- local myemakeargs=(
- GENTOO_PV=${PV}
- HAVE_GLUT=$(usex opengl)
- HAVE_LIBCRYPTO=$(usex ssl)
- HAVE_X11=$(usex X)
- USE_SYSTEM_LIBS=yes
- USE_SYSTEM_MUJS=$(usex javascript)
- USE_SYSTEM_GLUT=no
- HAVE_OBJCOPY=no
- "$@"
- )
-
- emake "${myemakeargs[@]}"
-}
-
-src_compile() {
- tc-export PKG_CONFIG
-
- _emake XCFLAGS="-fPIC"
-}
-
-src_install() {
- if use opengl || use X ; then
- domenu platform/debian/${PN}.desktop
- doicon -s scalable docs/logo/new-${PN}-icon.svg
- else
- rm docs/man/${PN}.1 || die "Failed to remove man page in src_install()"
- fi
-
- sed -i \
- -e "1iprefix = ${ED}/usr" \
- -e "1ilibdir = ${ED}/usr/$(get_libdir)" \
- -e "1idocdir = ${ED}/usr/share/doc/${PF}" \
- -i Makerules || die "Failed adding liprefix, lilibdir and lidocdir to Makerules in src_install()"
-
- _emake install
-
- dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
-
- 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
-
- # Respect libdir (bug #734898)
- sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc \
- || die "Failed to sed pkgconfig file to respect libdir in src_install()"
-
- insinto /usr/$(get_libdir)/pkgconfig
- doins platform/debian/${PN}.pc
-
- dodoc README CHANGES CONTRIBUTORS
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/
@ 2023-10-15 8:48 Viorel Munteanu
0 siblings, 0 replies; 20+ messages in thread
From: Viorel Munteanu @ 2023-10-15 8:48 UTC (permalink / raw
To: gentoo-commits
commit: c2d5f763e01c478515a9b6d416b1b68a3858672c
Author: Philipp Rösner <rndxelement <AT> protonmail <DOT> com>
AuthorDate: Thu Sep 14 14:36:37 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Oct 15 08:47:49 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2d5f763
app-text/mupdf: add 1.23.3
Signed-off-by: Philipp Rösner <rndxelement <AT> protonmail.com>
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
app-text/mupdf/Manifest | 1 +
.../mupdf/files/mupdf-1.23.3-cross-fixes.patch | 120 +++++++++++++++
app-text/mupdf/files/mupdf-1.23.3-darwin.patch | 45 ++++++
.../mupdf/files/mupdf-1.23.3-openssl-x11.patch | 19 +++
app-text/mupdf/mupdf-1.23.3.ebuild | 164 +++++++++++++++++++++
5 files changed, 349 insertions(+)
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index add0b2b8ea22..8380bb69f1e2 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -2,3 +2,4 @@ DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B a0dc3783c70cee1b7eb48d1658eb481
DIST mupdf-1.21.0-source.tar.gz 54753613 BLAKE2B bb531f165a9dd8af22aa6e1d65b57d7900bb5128d0c8ad235518ed0b1e446234b147fdd3937f3dd49f627ed2cfb49c4e325baf320f698adbbde68de466f61660 SHA512 a711489e236437e4e7c21373d8624118a5308941148be31cd57a0bbed708b44b1d4030aed71ccb82143159fc3a23e5524738e7fc6177058e6bdaf94a36beaf64
DIST mupdf-1.21.1-source.tar.gz 57243762 BLAKE2B 9ec79e380af40020d37e4a2a6372175f19b63a47e9f6f55cff777a827f0fba89507d19d4f86394e13209ca8eb9d812c2fc4664f44ed012c91727c9c442bce97c SHA512 11eeea409e0b44d3f754a44b00b15522c2ae2d94171b8c7067efa7acbb1d597eefe1e27607fab90a56bf6c73579bbfb77b7599080fc2504a5881aaf7cc1957c7
DIST mupdf-1.22.0-source.tar.gz 55043552 BLAKE2B 745a2fd1d0406acf4fa696585bcd21a4ff36e7539c1d45f886dfe5c9bbf966169e5183e89940d81e88db3014f1ebb0446ae1732b6c2fa25a135251853b71f1f7 SHA512 ba073b977306420343c969e6fec37cca4559031ad06cfdee2356edfdfa013ebe7654175aff931684fa48a935bf87f68537754b5e83f767517bc428ac07709a59
+DIST mupdf-1.23.3-source.tar.gz 55144800 BLAKE2B 816e2bf46c2431df9726976efeaa0d7ebd8809cbdd9331a747cca32088aaf21b70e9522614d1dc20c856cc597003be6285f866eae8bbde3098e702acfdea8465 SHA512 37fbebd07680d79a38d289264a4028396ee58fad52c541efa37463e63a45ed8bab71188d6c05eb15e602964d89ee6633575dceb972f7bd8b0b5efdde5af9b737
diff --git a/app-text/mupdf/files/mupdf-1.23.3-cross-fixes.patch b/app-text/mupdf/files/mupdf-1.23.3-cross-fixes.patch
new file mode 100644
index 000000000000..02fa3bfdd45c
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.23.3-cross-fixes.patch
@@ -0,0 +1,120 @@
+Refreshed patches based on:
+https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0004-MuPDF-crossbuild-use-target-arch-pkg-config.patch/
+https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use-host-cc-for-utils.patch/
+--- a/Makerules
++++ b/Makerules
+@@ -9,6 +9,9 @@ ifeq ($(OS),)
+ OS := $(OS:Darwin=MACOS)
+ endif
+
++PKG_CONFIG ?= pkg-config
++CC_FOR_BUILD ?= $(CC)
++
+ WARNING_CFLAGS := -Wall -Wsign-compare
+
+ # Feature configuration options
+@@ -190,51 +193,51 @@ else ifeq ($(OS),Linux)
+ LDFLAGS += -sTOTAL_MEMORY=48MB
+ endif
+
+- ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
+- SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
+- SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2)
++ ifeq ($(shell $(PKG_CONFIG) --exists freetype2 && echo yes),yes)
++ SYS_FREETYPE_CFLAGS := $(shell $(PKG_CONFIG) --cflags freetype2)
++ SYS_FREETYPE_LIBS := $(shell $(PKG_CONFIG) --libs freetype2)
+ endif
+- ifeq ($(shell pkg-config --exists gumbo && echo yes),yes)
+- SYS_GUMBO_CFLAGS := $(shell pkg-config --cflags gumbo)
+- SYS_GUMBO_LIBS := $(shell pkg-config --libs gumbo)
++ ifeq ($(shell $(PKG_CONFIG) --exists gumbo && echo yes),yes)
++ SYS_GUMBO_CFLAGS := $(shell $(PKG_CONFIG) --cflags gumbo)
++ SYS_GUMBO_LIBS := $(shell $(PKG_CONFIG) --libs gumbo)
+ endif
+- ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes)
+- SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
+- SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz)
++ ifeq ($(shell $(PKG_CONFIG) --exists harfbuzz && echo yes),yes)
++ SYS_HARFBUZZ_CFLAGS := $(shell $(PKG_CONFIG) --cflags harfbuzz)
++ SYS_HARFBUZZ_LIBS := $(shell $(PKG_CONFIG) --libs harfbuzz)
+ endif
+- ifeq ($(shell pkg-config --exists lcms2 && echo yes),yes)
+- SYS_LCMS2_CFLAGS := $(shell pkg-config --cflags lcms2)
+- SYS_LCMS2_LIBS := $(shell pkg-config --libs lcms2)
++ ifeq ($(shell $(PKG_CONFIG) --exists lcms2 && echo yes),yes)
++ SYS_LCMS2_CFLAGS := $(shell $(PKG_CONFIG) --cflags lcms2)
++ SYS_LCMS2_LIBS := $(shell $(PKG_CONFIG) --libs lcms2)
+ endif
+- ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes)
+- SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg)
+- SYS_LIBJPEG_LIBS := $(shell pkg-config --libs libjpeg)
++ ifeq ($(shell $(PKG_CONFIG) --exists libjpeg && echo yes),yes)
++ SYS_LIBJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libjpeg)
++ SYS_LIBJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libjpeg)
+ endif
+- ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes)
+- SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2)
+- SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2)
++ ifeq ($(shell $(PKG_CONFIG) --exists libopenjp2 && echo yes),yes)
++ SYS_OPENJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libopenjp2)
++ SYS_OPENJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libopenjp2)
+ endif
+- ifeq ($(shell pkg-config --exists zlib && echo yes),yes)
+- SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib)
+- SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
++ ifeq ($(shell $(PKG_CONFIG) --exists zlib && echo yes),yes)
++ SYS_ZLIB_CFLAGS := $(shell $(PKG_CONFIG) --cflags zlib)
++ SYS_ZLIB_LIBS := $(shell $(PKG_CONFIG) --libs zlib)
+ endif
+
+- HAVE_SYS_LEPTONICA := $(shell pkg-config --exists 'lept >= 1.7.4' && echo yes)
++ HAVE_SYS_LEPTONICA := $(shell $(PKG_CONFIG) --exists 'lept >= 1.7.4' && echo yes)
+ ifeq ($(HAVE_SYS_LEPTONICA),yes)
+- SYS_LEPTONICA_CFLAGS := $(shell pkg-config --cflags lept)
+- SYS_LEPTONICA_LIBS := $(shell pkg-config --libs lept)
++ SYS_LEPTONICA_CFLAGS := $(shell $(PKG_CONFIG) --cflags lept)
++ SYS_LEPTONICA_LIBS := $(shell $(PKG_CONFIG) --libs lept)
+ endif
+
+- HAVE_SYS_TESSERACT := $(shell pkg-config --exists 'tesseract >= 4.0.0' && echo yes)
++ HAVE_SYS_TESSERACT := $(shell $(PKG_CONFIG) --exists 'tesseract >= 4.0.0' && echo yes)
+ ifeq ($(HAVE_SYS_TESSERACT),yes)
+- SYS_TESSERACT_CFLAGS := $(shell pkg-config --cflags tesseract)
+- SYS_TESSERACT_LIBS := $(shell pkg-config --libs tesseract)
++ SYS_TESSERACT_CFLAGS := $(shell $(PKG_CONFIG) --cflags tesseract)
++ SYS_TESSERACT_LIBS := $(shell $(PKG_CONFIG) --libs tesseract)
+ endif
+
+- HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes)
++ HAVE_SYS_CURL := $(shell $(PKG_CONFIG) --exists libcurl && echo yes)
+ ifeq ($(HAVE_SYS_CURL),yes)
+- SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
+- SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
++ SYS_CURL_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcurl)
++ SYS_CURL_LIBS := $(shell $(PKG_CONFIG) --libs libcurl)
+ endif
+
+ HAVE_GLUT := yes
+@@ -243,18 +246,18 @@ else ifeq ($(OS),Linux)
+ SYS_GLUT_LIBS := -lglut -lGL
+ endif
+
+ 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)
++ X11_CFLAGS := $(shell $(PKG_CONFIG) --cflags x11 xext)
++ X11_LIBS := $(shell $(PKG_CONFIG) --libs x11 xext)
+ endif
+
+ ifeq ($(HAVE_LIBCRYPTO),)
+ HAVE_LIBCRYPTO := not-unless-portage-tells-me
+ endif
+ ifeq ($(HAVE_LIBCRYPTO),yes)
+- LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
+- LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
++ LIBCRYPTO_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcrypto) -DHAVE_LIBCRYPTO
++ LIBCRYPTO_LIBS := $(shell $(PKG_CONFIG) --libs libcrypto)
+ endif
+
+ HAVE_PTHREAD := yes
diff --git a/app-text/mupdf/files/mupdf-1.23.3-darwin.patch b/app-text/mupdf/files/mupdf-1.23.3-darwin.patch
new file mode 100644
index 000000000000..c151d81f175d
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.23.3-darwin.patch
@@ -0,0 +1,45 @@
+--- a/Makerules
++++ b/Makerules
+@@ -161,11 +161,11 @@ ifeq ($(OS),MINGW)
+ else ifeq ($(OS),MACOS)
+ HAVE_GLUT := yes
+ SYS_GLUT_CFLAGS := -Wno-deprecated-declarations
+- SYS_GLUT_LIBS := -framework GLUT -framework OpenGL
+- CC = xcrun cc
+- AR = xcrun ar
+- LD = xcrun ld
+- RANLIB = xcrun ranlib
++ SYS_GLUT_LIBS ?= -framework GLUT -framework OpenGL
++ CC ?= xcrun cc
++ AR ?= xcrun ar
++ LD ?= xcrun ld
++ RANLIB ?= xcrun ranlib
+
+ ifneq ($(ARCHFLAGS),)
+ $(warning "MacOS with ARCHFLAGS set. Assuming we are building for arm64, and setting HAVE_LIBCRYPTO to no.")
+@@ -180,15 +180,7 @@ else ifeq ($(OS),MACOS)
+ endif
+ endif
+
+-else ifeq ($(OS),Linux)
+- ifeq ($(PYODIDE_ROOT),)
+- HAVE_OBJCOPY := yes
+- else
+- # Pyodide's ld does not support -b so we cannot use it to create object
+- # files containing font data, so leave HAVE_OBJCOPY unset. And we need
+- # extra memory when linking.
+- LDFLAGS += -sTOTAL_MEMORY=48MB
+- endif
++endif
+
+ ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
+ SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
+@@ -263,8 +255,6 @@ else ifeq ($(OS),Linux)
+ PTHREAD_LIBS := -lpthread
+ endif
+
+-endif
+-
+ # The following section has various cross compilation configurations.
+ #
+ # Invoke these as:
diff --git a/app-text/mupdf/files/mupdf-1.23.3-openssl-x11.patch b/app-text/mupdf/files/mupdf-1.23.3-openssl-x11.patch
new file mode 100644
index 000000000000..b91bd9ad12e3
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.23.3-openssl-x11.patch
@@ -0,0 +1,19 @@
+--- a/Makerules
++++ b/Makerules
+@@ -243,14 +243,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
+
+ ifeq ($(HAVE_LIBCRYPTO),)
+- HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
++ HAVE_LIBCRYPTO := not-unless-portage-tells-me
+ endif
+ ifeq ($(HAVE_LIBCRYPTO),yes)
+ LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
diff --git a/app-text/mupdf/mupdf-1.23.3.ebuild b/app-text/mupdf/mupdf-1.23.3.ebuild
new file mode 100644
index 000000000000..7549d72031a4
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.23.3.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please check upstream git regularly for relevant security-related commits
+# to backport.
+
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git"
+SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.gz"
+S="${WORKDIR}"/${P}-source
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+javascript opengl ssl X"
+REQUIRED_USE="opengl? ( javascript )"
+
+# Although we use the bundled, patched version of freeglut in mupdf (because of
+# bug #653298), the best way to ensure that its dependencies are present is to
+# install system's freeglut.
+RDEPEND="
+ dev-libs/gumbo
+ media-libs/freetype:2
+ media-libs/harfbuzz:=[truetype]
+ media-libs/jbig2dec:=
+ media-libs/libpng:0=
+ >=media-libs/openjpeg-2.1:2=
+ >=media-libs/libjpeg-turbo-1.5.3-r2:0=
+ net-misc/curl
+ javascript? ( >=dev-lang/mujs-1.2.0:= )
+ opengl? ( >=media-libs/freeglut-3.0.0 )
+ ssl? ( >=dev-libs/openssl-1.1:0= )
+ sys-libs/zlib
+ X? (
+ media-libs/libglvnd[X]
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrandr
+ )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.15-CFLAGS.patch
+ "${FILESDIR}"/${PN}-1.19.0-Makefile.patch
+ "${FILESDIR}"/${PN}-1.21.0-add-desktop-pc-files.patch
+ "${FILESDIR}"/${P}-darwin.patch
+ # See bugs #662352
+ "${FILESDIR}"/${P}-openssl-x11.patch
+ # General cross fixes from Debian (refreshed)
+ "${FILESDIR}"/${P}-cross-fixes.patch
+ "${FILESDIR}"/${PN}-1.21.1-fix-aliasing-violation.patch
+)
+
+src_prepare() {
+ default
+
+ use hppa && append-cflags -ffunction-sections
+
+ append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)"
+
+ sed -e "1iOS = Linux" \
+ -e "1iCC = $(tc-getCC)" \
+ -e "1iCXX = $(tc-getCXX)" \
+ -e "1iLD = $(tc-getLD)" \
+ -e "1iAR = $(tc-getAR)" \
+ -e "1iverbose = yes" \
+ -e "1ibuild = debug" \
+ -i Makerules || die "Failed adding build variables to Makerules in src_prepare()"
+
+ # Adjust MuPDF version in .pc file created by the
+ # mupdf-1.10a-add-desktop-pc-xpm-files.patch file
+ sed -e "s/Version: \(.*\)/Version: ${PV}/" \
+ -i platform/debian/${PN}.pc || die "Failed substituting version in ${PN}.pc"
+}
+
+_emake() {
+ # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
+ #
+ # Bundled libs
+ # * General
+ # Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's
+ # recommendations. It does not mean "always use system libs".
+ # See [0] below for what it means in a specific version.
+ #
+ # * freeglut
+ # We don't use system's freeglut because upstream has a special modified
+ # version of it that gives mupdf clipboard support. See bug #653298
+ #
+ # * mujs
+ # As of v1.15.0, mupdf started using symbols in mujs that were not part
+ # of any release. We then went back to using the bundled version of it.
+ # But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk
+ # when bumping and check!
+ # See bug #685244
+ #
+ # * lmms2
+ # mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1].
+ # It is therefore not appropriate for us to unbundle it at this time.
+ #
+ # [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9
+ # [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt
+ local myemakeargs=(
+ GENTOO_PV=${PV}
+ HAVE_GLUT=$(usex opengl)
+ HAVE_LIBCRYPTO=$(usex ssl)
+ HAVE_X11=$(usex X)
+ USE_SYSTEM_LIBS=yes
+ USE_SYSTEM_MUJS=$(usex javascript)
+ USE_SYSTEM_GLUT=no
+ HAVE_OBJCOPY=no
+ "$@"
+ )
+
+ emake "${myemakeargs[@]}"
+}
+
+src_compile() {
+ tc-export PKG_CONFIG
+
+ _emake XCFLAGS="-fPIC"
+}
+
+src_install() {
+ if use opengl || use X ; then
+ domenu platform/debian/${PN}.desktop
+ doicon -s scalable docs/logo/new-${PN}-icon.svg
+ else
+ rm docs/man/${PN}.1 || die "Failed to remove man page in src_install()"
+ fi
+
+ sed -i \
+ -e "1iprefix = ${ED}/usr" \
+ -e "1ilibdir = ${ED}/usr/$(get_libdir)" \
+ -e "1idocdir = ${ED}/usr/share/doc/${PF}" \
+ -i Makerules || die "Failed adding liprefix, lilibdir and lidocdir to Makerules in src_install()"
+
+ _emake install
+
+ dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+
+ 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
+
+ # Respect libdir (bug #734898)
+ sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc \
+ || die "Failed to sed pkgconfig file to respect libdir in src_install()"
+
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins platform/debian/${PN}.pc
+
+ dodoc README CHANGES CONTRIBUTORS
+}
^ permalink raw reply related [flat|nested] 20+ messages in thread
end of thread, other threads:[~2023-10-15 8:48 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-08 13:24 [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/ Michael Weber
-- strict thread matches above, loose matches on Subject: below --
2023-10-15 8:48 Viorel Munteanu
2023-10-15 8:48 Viorel Munteanu
2022-12-04 14:50 Pacho Ramos
2022-06-30 12:45 Florian Schmaus
2021-02-24 16:22 Sam James
2020-10-13 23:21 Sam James
2019-11-26 14:25 Jory Pratt
2019-11-22 9:47 Mikle Kolyada
2018-12-21 1:11 Virgil Dupras
2018-10-15 14:43 Virgil Dupras
2018-10-07 17:43 Virgil Dupras
2018-08-18 21:01 Virgil Dupras
2018-07-25 1:33 Virgil Dupras
2017-06-22 23:30 Michael Weber
2017-05-13 22:46 Michael Weber
2017-04-28 9:33 Michael Weber
2017-02-05 17:25 Michael Weber
2016-01-08 23:48 Michael Weber
2015-08-11 10:29 Michael Weber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox