ki18n: build from release tarball instead of git

* add pythonnative to inherit
* Release tarball ships po files. As we have patched out the gettext/libintl
  configuration there is missing tool missing during compile. To fix this
  we add an additional patch not handling po-files for native build.

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2015-02-16 14:25:54 +01:00
parent 25a8f8cd9d
commit d04b82ba28
4 changed files with 39 additions and 5 deletions

View File

@@ -0,0 +1,32 @@
From 69bf91f00ec2f62907d57e6ce0f1a044669ba837 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Mon, 16 Feb 2015 14:46:17 +0100
Subject: [PATCH] do not install po-files for native build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [embedded-specific]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
CMakeLists.txt | 3 ---
1 file changed, 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e7c284c..aaa0c76 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,9 +47,6 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII)
remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
add_definitions(-DTRANSLATION_DOMAIN=\"ki18n5\")
-if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
- ki18n_install(po)
-endif()
add_subdirectory(src)
add_subdirectory(autotests)
--
1.9.3

View File

@@ -2,7 +2,10 @@ require ${BPN}.inc
inherit native
SRC_URI += "file://0002-CMakeLists.txt-do-not-search-for-libintl-gettext.patch"
SRC_URI += " \
file://0002-CMakeLists.txt-do-not-search-for-libintl-gettext.patch \
file://0003-do-not-install-po-files-for-native-build.patch \
"
EXTRA_OECMAKE += "-DBUILD_WITH_QTSCRIPT=OFF"

View File

@@ -1,6 +1,6 @@
require ${BPN}.inc
inherit cmake-lib
inherit cmake-lib pythonnative
SRC_URI += "file://0001-align-KI18N_MODULE_DIR-to-proper-path.patch"

View File

@@ -8,6 +8,5 @@ LIC_FILES_CHKSUM = " \
inherit kde-kf5
PV = "${KF5_VERSION}"
SRCREV = "1a5df65f06d5f51da1d6e1f06229ebd95b3161d9"
S = "${WORKDIR}/git"
SRC_URI[md5sum] = "71cb953acb2a9e7a6106b1e22260801a"
SRC_URI[sha256sum] = "ecf25edc6ff0b1e5e9b55f9f473977ab3fdb7b36a3af0a66a1afc850334c7f9b"