zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #58 from MaxKrummenacher/fixes

Browse Source 
qt5 plugins: follow meta-qt5 changes
This commit is contained in:
Andreas Müller
2018-10-28 19:31:16 +01:00
committed by GitHub
parent c8dcca6860 564701f273
commit 3c29a786f6
3 changed files with 9 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
recipes-kde/apps/marble/files/0001-align-path-of-designer-plugins.patch
View File

@@ -1,31 +0,0 @@
From 51a1a623dbdeac52b0afd383189e509f6b61df9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 16 Sep 2015 15:20:30 +0200
Subject: [PATCH] align path of designer plugins
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 68b3d78..57c4792 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -199,7 +199,7 @@ add_feature_info("Qt Designer plugins" WITH_DESIGNER_PLUGIN "Marble widget suppo
set(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Base directory for executables and libraries" FORCE)
if (NOT QT_PLUGINS_DIR)
- set(QT_PLUGINS_DIR ${CMAKE_INSTALL_LIBDIR}/plugins)
+ set(QT_PLUGINS_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/qt5/plugins)
endif()
####################################################
--
2.1.0

6
recipes-kde/apps/marble/marble.bb
View File

@@ -33,9 +33,11 @@ DEPENDS += " \
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "9865aa5891dca6613610d491e1928545"
SRC_URI[sha256sum] = "600ce8d9427ab702536a4846d69e2289355b92e1e1b75bd2371e3cfa4e911d7f"
SRC_URI += "file://0001-align-path-of-designer-plugins.patch"
EXTRA_OECMAKE += "-DMARBLE_PRI_INSTALL_DIR=${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/modules"
EXTRA_OECMAKE += " \
-DMARBLE_PRI_INSTALL_DIR=${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/modules \
-DQT_PLUGINS_DIR=${OE_QMAKE_PATH_PLUGINS} \
"
PACKAGES =+ " \
${PN}-qt \

10
recipes-lxqt/lxqt-qtplugin/files/0001-set-installation-path-fixed-cmake-query-returns-sysr.patch
View File

@@ -1,4 +1,4 @@
From 1404a308cde3904e10262687c9c3a3cc9f0aafd1 Mon Sep 17 00:00:00 2001
From 37cec8b882d9941430c2ad33298b5b9a49cbfa96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sun, 8 Feb 2015 20:50:43 +0100
Subject: [PATCH] set installation path fixed - cmake query returns sysrooted
@@ -15,10 +15,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
1 file changed, 1 insertion(+), 22 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d65d813..61038fb 100644
index 18403b5..74668be 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -37,25 +37,4 @@ target_link_libraries(qtlxqt
@@ -42,25 +42,4 @@ target_link_libraries(qtlxqt
)
@@ -44,7 +44,7 @@ index d65d813..61038fb 100644
-endif()
-
-install(TARGETS qtlxqt LIBRARY DESTINATION "${QT_PLUGINS_DIR}/platformthemes")
+install(TARGETS qtlxqt LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/qt5/plugins/platformthemes")
+install(TARGETS qtlxqt LIBRARY DESTINATION "${OE_QMAKE_PATH_PLUGINS}/platformthemes")
--
1.9.3
2.13.6