qskinny: remove
It stopped building with Qt 5.14. Attempts to upgrade failed: Qmake build configuration is not prepared for build systems. Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
@@ -1,69 +0,0 @@
|
||||
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
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
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
|
||||
|
||||
@@ -1,59 +0,0 @@
|
||||
SUMMARY = "A lightweight framework on top of the Qt scene graph"
|
||||
DESCRIPTION = "A lightweight framework on top of the Qt scene graph and only few classes from Qt/Quick. It is usable from C++ and/or QML"
|
||||
LICENSE = "LGPLv2.1-qskinny-exception"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=ef112951de2dd97ead272458f5b86bdc"
|
||||
|
||||
inherit qmake5 qemu-ext
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/uwerat/qskinny.git \
|
||||
file://0001-Fix-linking-for-all-examples.patch \
|
||||
file://0002-Do-not-install-to-usr-local.patch \
|
||||
"
|
||||
SRCREV = "84e19c43f800f1d05f23dcb855807e0159b8fa04"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "0.0.1+git${SRCPV}"
|
||||
|
||||
DEPENDS += " \
|
||||
qtbase \
|
||||
qtdeclarative \
|
||||
qtsvg \
|
||||
"
|
||||
|
||||
PACKAGECONFIG ?= ""
|
||||
PACKAGECONFIG[qtwebengine] = ",,qtwebengine"
|
||||
|
||||
SVG2QVG_CALL_IN_SOURCE = "$${SVG2QVG}"
|
||||
QEMUCALL = "${@qemu_run_binary_local(d, '${STAGING_DIR_TARGET}', '')}"
|
||||
|
||||
do_configure_prepend() {
|
||||
for pro_file in `find ${S} -name *.pro`; do
|
||||
# wrap cross svg2qvg by qemu
|
||||
sed -i 's|${SVG2QVG_CALL_IN_SOURCE}|${QEMUCALL} ${SVG2QVG_CALL_IN_SOURCE}|g' "$pro_file"
|
||||
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} += " \
|
||||
${libdir}/lib*skin.so \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
"
|
||||
|
||||
FILES_${PN}-examples += "${bindir}"
|
||||
|
||||
FILES_SOLIBSDEV = "${libdir}/libqsk*${SOLIBSDEV}"
|
||||
Reference in New Issue
Block a user