qskinny: hack to proper build
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
@@ -1,136 +0,0 @@
|
||||
From 19649bd6e41dad42abf25defdd9bd1bed6f9a0b6 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Mon, 22 Oct 2018 11:00:32 +0200
|
||||
Subject: [PATCH] Add installation targets
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
examples/example.pri | 3 +++
|
||||
playground/playground.pri | 3 +++
|
||||
qmlexport/qmlexport.pro | 3 +++
|
||||
qskconfig.pri | 11 +++++++++++
|
||||
skins/skins.pri | 4 ++++
|
||||
src/src.pro | 6 ++++++
|
||||
support/support.pro | 3 +++
|
||||
7 files changed, 33 insertions(+)
|
||||
|
||||
diff --git a/examples/example.pri b/examples/example.pri
|
||||
index 9057d57..21176fa 100644
|
||||
--- a/examples/example.pri
|
||||
+++ b/examples/example.pri
|
||||
@@ -7,6 +7,9 @@ QT += quick
|
||||
|
||||
TEMPLATE = app
|
||||
|
||||
+target.path = $${QSK_INSTALL_BINS}
|
||||
+INSTALLS = target
|
||||
+
|
||||
QSK_DIRS = \
|
||||
$${QSK_ROOT}/src/common \
|
||||
$${QSK_ROOT}/src/nodes \
|
||||
diff --git a/playground/playground.pri b/playground/playground.pri
|
||||
index a454e8d..9432dca 100644
|
||||
--- a/playground/playground.pri
|
||||
+++ b/playground/playground.pri
|
||||
@@ -9,6 +9,9 @@ CONFIG += no_private_qt_headers_warning
|
||||
|
||||
TEMPLATE = app
|
||||
|
||||
+target.path = $${QSK_INSTALL_BINS}
|
||||
+INSTALLS = target
|
||||
+
|
||||
QSK_DIRS = \
|
||||
$${QSK_ROOT}/src/common \
|
||||
$${QSK_ROOT}/src/nodes \
|
||||
diff --git a/qmlexport/qmlexport.pro b/qmlexport/qmlexport.pro
|
||||
index 9c8d87f..393623c 100644
|
||||
--- a/qmlexport/qmlexport.pro
|
||||
+++ b/qmlexport/qmlexport.pro
|
||||
@@ -6,6 +6,9 @@ include( $${QSK_ROOT}/qskconfig.pri )
|
||||
TEMPLATE = lib
|
||||
TARGET = qskqmlexport
|
||||
|
||||
+target.path = $${QSK_INSTALL_LIBS}
|
||||
+INSTALLS = target
|
||||
+
|
||||
DESTDIR = $${QSK_OUT_ROOT}/lib
|
||||
|
||||
QT += quick quick-private
|
||||
diff --git a/qskconfig.pri b/qskconfig.pri
|
||||
index 9952b91..9a9ab2c 100644
|
||||
--- a/qskconfig.pri
|
||||
+++ b/qskconfig.pri
|
||||
@@ -16,6 +16,17 @@ RCC_DIR = rcc
|
||||
|
||||
QSK_CONFIG += QskDll
|
||||
|
||||
+######################################################################
|
||||
+# Default install paths
|
||||
+######################################################################
|
||||
+
|
||||
+QSK_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
|
||||
+QSK_INSTALL_DOCS = $$[QT_INSTALL_DOCS]
|
||||
+QSK_INSTALL_HEADERS = $$[QT_INSTALL_HEADERS]
|
||||
+QSK_INSTALL_LIBS = $$[QT_INSTALL_LIBS]
|
||||
+QSK_INSTALL_BINS = $$[QT_INSTALL_BINS]
|
||||
+QSK_INSTALL_PLUGINS = $$[QT_INSTALL_PLUGINS]
|
||||
+
|
||||
*-g++* {
|
||||
|
||||
GCC_VERSION = $$system("$$QMAKE_CXX -dumpversion")
|
||||
diff --git a/skins/skins.pri b/skins/skins.pri
|
||||
index 7043c83..bad8431 100644
|
||||
--- a/skins/skins.pri
|
||||
+++ b/skins/skins.pri
|
||||
@@ -5,6 +5,10 @@ QSK_OUT_ROOT = $${OUT_PWD}/../..
|
||||
|
||||
CONFIG += plugin
|
||||
|
||||
+# Currently plugins are loaded as libs - to find them they nedd to go to libdir
|
||||
+target.path = $${QSK_INSTALL_LIBS}
|
||||
+INSTALLS = target
|
||||
+
|
||||
QT += quick
|
||||
|
||||
TEMPLATE = lib
|
||||
diff --git a/src/src.pro b/src/src.pro
|
||||
index a4f338c..c7165c2 100644
|
||||
--- a/src/src.pro
|
||||
+++ b/src/src.pro
|
||||
@@ -29,6 +29,9 @@ QSK_SUBDIRS = common graphic nodes controls layouts dialogs inputpanel
|
||||
INCLUDEPATH *= $${QSK_SUBDIRS}
|
||||
DEPENDPATH *= $${QSK_SUBDIRS}
|
||||
|
||||
+target.path = $${QSK_INSTALL_LIBS}
|
||||
+INSTALLS = target
|
||||
+
|
||||
HEADERS += \
|
||||
common/QskAspect.h \
|
||||
common/QskBoxBorderColors.h \
|
||||
@@ -315,3 +318,6 @@ SOURCES += \
|
||||
inputpanel/QskInputPredictionBar.cpp \
|
||||
inputpanel/QskVirtualKeyboard.cpp
|
||||
|
||||
+header_files.files = $$HEADERS
|
||||
+header_files.path = $${QSK_INSTALL_HEADERS}
|
||||
+INSTALLS += header_files
|
||||
diff --git a/support/support.pro b/support/support.pro
|
||||
index d7e4114..e919cb2 100644
|
||||
--- a/support/support.pro
|
||||
+++ b/support/support.pro
|
||||
@@ -7,6 +7,9 @@ include( $${QSK_ROOT}/qskconfig.pri )
|
||||
TEMPLATE = lib
|
||||
TARGET = qsktestsupport
|
||||
|
||||
+target.path = $${QSK_INSTALL_LIBS}
|
||||
+INSTALLS = target
|
||||
+
|
||||
DESTDIR = $${QSK_OUT_ROOT}/lib
|
||||
|
||||
QT += quick
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
From f6f8d9fee3a776f742977545dc62a418ccf82b89 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Fri, 2 Nov 2018 12:56:57 +0100
|
||||
Subject: [PATCH] Fix linking for all examples
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
examples/automotive/automotive.pro | 4 ----
|
||||
examples/example.pri | 4 +++-
|
||||
playground/playground.pri | 4 +++-
|
||||
3 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/examples/automotive/automotive.pro b/examples/automotive/automotive.pro
|
||||
index cb0954e..72e1159 100644
|
||||
--- a/examples/automotive/automotive.pro
|
||||
+++ b/examples/automotive/automotive.pro
|
||||
@@ -8,10 +8,6 @@ QSK_SKIN_DIR=$${QSK_ROOT}/skins
|
||||
INCLUDEPATH *= $${QSK_SKIN_DIR}
|
||||
DEPENDPATH *= $${QSK_SKIN_DIR}
|
||||
|
||||
-QSK_PLUGIN_DIR = $${QSK_OUT_ROOT}/plugins
|
||||
-QMAKE_RPATHDIR *= $${QSK_PLUGIN_DIR}/skins
|
||||
-LIBS *= -L$${QSK_PLUGIN_DIR}/skins -lsquiekskin -lmaterialskin
|
||||
-
|
||||
HEADERS += \
|
||||
ButtonBar.h \
|
||||
SoundControl.h \
|
||||
diff --git a/examples/example.pri b/examples/example.pri
|
||||
index 221f995..c8d59c2 100644
|
||||
--- a/examples/example.pri
|
||||
+++ b/examples/example.pri
|
||||
@@ -24,9 +24,11 @@ DEPENDPATH *= $${QSK_DIRS}
|
||||
|
||||
DESTDIR = $${QSK_OUT_ROOT}/examples/bin
|
||||
|
||||
-QMAKE_RPATHDIR *= $${QSK_OUT_ROOT}/lib
|
||||
+QMAKE_RPATHDIR *= $${QSK_OUT_ROOT}/lib $${QSK_OUT_ROOT}/plugins/skins
|
||||
qskAddLibrary($${QSK_OUT_ROOT}/lib, qsktestsupport)
|
||||
qskAddLibrary($${QSK_OUT_ROOT}/lib, qskinny)
|
||||
+qskAddLibrary($${QSK_OUT_ROOT}/plugins/skins, squiekskin)
|
||||
+qskAddLibrary($${QSK_OUT_ROOT}/plugins/skins, materialskin)
|
||||
|
||||
win32 {
|
||||
contains(QSK_CONFIG, QskDll) {
|
||||
diff --git a/playground/playground.pri b/playground/playground.pri
|
||||
index 8e61547..11362f9 100644
|
||||
--- a/playground/playground.pri
|
||||
+++ b/playground/playground.pri
|
||||
@@ -26,9 +26,11 @@ DEPENDPATH += $${QSK_DIRS}
|
||||
|
||||
DESTDIR = $${QSK_OUT_ROOT}/playground/bin
|
||||
|
||||
-QMAKE_RPATHDIR *= $${QSK_OUT_ROOT}/lib
|
||||
+QMAKE_RPATHDIR *= $${QSK_OUT_ROOT}/lib $${QSK_OUT_ROOT}/plugins/skins
|
||||
qskAddLibrary($${QSK_OUT_ROOT}/lib, qsktestsupport)
|
||||
qskAddLibrary($${QSK_OUT_ROOT}/lib, qskinny)
|
||||
+qskAddLibrary($${QSK_OUT_ROOT}/plugins/skins, squiekskin)
|
||||
+qskAddLibrary($${QSK_OUT_ROOT}/plugins/skins, materialskin)
|
||||
|
||||
win32 {
|
||||
contains(QSK_CONFIG, QskDll) {
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From 8a09ea3ea3be54e200480dc03e375aaae2bba4ef Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Fri, 2 Nov 2018 13:51:51 +0100
|
||||
Subject: [PATCH] Do not install to /usr/local
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
qskconfig.pri | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
|
||||
diff --git a/qskconfig.pri b/qskconfig.pri
|
||||
index f78c0c4..1926b5e 100644
|
||||
--- a/qskconfig.pri
|
||||
+++ b/qskconfig.pri
|
||||
@@ -10,10 +10,6 @@ QSK_VERSION = $${QSK_VER_MAJ}.$${QSK_VER_MIN}.$${QSK_VER_PAT}
|
||||
|
||||
QSK_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
|
||||
|
||||
-unix {
|
||||
- QSK_INSTALL_PREFIX = /usr/local/qskinny-$${QSK_VERSION}
|
||||
-}
|
||||
-
|
||||
win32 {
|
||||
QSK_INSTALL_PREFIX = C:/Qskinny-$${QSK_VERSION}
|
||||
}
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -7,9 +7,10 @@ inherit qmake5 qemu-ext
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/uwerat/qskinny.git \
|
||||
file://0001-Add-installation-targets.patch \
|
||||
file://0001-Fix-linking-for-all-examples.patch \
|
||||
file://0002-Do-not-install-to-usr-local.patch \
|
||||
"
|
||||
SRCREV = "7d39d8dbf659c22b9c65cac13a3da4119ea4b293"
|
||||
SRCREV = "84e19c43f800f1d05f23dcb855807e0159b8fa04"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "0.0.1+git${SRCPV}"
|
||||
|
||||
@@ -32,6 +33,20 @@ do_configure_prepend() {
|
||||
done
|
||||
}
|
||||
|
||||
do_install_append() {
|
||||
# Don't not pollute /usr/include
|
||||
install -d ${D}${includedir}/qskinny
|
||||
for header in `find ${D}/${includedir} -name '*.h*'`; do
|
||||
mv $header ${D}${includedir}/qskinny/
|
||||
done
|
||||
|
||||
# plugins are not yet used as such -> libdir
|
||||
for lib in `find ${D}/usr/plugins -name '*.so*'`; do
|
||||
mv $lib ${D}${libdir}/
|
||||
done
|
||||
rm -r ${D}/usr/plugins
|
||||
}
|
||||
|
||||
PACKAGES =+ "${PN}-examples"
|
||||
|
||||
FILES_${PN} += " \
|
||||
|
||||
Reference in New Issue
Block a user