From 5b80bfd7bffd4c20d80b7c70a7130529e9a755dd Mon Sep 17 00:00:00 2001
From: ToshikazuOhiwa <toshikazu_ohiwa@mail.toyota.co.jp>
Date: Mon, 30 Mar 2020 09:24:26 +0900
Subject: agl-basesystem

---
 ...INSTALL_PRF-to-allow-the-build-with-opene.patch | 32 +++++++
 ...ig.pri-Use-O1-optimization-in-DEBUG-flags.patch | 32 +++++++
 .../maliit-framework-qt5/maliit-server.desktop     |  6 ++
 .../recipes-qt/maliit/maliit-framework-qt5_git.bb  | 97 ++++++++++++++++++++++
 .../recipes-qt/maliit/maliit-plugins-qt5_git.bb    | 36 ++++++++
 5 files changed, 203 insertions(+)
 create mode 100644 external/meta-qt5/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch
 create mode 100644 external/meta-qt5/recipes-qt/maliit/maliit-framework-qt5/0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch
 create mode 100644 external/meta-qt5/recipes-qt/maliit/maliit-framework-qt5/maliit-server.desktop
 create mode 100644 external/meta-qt5/recipes-qt/maliit/maliit-framework-qt5_git.bb
 create mode 100644 external/meta-qt5/recipes-qt/maliit/maliit-plugins-qt5_git.bb

(limited to 'external/meta-qt5/recipes-qt/maliit')

