gentoo resync : 20.03.2021

4 files changed, 0 insertions, 115 deletions

diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index e68fe9e2b97f..56d9f66b8325 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,8 +1,4 @@
-AUX 0.3.5-compile-fix.patch 518 BLAKE2B e1e52be08b27459d2125fb44b1767c1f381ce13dfecae02b83afb6bc09db00c145f2b557db0c1515a383ea223eb51c68fdfa32d3effea334c5cddb9af5209ed5 SHA512 7af34317726849aa0eb49b7d7449c23cea1208a72ec1f872bf218b3be9c9b84bb8668523ef8ca0bee9fcdcffa44ba9599ba43f79c88bc3e8811597a91868a1c6
-AUX 0.3.5-fz_location.patch 1710 BLAKE2B fc6a13a495f3121466da5553c044d7de31c9a1c37984cc36b219d32aa2d9cfefb894f9f8225a5d93e96bbe4c25a6a4d76c2e24da24c583273bddf7efd4de4436 SHA512 fbab10cff2bc28da23effa17f05e17ef332b4ace23e7c995e1bfd6126f5dba66bb825ead78e91b70549e41c60ca089c64ba4961f2bc0d509c4e5bd6fa2b169e4
-DIST zathura-pdf-mupdf-0.3.5.tar.gz 8901 BLAKE2B 63595d6a4b305d8cd09eced1cfa3840a5ab3d37a61c42738603691621f1f1dbdfc31d5963b14c7af32f8c504f2470bf1cadb708fefbfd49fb25b2848b2564153 SHA512 1f7a748fee74296a008cef42c8f2e443409c77e16caa8441f74136260aaac7dee4d3c03e8a88532c45a0f9972e1b4965d4cffd488a00123d4d8cee9bcec2cf30
 DIST zathura-pdf-mupdf-0.3.6.tar.gz 8925 BLAKE2B ee74a1655da7d16070b8909dd0f44239eb21055a40a525b766dc3d9e81f84377abe0623ba33925a25739bccf885f8967496be30c27e421d30b1a78dd64b84aee SHA512 f6783c3fc08849d7dc6fd527b7fcdb51d4ef9214379ca6b4dc6d29e75b10f37e3ada2046e205449a7d0465f07e65a6cf3f2f44fba98360cba16676e705390a97
-EBUILD zathura-pdf-mupdf-0.3.5.ebuild 1112 BLAKE2B 12620e265b0ce055f23ce2562faa958dcc9d5796fda2a9614e54e59567281fe8e77d7fb484ae6feae4b5602fa0481d62766c1df4ef0209e9e961ed62c6537ca7 SHA512 98db4e1cc241b331a76d6b357b837f54a5edc0ed2dc7a03afb6668c9ee611888f94e5ac4e0ad3b637dd28886ee9c66b5daaf956b9a1bf0b33650fd3abc3d178f
 EBUILD zathura-pdf-mupdf-0.3.6.ebuild 820 BLAKE2B 8b7e4971575be372a30c98a8fbd348e3df257adcc1e4e2a02a0c09d8c3967e3e7c6c352fb98c239aff269eddbd765f6fce0e0995ef07f8b6fc56bcd4851a8cb8 SHA512 866df18c6496c891994782243fcea2fbd3301042e12f1cdb1358fe7195e30fa23e469ec462c604ad27250f235ff4833ec65664cfc571f0751b507b790d6ef4b6
 EBUILD zathura-pdf-mupdf-9999.ebuild 823 BLAKE2B ed4be465381eb7313c35873f9d479b3119c49b9175744511349b5345d6f6fba1ec2f341f05b0e5679eca91bed6f2b2a6d146706e25cfdc45caa894a312b07ba3 SHA512 2314179fdeac75c52412d950e449a5edaed5d3846d56e35c775086d17aa572fa53c25032b6251664422351618f920f909846ae4ef705fa06c06b5469ecfa8d30
 MISC metadata.xml 592 BLAKE2B 1159f04d19816c03115b8b2fd20ddbee3c420ffbd6276c9c48b80b4e6d43377354ae935d01c0ae7b3d81f8fc1f7b0f0928ee72ddcac6826c2775efd109b33e32 SHA512 449cce725a42bb2f05746e9af3e474547e83b4f7d25357b948ab8f24a9a6182dbd627a8cfa66b4385e396cfe3bc7e9dcadb9a6672eef354b49eb229e89640de8
