* [gentoo-commits] repo/gentoo:master commit in: app-text/zathura-pdf-mupdf/files/, app-text/zathura-pdf-mupdf/
@ 2019-10-27 10:53 Mikle Kolyada
0 siblings, 0 replies; 4+ messages in thread
From: Mikle Kolyada @ 2019-10-27 10:53 UTC (permalink / raw
To: gentoo-commits
commit: 7f4a6ec2c73c5f64af0f5f4e3808e8a1820d1ca9
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 27 10:52:08 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Oct 27 10:53:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f4a6ec2
app-text/zathura-pdf-mupdf: fix build
Closes: https://bugs.gentoo.org/693354
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
app-text/zathura-pdf-mupdf/files/0.3.5-compile-fix.patch | 11 +++++++++++
app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.5.ebuild | 1 +
2 files changed, 12 insertions(+)
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
new file mode 100644
index 00000000000..e031db3c918
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/files/0.3.5-compile-fix.patch
@@ -0,0 +1,11 @@
+--- 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/zathura-pdf-mupdf-0.3.5.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.5.ebuild
index a8c73f86302..ec8c60cf28e 100644
--- 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
@@ -35,5 +35,6 @@ BDEPEND="virtual/pkgconfig"
src_prepare() {
sed -i -e '/mupdfthird/d' meson.build || die "sed failed"
+ eapply "${FILESDIR}"/${PV}-compile-fix.patch
default
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/zathura-pdf-mupdf/files/, app-text/zathura-pdf-mupdf/
@ 2020-08-24 9:12 Mikle Kolyada
0 siblings, 0 replies; 4+ messages in thread
From: Mikle Kolyada @ 2020-08-24 9:12 UTC (permalink / raw
To: gentoo-commits
commit: 69db8d383698f52b4ab97df9c2df73b9fc135841
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 09:12:27 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 09:12:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69db8d38
app-text/zathura-pdf-mupdf: fix mupdf-1.17.0 compat
Closes: https://bugs.gentoo.org/737462
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
.../files/0.3.5-fz_location.patch | 44 ++++++++++++++++++++++
.../zathura-pdf-mupdf-0.3.5.ebuild | 6 ++-
2 files changed, 49 insertions(+), 1 deletion(-)
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
new file mode 100644
index 00000000000..03c0bf24aab
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/files/0.3.5-fz_location.patch
@@ -0,0 +1,44 @@
+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
index b1b7975e961..965f6f84b38 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -40,6 +40,10 @@ src_prepare() {
eapply "${FILESDIR}"/${PV}-compile-fix.patch
fi
+ if has_version '=app-text/mupdf-1.17*'; then
+ eapply "${FILESDIR}"/${PV}-fz_location.patch
+ fi
+
default
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/zathura-pdf-mupdf/files/, app-text/zathura-pdf-mupdf/
@ 2022-03-21 23:42 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-03-21 23:42 UTC (permalink / raw
To: gentoo-commits
commit: 7b411454909c30feac2134509bbc25aef46a1837
Author: Philipp Rösner <rndxelement <AT> protonmail <DOT> com>
AuthorDate: Mon Mar 21 20:35:20 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 23:34:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b411454
app-text/zathura-pdf-mupdf: fix sed call
Replace broken sed call by patch for meson.build
Closes: https://bugs.gentoo.org/835592
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Philipp Rösner <rndxelement <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24699
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch | 23 ++++++++++++++++++++++
....8.ebuild => zathura-pdf-mupdf-0.3.8-r1.ebuild} | 8 +++-----
.../zathura-pdf-mupdf-9999.ebuild | 8 +++-----
3 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch
new file mode 100644
index 000000000000..942eb710343d
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch
@@ -0,0 +1,23 @@
+--- a/meson.build
++++ b/meson.build
+@@ -20,7 +20,6 @@ girara = dependency('girara-gtk3')
+ glib = dependency('glib-2.0')
+ cairo = dependency('cairo')
+ mupdf = dependency('mupdf', required: false)
+-mupdfthird = cc.find_library('mupdf-third')
+
+ build_dependencies = [
+ zathura,
+@@ -32,10 +31,10 @@ build_dependencies = [
+ if not mupdf.found()
+ # normal build of mupdf
+ mupdf = cc.find_library('mupdf')
+- build_dependencies += [mupdf, mupdfthird]
++ build_dependencies += [mupdf]
+ else
+ # build from Debian's libmupdf-dev
+- build_dependencies += [mupdf, mupdfthird]
++ build_dependencies += [mupdf]
+
+ libjpeg = dependency('libjpeg')
+ libjbig2dec = cc.find_library('jbig2dec')
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8-r1.ebuild
similarity index 85%
rename from app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8.ebuild
rename to app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8-r1.ebuild
index f77ce12d862e..439355423fb1 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8-r1.ebuild
@@ -33,8 +33,6 @@ BDEPEND="app-text/tesseract
media-libs/leptonica
virtual/pkgconfig"
-src_prepare() {
- sed -i -e '/mupdfthird/d' meson.build || die "Failed removing mupdfthird from meson.build"
-
- default
-}
+PATCHES=(
+ "${FILESDIR}/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch"
+)
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
index 657da8ef975a..ee7721ceea68 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
@@ -33,8 +33,6 @@ BDEPEND="app-text/tesseract
media-libs/leptonica
dev-lang/mujs"
-src_prepare() {
- sed -i -e '/mupdfthird/d' meson.build || die "Failed removing mupdfthird from meson.build"
-
- default
-}
+PATCHES=(
+ "${FILESDIR}/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch"
+)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/zathura-pdf-mupdf/files/, app-text/zathura-pdf-mupdf/
@ 2024-10-21 12:36 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2024-10-21 12:36 UTC (permalink / raw
To: gentoo-commits
commit: b80d5bb7e6176eb71c311a692c0758ff359561c3
Author: Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Tue Sep 3 13:33:04 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Oct 21 12:36:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b80d5bb7
app-text/zathura-pdf-mupdf: drop 0.4.1
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
app-text/zathura-pdf-mupdf/Manifest | 1 -
.../zathura-pdf-mupdf-0.4.0-meson-mupdfthird.patch | 39 ------------------
.../zathura-pdf-mupdf-0.4.1.ebuild | 46 ----------------------
3 files changed, 86 deletions(-)
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index 48396d5508c6..b41cc2d08a75 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,3 +1,2 @@
-DIST zathura-pdf-mupdf-0.4.1.tar.gz 9346 BLAKE2B f1998acf00696fd40577f6e53b597258e519d3862c5b6b29bec292aaa732acf0b7a80ddf1b2f62d95d9462fe811a73cd912009106394bf1aadfa76be9c6d1adc SHA512 bf3360cdf6195af3cace4c769536a49f1cf2167c70a65b560410db1a0098119d726e73baeea98ca7100653c17248056c484fc436558e52a8dc12e7b83ce789b1
DIST zathura-pdf-mupdf-0.4.3.tar.gz 10146 BLAKE2B ca4edc56256d04e5ba42dd756976a3e444f37dfb5c1fff569329478c3053f7d48fa689d61b8769a73bac50e1244e74855705a9cd1cd25ed37a6927bd6c2ccf75 SHA512 ffab536d1cea26dd08fbb3808e0ff5d4b5b126bfdbd19a79101ac519ee9951d916b75c5b1b1e459f453087c936d84fa3839b4b84dd7f92398ba5cca87e186795
DIST zathura-pdf-mupdf-0.4.4.tar.gz 10100 BLAKE2B aa969ac9a702150d05e8c1dfc7f0f6752c0371c812a208f33ab19c14423b12636345544ce898eda3ab5517b895c832a91f3a6866468049e03b2d36a67d198c06 SHA512 c6297b8ed68a0797db2e7b295d7fc7cb4d099f24cd9faea49e1e2d0c61818b071297b57f6472c057010caf104053cc0866685349b33a61302280cb52bac055cf
diff --git a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.4.0-meson-mupdfthird.patch b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.4.0-meson-mupdfthird.patch
deleted file mode 100644
index caa0da05e37c..000000000000
--- a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.4.0-meson-mupdfthird.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -20,7 +20,6 @@ girara = dependency('girara-gtk3')
- glib = dependency('glib-2.0')
- cairo = dependency('cairo')
- mupdf = dependency('mupdf', required: false)
--mupdfthird = cc.find_library('mupdf-third')
-
- build_dependencies = [
- zathura,
-@@ -32,17 +31,15 @@ build_dependencies = [
- if not mupdf.found()
- # normal build of mupdf
- mupdf = cc.find_library('mupdf')
-- build_dependencies += [mupdf, mupdfthird]
-+ build_dependencies += [mupdf]
- else
- # build from Debian's libmupdf-dev
-- build_dependencies += [mupdf, mupdfthird]
-+ build_dependencies += [mupdf]
-
- libjpeg = dependency('libjpeg')
- libjbig2dec = cc.find_library('jbig2dec')
- libopenjp2 = dependency('libopenjp2')
- gumbo = dependency('gumbo')
-- tesseract = dependency('tesseract')
-- leptonica = dependency('lept')
- mujs = dependency('mujs')
-
- build_dependencies += [
-@@ -50,8 +47,6 @@ else
- libjbig2dec,
- libopenjp2,
- gumbo,
-- tesseract,
-- leptonica,
- mujs
- ]
- endif
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.1.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.1.ebuild
deleted file mode 100644
index 94db4774090d..000000000000
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson xdg
-
-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://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz"
-fi
-
-DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="https://git.pwmt.org/pwmt/zathura-pdf-mupdf"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="+javascript"
-
-DEPEND="
- >=app-text/mupdf-1.20.0:=[javascript?]
- >=app-text/zathura-0.5.2:=
- dev-libs/girara
- dev-libs/glib:2
- x11-libs/cairo
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.4.0-meson-mupdfthird.patch"
-)
-
-src_prepare() (
- default
-
- if ! use javascript ; then
- sed -i -e '/mujs/d' meson.build || die
- fi
-)
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-10-21 12:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-24 9:12 [gentoo-commits] repo/gentoo:master commit in: app-text/zathura-pdf-mupdf/files/, app-text/zathura-pdf-mupdf/ Mikle Kolyada
-- strict thread matches above, loose matches on Subject: below --
2024-10-21 12:36 Joonas Niilola
2022-03-21 23:42 Sam James
2019-10-27 10:53 Mikle Kolyada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox