diff --git a/recipes-kde/framework-tier1/ki18n/files/0002-align-KI18N_MODULE_DIR-to-proper-path.patch b/recipes-kde/framework-tier1/ki18n/files/0001-align-KI18N_MODULE_DIR-to-proper-path.patch similarity index 87% rename from recipes-kde/framework-tier1/ki18n/files/0002-align-KI18N_MODULE_DIR-to-proper-path.patch rename to recipes-kde/framework-tier1/ki18n/files/0001-align-KI18N_MODULE_DIR-to-proper-path.patch index 2ab7f326..11d909a3 100644 --- a/recipes-kde/framework-tier1/ki18n/files/0002-align-KI18N_MODULE_DIR-to-proper-path.patch +++ b/recipes-kde/framework-tier1/ki18n/files/0001-align-KI18N_MODULE_DIR-to-proper-path.patch @@ -1,7 +1,7 @@ -From e977098c48c7cbea7bfc13b059759d02e78e5f55 Mon Sep 17 00:00:00 2001 +From 2a041dadd884a69ca2c893a2bd76bd3c5071a8c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 1 Dec 2014 19:14:24 +0100 -Subject: [PATCH] align KI18N_MODULE_DIR to proper path +Subject: [PATCH 1/2] align KI18N_MODULE_DIR to proper path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/recipes-kde/framework-tier1/ki18n/files/0001-set-mkspec-path-as-set-in-meta-qt5.patch b/recipes-kde/framework-tier1/ki18n/files/0001-set-mkspec-path-as-set-in-meta-qt5.patch deleted file mode 100644 index fba48e91..00000000 --- a/recipes-kde/framework-tier1/ki18n/files/0001-set-mkspec-path-as-set-in-meta-qt5.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 87a5d75ec4e9a804850bd8e2b3a69e364a9603fc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 15 Jan 2014 23:10:05 +0100 -Subject: [PATCH] set mkspec path as set in meta-qt5 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [config] - -Signed-off-by: Andreas Müller ---- - src/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 683a5b9..2cf079a 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -111,7 +111,7 @@ QT.@PRI_TARGET_BASENAME@.depends = @PRI_TARGET_QTDEPS@" - - # This default value makes "installing qt and kf5 into the same prefix" work out of the box. - # Packagers who use -DCMAKE_INSTALL_PREFIX=/usr will certainly want to set ECM_MKSPECS_INSTALL_DIR to something like share/qt5/mkspecs/modules --set(ECM_MKSPECS_INSTALL_DIR mkspecs/modules CACHE PATH "The directory where mkspecs will be installed to.") -+set(ECM_MKSPECS_INSTALL_DIR lib/qt5/mkspecs/modules CACHE PATH "The directory where mkspecs will be installed to.") - - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qt_${PRI_TARGET_BASENAME}.pri DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) - #### end of qmake support --- -1.8.3.1 - diff --git a/recipes-kde/framework-tier1/ki18n/files/0002-CMakeLists.txt-do-not-search-for-libintl-gettext.patch b/recipes-kde/framework-tier1/ki18n/files/0002-CMakeLists.txt-do-not-search-for-libintl-gettext.patch new file mode 100644 index 00000000..d2955f18 --- /dev/null +++ b/recipes-kde/framework-tier1/ki18n/files/0002-CMakeLists.txt-do-not-search-for-libintl-gettext.patch @@ -0,0 +1,48 @@ +From 1f7e6c3b0bbbb25e83550739692e857fc5d7ea84 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 5 Jan 2015 13:39:45 +0100 +Subject: [PATCH 2/2] CMakeLists.txt: do not search for libintl / gettext +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 +--- + CMakeLists.txt | 6 ------ + cmake/KF5I18NMacros.cmake | 1 - + 2 files changed, 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3bea9f5..46fd9a4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -30,12 +30,6 @@ include(KDEInstallDirs) + include(KDEFrameworkCompilerSettings) + include(KDECMakeSettings) + +-find_package(LibIntl) +-set_package_properties(LibIntl PROPERTIES TYPE REQUIRED +- URL "http://gnuwin32.sourceforge.net/packages/libintl.htm" +- PURPOSE "Needed for building KI18n unless glibc is the system libc implementation" +-) +- + include(cmake/KF5I18NMacros.cmake) + + remove_definitions(-DQT_NO_CAST_FROM_ASCII) +diff --git a/cmake/KF5I18NMacros.cmake b/cmake/KF5I18NMacros.cmake +index a55f472..1928e9d 100644 +--- a/cmake/KF5I18NMacros.cmake ++++ b/cmake/KF5I18NMacros.cmake +@@ -4,7 +4,6 @@ + # Redistribution and use is allowed according to the terms of the BSD license. + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +-find_package(Gettext REQUIRED) + find_package(PythonInterp REQUIRED) + + if(KI18N_MODULE_DIR) +-- +1.8.3.1 + diff --git a/recipes-kde/framework-tier1/ki18n/ki18n-native.bb b/recipes-kde/framework-tier1/ki18n/ki18n-native.bb index ac26e841..65b9a181 100644 --- a/recipes-kde/framework-tier1/ki18n/ki18n-native.bb +++ b/recipes-kde/framework-tier1/ki18n/ki18n-native.bb @@ -2,4 +2,7 @@ require ${BPN}.inc inherit native -DEPENDS += "qtscript-native gettext-native" +DEPENDS += "qtscript-native" + +SRC_URI += "file://0002-CMakeLists.txt-do-not-search-for-libintl-gettext.patch" + diff --git a/recipes-kde/framework-tier1/ki18n/ki18n.bb b/recipes-kde/framework-tier1/ki18n/ki18n.bb index b0a4546e..c0836858 100644 --- a/recipes-kde/framework-tier1/ki18n/ki18n.bb +++ b/recipes-kde/framework-tier1/ki18n/ki18n.bb @@ -2,7 +2,7 @@ require ${BPN}.inc inherit cmake-lib -SRC_URI += "file://0002-align-KI18N_MODULE_DIR-to-proper-path.patch" +SRC_URI += "file://0001-align-KI18N_MODULE_DIR-to-proper-path.patch" # cross libs / headers CMAKE_HIDE_ERROR[1] = "KF5I18n, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"