Hello community, here is the log from the commit of package kconfig for openSUSE:Factory checked in at 2015-09-02 07:49:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kconfig (Old) and /work/SRC/openSUSE:Factory/.kconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kconfig" Changes: -------- --- /work/SRC/openSUSE:Factory/kconfig/kconfig.changes 2015-07-14 17:22:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kconfig.new/kconfig.changes 2015-09-02 07:49:46.000000000 +0200 @@ -1,0 +2,20 @@ +Sat Aug 15 16:43:25 UTC 2015 - [email protected] + +- Add kconfig-desktop-translations.patch: read translations for + .desktop files from desktop-translations if they are not in the + file itself (boo#904524, boo#932158) + +------------------------------------------------------------------- +Tue Aug 4 19:20:16 UTC 2015 - [email protected] + +- Update to 5.13.0 + * The Qt version requirement has been bumped from 5.2 to 5.3 + * Debug output has been ported to categorized output, for less + noise by default + * Docbook documentation has been reviewed and updated + * Don't recommend to use deprecated API + * Don't generate deprecated code + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.13.0.php + +------------------------------------------------------------------- Old: ---- kconfig-5.12.0.tar.xz New: ---- kconfig-5.13.0.tar.xz kconfig-desktop-translations.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kconfig.spec ++++++ --- /var/tmp/diff_new_pack.PxdQGP/_old 2015-09-02 07:49:47.000000000 +0200 +++ /var/tmp/diff_new_pack.PxdQGP/_new 2015-09-02 07:49:47.000000000 +0200 @@ -18,26 +18,28 @@ %bcond_without lang %define sonum 5 -%define _tar_path 5.12 +%define _tar_path 5.13 Name: kconfig -Version: 5.12.0 +Version: 5.13.0 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: fdupes BuildRequires: kf5-filesystem %if %{with lang} -BuildRequires: libqt5-linguist-devel >= 5.2.0 +BuildRequires: cmake(Qt5LinguistTools) >= 5.3.0 %endif -BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Gui) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Xml) >= 5.2.0 +BuildRequires: cmake(Qt5Core) >= 5.3.0 +BuildRequires: cmake(Qt5Gui) >= 5.3.0 +BuildRequires: cmake(Qt5Xml) >= 5.3.0 Summary: Provides an advanced configuration system License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf +# PATCH-FEATURE-OPENSUSE +Patch: kconfig-desktop-translations.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -101,7 +103,7 @@ Requires: kconf_update5 = %{version} Requires: libKF5ConfigCore%sonum = %{version} Requires: libKF5ConfigGui%sonum = %{version} -Requires: pkgconfig(Qt5Xml) >= 5.2.0 +Requires: cmake(Qt5Xml) >= 5.3.0 %description devel KConfig provides an advanced configuration system. It is made of two parts: @@ -121,6 +123,7 @@ %lang_package -n libKF5ConfigCore%sonum %prep %setup -q +%patch -p1 %build %cmake_kf5 -d build -- -Dlconvert_executable=%{_kf5_libdir}/qt5/bin/lconvert ++++++ kconfig-5.12.0.tar.xz -> kconfig-5.13.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.12.0/CMakeLists.txt new/kconfig-5.13.0/CMakeLists.txt --- old/kconfig-5.12.0/CMakeLists.txt 2015-07-05 10:54:35.000000000 +0200 +++ new/kconfig-5.13.0/CMakeLists.txt 2015-08-04 12:47:51.000000000 +0200 @@ -3,13 +3,13 @@ project(KConfig) include(FeatureSummary) -find_package(ECM 5.12.0 NO_MODULE) +find_package(ECM 5.13.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -set(REQUIRED_QT_VERSION 5.2.0) +set(REQUIRED_QT_VERSION 5.3.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui Xml) include(KDEInstallDirs) @@ -23,7 +23,7 @@ include(ECMMarkNonGuiExecutable) include(ECMPoQmTools) -set(KF5_VERSION "5.12.0") # handled by release scripts +set(KF5_VERSION "5.13.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KCONFIG VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kconfig_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.12.0/README.md new/kconfig-5.13.0/README.md --- old/kconfig-5.12.0/README.md 2015-07-05 10:54:35.000000000 +0200 +++ new/kconfig-5.13.0/README.md 2015-08-04 12:47:51.000000000 +0200 @@ -1,5 +1,7 @@ # KConfig +Persistent platform-independent application settings. + ## Introduction KConfig provides an advanced configuration system. It is made of two parts: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.12.0/autotests/kconfig_compiler/test_signal.cpp.ref new/kconfig-5.13.0/autotests/kconfig_compiler/test_signal.cpp.ref --- old/kconfig-5.12.0/autotests/kconfig_compiler/test_signal.cpp.ref 2015-07-05 10:54:35.000000000 +0200 +++ new/kconfig-5.13.0/autotests/kconfig_compiler/test_signal.cpp.ref 2015-08-04 12:47:51.000000000 +0200 @@ -56,9 +56,9 @@ s_globalTestSignal()->q = 0; } -bool TestSignal::usrWriteConfig() +bool TestSignal::usrSave() { - const bool res = KConfigSkeleton::usrWriteConfig(); + const bool res = KConfigSkeleton::usrSave(); if (!res) return false; if ( mSettingsChanged & signalEmoticonSettingsChanged ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.12.0/autotests/kconfig_compiler/test_signal.h.ref new/kconfig-5.13.0/autotests/kconfig_compiler/test_signal.h.ref --- old/kconfig-5.12.0/autotests/kconfig_compiler/test_signal.h.ref 2015-07-05 10:54:35.000000000 +0200 +++ new/kconfig-5.13.0/autotests/kconfig_compiler/test_signal.h.ref 2015-08-04 12:47:51.000000000 +0200 @@ -139,7 +139,7 @@ TestSignal(); friend class TestSignalHelper; - virtual bool usrWriteConfig(); + virtual bool usrSave(); // Appearance QString mEmoticonTheme; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.12.0/po/ast/kconfig5_qt.po new/kconfig-5.13.0/po/ast/kconfig5_qt.po --- old/kconfig-5.12.0/po/ast/kconfig5_qt.po 2015-07-05 10:54:35.000000000 +0200 +++ new/kconfig-5.13.0/po/ast/kconfig5_qt.po 2015-08-04 12:47:51.000000000 +0200 @@ -7,9 +7,9 @@ "Project-Id-Version: kwriteconfig\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-11 02:17+0000\n" -"PO-Revision-Date: 2015-04-08 04:27+0100\n" +"PO-Revision-Date: 2015-07-10 17:51+0100\n" "Last-Translator: enolp <[email protected]>\n" -"Language-Team: Asturian <[email protected]>\n" +"Language-Team: Asturian <[email protected]>\n" "Language: ast\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,92 +20,78 @@ "X-Generator: Lokalize 2.0\n" #: core/kconfig.cpp:883 -#, fuzzy msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Por favor, contauta col to alministrador del sistema." #: core/kconfigini.cpp:576 -#, fuzzy, qt-format +#, qt-format msgctxt "KConfigIniBackend|" msgid "Configuration file \"%1\" not writable.\n" -msgstr "Nun pue escribise nel ficheru de configuración \"%1\".\n" +msgstr "Nun ye escribible'l ficheru de configuración «%1».\n" #: core/kemailsettings.cpp:256 core/kemailsettings.cpp:259 #: core/kemailsettings.cpp:267 -#, fuzzy msgctxt "KEMailSettings|" msgid "Default" msgstr "Por defeutu" #: gui/kstandardshortcut.cpp:73 -#, fuzzy msgctxt "KStandardShortcut|@action" msgid "Open" msgstr "Abrir" #: gui/kstandardshortcut.cpp:74 -#, fuzzy msgctxt "KStandardShortcut|@action" msgid "New" msgstr "Nuevu" #: gui/kstandardshortcut.cpp:75 -#, fuzzy msgctxt "KStandardShortcut|@action" msgid "Close" msgstr "Zarrar" #: gui/kstandardshortcut.cpp:76 -#, fuzzy msgctxt "KStandardShortcut|@action" msgid "Save" msgstr "Guardar" #: gui/kstandardshortcut.cpp:77 -#, fuzzy msgctxt "KStandardShortcut|@action" msgid "Print" msgstr "Imprentar" #: gui/kstandardshortcut.cpp:78 -#, fuzzy msgctxt "KStandardShortcut|@action" msgid "Quit" msgstr "Colar" #: gui/kstandardshortcut.cpp:81 -#, fuzzy msgctxt "KStandardShortcut|@action" msgid "Undo" msgstr "Desfacer" #: gui/kstandardshortcut.cpp:82 -#, fuzzy msgctxt "KStandardShortcut|@action" msgid "Redo" msgstr "Refacer" #: gui/kstandardshortcut.cpp:83 -#, fuzzy msgctxt "KStandardShortcut|@action" msgid "Cut" msgstr "Cortar" #: gui/kstandardshortcut.cpp:84 -#, fuzzy msgctxt "KStandardShortcut|@action" msgid "Copy" msgstr "Copiar" #: gui/kstandardshortcut.cpp:85 -#, fuzzy msgctxt "KStandardShortcut|@action" msgid "Paste" msgstr "Apegar" #: gui/kstandardshortcut.cpp:86 -#, fuzzy msgctxt "KStandardShortcut|@action" msgid "Paste Selection" msgstr "Apegar esbilla" @@ -113,7 +99,7 @@ #: gui/kstandardshortcut.cpp:88 msgctxt "KStandardShortcut|@action" msgid "Select All" -msgstr "" +msgstr "Esbillar too" #: gui/kstandardshortcut.cpp:89 msgctxt "KStandardShortcut|@action" @@ -133,7 +119,7 @@ #: gui/kstandardshortcut.cpp:93 msgctxt "KStandardShortcut|@action" msgid "Find" -msgstr "" +msgstr "Alcontrar" #: gui/kstandardshortcut.cpp:94 msgctxt "KStandardShortcut|@action" @@ -148,7 +134,7 @@ #: gui/kstandardshortcut.cpp:96 msgctxt "KStandardShortcut|@action" msgid "Replace" -msgstr "" +msgstr "Trocar" #: gui/kstandardshortcut.cpp:99 msgctxt "KStandardShortcut|@action Go to main page" @@ -193,22 +179,22 @@ #: gui/kstandardshortcut.cpp:108 msgctxt "KStandardShortcut|@action" msgid "Reload" -msgstr "" +msgstr "Recargar" #: gui/kstandardshortcut.cpp:110 msgctxt "KStandardShortcut|@action" msgid "Beginning of Line" -msgstr "" +msgstr "Entamu de llinia" #: gui/kstandardshortcut.cpp:111 msgctxt "KStandardShortcut|@action" msgid "End of Line" -msgstr "" +msgstr "Final de llinia" #: gui/kstandardshortcut.cpp:112 msgctxt "KStandardShortcut|@action" msgid "Go to Line" -msgstr "" +msgstr "Dir a la llinia" #: gui/kstandardshortcut.cpp:113 msgctxt "KStandardShortcut|@action" @@ -223,22 +209,22 @@ #: gui/kstandardshortcut.cpp:116 msgctxt "KStandardShortcut|@action" msgid "Add Bookmark" -msgstr "" +msgstr "Amestar marcador" #: gui/kstandardshortcut.cpp:117 msgctxt "KStandardShortcut|@action" msgid "Zoom In" -msgstr "" +msgstr "Averar" #: gui/kstandardshortcut.cpp:118 msgctxt "KStandardShortcut|@action" msgid "Zoom Out" -msgstr "" +msgstr "Alloñar" #: gui/kstandardshortcut.cpp:119 msgctxt "KStandardShortcut|@action" msgid "Full Screen Mode" -msgstr "" +msgstr "Mou pantalla completa" #: gui/kstandardshortcut.cpp:121 msgctxt "KStandardShortcut|@action" @@ -258,17 +244,17 @@ #: gui/kstandardshortcut.cpp:126 msgctxt "KStandardShortcut|@action" msgid "Help" -msgstr "" +msgstr "Ayuda" #: gui/kstandardshortcut.cpp:127 msgctxt "KStandardShortcut|@action" msgid "What's This" -msgstr "" +msgstr "¿Qué ye esto?" #: gui/kstandardshortcut.cpp:130 msgctxt "KStandardShortcut|@action" msgid "Text Completion" -msgstr "" +msgstr "Completáu de testu" #: gui/kstandardshortcut.cpp:131 msgctxt "KStandardShortcut|@action" @@ -303,7 +289,7 @@ #: gui/kstandardshortcut.cpp:139 msgctxt "KStandardShortcut|@action" msgid "Save As" -msgstr "" +msgstr "Guardar como" #: gui/kstandardshortcut.cpp:140 msgctxt "KStandardShortcut|@action" @@ -323,12 +309,12 @@ #: gui/kstandardshortcut.cpp:143 msgctxt "KStandardShortcut|@action" msgid "Clear" -msgstr "" +msgstr "Llimpiar" #: gui/kstandardshortcut.cpp:144 msgctxt "KStandardShortcut|@action" msgid "Actual Size" -msgstr "" +msgstr "Tamañu actual" #: gui/kstandardshortcut.cpp:145 msgctxt "KStandardShortcut|@action" @@ -348,17 +334,17 @@ #: gui/kstandardshortcut.cpp:148 msgctxt "KStandardShortcut|@action" msgid "Zoom" -msgstr "" +msgstr "Zoom" #: gui/kstandardshortcut.cpp:149 msgctxt "KStandardShortcut|@action" msgid "Goto" -msgstr "" +msgstr "Dir a" #: gui/kstandardshortcut.cpp:150 msgctxt "KStandardShortcut|@action" msgid "Goto Page" -msgstr "" +msgstr "Dir a la pxina" #: gui/kstandardshortcut.cpp:151 msgctxt "KStandardShortcut|@action" @@ -403,7 +389,7 @@ #: gui/kstandardshortcut.cpp:159 msgctxt "KStandardShortcut|@action" msgid "Preferences" -msgstr "" +msgstr "Preferencies" #: gui/kstandardshortcut.cpp:160 msgctxt "KStandardShortcut|@action" @@ -413,17 +399,17 @@ #: gui/kstandardshortcut.cpp:161 msgctxt "KStandardShortcut|@action" msgid "Configure Notifications" -msgstr "" +msgstr "Configurar Notificaciones" #: gui/kstandardshortcut.cpp:162 msgctxt "KStandardShortcut|@action" msgid "Tip Of Day" -msgstr "" +msgstr "Conseyu'l día" #: gui/kstandardshortcut.cpp:163 msgctxt "KStandardShortcut|@action" msgid "Report Bug" -msgstr "" +msgstr "Informar fallu" #: gui/kstandardshortcut.cpp:164 msgctxt "KStandardShortcut|@action" @@ -433,12 +419,12 @@ #: gui/kstandardshortcut.cpp:165 msgctxt "KStandardShortcut|@action" msgid "About Application" -msgstr "" +msgstr "Tocante a l'aplicación" #: gui/kstandardshortcut.cpp:166 msgctxt "KStandardShortcut|@action" msgid "About KDE" -msgstr "" +msgstr "Tocante a KDE" #: kconf_update/kconf_update.cpp:948 msgctxt "main|" @@ -468,7 +454,7 @@ #: kconfig_compiler/kconfig_compiler.cpp:1581 msgctxt "main|" msgid "Display software license." -msgstr "" +msgstr "Amuesa la llicencia de software" #: kreadconfig/kreadconfig.cpp:56 kreadconfig/kwriteconfig.cpp:35 #, fuzzy @@ -499,7 +485,7 @@ #: kreadconfig/kreadconfig.cpp:60 msgctxt "main|" msgid "Type of variable" -msgstr "" +msgstr "Triba de variable" #: kreadconfig/kwriteconfig.cpp:38 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.12.0/po/sr/kconfig5_qt.po new/kconfig-5.13.0/po/sr/kconfig5_qt.po --- old/kconfig-5.12.0/po/sr/kconfig5_qt.po 2015-07-05 10:54:35.000000000 +0200 +++ new/kconfig-5.13.0/po/sr/kconfig5_qt.po 2015-08-04 12:47:51.000000000 +0200 @@ -3,7 +3,6 @@ msgid "" msgstr "" "Project-Id-Version: kconfig5_qt\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-11 02:17+0000\n" "PO-Revision-Date: 2014-08-17 13:35+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" @@ -18,6 +17,7 @@ "X-Text-Markup: qtrich\n" "X-Environment: kde\n" "X-Qt-Contexts: true\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; #: core/kconfig.cpp:883 msgctxt "KConfig|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.12.0/po/sr@ijekavian/kconfig5_qt.po new/kconfig-5.13.0/po/sr@ijekavian/kconfig5_qt.po --- old/kconfig-5.12.0/po/sr@ijekavian/kconfig5_qt.po 2015-07-05 10:54:35.000000000 +0200 +++ new/kconfig-5.13.0/po/sr@ijekavian/kconfig5_qt.po 2015-08-04 12:47:51.000000000 +0200 @@ -3,7 +3,6 @@ msgid "" msgstr "" "Project-Id-Version: kconfig5_qt\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-11 02:17+0000\n" "PO-Revision-Date: 2014-08-17 13:35+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" @@ -18,6 +17,7 @@ "X-Text-Markup: qtrich\n" "X-Environment: kde\n" "X-Qt-Contexts: true\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; #: core/kconfig.cpp:883 msgctxt "KConfig|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.12.0/po/sr@ijekavianlatin/kconfig5_qt.po new/kconfig-5.13.0/po/sr@ijekavianlatin/kconfig5_qt.po --- old/kconfig-5.12.0/po/sr@ijekavianlatin/kconfig5_qt.po 2015-07-05 10:54:35.000000000 +0200 +++ new/kconfig-5.13.0/po/sr@ijekavianlatin/kconfig5_qt.po 2015-08-04 12:47:51.000000000 +0200 @@ -3,7 +3,6 @@ msgid "" msgstr "" "Project-Id-Version: kconfig5_qt\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-11 02:17+0000\n" "PO-Revision-Date: 2014-08-17 13:35+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" @@ -18,6 +17,7 @@ "X-Text-Markup: qtrich\n" "X-Environment: kde\n" "X-Qt-Contexts: true\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; #: core/kconfig.cpp:883 msgctxt "KConfig|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.12.0/po/sr@latin/kconfig5_qt.po new/kconfig-5.13.0/po/sr@latin/kconfig5_qt.po --- old/kconfig-5.12.0/po/sr@latin/kconfig5_qt.po 2015-07-05 10:54:35.000000000 +0200 +++ new/kconfig-5.13.0/po/sr@latin/kconfig5_qt.po 2015-08-04 12:47:51.000000000 +0200 @@ -3,7 +3,6 @@ msgid "" msgstr "" "Project-Id-Version: kconfig5_qt\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-11 02:17+0000\n" "PO-Revision-Date: 2014-08-17 13:35+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" @@ -18,6 +17,7 @@ "X-Text-Markup: qtrich\n" "X-Environment: kde\n" "X-Qt-Contexts: true\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; #: core/kconfig.cpp:883 msgctxt "KConfig|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.12.0/src/core/CMakeLists.txt new/kconfig-5.13.0/src/core/CMakeLists.txt --- old/kconfig-5.12.0/src/core/CMakeLists.txt 2015-07-05 10:54:35.000000000 +0200 +++ new/kconfig-5.13.0/src/core/CMakeLists.txt 2015-08-04 12:47:51.000000000 +0200 @@ -1,5 +1,5 @@ -find_package(Qt5Core 5.2.0 REQUIRED NO_MODULE) +find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) set(libkconfigcore_SRCS kconfig.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.12.0/src/core/kcoreconfigskeleton.h new/kconfig-5.13.0/src/core/kcoreconfigskeleton.h --- old/kconfig-5.12.0/src/core/kcoreconfigskeleton.h 2015-07-05 10:54:35.000000000 +0200 +++ new/kconfig-5.13.0/src/core/kcoreconfigskeleton.h 2015-08-04 12:47:51.000000000 +0200 @@ -1417,8 +1417,8 @@ /** * Write preferences to config file. The values of all registered items are * written to disk. - * This method calls usrWriteConfig() after writing the settings from the - * registered items to the KConfig. You can override usrWriteConfig() + * This method calls usrSave() after writing the settings from the + * registered items to the KConfig. You can override usrSave() * in derived classes if you have special requirements. */ bool save(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.12.0/src/kconf_update/CMakeLists.txt new/kconfig-5.13.0/src/kconf_update/CMakeLists.txt --- old/kconfig-5.12.0/src/kconf_update/CMakeLists.txt 2015-07-05 10:54:35.000000000 +0200 +++ new/kconfig-5.13.0/src/kconf_update/CMakeLists.txt 2015-08-04 12:47:51.000000000 +0200 @@ -1,4 +1,4 @@ -find_package(Qt5Core 5.2.0 REQUIRED NO_MODULE) +find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) remove_definitions(-DQT_NO_CAST_FROM_ASCII) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.12.0/src/kconfig_compiler/CMakeLists.txt new/kconfig-5.13.0/src/kconfig_compiler/CMakeLists.txt --- old/kconfig-5.12.0/src/kconfig_compiler/CMakeLists.txt 2015-07-05 10:54:35.000000000 +0200 +++ new/kconfig-5.13.0/src/kconfig_compiler/CMakeLists.txt 2015-08-04 12:47:51.000000000 +0200 @@ -16,7 +16,7 @@ add_executable(KF5::kconfig_compiler ALIAS kconfig_compiler) endif() -find_package(Qt5Xml 5.2.0 REQUIRED NO_MODULE) +find_package(Qt5Xml ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) target_link_libraries(kconfig_compiler Qt5::Xml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.12.0/src/kconfig_compiler/kconfig_compiler.cpp new/kconfig-5.13.0/src/kconfig_compiler/kconfig_compiler.cpp --- old/kconfig-5.12.0/src/kconfig_compiler/kconfig_compiler.cpp 2015-07-05 10:54:35.000000000 +0200 +++ new/kconfig-5.13.0/src/kconfig_compiler/kconfig_compiler.cpp 2015-08-04 12:47:51.000000000 +0200 @@ -2125,7 +2125,7 @@ } if (hasNonModifySignals) { - h << " virtual bool usrWriteConfig();" << endl; + h << " virtual bool usrSave();" << endl; } // Member variables @@ -2605,9 +2605,9 @@ cpp << "}" << endl << endl; if (hasNonModifySignals) { - cpp << "bool " << cfg.className << "::" << "usrWriteConfig()" << endl; + cpp << "bool " << cfg.className << "::" << "usrSave()" << endl; cpp << "{" << endl; - cpp << " const bool res = " << cfg.inherits << "::usrWriteConfig();" << endl; + cpp << " const bool res = " << cfg.inherits << "::usrSave();" << endl; cpp << " if (!res) return false;" << endl << endl; Q_FOREACH (const Signal &signal, signalList) { if (signal.modify) { ++++++ kconfig-desktop-translations.patch ++++++ diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp index 3819716..17f9fa4 100644 --- a/src/core/kconfig.cpp +++ b/src/core/kconfig.cpp @@ -956,6 +956,19 @@ QByteArray KConfigPrivate::lookupData(const QByteArray &group, const char *key, return it->mValue; } +QByteArray KConfigPrivate::lookupExactData(const QByteArray &group, const char *key, + KEntryMap::SearchFlags flags) const +{ + if (bReadDefaults) { + flags |= KEntryMap::SearchDefaults; + } + const KEntryMapConstIterator it = entryMap.findExactEntry(group, key, flags); + if (it == entryMap.constEnd()) { + return QByteArray(); + } + return it->mValue; +} + QString KConfigPrivate::lookupData(const QByteArray &group, const char *key, KEntryMap::SearchFlags flags, bool *expand) const { diff --git a/src/core/kconfig_p.h b/src/core/kconfig_p.h index b93c816..27c28f4 100644 --- a/src/core/kconfig_p.h +++ b/src/core/kconfig_p.h @@ -47,6 +47,7 @@ public: QString lookupData(const QByteArray &group, const char *key, KEntryMap::SearchFlags flags, bool *expand) const; QByteArray lookupData(const QByteArray &group, const char *key, KEntryMap::SearchFlags flags) const; + QByteArray lookupExactData(const QByteArray &group, const char *key, KEntryMap::SearchFlags flags) const; void putData(const QByteArray &group, const char *key, const QByteArray &value, KConfigBase::WriteConfigFlags flags, bool expand = false); diff --git a/src/core/kconfigdata.h b/src/core/kconfigdata.h index 3b70c24..2d5031a 100644 --- a/src/core/kconfigdata.h +++ b/src/core/kconfigdata.h @@ -180,6 +180,19 @@ public: Iterator findExactEntry(const QByteArray &group, const QByteArray &key = QByteArray(), SearchFlags flags = SearchFlags()); + ConstIterator findExactEntry(const QByteArray &group, const QByteArray &key = QByteArray(), + SearchFlags flags = SearchFlags()) const + { + KEntryKey theKey(group, key, false, bool(flags & SearchDefaults)); + + // try the localized key first + if (flags & SearchLocalized) { + theKey.bLocal = true; + return find(theKey); + } + return find(theKey); + } + Iterator findEntry(const QByteArray &group, const QByteArray &key = QByteArray(), SearchFlags flags = SearchFlags()); diff --git a/src/core/kconfiggroup.cpp b/src/core/kconfiggroup.cpp index e09d602..b214519 100644 --- a/src/core/kconfiggroup.cpp +++ b/src/core/kconfiggroup.cpp @@ -1185,6 +1185,18 @@ bool KConfigGroup::hasKey(const char *key) const return !config()->d_func()->lookupData(d->fullName(), key, flags).isNull(); } +bool KConfigGroup::hasTranslatedKey(const char *key) const +{ + Q_ASSERT_X(isValid(), "KConfigGroup::hasTranslatedKey", "accessing an invalid group"); + + KEntryMap::SearchFlags flags = KEntryMap::SearchLocalized; + if (config()->readDefaults()) { + flags |= KEntryMap::SearchDefaults; + } + + return !config()->d_func()->lookupExactData(d->fullName(), key, flags).isNull(); +} + bool KConfigGroup::hasKey(const QString &key) const { return hasKey(key.toUtf8().constData()); diff --git a/src/core/kconfiggroup.h b/src/core/kconfiggroup.h index 9ddf886..fb7ea3b 100644 --- a/src/core/kconfiggroup.h +++ b/src/core/kconfiggroup.h @@ -623,6 +623,11 @@ public: */ QMap<QString, QString> entryMap() const; + /** + * @internal + */ + bool hasTranslatedKey(const char *key) const; + protected: bool hasGroupImpl(const QByteArray &group) const Q_DECL_OVERRIDE; KConfigGroup groupImpl(const QByteArray &b) Q_DECL_OVERRIDE; diff --git a/src/core/kdesktopfile.cpp b/src/core/kdesktopfile.cpp index 254b59a..f96d158 100644 --- a/src/core/kdesktopfile.cpp +++ b/src/core/kdesktopfile.cpp @@ -29,6 +29,7 @@ #include <QtCore/QFileInfo> #include <QUrl> #include <qstandardpaths.h> +#include <libintl.h> #include "kauthorized.h" #include "kconfig_p.h" @@ -169,6 +169,33 @@ bool KDesktopFile::isAuthorizedDesktopFile(const QString &path) return false; } +QString KDesktopFile::translatedEntry(const char *key) const +{ + Q_D(const KDesktopFile); + if (d->desktopGroup.hasTranslatedKey(key)) { + return d->desktopGroup.readEntry(key); + } + + if (d->desktopGroup.hasKey(key)) { + QString value = d->desktopGroup.readEntryUntranslated(key); + QString fName = fileName(); + fName = fName.mid(fName.lastIndexOf(QLatin1Char('/'))+1); + QString po_lookup_key = QString::fromLatin1(key) + QStringLiteral("(") + fName + QStringLiteral("): ") + value; + char *msgid = strdup(po_lookup_key.toUtf8().constData()); + const char *po_value = dgettext("desktop_translations", msgid); + + if (po_value == msgid) { + free(msgid); + return value; + } + + free(msgid); + return QString::fromUtf8(po_value); + } + + return QString(); +} + QString KDesktopFile::readType() const { Q_D(const KDesktopFile); @@ -183,20 +209,17 @@ QString KDesktopFile::readIcon() const QString KDesktopFile::readName() const { - Q_D(const KDesktopFile); - return d->desktopGroup.readEntry("Name", QString()); + return translatedEntry("Name"); } QString KDesktopFile::readComment() const { - Q_D(const KDesktopFile); - return d->desktopGroup.readEntry("Comment", QString()); + return translatedEntry("Comment"); } QString KDesktopFile::readGenericName() const { - Q_D(const KDesktopFile); - return d->desktopGroup.readEntry("GenericName", QString()); + return translatedEntry("GenericName"); } QString KDesktopFile::readPath() const diff --git a/src/core/kdesktopfile.h b/src/core/kdesktopfile.h index 2190051..1a11b93 100644 --- a/src/core/kdesktopfile.h +++ b/src/core/kdesktopfile.h @@ -243,6 +243,8 @@ protected: // virtual void virtual_hook( int id, void* data ); private: + QString translatedEntry(const char *) const; + Q_DISABLE_COPY(KDesktopFile) Q_DECLARE_PRIVATE(KDesktopFile)
