Hello community, here is the log from the commit of package systemsettings5 for openSUSE:Factory checked in at 2018-03-30 12:06:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemsettings5 (Old) and /work/SRC/openSUSE:Factory/.systemsettings5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemsettings5" Fri Mar 30 12:06:25 2018 rev:64 rq:591858 version:5.12.4 Changes: -------- --- /work/SRC/openSUSE:Factory/systemsettings5/systemsettings5.changes 2018-03-09 10:33:30.590952595 +0100 +++ /work/SRC/openSUSE:Factory/.systemsettings5.new/systemsettings5.changes 2018-03-30 12:06:29.755744639 +0200 @@ -1,0 +2,16 @@ +Tue Mar 27 15:40:49 CEST 2018 - fab...@ritter-vogt.de + +- Update to 5.12.4 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.12.4.php +- Changes since 5.12.3: + * None + +------------------------------------------------------------------- +Sat Mar 24 11:09:18 UTC 2018 - fab...@ritter-vogt.de + +- Support wayland sessions without QT_QPA_PLATFORM set: + * 0001-Use-platform-detection-in-SystemSettings.patch + +------------------------------------------------------------------- Old: ---- systemsettings-5.12.3.tar.xz New: ---- 0001-Use-platform-detection-in-SystemSettings.patch systemsettings-5.12.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemsettings5.spec ++++++ --- /var/tmp/diff_new_pack.pLvi4v/_old 2018-03-30 12:06:31.127695033 +0200 +++ /var/tmp/diff_new_pack.pLvi4v/_new 2018-03-30 12:06:31.131694889 +0200 @@ -18,7 +18,7 @@ %bcond_without lang Name: systemsettings5 -Version: 5.12.3 +Version: 5.12.4 Release: 0 Summary: KDE's control center License: GPL-2.0+ @@ -29,6 +29,8 @@ Patch0: install_administration_category.diff # PATCH-FIX-OPENSUSE systemsettings-desktop.diff -- rename application name to Configure Desktop, in order to cause less confusion for KDE4 users Patch1: systemsettings-desktop.diff +# PATCH-FIX-UPSTREAM +Patch2: 0001-Use-platform-detection-in-SystemSettings.patch BuildRequires: extra-cmake-modules >= 1.2.0 BuildRequires: kf5-filesystem BuildRequires: kirigami2-devel @@ -51,6 +53,7 @@ BuildRequires: cmake(KF5Service) BuildRequires: cmake(KF5WindowSystem) BuildRequires: cmake(KF5XmlGui) +BuildRequires: cmake(LibKWorkspace) BuildRequires: cmake(Qt5QuickWidgets) >= 5.4.0 BuildRequires: cmake(Qt5Widgets) >= 5.4.0 Requires: kirigami2 >= 2.1 @@ -74,8 +77,7 @@ %lang_package %prep %setup -q -n systemsettings-%{version} -%patch0 -p1 -%patch1 -p1 +%autopatch -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} ++++++ 0001-Use-platform-detection-in-SystemSettings.patch ++++++ >From 5405ba3d72482ccfd50c06cdb0bb9df62a9d88cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Fl=C3=B6ser?= <mgraess...@kde.org> Date: Sun, 18 Mar 2018 09:48:54 +0100 Subject: [PATCH] Use platform detection in SystemSettings Summary: SystemSettings needs to run on Wayland in a Wayland session and on X11 in an X11 session. Test Plan: unset QT_QPA_PLATFORM and XDG_SESSION_TYPE -> x11 window, reset XDG_SESSION_TYPE to wayland -> wayland window Reviewers: #plasma Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D11445 --- CMakeLists.txt | 2 ++ app/CMakeLists.txt | 1 + app/main.cpp | 3 +++ 3 files changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 147a4e5..c1d8ec4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,6 +48,8 @@ ecm_find_qmlmodule(org.kde.kcm 1.0) find_package(KF5Kirigami2 2.1 REQUIRED) +find_package(LibKWorkspace ${PROJECT_VERSION} REQUIRED) + add_subdirectory(core) add_subdirectory(app) add_subdirectory(categories) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index cb97e63..6db59a5 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -28,6 +28,7 @@ target_link_libraries( systemsettings5 systemsettingsview KF5::XmlGui KF5::DBusAddons KF5::ConfigGui + PW::KWorkspace ) install( TARGETS systemsettings5 ${INSTALL_TARGETS_DEFAULT_ARGS} ) diff --git a/app/main.cpp b/app/main.cpp index ae0d65d..3f1cd34 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -25,6 +25,8 @@ #include <KAboutData> #include <KCrash> +#include <kworkspace.h> + #include "SystemSettingsApp.h" #include "SettingsBase.h" @@ -33,6 +35,7 @@ int main( int argc, char *argv[] ) //exec is systemsettings5, but we need the QPT to use the right config from the qApp constructor //which is before KAboutData::setApplicationData QCoreApplication::setApplicationName("systemsettings"); + KWorkSpace::detectPlatform(argc, argv); SystemSettingsApp application(argc, argv); KCrash::initialize(); -- 2.16.2 ++++++ systemsettings-5.12.3.tar.xz -> systemsettings-5.12.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemsettings-5.12.3/CMakeLists.txt new/systemsettings-5.12.4/CMakeLists.txt --- old/systemsettings-5.12.3/CMakeLists.txt 2018-03-06 14:07:24.000000000 +0100 +++ new/systemsettings-5.12.4/CMakeLists.txt 2018-03-27 13:32:23.000000000 +0200 @@ -1,6 +1,6 @@ project(systemsettings) -set(PROJECT_VERSION "5.12.3") +set(PROJECT_VERSION "5.12.4") cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) set(QT_MIN_VERSION "5.9.0") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemsettings-5.12.3/categories/old/settings-application-and-system-notifications.desktop new/systemsettings-5.12.4/categories/old/settings-application-and-system-notifications.desktop --- old/systemsettings-5.12.3/categories/old/settings-application-and-system-notifications.desktop 2018-03-06 14:06:35.000000000 +0100 +++ new/systemsettings-5.12.4/categories/old/settings-application-and-system-notifications.desktop 2018-03-27 13:31:49.000000000 +0200 @@ -28,7 +28,7 @@ Name[hr]=Obavijesti sustava i aplikacija Name[hu]=Alkalmazás- és rendszerértesítések Name[ia]=Applicationes e notificationes de systema -Name[id]=Notifikasi Sistem dan Aplikasi +Name[id]=Pemberitahuan Sistem dan Aplikasi Name[is]=Tilkynningar kerfis og forrita Name[it]=Notifiche delle applicazioni e di sistema Name[ja]=アプリケーションとシステムの通知 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemsettings-5.12.3/categories/settings-workspace-search.desktop new/systemsettings-5.12.4/categories/settings-workspace-search.desktop --- old/systemsettings-5.12.3/categories/settings-workspace-search.desktop 2018-03-06 14:06:35.000000000 +0100 +++ new/systemsettings-5.12.4/categories/settings-workspace-search.desktop 2018-03-27 13:31:49.000000000 +0200 @@ -10,7 +10,7 @@ Name[ar]=البحث Name[bs]=Pretraga Name[ca]=Cerca -Name[ca@valencia]=Busca +Name[ca@valencia]=Cerca Name[cs]=Hledání Name[da]=Søgning Name[de]=Suchen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemsettings-5.12.3/po/ca@valencia/systemsettings.po new/systemsettings-5.12.4/po/ca@valencia/systemsettings.po --- old/systemsettings-5.12.3/po/ca@valencia/systemsettings.po 2018-03-06 14:06:51.000000000 +0100 +++ new/systemsettings-5.12.4/po/ca@valencia/systemsettings.po 2018-03-27 13:31:59.000000000 +0200 @@ -96,7 +96,7 @@ #, kde-format msgctxt "Search through a list of control modules" msgid "Search" -msgstr "Busca" +msgstr "Cerca" #: app/SettingsBase.cpp:137 #, kde-format @@ -271,13 +271,13 @@ #: sidebar/package/contents/ui/CategoriesPage.qml:59 #, kde-format msgid "Search..." -msgstr "Busca..." +msgstr "Cerca..." #: sidebar/package/contents/ui/CategoriesPage.qml:103 #, kde-format msgctxt "A search yelded no results" msgid "No items matching your search" -msgstr "No hi ha cap element que coincidisca amb la busca" +msgstr "No hi ha cap element que coincidisca amb la cerca" #: sidebar/package/contents/ui/IntroIcon.qml:85 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemsettings-5.12.3/po/id/systemsettings.po new/systemsettings-5.12.4/po/id/systemsettings.po --- old/systemsettings-5.12.3/po/id/systemsettings.po 2018-03-06 14:06:58.000000000 +0100 +++ new/systemsettings-5.12.4/po/id/systemsettings.po 2018-03-27 13:32:04.000000000 +0200 @@ -9,9 +9,9 @@ "Project-Id-Version: systemsettings\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-02-07 06:08+0100\n" -"PO-Revision-Date: 2017-12-19 07:30+0700\n" +"PO-Revision-Date: 2018-03-20 07:53+0700\n" "Last-Translator: Wantoyo <wanto...@gmail.com>\n" -"Language-Team: Indonesian <translation-team...@lists.sourceforge.net>\n" +"Language-Team: Indonesian <kde-i18n-...@kde.org>\n" "Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -48,10 +48,9 @@ msgstr "Setelan Sistem" #: app/main.cpp:42 -#, fuzzy, kde-format -#| msgid "Central configuration center for KDE." +#, kde-format msgid "Central configuration center by KDE." -msgstr "Pusat konfigurasi Terpusat untuk KDE." +msgstr "Pusat konfigurasi pokok oleh KDE." #: app/main.cpp:42 classic/ClassicMode.cpp:71 icons/IconMode.cpp:61 #, kde-format @@ -67,7 +66,7 @@ #: app/main.cpp:43 #, kde-format msgid "Maintainer" -msgstr "Pengelola" +msgstr "Pemelihara" #: app/main.cpp:44 classic/ClassicMode.cpp:73 icons/IconMode.cpp:63 #: sidebar/SidebarMode.cpp:264 @@ -170,12 +169,10 @@ msgstr "Tentang Setelan Sistem" #: app/ToolTips/tooltipmanager.cpp:191 -#, fuzzy, kde-format -#| msgid "<i>Contains 1 item</i>" -#| msgid_plural "<i>Contains %1 items</i>" +#, kde-format msgid "Contains 1 item" msgid_plural "Contains %1 items" -msgstr[0] "<i>Berisi %1 item</i>" +msgstr[0] "Berisi %1 item" #: classic/CategoryList.cpp:41 #, kde-format @@ -211,7 +208,7 @@ #: classic/configClassic.ui:17 #, kde-format msgid "Expand the first level automatically" -msgstr "Perluas level pertama secara otomatis" +msgstr "Bentangkan level pertama secara otomatis" #: core/ExternalAppModule.cpp:34 #, kde-format @@ -259,10 +256,9 @@ msgstr "Memberikan tampilan ikon yang dikategorikan dari modul kendali." #: icons/IconMode.cpp:67 -#, fuzzy, kde-format -#| msgid "Apply Settings" +#, kde-format msgid "All Settings" -msgstr "Terapkan Pengaturan" +msgstr "Semua Setelan" #: icons/IconMode.cpp:68 #, kde-format @@ -270,63 +266,60 @@ msgstr "Pintasan Keyboard: %1" #: sidebar/package/contents/ui/CategoriesPage.qml:59 -#, fuzzy, kde-format -#| msgctxt "Search through a list of control modules" -#| msgid "Search" +#, kde-format msgid "Search..." -msgstr "Cari" +msgstr "Cari..." #: sidebar/package/contents/ui/CategoriesPage.qml:103 #, kde-format msgctxt "A search yelded no results" msgid "No items matching your search" -msgstr "" +msgstr "Tiada item yang cocok atas pencarianmu" #: sidebar/package/contents/ui/IntroIcon.qml:85 #, kde-format msgid "Most used module number %1" -msgstr "" +msgstr "Banyaknya modul yang digunakan berjumlah %1" #: sidebar/package/contents/ui/introPage.qml:73 #, kde-format msgid "Frequently used:" -msgstr "" +msgstr "Sering digunakan:" #: sidebar/package/contents/ui/SubCategoryPage.qml:34 #, kde-format msgid "Back" -msgstr "" +msgstr "Kembali" #: sidebar/SidebarMode.cpp:259 #, kde-format msgid "Sidebar View" -msgstr "" +msgstr "Tampilan BilahSisi" #: sidebar/SidebarMode.cpp:260 -#, fuzzy, kde-format -#| msgid "Provides a categorized icons view of control modules." +#, kde-format msgid "Provides a categorized sidebar for control modules." -msgstr "Memberikan tampilan ikon yang dikategorikan dari modul kontrol." +msgstr "Memberikan bilah sisi yang dikategorikan untuk modul kendali." #: sidebar/SidebarMode.cpp:261 #, kde-format msgid "(c) 2017, Marco Martin" -msgstr "" +msgstr "(c) 2017, Marco Martin" #: sidebar/SidebarMode.cpp:262 #, kde-format msgid "Marco Martin" -msgstr "" +msgstr "Marco Martin" #: sidebar/SidebarMode.cpp:466 #, kde-format msgid "Sidebar" -msgstr "" +msgstr "BilahSisi" #: sidebar/SidebarMode.cpp:501 #, kde-format msgid "Most Used" -msgstr "" +msgstr "Paling Banyak Digunakan" #: sidebar/ToolTips/tooltipmanager.cpp:194 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemsettings-5.12.3/po/zh_CN/systemsettings.po new/systemsettings-5.12.4/po/zh_CN/systemsettings.po --- old/systemsettings-5.12.3/po/zh_CN/systemsettings.po 2018-03-06 14:07:11.000000000 +0100 +++ new/systemsettings-5.12.4/po/zh_CN/systemsettings.po 2018-03-27 13:32:13.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-02-07 06:08+0100\n" -"PO-Revision-Date: 2018-03-05 17:19-0500\n" +"PO-Revision-Date: 2018-03-18 19:40-0400\n" "Last-Translator: guoyunhebrave <guoyunhebr...@gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n"
