diff options
Diffstat (limited to 'app-text/mupdf')
-rw-r--r-- | app-text/mupdf/Manifest | 11 | ||||
-rw-r--r-- | app-text/mupdf/files/mupdf-1.10a-add-desktop-pc-xpm-files.patch | 533 | ||||
-rw-r--r-- | app-text/mupdf/files/mupdf-1.21.1-fix-url-processing.patch | 25 | ||||
-rw-r--r-- | app-text/mupdf/files/mupdf-1.23.3-cross-fixes.patch | 120 | ||||
-rw-r--r-- | app-text/mupdf/files/mupdf-1.23.3-darwin.patch | 45 | ||||
-rw-r--r-- | app-text/mupdf/files/mupdf-1.23.3-openssl-x11.patch | 19 | ||||
-rw-r--r-- | app-text/mupdf/mupdf-1.21.0.ebuild | 159 | ||||
-rw-r--r-- | app-text/mupdf/mupdf-1.23.3.ebuild (renamed from app-text/mupdf/mupdf-1.21.1-r1.ebuild) | 27 |
8 files changed, 201 insertions, 738 deletions
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index 3210881a5054..5bffe7811e79 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -1,4 +1,3 @@ -AUX mupdf-1.10a-add-desktop-pc-xpm-files.patch 13387 BLAKE2B e0100380b328cfd8ce6099c35886a6f2e9508f6d08c678dbc1386e88998d01bdacd160020dc6ceefffbe09f4cf2b64d08acfb76f8535ffcc0dc93c65a3a2da78 SHA512 1d6ccfccf785cca01b1a607e94f90a5e31c748154e9fa7664b9863c7b26951f17a584ffc7cd23dd83d1e547498e22c902067e9695006824017e69d33dbf25a5b AUX mupdf-1.15-CFLAGS.patch 376 BLAKE2B ace255a4110df9200d627ac68f5950218eeaa993bbd37fa7fe2d676572cad02d50a632750e6a9bdf6269cd97501f709d075a79d7db8b9832909b59b33251b594 SHA512 c00cd5cb30d33a9cbc55557cab3c4e2be1ae86121c5b1b28b6e35f97f93751aa2e96e106f13b7f365a56ebcce8e1c5e4163a440e8c85a48130803f5a7aec63ed AUX mupdf-1.15-openssl-x11.patch 668 BLAKE2B 40810d21718e0f30e47e3d61fc3c10442568565e519d2713f952fb11355fc532717ef2df40a074c0c79ed725d34e639e9fbde02694b5ae7a76ae9a9ef9a36acb SHA512 89cd9bbef7c7e920aacf1de4a513fb98199ff2f033818b617203a4517a2aeb7ad5ed4a3720ceb6dec370560d85759c973a7c15d9a47924d0c3d51cd3a9c6ad5b AUX mupdf-1.19.0-Makefile.patch 1043 BLAKE2B 7f449713700d57c0bf072661babcb5122d09be82a0b89520999618e22c7b44ae950f0e9fd653330d34078229da8bd36f8e5fd273c5110cbeaeb47347b3e4f666 SHA512 ddbc11d3bf7a1480effd57c9587b85d735c97c5215dbf9dc66bac535356f9cbc5ecc0dd1003c367d6e60d969383afdd9014a66e8fb51384632be407fe01694d4 @@ -6,14 +5,14 @@ AUX mupdf-1.19.0-cross-fixes.patch 5740 BLAKE2B dcc38e628e1c0ddde9647d06ea8c5812 AUX mupdf-1.19.0-darwin.patch 1056 BLAKE2B ae532c2d68842c3a1bb424c707a51a5ed56a72e7557e89b3830ac55bc713982065d1ec7055b84b91589c8b98a690d037c0fb6c90480fd89989e0f90cc49f9b97 SHA512 24cb6885c174bbfbe5ddc2e8f9a15c5154aa5699a19b5931d60ebb761a7587d717dbb65fba45070f963c0c3f432f8f58c00537d10b050546173a48f5c729a7c4 AUX mupdf-1.21.0-add-desktop-pc-files.patch 845 BLAKE2B 8fa08810dd0b797af517c7932a2b81c080721155f607970664ca68a8eb4ec53bcfdda417790bf002aff1b1e1e8257d67c3a2e6bf6d500ee50cc03a7f440b60c6 SHA512 96835698141898a9509321c6125d5bfce1b31d3a0329d3c2be55d9026cff65204112a8ac0774ece1ac1ca7a1ce3dc534437aca1a76eb7716317b2c7e648e549f AUX mupdf-1.21.1-fix-aliasing-violation.patch 2651 BLAKE2B 649b9cde7eefdf16ba5a57e40128dc57710d63a04281bae4f26f2ee9dc19933628826d52ff4aee95fd7e6141b35c59efe883439b852758bc5075e30a89507564 SHA512 deccc9193d9266a9add6e1d80eb289f4576e12703d8a0af640ebdbfc698cbb3a15ac9da3b752b1f6beb4ad901aa3bfd43d08d34738b5c7545182bf20200ecaac -AUX mupdf-1.21.1-fix-url-processing.patch 823 BLAKE2B e813dddb4691429f382010a71aefe648b094896290295d8f6366832db1044f2cd0813096dcf0096fe9a05f3dbf8009745118455638d7d8db2c11d65721d14029 SHA512 dcdadf8134fa27e7b089ccd26da3cb43856ec6aa0a30828b5e6f7cd76909ff30028a31877e77ba67f59060b0c648a8842daf295d2eae855e2876372c41210c03 AUX mupdf-1.21.1-no-drm.patch 586 BLAKE2B dad2f0544153830cd8fff32a667edc229e5f149f4a474af065bb3e4b47d0508125077810a652b63837cafa5c441223eb2993a51c8be25809793aa2c098018947 SHA512 6149a8527a3025cb3b9ddc97db8d2638a4f0653b55fd78a86a97aefd2bf44d8b35c42e31c79558d8e8ec396427577ddb792e85e4055b4e4c8d704ba510378579 +AUX mupdf-1.23.3-cross-fixes.patch 5381 BLAKE2B f4f10c69d45944b01ba422e9288091faa8fd5c79e87047f35d2ef253a4803be6a74ce762ad51b88ca170aeee3a7012d51a3695861daa7f2dc307e678cfad65fc SHA512 bac98d23c3ef1fb2efff7d7d53e5c817e7cd8e962772ea0efde4b811839c1ed7fced4ab01951f97c6b9e92defe16e220305ee7e41c35131176afc7ce94b605fc +AUX mupdf-1.23.3-darwin.patch 1282 BLAKE2B 770cf03765a5d0afb55a77a489030a79470c97bf60cae097a9e6c272e5cc716325aa9ba921250034a58bb178f7791f190372be73f2f7e92bd8c03a3c299ea6f9 SHA512 d6bc8663af7c769d5eb64e3262e73388b8b2b0b4d20876251d8d58f6058f0c08e6080b4e5a79dea0e8a0fa8c75bbfc3333d753cb5622481cc3fee05c2ea0beca +AUX mupdf-1.23.3-openssl-x11.patch 653 BLAKE2B 085eca797ed648becffc348376777d5e2544862b6f1a9b961c11d9421bada63d4f5fd1718474d7fb384346a8f560cbe025bd27138f38b20a83666a89ffb05451 SHA512 ca715f08069fd567d6d85dd27863f688211e47899b384b938dd41d1350bbd3b4ffd56201f973b2f6c996ba4add47129ec16921a6e572b86c6927ef3409b00ffb 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 EBUILD mupdf-1.19.1.ebuild 4490 BLAKE2B cf556d6ba654118ccd0316fb75f2f970cb96990f254bf3c51aee44405ad2bab8bd3f5245f5d04fd4d713d8befd8a84b62632a757ae69396e5291ac6c8cb6b57b SHA512 b1ee92e6e10373980739bed7bffb1bd658d9b3830f82fcc2b3153c5296828a50b487164e686a69de31df6ea25aa6e0925b5ff5c997ec91a6cef1851a7bff76af -EBUILD mupdf-1.21.0.ebuild 4744 BLAKE2B 1eedbb5b4aeecd9718c820e40ec40aa517d08b29d7cdca2c7a397824ecbf21a3dfe70cd6aff0afec2a1b5beb4baa7f4eb1703d1ab193be1430e3a226329ddbd6 SHA512 253804764cb8465bfa0b5f534d53e9e561e5ea5c2205cb5b05a1e401d412a05eb12ae0920de348677ad00c73194e372204e5b586d53c92ced42065477bc5e8bf -EBUILD mupdf-1.21.1-r1.ebuild 4994 BLAKE2B b62512eb89dab520784f9308c839654f380bbf3a7448aca72e4705427d066f5343112a426d383877eaed2032d6e0d302b92f9ece4f67678322944a016da91537 SHA512 8fc7a1b14811f080e2ab63852f8788994f437746edaf499bbb3c5682b458899fd9e47d10f43ad6f1941403f829b970089da0fc9ad5bc3b3b31f34a9bb74328be EBUILD mupdf-1.22.0.ebuild 4918 BLAKE2B 70d1743638bb667e0ffd9b86a4cdb8b954ba7d27d2fadd01d1fddc7bbf4cd8b25e85c0f5b5606f979091b5346f1eaeb0fbc57e6a950d92dbb4b549142ccd9ea4 SHA512 ccbfb9f03c91db4d6aa90775c99caaa3247275d0480a383a9977fdf0c99f98050a6b40feff7028650f259aa09fd1c767ced508990752accf85ebb2972101dcb4 +EBUILD mupdf-1.23.3.ebuild 4871 BLAKE2B 1839d52697551da480bb88c98f8bb743f88fe3cf47ed7259147247b54ad4d14a66f84988a0dd02f496862ca4c36936f4233b82ff3f0ab47916454014854743f4 SHA512 23588385cdc927c90a5a7e49f95bdd323261d04e5baa4d233f5f892c358c412093a780fe16b79aaf5a8d3838a065d051602f8dad6b6acc1a3bd56412e17adb32 MISC metadata.xml 497 BLAKE2B 35e16ef688aa8b046f3e8ceaa7399da31379ba50b2cbc36d842696d1589aeea5a55eede13d79188f08ae8ff411c16385128633a1fbdaba04ee115158ac7e529b SHA512 225727e22fe2756480f3d502f49a62abbd0fe09d6266c1e00c09b04c2b5da181fc46bb06b19020290fa857b1feb0d557e6a77084f6269b5e0fdfec593cd46709 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/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.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.23.3.ebuild index 9917968a7e2e..7549d72031a4 100644 --- a/app-text/mupdf/mupdf-1.21.1-r1.ebuild +++ b/app-text/mupdf/mupdf-1.23.3.ebuild @@ -15,8 +15,8 @@ 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" +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 @@ -30,33 +30,32 @@ RDEPEND=" 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}" -BDEPEND="X? ( x11-base/xorg-proto ) - virtual/pkgconfig" +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}"/${PN}-1.19.0-darwin.patch + "${FILESDIR}"/${P}-darwin.patch # See bugs #662352 - "${FILESDIR}"/${PN}-1.15-openssl-x11.patch + "${FILESDIR}"/${P}-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 + "${FILESDIR}"/${P}-cross-fixes.patch + "${FILESDIR}"/${PN}-1.21.1-fix-aliasing-violation.patch ) src_prepare() { @@ -64,8 +63,6 @@ src_prepare() { 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" \ |