commit frameworkintegration for openSUSE:Factory
Hello community, here is the log from the commit of package frameworkintegration for openSUSE:Factory checked in at 2015-02-16 15:04:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/frameworkintegration (Old) and /work/SRC/openSUSE:Factory/.frameworkintegration.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "frameworkintegration" Changes: -------- --- /work/SRC/openSUSE:Factory/frameworkintegration/frameworkintegration.changes 2015-01-30 15:08:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.frameworkintegration.new/frameworkintegration.changes 2015-02-16 17:25:58.000000000 +0100 @@ -1,0 +2,18 @@ +Sun Feb 8 18:15:14 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.7.0 + * Fix updating of single click setting at runtime + * Multiple fixes to the systemtray integration + * Only install color scheme on toplevel widgets + (to fix QQuickWidgets) + * Update XCursor settings on X11 platform + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.7.0.php +- Drop patches merged upstream: + 0005-Properly-check-for-systray-being-available.patch, + 0007-Use-activate-on-single-click-setting-from-QPlatformT.patch, + 0001-Update-XCursor-settings.patch, + 0004-Only-install-color-scheme-on-toplevel-widgets.patch and + 0008-Implement-SystemTrayMenuItem-setMenu-correctly.patch + +------------------------------------------------------------------- Old: ---- 0001-Update-XCursor-settings.patch 0004-Only-install-color-scheme-on-toplevel-widgets.patch 0005-Properly-check-for-systray-being-available.patch 0007-Use-activate-on-single-click-setting-from-QPlatformT.patch 0008-Implement-SystemTrayMenuItem-setMenu-correctly.patch frameworkintegration-5.6.0.tar.xz New: ---- frameworkintegration-5.7.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ frameworkintegration.spec ++++++ --- /var/tmp/diff_new_pack.DeyBlj/_old 2015-02-16 17:25:58.000000000 +0100 +++ /var/tmp/diff_new_pack.DeyBlj/_new 2015-02-16 17:25:58.000000000 +0100 @@ -17,12 +17,13 @@ %define lname libKF5Style5 +%define _tar_path 5.7 Name: frameworkintegration -Version: 5.6.0 +Version: %{_tar_path}.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.6.0 +BuildRequires: extra-cmake-modules >= 1.7.0 BuildRequires: fdupes BuildRequires: kconfig-devel >= %{kf5_version} BuildRequires: kconfigwidgets-devel >= %{kf5_version} @@ -44,18 +45,8 @@ License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source: http://download.kde.org/stable/frameworks/5.6/%{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf -# PATCH-FIX-UPSTREAM 0001-Update-XCursor-settings.patch -Patch0: 0001-Update-XCursor-settings.patch -# PATCH-FIX-UPSTREAM 0004-Only-install-color-scheme-on-toplevel-widgets.patch -Patch1: 0004-Only-install-color-scheme-on-toplevel-widgets.patch -# PATCH-FIX-UPSTREAM 0005-Properly-check-for-systray-being-available.patch -Patch2: 0005-Properly-check-for-systray-being-available.patch -# PATCH-FIX-UPSTREAM 0007-Use-activate-on-single-click-setting-from-QPlatformT.patch -Patch3: 0007-Use-activate-on-single-click-setting-from-QPlatformT.patch -# PATCH-FIX-UPSTREAM 0008-Implement-SystemTrayMenuItem-setMenu-correctly.patch -Patch4: 0008-Implement-SystemTrayMenuItem-setMenu-correctly.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -109,11 +100,6 @@ %lang_package -n %lname %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build %cmake_kf5 -d build ++++++ frameworkintegration-5.6.0.tar.xz -> frameworkintegration-5.7.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.6.0/CMakeLists.txt new/frameworkintegration-5.7.0/CMakeLists.txt --- old/frameworkintegration-5.6.0/CMakeLists.txt 2015-01-03 12:59:57.000000000 +0100 +++ new/frameworkintegration-5.7.0/CMakeLists.txt 2015-02-08 16:10:56.000000000 +0100 @@ -2,7 +2,7 @@ project(FrameworkIntegration) -find_package(ECM 1.6.0 REQUIRED NO_MODULE) +find_package(ECM 1.7.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -19,8 +19,8 @@ set(REQUIRED_QT_VERSION 5.2.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus) -set(KF5_VERSION "5.6.0") # handled by release scripts -set(KF5_DEP_VERSION "5.6.0") # handled by release scripts +set(KF5_VERSION "5.7.0") # handled by release scripts +set(KF5_DEP_VERSION "5.7.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX FRAMEWORKINTEGRATION VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/frameworkintegration_version.h" @@ -51,7 +51,7 @@ add_subdirectory(tests) # create a Config.cmake and a ConfigVersion.cmake file and install them -set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5FrameworkIntegration") +set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5FrameworkIntegration") ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5FrameworkIntegrationConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5FrameworkIntegrationConfig.cmake" @@ -66,9 +66,9 @@ install(EXPORT KF5FrameworkIntegrationTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5FrameworkIntegrationTargets.cmake NAMESPACE KF5:: ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/frameworkintegration_version.h - DESTINATION ${KF5_INCLUDE_INSTALL_DIR} COMPONENT Devel ) + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) -install(FILES plasma_workspace.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR}) +install(FILES plasma_workspace.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR}) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.6.0/autotests/CMakeLists.txt new/frameworkintegration-5.7.0/autotests/CMakeLists.txt --- old/frameworkintegration-5.6.0/autotests/CMakeLists.txt 2015-01-03 12:59:57.000000000 +0100 +++ new/frameworkintegration-5.7.0/autotests/CMakeLists.txt 2015-02-08 16:10:56.000000000 +0100 @@ -17,6 +17,7 @@ macro(FRAMEWORKINTEGRATION_TESTS _testname) add_executable(${_testname} ${_testname}.cpp ${ARGN}) + set_target_properties(${_testname} PROPERTIES COMPILE_FLAGS "-DUNIT_TEST") add_test(frameworkintegration-${_testname} ${_testname}) ecm_mark_as_test(${_testname}) target_link_libraries(${_testname} Qt5::Test Qt5::DBus KF5::ConfigWidgets KF5::ConfigCore KF5::IconThemes KF5::Style KF5::KIOFileWidgets KF5::I18n KF5::Notifications) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.6.0/autotests/kdeplatformtheme_unittest.cpp new/frameworkintegration-5.7.0/autotests/kdeplatformtheme_unittest.cpp --- old/frameworkintegration-5.6.0/autotests/kdeplatformtheme_unittest.cpp 2015-01-03 12:59:57.000000000 +0100 +++ new/frameworkintegration-5.7.0/autotests/kdeplatformtheme_unittest.cpp 2015-02-08 16:10:56.000000000 +0100 @@ -46,10 +46,17 @@ QStandardPaths::setTestModeEnabled(true); QString configPath = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation); + + if(!QDir(configPath).mkpath(".")) { + qFatal("Failed to create test configuration directory."); + } + configPath.append("/kdeglobals"); QFile::remove(configPath); - QFile::copy(CONFIGFILE, configPath); + if(!QFile::copy(CONFIGFILE, configPath)) { + qFatal("Failed to copy kdeglobals required for tests."); + } } Q_COREAPP_STARTUP_FUNCTION(prepareEnvironment); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.6.0/autotests/kstyle_unittest.cpp new/frameworkintegration-5.7.0/autotests/kstyle_unittest.cpp --- old/frameworkintegration-5.6.0/autotests/kstyle_unittest.cpp 2015-01-03 12:59:57.000000000 +0100 +++ new/frameworkintegration-5.7.0/autotests/kstyle_unittest.cpp 2015-02-08 16:10:56.000000000 +0100 @@ -36,10 +36,17 @@ QStandardPaths::setTestModeEnabled(true); QString configPath = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation); + + if(!QDir(configPath).mkpath(".")) { + qFatal("Failed to create test configuration directory."); + } + configPath.append("/kdeglobals"); QFile::remove(configPath); - QFile::copy(CONFIGFILE, configPath); + if(!QFile::copy(CONFIGFILE, configPath)) { + qFatal("Failed to copy kdeglobals required for tests."); + } } Q_COREAPP_STARTUP_FUNCTION(prepareEnvironment); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.6.0/plasma_workspace.notifyrc new/frameworkintegration-5.7.0/plasma_workspace.notifyrc --- old/frameworkintegration-5.6.0/plasma_workspace.notifyrc 2015-01-03 12:59:57.000000000 +0100 +++ new/frameworkintegration-5.7.0/plasma_workspace.notifyrc 2015-02-08 16:10:56.000000000 +0100 @@ -1,6 +1,7 @@ [Global] IconName=kde Comment=Plasma Workspace +Comment[ar]=مساحة عمل بلازما Comment[ca]=Espai de treball del Plasma Comment[cs]=Pracovní plocha Plasma Comment[da]=Plasma arbejdsområde @@ -35,6 +36,7 @@ [Event/Trash: emptied] Name=Trash: Emptied +Name[ar]=المهملات: أُفرغت Name[ca]=Paperera: s'ha buidat Name[cs]=Koš: vyprázdněn Name[da]=Affald: Tømt @@ -67,6 +69,7 @@ Name[zh_CN]=回收站：空的 Name[zh_TW]=資源回收筒：已清空 Comment=The trash has been emptied +Comment[ar]=أُفرغت المهملات Comment[ca]=S'ha buidat la paperera Comment[cs]=Koš byl vyprázdněn Comment[da]=Affaldet er blevet tømt @@ -103,6 +106,7 @@ [Event/Textcompletion: rotation] Name=Textcompletion: Rotation +Name[ar]=إكمال النصّ: دوران Name[ca]=Compleció de text: rotació Name[cs]=Doplňování textu: rotace Name[da]=Tekstfuldførelse: Rotation @@ -134,6 +138,7 @@ Name[zh_CN]=文本补全：旋转 Name[zh_TW]=文字補完：循環 Comment=The end of the list of matches has been reached +Comment[ar]=وصلتُ إلى نهاية قائمة التّطابقات Comment[ca]=S'ha arribat al final de la llista de coincidències Comment[cs]=Bylo dosaženo konce seznamu shod Comment[da]=Afslutningen på listen over matches er blevet nået @@ -169,6 +174,7 @@ [Event/Textcompletion: no match] Name=Textcompletion: No Match +Name[ar]=إكمال النصّ: لا تطابق Name[ca]=Compleció de text: sense coincidència Name[cs]=Doplňování textu: žádná shoda Name[da]=Tekstfuldførelse: Ingen match @@ -200,6 +206,7 @@ Name[zh_CN]=文本补全：没有匹配 Name[zh_TW]=文字補完：沒有符合 Comment=No matching completion was found +Comment[ar]=لم تُعثر على تطابقات Comment[ca]=No s'ha trobat cap compleció coincident Comment[cs]=Nebyla nalezena žádná shoda Comment[da]=Ingen matchende fuldstændiggørelse blev fundet @@ -235,6 +242,7 @@ [Event/Textcompletion: partial match] Name=Textcompletion: Partial Match +Name[ar]=إكمال النصّ: تطابق جزئيّ Name[ca]=Compleció de text: coincidència parcial Name[cs]=Doplňování textu: částčná shoda Name[da]=Tekstfuldførelse: Delvis match @@ -266,6 +274,7 @@ Name[zh_CN]=文本补全：部分匹配 Name[zh_TW]=文字補完：部份符合 Comment=There is more than one possible match +Comment[ar]=هناك أكثر من تطابق واحد ممكن Comment[ca]=Hi ha més d'una possible coincidència Comment[cs]=Existuje více než jedna shoda Comment[da]=Der er mere end et mulig match @@ -301,6 +310,7 @@ [Event/fatalerror] Name=Fatal Error +Name[ar]=خطأ فادح Name[ca]=Error fatal Name[cs]=Kritická chyba Name[da]=Fatal fejl @@ -332,6 +342,7 @@ Name[zh_CN]=致命错误 Name[zh_TW]=嚴重錯誤 Comment=There was a serious error causing the program to exit +Comment[ar]=حدث خطأ جادّ سببّ للبرنامج بإغلاقه Comment[ca]=S'ha produït un error seriós que ha provocat la sortida del programa Comment[cs]=Nastala závažná chyba, v důsledku které byl program ukončen Comment[da]=Der var en alvorlig fejl som forårsagede at programmet afsluttede @@ -368,6 +379,7 @@ [Event/notification] Name=Notification +Name[ar]=إخطار Name[ca]=Notificació Name[cs]=Upozornění Name[da]=Bekendtgørelse @@ -400,6 +412,7 @@ Name[zh_CN]=通知 Name[zh_TW]=通知 Comment=Something special happened in the program +Comment[ar]=حدث شيء خاصّ في البرنامج Comment[ca]=Quelcom especial ha passat en el programa Comment[cs]=Něco zvláštního se stalo s programem Comment[da]=Noget specielt skete i programmet @@ -435,6 +448,7 @@ [Event/warning] Name=Warning +Name[ar]=تحذير Name[ca]=Avís Name[cs]=Varování Name[da]=Advarsel @@ -467,6 +481,7 @@ Name[zh_CN]=警告 Name[zh_TW]=警告 Comment=There was an error in the program which may cause problems +Comment[ar]=حدث خطأ في البرنامج مما تسبّب بمشاكل Comment[ca]=S'ha produït un error en el programa que pot provocar problemes Comment[cs]=V programu nastala chyba, která může způsobit problémy Comment[da]=Der var en fejl i program som kan volde problemer @@ -502,6 +517,7 @@ [Event/catastrophe] Name=Catastrophe +Name[ar]=كارثة Name[ca]=Catàstrofe Name[cs]=Katastrofa Name[da]=Katastrofe @@ -533,6 +549,7 @@ Name[zh_CN]=严重故障 Name[zh_TW]=發生大災難 Comment=A very serious error occurred, at least causing the program to exit +Comment[ar]=حدث خطأ جادّ جدًّا، تسبّب للبرنامج بإنهائه على أقلّ تقدير Comment[ca]=S'ha produït un error molt seriós, com a mínim ha provocat la sortida del programa Comment[cs]=Nastala velmi závažná chyba, která má za následek minimálně ukončení programu Comment[da]=En meget alvorlig fejl opstod, som mindst forårsagede at programmet afsluttede @@ -569,6 +586,7 @@ [Event/startkde] Name=Login +Name[ar]=ولوج Name[ca]=Entrada Name[cs]=Přihlášení Name[da]=Login @@ -601,6 +619,7 @@ Name[zh_CN]=登录 Name[zh_TW]=登入 Comment=A new session is starting +Comment[ar]=جلسة جديدة تبدأ Comment[ca]=S'està iniciat una sessió nova Comment[cs]=Spouští se nové sezení Comment[da]=En ny session er ved at starte @@ -636,6 +655,7 @@ [Event/exitkde] Name=Logout +Name[ar]=خروج Name[ca]=Sortida Name[cs]=Odhlášení Name[da]=Log ud @@ -668,6 +688,7 @@ Name[zh_CN]=注销 Name[zh_TW]=登出 Comment=Session is exiting +Comment[ar]=الجلسة تخرج Comment[ca]=La sessió està finalitzant Comment[cs]=Sezení se ukončuje Comment[da]=Sessionen er ved at afslutte @@ -704,6 +725,7 @@ [Event/cancellogout] Name=Logout Canceled +Name[ar]=أُلغِيَ الخروج Name[ca]=S'ha cancel·lat la sortida Name[cs]=Odhlášení přerušeno Name[da]=Log ud annulleret @@ -736,6 +758,7 @@ Name[zh_CN]=注销取消了 Name[zh_TW]=登出已取消 Comment=Plasma logout was canceled +Comment[ar]=أُلغِيَ الخروج من بلازما Comment[ca]=S'ha cancel·lat la sortida del Plasma Comment[cs]=Odhlášení z Plazmy bylo zrušeno Comment[da]=Plasma log ud blev annulleret @@ -771,6 +794,7 @@ [Event/printerror] Name=Print Error +Name[ar]=خطأ طباعة Name[ca]=Error d'impressió Name[cs]=Chyba tisku Name[da]=Udskriftsfejl @@ -803,6 +827,7 @@ Name[zh_CN]=打印错误 Name[zh_TW]=列印錯誤 Comment=A print error has occurred +Comment[ar]=حدث خطأ في الطباعة Comment[ca]=S'ha produït un error d'impressió Comment[cs]=Nastala chyba v tisku Comment[da]=En udskriftsfejl opstod @@ -838,13 +863,14 @@ [Event/messageInformation] Name=Information Message +Name[ar]=رسالة معلومات Name[ca]=Missatge d'informació Name[cs]=Informační zpráva Name[da]=Informationsbesked Name[de]=Informationsmeldung Name[en_GB]=Information Message Name[es]=Mensaje de información -Name[fi]=Tiedottava viesti +Name[fi]=Ilmoitus Name[gd]=Teachdaireachd fiosrachaidh Name[hu]=Tájékoztató üzenet Name[it]=Messaggio informativo @@ -870,13 +896,14 @@ Name[zh_CN]=信息消息 Name[zh_TW]=資訊訊息 Comment=An information message is being shown +Comment[ar]=رسالة معلومات تظهر Comment[ca]=Es mostra un missatge d'informació Comment[cs]=Je zobrazována informační zpráva Comment[da]=En informationsbesked vises Comment[de]=Eine Informationsmeldung wird angezeigt Comment[en_GB]=An information message is being shown Comment[es]=Se está mostrando un mensaje de información -Comment[fi]=Näytetään tiedottava viesti +Comment[fi]=Ilmoitus näytetään Comment[gd]=Tha teachdaireachd fiosrachaidh 'ga sealltainn Comment[hu]=Tájékoztató üzenet jelenik meg Comment[it]=Un messaggio informativo viene mostrato @@ -905,13 +932,14 @@ [Event/messageWarning] Name=Warning Message +Name[ar]=رسالة تحذيريّة Name[ca]=Missatge d'avís Name[cs]=Varovná zpráva Name[da]=Advarselsbesked Name[de]=Warnmeldung Name[en_GB]=Warning Message Name[es]=Mensaje de advertencia -Name[fi]=Varoitusviesti +Name[fi]=Varoitus Name[gd]=Teachdaireachd rabhaidh Name[hu]=Figyelmeztető üzenet Name[it]=Messaggio di avviso @@ -937,13 +965,14 @@ Name[zh_CN]=警告消息 Name[zh_TW]=警告訊息 Comment=A warning message is being shown +Comment[ar]=رسالة تحذير تظهر Comment[ca]=Es mostra un missatge d'avís Comment[cs]=Je zobrazována výstražná zpráva Comment[da]=En advarselsbesked vises Comment[de]=Eine Warnmeldung wird angezeigt Comment[en_GB]=A warning message is being shown Comment[es]=Se está mostrando un mensaje de advertencia -Comment[fi]=Näytetään varoitusviesti +Comment[fi]=Varoitus näytetään Comment[gd]=Tha teachdaireachd rabhaidh 'ga sealltainn Comment[hu]=Figyelmeztető üzenet jelenik meg Comment[it]=Un messaggio di avviso viene mostrato @@ -972,13 +1001,14 @@ [Event/messageCritical] Name=Critical Message +Name[ar]=رسالة حرِجة Name[ca]=Missatge crític Name[cs]=Kritická zpráva Name[da]=Kritisk besked Name[de]=Kritische Meldung Name[en_GB]=Critical Message Name[es]=Mensaje crítico -Name[fi]=Kriittinen viesti +Name[fi]=Hälytys Name[gd]=Teachdaireachd èiginneach Name[hu]=Kritikus fontosságú üzenet Name[it]=Messaggio critico @@ -1004,13 +1034,14 @@ Name[zh_CN]=严重消息 Name[zh_TW]=嚴重訊息 Comment=A critical message is being shown +Comment[ar]=رسالة حرِجة تظهر Comment[ca]=Es mostra un missatge crític Comment[cs]=Je zobrazována kritická zpráva Comment[da]=En kritisk besked vises Comment[de]=Eine kritische Fehlermeldung wird angezeigt Comment[en_GB]=A critical message is being shown Comment[es]=Se está mostrando un mensaje crítico -Comment[fi]=Näytetään kriittinen viesti +Comment[fi]=Hälytys näytetään Comment[gd]=Tha teachdaireachd èiginneach 'ga sealltainn Comment[hu]=Kritikus fontosságú hibaüzenet jelenik meg Comment[it]=Un messaggio critico è stato mostrato @@ -1039,6 +1070,7 @@ [Event/messageboxQuestion] Name=Question +Name[ar]=سؤال Name[ca]=Pregunta Name[cs]=Dotaz Name[da]=Spørgsmål @@ -1071,6 +1103,7 @@ Name[zh_CN]=问题 Name[zh_TW]=詢問 Comment=A question is being asked +Comment[ar]=سؤال يُسأل Comment[ca]=Es pregunta una qüestió Comment[cs]=Je položen dotaz Comment[da]=Et spørgsmål stilles @@ -1107,6 +1140,7 @@ [Event/beep] Name=Beep +Name[ar]=جرس Name[ca]=Timbre Name[cs]=Pípnutí Name[da]=Bip @@ -1139,6 +1173,7 @@ Name[zh_CN]=响铃 Name[zh_TW]=嗶聲 Comment=Sound bell +Comment[ar]=جرس صوت Comment[ca]=So de campana Comment[cs]=Zvonek Comment[da]=Lad klokke lyde diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.6.0/po/ja/frameworkintegration5.po new/frameworkintegration-5.7.0/po/ja/frameworkintegration5.po --- old/frameworkintegration-5.6.0/po/ja/frameworkintegration5.po 2015-01-03 12:59:57.000000000 +0100 +++ new/frameworkintegration-5.7.0/po/ja/frameworkintegration5.po 2015-02-08 16:10:56.000000000 +0100 @@ -6,7 +6,7 @@ "PO-Revision-Date: 2014-05-01 01:02-0700\n" "Last-Translator: Japanese KDE translation team <kde-jp@kde.org>\n" "Language-Team: Japanese <kde-jp@kde.org>\n" -"Language: \n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.6.0/po/lt/frameworkintegration5.po new/frameworkintegration-5.7.0/po/lt/frameworkintegration5.po --- old/frameworkintegration-5.6.0/po/lt/frameworkintegration5.po 2015-01-03 12:59:57.000000000 +0100 +++ new/frameworkintegration-5.7.0/po/lt/frameworkintegration5.po 2015-02-08 16:10:56.000000000 +0100 @@ -1,23 +1,24 @@ # Lithuanian translations for trunk-kf package. # Copyright (C) 2014 This_file_is_part_of_KDE # This file is distributed under the same license as the trunk-kf package. -# Automatically generated, 2014. # +# Automatically generated, 2014. +# Liudas Ališauskas <liudas@akmc.lt>, 2015. msgid "" msgstr "" "Project-Id-Version: trunk-kf 5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-12-02 09:50+0000\n" -"PO-Revision-Date: 2014-09-29 14:18+0100\n" -"Last-Translator: Andrius Štikonas <andrius@stikonas.eu>\n" -"Language-Team: none\n" +"PO-Revision-Date: 2015-01-26 13:24+0200\n" +"Last-Translator: Liudas Ališauskas <liudas@akmc.lt>\n" +"Language-Team: Lithuanian <kde-i18n-lt@kde.org>\n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n" "%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" -"X-Generator: Poedit 1.5.5\n" +"X-Generator: Lokalize 1.5\n" #: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." @@ -30,32 +31,32 @@ #: platformtheme/kdeplatformtheme.cpp:227 msgctxt "@action:button" msgid "Save All" -msgstr "" +msgstr "Išsaugoti viską" #: platformtheme/kdeplatformtheme.cpp:233 msgctxt "@action:button" msgid "Yes to All" -msgstr "" +msgstr "Taip viskam" #: platformtheme/kdeplatformtheme.cpp:237 msgctxt "@action:button" msgid "No to All" -msgstr "" +msgstr "Ne viskam" #: platformtheme/kdeplatformtheme.cpp:240 msgctxt "@action:button" msgid "Abort" -msgstr "" +msgstr "Nutraukti" #: platformtheme/kdeplatformtheme.cpp:242 msgctxt "@action:button" msgid "Retry" -msgstr "" +msgstr "Bandyti vėl" #: platformtheme/kdeplatformtheme.cpp:244 msgctxt "@action:button" msgid "Ignore" -msgstr "" +msgstr "Ignoruoti" #: platformtheme/kdirselectdialog.cpp:132 msgctxt "folder name" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.6.0/po/nb/frameworkintegration5.po new/frameworkintegration-5.7.0/po/nb/frameworkintegration5.po --- old/frameworkintegration-5.6.0/po/nb/frameworkintegration5.po 2015-01-03 12:59:57.000000000 +0100 +++ new/frameworkintegration-5.7.0/po/nb/frameworkintegration5.po 2015-02-08 16:10:56.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-11-13 07:46+0000\n" +"POT-Creation-Date: 2014-12-02 09:50+0000\n" "PO-Revision-Date: 2014-09-14 22:12+0200\n" "Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" @@ -27,32 +27,32 @@ msgid "Saving..." msgstr "Lagrer …" -#: platformtheme/kdeplatformtheme.cpp:226 +#: platformtheme/kdeplatformtheme.cpp:227 msgctxt "@action:button" msgid "Save All" msgstr "" -#: platformtheme/kdeplatformtheme.cpp:232 +#: platformtheme/kdeplatformtheme.cpp:233 msgctxt "@action:button" msgid "Yes to All" msgstr "" -#: platformtheme/kdeplatformtheme.cpp:236 +#: platformtheme/kdeplatformtheme.cpp:237 msgctxt "@action:button" msgid "No to All" msgstr "" -#: platformtheme/kdeplatformtheme.cpp:239 +#: platformtheme/kdeplatformtheme.cpp:240 msgctxt "@action:button" msgid "Abort" msgstr "" -#: platformtheme/kdeplatformtheme.cpp:241 +#: platformtheme/kdeplatformtheme.cpp:242 msgctxt "@action:button" msgid "Retry" msgstr "" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:244 msgctxt "@action:button" msgid "Ignore" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.6.0/src/infopage/CMakeLists.txt new/frameworkintegration-5.7.0/src/infopage/CMakeLists.txt --- old/frameworkintegration-5.6.0/src/infopage/CMakeLists.txt 2015-01-03 12:59:57.000000000 +0100 +++ new/frameworkintegration-5.7.0/src/infopage/CMakeLists.txt 2015-02-08 16:10:56.000000000 +0100 @@ -24,4 +24,4 @@ box-center.png kde_infopage.css kde_infopage_rtl.css - DESTINATION ${KF5_DATA_INSTALL_DIR}/infopage) + DESTINATION ${KDE_INSTALL_DATADIR_KF5}/infopage) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.6.0/src/integrationplugin/CMakeLists.txt new/frameworkintegration-5.7.0/src/integrationplugin/CMakeLists.txt --- old/frameworkintegration-5.6.0/src/integrationplugin/CMakeLists.txt 2015-01-03 12:59:57.000000000 +0100 +++ new/frameworkintegration-5.7.0/src/integrationplugin/CMakeLists.txt 2015-02-08 16:10:56.000000000 +0100 @@ -10,4 +10,4 @@ ) install(TARGETS FrameworkIntegrationPlugin - DESTINATION ${PLUGIN_INSTALL_DIR}/kf5) + DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.6.0/src/kstyle/CMakeLists.txt new/frameworkintegration-5.7.0/src/kstyle/CMakeLists.txt --- old/frameworkintegration-5.6.0/src/kstyle/CMakeLists.txt 2015-01-03 12:59:57.000000000 +0100 +++ new/frameworkintegration-5.7.0/src/kstyle/CMakeLists.txt 2015-02-08 16:10:56.000000000 +0100 @@ -15,7 +15,7 @@ endif() # create a Config.cmake and a ConfigVersion.cmake file and install them -set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5Style") +set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Style") configure_file(config-kstyle.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kstyle.h ) @@ -25,7 +25,7 @@ generate_export_header(KF5Style BASE_NAME KStyle) add_library(KF5::Style ALIAS KF5Style) -target_include_directories(KF5Style INTERFACE "$<INSTALL_INTERFACE:${KF5_INCLUDE_INSTALL_DIR}/KStyle>") +target_include_directories(KF5Style INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KStyle>") target_link_libraries(KF5Style PUBLIC @@ -56,6 +56,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kstyle_export.h ${KStyle_HEADERS} - DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KStyle + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KStyle COMPONENT Devel) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.6.0/src/kstyle/kstyle.cpp new/frameworkintegration-5.7.0/src/kstyle/kstyle.cpp --- old/frameworkintegration-5.6.0/src/kstyle/kstyle.cpp 2015-01-03 12:59:57.000000000 +0100 +++ new/frameworkintegration-5.7.0/src/kstyle/kstyle.cpp 2015-02-08 16:10:56.000000000 +0100 @@ -103,7 +103,7 @@ void ColorSchemeFilter::installColorScheme(QWidget *w) { - if (!w) { + if (!w || !w->isTopLevel()) { return; } #if HAVE_X11 @@ -416,11 +416,6 @@ int KStyle::styleHint(StyleHint hint, const QStyleOption *option, const QWidget *widget, QStyleHintReturn *returnData) const { switch (hint) { - case SH_ItemView_ActivateItemOnSingleClick: { - KConfigGroup g(KSharedConfig::openConfig(), "KDE"); - return g.readEntry("SingleClick", true); - } - case SH_DialogButtonBox_ButtonsHaveIcons: { // was KGlobalSettings::showIconsOnPushButtons() : KConfigGroup g(KSharedConfig::openConfig(), "KDE"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.6.0/src/platformtheme/CMakeLists.txt new/frameworkintegration-5.7.0/src/platformtheme/CMakeLists.txt --- old/frameworkintegration-5.6.0/src/platformtheme/CMakeLists.txt 2015-01-03 12:59:57.000000000 +0100 +++ new/frameworkintegration-5.7.0/src/platformtheme/CMakeLists.txt 2015-02-08 16:10:56.000000000 +0100 @@ -7,6 +7,11 @@ set(HAVE_X11 ${XCB_XCB_FOUND}) if (XCB_XCB_FOUND) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) + find_package(X11) + set_package_properties(X11 PROPERTIES DESCRIPTION "Required for updating the Cursor theme on X11" + URL "http://www.x.org" + TYPE REQUIRED + ) endif() else() set(HAVE_X11 FALSE) @@ -46,7 +51,7 @@ ) if(HAVE_X11) - target_link_libraries(KDEPlatformTheme PRIVATE Qt5::X11Extras XCB::XCB) + target_link_libraries(KDEPlatformTheme PRIVATE Qt5::X11Extras XCB::XCB ${X11_Xcursor_LIB}) endif() -install(TARGETS KDEPlatformTheme DESTINATION ${QT_PLUGIN_INSTALL_DIR}/platformthemes) +install(TARGETS KDEPlatformTheme DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/platformthemes) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.6.0/src/platformtheme/kdeplatformsystemtrayicon.cpp new/frameworkintegration-5.7.0/src/platformtheme/kdeplatformsystemtrayicon.cpp --- old/frameworkintegration-5.6.0/src/platformtheme/kdeplatformsystemtrayicon.cpp 2015-01-03 12:59:57.000000000 +0100 +++ new/frameworkintegration-5.7.0/src/platformtheme/kdeplatformsystemtrayicon.cpp 2015-02-08 16:10:56.000000000 +0100 @@ -24,9 +24,7 @@ #include <QMenu> #include <QRect> #include <QApplication> -#include <QDBusConnection> -#include <QDBusConnectionInterface> -#include <QDBusReply> +#include <QDBusInterface> #if (QT_VERSION >= QT_VERSION_CHECK(5, 3, 0)) SystemTrayMenu::SystemTrayMenu() @@ -146,7 +144,6 @@ SystemTrayMenuItem::SystemTrayMenuItem() : QPlatformMenuItem() , m_tag(0) - , m_menu(Q_NULLPTR) , m_action(new QAction(this)) { connect(m_action, &QAction::triggered, this, &QPlatformMenuItem::activated); @@ -189,7 +186,9 @@ void SystemTrayMenuItem::setMenu(QPlatformMenu *menu) { - m_menu = menu; + if (SystemTrayMenu *ourMenu = qobject_cast<SystemTrayMenu *>(menu)) { + m_action->setMenu(ourMenu->menu()); + } } void SystemTrayMenuItem::setRole(QPlatformMenuItem::MenuRole role) @@ -327,8 +326,12 @@ bool KDEPlatformSystemTrayIcon::isSystemTrayAvailable() const { - QDBusReply<bool> reply = QDBusConnection::sessionBus().interface()->isServiceRegistered("org.kde.StatusNotifierWatcher"); - return reply.value(); + QDBusInterface systrayHost("org.kde.StatusNotifierWatcher", "/StatusNotifierWatcher", "org.kde.StatusNotifierWatcher"); + if (systrayHost.isValid()) { + return systrayHost.property("IsStatusNotifierHostRegistered").toBool(); + } + + return false; } bool KDEPlatformSystemTrayIcon::supportsMessages() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.6.0/src/platformtheme/kdeplatformsystemtrayicon.h new/frameworkintegration-5.7.0/src/platformtheme/kdeplatformsystemtrayicon.h --- old/frameworkintegration-5.6.0/src/platformtheme/kdeplatformsystemtrayicon.h 2015-01-03 12:59:57.000000000 +0100 +++ new/frameworkintegration-5.7.0/src/platformtheme/kdeplatformsystemtrayicon.h 2015-02-08 16:10:56.000000000 +0100 @@ -82,7 +82,6 @@ private: quintptr m_tag; - QPlatformMenu *m_menu; QAction *m_action; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.6.0/src/platformtheme/khintssettings.cpp new/frameworkintegration-5.7.0/src/platformtheme/khintssettings.cpp --- old/frameworkintegration-5.6.0/src/platformtheme/khintssettings.cpp 2015-01-03 12:59:57.000000000 +0100 +++ new/frameworkintegration-5.7.0/src/platformtheme/khintssettings.cpp 2015-02-08 16:10:56.000000000 +0100 @@ -33,6 +33,7 @@ #include <QApplication> #include <QGuiApplication> #include <QDialogButtonBox> +#include <QScreen> #include <QDBusConnection> #include <QDBusInterface> @@ -42,6 +43,16 @@ #include <ksharedconfig.h> #include <kcolorscheme.h> +#ifndef UNIT_TEST +#include <config-platformtheme.h> +#else +#define HAVE_X11 0 +#endif +#if HAVE_X11 +#include <QX11Info> +#include <X11/Xcursor/Xcursor.h> +#endif + static const QString defaultLookAndFeelPackage = "org.kde.breeze.desktop"; KHintsSettings::KHintsSettings() : QObject(0) @@ -234,6 +245,9 @@ case IconChanged: iconChanged(arg); //Once the KCM is ported to use IconChanged, this should not be needed break; + case CursorChanged: + updateCursorTheme(); + break; case StyleChanged: { QApplication *app = qobject_cast<QApplication *>(QCoreApplication::instance()); if (!app) { @@ -363,3 +377,33 @@ } } } + +void KHintsSettings::updateCursorTheme() +{ + KConfig config("kcminputrc"); + KConfigGroup g(&config, "Mouse"); + + QString theme = g.readEntry("cursorTheme", QString()); + int size = g.readEntry("cursorSize", -1); + + // Default cursor size is 16 points + if (size == -1) { + if (QScreen *s = QGuiApplication::primaryScreen()) { + size = s->logicalDotsPerInchY() * 16 / 72; + } else { + size = 0; + } + } + +#if HAVE_X11 + if (QX11Info::isPlatformX11()) { + // Note that in X11R7.1 and earlier, calling XcursorSetTheme() + // with a NULL theme would cause Xcursor to use "default", but + // in 7.2 and later it will cause it to revert to the theme that + // was configured when the application was started. + XcursorSetTheme(QX11Info::display(), theme.isNull() ? + "default" : QFile::encodeName(theme).constData()); + XcursorSetDefaultSize(QX11Info::display(), size); + } +#endif +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.6.0/src/platformtheme/khintssettings.h new/frameworkintegration-5.7.0/src/platformtheme/khintssettings.h --- old/frameworkintegration-5.6.0/src/platformtheme/khintssettings.h 2015-01-03 12:59:57.000000000 +0100 +++ new/frameworkintegration-5.7.0/src/platformtheme/khintssettings.h 2015-02-08 16:10:56.000000000 +0100 @@ -54,15 +54,13 @@ explicit KHintsSettings(); virtual ~KHintsSettings(); - inline QVariant hint(QPlatformTheme::ThemeHint hint) + inline QVariant hint(QPlatformTheme::ThemeHint hint) const { return m_hints[hint]; } - inline QPalette *palette(QPlatformTheme::Palette type) + + inline QPalette *palette(QPlatformTheme::Palette type) const { - if (!m_palettes.contains(type)) { - return 0; - } return m_palettes[type]; } @@ -78,6 +76,7 @@ void iconChanged(int group); void updateQtSettings(KConfigGroup &cg); Qt::ToolButtonStyle toolButtonStyle(const KConfigGroup &cg) const; + void updateCursorTheme(); QStringList xdgIconThemePaths() const; QHash<QPlatformTheme::Palette, QPalette *> m_palettes; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠hilbert.suse.de