diff --git a/qmmp-projectM-qt5.patch b/qmmp-projectM-qt5.patch index 8222f47..4b41c82 100644 --- a/qmmp-projectM-qt5.patch +++ b/qmmp-projectM-qt5.patch @@ -1,8 +1,6 @@ -Index: qmmp-1.1.9/src/plugins/Visual/projectm/CMakeLists.txt -=================================================================== ---- qmmp-1.1.9.orig/src/plugins/Visual/projectm/CMakeLists.txt -+++ qmmp-1.1.9/src/plugins/Visual/projectm/CMakeLists.txt -@@ -14,14 +14,14 @@ link_directories(${CMAKE_CURRENT_BINARY_ +--- a/src/plugins/Visual/projectm/CMakeLists.txt ++++ b/src/plugins/Visual/projectm/CMakeLists.txt +@@ -9,14 +9,14 @@ link_directories(${CMAKE_CURRENT_BINARY_ # projectM MESSAGE(STATUS "Found OpenGL implementation: ${Qt5Gui_OPENGL_IMPLEMENTATION}") IF(${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL GL) @@ -18,11 +16,9 @@ Index: qmmp-1.1.9/src/plugins/Visual/projectm/CMakeLists.txt + PATHS "/usr/share/projectM-qt5/" "/usr/local/share/projectM/") IF(PROJECTM_CONFIG) - ADD_DEFINITIONS(-DPROJECTM_CONFIG=\\\"${PROJECTM_CONFIG}\\\") -Index: qmmp-1.1.9/src/plugins/Visual/projectm/projectmplugin.cpp -=================================================================== ---- qmmp-1.1.9.orig/src/plugins/Visual/projectm/projectmplugin.cpp -+++ qmmp-1.1.9/src/plugins/Visual/projectm/projectmplugin.cpp + SET(libprojectm_DEFINES PROJECTM_CONFIG=\"${PROJECTM_CONFIG}\") +--- a/src/plugins/Visual/projectm/projectmplugin.cpp ++++ b/src/plugins/Visual/projectm/projectmplugin.cpp @@ -28,7 +28,7 @@ #include #include @@ -32,23 +28,8 @@ Index: qmmp-1.1.9/src/plugins/Visual/projectm/projectmplugin.cpp #include #include #include "projectmwidget.h" -Index: qmmp-1.1.9/src/plugins/Visual/projectm/projectmwrapper.h -=================================================================== ---- qmmp-1.1.9.orig/src/plugins/Visual/projectm/projectmwrapper.h -+++ qmmp-1.1.9/src/plugins/Visual/projectm/projectmwrapper.h -@@ -22,7 +22,7 @@ - #define PROJECTMWRAPPER_H - - #include --#include -+#include - - class ProjectMWrapper : public QObject, public projectM - { -Index: qmmp-1.1.9/src/plugins/Visual/projectm/projectmwidget.cpp -=================================================================== ---- qmmp-1.1.9.orig/src/plugins/Visual/projectm/projectmwidget.cpp -+++ qmmp-1.1.9/src/plugins/Visual/projectm/projectmwidget.cpp +--- a/src/plugins/Visual/projectm/projectmwidget.cpp ++++ b/src/plugins/Visual/projectm/projectmwidget.cpp @@ -35,7 +35,7 @@ #include "projectmwidget.h" @@ -58,3 +39,14 @@ Index: qmmp-1.1.9/src/plugins/Visual/projectm/projectmwidget.cpp #endif ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent) +--- a/src/plugins/Visual/projectm/projectmwrapper.h ++++ b/src/plugins/Visual/projectm/projectmwrapper.h +@@ -22,7 +22,7 @@ + #define PROJECTMWRAPPER_H + + #include +-#include ++#include + + class ProjectMWrapper : public QObject, public projectM + { diff --git a/qmmp.changes b/qmmp.changes index 8d2e477..065e6f3 100644 --- a/qmmp.changes +++ b/qmmp.changes @@ -16,6 +16,7 @@ Fri Oct 20 22:29:23 UTC 2017 - sor.alexei@meowr.ru * Fix control socket permissions. * Fix rusxmms support. * Update Spanish, Portuguese, Greek translations. +- Rebase qmmp-projectM-qt5.patch. ------------------------------------------------------------------- Fri Aug 25 06:10:58 UTC 2017 - olaf@aepfle.de