public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Joonas Niilola" <juippis@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/zathura/, app-text/zathura/files/
Date: Fri, 31 May 2024 13:41:04 +0000 (UTC)	[thread overview]
Message-ID: <1717162840.15c83a66d3ba6174ff72cbb2d53580686ef2a9ac.juippis@gentoo> (raw)

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


             reply	other threads:[~2024-05-31 13:41 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-31 13:41 Joonas Niilola [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-01-21  4:02 [gentoo-commits] repo/gentoo:master commit in: app-text/zathura/, app-text/zathura/files/ Sam James
2022-01-20  3:11 Sam James
2018-11-10 23:55 Mikle Kolyada

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1717162840.15c83a66d3ba6174ff72cbb2d53580686ef2a9ac.juippis@gentoo \
    --to=juippis@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox