Hello community, here is the log from the commit of package kcodecs for openSUSE:Factory checked in at 2014-04-02 17:21:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcodecs (Old) and /work/SRC/openSUSE:Factory/.kcodecs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcodecs" Changes: -------- --- /work/SRC/openSUSE:Factory/kcodecs/kcodecs.changes 2014-03-10 12:17:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kcodecs.new/kcodecs.changes 2014-04-02 17:21:52.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Mar 29 19:47:23 UTC 2014 - [email protected] + +- Update to 4.98.0 + * API improvements and cleanups + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-beta1.php + +------------------------------------------------------------------- Old: ---- kcodecs-4.97.0.tar.xz New: ---- kcodecs-4.98.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcodecs.spec ++++++ --- /var/tmp/diff_new_pack.yFh4Gu/_old 2014-04-02 17:21:52.000000000 +0200 +++ /var/tmp/diff_new_pack.yFh4Gu/_new 2014-04-02 17:21:52.000000000 +0200 @@ -18,10 +18,10 @@ %define lname libKF5Codecs5 Name: kcodecs -Version: 4.97.0 +Version: 4.98.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.11 +BuildRequires: extra-cmake-modules >= 0.0.12 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 ++++++ kcodecs-4.97.0.tar.xz -> kcodecs-4.98.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-4.97.0/CMakeLists.txt new/kcodecs-4.98.0/CMakeLists.txt --- old/kcodecs-4.97.0/CMakeLists.txt 2014-03-01 12:50:13.000000000 +0100 +++ new/kcodecs-4.98.0/CMakeLists.txt 2014-03-28 19:16:12.000000000 +0100 @@ -2,7 +2,7 @@ project(KCodecs) -find_package(ECM 0.0.11 REQUIRED NO_MODULE) +find_package(ECM 0.0.12 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ) @@ -19,7 +19,7 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) -set(KF5_VERSION "4.97.0") +set(KF5_VERSION "4.98.0") ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KCODECS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kcodecs_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-4.97.0/src/Messages.sh new/kcodecs-4.98.0/src/Messages.sh --- old/kcodecs-4.97.0/src/Messages.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/kcodecs-4.98.0/src/Messages.sh 2014-03-28 19:16:12.000000000 +0100 @@ -0,0 +1,18 @@ +#!/bin/sh + +# Invoke the extractrc script on all .ui, .rc, and .kcfg files in the sources. +# The results are stored in a pseudo .cpp file to be picked up by xgettext. +lst=`find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` +if [ -n "$lst" ] ; then + $EXTRACTRC $lst >> rc.cpp +fi + +# If your framework contains tips-of-the-day, call preparetips as well. +if [ -f "data/tips" ] ; then + ( cd data && $PREPARETIPS > ../tips.cpp ) +fi + +# Extract strings from all source files. +# If your framework depends on KI18n, use $XGETTEXT. If it uses Qt translation +# system, use $EXTRACT_TR_STRINGS. +$EXTRACT_TR_STRINGS `find . -name \*.cpp -o -name \*.h -name \*.qml` -o $podir/kcodecs5.pot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-4.97.0/src/kcharsets.cpp new/kcodecs-4.98.0/src/kcharsets.cpp --- old/kcodecs-4.97.0/src/kcharsets.cpp 2014-03-01 12:50:13.000000000 +0100 +++ new/kcodecs-4.98.0/src/kcharsets.cpp 2014-03-28 19:16:12.000000000 +0100 @@ -32,9 +32,9 @@ #include <QHash> /* - * ### FIXME KDE4: the name of the encodings should mostly be uppercase - * The names of this list are user-visible - * Generate with generate_string_table.pl (located in kdesdk/scripts), + * The encoding names (like "ISO 8859-1") in this list are user-visible, + * and should be mostly uppercase. + * Generate with generate_string_table.pl (located in kde-dev-scripts), * input data: ISO 8859-1 i18n:Western European @@ -147,11 +147,6 @@ */ /* - * THE FOLLOWING CODE IS GENERATED. PLEASE DO NOT EDIT BY HAND. - * The script used was generate_string_table.pl which can be found in kdesdk/scripts. - */ - -/* * This redefines the QT_TRANSLATE_NOOP3 macro provided by Qt to indicate that * statically initialised text should be translated so that it expands to just * the string that should be translated, making it possible to use it in the @@ -160,6 +155,12 @@ #undef QT_TRANSLATE_NOOP3 #define QT_TRANSLATE_NOOP3(a, b, c) b +/* + * THE FOLLOWING CODE IS GENERATED. PLEASE DO NOT EDIT BY HAND. + * The script used was generate_string_table.pl which can be found in kde-dev-scripts. + * It was then edited to use QT_TRANSLATE_NOOP3 instead of I18N_NOOP. + */ + static const char language_for_encoding_string[] = "ISO 8859-1\0" QT_TRANSLATE_NOOP3("", "Western European", "@item Text character set")"\0" @@ -348,7 +349,7 @@ /* * THE FOLLOWING CODE IS GENERATED. PLEASE DO NOT EDIT BY HAND. - * The script used was generate_string_table.pl which can be found in kdesdk/scripts. + * The script used was generate_string_table.pl which can be found in kde-dev-scripts. */ static const char builtin_string[] = @@ -456,7 +457,7 @@ /* * THE FOLLOWING CODE IS GENERATED. PLEASE DO NOT EDIT BY HAND. - * The script used was generate_string_table.pl which can be found in kdesdk/scripts. + * The script used was generate_string_table.pl which can be found in kde-dev-scripts. */ static const char conversion_hints_string[] = @@ -654,20 +655,6 @@ return available; } -#ifndef KDE_NO_DEPRECATED -QString KCharsets::languageForEncoding(const QString &encoding) const -{ - const char *lang = kcharsets_array_search((const char *)language_for_encoding_string, - language_for_encoding_indices, - encoding.toUtf8().constData()); - if (lang) { - return tr(lang, "@item Text character set"); - } else { - return tr("Other", "@item Text character set"); - } -} -#endif - QString KCharsets::descriptionForEncoding(const QString &encoding) const { const char *lang = kcharsets_array_search(language_for_encoding_string, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-4.97.0/src/kcharsets.h new/kcodecs-4.98.0/src/kcharsets.h --- old/kcodecs-4.97.0/src/kcharsets.h 2014-03-01 12:50:13.000000000 +0100 +++ new/kcodecs-4.98.0/src/kcharsets.h 2014-03-28 19:16:12.000000000 +0100 @@ -140,17 +140,6 @@ QList<QStringList> encodingsByScript() const; /** - * Returns the language the encoding is used for. - * @param encoding the encoding for the language - * @return the language of the encoding - * @deprecated Please use descriptionForEncoding instead. - * This function will be removed before KDE4 is released. - */ -#ifndef KDE_NO_DEPRECATED - KCODECS_DEPRECATED QString languageForEncoding(const QString &encoding) const; -#endif - - /** * @brief Returns a long description for an encoding name. * @param encoding the encoding for the language * @return the long description for the encoding -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
