From b02b6b573236144012d59771a61db2e826881ef2 Mon Sep 17 00:00:00 2001
From: ayhanyalcinsoy <ayhanyalcinsoy@pisilinux.org>
Date: Tue, 15 Mar 2016 11:42:16 +0200
Subject: [PATCH 1/2] gtk2:fixed

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

diff --git a/desktop/toolkit/gtk/gtk2/actions.py b/desktop/toolkit/gtk/gtk2/actions.py
index e83462910a..dcee37be0a 100644
--- a/desktop/toolkit/gtk/gtk2/actions.py
+++ b/desktop/toolkit/gtk/gtk2/actions.py
@@ -21,8 +21,8 @@ def setup():
 
     if get.buildTYPE() == "emul32":
         options += " --libdir=/usr/lib32 \
-                     --bindir=/emul32/bin \
-                     --sbindir=/emul32/sbin \
+                     --bindir=/usr/bin32 \
+                     --sbindir=/usr/sbin32 \
                      --disable-cups"
 
         shelltools.export("CC", "%s -m32" % get.CC())
@@ -49,7 +49,7 @@ def install():
 
     if get.buildTYPE() == "emul32":
         for binaries in ["gtk-query-immodules-2.0", "gtk-demo"]:
-            pisitools.domove("/emul32/bin/%s" % binaries, "/usr/bin/", "%s-32bit" % binaries)
-        pisitools.removeDir("/emul32")
+            pisitools.domove("/usr/bin32/%s" % binaries, "/usr/bin/", "%s-32bit" % binaries)
+        pisitools.removeDir("/usr/bin32")
         #hack to install gdkconfig.h in gdk headers dir
         pisitools.dosym("/usr/lib/gtk-2.0/include/gdkconfig.h","/usr/include/gtk-2.0/gdk/gdkconfig.h")
diff --git a/desktop/toolkit/gtk/gtk2/pspec.xml b/desktop/toolkit/gtk/gtk2/pspec.xml
index d9b0a7ce4e..e8719f160c 100644
--- a/desktop/toolkit/gtk/gtk2/pspec.xml
+++ b/desktop/toolkit/gtk/gtk2/pspec.xml
@@ -13,7 +13,7 @@
         <Description>GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites.</Description>
         <Archive sha1sum="f3c2f1a3728ed51d08054f6b4c7384fbf99477c0" type="tarxz">mirrors://gnome/gtk+/2.24/gtk+-2.24.28.tar.xz</Archive>
         <BuildDependencies>
-        <!--<Dependency>cups-devel</Dependency> --><!--It was disabled to avoid circle-->
+            <Dependency>cups-devel</Dependency><!--It was disabled to avoid circle-->
             <Dependency>libXi-devel</Dependency>
             <Dependency>cairo-devel</Dependency>
             <Dependency>libXext-devel</Dependency>
@@ -46,7 +46,6 @@
     <Package>
         <Name>gtk2</Name>
         <RuntimeDependencies>
-            <Dependency>cups</Dependency>
             <Dependency>libXi</Dependency>
             <Dependency>cairo</Dependency>
             <Dependency>libXext</Dependency>

From ef17ac66483c1ec4737f04d466977da7a9a2db21 Mon Sep 17 00:00:00 2001
From: ayhanyalcinsoy <ayhanyalcinsoy@pisilinux.org>
Date: Tue, 15 Mar 2016 11:42:59 +0200
Subject: [PATCH 2/2] gtk3:removed unneeded dep

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

diff --git a/desktop/toolkit/gtk/gtk3/actions.py b/desktop/toolkit/gtk/gtk3/actions.py
index 6e3fae81e6..65194ceeca 100644
--- a/desktop/toolkit/gtk/gtk3/actions.py
+++ b/desktop/toolkit/gtk/gtk3/actions.py
@@ -25,8 +25,8 @@ def setup():
 
     if get.buildTYPE() == "emul32":
         options += " --libdir=/usr/lib32 \
-                     --bindir=/emul32/bin \
-                     --sbindir=/emul32/sbin \
+                     --bindir=/usr/bin32 \
+                     --sbindir=/usr/sbin32 \
                      --enable-colord=no \
                    "
 
@@ -54,8 +54,8 @@ def install():
     pisitools.removeDir("/usr/share/man")
     pisitools.dodoc("AUTHORS", "README*", "HACKING", "ChangeLog*", "NEWS*")
 
-    if get.buildTYPE() == "_emul32":
+    if get.buildTYPE() == "emul32":
         for binaries in ["gtk-query-immodules-3.0"]:
-            pisitools.domove("/emul32/bin/%s" % binaries, "/usr/bin/", "%s-32bit" % binaries)
-        pisitools.removeDir("/emul32")
+            pisitools.domove("/usr/bin/%s" % binaries, "/usr/bin/", "%s-32bit" % binaries)
+        pisitools.removeDir("/usr/bin32")
     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 39a82cc6d0..d1f1fc0a59 100644
--- a/desktop/toolkit/gtk/gtk3/pspec.xml
+++ b/desktop/toolkit/gtk/gtk3/pspec.xml
@@ -49,7 +49,6 @@
             <Dependency>libX11</Dependency>
             <Dependency>libepoxy</Dependency>
             <Dependency>atk</Dependency>
-            <Dependency>cups</Dependency>
             <Dependency>pango</Dependency>
             <Dependency>libXi</Dependency>
             <!--<Dependency>json-glib</Dependency>-->