* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ki18n/, kde-frameworks/ki18n/files/
@ 2017-07-06 12:15 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2017-07-06 12:15 UTC (permalink / raw
To: gentoo-commits
commit: f77b1d87c3ec1625a950b58849d5430744040528
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 6 12:13:48 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 6 12:14:39 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f77b1d87
kde-frameworks/ki18n: Fix stable L10N build regression
See also: https://phabricator.kde.org/D6331
Upstream commit 77eab970fde3ecbc259d6deff61fce4f360b05a7
Package-Manager: Portage-2.3.6, Repoman-2.3.1
.../ki18n/files/ki18n-5.34.0-tsfiles.patch | 98 ++++++++++++++++++++++
kde-frameworks/ki18n/ki18n-5.34.0-r1.ebuild | 38 +++++++++
2 files changed, 136 insertions(+)
diff --git a/kde-frameworks/ki18n/files/ki18n-5.34.0-tsfiles.patch b/kde-frameworks/ki18n/files/ki18n-5.34.0-tsfiles.patch
new file mode 100644
index 00000000000..416ebf0d5b2
--- /dev/null
+++ b/kde-frameworks/ki18n/files/ki18n-5.34.0-tsfiles.patch
@@ -0,0 +1,98 @@
+From 77eab970fde3ecbc259d6deff61fce4f360b05a7 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Mon, 3 Jul 2017 17:30:21 +0200
+Subject: Make sure that the tsfiles target is generated
+
+Summary:
+I'm not sure how it's possible that pofiles is defined but tsfiles
+isn't, but this does fix the issue reported by Luigi:
+CMake Error at /usr/lib64/cmake/KF5I18n/KF5I18NMacros.cmake:129
+(add_dependencies):
+ Cannot add target-level dependencies to non-existent target "tsfiles".
+
+Test Plan:
+Built `svn+ssh://svn@svn.kde.org/home/kde/trunk/l10n-kf5/fr` by doing
+`./scripts/autogen.sh fr; mkdir build; cd build; cmake ../fr`
+
+Reviewers: #frameworks, ltoscano, lueck, aacid
+
+Reviewed By: ltoscano
+
+Subscribers: aacid, asturmlechner
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D6331
+---
+ cmake/KF5I18NMacros.cmake | 50 ++++++++++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 47 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/KF5I18NMacros.cmake b/cmake/KF5I18NMacros.cmake
+index 022de52..6168b2a 100644
+--- a/cmake/KF5I18NMacros.cmake
++++ b/cmake/KF5I18NMacros.cmake
+@@ -123,6 +123,8 @@ function(KI18N_INSTALL podir)
+
+ if (NOT TARGET pofiles)
+ add_custom_target(pofiles)
++ endif()
++ if (NOT TARGET tsfiles)
+ add_custom_target(tsfiles)
+ endif()
+ add_dependencies(pofiles pofiles-${pathmd5})
+@@ -132,7 +134,49 @@ function(KI18N_INSTALL podir)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${dirname} DESTINATION ${destname})
+ endfunction()
+
+-function(ki18n_install_ts_files _lang)
+- message(AUTHOR_WARNING "KI18N_INSTALL_TS_FILES is deprecated!")
+- ki18n_install(${_lang})
++#install the scripts for a given language in the target folder
++#usage: KI18N_INSTALL_TS_FILES("ja" ${scripts_dir})
++function(KI18N_INSTALL_TS_FILES lang scripts_dir)
++ file(GLOB_RECURSE ts_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${scripts_dir}/*)
++ set(pmapc_files)
++ foreach(ts_file ${ts_files})
++ string(REGEX MATCH "\\.svn/" in_svn ${ts_file})
++ if(NOT in_svn)
++ # If ts_file is "path/to/foo/bar.js"
++ # We want subpath to contain "foo"
++ get_filename_component(subpath ${ts_file} DIRECTORY)
++ get_filename_component(subpath ${subpath} NAME)
++ install(FILES ${ts_file}
++ DESTINATION ${LOCALE_INSTALL_DIR}/${lang}/LC_SCRIPTS/${subpath})
++ # If current file is a pmap, also install the compiled version.
++ get_filename_component(ts_ext ${ts_file} EXT)
++ if(ts_ext STREQUAL ".pmap")
++ set(pmap_file ${ts_file})
++ get_filename_component(pmap_basename ${ts_file} NAME)
++ set(pmapc_basename "${pmap_basename}c")
++ set(pmapc_file "${lang}-${subpath}-${pmapc_basename}")
++ add_custom_command(OUTPUT ${pmapc_file}
++ COMMAND ${PYTHON_EXECUTABLE}
++ ARGS
++ -B
++ ${_ki18n_pmap_compile_script}
++ ${CMAKE_CURRENT_SOURCE_DIR}/${pmap_file}
++ ${pmapc_file}
++ DEPENDS ${pmap_file})
++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${pmapc_file}
++ DESTINATION ${LOCALE_INSTALL_DIR}/${lang}/LC_SCRIPTS/${subpath}
++ RENAME ${pmapc_basename})
++ list(APPEND pmapc_files ${pmapc_file})
++ endif()
++ endif()
++ endforeach()
++ if(pmapc_files)
++ if(NOT TARGET pmapfiles)
++ add_custom_target(pmapfiles)
++ endif()
++ set(pmapc_target "pmapfiles-${lang}")
++ string(REPLACE "@" "_" pmapc_target ${pmapc_target})
++ add_custom_target(${pmapc_target} ALL DEPENDS ${pmapc_files})
++ add_dependencies(pmapfiles ${pmapc_target})
++ endif()
+ endfunction()
+--
+cgit v0.11.2
+
diff --git a/kde-frameworks/ki18n/ki18n-5.34.0-r1.ebuild b/kde-frameworks/ki18n/ki18n-5.34.0-r1.ebuild
new file mode 100644
index 00000000000..ef4e14f9f48
--- /dev/null
+++ b/kde-frameworks/ki18n/ki18n-5.34.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit kde5 python-single-r1
+
+DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ $(add_qt_dep qtscript)
+ sys-devel/gettext
+ virtual/libintl
+"
+DEPEND="${RDEPEND}
+ test? (
+ $(add_qt_dep qtconcurrent)
+ $(add_qt_dep qtdeclarative)
+ )
+"
+
+PATCHES=( "${FILESDIR}/${P}-tsfiles.patch" )
+
+pkg_setup() {
+ kde5_pkg_setup
+ python-single-r1_pkg_setup
+}
+
+src_install() {
+ kde5_src_install
+ python_fix_shebang "${ED}/usr/$(get_libdir)/cmake/KF5I18n/ts-pmap-compile.py"
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ki18n/, kde-frameworks/ki18n/files/
@ 2018-04-22 9:32 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2018-04-22 9:32 UTC (permalink / raw
To: gentoo-commits
commit: 4b2a7ee17866dd768651b51cd6640f39506a8469
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 22 08:00:46 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 22 09:32:37 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b2a7ee1
kde-frameworks/ki18n: Fix performance of build-pofiles
Thanks-to: Greg Turner <gmturner007 <AT> ameritech.net>
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=393141
See also: https://phabricator.kde.org/D12216
Closes: https://bugs.gentoo.org/653756
Package-Manager: Portage-2.3.31, Repoman-2.3.9
.../files/ki18n-5.45.0-fix-build-pofiles.patch | 38 ++++++++++++++++++++
kde-frameworks/ki18n/ki18n-5.45.0-r2.ebuild | 40 ++++++++++++++++++++++
2 files changed, 78 insertions(+)
diff --git a/kde-frameworks/ki18n/files/ki18n-5.45.0-fix-build-pofiles.patch b/kde-frameworks/ki18n/files/ki18n-5.45.0-fix-build-pofiles.patch
new file mode 100644
index 00000000000..055a4c24db9
--- /dev/null
+++ b/kde-frameworks/ki18n/files/ki18n-5.45.0-fix-build-pofiles.patch
@@ -0,0 +1,38 @@
+From 9c32bdab29b345976eee3b9c1c4bebd76cdcdde2 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Sun, 15 Apr 2018 01:39:58 +0200
+Subject: Don't need to run previous iterations commands again
+
+Summary: BUG: 393141
+
+Test Plan:
+Tested building plasma-workspace, it was clearly faster (although it
+would have finished eventually)
+
+Reviewers: #frameworks, arojas, sitter
+
+Reviewed By: sitter
+
+Subscribers: sitter, heikobecker
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D12216
+---
+ cmake/build-pofiles.cmake | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/cmake/build-pofiles.cmake b/cmake/build-pofiles.cmake
+index d0991ad..b39be31 100644
+--- a/cmake/build-pofiles.cmake
++++ b/cmake/build-pofiles.cmake
+@@ -62,6 +62,7 @@ foreach(pofile IN LISTS pofiles)
+ if(i EQUAL ${numberOfProcesses})
+ _processCommands()
+ set(i 0)
++ set(commands)
+ endif()
+ endforeach()
+
+--
+cgit v0.11.2
diff --git a/kde-frameworks/ki18n/ki18n-5.45.0-r2.ebuild b/kde-frameworks/ki18n/ki18n-5.45.0-r2.ebuild
new file mode 100644
index 00000000000..f419eb73015
--- /dev/null
+++ b/kde-frameworks/ki18n/ki18n-5.45.0-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit kde5 python-single-r1
+
+DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ $(add_qt_dep qtscript)
+ sys-devel/gettext
+ virtual/libintl
+"
+DEPEND="${RDEPEND}
+ test? (
+ $(add_qt_dep qtconcurrent)
+ $(add_qt_dep qtdeclarative)
+ )
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-build-pofiles.patch" )
+
+pkg_setup() {
+ kde5_pkg_setup
+ python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DPYTHON_EXECUTABLE="${PYTHON}"
+ )
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-04-22 9:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-22 9:32 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ki18n/, kde-frameworks/ki18n/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2017-07-06 12:15 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox