Hello community, here is the log from the commit of package gramps for openSUSE:Factory checked in at 2014-08-01 14:34:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gramps (Old) and /work/SRC/openSUSE:Factory/.gramps.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gramps" Changes: -------- --- /work/SRC/openSUSE:Factory/gramps/gramps.changes 2014-07-24 07:31:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gramps.new/gramps.changes 2014-08-01 14:34:45.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Jul 28 08:00:38 UTC 2014 - dimstar@opensuse.org + +- Add gramps-webkit3.0.patch: specify in the code that we require + WebKit 3.0, not 'any' WebKit (bnc#887048). +- No longer filter typelib(OsmGpsMap) from automatic dependency + scanner: we now have osm-gps-map 1.0.1 available. + +------------------------------------------------------------------- New: ---- gramps-webkit3.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gramps.spec ++++++ --- /var/tmp/diff_new_pack.vuh6m0/_old 2014-08-01 14:34:46.000000000 +0200 +++ /var/tmp/diff_new_pack.vuh6m0/_new 2014-08-01 14:34:46.000000000 +0200 @@ -17,7 +17,7 @@ # -%global __requires_exclude typelib\\(GtkosxApplication\\)|typelib\\(OsmGpsMap\\)|typelib\\(Gtkspell\\) +%global __requires_exclude typelib\\(GtkosxApplication\\)|typelib\\(Gtkspell\\) Name: gramps Version: 4.0.4 @@ -28,6 +28,8 @@ Group: Productivity/Other Url: http://www.gramps-project.org/ Source: http://downloads.sourceforge.net/project/gramps/Stable/%{version}/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM gramps-webkit3.0.patch dimstar@opensuse.org -- Specify that we need WebKit 3.0 +Patch0: gramps-webkit3.0.patch BuildRequires: fdupes BuildRequires: intltool # Needed for typelib() - Requires. @@ -55,6 +57,7 @@ %lang_package %prep %setup -q +%patch0 -p1 %build python setup.py build ++++++ gramps-webkit3.0.patch ++++++ Index: gramps-4.0.4/gramps/plugins/view/htmlrenderer.gpr.py =================================================================== --- gramps-4.0.4.orig/gramps/plugins/view/htmlrenderer.gpr.py +++ gramps-4.0.4/gramps/plugins/view/htmlrenderer.gpr.py @@ -54,6 +54,8 @@ TOOLKIT = NOWEB repository = Repository.get_default() if repository.enumerate_versions("WebKit"): try: + import gi + gi.require_version("WebKit", "3.0") from gi.repository import WebKit TOOLKIT = WEBKIT except: -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de