gentoo auto-resync : 04:12:2022 - 21:03:51

4 files changed, 39 insertions, 5 deletions

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index c139e5ab04ec..108a165eaf01 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -5,12 +5,13 @@ AUX mupdf-1.19.0-Makefile.patch 1043 BLAKE2B 7f449713700d57c0bf072661babcb5122d0
 AUX mupdf-1.19.0-cross-fixes.patch 5740 BLAKE2B dcc38e628e1c0ddde9647d06ea8c58124cb7a1fe771e88465c0516ff3d1b50b820d2110107428bd762abe85905bc7b6cc283067ece88471442e76fab2fcaf2a9 SHA512 db4093d330c8ce9c9d1bfee5b708dd423e04eb6f2d5c87f8e5779d28bdd320f15b6847a308e87d183c9b38c5396c0518b70325ea09c9e8f4a733750e4cf5ca13
 AUX mupdf-1.19.0-darwin.patch 1056 BLAKE2B ae532c2d68842c3a1bb424c707a51a5ed56a72e7557e89b3830ac55bc713982065d1ec7055b84b91589c8b98a690d037c0fb6c90480fd89989e0f90cc49f9b97 SHA512 24cb6885c174bbfbe5ddc2e8f9a15c5154aa5699a19b5931d60ebb761a7587d717dbb65fba45070f963c0c3f432f8f58c00537d10b050546173a48f5c729a7c4
 AUX mupdf-1.20.0-lcms2.patch 2512 BLAKE2B b641519f069c43ef2e9efdf0e18418e663e3fa39d1fb2a0a4b759f8af0412e3a63f212961d80430de86a8ea3d8228ece07e2a04cbe08ccbe330afcbad18e3527 SHA512 d25a843286f9376f17cc73dd974835eaa7be7a0a7b26fab338ae5b3cf54588f476538c73e3053edc2367bd5856eb1af0ebbffce426f7da287784dcb0ee3fc684
+AUX mupdf-1.21.0-add-desktop-pc-files.patch 845 BLAKE2B 8fa08810dd0b797af517c7932a2b81c080721155f607970664ca68a8eb4ec53bcfdda417790bf002aff1b1e1e8257d67c3a2e6bf6d500ee50cc03a7f440b60c6 SHA512 96835698141898a9509321c6125d5bfce1b31d3a0329d3c2be55d9026cff65204112a8ac0774ece1ac1ca7a1ce3dc534437aca1a76eb7716317b2c7e648e549f
 DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B a0dc3783c70cee1b7eb48d1658eb48186e35a42513aa9e98f7155bb82ed771ed0c5d5032013d09d93cdca4f49deda65553fe0e1af7645893722dafa855b2c958 SHA512 d6bc5b6adb6a418de50021864f4b3a75da653fa534eeedbfe9875cb202efeb13efdec66b4d108ca8fa6b0dc76733468b214e5fdf331bebc35fc6f722203fa3f7
 DIST mupdf-1.20.0-source.tar.gz 88455853 BLAKE2B 686d8b02972fc6cb7fa4541e4f0561c11e616f800decd20a79f23b577977785633bd3e17e2007f621db97dab6db1fcf500ac8e283984fbe675a25e7a4301b75b SHA512 6837299c589ece9cc443b027433fa3eee545f5155aeb6359b7a43da239d2e99195e9ae3950ddec6cb6ebae77bc877573c6f89a90754c58723d7e87d9739ed1f4
 DIST mupdf-1.20.3-source.tar.gz 88457290 BLAKE2B b16abfd4d9ac8123f1be60350d6124b8f36b6e8260f266d4dc7798610819128519944de8179a9e5453bc28da695ef8557fd8d755439113e520a8cad19039e52f SHA512 ed3fe09971223c500fb85558bb3f8c4a605c82fca3cd2217cdf4758e44bdfe3ef4106c95037d7a8ea536117414e5acbfa14aa736bfb7e33e591050c12c07a0ee
 DIST mupdf-1.21.0-source.tar.gz 54753613 BLAKE2B bb531f165a9dd8af22aa6e1d65b57d7900bb5128d0c8ad235518ed0b1e446234b147fdd3937f3dd49f627ed2cfb49c4e325baf320f698adbbde68de466f61660 SHA512 a711489e236437e4e7c21373d8624118a5308941148be31cd57a0bbed708b44b1d4030aed71ccb82143159fc3a23e5524738e7fc6177058e6bdaf94a36beaf64
 EBUILD mupdf-1.19.1.ebuild 4490 BLAKE2B cf556d6ba654118ccd0316fb75f2f970cb96990f254bf3c51aee44405ad2bab8bd3f5245f5d04fd4d713d8befd8a84b62632a757ae69396e5291ac6c8cb6b57b SHA512 b1ee92e6e10373980739bed7bffb1bd658d9b3830f82fcc2b3153c5296828a50b487164e686a69de31df6ea25aa6e0925b5ff5c997ec91a6cef1851a7bff76af
 EBUILD mupdf-1.20.0.ebuild 4750 BLAKE2B 9675a86e5f8bbf05933f49d422adb3d3d246953c7abe80eab58d75946265b4e5b4b17ed3e64098bc4fa5b1b0537884263ce50a084bf4f9109bd8f217212a2541 SHA512 591df3401dee953bb51499fb754e13127e32737dcbde3d924b02d713b1de8a7736e2c1bc123c24e5fb31a530a49c7a7eab0fc47ae8b9a22aea1206bb8df07989
