From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1524D1581D3 for ; Fri, 31 May 2024 13:41:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 57D86E2ABD; Fri, 31 May 2024 13:41:07 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3780EE2ABD for ; Fri, 31 May 2024 13:41:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 62049335D7B for ; Fri, 31 May 2024 13:41:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9B23F1704 for ; Fri, 31 May 2024 13:41:04 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1717162840.15c83a66d3ba6174ff72cbb2d53580686ef2a9ac.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/zathura/, app-text/zathura/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/zathura/files/zathura-9999-disable-seccomp-tests.patch app-text/zathura/zathura-9999.ebuild X-VCS-Directories: app-text/zathura/ app-text/zathura/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 15c83a66d3ba6174ff72cbb2d53580686ef2a9ac X-VCS-Branch: master Date: Fri, 31 May 2024 13:41:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c57a97f2-ec56-45ec-b62b-acf966245321 X-Archives-Hash: f9d2d1b54b28d3758354cd2b65677b9f commit: 15c83a66d3ba6174ff72cbb2d53580686ef2a9ac Author: Nicu Borta gmail com> AuthorDate: Sat Apr 6 12:09:12 2024 +0000 Commit: Joonas Niilola gentoo 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 gmail.com> Closes: https://github.com/gentoo/gentoo/pull/36137 Signed-off-by: Joonas Niilola 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