Hello community, here is the log from the commit of package kscreenlocker for openSUSE:Factory checked in at 2017-03-28 15:15:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kscreenlocker (Old) and /work/SRC/openSUSE:Factory/.kscreenlocker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kscreenlocker" Tue Mar 28 15:15:37 2017 rev:24 rq:482096 version:5.9.4 Changes: -------- --- /work/SRC/openSUSE:Factory/kscreenlocker/kscreenlocker.changes 2017-03-03 17:30:39.582768664 +0100 +++ /work/SRC/openSUSE:Factory/.kscreenlocker.new/kscreenlocker.changes 2017-03-28 15:15:38.293518162 +0200 @@ -1,0 +2,13 @@ +Tue Mar 21 19:21:45 CET 2017 - fab...@ritter-vogt.de + +- Update to 5.9.4 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.9.4.php +- Changes since 5.9.3: + * fix merge + * Implement manual focus on click (kde#348789,kde#374289) +- Remove patches, now upstream: + * 0001-Implement-manual-focus-on-click.patch + +------------------------------------------------------------------- Old: ---- 0001-Implement-manual-focus-on-click.patch kscreenlocker-5.9.3.tar.xz New: ---- kscreenlocker-5.9.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kscreenlocker.spec ++++++ --- /var/tmp/diff_new_pack.kPbX4i/_old 2017-03-28 15:15:38.905431486 +0200 +++ /var/tmp/diff_new_pack.kPbX4i/_new 2017-03-28 15:15:38.909430920 +0200 @@ -18,7 +18,7 @@ %bcond_without lang Name: kscreenlocker -Version: 5.9.3 +Version: 5.9.4 Release: 0 Summary: Library and components for secure lock screen architecture License: GPL-2.0+ @@ -27,8 +27,6 @@ Source: http://download.kde.org/stable/plasma/%{version}/kscreenlocker-%{version}.tar.xz # PATCH-FIX-OPENSUSE fix-wayland-version-requirement.diff -- Changes wayland requirement from 1.3 to 1.2.1 Patch0: fix-wayland-version-requirement.diff -# PATCH-FIX-UPSTREAM 0001-Implement-manual-focus-on-click.patch -Patch100: 0001-Implement-manual-focus-on-click.patch BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= 1.8.0 BuildRequires: kf5-filesystem @@ -93,7 +91,6 @@ # SLE12 has a patched 1.2.1 wayland with all features KDE needs from up to 1.7.0 %patch0 -p1 %endif -%patch100 -p1 %build %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} ++++++ kscreenlocker-5.9.3.tar.xz -> kscreenlocker-5.9.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kscreenlocker-5.9.3/CMakeLists.txt new/kscreenlocker-5.9.4/CMakeLists.txt --- old/kscreenlocker-5.9.3/CMakeLists.txt 2017-02-28 13:55:06.000000000 +0100 +++ new/kscreenlocker-5.9.4/CMakeLists.txt 2017-03-21 14:52:41.000000000 +0100 @@ -1,4 +1,4 @@ -set(PROJECT_VERSION "5.9.3") +set(PROJECT_VERSION "5.9.4") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kscreenlocker-5.9.3/greeter/greeterapp.cpp new/kscreenlocker-5.9.4/greeter/greeterapp.cpp --- old/kscreenlocker-5.9.3/greeter/greeterapp.cpp 2017-02-28 13:54:06.000000000 +0100 +++ new/kscreenlocker-5.9.4/greeter/greeterapp.cpp 2017-03-21 14:51:53.000000000 +0100 @@ -372,7 +372,6 @@ // this loop is required to make the qml/graphicsscene properly handle the shared keyboard input // ie. "type something into the box of every greeter" foreach (KQuickAddons::QuickViewSharedEngine *view, m_views) { - view->requestActivate(); if (!m_testing) { view->setKeyboardGrabEnabled(true); // TODO - check whether this still works in master! } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kscreenlocker-5.9.3/greeter/themes/org.kde.passworddialog/metadata.desktop new/kscreenlocker-5.9.4/greeter/themes/org.kde.passworddialog/metadata.desktop --- old/kscreenlocker-5.9.3/greeter/themes/org.kde.passworddialog/metadata.desktop 2017-02-28 13:54:06.000000000 +0100 +++ new/kscreenlocker-5.9.4/greeter/themes/org.kde.passworddialog/metadata.desktop 2017-03-21 14:51:53.000000000 +0100 @@ -10,6 +10,7 @@ Name[en_GB]=Password dialog Name[es]=Diálogo de contraseña Name[et]=Paroolidialoog +Name[eu]=Pasahitzaren elkarrizketa-koadroa Name[fi]=Salasanaikkuna Name[fr]=Boîtes de dialogue de mot de passe Name[gl]=Diálogo de contrasinal @@ -47,6 +48,7 @@ Comment[en_GB]=Screen locker that provides a password dialog and an interface to switch the current user Comment[es]=Bloqueador de pantalla que proporciona un diálogo de contraseña y una interfaz para cambiar el usuario actual Comment[et]=Ekraani lukustaja, mis pakub paroolidialoogi ja liidest aktiivse kasutaja vahetamiseks +Comment[eu]=Pantaila giltzatzailea, pasahitzaren elkarrizketa-koadro bat eta uneko erabiltzailea aldatzeko interfaze bat eskaintzen dituena Comment[fi]=Salasanakyselyn ja käyttäjävaihdon tarjoava näyttölukko Comment[fr]=Outil de verrouillage d'écran fournissant une boîte de dialogue de mot de passe et une interface pour changer d'utilisateur Comment[gl]=Bloqueador da pantalla que fornece un diálogo de contrasinal e unha interface para trocar de usuario. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kscreenlocker-5.9.3/kcm/screenlocker.desktop new/kscreenlocker-5.9.4/kcm/screenlocker.desktop --- old/kscreenlocker-5.9.3/kcm/screenlocker.desktop 2017-02-28 13:54:06.000000000 +0100 +++ new/kscreenlocker-5.9.4/kcm/screenlocker.desktop 2017-03-21 14:51:53.000000000 +0100 @@ -20,6 +20,7 @@ Name[en_GB]=Screen Locking Name[es]=Bloqueo de pantalla Name[et]=Ekraani lukustamine +Name[eu]=Pantaila giltzatzea Name[fi]=Näytön lukitseminen Name[fr]=Verrouillage de l'écran Name[gl]=Trancar a pantalla @@ -55,6 +56,7 @@ Comment[en_GB]=Screen Locking Timeouts Comment[es]=Tiempos de espera del bloqueo de pantalla Comment[et]=Ekraani lukustamise aegumine +Comment[eu]=Pantaila giltzatzeko denbora-muga Comment[fi]=Näytön lukitsemisen viiveet Comment[fr]=Délai de verrouillage de l'écran Comment[gl]=Tempos máximos de trancar a pantalla @@ -83,12 +85,14 @@ X-KDE-Keywords=lock,resume, screensaver, screenlock X-KDE-Keywords[ca]=bloqueig,reprendre,estalvi de pantalla,bloqueig de pantalla X-KDE-Keywords[ca@valencia]=bloqueig,reprendre,estalvi de pantalla,bloqueig de pantalla +X-KDE-Keywords[cs]=zamknout,pokračovat, spořič, zámek X-KDE-Keywords[da]=lås,genoptag,pauseskærm,skærmlås X-KDE-Keywords[de]=Sperren,Sperre aufheben,Bildschirmschoner,Bildschirmsperre X-KDE-Keywords[el]=κλείδωμα,συνέχιση,προφύλαξη οθόνης,κλείδωμα οθόνης X-KDE-Keywords[en_GB]=lock,resume, screensaver, screenlock X-KDE-Keywords[es]=bloquear, reanudar, salvapantallas, bloqueo de pantalla X-KDE-Keywords[et]=lukustamine,taastamine,ekraanisäästja,ekraani lukustamine +X-KDE-Keywords[eu]=giltzatu,berrekin,pantaila-babesle,pantaila-giltzatu X-KDE-Keywords[fi]=lock,resume, screensaver, screenlock, lukko, lukitseminen, herääminen, näytönsäästäjä, näyttölukko, lukitusnäyttö X-KDE-Keywords[fr]=verrouiller, reprendre,écran de veille, verrouillage de l'écran X-KDE-Keywords[gl]=bloquear,desbloquear,salvapantallas,bloqueo de pantalla diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kscreenlocker-5.9.3/kscreenlocker.notifyrc new/kscreenlocker-5.9.4/kscreenlocker.notifyrc --- old/kscreenlocker-5.9.3/kscreenlocker.notifyrc 2017-02-28 13:54:06.000000000 +0100 +++ new/kscreenlocker-5.9.4/kscreenlocker.notifyrc 2017-03-21 14:51:53.000000000 +0100 @@ -11,6 +11,7 @@ Comment[en_GB]=Screen Saver Comment[es]=Salvapantallas Comment[et]=Ekraanisäästja +Comment[eu]=Pantaila-babesle Comment[fi]=Näytönsäästäjä Comment[fr]=Écran de veille Comment[gl]=Protector de pantalla @@ -50,6 +51,7 @@ Name[en_GB]=Screen locked Name[es]=Pantalla bloqueada Name[et]=Ekraan on lukustatud +Name[eu]=Pantaila giltzatuta Name[fi]=Näyttö lukittu Name[fr]=Écran verrouillé Name[gl]=A pantalla está trancada @@ -87,6 +89,7 @@ Comment[en_GB]=The screen has been locked Comment[es]=Se ha bloqueado la pantalla Comment[et]=Ekraan on lukustatud +Comment[eu]=Pantaila giltzatu egin da Comment[fi]=Näyttö on lukittunut Comment[fr]=L'écran a été verrouillé Comment[gl]=A pantalla trancouse @@ -127,6 +130,7 @@ Name[en_GB]=Screen unlocked Name[es]=Pantalla desbloqueada Name[et]=Ekraan on lahtilukustatud +Name[eu]=Pantaila giltzapetik askatuta Name[fi]=Näytön lukitus aukeni Name[fr]=Écran déverrouillé Name[gl]=A pantalla desatrancouse @@ -164,6 +168,7 @@ Comment[en_GB]=The screen has been unlocked Comment[es]=Se ha desbloqueado la pantalla Comment[et]=Ekraan on lahtilukustatud +Comment[eu]=Pantaila giltzapetik askatu da Comment[fi]=Näytön lukitus on avautunut Comment[fr]=L'écran a été déverrouillé Comment[gl]=A pantalla desatrancouse diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kscreenlocker-5.9.3/po/eu/screenlocker_kcm.po new/kscreenlocker-5.9.4/po/eu/screenlocker_kcm.po --- old/kscreenlocker-5.9.3/po/eu/screenlocker_kcm.po 1970-01-01 01:00:00.000000000 +0100 +++ new/kscreenlocker-5.9.4/po/eu/screenlocker_kcm.po 2017-03-21 14:52:12.000000000 +0100 @@ -0,0 +1,126 @@ +# Translation of screenlocker_kcm.po to Euskara/Basque (eu). +# Copyright (C) 2017, Free Software Foundation, Inc. +# This file is distributed under the same license as the kde-workspace package. +# +# Iñigo Salvador Azurmendi <xa...@euskalnet.net>, 2017. +msgid "" +msgstr "" +"Project-Id-Version: screenlocker_kcm\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; +"POT-Creation-Date: 2017-02-11 07:08+0100\n" +"PO-Revision-Date: 2017-03-02 01:15+0100\n" +"Last-Translator: Iñigo Salvador Azurmendi <xa...@euskalnet.net>\n" +"Language-Team: Basque <kde-i18n-...@kde.org>\n" +"Language: eu\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 1.5\n" + +#: kcm.cpp:55 +#, kde-format +msgctxt "Spinbox suffix. Short for minutes" +msgid " min" +msgid_plural " mins" +msgstr[0] " min" +msgstr[1] " min" + +#: kcm.cpp:57 +#, kde-format +msgctxt "Spinbox suffix. Short for seconds" +msgid " sec" +msgid_plural " secs" +msgstr[0] " seg" +msgstr[1] " seg" + +#: kcm.cpp:78 +#, kde-format +msgid "Lock Session" +msgstr "Giltzatu saioa" + +#: kcm.cpp:143 +#, kde-format +msgid "Error" +msgstr "Errorea" + +#: kcm.cpp:143 +#, kde-format +msgid "Failed to successfully test the screen locker." +msgstr "Pantaila giltzatzailearen probak huts egin du." + +#. i18n: ectx: attribute (title), widget (QWidget, tab) +#: kcm.ui:36 +#, kde-format +msgid "Activation" +msgstr "Aktibazioa" + +#. i18n: ectx: property (text), widget (QCheckBox, kcfg_Autolock) +#: kcm.ui:50 +#, kde-format +msgid "Lock screen automatically after:" +msgstr "Giltzatu pantaila automatikoki hau igarotakoan:" + +#. i18n: ectx: property (text), widget (QLabel, label_2) +#: kcm.ui:73 +#, kde-format +msgid "Re&quire password after locking:" +msgstr "Es&katu pasahitza giltzatu ondoren:" + +#. i18n: ectx: property (specialValueText), widget (KPluralHandlingSpinBox, kcfg_LockGrace) +#: kcm.ui:89 +#, kde-format +msgid "Immediately" +msgstr "Berehala" + +#. i18n: ectx: property (toolTip), widget (QLabel, label_5) +#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_LockOnResume) +#: kcm.ui:102 kcm.ui:115 +#, kde-format +msgid "Lock screen when waking up from suspension" +msgstr "Giltzatu pantaila esekitako egoeratik esnatzean" + +#. i18n: ectx: property (text), widget (QLabel, label_5) +#: kcm.ui:105 +#, kde-format +msgid "&Lock screen on resume:" +msgstr "&Giltzatu pantaila berrekitean:" + +#. i18n: ectx: property (toolTip), widget (QLabel, label_7) +#: kcm.ui:128 +#, kde-format +msgid "The global keyboard shortcut to lock the screen." +msgstr "Pantaila giltzatzeko teklatuko laster-tekla orokorra." + +#. i18n: ectx: property (text), widget (QLabel, label_7) +#: kcm.ui:131 +#, kde-format +msgid "Lock screen:" +msgstr "Giltzatu pantaila:" + +#. i18n: ectx: attribute (title), widget (QWidget, tab_2) +#: kcm.ui:141 +#, kde-format +msgid "Wallpaper" +msgstr "Horma-papera" + +#. i18n: ectx: property (text), widget (QLabel, label) +#: kcm.ui:157 +#, kde-format +msgid "Wallpaper &Type:" +msgstr "Horma-paper &mota:" + +#: selectimagebutton.cpp:41 +#, kde-format +msgid "Load from file..." +msgstr "Zamatu fitxategitik..." + +#: selectimagebutton.cpp:42 +#, kde-format +msgid "Clear Image" +msgstr "Ezabatu irudia" + +#: selectimagebutton.cpp:74 +#, kde-format +msgid "Select image" +msgstr "Hautatu irudia" \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kscreenlocker-5.9.3/po/tr/kscreenlocker_greet.po new/kscreenlocker-5.9.4/po/tr/kscreenlocker_greet.po --- old/kscreenlocker-5.9.3/po/tr/kscreenlocker_greet.po 2017-02-28 13:55:01.000000000 +0100 +++ new/kscreenlocker-5.9.4/po/tr/kscreenlocker_greet.po 2017-03-21 14:52:37.000000000 +0100 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Volkan Gezer <volkange...@gmail.com>, 2013, 2014, 2015. +# Volkan Gezer <volkange...@gmail.com>, 2013, 2014, 2015, 2017. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:20+0100\n" -"PO-Revision-Date: 2015-02-08 14:01+0100\n" +"PO-Revision-Date: 2017-03-15 10:39+0100\n" "Last-Translator: Volkan Gezer <volkange...@gmail.com>\n" "Language-Team: Turkish <kde-l10n...@kde.org>\n" "Language: tr\n" @@ -15,7 +15,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" #: main.cpp:93 #, kde-format @@ -28,10 +28,9 @@ msgstr "Karşılayıcıyı test kipinde başlatır" #: main.cpp:101 -#, fuzzy, kde-format -#| msgid "Starts the greeter in testing mode" +#, kde-format msgid "Starts the greeter with the selected theme (only in Testing mode)" -msgstr "Karşılayıcıyı test kipinde başlatır" +msgstr "Karşılayıcıyı seçili tema kullanarak başlatır (sadece Tt kipinde)" #: main.cpp:106 #, kde-format @@ -52,7 +51,7 @@ #: main.cpp:114 #, kde-format msgid "Default to the switch user UI." -msgstr "" +msgstr "Kullanıcı arayüzü değiştirme olarak öntanımlı kıl." #: main.cpp:117 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kscreenlocker-5.9.3/x11locker.cpp new/kscreenlocker-5.9.4/x11locker.cpp --- old/kscreenlocker-5.9.3/x11locker.cpp 2017-02-28 13:54:06.000000000 +0100 +++ new/kscreenlocker-5.9.4/x11locker.cpp 2017-03-21 14:51:53.000000000 +0100 @@ -51,6 +51,7 @@ X11Locker::X11Locker(QObject *parent) : AbstractLocker(parent) , QAbstractNativeEventFilter() + , m_focusedLockWindow(XCB_WINDOW_NONE) { initialize(); } @@ -229,8 +230,12 @@ XDeleteProperty (QX11Info::display(), win, gXA_VROOT); } -static void fakeFocusIn( WId window ) +void X11Locker::fakeFocusIn( WId window ) { + if (window == m_focusedLockWindow) { + return; + } + // We have keyboard grab, so this application will // get keyboard events even without having focus. // Fake FocusIn to make Qt realize it has the active @@ -244,6 +249,8 @@ ev.xfocus.detail = NotifyAncestor; XSendEvent( QX11Info::display(), window, False, NoEventMask, &ev ); XFlush(QX11Info::display()); + + m_focusedLockWindow = window; } template< typename T> @@ -308,6 +315,11 @@ (x>=x_return && x<=x_return+(int)width_return) && (y>=y_return && y<=y_return+(int)height_return) ) { + // We need to do our own focus handling (see comment in fakeFocusIn). + // For now: Focus on clicks inside the window + if (responseType == XCB_BUTTON_PRESS) { + fakeFocusIn(window); + } const int targetX = x - x_return; const int targetY = y - y_return; if (responseType == XCB_KEY_PRESS || responseType == XCB_KEY_RELEASE) { @@ -386,6 +398,10 @@ else qDebug() << "Unknown toplevel for MapNotify"; m_lockWindows.removeAll(xu->event); + if (m_focusedLockWindow == xu->event && !m_lockWindows.empty()) { + // The currently focused window vanished, just focus the first one in the list + fakeFocusIn(m_lockWindows[0]); + } ret = true; } break; @@ -508,8 +524,14 @@ // not yet shown and we have a lock window, so we show our own window m_background->show(); } + + if (m_lockWindows.empty()) { + // Make sure to focus the first window + m_focusedLockWindow = XCB_WINDOW_NONE; + fakeFocusIn(window); + } + m_lockWindows.prepend(window); - fakeFocusIn(window); stayOnTop(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kscreenlocker-5.9.3/x11locker.h new/kscreenlocker-5.9.4/x11locker.h --- old/kscreenlocker-5.9.3/x11locker.h 2017-02-28 13:54:06.000000000 +0100 +++ new/kscreenlocker-5.9.4/x11locker.h 2017-03-21 14:51:53.000000000 +0100 @@ -60,6 +60,7 @@ void setVRoot(Window win, Window vr); void removeVRoot(Window win); int findWindowInfo(Window w); + void fakeFocusIn(WId window); void stayOnTop() override; struct WindowInfo { @@ -69,6 +70,7 @@ QList<WindowInfo> m_windowInfo; QList<WId> m_lockWindows; QList<quint32> m_allowedWindows; + WId m_focusedLockWindow; }; }