diff --git a/app-text/zathura-pdf-mupdf/files/0.3.5-compile-fix.patch b/app-text/zathura-pdf-mupdf/files/0.3.5-compile-fix.patch
deleted file mode 100644
index e031db3c9188..000000000000
--- a/app-text/zathura-pdf-mupdf/files/0.3.5-compile-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/zathura-pdf-mupdf/search.c	2019-09-12 11:29:21.527194069 +0200
-+++ b/zathura-pdf-mupdf/search.c	2019-09-12 11:30:11.648675352 +0200
-@@ -39,7 +39,7 @@
-     mupdf_page_extract_text(mupdf_document, mupdf_page);
-   }
- 
--  fz_quad* hit_bbox = fz_malloc_array(mupdf_page->ctx, N_SEARCH_RESULTS, fz_quad);
-+  fz_quad* hit_bbox = fz_malloc_array(mupdf_page->ctx, N_SEARCH_RESULTS, sizeof(fz_quad));
-   int num_results = fz_search_stext_page(mupdf_page->ctx, mupdf_page->text,
-       text, hit_bbox, N_SEARCH_RESULTS);
- 
diff --git a/app-text/zathura-pdf-mupdf/files/0.3.5-fz_location.patch b/app-text/zathura-pdf-mupdf/files/0.3.5-fz_location.patch
deleted file mode 100644
index 03c0bf24aab5..000000000000
--- a/app-text/zathura-pdf-mupdf/files/0.3.5-fz_location.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From c2dd7835b63ff68c0edc8a3182b3f994dc6ab4dd Mon Sep 17 00:00:00 2001

-From: a <a@a.com>

-Date: Sun, 16 Aug 2020 19:46:11 +0300

-Subject: [PATCH] fix conversion from 'fz_location' to 'unsigned int'

-

----

- zathura-pdf-mupdf/index.c | 2 +-

- 1 file changed, 1 insertion(+), 1 deletion(-)

-

-diff --git a/zathura-pdf-mupdf/index.c b/zathura-pdf-mupdf/index.c

-index c421f5c..996d012 100644

---- a/zathura-pdf-mupdf/index.c

-+++ b/zathura-pdf-mupdf/index.c

-@@ -67,7 +67,7 @@ build_index(fz_context* ctx, fz_document* document, fz_outline* outline, girara_

- 

-       type                    = ZATHURA_LINK_GOTO_DEST;

-       target.destination_type = ZATHURA_LINK_DESTINATION_XYZ;

--      target.page_number      = fz_resolve_link(ctx, document, outline->uri, &x, &y);

-+      target.page_number      = fz_resolve_link(ctx, document, outline->uri, &x, &y).page;

-       target.left  = x;

-       target.top   = y;

-       target.zoom  = 0.0;

--- 

-

----

- zathura-pdf-mupdf/links.c | 2 +-

- 1 file changed, 1 insertion(+), 1 deletion(-)

-

-diff --git a/zathura-pdf-mupdf/links.c b/zathura-pdf-mupdf/links.c

-index 99c5715..2e8e90a 100644

---- a/zathura-pdf-mupdf/links.c

-+++ b/zathura-pdf-mupdf/links.c

-@@ -57,7 +57,7 @@ pdf_page_links_get(zathura_page_t* page, void* data, zathura_error_t* error)

-       type                    = ZATHURA_LINK_GOTO_DEST;

-       target.destination_type = ZATHURA_LINK_DESTINATION_XYZ;

-       target.page_number      = fz_resolve_link(mupdf_document->ctx,

--          mupdf_document->document, link->uri, &x, &y);

-+          mupdf_document->document, link->uri, &x, &y).page;

-       target.left  = x;

-       target.top   = y;

-       target.zoom  = 0.0;

--- 

-2.28.0

-

diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.5.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.5.ebuild
deleted file mode 100644
index 965f6f84b38a..000000000000
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm x86"
-	SRC_URI="https://github.com/pwmt/zathura-pdf-mupdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="https://pwmt.org/projects/zathura-pdf-mupdf/"
-
-LICENSE="ZLIB"
-SLOT="0"
-
-DEPEND="app-text/mupdf:=
-	>=app-text/zathura-0.3.9
-	dev-libs/girara
-	dev-libs/glib:2
-	media-libs/jbig2dec:=
-	media-libs/openjpeg:2=
-	virtual/jpeg:0
-	x11-libs/cairo"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e '/mupdfthird/d' meson.build || die "sed failed"
-
-	if has_version '<app-text/mupdf-1.16.1'; then
-		eapply "${FILESDIR}"/${PV}-compile-fix.patch
-	fi
-
-	if has_version '=app-text/mupdf-1.17*'; then
-		eapply "${FILESDIR}"/${PV}-fz_location.patch
-	fi
-
-	default
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}