commit: 7ccdbea27457da611c7aa7dfb9008d087b1aef77 Author: Chris Mayo <aklhfex <AT> gmail <DOT> com> AuthorDate: Tue Apr 13 02:39:15 2021 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Tue Apr 13 04:39:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ccdbea2
app-text/evince: Version bump to 40.0 Closes: https://bugs.gentoo.org/774345 Signed-off-by: Chris Mayo <aklhfex <AT> gmail.com> Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> app-text/evince/Manifest | 1 + app-text/evince/evince-40.0.ebuild | 131 +++++++++++++++++++++ .../evince/files/40.0-avoid-changing-soname.patch | 66 +++++++++++ app-text/evince/files/40.0-internal-synctex.patch | 28 +++++ 4 files changed, 226 insertions(+) diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest index 5417d246ea3..f277a2a0884 100644 --- a/app-text/evince/Manifest +++ b/app-text/evince/Manifest @@ -1,3 +1,4 @@ DIST evince-3.36.10.tar.xz 2430584 BLAKE2B 7c8b5e3dec7168f4ab6976022bb85041fd8cc9f55b8c032bbf03cf492d243dc49f00d6913c1f2f09498c1b4091b4be126a9367dd3ed235635e9d08e6a9ae5a0d SHA512 2a17fc1fbd18e2685c254194d0e195ec0c6126f37212ae64297fb06f30f2e07f926cb768affb4d5c9c407c4dfc43db3578ffd244c9a6e121d1d3c9b5e653b4d2 DIST evince-3.36.7.tar.xz 2580208 BLAKE2B 76ba6d206289f9981af24e5d82c9567c05984ad71efe83391aa1f8fdd94d31c284e600cf81eab9868e01f120f71cde1ae9b6ee6b7a4b1da47458d17b95b78d87 SHA512 dacc26d2d75c3dcadceb0a35c995ae3501bd91e84632cdf87decd359350e74032444707ea152e24c01fb57fe0ef2a426813a33919833cefdeb8699f8c642d910 DIST evince-3.36.9.tar.xz 2429740 BLAKE2B 7154d473561955df9be545bbda520034e7de1556ea241dd30833ac014af2bb20fc3ef1d7fe6777cdcfab90553eb3f0562e1452df62c1c1eeb6b47b5bb64298bf SHA512 54f2dfc287fa627e1474c4bb23e6127bc5daa7044c2158805e5af487b7d65e776da9b86adbb83ec63fad3ce4c339f57483a3a2d7b95ad14de2dc76e29a29a8fb +DIST evince-40.0.tar.xz 2928668 BLAKE2B 852c532b595f50e849893670b536b5b8c25f0407a719cbe659faa3f72b51f43a0471c3df9197fa5bd11735c14e0779d8cf28a88cd79aabec4dffa797443b9819 SHA512 995693e4a6e1a3bb31e1d4f3538dc53519102a5a6afa58ba61454a1e2ca582df26bd368876210fce6fab8ff4e218305644fa7a7a88c99e1a1ca5bda8d8f1ece2 diff --git a/app-text/evince/evince-40.0.ebuild b/app-text/evince/evince-40.0.ebuild new file mode 100644 index 00000000000..6236265c87f --- /dev/null +++ b/app-text/evince/evince-40.0.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome.org meson systemd + +DESCRIPTION="Simple document viewer for GNOME" +HOMEPAGE="https://wiki.gnome.org/Apps/Evince"; + +LICENSE="GPL-2+ CC-BY-SA-3.0" +# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3) +SLOT="0/evd3.4-evv3.3" +IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus nsplugin postscript spell t1lib tiff xps" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" + +# atk used in libview +# bundles unarr +DEPEND=" + dev-libs/atk + >=dev-libs/glib-2.44.0:2 + >=gui-libs/libhandy-1.0:1= + >=dev-libs/libxml2-2.5:2 + sys-libs/zlib:= + >=x11-libs/gdk-pixbuf-2.40:2 + >=x11-libs/gtk+-3.22.0:3[cups?,introspection?] + gnome-base/gsettings-desktop-schemas + >=x11-libs/cairo-1.10:= + >=app-text/poppler-0.76.0[cairo] + >=app-arch/libarchive-3.2.0 + djvu? ( >=app-text/djvu-3.5.22:= ) + dvi? ( + >=app-text/libspectre-0.2:= + dev-libs/kpathsea:= + t1lib? ( >=media-libs/t1lib-5:= ) ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + media-libs/gst-plugins-good:1.0 ) + gnome? ( gnome-base/gnome-desktop:3= ) + gnome-keyring? ( >=app-crypt/libsecret-0.5 ) + introspection? ( >=dev-libs/gobject-introspection-1:= ) + nautilus? ( >=gnome-base/nautilus-3.28.0 ) + postscript? ( >=app-text/libspectre-0.2:= ) + spell? ( >=app-text/gspell-1.6.0:= ) + tiff? ( >=media-libs/tiff-3.6:0= ) + xps? ( >=app-text/libgxps-0.2.1:= ) +" +RDEPEND="${DEPEND} + gnome-base/gvfs + gnome-base/librsvg + || ( + >=x11-themes/adwaita-icon-theme-2.17.1 + >=x11-themes/hicolor-icon-theme-0.10 + ) +" +BDEPEND=" + gtk-doc? ( >=dev-util/gtk-doc-1.33 ) + app-text/docbook-xml-dtd:4.3 + dev-libs/appstream-glib + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/40.0-internal-synctex.patch + "${FILESDIR}"/40.0-avoid-changing-soname.patch +) + +src_prepare() { + default + + # Do not depend on adwaita-icon-theme, bug #326855, #391859 + # https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7 + sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die + + # https://gitlab.gnome.org/GNOME/evince/-/merge_requests/336 + sed -i -e 's:T1_initLib:T1_InitLib:' meson.build || die +} + +src_configure() { + local emesonargs=( + -Dplatform=gnome + + -Dviewer=true + -Dpreviewer=false + -Dthumbnailer=true + $(meson_use nsplugin browser_plugin) + $(meson_use nautilus) + + -Dcomics=enabled + $(meson_feature djvu) + $(meson_feature dvi) + -Dpdf=enabled + $(meson_feature postscript ps) + $(meson_feature tiff) + $(meson_feature xps) + + $(meson_use gtk-doc gtk_doc) + -Duser_doc=true + $(meson_use introspection) + -Ddbus=true + $(meson_feature gnome-keyring keyring) + $(meson_feature cups gtk_unix_print) + $(meson_feature gnome thumbnail_cache) + $(meson_feature gstreamer multimedia) + $(meson_feature spell gspell) + + $(meson_feature t1lib) + + -Dbrowser_plugin_dir="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" + -Dsystemduserunitdir="$(systemd_get_userunitdir)" + + ) + meson_src_configure +} + +src_compile() { + meson_src_compile +} + +src_test() { + meson_src_test +} + +src_install() { + meson_src_install +} diff --git a/app-text/evince/files/40.0-avoid-changing-soname.patch b/app-text/evince/files/40.0-avoid-changing-soname.patch new file mode 100644 index 00000000000..6742d967b10 --- /dev/null +++ b/app-text/evince/files/40.0-avoid-changing-soname.patch @@ -0,0 +1,66 @@ +From ca4b7aaff690095971de96370317fdf1bcd3af8f Mon Sep 17 00:00:00 2001 +From: Kalev Lember <[email protected]> +Date: Fri, 26 Mar 2021 14:48:51 +0100 +Subject: [PATCH] Avoid changing soname + +Bumping the major version to 40 in commit +288be740b5bbb59757db5038ab435ceb7a334dcf inadvertently changed the +soname for shared libevdocument and libevview. + +Fix this by making the soname calculation independent from the project +version as the library ABI hasn't actually changed. +--- + libdocument/meson.build | 2 +- + libview/meson.build | 2 +- + meson.build | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libdocument/meson.build b/libdocument/meson.build +index 74fe2fb1..e09de7fc 100644 +--- a/libdocument/meson.build ++++ b/libdocument/meson.build +@@ -138,7 +138,7 @@ cflags = [ + ] + + libevdocument = shared_library( +- 'evdocument' + ev_major_version.to_string(), ++ 'evdocument3', + version: ev_document_version, + sources: sources + enum_sources + [version_header], + include_directories: top_inc, +diff --git a/libview/meson.build b/libview/meson.build +index 20179aff..74c86d51 100644 +--- a/libview/meson.build ++++ b/libview/meson.build +@@ -82,7 +82,7 @@ if enable_multimedia + endif + + libevview = shared_library( +- 'evview' + ev_major_version.to_string(), ++ 'evview3', + version: ev_view_version, + sources: sources + marshal_sources + enum_sources, + include_directories: top_inc, +diff --git a/meson.build b/meson.build +index 1ed37e96..cafb9023 100644 +--- a/meson.build ++++ b/meson.build +@@ -43,13 +43,13 @@ ev_document_version = '@0@.@1@.@2@'.format(ev_document_current, ev_document_revi + ev_document_current_minus_age = ev_document_current - ev_document_age + + # Libtool version of the view library +-ev_view_current = ev_major_version ++ev_view_current = 3 + ev_view_revision = 0 + ev_view_age = 0 + ev_view_version = '@0@.@1@.@2@'.format(ev_view_current, ev_view_revision, ev_view_age) + ev_view_current_minus_age = ev_view_current - ev_view_age + +-ev_api_version = '@[email protected]'.format(ev_major_version) ++ev_api_version = '3.0' + + ev_include_subdir = join_paths(ev_name, ev_api_version) + +-- +GitLab + diff --git a/app-text/evince/files/40.0-internal-synctex.patch b/app-text/evince/files/40.0-internal-synctex.patch new file mode 100644 index 00000000000..8c45548c639 --- /dev/null +++ b/app-text/evince/files/40.0-internal-synctex.patch @@ -0,0 +1,28 @@ +From ce976d98317535d17d8aabd67729918a94b24cea Mon Sep 17 00:00:00 2001 +From: Matt Turner <[email protected]> +Date: Mon, 12 Apr 2021 23:07:50 -0400 +Subject: [PATCH] build: always use internal synctex instead of automagically + +We don't have a separate synctex package and would have to pull in +all of texlive-core; so instead of fixing the automagic use of it, +just remove support for external synctex, as that's easier. +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index abee124d..63c5040c 100644 +--- a/meson.build ++++ b/meson.build +@@ -251,7 +251,7 @@ config_h.set('HAVE_DESKTOP_SCHEMAS', gsettings_desktop_schemas_dep.found()) + + # *** libsynctex *** + synctex_dep = dependency('synctex', version: '>= 1.19', required: false) +-external_synctex = synctex_dep.found() ++external_synctex = false + + # *** Mime types list *** + mime_types_list = { +-- +2.26.3 +
