From db08b4be9bf6f89f01d8408d6d4bae73c91bf6a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 16 Feb 2015 16:02:28 +0100 Subject: [PATCH] kdoctools: build from release tarball instead of git MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit native patch for ignoring documentation had to be aligned slightly: tarball is shipping po-file bit we do not configure for the tools to handle them. This change is similar to that in ki18n-native's transition to tarball. Signed-off-by: Andreas Müller --- .../files/0004-don-t-build-documentation.patch | 17 +++++++++++------ recipes-kde/kf5/tier2/kdoctools/kdoctools.inc | 4 ++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/recipes-kde/kf5/tier2/kdoctools/files/0004-don-t-build-documentation.patch b/recipes-kde/kf5/tier2/kdoctools/files/0004-don-t-build-documentation.patch index 1aafc2e9..4c138cea 100644 --- a/recipes-kde/kf5/tier2/kdoctools/files/0004-don-t-build-documentation.patch +++ b/recipes-kde/kf5/tier2/kdoctools/files/0004-don-t-build-documentation.patch @@ -10,16 +10,21 @@ Upstream-Status: Inappropriate [configuration] Signed-off-by: Andreas Müller --- - CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) + CMakeLists.txt | 4 ---- + 1 file changed, 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 425c688..3adbd7e 100644 +index 62328bf..7adc6f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -81,7 +81,6 @@ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po" AND KF5I18n_FOUND) - kdoctools_install(po) - endif() +@@ -74,12 +74,7 @@ set(KDOCTOOLS_LANGUAGES_LIST af bg ca cs da de el en-GB en eo es et fi fo fr gl + + set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5DocTools") + add_definitions(-DTRANSLATION_DOMAIN=\"kdoctools5\") +-if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po" AND KF5I18n_FOUND) +- ki18n_install(po) +- kdoctools_install(po) +-endif() add_subdirectory(common) -add_subdirectory(docs) add_subdirectory(src) diff --git a/recipes-kde/kf5/tier2/kdoctools/kdoctools.inc b/recipes-kde/kf5/tier2/kdoctools/kdoctools.inc index e3622331..e5e9949a 100644 --- a/recipes-kde/kf5/tier2/kdoctools/kdoctools.inc +++ b/recipes-kde/kf5/tier2/kdoctools/kdoctools.inc @@ -11,8 +11,8 @@ inherit kde-kf5 DEPENDS += "docbook-xml-dtd4 docbook-xsl-stylesheets" PV = "${KF5_VERSION}" -SRCREV = "93b844cdcfde640acfb231429c1c685de2c3cc4f" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "65efa563057f08eb25bf626eab5d7345" +SRC_URI[sha256sum] = "b125d7b2654cbbe6ba0f5eaf7773f688c54ba4bd048046f7a2134b3954869a06" SRC_URI += " \ file://0001-Add-cmdline-param-to-help-find-xsl.patch \