From d87262dd706fec50cd150aab3e93883b6337466d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:56:41 +0100 Subject: gentoo resync : 14.07.2018 --- .../mupdf-1.10a-add-desktop-pc-xpm-files.patch | 533 --------------------- app-text/mupdf/files/mupdf-1.11-CFLAGS.patch | 10 - .../mupdf/files/mupdf-1.11-CVE-2017-6060.patch | 15 - .../files/mupdf-1.11-drop-libmupdfthird.patch | 22 - .../files/mupdf-1.11-openssl-curl-x11-r1.patch | 37 -- .../mupdf/files/mupdf-1.11-openssl-curl-x11.patch | 37 -- app-text/mupdf/files/mupdf-1.11-system-glfw.patch | 11 - app-text/mupdf/files/mupdf-1.12-CFLAGS.patch | 11 - app-text/mupdf/files/mupdf-1.3-zoom-2.patch | 10 - app-text/mupdf/files/mupdf-1.9a-debug-build.patch | 10 - 10 files changed, 696 deletions(-) delete mode 100644 app-text/mupdf/files/mupdf-1.10a-add-desktop-pc-xpm-files.patch delete mode 100644 app-text/mupdf/files/mupdf-1.11-CFLAGS.patch delete mode 100644 app-text/mupdf/files/mupdf-1.11-CVE-2017-6060.patch delete mode 100644 app-text/mupdf/files/mupdf-1.11-drop-libmupdfthird.patch delete mode 100644 app-text/mupdf/files/mupdf-1.11-openssl-curl-x11-r1.patch delete mode 100644 app-text/mupdf/files/mupdf-1.11-openssl-curl-x11.patch delete mode 100644 app-text/mupdf/files/mupdf-1.11-system-glfw.patch delete mode 100644 app-text/mupdf/files/mupdf-1.12-CFLAGS.patch delete mode 100644 app-text/mupdf/files/mupdf-1.3-zoom-2.patch delete mode 100644 app-text/mupdf/files/mupdf-1.9a-debug-build.patch (limited to 'app-text/mupdf/files') 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.$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.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.,.].{.{.{.{.{.{.{", -+"Oo1O+.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.11-CFLAGS.patch b/app-text/mupdf/files/mupdf-1.11-CFLAGS.patch deleted file mode 100644 index 2ffd326e5e46..000000000000 --- a/app-text/mupdf/files/mupdf-1.11-CFLAGS.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- mupdf-1.11-source/Makerules -+++ mupdf-1.11-source/Makerules -@@ -23,7 +23,6 @@ - endif - - ifeq "$(build)" "debug" --CFLAGS += -pipe -g - LDFLAGS += -g - else ifeq "$(build)" "release" - CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer diff --git a/app-text/mupdf/files/mupdf-1.11-CVE-2017-6060.patch b/app-text/mupdf/files/mupdf-1.11-CVE-2017-6060.patch deleted file mode 100644 index a595253e8649..000000000000 --- a/app-text/mupdf/files/mupdf-1.11-CVE-2017-6060.patch +++ /dev/null @@ -1,15 +0,0 @@ -X-Git-Url: http://git.ghostscript.com/?p=user%2Fsebras%2Fmupdf.git;a=blobdiff_plain;f=platform%2Fx11%2Fjstest_main.c;h=f158d9628ed0c0a84e37fe128277679e8334422a;hp=13c3a0a3ba3ff4aae29f6882d23740833c1d842f;hb=06a012a42c9884e3cd653e7826cff1ddec04eb6e;hpb=34e18d127a02146e3415b33c4b67389ce1ddb614 - -diff --git a/platform/x11/jstest_main.c b/platform/x11/jstest_main.c -index 13c3a0a..f158d96 100644 ---- a/platform/x11/jstest_main.c -+++ b/platform/x11/jstest_main.c -@@ -346,7 +346,7 @@ main(int argc, char *argv[]) - } - else if (match(&line, "OPEN")) - { -- char path[1024]; -+ char path[LONGLINE]; - if (file_open) - pdfapp_close(&gapp); - if (prefix) diff --git a/app-text/mupdf/files/mupdf-1.11-drop-libmupdfthird.patch b/app-text/mupdf/files/mupdf-1.11-drop-libmupdfthird.patch deleted file mode 100644 index e5600c00cd83..000000000000 --- a/app-text/mupdf/files/mupdf-1.11-drop-libmupdfthird.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- mupdf-1.11-source/Makefile -+++ mupdf-1.11-source/Makefile -@@ -301,7 +301,7 @@ - # --- Library --- - - MUPDF_LIB = $(OUT)/libmupdf.a --THIRD_LIB = $(OUT)/libmupdfthird.a -+THIRD_LIB = - THREAD_LIB = $(OUT)/libmuthreads.a - - MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(SVG_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ) ---- mupdf-1.12.0-source/Makefile -+++ mupdf-1.12.0-source/Makefile -@@ -343,7 +343,7 @@ - - THREAD_OBJ := $(THREAD_OBJ) - --$(MUPDF_LIB) : $(MUPDF_OBJ) -+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ) - $(THIRD_LIB) : $(THIRD_OBJ) - $(THREAD_LIB) : $(THREAD_OBJ) - diff --git a/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11-r1.patch b/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11-r1.patch deleted file mode 100644 index 92845a0eef2f..000000000000 --- a/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11-r1.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- mupdf-1.11-source/Makerules -+++ mupdf-1.11-source/Makerules -@@ -116,12 +116,17 @@ - SYS_PTHREAD_CFLAGS := - SYS_PTHREAD_LIBS := -lpthread - -+WANT_OPENSSL ?= yes -+ifeq "$(WANT_OPENSSL)" "yes" - ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes" - HAVE_LIBCRYPTO := yes - SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto) - SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) - endif -+endif - -+WANT_CURL ?= yes -+ifeq "$(WANT_CURL)" "yes" - ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes" - HAVE_CURL := yes - SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl) -@@ -133,12 +138,16 @@ - endif - endif - SYS_CURL_DEPS += -lpthread -lrt -+endif - -+WANT_X11 ?= yes -+ifeq "$(WANT_X11)" "yes" - ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes" - HAVE_X11 := yes - SYS_X11_CFLAGS := $(shell pkg-config --cflags x11 xext) - SYS_X11_LIBS := $(shell pkg-config --libs x11 xext) - endif -+endif - - ifeq "$(shell pkg-config --exists harfbuzz && echo yes)" "yes" - SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz) diff --git a/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11.patch b/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11.patch deleted file mode 100644 index 91fd9f6485dc..000000000000 --- a/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- mupdf-1.11-source/Makerules -+++ mupdf-1.11-source/Makerules -@@ -116,12 +116,17 @@ - SYS_PTHREAD_CFLAGS := - SYS_PTHREAD_LIBS := -lpthread - -+WANT_OPENSSL ?= yes -+ifeq "$(WANT_OPENSSL)" "yes" - ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes" - HAVE_LIBCRYPTO := yes - SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto) - SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) - endif -+endif - -+WANT_CURL ?= yes -+ifeq "$(WANT_CURL)" "yes" - ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes" - HAVE_CURL := yes - SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl) -@@ -133,12 +138,16 @@ - endif - endif - SYS_CURL_DEPS += -lpthread -lrt -+endif - -+WANT_X!! ?= yes -+ifeq "$(WANT_X11)" "yes" - ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes" - HAVE_X11 := yes - SYS_X11_CFLAGS := $(shell pkg-config --cflags x11 xext) - SYS_X11_LIBS := $(shell pkg-config --libs x11 xext) - endif -+endif - - ifeq "$(shell pkg-config --exists harfbuzz && echo yes)" "yes" - SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz) diff --git a/app-text/mupdf/files/mupdf-1.11-system-glfw.patch b/app-text/mupdf/files/mupdf-1.11-system-glfw.patch deleted file mode 100644 index 90189f9400b0..000000000000 --- a/app-text/mupdf/files/mupdf-1.11-system-glfw.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mupdf-1.11-source/Makerules -+++ mupdf-1.11-source/Makerules -@@ -158,6 +158,8 @@ - SYS_JBIG2DEC_LIBS := -ljbig2dec - SYS_LIBJPEG_LIBS := -ljpeg - SYS_ZLIB_LIBS := -lz -+SYS_GLFW_CFLAGS = $(shell pkg-config --cflags glfw3 gl) -+SYS_GLFW_LIBS = $(shell pkg-config --libs glfw3 gl) - - endif - diff --git a/app-text/mupdf/files/mupdf-1.12-CFLAGS.patch b/app-text/mupdf/files/mupdf-1.12-CFLAGS.patch deleted file mode 100644 index 796d127263ae..000000000000 --- a/app-text/mupdf/files/mupdf-1.12-CFLAGS.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mupdf-1.12.0-source/Makerules -+++ mupdf-1.12.0-source/Makerules -@@ -22,8 +22,6 @@ - endif - - ifeq "$(build)" "debug" --CFLAGS += -pipe -g --LDFLAGS += -g - else ifeq "$(build)" "release" - CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer - LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s diff --git a/app-text/mupdf/files/mupdf-1.3-zoom-2.patch b/app-text/mupdf/files/mupdf-1.3-zoom-2.patch deleted file mode 100644 index 353912450236..000000000000 --- a/app-text/mupdf/files/mupdf-1.3-zoom-2.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- mupdf-1.3/platform/x11/pdfapp.c -+++ mupdf-1.3/platform/x11/pdfapp.c -@@ -866,6 +867,7 @@ - break; - - case ' ': -+ case 'F': - panto = DONT_PAN; - if (app->numberlen > 0) - app->pageno += atoi(app->number); diff --git a/app-text/mupdf/files/mupdf-1.9a-debug-build.patch b/app-text/mupdf/files/mupdf-1.9a-debug-build.patch deleted file mode 100644 index 93c52f5c5f8b..000000000000 --- a/app-text/mupdf/files/mupdf-1.9a-debug-build.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- mupdf-1.9a/Makefile -+++ mupdf-1.9a/Makefile -@@ -1,6 +1,6 @@ - # GNU Makefile - --build ?= release -+build ?= debug - - OUT := build/$(build) - GEN := generated -- cgit v1.2.3