From b8690d0ff8456bf55053048f09f0ce1d9f01f891 Mon Sep 17 00:00:00 2001
From: ayhanyalcinsoy <ayhanyalcinsoy@pisilinux.org>
Date: Wed, 29 Jul 2015 13:04:53 +0300
Subject: [PATCH 1/3] scim:fixed deps

---
 x11/im/scim/pspec.xml | 43 +++++--------------------------------------
 1 file changed, 5 insertions(+), 38 deletions(-)

diff --git a/x11/im/scim/pspec.xml b/x11/im/scim/pspec.xml
index b7267d15bf..116caa3d1a 100644
--- a/x11/im/scim/pspec.xml
+++ b/x11/im/scim/pspec.xml
@@ -19,10 +19,8 @@
         </AdditionalFiles>
         <BuildDependencies>
             <Dependency>gtk2-devel</Dependency>
-            <Dependency>gtk3-devel</Dependency>
             <Dependency>libXt-devel</Dependency>
             <Dependency>intltool</Dependency>
-            <Dependency>qt5-base-devel</Dependency>
         </BuildDependencies>
         <Patches>
             <Patch level="1">scim-1.4.14-compile.patch</Patch>
@@ -40,7 +38,9 @@
         <Summary>Core of SCIM for users</Summary>
         <RuntimeDependencies>
             <Dependency>libX11</Dependency>
-            <Dependency>libgcc</Dependency>
+            <Dependency>gtk2</Dependency>
+            <Dependency>pango</Dependency>
+            <Dependency>gdk-pixbuf</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="config">/etc</Path>
@@ -60,9 +60,9 @@
         <Name>scim-libs</Name>
         <Summary>Libraries of SCIM</Summary>
         <RuntimeDependencies>
+            <Dependency>pango</Dependency>
             <Dependency>libX11</Dependency>
-            <Dependency>libgcc</Dependency>
-            <Dependency>libtool-ltdl</Dependency>
+            <Dependency>gtk2</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib/libscim-*</Path>
@@ -88,47 +88,14 @@
         <Name>scim-immodule-gtk2</Name>
         <Summary>IM Module for GTK2 applications</Summary>
         <RuntimeDependencies>
-            <Dependency>scim-libs</Dependency>
-            <Dependency>atk</Dependency>
             <Dependency>gtk2</Dependency>
-            <Dependency>cairo</Dependency>
             <Dependency>pango</Dependency>
-            <Dependency>fontconfig</Dependency>
-            <Dependency>gdk-pixbuf</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib/gtk-2.0</Path>
         </Files>
     </Package>
 
-    <Package>
-        <Name>scim-immodule-gtk3</Name>
-        <Summary>IM Module for GTK3 applications</Summary>
-        <RuntimeDependencies>
-            <Dependency>scim-libs</Dependency>
-            <Dependency>atk</Dependency>
-            <Dependency>gtk3</Dependency>
-            <Dependency>cairo</Dependency>
-            <Dependency>pango</Dependency>
-            <Dependency>gdk-pixbuf</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="library">/usr/lib/gtk-3.0</Path>
-        </Files>
-    </Package>
-
-    <Package>
-        <Name>scim-immodule-qt5</Name>
-        <Summary>IM Module for Qt5 applications</Summary>
-        <RuntimeDependencies>
-            <Dependency>scim-libs</Dependency>
-            <Dependency>qt</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="library">/usr/lib/qt4/plugins/inputmethods/im-scim.so</Path>
-        </Files>
-    </Package>
-
     <History>
         <Update release="4">
             <Date>2014-05-16</Date>

From 19ecd6c5e7d5d79f5085ae10cde4d48bf3e5f197 Mon Sep 17 00:00:00 2001
From: ayhanyalcinsoy <ayhanyalcinsoy@pisilinux.org>
Date: Wed, 29 Jul 2015 17:15:24 +0300
Subject: [PATCH 2/3] gtk3:fixed deps and file conflict

---
 desktop/toolkit/gtk/gtk3/actions.py | 2 +-
 desktop/toolkit/gtk/gtk3/pspec.xml  | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/desktop/toolkit/gtk/gtk3/actions.py b/desktop/toolkit/gtk/gtk3/actions.py
index 90763b9448..bfc7127e4a 100644
--- a/desktop/toolkit/gtk/gtk3/actions.py
+++ b/desktop/toolkit/gtk/gtk3/actions.py
@@ -17,7 +17,6 @@ def setup():
                --disable-silent-rules \
                --disable-schemas-compile \
                --enable-introspection \
-               --enable-gtk2-dependency \
                --disable-papi \
                --disable-wayland-backend \
               "
@@ -59,3 +58,4 @@ def install():
         for binaries in ["gtk-query-immodules-3.0"]:
             pisitools.domove("/_emul32/bin/%s" % binaries, "/usr/bin/", "%s-32bit" % binaries)
         pisitools.removeDir("/_emul32")
