Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ki18n for openSUSE:Factory checked in at 2022-03-14 19:34:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ki18n (Old) and /work/SRC/openSUSE:Factory/.ki18n.new.25692 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ki18n" Mon Mar 14 19:34:29 2022 rev:105 rq:961249 version:5.92.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ki18n/ki18n.changes 2022-02-24 18:21:48.514684667 +0100 +++ /work/SRC/openSUSE:Factory/.ki18n.new.25692/ki18n.changes 2022-03-14 19:35:55.442044203 +0100 @@ -1,0 +2,11 @@ +Mon Mar 7 09:26:56 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.92.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.92.0 +- Changes since 5.91.0: + * Add Qt6 Android CI + * Remove broken Python bindings generation + +------------------------------------------------------------------- Old: ---- ki18n-5.91.0.tar.xz ki18n-5.91.0.tar.xz.sig New: ---- ki18n-5.92.0.tar.xz ki18n-5.92.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ki18n.spec ++++++ --- /var/tmp/diff_new_pack.RD2IMD/_old 2022-03-14 19:35:55.994044866 +0100 +++ /var/tmp/diff_new_pack.RD2IMD/_new 2022-03-14 19:35:56.010044885 +0100 @@ -17,14 +17,14 @@ %define lname libKF5I18n5 -%define _tar_path 5.91 +%define _tar_path 5.92 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without released Name: ki18n -Version: 5.91.0 +Version: 5.92.0 Release: 0 Summary: KDE Gettext-based UI text internationalization License: LGPL-2.1-or-later ++++++ ki18n-5.91.0.tar.xz -> ki18n-5.92.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.91.0/.gitlab-ci.yml new/ki18n-5.92.0/.gitlab-ci.yml --- old/ki18n-5.91.0/.gitlab-ci.yml 2022-02-05 22:24:09.000000000 +0100 +++ new/ki18n-5.92.0/.gitlab-ci.yml 2022-03-05 14:01:19.000000000 +0100 @@ -6,3 +6,4 @@ - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.91.0/CMakeLists.txt new/ki18n-5.92.0/CMakeLists.txt --- old/ki18n-5.91.0/CMakeLists.txt 2022-02-05 22:24:09.000000000 +0100 +++ new/ki18n-5.92.0/CMakeLists.txt 2022-03-05 14:01:19.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.91.0") # handled by release scripts +set(KF_VERSION "5.92.0") # handled by release scripts project(KI18n VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.91.0 NO_MODULE) +find_package(ECM 5.92.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.91.0/autotests/pythontest.py new/ki18n-5.92.0/autotests/pythontest.py --- old/ki18n-5.91.0/autotests/pythontest.py 2022-02-05 22:24:09.000000000 +0100 +++ new/ki18n-5.92.0/autotests/pythontest.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -#!/usr/bin/env python -#-*- coding: utf-8 -*- - -from __future__ import print_function - -import sys - -sys.path.append(sys.argv[1]) - -from PyQt5 import QtCore -from PyQt5 import QtWidgets - -from PyKF5 import KI18n - -def main(): - app = QtWidgets.QApplication(sys.argv) - - assert(KI18n.i18n("foo".encode('utf-8')) == "foo") - -if __name__ == '__main__': - sys.exit(main()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.91.0/cmake/rules_PyKF5.py new/ki18n-5.92.0/cmake/rules_PyKF5.py --- old/ki18n-5.91.0/cmake/rules_PyKF5.py 2022-02-05 22:24:09.000000000 +0100 +++ new/ki18n-5.92.0/cmake/rules_PyKF5.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,180 +0,0 @@ -#============================================================================= -# SPDX-FileCopyrightText: 2016 by Shaheed Haque (srha...@theiet.org) -# SPDX-FileCopyrightText: 2016 Stephen Kelly <steve...@gmail.com> -# -# SPDX-License-Identifier: BSD-3-Clause -#============================================================================= - -import os, sys - -import rules_engine -sys.path.append(os.path.dirname(os.path.dirname(rules_engine.__file__))) -import Qt5Ruleset - -from clang.cindex import CursorKind - -def i18n_ellipsis(container, function, sip, matcher): - if len(sip["template_parameters"]) == 0: - sip["parameters"] += ["..."] - else: - sip["name"] = "" - -def i18np_ellipsis(container, function, sip, matcher): - if len(sip["template_parameters"]) == 1: - sip["parameters"][-1] = "..." - sip["template_parameters"] = "" - else: - sip["name"] = "" - -def local_function_rules(): - return [ - ["KLocalizedString", "subs", ".*", ".*", ".*unsigned int.*", rules_engine.function_discard], - ["KLocalizedString", "subs", ".*", ".*", ".*long.*", rules_engine.function_discard], - ["KLocalizedString", "subs", ".*", ".*", ".*unsigned long.*", rules_engine.function_discard], - ["KLocalizedString", "subs", ".*", ".*", ".*unsigned long long.*", rules_engine.function_discard], - ["KLocalizedString", "subs", ".*", ".*", ".*QChar.*", rules_engine.function_discard], - ["Kuit", "setupForDomain", ".*", ".*", ".*", rules_engine.function_discard], - ["KuitSetup", "setTagPattern", ".*", ".*", ".*", rules_engine.function_discard], - - ["klocalizedstring.h", "i18n", ".*", ".*", ".*", i18n_ellipsis], - ["klocalizedstring.h", "i18nc", ".*", ".*", ".*", i18n_ellipsis], - ["klocalizedstring.h", "i18np", ".*", ".*", ".*", i18np_ellipsis], - ["klocalizedstring.h", "i18ncp", ".*", ".*", ".*", i18np_ellipsis], - ] - -def local_typedef_rules(): - return [ - [".*", "TagFormatter", rules_engine.typedef_discard], - ] - -def _klocalizedstring_add_template_code(filename, sip, entry): - sip["code"] = """ -%ModuleCode -QString klocalizedstring_i18n_template(KLocalizedString base, PyObject *list,int *sipIsErr) { - KLocalizedString result = base; - QString *arg; - long long_arg; - double double_arg; - int iserr = 0; - - for (int i=0; i < PyTuple_Size(list); i++) { - PyObject *pyarg = PyTuple_GET_ITEM (list, i); -#if PY_MAJOR_VERSION >= 3 - if (PyLong_Check(pyarg)) { - long_arg = PyLong_AsLong(pyarg); -#else - if (PyInt_Check(pyarg)) { - long_arg = PyInt_AsLong(pyarg); -#endif - if (long_arg==-1 && PyErr_Occurred()) { - *sipIsErr = 1; - return QString(); - } - result = result.subs(long_arg); - -#if PY_MAJOR_VERSION >= 3 - } else if (PyNumber_Check(pyarg)) { - PyObject *long_py = PyNumber_Long(pyarg); - long_arg = PyLong_AsLong(long_py); - Py_DECREF(long_py); -#else - } else if (PyLong_Check(pyarg)) { - long_arg = PyLong_AsLong(pyarg); -#endif - if (long_arg==-1 && PyErr_Occurred()) { - *sipIsErr = 1; - return QString(); - } - result = result.subs(long_arg); - - } else if (PyFloat_Check(pyarg)) { - double_arg = PyFloat_AsDouble(pyarg); - result = result.subs(double_arg); - - } else { - int state = 0; - arg = (QString *)sipForceConvertToType(pyarg, sipType_QString, NULL, SIP_NOT_NONE, &state, &iserr); - if (iserr) { - *sipIsErr = 1; - return QString(); - } - - result = result.subs(*arg); - sipReleaseType(arg,sipType_QString,state); - arg = 0; - } - } - - return result.toString(); -} -%End\n -""" - -class RuleSet(Qt5Ruleset.RuleSet): - """ - SIP file generator rules. This is a set of (short, non-public) functions - and regular expression-based matching rules. - """ - def __init__(self): - Qt5Ruleset.RuleSet.__init__(self) - self._fn_db = rules_engine.FunctionRuleDb(lambda: local_function_rules() + Qt5Ruleset.function_rules()) - self._typedef_db = rules_engine.TypedefRuleDb(lambda: local_typedef_rules()) - self._methodcode = rules_engine.MethodCodeDb({ - "klocalizedstring.h": { - "i18n": - { - "code": - """ - %MethodCode - QString result = klocalizedstring_i18n_template(ki18n(a0),a1,&sipIsErr); - if (!sipIsErr) { - sipRes = new QString(result); - } - %End - """ - }, - "i18nc": - { - "code": - """ - %MethodCode - QString result = klocalizedstring_i18n_template(ki18nc(a0,a1),a2,&sipIsErr); - if (!sipIsErr) { - sipRes = new QString(result); - } - %End - """ - }, - "i18np": - { - "code": - """ - %MethodCode - QString result = klocalizedstring_i18n_template(ki18np(a0,a1),a2,&sipIsErr); - if (!sipIsErr) { - sipRes = new QString(result); - } - %End - """ - }, - "i18ncp": - { - "code": - """ - %MethodCode - QString result = klocalizedstring_i18n_template(ki18ncp(a0,a1,a2),a3,&sipIsErr); - if (!sipIsErr) { - sipRes = new QString(result); - } - %End - """ - }, - } - }) - - self._modulecode = rules_engine.ModuleCodeDb({ - "klocalizedstring.h": - { - "code": _klocalizedstring_add_template_code, - }, - }) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.91.0/po/zh_CN/ki18n5.po new/ki18n-5.92.0/po/zh_CN/ki18n5.po --- old/ki18n-5.91.0/po/zh_CN/ki18n5.po 2022-02-05 22:24:09.000000000 +0100 +++ new/ki18n-5.92.0/po/zh_CN/ki18n5.po 2022-03-05 14:01:19.000000000 +0100 @@ -16,7 +16,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-01-02 00:43+0000\n" -"PO-Revision-Date: 2022-01-08 15:22\n" +"PO-Revision-Date: 2022-02-26 05:16\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.91.0/src/i18n/CMakeLists.txt new/ki18n-5.92.0/src/i18n/CMakeLists.txt --- old/ki18n-5.91.0/src/i18n/CMakeLists.txt 2022-02-05 22:24:09.000000000 +0100 +++ new/ki18n-5.92.0/src/i18n/CMakeLists.txt 2022-03-05 14:01:19.000000000 +0100 @@ -66,25 +66,6 @@ REQUIRED_HEADERS KI18n_HEADERS ) -find_package(PythonModuleGeneration) - -if (PythonModuleGeneration_FOUND) - ecm_generate_python_binding( - TARGET KF5::I18n - PYTHONNAMESPACE PyKF5 - MODULENAME KI18n - RULES_FILE "${CMAKE_SOURCE_DIR}/cmake/rules_PyKF5.py" - SIP_DEPENDS - QtCore/QtCoremod.sip - HEADERS - klocalizedcontext.h - klocalizedstring.h - klocalizedtranslator.h - kuitmarkup.h - kuitsetup.h - ) -endif() - install(FILES ${KI18n_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/ki18n_export.h
