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 0178E15838C for ; Sun, 21 Jan 2024 04:02:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79FEBE29BA; Sun, 21 Jan 2024 04:02:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5935FE29B8 for ; Sun, 21 Jan 2024 04:02: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 6431C34330D for ; Sun, 21 Jan 2024 04:02:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7227014B6 for ; Sun, 21 Jan 2024 04:02:04 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1705809396.6ca4cc6ca7af63a24b266a59a1640b2eaab301d2.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/zathura/files/, app-text/zathura/ 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/files/ app-text/zathura/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6ca4cc6ca7af63a24b266a59a1640b2eaab301d2 X-VCS-Branch: master Date: Sun, 21 Jan 2024 04:02: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: f44ac994-9b0d-47da-83a4-cca1bd5514e6 X-Archives-Hash: 310a58919b07cb402324a233e66d5d7a commit: 6ca4cc6ca7af63a24b266a59a1640b2eaab301d2 Author: Mason Rocha turret cyou> AuthorDate: Sat Dec 9 20:09:30 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jan 21 03:56:36 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ca4cc6c app-text/zathura: update dependencies, rebase patch for 9999 upstream's changes to tests/meson.build require patch rebase, 0.5.3 introduced some dependency changes so those are also reflected here. Signed-off-by: Mason Rocha turret.cyou> Signed-off-by: Sam James gentoo.org> .../files/zathura-9999-disable-seccomp-tests.patch | 22 ++++++++++++++++++++ app-text/zathura/zathura-9999.ebuild | 24 ++++++++++++---------- 2 files changed, 35 insertions(+), 11 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..7658f3f6f417 --- /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 1b2e81a..b2b7565 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -45,17 +45,5 @@ if check.found() + args: ['-a', '-s', '-screen 0 1400x900x24 -ac +extension GLX +render -noreset', 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: ['-a', '-s', '-screen 0 1400x900x24 -ac +extension GLX +render -noreset', sandbox], +- timeout: 60*60 +- ) +- endif + endif + endif diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild index 1ad4fe4776d4..4874ec9d4c41 100644 --- a/app-text/zathura/zathura-9999.ebuild +++ b/app-text/zathura/zathura-9999.ebuild @@ -15,40 +15,42 @@ if [[ ${PV} == *9999 ]]; then else SRC_URI=" https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz - https://cdn.turret.cyou/354c6d33bfd3bbc67c0047af1328498978eef352/${P}-manpages.tar.xz + https://cdn.turret.cyou/e28b2f940d1a19a74ecbfd80ea4477c5ea9ac627/${P}-manpages.tar.xz " KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux" fi LICENSE="ZLIB" -SLOT="0/$(ver_cut 1-2)" +SLOT="0/5.6" IUSE="seccomp sqlite synctex test" RESTRICT="!test? ( test )" -DEPEND=" - >=dev-libs/girara-0.3.7 +RDEPEND=" + >=dev-libs/girara-0.4.1 >=dev-libs/glib-2.50:2 + dev-libs/json-glib sys-apps/file - >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 seccomp? ( sys-libs/libseccomp ) - sqlite? ( >=dev-db/sqlite-3.5.9:3 ) + sqlite? ( >=dev-db/sqlite-3.6.23:3 ) synctex? ( app-text/texlive-core ) " -RDEPEND="${DEPEND}" -BDEPEND=" +DEPEND=" + ${RDEPEND} test? ( - dev-libs/appstream-glib dev-libs/check - x11-base/xorg-server[xvfb] + x11-libs/gtk+[X] ) +" +BDEPEND=" + >=sys-devel/gettext-0.19.8 virtual/pkgconfig " PATCHES=( - "${FILESDIR}"/zathura-disable-seccomp-tests.patch + "${FILESDIR}"/${P}-disable-seccomp-tests.patch ) src_configure() {