+    pisitools.rename("/usr/bin/gtk-update-icon-cache", "gtk3-update-icon-cache")
diff --git a/desktop/toolkit/gtk/gtk3/pspec.xml b/desktop/toolkit/gtk/gtk3/pspec.xml
index 92c758b6fb..0ad0c92885 100644
--- a/desktop/toolkit/gtk/gtk3/pspec.xml
+++ b/desktop/toolkit/gtk/gtk3/pspec.xml
@@ -52,9 +52,9 @@
             <Dependency>cups</Dependency>
             <Dependency>pango</Dependency>
             <Dependency>libXi</Dependency>
-            <Dependency>json-glib</Dependency>
+            <!--<Dependency>json-glib</Dependency>-->
             <Dependency>cairo</Dependency>
-            <Dependency>gobject-introspection</Dependency>
+            <!--<Dependency>gobject-introspection</Dependency>-->
             <Dependency>libXext</Dependency>
             <Dependency>libXrandr</Dependency>
             <Dependency>libXfixes</Dependency>
@@ -124,8 +124,10 @@
             <Dependency release="current">gtk3</Dependency>
             <Dependency>atk-devel</Dependency>
             <Dependency>pango-devel</Dependency>
+            <Dependency>libX11-devel</Dependency>
             <Dependency>libXi-devel</Dependency>
             <Dependency>cairo-devel</Dependency>
+            <Dependency>glib2-devel</Dependency>
             <Dependency>libXext-devel</Dependency>
             <Dependency>libepoxy-devel</Dependency>
             <Dependency>libXfixes-devel</Dependency>

From ae3531df8af3f1e88d38164ff39a7b190daac91a Mon Sep 17 00:00:00 2001
From: ayhanyalcinsoy <ayhanyalcinsoy@pisilinux.org>
Date: Wed, 29 Jul 2015 17:43:40 +0300
Subject: [PATCH 3/3] scim:fixed deps

---
 x11/im/scim/actions.py |  1 -
 x11/im/scim/pspec.xml  | 28 +++++++++++++++++++++++++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/x11/im/scim/actions.py b/x11/im/scim/actions.py
index 584b7b7b68..1885c746d0 100644
--- a/x11/im/scim/actions.py
+++ b/x11/im/scim/actions.py
@@ -25,7 +25,6 @@ def setup():
                         ")
                          #--disable-panel-gtk \
                          #--disable-setup-ui")
-                         # no gtk3 support in scim-anthy
 
     pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
 
diff --git a/x11/im/scim/pspec.xml b/x11/im/scim/pspec.xml
index 116caa3d1a..3bcedb10de 100644
--- a/x11/im/scim/pspec.xml
+++ b/x11/im/scim/pspec.xml
@@ -18,9 +18,10 @@
             <AdditionalFile permission="0644" target="configs/global">scim-system-global</AdditionalFile>
         </AdditionalFiles>
         <BuildDependencies>
-            <Dependency>gtk2-devel</Dependency>
+            <Dependency>gtk3-devel</Dependency>
             <Dependency>libXt-devel</Dependency>
             <Dependency>intltool</Dependency>
+            <Dependency>qt5-base-devel</Dependency>
         </BuildDependencies>
         <Patches>
             <Patch level="1">scim-1.4.14-compile.patch</Patch>
@@ -38,7 +39,10 @@
         <Summary>Core of SCIM for users</Summary>
         <RuntimeDependencies>
             <Dependency>libX11</Dependency>
-            <Dependency>gtk2</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency>scim-libs</Dependency>
+            <Dependency>gtk3</Dependency>
+            <Dependency>glib2</Dependency>
             <Dependency>pango</Dependency>
             <Dependency>gdk-pixbuf</Dependency>
         </RuntimeDependencies>
@@ -62,7 +66,11 @@
         <RuntimeDependencies>
             <Dependency>pango</Dependency>
             <Dependency>libX11</Dependency>
-            <Dependency>gtk2</Dependency>
+            <Dependency>gtk3</Dependency>
+            <Dependency>cairo</Dependency>
+            <Dependency>glib2</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency>libtool-ltdl</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib/libscim-*</Path>
@@ -84,11 +92,25 @@
         </Files>
     </Package>
 
+    <Package>
+        <Name>scim-immodule-gtk3</Name>
+        <Summary>IM Module for GTK3 applications</Summary>
+        <RuntimeDependencies>
+            <Dependency>gtk3</Dependency>
+            <Dependency>glib2</Dependency>
+            <Dependency>pango</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="library">/usr/lib/gtk-3.0</Path>
+        </Files>
+    </Package>
+
     <Package>
         <Name>scim-immodule-gtk2</Name>
         <Summary>IM Module for GTK2 applications</Summary>
         <RuntimeDependencies>
             <Dependency>gtk2</Dependency>
+            <Dependency>glib2</Dependency>
             <Dependency>pango</Dependency>
         </RuntimeDependencies>
         <Files>