diff --git a/external/meta-qt5/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch b/external/meta-qt5/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch
new file mode 100644
index 00000000..a4103f25
--- /dev/null
+++ b/external/meta-qt5/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch
@@ -0,0 +1,32 @@
+From be5c73c72d1efa90ba440957d6f5ff3278c25545 Mon Sep 17 00:00:00 2001
+From: Samuel Stirtzel <s.stirtzel@googlemail.com>
+Date: Wed, 1 Aug 2012 13:21:51 +0200
+Subject: [PATCH] Fix MALIIT_INSTALL_PRF to allow the build with openembedded
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
+
+---
+ config.pri | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/config.pri b/config.pri
+index 8f24864..94d595a 100644
+--- a/config.pri
++++ b/config.pri
+@@ -144,9 +144,11 @@ noxcb {
+     DEFINES += NOXCB
+ }
+ 
+-MALIIT_INSTALL_PRF = $$[QT_INSTALL_DATA]/mkspecs/features
+-local-install {
+-    MALIIT_INSTALL_PRF = $$replace(MALIIT_INSTALL_PRF, $$[QT_INSTALL_PREFIX], $$PREFIX)
++isEmpty(MALIIT_INSTALL_PRF) {
++    MALIIT_INSTALL_PRF = $$[QT_INSTALL_DATA]/mkspecs/features
++    local-install {
++        MALIIT_INSTALL_PRF = $$replace(MALIIT_INSTALL_PRF, $$[QT_INSTALL_PREFIX], $$PREFIX)
++    }
+ }
+ 
+ defineTest(outputFile) {
diff --git a/external/meta-qt5/recipes-qt/maliit/maliit-framework-qt5/0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch b/external/meta-qt5/recipes-qt/maliit/maliit-framework-qt5/0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch
new file mode 100644
index 00000000..2310e637
--- /dev/null
+++ b/external/meta-qt5/recipes-qt/maliit/maliit-framework-qt5/0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch
@@ -0,0 +1,32 @@
+From fb4316ca6e44a6b34e7d109360fc716c372e1293 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 12 Jul 2017 11:45:06 -0700
+Subject: [PATCH] config.pri: Use -O1 optimization in DEBUG flags
+
+when building wit FORTIFY_SOURCES we need some level of
+optimization turned on for the compile to succeed
+
+O1 is a good compromise between debug quality and
+optimization level.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+---
+ config.pri | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/config.pri b/config.pri
+index 94d595a..d7b221f 100644
+--- a/config.pri
++++ b/config.pri
+@@ -15,8 +15,8 @@ include(defines.pri)
+ # Linker optimization for release build
+ QMAKE_LFLAGS_RELEASE+=-Wl,--as-needed
+ # Compiler warnings are error if the build type is debug
+-QMAKE_CXXFLAGS_DEBUG+=-Werror -O0
+-QMAKE_CFLAGS_DEBUG+=-Werror -O0
++QMAKE_CXXFLAGS_DEBUG+=-Werror -O1
++QMAKE_CFLAGS_DEBUG+=-Werror -O1
+ 
+ OBJECTS_DIR = .obj
+ MOC_DIR = .moc
diff --git a/external/meta-qt5/recipes-qt/maliit/maliit-framework-qt5/maliit-server.desktop b/external/meta-qt5/recipes-qt/maliit/maliit-framework-qt5/maliit-server.desktop
new file mode 100644
index 00000000..24bdf9b5
--- /dev/null
+++ b/external/meta-qt5/recipes-qt/maliit/maliit-framework-qt5/maliit-server.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Maliit server
+Exec=/usr/bin/maliit-server
+Icon=
+Type=Application
+Categories=Utility;
diff --git a/external/meta-qt5/recipes-qt/maliit/maliit-framework-qt5_git.bb b/external/meta-qt5/recipes-qt/maliit/maliit-framework-qt5_git.bb
new file mode 100644
index 00000000..232e8252
--- /dev/null
+++ b/external/meta-qt5/recipes-qt/maliit/maliit-framework-qt5_git.bb
@@ -0,0 +1,97 @@
+DESCRIPTION = "A virtual keyboard for touch-screen based user interfaces"
+HOMEPAGE = "https://wiki.maliit.org/Main_Page"
+
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=5c917f6ce94ceb8d8d5e16e2fca5b9ad"
+
+inherit qmake5 qmake5_paths
+
+SRC_URI = "git://github.com/maliit/framework.git;branch=master \
+           file://0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch \
+           file://maliit-server.desktop \
+           file://0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch \
+           "
+
+SRCREV = "60b1b10de14f932420313c547ab801daf522d539"
+PV = "0.99.0+git${SRCPV}"
+
+
+PACKAGES =+ "${PN}-gtk"
+GTKIMMODULES_PACKAGES = "${PN}-gtk"
+
+DEPENDS = "qtdeclarative"
+
+RRECOMMENDS_${PN} = "maliit-plugins-qt5"
+
+FILES_${PN} += "\
+    ${libdir}/*.so* \
+    ${bindir} \
+    ${datadir}/applications/maliit-server.desktop \
+    ${datadir}/dbus-1 \
+    ${OE_QMAKE_PATH_PLUGINS}/platforminputcontexts \
+"
+
+FILES_${PN}-dbg += "\
+    ${libdir}/maliit-framework-tests \
+"
+
+FILES_${PN}-dev += "\
+    ${includedir}/maliit \
+    ${libdir}/pkgconfig \
+    ${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs \
+"
+
+EXTRA_QMAKEVARS_PRE = "\
+    PREFIX=${OE_QMAKE_PATH_PREFIX} \
+    LIBDIR=${OE_QMAKE_PATH_LIBS} \
+    DATADIR=${OE_QMAKE_PATH_DATA} \
+    QT_INSTALL_PLUGINS=${OE_QMAKE_PATH_PLUGINS} \
+    MALIIT_INSTALL_PRF=${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/features \
+    SCHEMADIR=${sysconfdir}/gconf/schemas \
+    CONFIG+=disable-gconf \
+    CONFIG+=disable-gtk-cache-update \
+    CONFIG+=local-install \
+    CONFIG+=nosdk \
+    CONFIG+=nodoc \
+    CONFIG+=noxcb \
+    CONFIG+=enable-dbus-activation \
+    CONFIG+=qt5-inputcontext \
+"
+
+# tests fail to build with clang
+EXTRA_QMAKEVARS_PRE_append_toolchain-clang = " CONFIG+=notests"
+
+EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
+
+do_install_append() {
+    #Fix absolute paths
+    sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/features/maliit-framework.prf
+    sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/features/maliit-plugins.prf
+
+    install -d ${D}${datadir}/applications
+    install -m 644 ${WORKDIR}/maliit-server.desktop ${D}${datadir}/applications
+}
+
+pkg_postinst_${PN} () {
+#!/bin/sh
+# should run online
+if [ "x$D" != "x" ]; then
+    exit 1
+fi
+echo "export QT_IM_MODULE=Maliit" >> /etc/xprofile
+ln -s /usr/share/applications/maliit-server.desktop /etc/xdg/autostart/maliit-server.desktop
+}
+
+pkg_postrm_${PN} () {
+#!/bin/sh
+# should run online
+if [ "x$D" = "x" ]; then
+    exit 1
+fi
+if [ -e "/etc/xprofile" ]; then
+    sed -i -e "g|export QT_IM_MODULE=Maliit|d" /etc/xprofile
+fi
+rm -f /etc/xdg/autostart/maliit-server.desktop
+}
+
+S = "${WORKDIR}/git"
diff --git a/external/meta-qt5/recipes-qt/maliit/maliit-plugins-qt5_git.bb b/external/meta-qt5/recipes-qt/maliit/maliit-plugins-qt5_git.bb
new file mode 100644
index 00000000..8225cb54
--- /dev/null
+++ b/external/meta-qt5/recipes-qt/maliit/maliit-plugins-qt5_git.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "Plugins for a virtual keyboard for touch-screen based user interfaces"
+HOMEPAGE = "https://wiki.maliit.org/Main_Page"
+
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=f29b21caa8e460097bfad9c026a33621"
+
+inherit qmake5
+
+DEPENDS = "maliit-framework-qt5"
+
+RDEPENDS_${PN} += "qtsvg-plugins"
+
+SRC_URI = "git://github.com/maliit/plugins.git;branch=master"
+
+SRCREV = "c6a348592607248a771a3dde5a0e33dc3c433a2a"
+PV = "0.99.0+git${SRCPV}"
+
+EXTRA_QMAKEVARS_PRE = "\
+    PREFIX=${prefix} \
+    MALIIT_INSTALL_PRF=${QMAKE_MKSPEC_PATH}/mkspecs/features \
+    MALIIT_PLUGINS_DATA_DIR=${datadir} \
+    LIBDIR=${libdir} \
+    CONFIG+=nodoc \
+"
+
+# tests fail to build with clang
+EXTRA_QMAKEVARS_PRE_append_toolchain-clang = " CONFIG+=notests"
+
+FILES_${PN} += "\
+    ${libdir}/maliit \
+    ${datadir} \
+"
+
+S= "${WORKDIR}/git"
+
+EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
-- 
cgit 1.2.3-korg