Hello community, here is the log from the commit of package noise for openSUSE:Factory checked in at 2017-04-11 09:39:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/noise (Old) and /work/SRC/openSUSE:Factory/.noise.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "noise" Tue Apr 11 09:39:30 2017 rev:3 rq:484326 version:0.4.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/noise/noise.changes 2017-01-22 00:20:36.919537962 +0100 +++ /work/SRC/openSUSE:Factory/.noise.new/noise.changes 2017-04-11 09:39:34.144495526 +0200 @@ -1,0 +2,5 @@ +Sat Apr 1 11:20:11 UTC 2017 - [email protected] + +- Add noise-0.4.0.2-vala-0.36.patch: Fix build with vala >= 0.36. + +------------------------------------------------------------------- @@ -24 +28,0 @@ - New: ---- noise-0.4.0.2-vala-0.36.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ noise.spec ++++++ --- /var/tmp/diff_new_pack.A56Ldf/_old 2017-04-11 09:39:34.724413605 +0200 +++ /var/tmp/diff_new_pack.A56Ldf/_new 2017-04-11 09:39:34.724413605 +0200 @@ -1,7 +1,7 @@ # # spec file for package noise # -# 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 @@ -16,6 +16,7 @@ # +%define _version 0.4.x %define soname noise-core0 Name: noise Version: 0.4.0.2 @@ -24,7 +25,9 @@ License: GPL-3.0 Group: Productivity/Multimedia/Sound/Players Url: https://launchpad.net/noise -Source: https://launchpad.net/noise/0.4.x/%{version}/+download/%{name}-%{version}.tar.xz +Source: https://launchpad.net/noise/%{_version}/%{version}/+download/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM noise-0.4.0.2-vala-0.36.patch -- Fix build with vala >= 0.36. +Patch0: noise-0.4.0.2-vala-0.36.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ @@ -55,12 +58,11 @@ BuildRequires: pkgconfig(zeitgeist-2.0) Requires: libgda-5_0-sqlite Recommends: %{name}-lang -BuildRoot: %{_tmppath}/%{name}-%{version}-build %glib2_gsettings_schema_requires %description -Noise is a GTK3 audio player with a focus on music and libraries. It -handles external devices, CDs, and album art. Noise utilizes Granite +Noise is a GTK+ audio player with a focus on music and libraries. It +handles external devices, CDs, and album art. Noise utilises Granite for a consistent and slick UI. %package -n lib%{soname} @@ -68,8 +70,8 @@ Group: System/GUI/Other %description -n lib%{soname} -Noise is a GTK3 audio player with a focus on music and libraries. It -handles external devices, CDs, and album art. Noise utilizes Granite +Noise is a GTK+ audio player with a focus on music and libraries. It +handles external devices, CDs, and album art. Noise utilises Granite for a consistent and slick UI. %package devel @@ -84,22 +86,22 @@ %prep %setup -q - +%patch0 -p1 sed -i 's/metainfo/appdata/' $(grep -rwl metainfo) %build %cmake \ -DBUILD_PLUGINS=OFF \ -DGSETTINGS_COMPILE=OFF -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install %cmake_install %suse_update_desktop_file org.pantheon.noise -%fdupes %{buildroot}%{_datadir}/locale -%fdupes %{buildroot}%{_datadir}/icons +%fdupes %{buildroot}%{_datadir}/locale/ +%fdupes %{buildroot}%{_datadir}/icons/ %find_lang %{name} @@ -114,6 +116,7 @@ %icon_theme_cache_postun %post -n lib%{soname} -p /sbin/ldconfig + %postun -n lib%{soname} -p /sbin/ldconfig %files @@ -122,10 +125,10 @@ %{_bindir}/%{name} %{_datadir}/%{name}/ %{_datadir}/applications/org.pantheon.noise.desktop +%dir %{_datadir}/appdata/ %{_datadir}/appdata/org.pantheon.noise.appdata.xml %{_datadir}/glib-2.0/schemas/org.pantheon.noise.gschema.xml -%{_datadir}/icons/hicolor/*/apps/*.??g -%dir %{_datadir}/appdata +%{_datadir}/icons/hicolor/*/apps/*.* %files -n lib%{soname} %defattr (-,root,root) @@ -135,7 +138,7 @@ %defattr (-,root,root) %{_libdir}/lib%{name}-core.so %{_libdir}/pkgconfig/%{name}-core.pc -%dir %{_includedir}/%{name}-core +%dir %{_includedir}/%{name}-core/ %{_includedir}/%{name}-core/*.h %{_datadir}/vala/vapi/%{name}-core.* ++++++ noise-0.4.0.2-vala-0.36.patch ++++++ --- a/core/Utils/TimeUtils.vala +++ b/core/Utils/TimeUtils.vala @@ -48,7 +48,7 @@ namespace Noise.TimeUtils { uint seconds = given_seconds - days * 86400 - hours * 3600 - minutes * 60; if (given_seconds < SECONDS_PER_MINUTE) - return ngettext ("%d second", "%d seconds", seconds).printf (seconds); + return ngettext ("%u second", "%u seconds", seconds).printf (seconds); string days_string = "", hours_string = "", minutes_string = "", seconds_string = ""; --- a/plugins/Devices/CDRom/CDRomDevice.vala +++ b/plugins/Devices/CDRom/CDRomDevice.vala @@ -350,7 +350,7 @@ public class Noise.Plugins.CDRomDevice : } private string get_track_status (Media m) { - return _("Importing track %i: %s").printf (m.track, m.get_title_markup ()); + return _("Importing track %u: %s").printf (m.track, m.get_title_markup ()); } public void cancel_transfer() { --- a/src/Dialogs/TransferFromDeviceDialog.vala +++ b/src/Dialogs/TransferFromDeviceDialog.vala @@ -284,7 +284,7 @@ public class Noise.TransferFromDeviceDia mediasModel.foreach(createTransferList); if(libraries_manager.local_library.doing_file_operations()) { - NotificationManager.get_default ().show_alert (_("Cannot Import"), _("Noise is already doing file operations. Please wait until those finish to import from %d").printf( d.getDisplayName())); + NotificationManager.get_default ().show_alert (_("Cannot Import"), _("Noise is already doing file operations. Please wait until those finish to import from %s").printf( d.getDisplayName())); } else { libraries_manager.transfer_to_local_library (to_transfer); this.destroy(); --- a/src/Views/ListView/ColumnBrowser/ColumnBrowser.vala +++ b/src/Views/ListView/ColumnBrowser/ColumnBrowser.vala @@ -399,7 +399,7 @@ public abstract class Noise.ColumnBrowse if (rating < 1) rating_str = _("Unrated"); else - rating_str = ngettext ("%i Star", "%i Stars", rating).printf (rating); + rating_str = ngettext ("%u Star", "%u Stars", rating).printf (rating); column_set.add (rating_str); } --- a/src/Views/ListView/Lists/CellDataFunctionHelper.vala +++ b/src/Views/ListView/Lists/CellDataFunctionHelper.vala @@ -121,7 +121,7 @@ public class Noise.CellDataFunctionHelpe tree_model.get_value(iter, ListColumn.BITRATE, out val); var text_cell = cell as CellRendererText; uint n = val.get_uint (); - text_cell.text = n <= 0 ? NOT_AVAILABLE : _("%i kbps").printf (n); + text_cell.text = n <= 0 ? NOT_AVAILABLE : _("%u kbps").printf (n); } // turns int of seconds into pretty length mm:ss format --- a/src/Widgets/PresetList.vala +++ b/src/Widgets/PresetList.vala @@ -131,7 +131,11 @@ public class Noise.PresetList : Gtk.Comb if(o != null && o is EqualizerPreset && ((EqualizerPreset)o) == last_selected_preset) { if (!((EqualizerPreset)o).is_default) { ncustompresets--; +#if VALA_0_36 + store.remove(ref iter); +#else store.remove(iter); +#endif break; } } @@ -244,7 +248,11 @@ public class Noise.PresetList : Gtk.Comb store.get(iter, 1, out text); if(text != null && text == DELETE_PRESET) { +#if VALA_0_36 + store.remove(ref iter); +#else store.remove(iter); +#endif // Also remove the separator ... remove_separator_item(1); } @@ -261,7 +269,11 @@ public class Noise.PresetList : Gtk.Comb store.get(iter, 1, out text); if((nitems - index == count || index == -1) && text != null && text == SEPARATOR_NAME) { +#if VALA_0_36 + store.remove(ref iter); +#else store.remove(iter); +#endif break; } }
