| 1 |
commit: 2af6b2174d988ef90e8178a6c13839d33af70f35 |
| 2 |
Author: Michael Weber <xmw <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 5 17:24:55 2017 +0000 |
| 4 |
Commit: Michael Weber <xmw <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 5 17:24:55 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2af6b217 |
| 7 |
|
| 8 |
app-text/mupdf: Remove old versions (bug 600674, 590480, 589826). |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
app-text/mupdf/Manifest | 3 - |
| 13 |
app-text/mupdf/files/mupdf-1.3-CFLAGS.patch | 11 - |
| 14 |
app-text/mupdf/files/mupdf-1.3-pkg-config.patch | 20 - |
| 15 |
.../files/mupdf-1.5-Makerules-openssl-curl.patch | 27 -- |
| 16 |
.../files/mupdf-1.5-format-security-error.patch | 22 - |
| 17 |
.../mupdf/files/mupdf-1.5-old-debian-files.patch | 533 --------------------- |
| 18 |
app-text/mupdf/files/mupdf-1.5-openjpeg-2.1.patch | 51 -- |
| 19 |
app-text/mupdf/files/mupdf-1.7a-system-mujs.patch | 11 - |
| 20 |
app-text/mupdf/files/mupdf-1.9a-no-thirdlibs.patch | 113 ----- |
| 21 |
app-text/mupdf/mupdf-1.5-r1.ebuild | 128 ----- |
| 22 |
app-text/mupdf/mupdf-1.8.ebuild | 141 ------ |
| 23 |
app-text/mupdf/mupdf-1.9a.ebuild | 144 ------ |
| 24 |
12 files changed, 1204 deletions(-) |
| 25 |
|
| 26 |
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest |
| 27 |
index 43abae7..006624c 100644 |
| 28 |
--- a/app-text/mupdf/Manifest |
| 29 |
+++ b/app-text/mupdf/Manifest |
| 30 |
@@ -1,4 +1 @@ |
| 31 |
DIST mupdf-1.10a-source.tar.gz 42264707 SHA256 aacc1f36b9180f562022ef1ab3439b009369d944364f3cff8a2a898834e3a836 SHA512 8c735963364985e74ceb38242afae555a3d2ee7c69abe3fe5c485e8613a83d996a58f231cb689a156019d431fa67d565503247d010b0a404054850483aed9fec WHIRLPOOL f3dc7fbddd2ee140226f17b444f184138dbff5d626033a295a7b335119fae5eb49eae680fb392068935610cdbed21267016af8afaa080fffba4f320b82209fbb |
| 32 |
-DIST mupdf-1.5.tar.gz 7485699 SHA256 946393c7abf78e50fa9815f18a9e91f275a1a96a7ea14ae39b5237944070d1f5 SHA512 bfb79838eba629295ab164cf37e49edc8846689598fbad9312409535022a2e747bd062718b899909564c6cf5826fb46a2b4b579ced8c7a3896d6098e7e5ccf40 WHIRLPOOL ebcaf5f677984a78aecf9eeb72e7a79e6e2a6388db5024427d8bf55f31b3690844dd291ada3cd578a5bb9a370ea21cb2a044656c21a0ef47cdf7bfc42c842beb |
| 33 |
-DIST mupdf-1.8.tar.gz 7706473 SHA256 d4e06644caad381d1dc88401dae12ee614809a7b95f6dcbf6fd086d5b594dcc4 SHA512 6adc30330c61d0bb8c9ee09488ef31701e9a7425cbac76e072eae9816c14a1190a1e2bd1e9155b6892d4198f7d8692661582cc1b82c7caab7b3ba4fddfcc7461 WHIRLPOOL 9fceca049cf5eaffd1520a0077c78bd8647d8e5b384eb2c1bc968a16349b46909b592cb8cbd5ee0546e798434afbece39a258e175ba02d0454b8edc35e179dd7 |
| 34 |
-DIST mupdf-1.9a.tar.gz 13282205 SHA256 2a7d6d73cd1f6de8f70792dff9936b84c54c127feecd485675e0d0c17debc98d SHA512 aa268484371597f2082bff61052b3f80e30b8d41018bf0477b8975e4520849090b75e6c4be6be15d6af9cea6d9315deb28f82c6afc8b6f3c5bfc3498eca91140 WHIRLPOOL b552e68d0412e723e23c645516e87d695e00af0c88b14ab1ebc6b65e374f525fab6df2b5f81fe72fc8a61a8a9f616712ef0d215a07327745d33fb0238509eac9 |
| 35 |
|
| 36 |
diff --git a/app-text/mupdf/files/mupdf-1.3-CFLAGS.patch b/app-text/mupdf/files/mupdf-1.3-CFLAGS.patch |
| 37 |
deleted file mode 100644 |
| 38 |
index 3c44e98..00000000 |
| 39 |
--- a/app-text/mupdf/files/mupdf-1.3-CFLAGS.patch |
| 40 |
+++ /dev/null |
| 41 |
@@ -1,11 +0,0 @@ |
| 42 |
---- mupdf-1.3/Makerules |
| 43 |
-+++ mupdf-1.3/Makerules |
| 44 |
-@@ -6,7 +6,7 @@ |
| 45 |
- CFLAGS += -Wall |
| 46 |
- |
| 47 |
- ifeq "$(build)" "debug" |
| 48 |
--CFLAGS += -pipe -g -DDEBUG |
| 49 |
-+CFLAGS += -DDEBUG |
| 50 |
- else ifeq "$(build)" "profile" |
| 51 |
- CFLAGS += -pipe -O2 -DNDEBUG -pg |
| 52 |
- LDFLAGS += -pg |
| 53 |
|
| 54 |
diff --git a/app-text/mupdf/files/mupdf-1.3-pkg-config.patch b/app-text/mupdf/files/mupdf-1.3-pkg-config.patch |
| 55 |
deleted file mode 100644 |
| 56 |
index f943014..00000000 |
| 57 |
--- a/app-text/mupdf/files/mupdf-1.3-pkg-config.patch |
| 58 |
+++ /dev/null |
| 59 |
@@ -1,20 +0,0 @@ |
| 60 |
-no pkgconfig data for jbig2dec and jpeg |
| 61 |
-http://bugs.ghostscript.com/show_bug.cgi?id=694301 |
| 62 |
- |
| 63 |
-openjpeg-2 |
| 64 |
-http://bugs.ghostscript.com/show_bug.cgi?id=693518 |
| 65 |
- |
| 66 |
---- mupdf-1.3/platform/debian/mupdf.pc |
| 67 |
-+++ mupdf-1.3/platform/debian/mupdf.pc |
| 68 |
-@@ -4,9 +4,9 @@ |
| 69 |
- includedir=${prefix}/include |
| 70 |
- |
| 71 |
- Name: mupdf |
| 72 |
- Description: Library for rendering PDF documents |
| 73 |
--Requires.private: freetype2 |
| 74 |
-+Requires: freetype2 libopenjp2 libcrypto |
| 75 |
- Version: 0.5.0 |
| 76 |
- Libs: -L${libdir} -lmupdf |
| 77 |
--Libs.private: -lopenjpeg -ljbig2dec -ljpeg -lz -lm |
| 78 |
-+Libs.private: -lmupdf-js-none |
| 79 |
- Cflags: -I${includedir} |
| 80 |
|
| 81 |
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 |
| 82 |
deleted file mode 100644 |
| 83 |
index bc9312a..00000000 |
| 84 |
--- a/app-text/mupdf/files/mupdf-1.5-Makerules-openssl-curl.patch |
| 85 |
+++ /dev/null |
| 86 |
@@ -1,27 +0,0 @@ |
| 87 |
---- mupdf-1.5/Makerules |
| 88 |
-+++ mupdf-1.5/Makerules |
| 89 |
-@@ -58,17 +58,23 @@ |
| 90 |
- |
| 91 |
- HAVE_X11 ?= yes |
| 92 |
- |
| 93 |
-+WANT_OPENSSL ?= yes |
| 94 |
-+ifeq "$(WANT_OPENSSL)" "yes" |
| 95 |
- ifeq "$(shell pkg-config --exists libcrypto && echo yes)" "yes" |
| 96 |
- SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL $(shell pkg-config --cflags libcrypto) |
| 97 |
- SYS_OPENSSL_LIBS = $(shell pkg-config --libs libcrypto) |
| 98 |
- endif |
| 99 |
-+endif |
| 100 |
- |
| 101 |
-+WANT_CURL ?= yes |
| 102 |
-+ifeq "$(WANT_CURL)" "yes" |
| 103 |
- ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes" |
| 104 |
- HAVE_CURL = yes |
| 105 |
- SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl) |
| 106 |
- SYS_CURL_LIBS = $(shell pkg-config --libs libcurl) |
| 107 |
--endif |
| 108 |
- SYS_CURL_DEPS = -lpthread -lrt |
| 109 |
-+endif |
| 110 |
-+endif |
| 111 |
- |
| 112 |
- SYS_X11_CFLAGS = $(shell pkg-config --cflags x11 xext) |
| 113 |
- SYS_X11_LIBS = $(shell pkg-config --libs x11 xext) |
| 114 |
|
| 115 |
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 |
| 116 |
deleted file mode 100644 |
| 117 |
index d0dce97..00000000 |
| 118 |
--- a/app-text/mupdf/files/mupdf-1.5-format-security-error.patch |
| 119 |
+++ /dev/null |
| 120 |
@@ -1,22 +0,0 @@ |
| 121 |
-From: =?utf-8?q?=22Kan-Ru_Chen_=28=E9=99=B3=E4=BE=83=E5=A6=82=29=22?= |
| 122 |
- <koster@××××××.org> |
| 123 |
-Date: Sat, 20 Sep 2014 13:12:16 +0800 |
| 124 |
-Subject: Fix -Werror=format-security error |
| 125 |
- |
| 126 |
---- |
| 127 |
- source/pdf/pdf-op-run.c | 2 +- |
| 128 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 129 |
- |
| 130 |
-diff --git a/source/pdf/pdf-op-run.c b/source/pdf/pdf-op-run.c |
| 131 |
-index 2bea94b..da881b2 100644 |
| 132 |
---- a/source/pdf/pdf-op-run.c |
| 133 |
-+++ b/source/pdf/pdf-op-run.c |
| 134 |
-@@ -1729,7 +1729,7 @@ run_xobject(pdf_csi *csi, void *state, pdf_obj *resources, pdf_xobject *xobj, co |
| 135 |
- |
| 136 |
- /* Rethrow postponed errors */ |
| 137 |
- if (errmess[0]) |
| 138 |
-- fz_throw(ctx, FZ_ERROR_GENERIC, errmess); |
| 139 |
-+ fz_throw(ctx, FZ_ERROR_GENERIC, "%s", errmess); |
| 140 |
- } |
| 141 |
- |
| 142 |
- static void pdf_run_BDC(pdf_csi *csi, void *state) |
| 143 |
|
| 144 |
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 |
| 145 |
deleted file mode 100644 |
| 146 |
index 3dd6419..00000000 |
| 147 |
--- a/app-text/mupdf/files/mupdf-1.5-old-debian-files.patch |
| 148 |
+++ /dev/null |
| 149 |
@@ -1,533 +0,0 @@ |
| 150 |
---- /dev/null |
| 151 |
-+++ platform/debian/mupdf.desktop |
| 152 |
-@@ -0,0 +1,15 @@ |
| 153 |
-+[Desktop Entry] |
| 154 |
-+Name=MuPDF |
| 155 |
-+GenericName=PDF file viewer |
| 156 |
-+Exec=mupdf %f |
| 157 |
-+TryExec=mupdf |
| 158 |
-+Icon=mupdf |
| 159 |
-+Terminal=false |
| 160 |
-+Type=Application |
| 161 |
-+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 |
| 162 |
-+Categories=Viewer;Graphics; |
| 163 |
-+Actions=View |
| 164 |
-+ |
| 165 |
-+[Desktop Action View] |
| 166 |
-+Name=View with mupdf |
| 167 |
-+Exec=mupdf %f |
| 168 |
---- /dev/null |
| 169 |
-+++ platform/debian/mupdf.pc |
| 170 |
-@@ -0,0 +1,12 @@ |
| 171 |
-+prefix=/usr |
| 172 |
-+exec_prefix=${prefix} |
| 173 |
-+libdir=${exec_prefix}/lib |
| 174 |
-+includedir=${prefix}/include |
| 175 |
-+ |
| 176 |
-+Name: mupdf |
| 177 |
-+Description: Library for rendering PDF documents |
| 178 |
-+Requires.private: freetype2 |
| 179 |
-+Version: 0.5.0 |
| 180 |
-+Libs: -L${libdir} -lmupdf |
| 181 |
-+Libs.private: -lopenjpeg -ljbig2dec -ljpeg -lz -lm |
| 182 |
-+Cflags: -I${includedir} |
| 183 |
---- /dev/null |
| 184 |
-+++ platform/debian/mupdf.xpm |
| 185 |
-@@ -0,0 +1,497 @@ |
| 186 |
-+/* XPM */ |
| 187 |
-+static char *mupdf[] = { |
| 188 |
-+/* width height ncolors chars_per_pixel */ |
| 189 |
-+"48 48 442 2", |
| 190 |
-+/* colors */ |
| 191 |
-+" c #000000", |
| 192 |
-+" . c #2E4558", |
| 193 |
-+" X c #252121", |
| 194 |
-+" o c #AFAFAF", |
| 195 |
-+" O c #28313B", |
| 196 |
-+" + c #231F1F", |
| 197 |
-+" @ c #686666", |
| 198 |
-+" # c #98BDD7", |
| 199 |
-+" $ c #201B1C", |
| 200 |
-+" % c #7CABCC", |
| 201 |
-+" & c #4487B6", |
| 202 |
-+" * c #DFDEDE", |
| 203 |
-+" = c #4285B4", |
| 204 |
-+" - c #615E5F", |
| 205 |
-+" ; c #605E5E", |
| 206 |
-+" : c #23262C", |
| 207 |
-+" > c #D9D8D8", |
| 208 |
-+" , c #F7FAFC", |
| 209 |
-+" < c #D7D6D6", |
| 210 |
-+" 1 c #BFD6E6", |
| 211 |
-+" 2 c #6BA0C5", |
| 212 |
-+" 3 c #232122", |
| 213 |
-+" 4 c #555253", |
| 214 |
-+" 5 c #CDCCCC", |
| 215 |
-+" 6 c #E7EFF6", |
| 216 |
-+" 7 c #4786B2", |
| 217 |
-+" 8 c #CADDEA", |
| 218 |
-+" 9 c #4085B5", |
| 219 |
-+" 0 c #AECBDF", |
| 220 |
-+" q c #CBCACA", |
| 221 |
-+" w c #92B9D4", |
| 222 |
-+" e c #365F7D", |
| 223 |
-+" r c #5A95BE", |
| 224 |
-+" t c #3E83B3", |
| 225 |
-+" y c #304B60", |
| 226 |
-+" u c #C7C6C6", |
| 227 |
-+" i c #4D8EBB", |
| 228 |
-+" p c #F1F6F9", |
| 229 |
-+" a c #C1C0C0", |
| 230 |
-+" s c #454243", |
| 231 |
-+" d c #669CC3", |
| 232 |
-+" f c #81AECD", |
| 233 |
-+" g c #7A7777", |
| 234 |
-+" h c #434041", |
| 235 |
-+" j c #3E779F", |
| 236 |
-+" k c #272E36", |
| 237 |
-+" l c #413E3F", |
| 238 |
-+" z c #3F3C3D", |
| 239 |
-+" x c #5895BF", |
| 240 |
-+" c c #3D3A3B", |
| 241 |
-+" v c #C6DBE9", |
| 242 |
-+" b c #B8B6B7", |
| 243 |
-+" n c #4282B0", |
| 244 |
-+" m c #FDFDFE", |
| 245 |
-+" M c #B7B6B6", |
| 246 |
-+" N c #8DB5D2", |
| 247 |
-+" B c #242529", |
| 248 |
-+" V c #B3B2B2", |
| 249 |
-+" C c #222327", |
| 250 |
-+" Z c #B0AEAF", |
| 251 |
-+" A c #EDF4F8", |
| 252 |
-+" S c #686565", |
| 253 |
-+" D c #488AB9", |
| 254 |
-+" F c #9ABED8", |
| 255 |
-+" G c #7EACCD", |
| 256 |
-+" H c #ECF2F7", |
| 257 |
-+" J c #211C1C", |
| 258 |
-+" K c #666363", |
| 259 |
-+" L c #F1F1F2", |
| 260 |
-+" P c #ABAAAA", |
| 261 |
-+" I c #4588B6", |
| 262 |
-+" U c #A9A8A8", |
| 263 |
-+" Y c #2D2A2B", |
| 264 |
-+" T c #A7A6A6", |
| 265 |
-+" R c #615D5E", |
| 266 |
-+" E c #2B2829", |
| 267 |
-+" W c #8DB7D5", |
| 268 |
-+" Q c #F9FBFD", |
| 269 |
-+" ! c #DDE9F2", |
| 270 |
-+" ~ c #F8FBFC", |
| 271 |
-+" ^ c #DCE9F1", |
| 272 |
-+" / c #A5C5DC", |
| 273 |
-+" ( c #89B3D1", |
| 274 |
-+" ) c #5C5959", |
| 275 |
-+" _ c #A4C5DB", |
| 276 |
-+" ` c #335A76", |
| 277 |
-+" ' c #518FBB", |
| 278 |
-+" ] c #E6E7E7", |
| 279 |
-+" [ c #5A5757", |
| 280 |
-+" { c #232021", |
| 281 |
-+" } c #33536C", |
| 282 |
-+" | c #98BED9", |
| 283 |
-+". c #E0E1E1", |
| 284 |
-+".. c #7CACCE", |
| 285 |
-+".X c #4488B8", |
| 286 |
-+".o c #2D3F4F", |
| 287 |
-+".O c #999898", |
| 288 |
-+".+ c #4388B7", |
| 289 |
-+".@ c #5E98C1", |
| 290 |
-+".# c #CDCDCB", |
| 291 |
-+".$ c #524F4F", |
| 292 |
-+".% c #B0CCE0", |
| 293 |
-+".& c #979696", |
| 294 |
-+".* c #78A8CA", |
| 295 |
-+".= c #5C96BF", |
| 296 |
-+".- c #969495", |
| 297 |
-+".; c #4084B4", |
| 298 |
-+".: c #252930", |
| 299 |
-+".> c #949293", |
| 300 |
-+"., c #929091", |
| 301 |
-+".< c #417FAB", |
| 302 |
-+".1 c #4F8FBC", |
| 303 |
-+".2 c #F3F7FA", |
| 304 |
-+".3 c #D3D3D4", |
| 305 |
-+".4 c #D7E5EF", |
| 306 |
-+".5 c #222023", |
| 307 |
-+".6 c #9FC1D9", |
| 308 |
-+".7 c #679DC3", |
| 309 |
-+".8 c #37678A", |
| 310 |
-+".9 c #4B8BB8", |
| 311 |
-+".0 c #3E769E", |
| 312 |
-+".q c #3C749C", |
| 313 |
-+".w c #403D3D", |
| 314 |
-+".e c #92BAD6", |
| 315 |
-+".r c #C8DCEA", |
| 316 |
-+".t c #FEFEFE", |
| 317 |
-+".y c #3D393A", |
| 318 |
-+".u c #3B3738", |
| 319 |
-+".i c #355974", |
| 320 |
-+".p c #353132", |
| 321 |
-+".a c #7A7879", |
| 322 |
-+".s c #498BB9", |
| 323 |
-+".d c #9BBFD8", |
| 324 |
-+".f c #4E8AB4", |
| 325 |
-+".g c #787677", |
| 326 |
-+".h c #F2F2F2", |
| 327 |
-+".j c #F0F0F0", |
| 328 |
-+".k c #2F2B2C", |
| 329 |
-+".l c #EEEEEE", |
| 330 |
-+".z c #727071", |
| 331 |
-+".x c #26282D", |
| 332 |
-+".c c #ECECEC", |
| 333 |
-+".v c #2B2728", |
| 334 |
-+".b c #FAFCFD", |
| 335 |
-+".n c #EAEAEA", |
| 336 |
-+".m c #DEEAF2", |
| 337 |
-+".M c #E9EAE9", |
| 338 |
-+".N c #C2D8E7", |
| 339 |
-+".B c #6E6C6D", |
| 340 |
-+".V c #5390BC", |
| 341 |
-+".C c #E8E8E8", |
| 342 |
-+".Z c #6EA2C6", |
| 343 |
-+".A c #272324", |
| 344 |
-+".S c #E7E6E7", |
| 345 |
-+".D c #E6E6E6", |
| 346 |
-+".F c #252122", |
| 347 |
-+".G c #29333D", |
| 348 |
-+".H c #E4E4E4", |
| 349 |
-+".J c #3F7AA5", |
| 350 |
-+".K c #231F20", |
| 351 |
-+".L c #E2E2E2", |
| 352 |
-+".P c #211D1E", |
| 353 |
-+".I c #E0E0E0", |
| 354 |
-+".U c #EAF1F7", |
| 355 |
-+".Y c #6099C2", |
| 356 |
-+".T c #1F1B1C", |
| 357 |
-+".R c #E9F1F6", |
| 358 |
-+".E c #CDDFEB", |
| 359 |
-+".W c #4387B6", |
| 360 |
-+".Q c #96BBD6", |
| 361 |
-+".! c #B1CDE0", |
| 362 |
-+".~ c #DEDEDE", |
| 363 |
-+".^ c #79A9CA", |
| 364 |
-+"./ c #4285B5", |
| 365 |
-+".( c #272A31", |
| 366 |
-+".) c #5D97BF", |
| 367 |
-+"._ c #4185B4", |
| 368 |
-+".` c #DCDCDC", |
| 369 |
-+".' c #959393", |
| 370 |
-+".] c #DADADA", |
| 371 |
-+".[ c #314B5F", |
| 372 |
-+".{ c #D8D8D8", |
| 373 |
-+".} c #D7D8D7", |
| 374 |
-+".| c #D6D6D6", |
| 375 |
-+"X c #F5F8FB", |
| 376 |
-+"X. c #D4D4D4", |
| 377 |
-+"XX c #6AA0C5", |
| 378 |
-+"Xo c #BDD4E5", |
| 379 |
-+"XO c #3A6A8C", |
| 380 |
-+"X+ c #232123", |
| 381 |
-+"X@ c #D3D4D3", |
| 382 |
-+"X# c #D2D2D2", |
| 383 |
-+"X$ c #D0D0D0", |
| 384 |
-+"X% c #CECECE", |
| 385 |
-+"X& c #CCCCCC", |
| 386 |
-+"X* c #CADDEB", |
| 387 |
-+"X= c #37617F", |
| 388 |
-+"X- c #242A31", |
| 389 |
-+"X; c #CACACA", |
| 390 |
-+"X: c #C8DBE9", |
| 391 |
-+"X> c #90B7D3", |
| 392 |
-+"X, c #817F7F", |
| 393 |
-+"X< c #3F7EAB", |
| 394 |
-+"X1 c #548FB9", |
| 395 |
-+"X2 c #355873", |
| 396 |
-+"X3 c #7D7B7B", |
| 397 |
-+"X4 c #C2C2C2", |
| 398 |
-+"X5 c #4B8CBA", |
| 399 |
-+"X6 c #C0C0C0", |
| 400 |
-+"X7 c #D4E4EE", |
| 401 |
-+"X8 c #81AECE", |
| 402 |
-+"X9 c #659CC3", |
| 403 |
-+"X0 c #787576", |
| 404 |
-+"Xq c #4788B6", |
| 405 |
-+"Xw c #252C35", |
| 406 |
-+"Xe c #757373", |
| 407 |
-+"Xr c #BABABA", |
| 408 |
-+"Xt c #FCFDFE", |
| 409 |
-+"Xy c #B6B6B6", |
| 410 |
-+"Xu c #C4D9E8", |
| 411 |
-+"Xi c #706D6E", |
| 412 |
-+"Xp c #8CB5D2", |
| 413 |
-+"Xa c #70A3C7", |
| 414 |
-+"Xs c #8BB5D1", |
| 415 |
-+"Xd c #5491BC", |
| 416 |
-+"Xf c #5391BB", |
| 417 |
-+"Xg c #282424", |
| 418 |
-+"Xh c #272223", |
| 419 |
-+"Xj c #6C696A", |
| 420 |
-+"Xk c #2F4659", |
| 421 |
-+"Xl c #6B6969", |
| 422 |
-+"Xz c #407BA5", |
| 423 |
-+"Xx c #6A6768", |
| 424 |
-+"Xc c #E4E3E3", |
| 425 |
-+"Xv c #3E79A3", |
| 426 |
-+"Xb c #231E1F", |
| 427 |
-+"Xn c #221E1E", |
| 428 |
-+"Xm c #E2E1E1", |
| 429 |
-+"XM c #211C1D", |
| 430 |
-+"XN c #EBF2F7", |
| 431 |
-+"XB c #201C1C", |
| 432 |
-+"XV c #CFE0EC", |
| 433 |
-+"XC c #4588B7", |
| 434 |
-+"XZ c #B3CEE1", |
| 435 |
-+"XA c #366384", |
| 436 |
-+"XS c #5F98C0", |
| 437 |
-+"XD c #4386B5", |
| 438 |
-+"XF c #DEDDDD", |
| 439 |
-+"XG c #2B3D4B", |
| 440 |
-+"XH c #615F5F", |
| 441 |
-+"XJ c #5F5D5D", |
| 442 |
-+"XK c #5E5B5C", |
| 443 |
-+"XL c #DCE9F2", |
| 444 |
-+"XP c #407DA8", |
| 445 |
-+"XI c #86B1CF", |
| 446 |
-+"XU c #D4D3D3", |
| 447 |
-+"XY c #3A698B", |
| 448 |
-+"XT c #3E7BA6", |
| 449 |
-+"XR c #232022", |
| 450 |
-+"XE c #545152", |
| 451 |
-+"XW c #999899", |
| 452 |
-+"XQ c #79AACC", |
| 453 |
-+"X! c #524F50", |
| 454 |
-+"X~ c #CCCDCB", |
| 455 |
-+"X^ c #3D749B", |
| 456 |
-+"X/ c #93BAD5", |
| 457 |
-+"X( c #77A8CA", |
| 458 |
-+"X) c #37607E", |
| 459 |
-+"X_ c #5B96BF", |
| 460 |
-+"X` c #3F84B4", |
| 461 |
-+"X' c #CAC9C9", |
| 462 |
-+"X] c #C6C5C5", |
| 463 |
-+"X[ c #3F7DAA", |
| 464 |
-+"X{ c #F2F7FA", |
| 465 |
-+"X} c #C2C1C1", |
| 466 |
-+"X| c #212023", |
| 467 |
-+"o c #9EC1D9", |
| 468 |
-+"o. c #444142", |
| 469 |
-+"oX c #3F78A0", |
| 470 |
-+"oo c #90B8D5", |
| 471 |
-+"oO c #FEFEFF", |
| 472 |
-+"o+ c #E2ECF4", |
| 473 |
-+"o@ c #2B3A47", |
| 474 |
-+"o# c #25262A", |
| 475 |
-+"o$ c #B1AFB0", |
| 476 |
-+"o% c #28313A", |
| 477 |
-+"o& c #221D1D", |
| 478 |
-+"o* c #262F38", |
| 479 |
-+"o= c #629BC2", |
| 480 |
-+"o- c #302D2E", |
| 481 |
-+"o; c #6199C1", |
| 482 |
-+"o: c #201B1B", |
| 483 |
-+"o> c #4587B6", |
| 484 |
-+"o, c #F0F0F1", |
| 485 |
-+"o< c #2D3E4C", |
| 486 |
-+"o1 c #2E2B2C", |
| 487 |
-+"o2 c #4385B4", |
| 488 |
-+"o3 c #A8A7A7", |
| 489 |
-+"o4 c #A7A5A6", |
| 490 |
-+"o5 c #3D7197", |
| 491 |
-+"o6 c #4183B2", |
| 492 |
-+"o7 c #4083B1", |
| 493 |
-+"o8 c #A5A3A4", |
| 494 |
-+"o9 c #3B6F95", |
| 495 |
-+"o0 c #5290BC", |
| 496 |
-+"oq c #A4C4DB", |
| 497 |
-+"ow c #E9F1F7", |
| 498 |
-+"oe c #4387B7", |
| 499 |
-+"or c #E7EFF5", |
| 500 |
-+"ot c #CBDDEA", |
| 501 |
-+"oy c #4185B5", |
| 502 |
-+"ou c #5B95BE", |
| 503 |
-+"oi c #3F83B3", |
| 504 |
-+"op c #939192", |
| 505 |
-+"oa c #929191", |
| 506 |
-+"os c #2B3743", |
| 507 |
-+"od c #4C4849", |
| 508 |
-+"of c #2A3742", |
| 509 |
-+"og c #F4F8FB", |
| 510 |
-+"oh c #D8E6F0", |
| 511 |
-+"oj c #4C8CB9", |
| 512 |
-+"ok c #211F22", |
| 513 |
-+"ol c #CFD0D0", |
| 514 |
-+"oz c #444041", |
| 515 |
-+"ox c #262C34", |
| 516 |
-+"oc c #413E3E", |
| 517 |
-+"ov c #403C3D", |
| 518 |
-+"ob c #3B739B", |
| 519 |
-+"on c #858384", |
| 520 |
-+"om c #FFFFFF", |
| 521 |
-+"oM c #E3EDF4", |
| 522 |
-+"oN c #5995BF", |
| 523 |
-+"oB c #3E3A3B", |
| 524 |
-+"oV c #C7DBE9", |
| 525 |
-+"oC c #2F4B61", |
| 526 |
-+"oZ c #5793BD", |
| 527 |
-+"oA c #3C3839", |
| 528 |
-+"oS c #2A3945", |
| 529 |
-+"oD c #7E7D7D", |
| 530 |
-+"oF c #345873", |
| 531 |
-+"oG c #363233", |
| 532 |
-+"oH c #7B797A", |
| 533 |
-+"oJ c #EFF4F9", |
| 534 |
-+"oK c #EEF4F8", |
| 535 |
-+"oL c #F3F3F3", |
| 536 |
-+"oP c #9ABED7", |
| 537 |
-+"oI c #4788B7", |
| 538 |
-+"oU c #629AC1", |
| 539 |
-+"oY c #ACAAAA", |
| 540 |
-+"oT c #F1F1F1", |
| 541 |
-+"oR c #EFEFEF", |
| 542 |
-+"oE c #737172", |
| 543 |
-+"oW c #EDEDED", |
| 544 |
-+"oQ c #A9C9DF", |
| 545 |
-+"o! c #FBFDFE", |
| 546 |
-+"o~ c #EBEBEB", |
| 547 |
-+"o^ c #DFEBF3", |
| 548 |
-+"o/ c #4581AB", |
| 549 |
-+"o( c #6F6D6E", |
| 550 |
-+"o) c #EAE9EA", |
| 551 |
-+"o_ c #E9E9E9", |
| 552 |
-+"o` c #C1D7E6", |
| 553 |
-+"o' c #E7E7E7", |
| 554 |
-+"o] c #E6E7E6", |
| 555 |
-+"o[ c #E5E5E5", |
| 556 |
-+"o{ c #3F7BA5", |
| 557 |
-+"o} c #242021", |
| 558 |
-+"o| c #E3E3E3", |
| 559 |
-+"O c #3E79A4", |
| 560 |
-+"O. c #221E1F", |
| 561 |
-+"OX c #26303A", |
| 562 |
-+"Oo c #9C9A9A", |
| 563 |
-+"OO c #E1E1E1", |
| 564 |
-+"O+ c #201C1D", |
| 565 |
-+"O@ c #4488B7", |
| 566 |
-+"O# c #DFDFDF", |
| 567 |
-+"O$ c #7BAACC", |
| 568 |
-+"O% c #356384", |
| 569 |
-+"O& c #1E1A1B", |
| 570 |
-+"O* c #4386B6", |
| 571 |
-+"O= c #4286B5", |
| 572 |
-+"O- c #95BAD5", |
| 573 |
-+"O; c #DDDDDD", |
| 574 |
-+"O: c #1C1819", |
| 575 |
-+"O> c #DBDBDB", |
| 576 |
-+"O, c #D9D9D9", |
| 577 |
-+"O< c #D7D7D7", |
| 578 |
-+"O1 c #417FAA", |
| 579 |
-+"O2 c #DAE7F1", |
| 580 |
-+"O3 c #F5F9FB", |
| 581 |
-+"O4 c #D5D5D5", |
| 582 |
-+"O5 c #242224", |
| 583 |
-+"O6 c #D4D3D4", |
| 584 |
-+"O7 c #85B1CF", |
| 585 |
-+"O8 c #D3D3D3", |
| 586 |
-+"O9 c #699FC4", |
| 587 |
-+"O0 c #4D8DB9", |
| 588 |
-+"Oq c #222022", |
| 589 |
-+"Ow c #34556F", |
| 590 |
-+"Oe c #D1D1D1", |
| 591 |
-+"Or c #D0CFD0", |
| 592 |
-+"Ot c #8A8888", |
| 593 |
-+"Oy c #CFCFCF", |
| 594 |
-+"Ou c #CDCDCD", |
| 595 |
-+"Oi c #CCCDCC", |
| 596 |
-+"Op c #CADEEB", |
| 597 |
-+"Oa c #E5EEF5", |
| 598 |
-+"Os c #C9DCEA", |
| 599 |
-+"Od c #ADCADF", |
| 600 |
-+"Of c #C8DCE9", |
| 601 |
-+"Og c #91B8D4", |
| 602 |
-+"Oh c #5994BE", |
| 603 |
-+"Oj c #3D82B3", |
| 604 |
-+"Ok c #5894BD", |
| 605 |
-+"Ol c #3C82B2", |
| 606 |
-+"Oz c #4181AD", |
| 607 |
-+"Ox c #3B3737", |
| 608 |
-+"Oc c #C5C5C5", |
| 609 |
-+"Ov c #293643", |
| 610 |
-+"Ob c #3E7DAA", |
| 611 |
-+"On c #C1C1C1", |
| 612 |
-+"Om c #353131", |
| 613 |
-+"OM c #D4E3EE", |
| 614 |
-+"ON c #B8D1E3", |
| 615 |
-+"OB c #BFBFBF", |
| 616 |
-+"OV c #9CBFD8", |
| 617 |
-+"OC c #80ADCD", |
| 618 |
-+"OZ c #649BC2", |
| 619 |
-+"OA c #4889B7", |
| 620 |
-+"OS c #BDBDBD", |
| 621 |
-+"OD c #2E292A", |
| 622 |
-+"OF c #4283B1", |
| 623 |
-+"OG c #B7B7B7", |
| 624 |
-+"OH c #4183B0", |
| 625 |
-+"OJ c #5794BF", |
| 626 |
-+"OK c #A7C6DC", |
| 627 |
-+"OL c #365B77", |
| 628 |
-+"OP c #8BB4D1", |
| 629 |
-+"OI c #282324", |
| 630 |
-+"OU c #272323", |
| 631 |
-+"OY c #6C6A6A", |
| 632 |
-+"OT c None", |
| 633 |
-+/* pixels */ |
| 634 |
-+" 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 ", |
| 635 |
-+"o,.joToToToToToToToToToToToToToToToToToToToT.h.h.h.hoToToToToToToToToToToToToToToToToToToToT.j.j", |
| 636 |
-+".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", |
| 637 |
-+"oRoRoRoRoRoRoRoRoRoRoRoRoRoRoRoT.hXcOBoaXjX!oz c cozX!XjoaOBXc.hoToRoRoRoRoRoRoRoRoRoRoRoRoRoRoR", |
| 638 |
-+".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", |
| 639 |
-+".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", |
| 640 |
-+"oWoWoWoWoWoWoWoWoWoWoWoR uXK X $XRo% yXA.qo/.fX1X1.fo/.qXA yo%XR $ XXK uoRoWoWoWoWoWoWoWoWoWoWoW", |
| 641 |
-+".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", |
| 642 |
-+"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~", |
| 643 |
-+".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", |
| 644 |
-+".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", |
| 645 |
-+"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_", |
| 646 |
-+".C.C.C.C.C.Co~o8Xg kX^oeoZXf._XDXD 0omomomomomomomomomomomomomomomom.b #XCX^ kXgo8o~.C.C.C.C.C.C", |
| 647 |
-+"o'o'o'o'o'.CO>.$okX=oeXDo>O=XD./Xd.momomomomomomomomomomomomomom pX7.NOK 'oeX=ok.$O>.Co'o'o'o'o'", |
| 648 |
-+" ]o'o'o'.So_ TXh.o nXDXDXDXDXD.; %.bomomomomomomomomomomomomoOo`O9ojo>XDXDXD n.oXh To_ ]o'o'o'.S", |
| 649 |
-+".D.D.D.D.Do| SX|XY.+XDXDXDXDXDXDXZomomomomomomomomomomomomom.4Xd.;O=XDXDXDXD.+XYX| So|.D.D.D.D.D", |
| 650 |
-+"o[o[o[o[.D 5OxOvOzO*XDXDXDXD =oZo+omomomomomomomomomomomomomoP.;XDXDXDXDXDXDO*OzOvOx 5o]o[o[o[o[", |
| 651 |
-+".H.H.H.Ho' POU }oeXDXDXDXDXD.;X8o!omomomomomomomomomomomom.bX(.;XDXDXDXDXDXDXDoe }OU Po'.H.H.H.H", |
| 652 |
-+"o|o|o|o|.DOt.5XO.+XDXDXDXDXD &ONomomomomomomomomomomomomom.2.7._XDXDXDXDXDXDXD.+XO.5Ot.Do|o|o|o|", |
| 653 |
-+"o|o|o|o|o|Xi : j.WXDXDXDXD = rOaomomomomomomomomomomomomom AXS._XDXDXDXDXDXDXD.W j :Xio|o|o|o|o|", |
| 654 |
-+".L.L.L.L.I RXwXP.WXDXDXDXD.;XI momomomomomomomomomomomomomXN.=._XDXDXDXDXDXDXD.WXPXw R.I.L.L.L.L", |
| 655 |
-+"OOOOOOOOO; [OX.<O*XDXDXDXD IXoomomomomomomomomomomomomomom.UX_._XDXDXDXDXDXDXDO*.<OX [O;OOOOOOOO", |
| 656 |
-+".I.I.I.IO; )o*O1O*XDXDXD._.).Romomomomomog ~omomomomomomom.UX_._XDXDXDXDXDXDXDO*O1o* )O;.I.I.I.I", |
| 657 |
-+"O#O#O#O#O# KX-Xz.WXDXDXD.;XsoOomomomomom vowomomomomomomom.UX_._XDXDXDXDXDXDXD.WXzX- KO#O#O#O#O#", |
| 658 |
-+"O#O#O#O#. g Co5oeXDXDXDXq.Nomomomomom ,X>oromomomomomomom.UX_._XDXDXDXDXDXDXDoeo5 C gOOO#O#O#O#", |
| 659 |
-+".~.~.~.~OO.- {X).XXDXD._o; HomomomomomohO9.Romomomomomomom.UX_._XDXDXDXDXDXDXD.XX) {.-OO.~.~.~.~", |
| 660 |
-+"O;O;O;O;O#XyOD .o2XDXD.;Ogomomomomomom / r.Uomomomomomomom.UX_._XDXDXDXDXDXDXDo2 .ODXyO#O;O;O;O;", |
| 661 |
-+".`.`.`.`O;Oeod.:oX.WXDOAoVomomomomomO3XaOk.Uomomomomomomom.UX_._XDXDXDXDXDXD.WoX.:odOeO;.`.`.`.`", |
| 662 |
-+"O>O>O>O>O>O;X,.POw.W._ doJomomomomomOMoj r.Uomomomomomomom.UX_._XDXDXDXDXDXD.WOw.PX,O;O>O>O>O>O>", |
| 663 |
-+"O>O>O>O>O>O;XrOmox.0 9X8Xtomomomomom.6X`ou.Uomomomomomomom.UX_._XDXDXDXDXDoe.0oxOmXrO;O>O>O>O>O>", |
| 664 |
-+".].].].].].]O,.z JXkOH.VotomomomomX{ 2oiou.Uomomomomomomom.UX_._XDO= &O0 &OFXk J.zO,.].].].].].]", |
| 665 |
-+"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,", |
| 666 |
-+".{.{.{.{.{.{.{.].,.A BX)oyXXO2omom.Q.;._ou.Uomomomomomomom.UOh._ dO-X9O=X) BOI.,.].{.{.{.{.{.{.{", |
| 667 |
-+"O<O<O<O<O<O<O<.{O8o(Xno#OLo7.YXuX O7oIoiOk.Romomomomomomom HOCoqOdo=o6OLo#Xno(O8.{O<O<O<O<O<O<O<", |
| 668 |
-+"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<", |
| 669 |
-+".|.|.|.|.|.|.|.|.|.}X]XH.KXn.G eX<oN.e 8 6 Qomomomom.bXN.roo xX< e.GXn.KXHX].}.|.|.|.|.|.|.|.|.|", |
| 670 |
-+"O4O4O4O4O4O4O4O4O4O4O<X;Xe.vXBX+ofoFob 7.@XQ W | | WXQ.@ 7oboFofX+XB.vXeX;O<O4O4O4O4O4O4O4O4O4O4", |
| 671 |
-+"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.", |
| 672 |
-+"O8O8O8O6O8XUXUO8O8XUXUO8X..|OnX,oc.F $ Jo&XbXRO5O5XRXbo& J $.FocX,On.|X.O8XUX@X@O8.3O8O8O8O8O8X@", |
| 673 |
-+"O8O8O8O8O8O8O8O8O8O8O8O8O8O8X.X. aop ; c Eo}.PXMXM.Po} E c ;op aX.X.O8O8O8O8O8O8O8O8O8O8O8O8O8O8", |
| 674 |
-+"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#", |
| 675 |
-+"OeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeO8X4OGOnOcOcX} MOSX#OeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOe", |
| 676 |
-+"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$", |
| 677 |
-+"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$", |
| 678 |
-+"OyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyX#oHXEXFoBO&.TO:OYX$OyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOy", |
| 679 |
-+"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%", |
| 680 |
-+"X%X%OuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuX% oo$.h boYo4.O UX%OuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuX%X%", |
| 681 |
-+" 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 " |
| 682 |
-+}; |
| 683 |
|
| 684 |
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 |
| 685 |
deleted file mode 100644 |
| 686 |
index f3b09eb..00000000 |
| 687 |
--- a/app-text/mupdf/files/mupdf-1.5-openjpeg-2.1.patch |
| 688 |
+++ /dev/null |
| 689 |
@@ -1,51 +0,0 @@ |
| 690 |
-From: =?utf-8?q?=22Kan-Ru_Chen_=28=E9=99=B3=E4=BE=83=E5=A6=82=29=22?= |
| 691 |
- <koster@××××××.org> |
| 692 |
-Date: Sat, 20 Sep 2014 12:33:08 +0800 |
| 693 |
-Subject: Fix build with libopenjp2 |
| 694 |
- |
| 695 |
---- |
| 696 |
- Makerules | 4 ++-- |
| 697 |
- source/fitz/load-jpx.c | 10 +--------- |
| 698 |
- 2 files changed, 3 insertions(+), 11 deletions(-) |
| 699 |
- |
| 700 |
-diff --git a/Makerules b/Makerules |
| 701 |
-index 766ad53..a93b9cf 100644 |
| 702 |
---- a/Makerules |
| 703 |
-+++ b/Makerules |
| 704 |
-@@ -105,8 +105,8 @@ SYS_HARFBUZZ_CFLAGS = $(shell pkg-config --cflags harfbuzz) |
| 705 |
- SYS_HARFBUZZ_LIBS = $(shell pkg-config --libs harfbuzz) |
| 706 |
- SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2) |
| 707 |
- SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2) |
| 708 |
--SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjp2) |
| 709 |
--SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjp2) |
| 710 |
-+SYS_OPENJPEG_CFLAGS = -I/usr/include/openjpeg-2.1 |
| 711 |
-+SYS_OPENJPEG_LIBS = -lopenjp2 |
| 712 |
- SYS_JBIG2DEC_LIBS = -ljbig2dec |
| 713 |
- SYS_JPEG_LIBS = -ljpeg |
| 714 |
- SYS_ZLIB_LIBS = -lz |
| 715 |
-diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c |
| 716 |
-index 6b92e5c..72dea50 100644 |
| 717 |
---- a/source/fitz/load-jpx.c |
| 718 |
-+++ b/source/fitz/load-jpx.c |
| 719 |
-@@ -1,13 +1,5 @@ |
| 720 |
- #include "mupdf/fitz.h" |
| 721 |
- |
| 722 |
--/* Without the definition of OPJ_STATIC, compilation fails on windows |
| 723 |
-- * due to the use of __stdcall. We believe it is required on some |
| 724 |
-- * linux toolchains too. */ |
| 725 |
--#define OPJ_STATIC |
| 726 |
--#ifndef _MSC_VER |
| 727 |
--#define OPJ_HAVE_STDINT_H |
| 728 |
--#endif |
| 729 |
-- |
| 730 |
- #include <openjpeg.h> |
| 731 |
- |
| 732 |
- static void fz_opj_error_callback(const char *msg, void *client_data) |
| 733 |
-@@ -117,7 +109,7 @@ fz_load_jpx(fz_context *ctx, unsigned char *data, int size, fz_colorspace *defcs |
| 734 |
- opj_stream_set_read_function(stream, fz_opj_stream_read); |
| 735 |
- opj_stream_set_skip_function(stream, fz_opj_stream_skip); |
| 736 |
- opj_stream_set_seek_function(stream, fz_opj_stream_seek); |
| 737 |
-- opj_stream_set_user_data(stream, &sb); |
| 738 |
-+ opj_stream_set_user_data(stream, &sb, NULL); |
| 739 |
- /* Set the length to avoid an assert */ |
| 740 |
- opj_stream_set_user_data_length(stream, size); |
| 741 |
\ No newline at end of file |
| 742 |
|
| 743 |
diff --git a/app-text/mupdf/files/mupdf-1.7a-system-mujs.patch b/app-text/mupdf/files/mupdf-1.7a-system-mujs.patch |
| 744 |
deleted file mode 100644 |
| 745 |
index 1ccaf32..00000000 |
| 746 |
--- a/app-text/mupdf/files/mupdf-1.7a-system-mujs.patch |
| 747 |
+++ /dev/null |
| 748 |
@@ -1,11 +0,0 @@ |
| 749 |
---- mupdf-1.7a/Makefile |
| 750 |
-+++ mupdf-1.7a/Makefile |
| 751 |
-@@ -98,7 +98,7 @@ |
| 752 |
- ifeq "$(HAVE_MUJS)" "yes" |
| 753 |
- PDF_OBJ += $(OUT)/pdf/js/pdf-js.o |
| 754 |
- PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-mu.o |
| 755 |
--THIRD_LIBS += $(MUJS_LIB) |
| 756 |
-+THIRD_LIBS += |
| 757 |
- LIBS += $(MUJS_LIBS) |
| 758 |
- CFLAGS += $(MUJS_CFLAGS) |
| 759 |
- else ifeq "$(HAVE_JSCORE)" "yes" |
| 760 |
|
| 761 |
diff --git a/app-text/mupdf/files/mupdf-1.9a-no-thirdlibs.patch b/app-text/mupdf/files/mupdf-1.9a-no-thirdlibs.patch |
| 762 |
deleted file mode 100644 |
| 763 |
index 08d2eca..00000000 |
| 764 |
--- a/app-text/mupdf/files/mupdf-1.9a-no-thirdlibs.patch |
| 765 |
+++ /dev/null |
| 766 |
@@ -1,113 +0,0 @@ |
| 767 |
---- mupdf-1.9a/Makefile |
| 768 |
-+++ mupdf-1.9a/Makefile |
| 769 |
-@@ -142,15 +141,12 @@ |
| 770 |
- # --- Library --- |
| 771 |
- |
| 772 |
- MUPDF_LIB = $(OUT)/libmupdf.a |
| 773 |
--THIRD_LIB = $(OUT)/libmupdfthird.a |
| 774 |
- |
| 775 |
- MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ) |
| 776 |
--THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_OBJ) $(JBIG2DEC_OBJ) $(JPEG_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ) |
| 777 |
- |
| 778 |
- $(MUPDF_LIB) : $(MUPDF_OBJ) |
| 779 |
--$(THIRD_LIB) : $(THIRD_OBJ) |
| 780 |
- |
| 781 |
--INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) |
| 782 |
-+INSTALL_LIBS := $(MUPDF_LIB) |
| 783 |
- |
| 784 |
- # --- Rules --- |
| 785 |
- |
| 786 |
-@@ -251,19 +247,19 @@ |
| 787 |
- MUTOOL := $(addprefix $(OUT)/, mutool) |
| 788 |
- 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) |
| 789 |
- $(MUTOOL_OBJ): $(FITZ_HDR) $(PDF_HDR) |
| 790 |
--$(MUTOOL) : $(MUPDF_LIB) $(THIRD_LIB) |
| 791 |
-+$(MUTOOL) : $(MUPDF_LIB) |
| 792 |
- $(MUTOOL) : $(MUTOOL_OBJ) |
| 793 |
- $(LINK_CMD) |
| 794 |
- |
| 795 |
- MJSGEN := $(OUT)/mjsgen |
| 796 |
--$(MJSGEN) : $(MUPDF_LIB) $(THIRD_LIB) |
| 797 |
-+$(MJSGEN) : $(MUPDF_LIB) |
| 798 |
- $(MJSGEN) : $(addprefix $(OUT)/tools/, mjsgen.o) |
| 799 |
- $(LINK_CMD) |
| 800 |
- |
| 801 |
- MUJSTEST := $(OUT)/mujstest |
| 802 |
- MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.o pdfapp.o) |
| 803 |
- $(MUJSTEST_OBJ) : $(FITZ_HDR) $(PDF_HDR) |
| 804 |
--$(MUJSTEST) : $(MUPDF_LIB) $(THIRD_LIB) |
| 805 |
-+$(MUJSTEST) : $(MUPDF_LIB) |
| 806 |
- $(MUJSTEST) : $(MUJSTEST_OBJ) |
| 807 |
- $(LINK_CMD) |
| 808 |
- |
| 809 |
-@@ -271,7 +267,7 @@ |
| 810 |
- MUVIEW_X11 := $(OUT)/mupdf-x11 |
| 811 |
- MUVIEW_X11_OBJ := $(addprefix $(OUT)/platform/x11/, x11_main.o x11_image.o pdfapp.o) |
| 812 |
- $(MUVIEW_X11_OBJ) : $(FITZ_HDR) $(PDF_HDR) |
| 813 |
--$(MUVIEW_X11) : $(MUPDF_LIB) $(THIRD_LIB) |
| 814 |
-+$(MUVIEW_X11) : $(MUPDF_LIB) |
| 815 |
- $(MUVIEW_X11) : $(MUVIEW_X11_OBJ) |
| 816 |
- $(LINK_CMD) $(X11_LIBS) |
| 817 |
- |
| 818 |
-@@ -279,7 +275,7 @@ |
| 819 |
- MUVIEW_GLFW := $(OUT)/mupdf-gl |
| 820 |
- MUVIEW_GLFW_OBJ := $(addprefix $(OUT)/platform/gl/, gl-font.o gl-input.o gl-main.o) |
| 821 |
- $(MUVIEW_GLFW_OBJ) : $(FITZ_HDR) $(PDF_HDR) platform/gl/gl-app.h |
| 822 |
--$(MUVIEW_GLFW) : $(MUPDF_LIB) $(THIRD_LIB) $(GLFW_LIB) |
| 823 |
-+$(MUVIEW_GLFW) : $(MUPDF_LIB) $(GLFW_LIB) |
| 824 |
- $(MUVIEW_GLFW) : $(MUVIEW_GLFW_OBJ) |
| 825 |
- $(LINK_CMD) $(GLFW_LIBS) |
| 826 |
- endif |
| 827 |
-@@ -288,7 +284,7 @@ |
| 828 |
- MUVIEW_X11_CURL := $(OUT)/mupdf-x11-curl |
| 829 |
- MUVIEW_X11_CURL_OBJ := $(addprefix $(OUT)/platform/x11/curl/, x11_main.o x11_image.o pdfapp.o curl_stream.o) |
| 830 |
- $(MUVIEW_X11_CURL_OBJ) : $(FITZ_HDR) $(PDF_HDR) |
| 831 |
--$(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(THIRD_LIB) $(CURL_LIB) |
| 832 |
-+$(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(CURL_LIB) |
| 833 |
- $(MUVIEW_X11_CURL) : $(MUVIEW_X11_CURL_OBJ) |
| 834 |
- $(LINK_CMD) $(X11_LIBS) $(CURL_LIBS) $(SYS_CURL_DEPS) |
| 835 |
- endif |
| 836 |
-@@ -298,7 +294,7 @@ |
| 837 |
- MUVIEW_WIN32 := $(OUT)/mupdf |
| 838 |
- MUVIEW_WIN32_OBJ := $(addprefix $(OUT)/platform/x11/, win_main.o pdfapp.o win_res.o) |
| 839 |
- $(MUVIEW_WIN32_OBJ) : $(FITZ_HDR) $(PDF_HDR) |
| 840 |
--$(MUVIEW_WIN32) : $(MUPDF_LIB) $(THIRD_LIB) |
| 841 |
-+$(MUVIEW_WIN32) : $(MUPDF_LIB) |
| 842 |
- $(MUVIEW_WIN32) : $(MUVIEW_WIN32_OBJ) |
| 843 |
- $(LINK_CMD) $(WIN32_LIBS) |
| 844 |
- endif |
| 845 |
-@@ -312,9 +308,9 @@ |
| 846 |
- |
| 847 |
- examples: $(OUT)/example $(OUT)/multi-threaded |
| 848 |
- |
| 849 |
--$(OUT)/example: docs/example.c $(MUPDF_LIB) $(THIRD_LIB) |
| 850 |
-+$(OUT)/example: docs/example.c $(MUPDF_LIB) |
| 851 |
- $(LINK_CMD) $(CFLAGS) |
| 852 |
--$(OUT)/multi-threaded: docs/multi-threaded.c $(MUPDF_LIB) $(THIRD_LIB) |
| 853 |
-+$(OUT)/multi-threaded: docs/multi-threaded.c $(MUPDF_LIB) |
| 854 |
- $(LINK_CMD) $(CFLAGS) -lpthread |
| 855 |
- |
| 856 |
- # --- Update version string header --- |
| 857 |
-@@ -343,7 +339,6 @@ |
| 858 |
- mandir ?= $(prefix)/share/man |
| 859 |
- docdir ?= $(prefix)/share/doc/mupdf |
| 860 |
- |
| 861 |
--third: $(THIRD_LIB) |
| 862 |
- extra: $(CURL_LIB) $(GLFW_LIB) |
| 863 |
- libs: $(INSTALL_LIBS) |
| 864 |
- apps: $(INSTALL_APPS) |
| 865 |
-@@ -376,7 +371,7 @@ |
| 866 |
- java: |
| 867 |
- $(MAKE) -C platform/java |
| 868 |
- |
| 869 |
--tags: $(shell find include source platform thirdparty -name '*.[ch]' -or -name '*.cc' -or -name '*.hh') |
| 870 |
-+tags: $(shell find include source platform -name '*.[ch]' -or -name '*.cc' -or -name '*.hh') |
| 871 |
- ctags $^ |
| 872 |
- |
| 873 |
- cscope.files: $(shell find include source platform -name '*.[ch]') |
| 874 |
-@@ -397,4 +392,4 @@ |
| 875 |
- debug: |
| 876 |
- $(MAKE) build=debug |
| 877 |
- |
| 878 |
--.PHONY: all clean nuke install third libs apps generate |
| 879 |
-+.PHONY: all clean nuke install libs apps generate |
| 880 |
|
| 881 |
diff --git a/app-text/mupdf/mupdf-1.5-r1.ebuild b/app-text/mupdf/mupdf-1.5-r1.ebuild |
| 882 |
deleted file mode 100644 |
| 883 |
index 888af5e..00000000 |
| 884 |
--- a/app-text/mupdf/mupdf-1.5-r1.ebuild |
| 885 |
+++ /dev/null |
| 886 |
@@ -1,128 +0,0 @@ |
| 887 |
-# Copyright 1999-2015 Gentoo Foundation |
| 888 |
-# Distributed under the terms of the GNU General Public License v2 |
| 889 |
-# $Id$ |
| 890 |
- |
| 891 |
-EAPI=5 |
| 892 |
- |
| 893 |
-inherit eutils multilib toolchain-funcs vcs-snapshot |
| 894 |
- |
| 895 |
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C" |
| 896 |
-HOMEPAGE="http://mupdf.com/" |
| 897 |
-SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=b2f096de23e5341fbbcd7c290f3a144423741906;sf=tgz -> ${P}.tar.gz" |
| 898 |
- |
| 899 |
-LICENSE="AGPL-3" |
| 900 |
-MY_SOVER=1.5 |
| 901 |
-SLOT="0/${MY_SOVER}" |
| 902 |
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" |
| 903 |
-IUSE="X vanilla +curl +openssl static static-libs" |
| 904 |
- |
| 905 |
-LIB_DEPEND="dev-libs/openssl[static-libs?] |
| 906 |
- media-libs/freetype:2[static-libs?] |
| 907 |
- media-libs/jbig2dec[static-libs?] |
| 908 |
- media-libs/openjpeg:2[static-libs?] |
| 909 |
- net-misc/curl[static-libs?] |
| 910 |
- virtual/jpeg[static-libs?] |
| 911 |
- X? ( x11-libs/libX11[static-libs?] |
| 912 |
- x11-libs/libXext[static-libs?] )" |
| 913 |
-RDEPEND="${LIB_DEPEND}" |
| 914 |
-DEPEND="${RDEPEND} |
| 915 |
- virtual/pkgconfig |
| 916 |
- static-libs? ( ${LIB_DEPEND} ) |
| 917 |
- static? ( ${LIB_DEPEND//?} |
| 918 |
- app-arch/bzip2[static-libs] |
| 919 |
- x11-libs/libXau[static-libs] |
| 920 |
- x11-libs/libXdmcp[static-libs] |
| 921 |
- x11-libs/libxcb[static-libs] )" |
| 922 |
- |
| 923 |
-src_prepare() { |
| 924 |
- rm -rf thirdparty || die |
| 925 |
- |
| 926 |
- epatch \ |
| 927 |
- "${FILESDIR}"/${PN}-1.3-CFLAGS.patch \ |
| 928 |
- "${FILESDIR}"/${PN}-1.5-old-debian-files.patch \ |
| 929 |
- "${FILESDIR}"/${PN}-1.3-pkg-config.patch \ |
| 930 |
- "${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch \ |
| 931 |
- "${FILESDIR}"/${PN}-1.5-format-security-error.patch |
| 932 |
- |
| 933 |
- if has_version ">=media-libs/openjpeg-2.1:2" ; then |
| 934 |
- epatch \ |
| 935 |
- "${FILESDIR}"/${PN}-1.5-openjpeg-2.1.patch |
| 936 |
- fi |
| 937 |
- |
| 938 |
- sed -e "/^libdir=/s:/lib:/$(get_libdir):" \ |
| 939 |
- -e "/^prefix=/s:=.*:=${EROOT}/usr:" \ |
| 940 |
- -i platform/debian/${PN}.pc || die |
| 941 |
- |
| 942 |
- use vanilla || epatch \ |
| 943 |
- "${FILESDIR}"/${PN}-1.3-zoom-2.patch |
| 944 |
- |
| 945 |
- #http://bugs.ghostscript.com/show_bug.cgi?id=693467 |
| 946 |
- sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \ |
| 947 |
- -i platform/debian/${PN}.desktop || die |
| 948 |
- |
| 949 |
- sed -e "1iOS = Linux" \ |
| 950 |
- -e "1iCC = $(tc-getCC)" \ |
| 951 |
- -e "1iLD = $(tc-getCC)" \ |
| 952 |
- -e "1iAR = $(tc-getAR)" \ |
| 953 |
- -e "1iverbose = yes" \ |
| 954 |
- -e "1ibuild = debug" \ |
| 955 |
- -e "1iprefix = ${ED}usr" \ |
| 956 |
- -e "1ilibdir = ${ED}usr/$(get_libdir)" \ |
| 957 |
- -e "1idocdir = ${ED}usr/share/doc/${PF}" \ |
| 958 |
- -e "1iHAVE_X11 = $(usex X)" \ |
| 959 |
- -e "1iWANT_OPENSSL = $(usex openssl)" \ |
| 960 |
- -e "1iWANT_CURL = $(usex curl)" \ |
| 961 |
- -i Makerules || die |
| 962 |
- |
| 963 |
- if use static-libs || use static ; then |
| 964 |
- cp -a "${S}" "${S}"-static || die |
| 965 |
- #add missing Libs.private for xcb and freetype |
| 966 |
- sed -e 's:\(pkg-config --libs\):\1 --static:' \ |
| 967 |
- -e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \ |
| 968 |
- -e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \ |
| 969 |
- -i "${S}"-static/Makerules || die |
| 970 |
- fi |
| 971 |
- |
| 972 |
- my_soname=libmupdf.so.${MY_SOVER} |
| 973 |
- my_soname_js_none=libmupdf-js-none.so.${MY_SOVER} |
| 974 |
- sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \ |
| 975 |
- -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \ |
| 976 |
- -e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \ |
| 977 |
- -e "\$a\$(MUPDF_JS_NONE_LIB):" \ |
| 978 |
- -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \ |
| 979 |
- -e "/install/s: COPYING : :" \ |
| 980 |
- -i Makefile || die |
| 981 |
-} |
| 982 |
- |
| 983 |
-src_compile() { |
| 984 |
- emake XCFLAGS="-fpic" |
| 985 |
- use static-libs && \ |
| 986 |
- emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a |
| 987 |
- use static && \ |
| 988 |
- emake -C "${S}"-static XLIBS="-static" |
| 989 |
-} |
| 990 |
- |
| 991 |
-src_install() { |
| 992 |
- if use X ; then |
| 993 |
- domenu platform/debian/${PN}.desktop |
| 994 |
- doicon platform/debian/${PN}.xpm |
| 995 |
- else |
| 996 |
- rm docs/man/${PN}.1 |
| 997 |
- fi |
| 998 |
- |
| 999 |
- emake install |
| 1000 |
- dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so |
| 1001 |
- |
| 1002 |
- use static-libs && \ |
| 1003 |
- dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a |
| 1004 |
- if use static ; then |
| 1005 |
- dobin "${S}"-static/build/debug/mu{tool,draw} |
| 1006 |
- use X && dobin "${S}"-static/build/debug/${PN}-x11 |
| 1007 |
- fi |
| 1008 |
- use X && dosym ${PN}-x11 /usr/bin/${PN} |
| 1009 |
- |
| 1010 |
- insinto /usr/$(get_libdir)/pkgconfig |
| 1011 |
- doins platform/debian/${PN}.pc |
| 1012 |
- |
| 1013 |
- dodoc README docs/*.{txt,c} |
| 1014 |
-} |
| 1015 |
|
| 1016 |
diff --git a/app-text/mupdf/mupdf-1.8.ebuild b/app-text/mupdf/mupdf-1.8.ebuild |
| 1017 |
deleted file mode 100644 |
| 1018 |
index ad053a0..00000000 |
| 1019 |
--- a/app-text/mupdf/mupdf-1.8.ebuild |
| 1020 |
+++ /dev/null |
| 1021 |
@@ -1,141 +0,0 @@ |
| 1022 |
-# Copyright 1999-2016 Gentoo Foundation |
| 1023 |
-# Distributed under the terms of the GNU General Public License v2 |
| 1024 |
-# $Id$ |
| 1025 |
- |
| 1026 |
-EAPI=5 |
| 1027 |
- |
| 1028 |
-inherit eutils flag-o-matic multilib toolchain-funcs vcs-snapshot |
| 1029 |
- |
| 1030 |
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C" |
| 1031 |
-HOMEPAGE="http://mupdf.com/" |
| 1032 |
-SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=179403598244f069b56e60866c13a0b840c5932e;sf=tgz -> ${P}.tar.gz" |
| 1033 |
- |
| 1034 |
-LICENSE="AGPL-3" |
| 1035 |
-MY_SOVER=1.8 |
| 1036 |
-SLOT="0/${MY_SOVER}" |
| 1037 |
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" |
| 1038 |
-IUSE="X vanilla +curl javascript libressl opengl +openssl static static-libs" |
| 1039 |
- |
| 1040 |
-LIB_DEPEND=" |
| 1041 |
- !libressl? ( dev-libs/openssl:0[static-libs?] ) |
| 1042 |
- libressl? ( dev-libs/libressl[static-libs?] ) |
| 1043 |
- media-libs/freetype:2[static-libs?] |
| 1044 |
- media-libs/jbig2dec[static-libs?] |
| 1045 |
- media-libs/openjpeg:2[static-libs?] |
| 1046 |
- net-misc/curl[static-libs?] |
| 1047 |
- virtual/jpeg[static-libs?] |
| 1048 |
- X? ( x11-libs/libX11[static-libs?] |
| 1049 |
- x11-libs/libXext[static-libs?] ) |
| 1050 |
- javascript? ( <dev-lang/mujs-0_p20160504 ) |
| 1051 |
- opengl? ( >=media-libs/glfw-3 )" |
| 1052 |
-RDEPEND="${LIB_DEPEND}" |
| 1053 |
-DEPEND="${RDEPEND} |
| 1054 |
- virtual/pkgconfig |
| 1055 |
- static-libs? ( ${LIB_DEPEND} ) |
| 1056 |
- static? ( ${LIB_DEPEND//?} |
| 1057 |
- app-arch/bzip2[static-libs] |
| 1058 |
- x11-libs/libXau[static-libs] |
| 1059 |
- x11-libs/libXdmcp[static-libs] |
| 1060 |
- x11-libs/libxcb[static-libs] )" |
| 1061 |
- |
| 1062 |
-REQUIRED_USE="opengl? ( X !static !static-libs )" |
| 1063 |
- |
| 1064 |
-src_prepare() { |
| 1065 |
- use hppa && append-cflags -ffunction-sections |
| 1066 |
- |
| 1067 |
- rm -rf thirdparty || die |
| 1068 |
- |
| 1069 |
- epatch \ |
| 1070 |
- "${FILESDIR}"/${PN}-1.3-CFLAGS.patch \ |
| 1071 |
- "${FILESDIR}"/${PN}-1.5-old-debian-files.patch \ |
| 1072 |
- "${FILESDIR}"/${PN}-1.3-pkg-config.patch \ |
| 1073 |
- "${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch \ |
| 1074 |
- "${FILESDIR}"/${PN}-1.7a-system-mujs.patch \ |
| 1075 |
- "${FILESDIR}"/${PN}-1.8-system-glfw.patch |
| 1076 |
- |
| 1077 |
- if has_version ">=media-libs/openjpeg-2.1:2" ; then |
| 1078 |
- epatch \ |
| 1079 |
- "${FILESDIR}"/${PN}-1.5-openjpeg-2.1.patch |
| 1080 |
- fi |
| 1081 |
- |
| 1082 |
- sed -e "/^libdir=/s:/lib:/$(get_libdir):" \ |
| 1083 |
- -e "/^prefix=/s:=.*:=${EROOT}/usr:" \ |
| 1084 |
- -i platform/debian/${PN}.pc || die |
| 1085 |
- |
| 1086 |
- use vanilla || epatch \ |
| 1087 |
- "${FILESDIR}"/${PN}-1.3-zoom-2.patch |
| 1088 |
- |
| 1089 |
- #http://bugs.ghostscript.com/show_bug.cgi?id=693467 |
| 1090 |
- sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \ |
| 1091 |
- -i platform/debian/${PN}.desktop || die |
| 1092 |
- |
| 1093 |
- sed -e "1iOS = Linux" \ |
| 1094 |
- -e "1iCC = $(tc-getCC)" \ |
| 1095 |
- -e "1iLD = $(tc-getCC)" \ |
| 1096 |
- -e "1iAR = $(tc-getAR)" \ |
| 1097 |
- -e "1iverbose = yes" \ |
| 1098 |
- -e "1ibuild = debug" \ |
| 1099 |
- -e "1iprefix = ${ED}usr" \ |
| 1100 |
- -e "1ilibdir = ${ED}usr/$(get_libdir)" \ |
| 1101 |
- -e "1idocdir = ${ED}usr/share/doc/${PF}" \ |
| 1102 |
- -e "1iHAVE_X11 = $(usex X)" \ |
| 1103 |
- -e "1iWANT_OPENSSL = $(usex openssl)" \ |
| 1104 |
- -e "1iWANT_CURL = $(usex curl)" \ |
| 1105 |
- -e "1iHAVE_MUJS = $(usex javascript)" \ |
| 1106 |
- -e "1iMUJS_LIBS = -lmujs" \ |
| 1107 |
- -e "1iMUJS_CFLAGS =" \ |
| 1108 |
- -e "1iHAVE_GLFW = $(usex opengl yes no)" \ |
| 1109 |
- -i Makerules || die |
| 1110 |
- |
| 1111 |
- if use static-libs || use static ; then |
| 1112 |
- cp -a "${S}" "${S}"-static || die |
| 1113 |
- #add missing Libs.private for xcb and freetype |
| 1114 |
- sed -e 's:\(pkg-config --libs\):\1 --static:' \ |
| 1115 |
- -e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \ |
| 1116 |
- -e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \ |
| 1117 |
- -i "${S}"-static/Makerules || die |
| 1118 |
- fi |
| 1119 |
- |
| 1120 |
- my_soname=libmupdf.so.${MY_SOVER} |
| 1121 |
- my_soname_js_none=libmupdf-js-none.so.${MY_SOVER} |
| 1122 |
- sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \ |
| 1123 |
- -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \ |
| 1124 |
- -e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \ |
| 1125 |
- -e "\$a\$(MUPDF_JS_NONE_LIB):" \ |
| 1126 |
- -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \ |
| 1127 |
- -e "/install/s: COPYING : :" \ |
| 1128 |
- -i Makefile || die |
| 1129 |
-} |
| 1130 |
- |
| 1131 |
-src_compile() { |
| 1132 |
- emake XCFLAGS="-fpic" |
| 1133 |
- use static-libs && \ |
| 1134 |
- emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a |
| 1135 |
- use static && \ |
| 1136 |
- emake -C "${S}"-static XLIBS="-static" |
| 1137 |
-} |
| 1138 |
- |
| 1139 |
-src_install() { |
| 1140 |
- if use X ; then |
| 1141 |
- domenu platform/debian/${PN}.desktop |
| 1142 |
- doicon platform/debian/${PN}.xpm |
| 1143 |
- else |
| 1144 |
- rm docs/man/${PN}.1 |
| 1145 |
- fi |
| 1146 |
- |
| 1147 |
- emake install |
| 1148 |
- dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so |
| 1149 |
- |
| 1150 |
- use static-libs && \ |
| 1151 |
- dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a |
| 1152 |
- if use static ; then |
| 1153 |
- dobin "${S}"-static/build/debug/mu{tool,draw} |
| 1154 |
- use X && dobin "${S}"-static/build/debug/${PN}-x11 |
| 1155 |
- fi |
| 1156 |
- use X && dosym ${PN}-x11 /usr/bin/${PN} |
| 1157 |
- |
| 1158 |
- insinto /usr/$(get_libdir)/pkgconfig |
| 1159 |
- doins platform/debian/${PN}.pc |
| 1160 |
- |
| 1161 |
- dodoc README docs/*.{txt,c} |
| 1162 |
-} |
| 1163 |
|
| 1164 |
diff --git a/app-text/mupdf/mupdf-1.9a.ebuild b/app-text/mupdf/mupdf-1.9a.ebuild |
| 1165 |
deleted file mode 100644 |
| 1166 |
index c47d34f..00000000 |
| 1167 |
--- a/app-text/mupdf/mupdf-1.9a.ebuild |
| 1168 |
+++ /dev/null |
| 1169 |
@@ -1,144 +0,0 @@ |
| 1170 |
-# Copyright 1999-2016 Gentoo Foundation |
| 1171 |
-# Distributed under the terms of the GNU General Public License v2 |
| 1172 |
-# $Id$ |
| 1173 |
- |
| 1174 |
-EAPI=5 |
| 1175 |
- |
| 1176 |
-inherit eutils flag-o-matic multilib toolchain-funcs vcs-snapshot |
| 1177 |
- |
| 1178 |
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C" |
| 1179 |
-HOMEPAGE="http://mupdf.com/" |
| 1180 |
-SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=027860688eafc89ca3d57937a77a43a9bb96f590;sf=tgz -> ${P}.tar.gz" |
| 1181 |
- |
| 1182 |
-LICENSE="AGPL-3" |
| 1183 |
-MY_SOVER=1.9 |
| 1184 |
-SLOT="0/${MY_SOVER}" |
| 1185 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" |
| 1186 |
-IUSE="X vanilla +curl libressl opengl +openssl static static-libs" |
| 1187 |
- |
| 1188 |
-LIB_DEPEND=" |
| 1189 |
- !libressl? ( dev-libs/openssl:0[static-libs?] ) |
| 1190 |
- libressl? ( dev-libs/libressl[static-libs?] ) |
| 1191 |
- >=dev-lang/mujs-0_p20160504 |
| 1192 |
- media-libs/freetype:2[static-libs?] |
| 1193 |
- media-libs/harfbuzz[static-libs?] |
| 1194 |
- media-libs/jbig2dec[static-libs?] |
| 1195 |
- media-libs/libpng:0[static-libs?] |
| 1196 |
- media-libs/openjpeg:2[static-libs?] |
| 1197 |
- net-misc/curl[static-libs?] |
| 1198 |
- virtual/jpeg[static-libs?] |
| 1199 |
- X? ( x11-libs/libX11[static-libs?] |
| 1200 |
- x11-libs/libXext[static-libs?] ) |
| 1201 |
- opengl? ( >=media-libs/glfw-3 )" |
| 1202 |
-RDEPEND="${LIB_DEPEND}" |
| 1203 |
-DEPEND="${RDEPEND} |
| 1204 |
- virtual/pkgconfig |
| 1205 |
- static-libs? ( ${LIB_DEPEND} ) |
| 1206 |
- static? ( ${LIB_DEPEND//?} |
| 1207 |
- app-arch/bzip2[static-libs] |
| 1208 |
- x11-libs/libXau[static-libs] |
| 1209 |
- x11-libs/libXdmcp[static-libs] |
| 1210 |
- x11-libs/libxcb[static-libs] )" |
| 1211 |
- |
| 1212 |
-REQUIRED_USE="opengl? ( X !static !static-libs )" |
| 1213 |
- |
| 1214 |
-src_prepare() { |
| 1215 |
- use hppa && append-cflags -ffunction-sections |
| 1216 |
- |
| 1217 |
- rm -rf thirdparty || die |
| 1218 |
- |
| 1219 |
- epatch \ |
| 1220 |
- "${FILESDIR}"/${PN}-1.9a-CFLAGS.patch \ |
| 1221 |
- "${FILESDIR}"/${PN}-1.9a-debug-build.patch \ |
| 1222 |
- "${FILESDIR}"/${PN}-1.5-old-debian-files.patch \ |
| 1223 |
- "${FILESDIR}"/${PN}-1.3-pkg-config.patch \ |
| 1224 |
- "${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch \ |
| 1225 |
- "${FILESDIR}"/${PN}-1.9a-no-thirdlibs.patch \ |
| 1226 |
- "${FILESDIR}"/${PN}-1.8-system-glfw.patch |
| 1227 |
- |
| 1228 |
- if has_version ">=media-libs/openjpeg-2.1:2" ; then |
| 1229 |
- epatch \ |
| 1230 |
- "${FILESDIR}"/${PN}-1.5-openjpeg-2.1.patch |
| 1231 |
- fi |
| 1232 |
- |
| 1233 |
- sed -e "/^libdir=/s:/lib:/$(get_libdir):" \ |
| 1234 |
- -e "/^prefix=/s:=.*:=${EROOT}/usr:" \ |
| 1235 |
- -i platform/debian/${PN}.pc || die |
| 1236 |
- |
| 1237 |
- use vanilla || epatch \ |
| 1238 |
- "${FILESDIR}"/${PN}-1.3-zoom-2.patch |
| 1239 |
- |
| 1240 |
- #http://bugs.ghostscript.com/show_bug.cgi?id=693467 |
| 1241 |
- sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \ |
| 1242 |
- -i platform/debian/${PN}.desktop || die |
| 1243 |
- |
| 1244 |
- sed -e "1iOS = Linux" \ |
| 1245 |
- -e "1iCC = $(tc-getCC)" \ |
| 1246 |
- -e "1iLD = $(tc-getCC)" \ |
| 1247 |
- -e "1iAR = $(tc-getAR)" \ |
| 1248 |
- -e "1iverbose = yes" \ |
| 1249 |
- -e "1ibuild = debug" \ |
| 1250 |
- -e "1iprefix = ${ED}usr" \ |
| 1251 |
- -e "1ilibdir = ${ED}usr/$(get_libdir)" \ |
| 1252 |
- -e "1idocdir = ${ED}usr/share/doc/${PF}" \ |
| 1253 |
- -e "1iHAVE_X11 = $(usex X)" \ |
| 1254 |
- -e "1iWANT_OPENSSL = $(usex openssl)" \ |
| 1255 |
- -e "1iWANT_CURL = $(usex curl)" \ |
| 1256 |
- -e "1iHAVE_MUJS = yes" \ |
| 1257 |
- -e "1iMUJS_LIBS = -lmujs" \ |
| 1258 |
- -e "1iMUJS_CFLAGS =" \ |
| 1259 |
- -e "1iHAVE_GLFW = $(usex opengl yes no)" \ |
| 1260 |
- -i Makerules || die |
| 1261 |
- |
| 1262 |
- if use static-libs || use static ; then |
| 1263 |
- cp -a "${S}" "${S}"-static || die |
| 1264 |
- #add missing Libs.private for xcb and freetype |
| 1265 |
- sed -e 's:\(pkg-config --libs\):\1 --static:' \ |
| 1266 |
- -e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \ |
| 1267 |
- -e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \ |
| 1268 |
- -i "${S}"-static/Makerules || die |
| 1269 |
- fi |
| 1270 |
- |
| 1271 |
- my_soname=libmupdf.so.${MY_SOVER} |
| 1272 |
- my_soname_js_none=libmupdf-js-none.so.${MY_SOVER} |
| 1273 |
- sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \ |
| 1274 |
- -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \ |
| 1275 |
- -e "/^MUPDF_LIB =/s:=.*:= \$(OUT)/${my_soname}:" \ |
| 1276 |
- -e "\$a\$(MUPDF_JS_NONE_LIB):" \ |
| 1277 |
- -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \ |
| 1278 |
- -e "/install/s: COPYING : :" \ |
| 1279 |
- -i Makefile || die |
| 1280 |
-} |
| 1281 |
- |
| 1282 |
-src_compile() { |
| 1283 |
- emake XCFLAGS="-fpic" |
| 1284 |
- use static-libs && \ |
| 1285 |
- emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a |
| 1286 |
- use static && \ |
| 1287 |
- emake -C "${S}"-static XLIBS="-static" |
| 1288 |
-} |
| 1289 |
- |
| 1290 |
-src_install() { |
| 1291 |
- if use X ; then |
| 1292 |
- domenu platform/debian/${PN}.desktop |
| 1293 |
- doicon platform/debian/${PN}.xpm |
| 1294 |
- else |
| 1295 |
- rm docs/man/${PN}.1 |
| 1296 |
- fi |
| 1297 |
- |
| 1298 |
- emake install |
| 1299 |
- dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so |
| 1300 |
- |
| 1301 |
- use static-libs && \ |
| 1302 |
- dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a |
| 1303 |
- if use static ; then |
| 1304 |
- dobin "${S}"-static/build/debug/mu{tool,draw} |
| 1305 |
- use X && dobin "${S}"-static/build/debug/${PN}-x11 |
| 1306 |
- fi |
| 1307 |
- use X && dosym ${PN}-x11 /usr/bin/${PN} |
| 1308 |
- |
| 1309 |
- insinto /usr/$(get_libdir)/pkgconfig |
| 1310 |
- doins platform/debian/${PN}.pc |
| 1311 |
- |
| 1312 |
- dodoc README docs/*.{txt,c} |
| 1313 |
-} |
Archives