Hello community, here is the log from the commit of package xnoise for openSUSE:Factory checked in at 2017-04-11 09:39:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xnoise (Old) and /work/SRC/openSUSE:Factory/.xnoise.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xnoise" Tue Apr 11 09:39:04 2017 rev:5 rq:484275 version:0.2.21 Changes: -------- --- /work/SRC/openSUSE:Factory/xnoise/xnoise.changes 2016-07-07 15:10:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xnoise.new/xnoise.changes 2017-04-11 09:39:06.128453158 +0200 @@ -1,0 +2,5 @@ +Fri Mar 31 23:07:22 UTC 2017 - [email protected] + +- Update xnoise-compilation-fix.patch for Vala 0.36. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xnoise.spec ++++++ --- /var/tmp/diff_new_pack.5SZaRC/_old 2017-04-11 09:39:07.000329993 +0200 +++ /var/tmp/diff_new_pack.5SZaRC/_new 2017-04-11 09:39:07.004329428 +0200 @@ -1,7 +1,7 @@ # # spec file for package xnoise # -# Copyright (c) 2016 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 @@ -21,13 +21,13 @@ Name: xnoise Version: 0.2.21 Release: 0 -Summary: Feature-rich Amarok-like media player in Gtk+ with a smooth GUI +Summary: Feature-rich Amarok-like media player in GTK+ with a smooth GUI License: SUSE-GPL-2.0-with-linking-exception Group: Productivity/Multimedia/Sound/Players Url: https://bitbucket.org/shuerhaaken/xnoise Source: https://bitbucket.org/shuerhaaken/%{name}/downloads/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM xnoise-compilation-fix.patch [email protected] -- Fix Vala compilation and 64bit portability issue. -Patch0: %{name}-compilation-fix.patch +# PATCH-FIX-UPSTREAM xnoise-compilation-fix.patch [email protected] -- Fix Vala compilation and a 64bit portability issue. +Patch0: xnoise-compilation-fix.patch # PATCH-FIX-UPSTREAM xnoise-ListStore.patch [email protected] -- error: `ListStore' is an ambiguous reference between `GLib.ListStore' and `Gtk.ListStore' Patch1: xnoise-ListStore.patch BuildRequires: autoconf @@ -37,6 +37,7 @@ BuildRequires: hicolor-icon-theme BuildRequires: intltool BuildRequires: libtool +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: vala BuildRequires: pkgconfig(cairo) @@ -105,16 +106,16 @@ %build autoreconf -fi %configure --disable-static -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install %make_install -rm -f %{buildroot}%{_libdir}/%{_libname}.la +find %{buildroot} -type f -name "*.la" -delete -print %find_lang %{name} %{?no_lang_C} %fdupes %{buildroot}%{_datadir}/%{name}/ %check -make check %{?_smp_mflags} +make check %{?_smp_mflags} V=1 %post %desktop_database_post ++++++ xnoise-compilation-fix.patch ++++++ --- /var/tmp/diff_new_pack.5SZaRC/_old 2017-04-11 09:39:07.028326038 +0200 +++ /var/tmp/diff_new_pack.5SZaRC/_new 2017-04-11 09:39:07.028326038 +0200 @@ -1,7 +1,6 @@ -diff -ur a/libxnoise/BackgroundWorker/xnoise-worker.vala b/libxnoise/BackgroundWorker/xnoise-worker.vala --- a/libxnoise/BackgroundWorker/xnoise-worker.vala +++ b/libxnoise/BackgroundWorker/xnoise-worker.vala -@@ -65,7 +65,7 @@ +@@ -65,7 +65,7 @@ public class Xnoise.Worker : Object { public bool is_same_thread() { @@ -10,10 +9,23 @@ } public enum Priority { -diff -ur a/libxnoise/Parameter/xnoise-parameter.vala b/libxnoise/Parameter/xnoise-parameter.vala +--- a/libxnoise/ExtraWidgets/xnoise-tree-media-selector.vala ++++ b/libxnoise/ExtraWidgets/xnoise-tree-media-selector.vala +@@ -404,7 +404,11 @@ private class Xnoise.TreeMediaSelector : + Value v; + this.store.get_value(iter, Column.NAME, out v); + if(v.get_string() == name) { ++#if VALA_0_36 ++ this.store.remove(ref iter); ++#else + this.store.remove(iter); ++#endif + return true; + } + return false; --- a/libxnoise/Parameter/xnoise-parameter.vala +++ b/libxnoise/Parameter/xnoise-parameter.vala -@@ -37,7 +37,7 @@ +@@ -37,7 +37,7 @@ public class Xnoise.Params : GLib.Object private static const string settings_int = "settings_int"; private static const string settings_double = "settings_double"; private static const string settings_string = "settings_string"; @@ -22,7 +34,7 @@ private static HashTable<string,double?> ht_double; private static HashTable<string,string> ht_string; private static bool inited = false; -@@ -50,7 +50,7 @@ +@@ -50,7 +50,7 @@ public class Xnoise.Params : GLib.Object if(inited == true) return; IParams_implementers = new GLib.List<IParams>(); @@ -31,7 +43,7 @@ ht_double = new GLib.HashTable<string,double?>(str_hash, str_equal); ht_string = new GLib.HashTable<string,string>(str_hash, str_equal); read_all_parameters_from_file(); -@@ -133,16 +133,16 @@ +@@ -133,16 +133,16 @@ public class Xnoise.Params : GLib.Object // GETTERS FOR THE HASH TABLE //Type bool public static bool get_bool_value(string key) { @@ -52,10 +64,55 @@ return val; else return 0; -diff -ur a/libxnoise/Utils/xnoise-utilities.vala b/libxnoise/Utils/xnoise-utilities.vala +--- a/libxnoise/TrackList/xnoise-tracklist.vala ++++ b/libxnoise/TrackList/xnoise-tracklist.vala +@@ -1101,7 +1101,11 @@ public class Xnoise.TrackList : TreeView + removed_playing_title = true; + global.position_reference = null; + } ++#if VALA_0_36 ++ this.tracklistmodel.remove(ref it); ++#else + this.tracklistmodel.remove(it); ++#endif + } + TreeIter iter; + if(path_2.prev() && removed_playing_title) { +@@ -1131,7 +1135,11 @@ public class Xnoise.TrackList : TreeView + global.position_reference = null; + //global.reset_position_reference(); // set to null without *_changed signal + } ++#if VALA_0_36 ++ tracklistmodel.remove(ref iter); ++#else + tracklistmodel.remove(iter); ++#endif + } + if(path_2.prev() && removed_playing_title) { + tracklistmodel.get_iter(out iter, path_2); --- a/libxnoise/Utils/xnoise-utilities.vala +++ b/libxnoise/Utils/xnoise-utilities.vala -@@ -253,7 +253,8 @@ +@@ -95,8 +95,7 @@ namespace Xnoise.Utilities { + print("Failed to get xnoise directories! \n"); + var msg = new Gtk.MessageDialog(null, Gtk.DialogFlags.MODAL, Gtk.MessageType.ERROR, + Gtk.ButtonsType.OK, +- "Failed to get xnoise directories! \n", +- null); ++ "Failed to get xnoise directories! \n"); + msg.run(); + return false; + } +@@ -131,8 +130,7 @@ namespace Xnoise.Utilities { + print("Failed to get xnoise directories! \n"); + var msg = new Gtk.MessageDialog(null, Gtk.DialogFlags.MODAL, Gtk.MessageType.ERROR, + Gtk.ButtonsType.OK, +- "Failed to get xnoise directories! \n", +- null); ++ "Failed to get xnoise directories! \n"); + msg.run(); + return false; + } +@@ -253,7 +251,8 @@ namespace Xnoise.Utilities { try { GLib.Regex r = new GLib.Regex("\n"); @@ -65,7 +122,7 @@ } catch(GLib.RegexError e) { print("%s\n", e.message); -@@ -312,7 +313,8 @@ +@@ -312,7 +311,8 @@ namespace Xnoise.Utilities { public static string replace_underline_with_blank_encoded(string value) { try { GLib.Regex r = new GLib.Regex("_");
