[gentoo-commits] repo/gentoo:master commit in: app-text/atril/, app-text/atril/files/
commit: 1d22283e63b0b3352a6fc636060911f3a4e4aeac Author: Adam Feldman gentoo org> AuthorDate: Sat Sep 5 15:42:27 2020 + Commit: Adam Feldman gentoo org> CommitDate: Fri Sep 25 20:32:18 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d22283e app-text/atril: Bump to 1.24.0-r2, synctex optional, add broken tests Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Adam Feldman gentoo.org> app-text/atril/atril-1.24.0-r2.ebuild | 119 + .../files/atril-1.24.0-make-synctex-optional.patch | 526 + app-text/atril/metadata.xml| 2 + 3 files changed, 647 insertions(+) diff --git a/app-text/atril/atril-1.24.0-r2.ebuild b/app-text/atril/atril-1.24.0-r2.ebuild new file mode 100644 index 000..6947e34b8f3 --- /dev/null +++ b/app-text/atril/atril-1.24.0-r2.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MATE_LA_PUNT="yes" + +PYTHON_COMPAT=( python3_{6,7} ) + +inherit mate python-any-r1 virtualx + +if [[ ${PV} != ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +DESCRIPTION="Atril document viewer for MATE" +LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+" +SLOT="0" + +IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring +postscript synctex t1lib test tiff xps" + +REQUIRED_USE="t1lib? ( dvi )" + +COMMON_DEPEND=" + >=app-text/poppler-0.22[cairo] + dev-libs/atk + >=dev-libs/glib-2.62:2 + >=dev-libs/libxml2-2.5:2 + sys-libs/zlib + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-3.22:3[introspection?] + x11-libs/libICE + >=x11-libs/libSM-1:0 + x11-libs/libX11 + >=x11-libs/cairo-1.14 + x11-libs/pango + caja? ( >=mate-base/caja-1.17.1[introspection?] ) + djvu? ( >=app-text/djvu-3.5.17:0 ) + dvi? ( + virtual/tex-base + t1lib? ( >=media-libs/t1lib-5:5 ) + ) + epub? ( + dev-libs/mathjax + >=net-libs/webkit-gtk-2.6.0:4 + ) + gnome-keyring? ( >=app-crypt/libsecret-0.5 ) + introspection? ( >=dev-libs/gobject-introspection-0.6:= ) + postscript? ( >=app-text/libspectre-0.2 ) + synctex? ( virtual/tex-base ) + tiff? ( >=media-libs/tiff-3.6:0 ) + xps? ( >=app-text/libgxps-0.2.1 ) +" + +RDEPEND="${COMMON_DEPEND} + virtual/libintl + !!app-text/mate-document-viewer +" + +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + app-text/rarian + app-text/yelp-tools + >=app-text/scrollkeeper-dtd-1:1.0 + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/gtk-doc + dev-util/gtk-doc-am + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') ) +" + +#RESTRICT="!test? ( test )" +# Tests use dogtail and require using accessibility services. +# Until we figure out how to run successfully, don't run tests +RESTRICT="test" + +PATCHES=( "${FILESDIR}/${PN}-1.24.0-make-synctex-optional.patch" ) + +python_check_deps() { + use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_configure() { + # Passing --disable-help would drop offline help, that would be inconsistent + # with helps of the most of GNOME apps that doesn't require network for that. + mate_src_configure \ + --enable-comics \ + --enable-pdf \ + --enable-pixbuf \ + --enable-previewer \ + --enable-thumbnailer \ + $(use_with gnome-keyring keyring) \ + $(use_enable caja) \ + $(use_enable dbus) \ + $(use_enable debug) \ + $(use_enable djvu) \ + $(use_enable dvi) \ + $(use_enable epub) \ + $(use_enable introspection) \ + $(use_enable postscript ps) \ + $(use_enable synctex) \ + $(use_enable t1lib) \ + $(use_enable test tests) \ + $(use_enable tiff) \ + $(use_enable xps) +} + +src_test() { + export GSETTINGS_BACKEND=keyfile + gsettings set org.gnome.desktop.interface toolkit-accessibility true || die + gsettings set org.mate.interface accessibility true || die + virtx emake check +} diff --git a/app-text/atril/files/atril-1.24.0-make-synctex-optional.patch b/app-text/atril/files/atril-1.24.0-make-synctex-optional.patch new file mode 100644 index 000..7b2d3a9c372 --- /dev/null +++ b/app-text/atril/files/atril-1.24.0-make-synctex-optional.patch @@ -0,0 +1,526 @@ +From ed650322792514d69ae54eef4cb105cac1dcb4b8 Mon Sep 17 00:00:00 2001 +From: Oz Tiram +Date: Fri, 7 Feb 2020 21:57:10 +0100 +Subject: [PATCH 1/5] Make
[gentoo-commits] repo/gentoo:master commit in: app-text/atril/, app-text/atril/files/
commit: 50d9a00ce8479638672bc7938ce9dc388172a82f Author: NP-Hardass gentoo org> AuthorDate: Fri Feb 23 20:19:06 2018 + Commit: NP Hardass gentoo org> CommitDate: Fri Feb 23 20:22:55 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50d9a00c app-text/atril: Fix CVE-2017-183 Bug: https://bugs.gentoo.org/624880 Package-Manager: Portage-2.3.24, Repoman-2.3.6 ...ril-1.12.2-r4.ebuild => atril-1.12.2-r5.ebuild} | 4 +++- ...ril-1.14.2-r1.ebuild => atril-1.14.2-r2.ebuild} | 4 +++- ...ril-1.16.1-r1.ebuild => atril-1.16.1-r2.ebuild} | 4 +++- app-text/atril/files/atril-cve-2017-183.patch | 28 ++ 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/app-text/atril/atril-1.12.2-r4.ebuild b/app-text/atril/atril-1.12.2-r5.ebuild similarity index 96% rename from app-text/atril/atril-1.12.2-r4.ebuild rename to app-text/atril/atril-1.12.2-r5.ebuild index aa353029fbd..360dac80db2 100644 --- a/app-text/atril/atril-1.12.2-r4.ebuild +++ b/app-text/atril/atril-1.12.2-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -67,6 +67,8 @@ DEPEND="${RDEPEND} # Tests use dogtail which is not available on Gentoo. RESTRICT="test" +FILES=( "${FILESDIR}/${PN}-cve-2017-183.patch" ) + src_configure() { # Passing --disable-help would drop offline help, that would be inconsistent # with helps of the most of GNOME apps that doesn't require network for that. diff --git a/app-text/atril/atril-1.14.2-r1.ebuild b/app-text/atril/atril-1.14.2-r2.ebuild similarity index 96% rename from app-text/atril/atril-1.14.2-r1.ebuild rename to app-text/atril/atril-1.14.2-r2.ebuild index 12e1ae529a2..792c2c2e6a0 100644 --- a/app-text/atril/atril-1.14.2-r1.ebuild +++ b/app-text/atril/atril-1.14.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -69,6 +69,8 @@ DEPEND="${COMMON_DEPEND} # Tests use dogtail which is not available on Gentoo. RESTRICT="test" +FILES=( "${FILESDIR}/${PN}-cve-2017-183.patch" ) + src_configure() { # Passing --disable-help would drop offline help, that would be inconsistent # with helps of the most of GNOME apps that doesn't require network for that. diff --git a/app-text/atril/atril-1.16.1-r1.ebuild b/app-text/atril/atril-1.16.1-r2.ebuild similarity index 96% rename from app-text/atril/atril-1.16.1-r1.ebuild rename to app-text/atril/atril-1.16.1-r2.ebuild index 4259cddf89b..24aad9d4f3c 100644 --- a/app-text/atril/atril-1.16.1-r1.ebuild +++ b/app-text/atril/atril-1.16.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -68,6 +68,8 @@ DEPEND="${COMMON_DEPEND} # Tests use dogtail which is not available on Gentoo. RESTRICT="test" +FILES=( "${FILESDIR}/${PN}-cve-2017-183.patch" ) + src_configure() { # Passing --disable-help would drop offline help, that would be inconsistent # with helps of the most of GNOME apps that doesn't require network for that. diff --git a/app-text/atril/files/atril-cve-2017-183.patch b/app-text/atril/files/atril-cve-2017-183.patch new file mode 100644 index 000..29c81f7e542 --- /dev/null +++ b/app-text/atril/files/atril-cve-2017-183.patch @@ -0,0 +1,28 @@ +From f4291fd62f7dfe6460d2406a979ccfac0c68dd59 Mon Sep 17 00:00:00 2001 +From: ZenWalker +Date: Wed, 19 Jul 2017 11:00:09 +0200 +Subject: [PATCH] comics: make the files containing "--checkpoint-action=" + unsupported + +Fixes #257 +--- + backend/comics/comics-document.c | 6 ++ + 1 file changed, 6 insertions(+) + +diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c +index 9f945c6..4d4d293 100644 +--- a/backend/comics/comics-document.c b/backend/comics/comics-document.c +@@ -983,6 +983,12 @@ extract_argv (EvDocument *document, gint page) + char *command_line, *quoted_archive, *quoted_filename; + GError *err = NULL; + ++ if (g_strrstr (comics_document->page_names->pdata[page], "--checkpoint-action=")) ++ { ++ g_warning ("File unsupported\n"); ++ gtk_main_quit (); ++ } ++ + if (page >= comics_document->page_names->len) + return NULL; +