Hello community, here is the log from the commit of package audacious-plugins for openSUSE:Factory checked in at 2018-01-07 17:23:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/audacious-plugins (Old) and /work/SRC/openSUSE:Factory/.audacious-plugins.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "audacious-plugins" Sun Jan 7 17:23:50 2018 rev:5 rq:562210 version:3.9 Changes: -------- --- /work/SRC/openSUSE:Factory/audacious-plugins/audacious-plugins.changes 2017-10-30 21:18:57.186175615 +0100 +++ /work/SRC/openSUSE:Factory/.audacious-plugins.new/audacious-plugins.changes 2018-01-07 17:23:56.842035961 +0100 @@ -1,0 +2,5 @@ +Sat Jan 6 12:00:54 UTC 2018 - sor.alexei@meowr.ru + +- Add audacious-plugins-qt-5.10.patch: Fix building with Qt 5.10+. + +------------------------------------------------------------------- New: ---- audacious-plugins-qt-5.10.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audacious-plugins.spec ++++++ --- /var/tmp/diff_new_pack.QJNOLU/_old 2018-01-07 17:23:57.462006901 +0100 +++ /var/tmp/diff_new_pack.QJNOLU/_new 2018-01-07 17:23:57.466006713 +0100 @@ -1,7 +1,7 @@ # # spec file for package audacious-plugins # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -25,16 +25,24 @@ Version: 3.9 Release: 0 Summary: Plugins for Audacious -License: GPL-2.0+ and LGPL-2.1+ and GPL-3.0 and MIT and BSD-2-Clause +License: GPL-2.0+ AND LGPL-2.1+ AND GPL-3.0 AND MIT AND BSD-2-Clause Group: Productivity/Multimedia/Sound/Players Url: http://audacious-media-player.org/ Source: https://github.com/audacious-media-player/audacious-plugins/archive/%{name}-%{version}-gtk3.tar.gz +# PATCH-FIX-UPSTREAM audacious-plugins-qt-5.10.patch -- Fix building with Qt 5.10+. +Patch0: audacious-plugins-qt-5.10.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: fdupes BuildRequires: gcc-c++ >= 4.5 +BuildRequires: libmp3lame-devel BuildRequires: lirc-devel BuildRequires: pkgconfig +BuildRequires: pkgconfig(Qt5Core) >= 5.2 +BuildRequires: pkgconfig(Qt5Gui) >= 5.2 +BuildRequires: pkgconfig(Qt5Multimedia) >= 5.2 +BuildRequires: pkgconfig(Qt5OpenGL) >= 5.2 +BuildRequires: pkgconfig(Qt5Widgets) >= 5.2 BuildRequires: pkgconfig(alsa) >= 1.0.16 BuildRequires: pkgconfig(audacious) >= %{aud_ver_min} BuildRequires: pkgconfig(dbus-1) >= 0.60 @@ -42,10 +50,12 @@ BuildRequires: pkgconfig(flac) >= 1.2.1 BuildRequires: pkgconfig(fluidsynth) >= 1.0.6 BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.26 +BuildRequires: pkgconfig(gdk-x11-3.0) BuildRequires: pkgconfig(gio-2.0) >= 2.32 BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glib-2.0) >= 2.32 BuildRequires: pkgconfig(gmodule-2.0) >= 2.32 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.4 BuildRequires: pkgconfig(jack) >= 1.9.7 BuildRequires: pkgconfig(libavcodec) >= 53.40.0 BuildRequires: pkgconfig(libavformat) >= 53.25.0 @@ -57,6 +67,7 @@ BuildRequires: pkgconfig(libcue) BuildRequires: pkgconfig(libcurl) >= 7.9.7 BuildRequires: pkgconfig(libmms) >= 0.3 +BuildRequires: pkgconfig(libmpg123) >= 1.12 BuildRequires: pkgconfig(libnotify) >= 0.7 BuildRequires: pkgconfig(libpulse) >= 0.9.5 BuildRequires: pkgconfig(libsidplayfp) >= 1.0 @@ -71,25 +82,16 @@ BuildRequires: pkgconfig(vorbisenc) >= 1.0 BuildRequires: pkgconfig(vorbisfile) >= 1.0 BuildRequires: pkgconfig(wavpack) >= 4.31 +BuildRequires: pkgconfig(xcomposite) +BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(zlib) Requires: libaudcore%{?_isa} <= %{aud_ver_max} Requires: libaudcore%{?_isa} >= %{aud_ver_min} Recommends: %{name}-extra Recommends: %{name}-lang -BuildRequires: pkgconfig(gdk-x11-3.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.4 -BuildRequires: pkgconfig(xcomposite) -BuildRequires: pkgconfig(xrender) -BuildRequires: pkgconfig(Qt5Core) >= 5.2 -BuildRequires: pkgconfig(Qt5Gui) >= 5.2 -BuildRequires: pkgconfig(Qt5Multimedia) >= 5.2 -BuildRequires: pkgconfig(Qt5OpenGL) >= 5.2 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.2 %if %{with faad} BuildRequires: libfaad-devel %endif -BuildRequires: libmp3lame-devel -BuildRequires: pkgconfig(libmpg123) >= 1.12 %description Plugins for the Audacious audio player. @@ -98,7 +100,7 @@ %package extra Summary: Extra plugins for Audacious -License: GPL-2.0+ and MIT and BSD-2-Clause +License: GPL-2.0+ AND MIT AND BSD-2-Clause Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -107,6 +109,7 @@ %prep %setup -q -n %{name}-%{name}-%{version}-gtk3 +%patch0 -p1 %build NOCONFIGURE=1 ./autogen.sh @@ -127,7 +130,6 @@ %fdupes %{buildroot}%{_datadir}/ %files -%defattr(-,root,root) %{_libdir}/audacious/ %if %{with faad} %exclude %{_libdir}/audacious/Input/aac-raw.so @@ -139,10 +141,8 @@ %{_datadir}/audacious/ %files lang -f %{name}.lang -%defattr(-,root,root) %files extra -%defattr(-,root,root) %if %{with faad} %{_libdir}/audacious/Input/aac-raw.so %endif ++++++ audacious-plugins-qt-5.10.patch ++++++ --- a/src/qtui/info_bar.cc +++ b/src/qtui/info_bar.cc @@ -255,8 +255,8 @@ void InfoBar::paintEvent (QPaintEvent *) if (d.title.text ().isNull () && ! d.orig_title.isNull ()) { QFontMetrics metrics = p.fontMetrics (); - d.title = metrics.elidedText (d.orig_title, Qt::ElideRight, - width () - ps.VisWidth - ps.Height - ps.Spacing); + d.title = QStaticText(metrics.elidedText (d.orig_title, Qt::ElideRight, + width () - ps.VisWidth - ps.Height - ps.Spacing)); } p.setPen (QColor (255, 255, 255));