diff options
Diffstat (limited to 'meta/recipes-qt/qt-apps/qmmp')
-rw-r--r-- | meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch | 25 | ||||
-rw-r--r-- | meta/recipes-qt/qt-apps/qmmp/no-sessionmanager.patch | 21 |
2 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch b/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch new file mode 100644 index 0000000000..de17b4ef0b --- /dev/null +++ b/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch @@ -0,0 +1,25 @@ +Do not include /usr/include host paths + +These were added upstream apparently for freebsd support, but trigger +compiler warnings during the build and could be dangerous, so remove +them. + +Upstream-Status: Inappropriate [cross] + +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,12 +1,5 @@ + cmake_minimum_required(VERSION 2.6.0) + +-#freebsd support +-include_directories(SYSTEM /usr/local/include) +-link_directories(/usr/local/lib) +-link_directories(/usr/local/lib32) +-link_directories(/usr/local/lib64) +-SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include) +- + #extract version from qmmp.h + FILE(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/src/qmmp/qmmp.h" + QMMP_VERSION_DATA REGEX "^#define[ \t]+QMMP_VERSION_[A-Z]+[ \t]+[0-9]+.*$") diff --git a/meta/recipes-qt/qt-apps/qmmp/no-sessionmanager.patch b/meta/recipes-qt/qt-apps/qmmp/no-sessionmanager.patch new file mode 100644 index 0000000000..5e2978b658 --- /dev/null +++ b/meta/recipes-qt/qt-apps/qmmp/no-sessionmanager.patch @@ -0,0 +1,21 @@ +Don't call session manager function if not enabled + +If session management has been disabled we will get a compilation +failure if we try to call QApplication::commitData() so don't do so if +it is disabled. + +Upstream-Status: Pending + +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> + +--- a/src/app/qmmpapplication.cpp ++++ b/src/app/qmmpapplication.cpp +@@ -29,6 +29,8 @@ void QmmpApplication::commitData(QSessionManager &manager) + { + if(UiHelper::instance()) + UiHelper::instance()->exit(); ++#ifndef QT_NO_SESSIONMANAGER + else + QApplication::commitData(manager); ++#endif + } |