From ab5d9bcc12ecc4993d2bb75c44cd786afc9e9a9d Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Sat, 23 Feb 2019 10:58:29 +0300
Subject: [PATCH 1/2] qt5-base:rebuild gtk3

---
 desktop/toolkit/qt5/qt5-base/pspec.xml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/desktop/toolkit/qt5/qt5-base/pspec.xml b/desktop/toolkit/qt5/qt5-base/pspec.xml
index a97883eb19..997c59f017 100755
--- a/desktop/toolkit/qt5/qt5-base/pspec.xml
+++ b/desktop/toolkit/qt5/qt5-base/pspec.xml
@@ -25,7 +25,7 @@
             <Dependency>desktop-file-utils</Dependency>
             <Dependency>fontconfig-devel</Dependency>
             <Dependency>gperf</Dependency>
-            <Dependency versionFrom="2.24.31">gtk2-devel</Dependency>
+            <Dependency versionFrom="2.24.31">gtk3-devel</Dependency>
             <Dependency versionFrom="1.4.2">harfbuzz-devel</Dependency>
             <Dependency>icon-theme-hicolor</Dependency>
             <Dependency versionFrom="1.18">leveldb-devel</Dependency>
@@ -86,7 +86,7 @@
     <Package>
         <Name>qt5-base</Name>
         <RuntimeDependencies>
-            <Dependency>gtk2</Dependency>
+            <Dependency>gtk3</Dependency>
             <Dependency>pango</Dependency>
             <Dependency>libpcre</Dependency>
             <Dependency>libgcc</Dependency>
@@ -207,7 +207,7 @@
         <BuildDependencies>
             <Dependency>cups-32bit</Dependency>
             <Dependency>dbus-32bit</Dependency>
-            <Dependency>gtk2-32bit</Dependency>
+            <Dependency>gtk3-32bit</Dependency>
             <Dependency>mesa-32bit</Dependency>
             <Dependency>zlib-32bit</Dependency>
             <Dependency>glib2-32bit</Dependency>
@@ -234,7 +234,7 @@
             <Dependency>qt5-base-devel</Dependency>
             <Dependency>cups-32bit</Dependency>
             <Dependency>dbus-32bit</Dependency>
-            <Dependency>gtk2-32bit</Dependency>
+            <Dependency>gtk3-32bit</Dependency>
             <Dependency>mesa-32bit</Dependency>
             <Dependency>zlib-32bit</Dependency>
             <Dependency>glib2-32bit</Dependency>
@@ -262,6 +262,13 @@
     </Package>-->
 
     <History>
+        <Update release="16">
+            <Date>2019-02-23</Date>
+            <Version>5.12.1</Version>
+            <Comment>Rebuild Gtk3.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="15">
             <Date>2019-02-09</Date>
             <Version>5.12.1</Version>

From 9eb280abe92083f2ac04c95b5d0dda6f7f5e021c Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Sat, 23 Feb 2019 18:30:33 +0300
Subject: [PATCH 2/2] sddm:ver.bump

---
 .../sddm/files/sddm-0.16.0-ck2-revert.patch   | 20 +++++++++++++++++++
 desktop/misc/sddm/files/sddm.conf             |  3 +++
 desktop/misc/sddm/pspec.xml                   | 11 ++++++++--
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 desktop/misc/sddm/files/sddm-0.16.0-ck2-revert.patch

diff --git a/desktop/misc/sddm/files/sddm-0.16.0-ck2-revert.patch b/desktop/misc/sddm/files/sddm-0.16.0-ck2-revert.patch
new file mode 100644
index 0000000000..bbe2a27284
--- /dev/null
+++ b/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
diff --git a/desktop/misc/sddm/files/sddm.conf b/desktop/misc/sddm/files/sddm.conf
index e15d8a2c4f..6572d681dd 100644
--- a/desktop/misc/sddm/files/sddm.conf
+++ b/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
diff --git a/desktop/misc/sddm/pspec.xml b/desktop/misc/sddm/pspec.xml
index 78d236f5ae..1319c0252b 100644
--- a/desktop/misc/sddm/pspec.xml
+++ b/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>