Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/evince.git#a0329b6d354eda19c97161b18e8a2f5ca06500aa
This commit is contained in:
DistroBaker 2021-03-28 20:10:33 +00:00
parent 2f19f96e78
commit 14f0072b9e
4 changed files with 28 additions and 65 deletions

2
.gitignore vendored
View File

@ -96,3 +96,5 @@ evince-3.0.0.tar.bz2
/evince-3.38.0.tar.xz
/evince-3.39.1.tar.xz
/evince-3.39.2.tar.xz
/evince-40.0.tar.xz
/evince-40.1.tar.xz

View File

@ -1,39 +0,0 @@
From e56653558be1cb8ab2411437bd411f5c1812d0aa Mon Sep 17 00:00:00 2001
From: Marek Kasik <mkasik@redhat.com>
Date: Wed, 3 Mar 2021 17:15:58 +0100
Subject: [PATCH] window: Set page cache size with correct type
ev_view_set_page_cache_size() accepts gsize as its second parameter
but guint was passed in. This reduced maximal cache size considerably
as its size is 4 bytes.
Retyping the multiplication by "1024 * 1024" to gsize increases maximal
configurable cache size beyond 4 GiB.
---
shell/ev-window.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/shell/ev-window.c b/shell/ev-window.c
index ba282e18..077d577d 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -1554,7 +1554,7 @@ page_cache_size_changed (GSettings *settings,
page_cache_mb = g_settings_get_uint (settings, GS_PAGE_CACHE_SIZE);
ev_view_set_page_cache_size (EV_VIEW (priv->view),
- page_cache_mb * 1024 * 1024);
+ (gsize) page_cache_mb * 1024 * 1024);
}
static void
@@ -7636,7 +7636,7 @@ ev_window_init (EvWindow *ev_window)
page_cache_mb = g_settings_get_uint (ev_window_ensure_settings (ev_window),
GS_PAGE_CACHE_SIZE);
ev_view_set_page_cache_size (EV_VIEW (priv->view),
- page_cache_mb * 1024 * 1024);
+ (gsize) page_cache_mb * 1024 * 1024);
allow_links_change_zoom = g_settings_get_boolean (ev_window_ensure_settings (ev_window),
GS_ALLOW_LINKS_CHANGE_ZOOM);
ev_view_set_allow_links_change_zoom (EV_VIEW (priv->view),
--
2.30.1

View File

@ -1,36 +1,32 @@
%global poppler_version 0.33.0
%global glib2_version 2.44.0
%global gtk3_version 3.22.0
%global gxps_version 0.2.1
%global synctex_version 1.19
# Exclude private libraries from autogenerated provides and requires
%global __provides_exclude_from ^%{_libdir}/evince/
%global __requires_exclude ^(%%(find %{buildroot}%{_libdir}/evince/ -name '*.so' | xargs -n1 basename | sort -u | paste -s -d '|' -))
Name: evince
Version: 3.39.2
Release: 2%{?dist}
Version: 40.1
Release: 1%{?dist}
Summary: Document viewer
License: GPLv2+ and GPLv3+ and LGPLv2+ and MIT and Afmparse
URL: https://wiki.gnome.org/Apps/Evince
Source0: https://download.gnome.org/sources/%{name}/3.39/%{name}-%{version}.tar.xz
Patch0: 0001-window-Set-page-cache-size-with-correct-type.patch
Source0: https://download.gnome.org/sources/%{name}/40/%{name}-%{version}.tar.xz
BuildRequires: gcc-c++
BuildRequires: gcc
BuildRequires: gettext-devel
BuildRequires: pkgconfig(adwaita-icon-theme)
BuildRequires: pkgconfig(gio-unix-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(gio-unix-2.0)
BuildRequires: pkgconfig(gnome-desktop-3.0)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gstreamer-1.0)
BuildRequires: pkgconfig(gstreamer-base-1.0)
BuildRequires: pkgconfig(gstreamer-video-1.0)
BuildRequires: pkgconfig(gtk+-x11-3.0) >= %{gtk3_version}
BuildRequires: pkgconfig(gtk+-x11-3.0)
BuildRequires: pkgconfig(libhandy-1)
BuildRequires: pkgconfig(libsecret-1)
BuildRequires: pkgconfig(libspectre)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(poppler-glib) >= %{poppler_version}
BuildRequires: pkgconfig(poppler-glib)
BuildRequires: pkgconfig(libarchive)
BuildRequires: pkgconfig(gspell-1)
BuildRequires: libtiff-devel
@ -40,7 +36,7 @@ BuildRequires: /usr/bin/desktop-file-validate
BuildRequires: libappstream-glib-devel
BuildRequires: meson
%if ! 0%{?flatpak}
BuildRequires: pkgconfig(synctex) >= %{synctex_version}
BuildRequires: pkgconfig(synctex)
# for the nautilus properties page
BuildRequires: pkgconfig(libnautilus-extension)
# for the dvi backend
@ -51,15 +47,10 @@ BuildRequires: texlive-lib-devel
BuildRequires: djvulibre-devel
%endif
# for the xps backend
BuildRequires: pkgconfig(libgxps) >= %{gxps_version}
BuildRequires: pkgconfig(libgxps)
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: %{name}-thumbnailer%{?_isa} = %{version}-%{release}
Requires: glib2%{?_isa} >= %{glib2_version}
Requires: gtk3%{?_isa} >= %{gtk3_version}
# Removed in F29
Obsoletes: evince-browser-plugin < 3.30.0
%description
Evince is simple multi-page document viewer. It can display and print
@ -166,14 +157,12 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/org.gn
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Evince.desktop
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Evince-previewer.desktop
%ldconfig_scriptlets libs
%files -f evince.lang
%{_bindir}/evince
%{_bindir}/evince-previewer
%{_datadir}/%{name}/
%{_datadir}/applications/org.gnome.Evince.desktop
%{_datadir}/applications/org.gnome.Evince-previewer.desktop
%{_datadir}/evince/
%{_datadir}/icons/hicolor/*/apps/org.gnome.Evince.*
%{_datadir}/icons/hicolor/*/apps/org.gnome.Evince-symbolic.svg
%{_mandir}/man1/evince.1*
@ -190,8 +179,8 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Evince-p
%files libs
%doc NEWS AUTHORS
%license COPYING
%{_libdir}/libevview3.so.*
%{_libdir}/libevdocument3.so.*
%{_libdir}/libevdocument3.so.4*
%{_libdir}/libevview3.so.3*
%dir %{_libdir}/evince
%dir %{_libdir}/evince/4
%dir %{_libdir}/evince/4/backends
@ -258,6 +247,17 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Evince-p
%{_mandir}/man1/evince-thumbnailer.1*
%changelog
* Fri Mar 26 2021 Kalev Lember <klember@redhat.com> - 40.1-1
- Update to 40.1
- Remove various minimum version requires
- Remove old obsoletes
- Don't use ldconfig_scriptlets
- Filter private library provides
* Fri Mar 26 2021 Kalev Lember <klember@redhat.com> - 40.0-1
- Update to 40.0
- Tighten soname globs
* Wed Mar 03 2021 Marek Kasik <mkasik@redhat.com> - 3.39.2-2
- Set page cache size with correct type
- Resolves: #1458845

View File

@ -1 +1 @@
SHA512 (evince-3.39.2.tar.xz) = 978322943d53a8b6687e0823b5f87d6d3bc706931eecf677a78a1ef0919ecc3ee67485eb3d829f993b2560ffa41253bc63514bed390ce36686feabab97f1262e
SHA512 (evince-40.1.tar.xz) = c688ee962cfff8b024b572161bae689d25b5b566ac623abeff38b4b8e6e541ce343023ed2c1ba0df1f65d6ec9a631aac3a748c940db556dbb89ab45ac565147d