-EBUILD mupdf-1.20.3.ebuild 4784 BLAKE2B bd11606b9838c88c91cf3702b8eb581ec6a4cca0308a0c8bb37f86f403e909644b48567ce985c14381123d4d0e2ccd373ee043fe6ff1051278b2aa6ddde498d6 SHA512 15e099d22871345aef9fb119c3f2f7c0c0137bd9da0e805f4ac229a77c08b11ffd0378a4bcbbf4c126e2526f1b664999a9ed9b0e624af2663651820dfd0194f7
-EBUILD mupdf-1.21.0.ebuild 4746 BLAKE2B c5b40eb54dcb18d611dd0b281be82ddce9562fcfbdd3f699b129c9fcab43004f5c17b44d939bb4797f22d91cc8fefc7cc30d011dfa29599278b15aea0f1c8d08 SHA512 8a8a204c8a41ebae97379b3c8a8ccfe2e512a3aa742043226cd9765bb24b1f1bf7b3af41a282722a88cc61ccd5dff3f3503bdaa695439506e2ed0c5662d5e761
+EBUILD mupdf-1.20.3.ebuild 4780 BLAKE2B 399303c48befa35538363af41b5b0a888715cb152dba91f6de31ea96b03bcc0e312f287f005483a9ba3d09096ebc55cbf1ce56a9848ad68de496a9eec90cbf00 SHA512 386d319b390e90920d877ff68bc62594e7e99ad5b8aa2218f7b8b058559b9cff81dcb75aa0c7651fe15992e8dfc7cbe44d594d39f7399643a371aa5b9e551f23
+EBUILD mupdf-1.21.0.ebuild 4750 BLAKE2B c41d5e0bdae99e855c69e176d93612826bff39179ccabdd0b78b4da1882e014ed1a2aaf17db10fe2d520c162e939203ac61583db0b9cc2159b7a1c143dee2206 SHA512 e20aff284df761a4293577027826a2fcea65d6771849e5867ef9c5c675ebdde5d3ca667ba23439c3def33617ddeb44a70fb9c74c708ae51dbc674067978388d3
 MISC metadata.xml 405 BLAKE2B 8b71db6f16bfb481e524a331eac615661b267d2d2fddde3aa6c9244b75026eacada167e2ed2ad6e7611bad234b53c0b073063925ae6745832585771d5342c913 SHA512 23f707e5ed833c5901d482e0d9cedbae751434311d8c67e7b300b452faabd958eb0c12a5b1c48a3c6d4773891cf3c7426d60a85eecd4b3ceb3358f68f4c8ad87
diff --git a/app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch b/app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch
new file mode 100644
index 000000000000..4d449a2fec15
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch
@@ -0,0 +1,33 @@
+--- /dev/null
++++ ./platform/debian/mupdf.desktop
+@@ -0,0 +1,15 @@
++[Desktop Entry]
++Name=MuPDF
++GenericName=PDF file viewer
++Exec=mupdf %f
++TryExec=mupdf
++Icon=new-mupdf-icon
++Terminal=false
++Type=Application
++MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;image/jpeg;image/pjpeg;image/png;image/tiff;image/x-tiff;
++Categories=Viewer;Graphics;
++Actions=View;
++
++[Desktop Action View]
++Name=View with mupdf
++Exec=mupdf %f
+--- /dev/null
++++ ./platform/debian/mupdf.pc
+@@ -0,0 +1,12 @@
++prefix=/usr
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
++
++Name: mupdf
++Description: Library for rendering PDF documents
++Requires: freetype2 libopenjp2 libcrypto
++Version: 0.5.0
++Libs: -L${libdir} -lmupdf
++Libs.private: -lmupdf-js-none
++Cflags: -I${includedir}
diff --git a/app-text/mupdf/mupdf-1.20.3.ebuild b/app-text/mupdf/mupdf-1.20.3.ebuild
index 4ae490af4eb7..578687ddd9de 100644
--- a/app-text/mupdf/mupdf-1.20.3.ebuild
+++ b/app-text/mupdf/mupdf-1.20.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 x86"
 IUSE="+javascript opengl ssl X"
 REQUIRED_USE="opengl? ( javascript )"
 
diff --git a/app-text/mupdf/mupdf-1.21.0.ebuild b/app-text/mupdf/mupdf-1.21.0.ebuild
index 0eaa99a07eba..c2d55d2bd989 100644
--- a/app-text/mupdf/mupdf-1.21.0.ebuild
+++ b/app-text/mupdf/mupdf-1.21.0.ebuild
@@ -46,7 +46,7 @@ BDEPEND="X? ( x11-base/xorg-proto )
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.15-CFLAGS.patch
 	"${FILESDIR}"/${PN}-1.19.0-Makefile.patch
-	"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+	"${FILESDIR}"/${P}-add-desktop-pc-files.patch
 	"${FILESDIR}"/${PN}-1.19.0-darwin.patch
 	# See bugs #662352
 	"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
@@ -126,7 +126,7 @@ src_compile() {
 src_install() {
 	if use opengl || use X ; then
 		domenu platform/debian/${PN}.desktop
-		doicon platform/debian/${PN}.xpm
+		doicon -s scalable docs/logo/new-${PN}-icon.svg
 	else
 		rm docs/man/${PN}.1 || die "Failed to remove man page in src_install()"
 	fi