diff --git a/qmmp-fix-openmpt.patch b/qmmp-fix-openmpt.patch new file mode 100644 index 0000000..fdb0317 --- /dev/null +++ b/qmmp-fix-openmpt.patch @@ -0,0 +1,40 @@ +--- a/src/plugins/Input/modplug/decoder_modplug.cpp ++++ b/src/plugins/Input/modplug/decoder_modplug.cpp +@@ -29,7 +29,6 @@ + #include + #include + #include +-#include + #include + #include + #include +--- a/src/plugins/Input/modplug/decodermodplugfactory.cpp ++++ b/src/plugins/Input/modplug/decodermodplugfactory.cpp +@@ -25,7 +25,6 @@ + #include + #include + #include +-#include + #include + #include "settingsdialog.h" + #include "modplugmetadatamodel.h" +--- a/src/plugins/Input/modplug/modplugmetadatamodel.cpp ++++ b/src/plugins/Input/modplug/modplugmetadatamodel.cpp +@@ -21,7 +21,6 @@ + #include + #include + #include +-#include + #include + #include + #include "archivereader.h" +--- a/src/plugins/Input/modplug/settingsdialog.cpp ++++ b/src/plugins/Input/modplug/settingsdialog.cpp +@@ -22,7 +22,6 @@ + #include + + #include +-#include + #include + + #include "decoder_modplug.h" diff --git a/qmmp.changes b/qmmp.changes index 069e438..f01a6cc 100644 --- a/qmmp.changes +++ b/qmmp.changes @@ -15,6 +15,7 @@ Sat Jun 3 11:48:21 UTC 2017 - sor.alexei@meowr.ru * Update French and Russian translations. - Enable building with libmad for newer openSUSE releases even outside of Packman. +- Add qmmp-fix-openmpt.patch: fix OpenMPT compatibility. ------------------------------------------------------------------- Thu Mar 23 11:55:35 UTC 2017 - sor.alexei@meowr.ru diff --git a/qmmp.spec b/qmmp.spec index d9c53c7..2290d34 100644 --- a/qmmp.spec +++ b/qmmp.spec @@ -34,6 +34,8 @@ Patch0: %{name}-fix_cdda_version.patch Patch1: %{name}-default-pulse.patch # PATCH-FIX-OPENSUSE qmmp-taglib-1.9.patch -- Extend TagLib support to 1.9. Patch2: %{name}-taglib-1.9.patch +# PATCH-FIX-OPENSUSE qmmp-fix-openmpt.patch -- Fix OpenMPT compatibility. +Patch3: %{name}-fix-openmpt.patch BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: gcc-c++ @@ -143,6 +145,7 @@ Development files for libqmmp. %patch0 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %cmake \