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 @@
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.
mirrors://gnome/gtk+/2.24/gtk+-2.24.28.tar.xz
-
+ cups-devel
libXi-devel
cairo-devel
libXext-devel
@@ -46,7 +46,6 @@
gtk2
- cups
libXi
cairo
libXext
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 @@
libX11
libepoxy
atk
- cups
pango
libXi