From c72b5a78a25190d3f8966c903f5b8eb4cc5cf635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 8 Feb 2015 21:27:09 +0100 Subject: [PATCH] add lxqt-qtplugin 0.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...-path-fixed-cmake-query-returns-sysr.patch | 50 +++++++++++++++++++ ...-for-a-unique-lxqt.-No-more-suffixes.patch | 28 +++++++++++ .../lxqt-qtplugin/lxqt-qtplugin_git.bb | 18 +++++++ 3 files changed, 96 insertions(+) create mode 100644 recipes-lxqt/lxqt-qtplugin/files/0001-set-installation-path-fixed-cmake-query-returns-sysr.patch create mode 100644 recipes-lxqt/lxqt-qtplugin/files/0002-Unify-naming-for-a-unique-lxqt.-No-more-suffixes.patch create mode 100644 recipes-lxqt/lxqt-qtplugin/lxqt-qtplugin_git.bb diff --git a/recipes-lxqt/lxqt-qtplugin/files/0001-set-installation-path-fixed-cmake-query-returns-sysr.patch b/recipes-lxqt/lxqt-qtplugin/files/0001-set-installation-path-fixed-cmake-query-returns-sysr.patch new file mode 100644 index 00000000..b6155d89 --- /dev/null +++ b/recipes-lxqt/lxqt-qtplugin/files/0001-set-installation-path-fixed-cmake-query-returns-sysr.patch @@ -0,0 +1,50 @@ +From 1404a308cde3904e10262687c9c3a3cc9f0aafd1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 8 Feb 2015 20:50:43 +0100 +Subject: [PATCH] set installation path fixed - cmake query returns sysrooted + path +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller +--- + src/CMakeLists.txt | 23 +---------------------- + 1 file changed, 1 insertion(+), 22 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index d65d813..61038fb 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -14,25 +14,4 @@ target_link_libraries(qtlxqt + Qt5::Widgets + ) + +-# there is no standard way to get the plugin dir of Qt5 with cmake +-# The best way is get_target_property(QT_PLUGINS_DIR Qt5::QGtk2ThemePlugin LOCATION). +-# This directly returns the platformthemes dir. However, this does not work +-# in some distros, such as ubuntu. +-# Finally, I came up with a more reliable way by using qmake. +-get_target_property(QT_QMAKE_EXECUTABLE ${Qt5Core_QMAKE_EXECUTABLE} IMPORTED_LOCATION) +-if(NOT QT_QMAKE_EXECUTABLE) +- message(FATAL_ERROR "qmake is not found.") +-endif() +- +-# execute the command "qmake -query QT_INSTALL_PLUGINS" to get the path of plugins dir. +-execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_PLUGINS +- OUTPUT_VARIABLE QT_PLUGINS_DIR +- OUTPUT_STRIP_TRAILING_WHITESPACE +-) +-if(QT_PLUGINS_DIR) +- message(STATUS "Qt5 plugin directory:" "${QT_PLUGINS_DIR}") +-else() +- message(FATAL_ERROR "Qt5 plugin directory cannot be detected.") +-endif() +- +-install(TARGETS qtlxqt LIBRARY DESTINATION "${QT_PLUGINS_DIR}/platformthemes") ++install(TARGETS qtlxqt LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/qt5/platformthemes") +-- +1.9.3 + diff --git a/recipes-lxqt/lxqt-qtplugin/files/0002-Unify-naming-for-a-unique-lxqt.-No-more-suffixes.patch b/recipes-lxqt/lxqt-qtplugin/files/0002-Unify-naming-for-a-unique-lxqt.-No-more-suffixes.patch new file mode 100644 index 00000000..c9d87a29 --- /dev/null +++ b/recipes-lxqt/lxqt-qtplugin/files/0002-Unify-naming-for-a-unique-lxqt.-No-more-suffixes.patch @@ -0,0 +1,28 @@ +From af1cd7e415e047430278931e4af09766d3c8dc04 Mon Sep 17 00:00:00 2001 +From: Helio Chissini de Castro +Date: Sat, 20 Dec 2014 13:28:02 -0200 +Subject: [PATCH] - Unify naming for a unique lxqt. No more suffixes + +Upstream-Status: Applied + +Signed-off-by: Helio Chissini de Castro +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index be8b01a..6bb3e57 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,7 +8,7 @@ set(CMAKE_AUTOMOC ON) + find_package(Qt5Widgets REQUIRED QUIET) + find_package(Qt5LinguistTools REQUIRED QUIET) + +-find_package(lxqt-qt5 REQUIRED QUIET) ++find_package(lxqt REQUIRED QUIET) + + include(${LXQT_USE_FILE}) + +-- +1.9.3 + diff --git a/recipes-lxqt/lxqt-qtplugin/lxqt-qtplugin_git.bb b/recipes-lxqt/lxqt-qtplugin/lxqt-qtplugin_git.bb new file mode 100644 index 00000000..eae36652 --- /dev/null +++ b/recipes-lxqt/lxqt-qtplugin/lxqt-qtplugin_git.bb @@ -0,0 +1,18 @@ +SUMMARY = "LXQt Qt platform integration plugin" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=0964c689fcf4c21c6797ea87408416b6" + +inherit lxqt + +DEPENDS += "liblxqt" + +SRCREV = "7963ead0cdd4180b61e5d8a90827c60f6b077965" +PV = "0.9.0" +SRC_URI += " \ + file://0001-set-installation-path-fixed-cmake-query-returns-sysr.patch \ + file://0002-Unify-naming-for-a-unique-lxqt.-No-more-suffixes.patch \ +" + +FILES_${PN} += "${libdir}/qt5/platformthemes" +FILES_${PN}-dbg += "${libdir}/qt5/platformthemes/.debug" +