From 54ec8bfbf0a52f65555b220bd17b4d92d1cfff62 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Wed, 1 Aug 2018 13:50:20 +0200 Subject: [PATCH] Update to 3.29.90 Remove unneeded patches Handle renamed evince* files Don't list missing README --- .gitignore | 1 + 0001-Resolves-rhbz-1358249-page-up-down.patch | 18 ------ ...-Bump-poppler-requirements-to-0.33.0.patch | 55 ------------------- evince-3.28.2-media-player-keys.patch | 43 --------------- evince.spec | 33 ++++++----- sources | 2 +- 6 files changed, 20 insertions(+), 132 deletions(-) delete mode 100644 0001-Resolves-rhbz-1358249-page-up-down.patch delete mode 100644 0001-Revert-Bump-poppler-requirements-to-0.33.0.patch delete mode 100644 evince-3.28.2-media-player-keys.patch diff --git a/.gitignore b/.gitignore index 4d38e10..0ddc497 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,4 @@ evince-3.0.0.tar.bz2 /evince-3.28.0.tar.xz /evince-3.28.1.tar.xz /evince-3.28.2.tar.xz +/evince-3.29.90.tar.xz diff --git a/0001-Resolves-rhbz-1358249-page-up-down.patch b/0001-Resolves-rhbz-1358249-page-up-down.patch deleted file mode 100644 index 30a52f4..0000000 --- a/0001-Resolves-rhbz-1358249-page-up-down.patch +++ /dev/null @@ -1,18 +0,0 @@ -@@ -, +, @@ ---- - shell/ev-application.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) ---- a/shell/ev-application.c -+++ a/shell/ev-application.c -@@ -1044,8 +1044,8 @@ ev_application_startup (GApplication *gapplication) - "win.select-page", "L", NULL, - "win.go-backwards", "Page_Up", NULL, - "win.go-forward", "Page_Down", NULL, -- "win.go-next-page", "n", NULL, -- "win.go-previous-page", "p", NULL, -+ "win.go-next-page", "n", "Page_Down", NULL, -+ "win.go-previous-page", "p", "Page_Up", NULL, - "win.go-back-history", "P", "Back", NULL, - "win.go-forward-history", "N", "Forward", NULL, - "win.sizing-mode::fit-page", "f", NULL, --- diff --git a/0001-Revert-Bump-poppler-requirements-to-0.33.0.patch b/0001-Revert-Bump-poppler-requirements-to-0.33.0.patch deleted file mode 100644 index 58c10af..0000000 --- a/0001-Revert-Bump-poppler-requirements-to-0.33.0.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 22b047c3db84a34fc5fb5076474640bcd3917c73 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Fri, 17 Feb 2017 09:28:18 +0000 -Subject: [PATCH] Revert "Bump poppler requirements to 0.33.0" - -This reverts commit 5a4912bdbbf3c8000e77a093cf366276eeb56283. ---- - backend/pdf/ev-poppler.cc | 4 ++++ - configure.ac | 7 ++++++- - 2 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc -index 214094f..f3a6510 100644 ---- a/backend/pdf/ev-poppler.cc -+++ b/backend/pdf/ev-poppler.cc -@@ -3508,7 +3508,11 @@ pdf_document_annotations_save_annotation (EvDocumentAnnotations *document_annota - poppler_rect.y2 = height - ev_rect.y1; - - if (poppler_annot_markup_has_popup (markup)) -+#ifdef HAVE_POPPLER_ANNOT_MARKUP_SET_POPUP_RECTANGLE - poppler_annot_markup_set_popup_rectangle (markup, &poppler_rect); -+#else -+ poppler_annot_markup_set_popup (markup, &poppler_rect); -+#endif - else - poppler_annot_markup_set_popup (markup, &poppler_rect); - } -diff --git a/configure.ac b/configure.ac -index 23a390f..a01392a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -536,7 +536,7 @@ AC_ARG_ENABLE([pdf], - [enable_pdf=yes]) - - if test "x$enable_pdf" = "xyes"; then -- POPPLER_REQUIRED=0.33.0 -+ POPPLER_REQUIRED=0.24.0 - PKG_CHECK_MODULES(POPPLER, poppler-glib >= $POPPLER_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED,enable_pdf=yes,enable_pdf=no) - - if test "x$enable_pdf" = "xyes"; then -@@ -549,6 +549,11 @@ if test "x$enable_pdf" = "xyes"; then - if test x$enable_cairo_ps = xyes; then - AC_DEFINE([HAVE_CAIRO_PS], [1], [defined if cairo-ps is available]) - fi -+ -+ evince_save_LIBS=$LIBS -+ LIBS="$LIBS $POPPLER_LIBS" -+ AC_CHECK_FUNCS(poppler_annot_markup_set_popup_rectangle) -+ LIBS=$evince_save_LIBS - else - AC_MSG_ERROR("PDF support is disabled since poppler-glib library version $POPPLER_REQUIRED or newer not found") - fi --- -2.9.3 - diff --git a/evince-3.28.2-media-player-keys.patch b/evince-3.28.2-media-player-keys.patch deleted file mode 100644 index 5a7148e..0000000 --- a/evince-3.28.2-media-player-keys.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/shell/ev-media-player-keys.c b/shell/ev-media-player-keys.c -index a0075edc..63a1344c 100644 ---- a/shell/ev-media-player-keys.c -+++ b/shell/ev-media-player-keys.c -@@ -41,8 +41,9 @@ struct _EvMediaPlayerKeys - { - GObject parent; - -- GDBusProxy *proxy; -- gboolean has_name_owner; -+ GDBusProxy *proxy; -+ gboolean has_name_owner; -+ GCancellable *service_appearance_cancellable; - }; - - struct _EvMediaPlayerKeysClass -@@ -187,13 +188,15 @@ mediakeys_service_appeared_cb (GObject *source_object, - static void - ev_media_player_keys_init (EvMediaPlayerKeys *keys) - { -+ keys->service_appearance_cancellable = g_cancellable_new (); -+ - g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION, - G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, - NULL, - SD_NAME, - SD_OBJECT_PATH, - SD_INTERFACE, -- NULL, -+ keys->service_appearance_cancellable, - mediakeys_service_appeared_cb, - keys); - } -@@ -212,6 +215,9 @@ ev_media_player_keys_finalize (GObject *object) - { - EvMediaPlayerKeys *keys = EV_MEDIA_PLAYER_KEYS (object); - -+ g_cancellable_cancel (keys->service_appearance_cancellable); -+ g_object_unref (keys->service_appearance_cancellable); -+ - if (keys->proxy != NULL) { - ev_media_player_keys_release_keys (keys); - g_object_unref (keys->proxy); diff --git a/evince.spec b/evince.spec index a085386..2689ba1 100644 --- a/evince.spec +++ b/evince.spec @@ -4,8 +4,8 @@ %global gxps_version 0.2.1 Name: evince -Version: 3.28.2 -Release: 4%{?dist} +Version: 3.29.90 +Release: 1%{?dist} Summary: Document viewer License: GPLv2+ and GPLv3+ and LGPLv2+ and MIT and Afmparse @@ -15,10 +15,6 @@ Source0: https://download.gnome.org/sources/%{name}/3.28/%{name}-%{versio Patch0: evince-3.21.4-NPNVToolKit.patch # https://bugzilla.gnome.org/show_bug.cgi?id=766749 Patch3: 0001-Resolves-deb-762530-rhbz-1061177-add-man-pages.patch -Patch4: 0001-Resolves-rhbz-1358249-page-up-down.patch -Patch6: 0001-Revert-Bump-poppler-requirements-to-0.33.0.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1359507 -Patch7: evince-3.28.2-media-player-keys.patch BuildRequires: gcc-c++ BuildRequires: gcc @@ -152,7 +148,7 @@ make %{?_smp_mflags} V=1 LIBTOOL=/usr/bin/libtool # # See http://people.freedesktop.org/~hughsient/appdata/#screenshots for more details. # -appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/metainfo/evince.appdata.xml \ +appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/metainfo/org.gnome.Evince.appdata.xml \ https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/evince/a.png %find_lang evince --with-gnome @@ -169,28 +165,29 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a %check -desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/evince.desktop +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}/* %{_datadir}/%{name}/ -%{_datadir}/applications/%{name}.desktop -%{_datadir}/applications/evince-previewer.desktop -%{_datadir}/icons/hicolor/*/apps/evince.* -%{_datadir}/icons/hicolor/*/apps/evince-symbolic.svg +%{_datadir}/applications/org.gnome.Evince.desktop +%{_datadir}/applications/org.gnome.Evince-previewer.desktop +%{_datadir}/icons/hicolor/*/apps/org.gnome.Evince.* +%{_datadir}/icons/hicolor/*/apps/org.gnome.Evince-symbolic.svg %{_mandir}/man1/*.1* %{_libexecdir}/evinced %{_datadir}/dbus-1/services/org.gnome.evince.Daemon.service %{_datadir}/glib-2.0/schemas/org.gnome.Evince.gschema.xml %{_datadir}/GConf/gsettings/evince.convert -%{_datadir}/metainfo/evince.appdata.xml +%{_datadir}/metainfo/org.gnome.Evince.appdata.xml %{_datadir}/thumbnailers/evince.thumbnailer -%{_userunitdir}/evince.service +%{_userunitdir}/org.gnome.Evince.service %files libs -%doc README NEWS AUTHORS +%doc NEWS AUTHORS %license COPYING %{_libdir}/libevview3.so.* %{_libdir}/libevdocument3.so.* @@ -254,6 +251,12 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/evince.desktop %{_libdir}/mozilla/plugins/libevbrowserplugin.so %changelog +* Wed Aug 1 2018 Marek Kasik - 3.29.90-1 +- Update to 3.29.90 +- Remove unneeded patches +- Handle renamed evince* files +- Don't list missing README + * Fri Jul 13 2018 Fedora Release Engineering - 3.28.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 798e8a5..660215b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evince-3.28.2.tar.xz) = 6deeefc5ed52d79627ae892b227bcf023c6ea45ac02c6a3a7c9fa1004f5da2e36051bfea73f6838cb8f9aed8cadfd145173a5d3b2be405f1d1f06bd4fdadae23 +SHA512 (evince-3.29.90.tar.xz) = e96869586bf23987a2634c7637ad620b325fb43dfe381dd2e751066bcfc807d6e7d456c61add727531013c22b1cdf2832468ba5b18daff59e3377782a948d4f3