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

kwallet: make it build

Browse Source 
TBD: send patches to oe-core for libassuan-native and gpgme-native

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2014-12-04 15:01:12 +01:00
parent dea8247644
commit 75aa097b0c
2 changed files with 55 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
recipes-kde-framework/tier3/kwallet/files/0001-add-NO_CMAKE_FIND_ROOT_PATH-in-find-to-org.kde.KWall.patch Normal file
View File

@@ -0,0 +1,35 @@
From 184ac153212ef545434ec56c3d414b636c11e6d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Thu, 4 Dec 2014 14:44:29 +0100
Subject: [PATCH] add NO_CMAKE_FIND_ROOT_PATH in find to org.kde.KWallet.xml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
in sysrooted environment build ended up in:
| make[2]: *** No rule to make target '/home/a.mueller/tmp/oe-core-glibc/work/cortexa9hf-vfp-neon-angstrom-linux-gnueabi/kwallet/5.5.0-r0/git/src/runtime/kwalletd/kwallet_xml-NOTFOUND', needed by 'src/runtime/kwalletd/home/a.mueller/tmp/oe-core-glibc/work/cortexa9hf-vfp-neon-angstrom-linux-gnueabi/kwallet/5.5.0-r0/git/src/runtime/kwalletd/kwallet_xml-notfound.cpp'. Stop.
Upstream-Status: pending
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
src/runtime/kwalletd/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/runtime/kwalletd/CMakeLists.txt b/src/runtime/kwalletd/CMakeLists.txt
index 907ef19..4b71d85 100644
--- a/src/runtime/kwalletd/CMakeLists.txt
+++ b/src/runtime/kwalletd/CMakeLists.txt
@@ -79,7 +79,7 @@ if (KF5Gpgmepp_FOUND)
)
endif(KF5Gpgmepp_FOUND)
-find_file(kwallet_xml org.kde.KWallet.xml HINTS ${CMAKE_CURRENT_SOURCE_DIR}/../../api/KWallet)
+find_file(kwallet_xml org.kde.KWallet.xml HINTS ${CMAKE_CURRENT_SOURCE_DIR}/../../api/KWallet NO_CMAKE_FIND_ROOT_PATH)
qt5_add_dbus_adaptor( kwalletd_SRCS ${kwallet_xml} kwalletd.h KWalletD )
--
1.8.3.1

25
recipes-kde-framework/tier3/kwallet/kwallet_5.5.0.bb
View File

@@ -6,12 +6,27 @@ LIC_FILES_CHKSUM = " \
inherit kde cmake-lib
DEPENDS += "libgcrypt gpgme kconfig kwindowsystem ki18n"
DEPENDS += " \
libgcrypt \
gpgme-native gpgme \
kconfig \
kcoreaddons \
kdbusaddons \
kiconthemes \
ki18n \
knotifications \
kservice \
kwidgetsaddons \
kwindowsystem \
"
# TBD: add KF5Gpgmepp with PACKAGECONFIG??
SRC_URI += "file://0001-add-NO_CMAKE_FIND_ROOT_PATH-in-find-to-org.kde.KWall.patch"
SRCREV = "85723c9c84a1a47e4e108de812183ac07656859b"
#EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
# cross libs / headers
CMAKE_HIDE_ERROR[1] = "KF5XmlGui, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_HIDE_ERROR[2] = "KF5XmlGui, -S${includedir}, -S${STAGING_INCDIR}"
CMAKE_HIDE_ERROR[1] = "KF5Wallet, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_HIDE_ERROR[2] = "KF5Wallet, -S${includedir}, -S${STAGING_INCDIR}"
FILES_${PN} += "${datadir}"