Update to 3.21.92

This commit is contained in:
Marek Kasik 2016-09-14 17:42:10 +02:00
parent a887309eb7
commit 5443729259
4 changed files with 14 additions and 26 deletions

1
.gitignore vendored
View File

@ -60,3 +60,4 @@ evince-3.0.0.tar.bz2
/evince-3.20.0.tar.xz
/evince-3.21.3.tar.xz
/evince-3.21.4.tar.xz
/evince-3.21.92.tar.xz

View File

@ -1,21 +1,6 @@
From 5b026932b70c9b9ea5575c395fc7bc2aa0c0b299 Mon Sep 17 00:00:00 2001
From: Marek Kasik <mkasik@redhat.com>
Date: Thu, 12 Mar 2015 11:28:15 +0100
Subject: [PATCH] browser-plugin: Check supported Gtk+ version
Check version of Gtk+ supported by browser in NP_Initialize() and in NPP_New().
Return error if version supported by browser is 1 or 2.
https://bugzilla.gnome.org/show_bug.cgi?id=738270
---
browser-plugin/EvBrowserPluginMain.cpp | 46 +++++++++++++++++++++++++---------
1 file changed, 34 insertions(+), 12 deletions(-)
diff --git a/browser-plugin/EvBrowserPluginMain.cpp b/browser-plugin/EvBrowserPluginMain.cpp
index fb749f4..e529c87 100644
--- a/browser-plugin/EvBrowserPluginMain.cpp
+++ b/browser-plugin/EvBrowserPluginMain.cpp
@@ -34,11 +34,40 @@ static EvBrowserPlugin *pluginForInstance(NPP instance)
--- evince-3.21.92/browser-plugin/EvBrowserPluginMain.cpp
+++ evince-3.21.92/browser-plugin/EvBrowserPluginMain.cpp
@@ -38,11 +38,40 @@ static EvBrowserPlugin *pluginForInstanc
return static_cast<EvBrowserPlugin *>(instance->pdata);
}
@ -56,7 +41,7 @@ index fb749f4..e529c87 100644
return EvBrowserPlugin::create(instance)->initialize(pluginType, mode, argc, argn, argv, savedData);
}
@@ -193,25 +222,18 @@ NPError NP_Initialize(NPNetscapeFuncs *browserFuncs, NPPluginFuncs *pluginFuncs)
@@ -197,6 +226,11 @@ NPError NP_Initialize(NPNetscapeFuncs *b
if ((browserFuncs->version >> 8) > NP_VERSION_MAJOR)
return NPERR_INCOMPATIBLE_VERSION_ERROR;
@ -68,7 +53,9 @@ index fb749f4..e529c87 100644
if (!ev_init())
return NPERR_GENERIC_ERROR;
gtk_init(nullptr, nullptr);
@@ -207,20 +241,8 @@ NPError NP_Initialize(NPNetscapeFuncs *b
return NPERR_GENERIC_ERROR;
#endif
- browser = browserFuncs;
initializePluginFuncs(pluginFuncs);
@ -87,6 +74,3 @@ index fb749f4..e529c87 100644
return NPERR_NO_ERROR;
}
--
2.1.0

View File

@ -4,8 +4,8 @@
%global gxps_version 0.2.1
Name: evince
Version: 3.21.4
Release: 2%{?dist}
Version: 3.21.92
Release: 1%{?dist}
Summary: Document viewer
License: GPLv2+ and GPLv3+ and LGPLv2+ and MIT and Afmparse
@ -262,6 +262,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null ||:
%{_libdir}/mozilla/plugins/libevbrowserplugin.so
%changelog
* Wed Sep 14 2016 Marek Kasik <mkasik@redhat.com> - 3.21.92-1
- Update to 3.21.92
* Mon Aug 15 2016 Marek Kasik <mkasik@redhat.com> - 3.21.4-2
- Check version of NPNVToolkit provided by browser
- Resolves: #1198229

View File

@ -1 +1 @@
a57956bfabb65c26f29263f5b14b9a7a evince-3.21.4.tar.xz
831a1b03a4366f4d22bda0de5dec57cc evince-3.21.92.tar.xz