Merge pull request #6590 from Rmys/master

sddm:ver.bump

desktop/misc/sddm/files/sddm-0.16.0-ck2-revert.patch

@@ -0,0 +1,20 @@
+SDDM 0.16.0 fails to start with consolekit2 because it assumes consolekit2
+has the same interface names as logind.
+
+This patch forces sddm to use legacy behaviour when consolekit2 is detected.
+
+Bug: https://bugs.gentoo.org/633920
+Bug: https://github.com/sddm/sddm/issues/903
+Bug: https://github.com/ConsoleKit2/ConsoleKit2/issues/99
+
+--- a/src/daemon/LogindDBusTypes.cpp
++++ b/src/daemon/LogindDBusTypes.cpp
+@@ -60,7 +60,7 @@
+ 
+     if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) {
+         qDebug() << "Console kit interface found";
+-        available = true;
++        available = false;
+         serviceName = QStringLiteral("org.freedesktop.ConsoleKit");
+         managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager");
+         managerIfaceName = QStringLiteral("/org.freedesktop.ConsoleKit.Manager"); //note this doesn't match logind

desktop/misc/sddm/files/sddm.conf

@@ -21,6 +21,9 @@ Numlock=none
 # Reboot command
 RebootCommand=/sbin/shutdown -r now
 
+# Input method module
+InputMethod=
+
 
 [Theme]
 # Current theme name

desktop/misc/sddm/pspec.xml

@@ -14,7 +14,7 @@
         <IsA>app:console</IsA>
         <Summary>QML based X11 display manager</Summary>
         <Description>KDE Power Management module. Provides kded daemon DBus helper and KCM for configuring Power settings</Description>
-        <Archive sha1sum="ee92a2b27602c13d6ac5cfd34399192a31ca033c" type="tarxz">https://github.com/sddm/sddm/releases/download/v0.14.0/sddm-0.14.0.tar.xz</Archive>
+        <Archive sha1sum="286fa1f0102e3b05a84a165a00978d6feab20a60" type="tarxz">https://github.com/sddm/sddm/releases/download/v0.18.0/sddm-0.18.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
             <Dependency>qt5-linguist</Dependency>
@@ -27,8 +27,8 @@
         </BuildDependencies>
         <Patches>            
             <Patch>sddm-respect-user-flags.patch</Patch>
-            <Patch>ecb903e4.patch</Patch>
             <Patch>sddm-0.14.0-consolekit.patch</Patch>
+            <Patch>sddm-0.16.0-ck2-revert.patch</Patch>
         </Patches>
     </Source>
 
@@ -70,6 +70,13 @@
     </Package>
 
     <History>
+        <Update release="10">
+            <Date>2019-02-22</Date>
+            <Version>0.18.0</Version>
+            <Comment>Version bump</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="9">
             <Date>2019-02-18</Date>
             <Version>0.14.0</Version>