From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1592847-garchives=archives.gentoo.org@lists.gentoo.org> 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 4BDA815838C for <garchives@archives.gentoo.org>; 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 9C793E29B8; 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 77AACE29B8 for <gentoo-commits@lists.gentoo.org>; 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 3055D3432FB for <gentoo-commits@lists.gentoo.org>; Sun, 21 Jan 2024 04:02:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5DC4014B5 for <gentoo-commits@lists.gentoo.org>; Sun, 21 Jan 2024 04:02:04 +0000 (UTC) From: "Sam James" <sam@gentoo.org> 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" <sam@gentoo.org> Message-ID: <1705809360.1e2c2e31cd762c3449ae61c263f631aa6e942f59.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/Manifest app-text/zathura/files/zathura-0.5.3-disable-seccomp-tests.patch app-text/zathura/zathura-0.5.3.ebuild X-VCS-Directories: app-text/zathura/files/ app-text/zathura/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1e2c2e31cd762c3449ae61c263f631aa6e942f59 X-VCS-Branch: master Date: Sun, 21 Jan 2024 04:02:04 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 11648511-713c-4595-aade-3f5ee5a10e30 X-Archives-Hash: 768b09231e4758b9196b1d7f39268dd6 commit: 1e2c2e31cd762c3449ae61c263f631aa6e942f59 Author: Mason Rocha <turret <AT> turret <DOT> cyou> AuthorDate: Sat Dec 9 20:01:30 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jan 21 03:56:00 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e2c2e31 app-text/zathura: add 0.5.3 zathura 0.5.3 changes some things in the tests meson file, requiring a separate patch to be rebased from master. dependencies have been revamped a little, there were some extra non-needed dependencies, such as x11-base/xorg-server[xvfb] in tests (thanks sevz17). test dependencies were moved to DEPEND. upstream hardened some requirements aswell. finally, upstream maintains an API/ABI versioning system separate from the package version itself, and has bumped both API and ABI without a minor/major version number bump, thus i've opted to move the subslots to be independent of the actual version number Signed-off-by: Mason Rocha <turret <AT> turret.cyou> Signed-off-by: Sam James <sam <AT> gentoo.org> app-text/zathura/Manifest | 2 + .../zathura-0.5.3-disable-seccomp-tests.patch | 24 +++++++ app-text/zathura/zathura-0.5.3.ebuild | 74 ++++++++++++++++++++++ 3 files changed, 100 insertions(+) diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest index 0ae0b91f44e5..0196d7628f58 100644 --- a/app-text/zathura/Manifest +++ b/app-text/zathura/Manifest @@ -1,3 +1,5 @@ DIST zathura-0.4.9.tar.gz 206194 BLAKE2B 0dd4b153cf7f8e3ddd4ede5514389b2c5e4aa88e2c416646acc38f7e19419e11165c2a5b51548a05d69a1b947e661b885f7c9d8c100179d0d23d8754cb441d97 SHA512 fbab65cba7ac37e4021233a4ae0356a85f4a88d2c1a2d8337cd627eae389856b6b4e692904233332d2fa14ad0300e8c52732059a75314a0ef147a02ca9f8db10 DIST zathura-0.5.2-manpages.tar.xz 9696 BLAKE2B 23c6e94d5b44c1e20338ea04afb7644e4c76618cdc4902d2edd436734498c6b17e1522b37269d67a62801632595f535724d8f5d4c9817e017e6341c5365c5842 SHA512 3bb431f0564ddc1f67bcd21f019a43f6af95c3e3b42b264b7e1f01f10cebd7c05115e452a868dd176e5a0d65a9085ac3d554d69e553aa53569593ea494036f7c 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 diff --git a/app-text/zathura/files/zathura-0.5.3-disable-seccomp-tests.patch b/app-text/zathura/files/zathura-0.5.3-disable-seccomp-tests.patch new file mode 100644 index 000000000000..1d9d0a59ca83 --- /dev/null +++ b/app-text/zathura/files/zathura-0.5.3-disable-seccomp-tests.patch @@ -0,0 +1,24 @@ +diff --git a/tests/meson.build b/tests/meson.build +index d2bed1d..9dbb6df 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -44,18 +44,7 @@ if check.found() + test('session', xvfb, + 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-0.5.3.ebuild b/app-text/zathura/zathura-0.5.3.ebuild new file mode 100644 index 000000000000..4874ec9d4c41 --- /dev/null +++ b/app-text/zathura/zathura-0.5.3.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson virtualx xdg + +DESCRIPTION="A highly customizable and functional document viewer" +HOMEPAGE="https://pwmt.org/projects/zathura/" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git" + EGIT_BRANCH="develop" +else + SRC_URI=" + https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz + https://cdn.turret.cyou/e28b2f940d1a19a74ecbfd80ea4477c5ea9ac627/${P}-manpages.tar.xz + " + KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="ZLIB" +SLOT="0/5.6" +IUSE="seccomp sqlite synctex test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/girara-0.4.1 + >=dev-libs/glib-2.50:2 + dev-libs/json-glib + sys-apps/file + x11-libs/cairo + >=x11-libs/gtk+-3.22:3 + seccomp? ( sys-libs/libseccomp ) + sqlite? ( >=dev-db/sqlite-3.6.23:3 ) + synctex? ( app-text/texlive-core ) +" +DEPEND=" + ${RDEPEND} + test? ( + dev-libs/check + x11-libs/gtk+[X] + ) +" +BDEPEND=" + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${P}-disable-seccomp-tests.patch +) + +src_configure() { + local emesonargs=( + -Dconvert-icon=disabled + -Dmanpages=disabled + -Dseccomp=$(usex seccomp enabled disabled) + -Dsqlite=$(usex sqlite enabled disabled) + -Dsynctex=$(usex synctex enabled disabled) + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +} + +src_install() { + meson_src_install + [[ ${PV} != *9999 ]] && doman "${WORKDIR}"/man/zathura* +}