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] 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>