[gentoo-commits] repo/gentoo:master commit in: app-text/zathura/, app-text/zathura/files/

[gentoo-commits] repo/gentoo:master commit in: app-text/zathura/, app-text/zathura/files/

[Mikle Kolyada]

commit:     c620bdc2b3a0872b6bc6ef0a9c624a411328db0d
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 10 23:54:43 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Nov 10 23:55:34 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c620bdc2

app-text/zathura: find libm properly

Closes: https://bugs.gentoo.org/669850
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-text/zathura/files/zathura-find-libm.patch | 26 ++++++++++++++++++++++++++
 app-text/zathura/zathura-0.4.1.ebuild          |  2 ++
 2 files changed, 28 insertions(+)

diff --git a/app-text/zathura/files/zathura-find-libm.patch b/app-text/zathura/files/zathura-find-libm.patch
new file mode 100644
index 00000000000..4995238fb8d
--- /dev/null
+++ b/app-text/zathura/files/zathura-find-libm.patch
@@ -0,0 +1,26 @@
+From cc99b8d3491ce0cd30ba56decc33d811478bab0c Mon Sep 17 00:00:00 2001
+From: Sebastian Ramacher <sebastian@ramacher.at>
+Date: Tue, 30 Oct 2018 00:39:19 +0100
+Subject: [PATCH] Search for m instead of libm (fixes #757)
+
+Thanks to Franz Trischberger for the fix.
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index f54f104..afe9ae8 100644
+--- a/meson.build
++++ b/meson.build
+@@ -36,7 +36,7 @@ dbusinterfacesdir = join_paths(datadir, 'dbus-1', 'interfaces')
+ plugindir = join_paths(get_option('libdir'), 'zathura')
+ 
+ # required dependencies
+-libm = cc.find_library('libm', required: false)
++libm = cc.find_library('m', required: false)
+ girara = dependency('girara-gtk3', version: '>=0.2.9')
+ glib = dependency('glib-2.0', version: '>=2.50')
+ gio = dependency('gio-unix-2.0', required: host_machine.system() != 'windows')
+-- 
+2.18.0
+

diff --git a/app-text/zathura/zathura-0.4.1.ebuild b/app-text/zathura/zathura-0.4.1.ebuild
index 1b9071f73e7..446cef59dfa 100644
--- a/app-text/zathura/zathura-0.4.1.ebuild
+++ b/app-text/zathura/zathura-0.4.1.ebuild
@@ -21,6 +21,8 @@ LICENSE="ZLIB"
 SLOT="0"
 IUSE="+magic seccomp sqlite synctex test"
 
+PATCHES=( "${FILESDIR}"/${PN}-find-libm.patch )
+
 RDEPEND="dev-libs/appstream
 	>=dev-libs/girara-0.3.1
 	>=dev-libs/glib-2.50:2

[gentoo-commits] repo/gentoo:master commit in: app-text/zathura/, app-text/zathura/files/

[Sam James]

commit:     b02e1593d0916e5657fb7e1d3bf34a90b8f34f03
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 20 03:09:26 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 20 03:09:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b02e1593

app-text/zathura: fix build with meson 0.61

Closes: https://bugs.gentoo.org/831468
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/zathura-0.4.8-meson-0.61-build.patch     | 27 ++++++++++++++++++++++
 app-text/zathura/zathura-0.4.8.ebuild              |  6 ++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/app-text/zathura/files/zathura-0.4.8-meson-0.61-build.patch b/app-text/zathura/files/zathura-0.4.8-meson-0.61-build.patch
new file mode 100644
index 000000000000..577eddc4da1f
--- /dev/null
+++ b/app-text/zathura/files/zathura-0.4.8-meson-0.61-build.patch
@@ -0,0 +1,27 @@
+https://github.com/pwmt/zathura/commit/c6ec5044c5ff843979050bfb81742d14740bb656.patch
+https://bugs.gentoo.org/831468
+
+From: Sebastian Ramacher <sebastian@ramacher.at>
+Date: Sat, 30 Oct 2021 15:41:25 +0200
+Subject: [PATCH] Fix build with meson 0.60
+
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -19,7 +19,7 @@ endif
+ i18n = import('i18n')
+ podir = join_paths(meson.project_source_root(), 'po')
+ 
+-desktop = i18n.merge_file('desktop',
++desktop = i18n.merge_file(
+   input: 'org.pwmt.zathura.desktop.in',
+   output: 'org.pwmt.zathura.desktop',
+   install: true,
+@@ -28,7 +28,7 @@ desktop = i18n.merge_file('desktop',
+   type: 'desktop'
+ )
+ 
+-appdata = i18n.merge_file('appdata',
++appdata = i18n.merge_file(
+   input: 'org.pwmt.zathura.appdata.xml.in',
+   output: 'org.pwmt.zathura.appdata.xml',
+   install: true,

diff --git a/app-text/zathura/zathura-0.4.8.ebuild b/app-text/zathura/zathura-0.4.8.ebuild
index 0de2aed7939f..83b02ddfd08f 100644
--- a/app-text/zathura/zathura-0.4.8.ebuild
+++ b/app-text/zathura/zathura-0.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,6 +40,10 @@ BDEPEND="doc? ( dev-python/sphinx )
 		dev-libs/check )
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-meson-0.61-build.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		-Dconvert-icon=disabled

[gentoo-commits] repo/gentoo:master commit in: app-text/zathura/, app-text/zathura/files/

[Sam James]

commit:     efabffde1e649ba54b38cc0a856451ea8098cb9d
Author:     Mason Rocha <turret <AT> turret <DOT> cyou>
AuthorDate: Sat Dec  9 21:53:01 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 21 03:56:41 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efabffde

app-text/zathura: version bump 0.5.4

also zathura-9999 uses 0.5.4 patch so there isn't any duplicate patches

Signed-off-by: Mason Rocha <turret <AT> turret.cyou>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/zathura/Manifest                                               | 2 ++
 ...le-seccomp-tests.patch => zathura-0.5.4-disable-seccomp-tests.patch} | 0
 app-text/zathura/{zathura-9999.ebuild => zathura-0.5.4.ebuild}          | 2 +-
 app-text/zathura/zathura-9999.ebuild                                    | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 0196d7628f58..d230578f075f 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -3,3 +3,5 @@ DIST zathura-0.5.2-manpages.tar.xz 9696 BLAKE2B 23c6e94d5b44c1e20338ea04afb7644e
 DIST zathura-0.5.2.tar.gz 208606 BLAKE2B fc7e8042a373a3fd66973fd5d6c7c3e7d6da884fb40269545e4074b42fdbc9b6f286089769a435394812e24a8b24de328521a2fd797bbb13c16115b112dd9a48 SHA512 17f2a6535b2b3c6f61986cd8a6ccdef2c1a129d8ebf8c86cbe3c8eac868c2780801f3fe2fdc17c429ca0c63a71a328bbb6c7f814f82714dd7f1a5a4728663b1f
 DIST zathura-0.5.3-manpages.tar.xz 10064 BLAKE2B f2d9988bfa1edf79b64be460c242ddf6fae15d84a6e0f8e25011962f24a3aca77a15ce285dc7e742693e28aff70da9f6f311f56ceafbda1439f2a6e347a973f8 SHA512 49269eca809a5c468f759991114a8beeeadb2e82b38c9126c89c63c2b90aa6a02624e5971c9d175c52abd724d23f48b05d03ba469397da5d12925ed8cdf11668
 DIST zathura-0.5.3.tar.gz 216701 BLAKE2B 0a39dc4d7f0d2ec36a9e52a8b9c606c56ed48cb9d37eb232303a596f386a9d980cef96e549efc461f577f286793861ee6654a72ebdfe8fbda25022e4ce38f657 SHA512 236dc981978d3fc7999be47d87d4ca9aaca03bfa1e069cd22c41bd93231248061faf7df62b2371dd28b17ec3f381ce2fff908f6b26ad211b529f51b9b1dabb53
+DIST zathura-0.5.4-manpages.tar.xz 10060 BLAKE2B 103d2b5ed4ab71bc096305e70addbf94f11539cc989fc867766a1366ec18ca30379ce8f5b9f2b4a4a67507f79bbf6c6136c46f47161d1b74457c04488aa3dcea SHA512 a8251740a8e24e1c37093bec58b0169f04bd318878d743c72f07505a722c58da4f84a2dad5d46ded7789e1b4c5f2a7bab9cc6d023cd0935e49fe4388c9c28bd9
+DIST zathura-0.5.4.tar.gz 216719 BLAKE2B 94219e1feb22dc5cf3c072ed7d53b984c58e1f5c2d86b7e2b9e67c2d1cde92e9972aa18583930d3af3bc7d9c2afe367221ed3c2141fee682cc7ea54aae603ec4 SHA512 16f7291c3742cffe9ba5c6a3137781b2dd0b0bfcd61747e45a3c4b14df97781b49d526a298d2be9f564c84e616f1adef2ff4f5442d539fd42ab5e862baa00922

diff --git a/app-text/zathura/files/zathura-9999-disable-seccomp-tests.patch b/app-text/zathura/files/zathura-0.5.4-disable-seccomp-tests.patch
similarity index 100%
rename from app-text/zathura/files/zathura-9999-disable-seccomp-tests.patch
rename to app-text/zathura/files/zathura-0.5.4-disable-seccomp-tests.patch

diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-0.5.4.ebuild
similarity index 94%
copy from app-text/zathura/zathura-9999.ebuild
copy to app-text/zathura/zathura-0.5.4.ebuild
index 4874ec9d4c41..b33e1ccf4a6b 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-0.5.4.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="
 		https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz
-		https://cdn.turret.cyou/e28b2f940d1a19a74ecbfd80ea4477c5ea9ac627/${P}-manpages.tar.xz
+		https://cdn.turret.cyou/~turret/distfiles/${PN}/${P}-manpages.tar.xz
 	"
 	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi

diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
index 4874ec9d4c41..d3ad8d2fd0a1 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-9999.ebuild
@@ -50,7 +50,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${P}-disable-seccomp-tests.patch
+	"${FILESDIR}/zathura-0.5.4-disable-seccomp-tests.patch"
 )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: app-text/zathura/, app-text/zathura/files/

[Joonas Niilola]

commit:     15c83a66d3ba6174ff72cbb2d53580686ef2a9ac
Author:     Nicu Borta <nicu.borta111 <AT> gmail <DOT> com>
AuthorDate: Sat Apr  6 12:09:12 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri May 31 13:40:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15c83a66

app-text/zathura: fix 9999 ebuild

Update disable-seccomp-tests patch.

Bump girara version.

Make sqlite a hard dependency.

Signed-off-by: Nicu Borta <nicu.borta111 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36137
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../files/zathura-9999-disable-seccomp-tests.patch | 22 ++++++++++++++++++++++
 app-text/zathura/zathura-9999.ebuild               |  9 ++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/app-text/zathura/files/zathura-9999-disable-seccomp-tests.patch b/app-text/zathura/files/zathura-9999-disable-seccomp-tests.patch
new file mode 100644
index 000000000000..09947eb722b4
--- /dev/null
+++ b/app-text/zathura/files/zathura-9999-disable-seccomp-tests.patch
@@ -0,0 +1,22 @@
+diff --git a/tests/meson.build b/tests/meson.build
+index 10531a5..1c79e29 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -54,17 +54,5 @@ if check.found()
+       args: xvfb_args + [session],
+       timeout: 60*60
+     )
+-
+-    if seccomp.found()
+-      sandbox = executable('test_sandbox', ['test_sandbox.c', 'tests.c'],
+-        dependencies: build_dependencies + test_dependencies,
+-        include_directories: include_directories,
+-        c_args: defines + flags
+-      )
+-      test('sandbox', xvfb,
+-        args: xvfb_args + [sandbox],
+-        timeout: 60*60
+-      )
+-    endif
+   endif
+ endif

diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
index 3cf03fc8f6e7..0a26c971eaf0 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-9999.ebuild
@@ -22,19 +22,19 @@ fi
 
 LICENSE="ZLIB"
 SLOT="0/5.6"
-IUSE="seccomp sqlite synctex test"
+IUSE="seccomp synctex test"
 
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-libs/girara-0.4.1
+	>=dev-libs/girara-0.4.3
 	>=dev-libs/glib-2.50:2
 	dev-libs/json-glib
 	sys-apps/file
 	x11-libs/cairo
 	>=x11-libs/gtk+-3.22:3
+	>=dev-db/sqlite-3.6.23:3
 	seccomp? ( sys-libs/libseccomp )
-	sqlite? ( >=dev-db/sqlite-3.6.23:3 )
 	synctex? ( app-text/texlive-core )
 "
 DEPEND="
@@ -50,7 +50,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/zathura-0.5.4-disable-seccomp-tests.patch"
+	"${FILESDIR}"/${P}-disable-seccomp-tests.patch
 )
 
 src_configure() {
@@ -58,7 +58,6 @@ src_configure() {
 		-Dconvert-icon=disabled
 		-Dmanpages=disabled
 		-Dseccomp=$(usex seccomp enabled disabled)
-		-Dsqlite=$(usex sqlite enabled disabled)
 		-Dsynctex=$(usex synctex enabled disabled)
 		)
 	meson_src_configure