diff --git a/audacious-plugins-3.9-qt5.patch b/audacious-plugins-3.9-qt5.patch new file mode 100644 index 0000000..b232223 --- /dev/null +++ b/audacious-plugins-3.9-qt5.patch @@ -0,0 +1,14 @@ +diff -Naur audacious-plugins-3.9-orig/src/qtui/info_bar.cc audacious-plugins-3.9-qt5/src/qtui/info_bar.cc +--- audacious-plugins-3.9-orig/src/qtui/info_bar.cc 2017-08-20 03:20:10.000000000 +0200 ++++ audacious-plugins-3.9-qt5/src/qtui/info_bar.cc 2018-01-25 14:57:25.801669912 +0100 +@@ -255,8 +255,8 @@ + 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)); diff --git a/audacious-plugins.spec b/audacious-plugins.spec index 61e4f9e..49f0a41 100644 --- a/audacious-plugins.spec +++ b/audacious-plugins.spec @@ -46,6 +46,8 @@ Patch2: audacious-plugins-3.6-ladspa.patch Patch3: audacious-plugins-3.9-unbundle-adplug.patch # related to patch 3 to adjust compiler -I/-l args temporarily Patch4: audacious-plugins-3.9-adplug-makefile.patch +# make build again after a change in Qt 5 +Patch5: audacious-plugins-3.9-qt5.patch BuildRequires: gcc-c++ BuildRequires: audacious-devel >= %{aud_ver} @@ -326,6 +328,7 @@ install -p -m0644 %{SOURCE102} ${RPM_BUILD_ROOT}%{_datadir}/appdata %changelog * Thu Jan 25 2018 Michael Schwendt - 3.9-4 +- Make build again after a change in Qt 5. - Merge post-3.9 unbundling of adplug plugin and make it build without touching more than the plugin directory. - Use %%autosetup.