Hello community, here is the log from the commit of package deadbeef for openSUSE:Factory checked in at 2017-11-07 09:57:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deadbeef (Old) and /work/SRC/openSUSE:Factory/.deadbeef.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "deadbeef" Tue Nov 7 09:57:50 2017 rev:5 rq:538828 version:0.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/deadbeef/deadbeef.changes 2017-08-28 15:32:47.928883375 +0200 +++ /work/SRC/openSUSE:Factory/.deadbeef.new/deadbeef.changes 2017-11-07 09:58:01.846231379 +0100 @@ -1,0 +2,15 @@ +Fri Nov 3 18:10:41 UTC 2017 - sor.alexei@meowr.ru + +- Add deadbeef.appdata.xml as a separate file and remove + deadbeef-add-appdata.patch (boo#1066408): the patch was rejected + upstream. Remove intltool stubs, which fixes the bug. + +------------------------------------------------------------------- +Thu Nov 2 17:25:14 UTC 2017 - stefan.bruens@rwth-aachen.de + +Fix build on ARM/PPC: + * Add 0001-Explicitly-specify-signedness-for-char.patch + * Add 0002-Use-signed-values-instead-of-potentially-unsigned-li.patch + * Add 0003-Fix-operator-precedence-and-uninitialized-value-warn.patch + +------------------------------------------------------------------- Old: ---- deadbeef-add-appdata.patch New: ---- 0001-Explicitly-specify-signedness-for-char.patch 0002-Use-signed-values-instead-of-potentially-unsigned-li.patch 0003-Fix-operator-precedence-and-uninitialized-value-warn.patch deadbeef.appdata.xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deadbeef.spec ++++++ --- /var/tmp/diff_new_pack.A25XHu/_old 2017-11-07 09:58:03.198182332 +0100 +++ /var/tmp/diff_new_pack.A25XHu/_new 2017-11-07 09:58:03.210181897 +0100 @@ -21,16 +21,21 @@ Version: 0.7.2 Release: 0 Summary: GTK+ audio player -License: Zlib and GPL-2.0+ and LGPL-2.1+ and BSD-3-Clause +License: Zlib AND GPL-2.0+ AND LGPL-2.1+ AND BSD-3-Clause Group: Productivity/Multimedia/Sound/Players Url: http://deadbeef.sourceforge.net/ Source: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2 +Source1: %{name}.appdata.xml # PATCH-FIX-OPENSUSE deadbeef-fix_ubuntu_unity_desktop.patch i@marguerite.su -- Fix Unity-oriented desktop-file warnings. Patch0: %{name}-fix_ubuntu_unity_desktop.patch # PATCH-FIX-OPENSUSE deadbeef-compiler-warnings.patch olaf@aepfle.de -- Fix compiler warnings. Patch1: %{name}-compiler-warnings.patch -# PATCH-FEATURE-UPSTREAM deadbeef-add-appdata.patch -- Add a translateable AppStream metadata file, https://github.com/Alexey-Yakovenko/deadbeef/pull/1705 -Patch2: %{name}-add-appdata.patch +# PATCH-FIX-OPENSUSE 0001-Explicitly-specify-signedness-for-char.patch -- Explicitly specify signedness for char +Patch2: 0001-Explicitly-specify-signedness-for-char.patch +# PATCH-FIX-OPENSUSE 0002-Use-signed-values-instead-of-potentially-unsigned-li.patch +Patch3: 0002-Use-signed-values-instead-of-potentially-unsigned-li.patch +# PATCH-FIX-OPENSUSE 0003-Fix-operator-precedence-and-uninitialized-value-warn.patch +Patch4: 0003-Fix-operator-precedence-and-uninitialized-value-warn.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ @@ -55,16 +60,16 @@ BuildRequires: pkgconfig(libcddb) BuildRequires: pkgconfig(libcdio) BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libmpg123) BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libzip) +BuildRequires: pkgconfig(mad) BuildRequires: pkgconfig(samplerate) BuildRequires: pkgconfig(sndfile) BuildRequires: pkgconfig(vorbis) BuildRequires: pkgconfig(wavpack) Recommends: %{name}-lang -BuildRequires: pkgconfig(libmpg123) -BuildRequires: pkgconfig(mad) %if %{with restricted} BuildRequires: libfaad-devel Requires: %{name}-plugins-extra = %{version} @@ -84,7 +89,7 @@ %if %{with restricted} %package plugins-extra Summary: Extra plugins for DeaDBeeF -License: Zlib and GPL-2.0+ and LGPL-2.1+ and BSD-3-Clause and Unicode and SUSE-NonFree +License: Zlib AND GPL-2.0+ AND LGPL-2.1+ AND BSD-3-Clause AND Unicode AND SUSE-NonFree Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} Obsoletes: %{name}-restricted-plugins < %{version} @@ -108,6 +113,10 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 + +cp %{SOURCE1} %{name}.appdata.xml %build autoreconf -fi @@ -125,10 +134,14 @@ %install %make_install +install -Dpm 0644 %{name}.appdata.xml \ + %{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml + %suse_update_desktop_file %{name} find %{buildroot} -type f -name "*.la" -delete -print %find_lang %{name} +%if 0%{?suse_version} <= 1320 %post %desktop_database_post %icon_theme_cache_post @@ -136,9 +149,9 @@ %postun %desktop_database_postun %icon_theme_cache_postun +%endif %files -%defattr(-,root,root) %doc %{_docdir}/%{name}/ %{_bindir}/%{name} %dir %{_libdir}/%{name}/ @@ -189,21 +202,18 @@ %{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.* -%dir %{_datadir}/appdata/ -%{_datadir}/appdata/%{name}.appdata.xml +%dir %{_datadir}/metainfo/ +%{_datadir}/metainfo/%{name}.appdata.xml %files lang -f %{name}.lang -%defattr(-,root,root) %if %{with restricted} %files plugins-extra -%defattr(-,root,root) %{_libdir}/%{name}/aac.so* %{_libdir}/%{name}/ddb_ao.so* %endif %files devel -%defattr(-,root,root) %{_includedir}/%{name}/ %changelog ++++++ 0001-Explicitly-specify-signedness-for-char.patch ++++++
From a3c6b61ccd78ed0eaa88720d0ba627c6125e64b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?=
Date: Thu, 2 Nov 2017 18:24:10 +0100 Subject: [PATCH 1/3] Explicitly specify signedness for char
From d12c50afeed29f8fd7e18976f0d114309ad25db4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?=
Date: Thu, 2 Nov 2017 20:09:00 +0100 Subject: [PATCH 2/3] Use signed values instead of potentially unsigned
char is unsigned on ARM/PPC, be explicit to avoid warnings/errors
---
plugins/adplug/adplug/s3m.cpp | 2 +-
plugins/adplug/adplug/s3m.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/plugins/adplug/adplug/s3m.cpp b/plugins/adplug/adplug/s3m.cpp
index 173a7563..2158baeb 100644
--- a/plugins/adplug/adplug/s3m.cpp
+++ b/plugins/adplug/adplug/s3m.cpp
@@ -26,7 +26,7 @@
#include
From 30080bc60897545bb39805eeaebe6588a760d126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?=
Date: Thu, 2 Nov 2017 20:10:18 +0100 Subject: [PATCH 3/3] Fix operator precedence and uninitialized value warnings
---
plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidendian.h | 4 ++--
plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidendian.h b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidendian.h
index 9fa8582d..d6d9c079 100644
--- a/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidendian.h
+++ b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidendian.h
@@ -115,7 +115,7 @@ inline void endian_16hi8 (uint_least16_t &word, uint8_t byte)
#endif
}
-// Set the hi byte (8 bit) in a word (16 bit)
+// Get the hi byte (8 bit) of a word (16 bit)
inline uint8_t endian_16hi8 (uint_least16_t word)
{
#if defined(SID_OPTIMISE_MEMORY_ACCESS)
@@ -141,7 +141,7 @@ inline void endian_16swap8 (uint_least16_t &word)
// Convert high-byte and low-byte to 16-bit word.
inline uint_least16_t endian_16 (uint8_t hi, uint8_t lo)
{
- uint_least16_t word;
+ uint_least16_t word = 0;
endian_16lo8 (word, lo);
endian_16hi8 (word, hi);
return word;
diff --git a/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h b/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h
index 98171d73..01799652 100644
--- a/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h
+++ b/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h
@@ -197,7 +197,7 @@ private:
// Compress address to not leave so many spaces
uint_least8_t convertAddr(uint_least8_t addr)
- { return (((addr) & 0x3) | ((addr) >> 3) & 0x0c); }
+ { return ((addr) & 0x3) | (((addr) >> 3) & 0x0c); }
void reset (void);
uint8_t read (uint_least8_t addr)
--
2.14.3
++++++ deadbeef.appdata.xml ++++++
<?xml version="1.0" encoding="UTF-8"?>
<application>
<id type="desktop">deadbeef.desktop</id>
<license>Zlib and GPL-2.0+ and LGPL-2.1+ and BSD-3-Clause</license>