Hello community,
here is the log from the commit of package midori for openSUSE:Factory checked
in at 2017-04-28 09:14:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/midori (Old)
and /work/SRC/openSUSE:Factory/.midori.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "midori"
Fri Apr 28 09:14:24 2017 rev:46 rq:491439 version:0.5.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/midori/midori.changes 2015-09-08
18:04:52.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.midori.new/midori.changes 2017-04-28
09:14:25.248627436 +0200
@@ -1,0 +2,5 @@
+Wed Apr 26 22:35:07 UTC 2017 - lazy.k...@opensuse.org
+
+- Add midori-fix-vala_0.35.patch: fix build with vala 0.35+.
+
+-------------------------------------------------------------------
New:
----
midori-fix-vala_0.35.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ midori.spec ++++++
--- /var/tmp/diff_new_pack.0pIlFK/_old 2017-04-28 09:14:26.704422142 +0200
+++ /var/tmp/diff_new_pack.0pIlFK/_new 2017-04-28 09:14:26.712421015 +0200
@@ -1,7 +1,7 @@
#
# spec file for package midori
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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,8 @@
Source1: %{name}.1
Source99: baselibs.conf
Patch0: midori-fix-plugins.diff
+# PATCH-FIX-UPSTREAM midori-fix-vala_0.35.patch lazy.k...@opensuse.org -- fix
build with vala 0.35
+Patch1: midori-fix-vala_0.35.patch
%if 0%{?with_granite}
BuildRequires: pkgconfig(granite)
BuildRequires: pkgconfig(gtk+-3.0)
@@ -99,9 +101,9 @@
%package branding-upstream
Summary: Upstream Branding of Midori
-Group: Productivity/Networking/Web/Browsers
# BRAND: config: Controls default browser settings such as the homepage.
# BRAND: search: Controls the default search engines.
+Group: Productivity/Networking/Web/Browsers
Supplements: packageand(%{name}:branding-upstream)
Provides: %{name}-branding = %{version}
BuildArch: noarch
@@ -116,6 +118,10 @@
%setup -q
%patch0 -p1
+%if 0%{?suse_version} > 1320
+%patch1 -p1
+%endif
+
# 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-fix-vala_0.35.patch ++++++
Index: midori-0.5.11/extensions/transfers.vala
===================================================================
--- midori-0.5.11.orig/extensions/transfers.vala
+++ midori-0.5.11/extensions/transfers.vala
@@ -275,7 +275,7 @@ namespace Transfers {
Transfer found;
store.get (iter, 0, out found);
if (transfer == found) {
- store.remove (iter);
+ store.remove (ref iter);
break;
}
} while (store.iter_next (ref iter));
@@ -455,7 +455,7 @@ namespace Transfers {
if (notifications.length () == 1)
msg = _("The file '<b>%s</b>' has been
downloaded.").printf (filename);
else
- msg = _("'<b>%s</b>' and %d other files have been
downloaded.").printf (filename, notifications.length ());
+ msg = _("'<b>%s</b>' and %d other files have been
downloaded.").printf (filename, (int) notifications.length ());
get_app ().send_notification (_("Transfer completed"), msg);
notifications = new GLib.List<string> ();
}
Index: midori-0.5.11/midori/midori-notebook.vala
===================================================================
--- midori-0.5.11.orig/midori/midori-notebook.vala
+++ midori-0.5.11/midori/midori-notebook.vala
@@ -10,7 +10,7 @@
*/
namespace Midori {
- protected class Tally : Gtk.EventBox {
+ internal class Tally : Gtk.EventBox {
public Midori.Tab tab { get; set; }
Gtk.Spinner spinner;
public Gtk.Label label;
@@ -22,7 +22,7 @@ namespace Midori {
public bool close_button_left { get; set; default = false; }
public bool close_button_visible { get; set; default = false; }
- protected Tally (Midori.Tab tab) {
+ internal Tally (Midori.Tab tab) {
this.tab = tab;
box = new Gtk.HBox (false, 1);
add (box);
@@ -155,7 +155,7 @@ namespace Midori {
int last_tab_size = 0;
#if !HAVE_GTK3
- static const string style_fixup = """
+ const string style_fixup = """
style "midori-close-button-style"
{
GtkWidget::focus-padding = 0
Index: midori-0.5.11/extensions/apps.vala
===================================================================
--- midori-0.5.11.orig/extensions/apps.vala
+++ midori-0.5.11/extensions/apps.vala
@@ -265,7 +265,7 @@ namespace Apps {
store.get (iter, 0, out launcher);
try {
launcher.file.trash (null);
- store.remove (iter);
+ store.remove (ref iter);
string filename =
Midori.Download.clean_filename (launcher.name);
#if HAVE_WIN32
Index: midori-0.5.11/extensions/history-list.vala
===================================================================
--- midori-0.5.11.orig/extensions/history-list.vala
+++ midori-0.5.11/extensions/history-list.vala
@@ -223,7 +223,7 @@ namespace HistoryList {
FixMe: the retrun value of `Gtk.ListStore.remove` should
be checked
Note: in some cases the return value of
`Gtk.ListStore.remove` is wrong
*/
- model.remove (iter);
+ model.remove (ref iter);
this.browser.close_tab (view);
if (length > 2)
this.resize_treeview ();
Index: midori-0.5.11/extensions/notes.vala
===================================================================
--- midori-0.5.11.orig/extensions/notes.vala
+++ midori-0.5.11/extensions/notes.vala
@@ -116,7 +116,7 @@ namespace ClipNotes {
if (current_note == note) {
current_note = null;
}
- notes_list_store.remove (iter);
+ notes_list_store.remove (ref iter);
break;
}
} while (notes_list_store.iter_next (ref iter));
Index: midori-0.5.11/extensions/adblock/widgets.vala
===================================================================
--- midori-0.5.11.orig/extensions/adblock/widgets.vala
+++ midori-0.5.11/extensions/adblock/widgets.vala
@@ -227,7 +227,7 @@ namespace Adblock {
liststore.get (iter, 0, out sub);
if (sub.mutable) {
config.remove (sub);
- liststore.remove (iter);
+ liststore.remove (ref iter);
return true;
}
}
