diff options
| author | Kai Kang <kai.kang@windriver.com> | 2014-03-12 15:46:57 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-17 14:01:07 +0000 |
| commit | fa10bd5aed84768ded25cdba348ce197a5fdbf2a (patch) | |
| tree | 53e8ee1d10597716eec726c4ec69dd33c4f73602 /meta/recipes-qt/qt-apps/qmmp | |
| parent | 87df114982db7a94fce8622b15458bbe2d2ddacc (diff) | |
| download | openembedded-core-fa10bd5aed84768ded25cdba348ce197a5fdbf2a.tar.gz openembedded-core-fa10bd5aed84768ded25cdba348ce197a5fdbf2a.tar.bz2 openembedded-core-fa10bd5aed84768ded25cdba348ce197a5fdbf2a.zip | |
qmmp: update to 0.7.5
Update qmmp to 0.7.5 version
* update no-host-paths.patch
* remove no-sessionmanager.patch which is merged
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt-apps/qmmp')
| -rw-r--r-- | meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch | 13 | ||||
| -rw-r--r-- | meta/recipes-qt/qt-apps/qmmp/no-sessionmanager.patch | 21 |
2 files changed, 7 insertions, 27 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 index de17b4ef0b..2bb5bb11cc 100644 --- a/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch +++ b/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch @@ -8,16 +8,17 @@ Upstream-Status: Inappropriate [cross] Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,12 +1,5 @@ +Update patch for version 0.7.4. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +--- qmmp-0.7.4/CMakeLists.txt 2014-01-10 09:59:44.971837746 +0800 ++++ qmmp-0.7.4/CMakeLists.txt.new 2014-01-10 10:24:51.855837566 +0800 +@@ -1,9 +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 diff --git a/meta/recipes-qt/qt-apps/qmmp/no-sessionmanager.patch b/meta/recipes-qt/qt-apps/qmmp/no-sessionmanager.patch deleted file mode 100644 index 5e2978b658..0000000000 --- a/meta/recipes-qt/qt-apps/qmmp/no-sessionmanager.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 - } |