Hello community, here is the log from the commit of package midori for openSUSE:Factory checked in at 2015-04-10 09:51:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/midori (Old) and /work/SRC/openSUSE:Factory/.midori.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "midori" Changes: -------- --- /work/SRC/openSUSE:Factory/midori/midori.changes 2014-11-24 11:09:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.midori.new/midori.changes 2015-04-10 09:52:00.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 7 13:11:03 UTC 2015 - dimstar@opensuse.org + +- Add midori-ListStore.patch: Fix "`ListStore' is an ambiguous + reference between `GLib.ListStore' and `Gtk.ListStore'". + +------------------------------------------------------------------- New: ---- midori-ListStore.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ midori.spec ++++++ --- /var/tmp/diff_new_pack.9i0wCL/_old 2015-04-10 09:52:01.000000000 +0200 +++ /var/tmp/diff_new_pack.9i0wCL/_new 2015-04-10 09:52:01.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package midori # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,7 @@ Source1: %{name}.1 Source99: baselibs.conf Patch0: midori-fix-plugins.diff +Patch1: midori-ListStore.patch BuildRequires: cmake BuildRequires: docutils BuildRequires: fdupes @@ -106,6 +107,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 # remove parts that do not conform to the desktop file spec for desktop in data/midori.desktop.in data/midori-private.desktop.in; do awk ' ++++++ midori-ListStore.patch ++++++ Index: midori-0.5.9/extensions/history-list.vala =================================================================== --- midori-0.5.9.orig/extensions/history-list.vala +++ midori-0.5.9/extensions/history-list.vala @@ -319,7 +319,7 @@ namespace HistoryList { } private void create_widgets () { - ListStore model; + Gtk.ListStore model; TreeIter iter; TreeIter? active_iter = null; @@ -331,7 +331,7 @@ namespace HistoryList { var tab_closing_behavior = this.hl_manager.get_integer ("TabClosingBehavior"); - model = new ListStore (2, typeof (string), typeof (int)); + model = new Gtk.ListStore (2, typeof (string), typeof (int)); model.append (out iter); model.set (iter, TabClosingBehaviorModel.TEXT, _("Do nothing"),