From 0ff7279a33cfe41d32a099b4fc58802f6d853c3b Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Mon, 14 Mar 2016 14:04:23 +0200 Subject: [PATCH 1/4] gtk2:removed cups from build deps --- desktop/toolkit/gtk/gtk2/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/toolkit/gtk/gtk2/pspec.xml b/desktop/toolkit/gtk/gtk2/pspec.xml index f46dc4d330..786b334dad 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 From a222cfd197424aca6db139e3390c4213ea14a58e Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Mon, 14 Mar 2016 14:04:50 +0200 Subject: [PATCH 2/4] gtk3:removed cups from build deps --- desktop/toolkit/gtk/gtk3/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/toolkit/gtk/gtk3/pspec.xml b/desktop/toolkit/gtk/gtk3/pspec.xml index 5fa4c45d11..39a82cc6d0 100644 --- a/desktop/toolkit/gtk/gtk3/pspec.xml +++ b/desktop/toolkit/gtk/gtk3/pspec.xml @@ -14,7 +14,7 @@ mirrors://gnome/gtk+/3.18/gtk+-3.18.6.tar.xz atk-devel - cups-devel + at-spi2-atk-devel pango-devel json-glib-devel From aa2934811dcb4d388577d7c93740090da6b3a31d Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Mon, 14 Mar 2016 14:12:56 +0200 Subject: [PATCH 3/4] gtk2:fixed typo for emul32 --- desktop/toolkit/gtk/gtk2/actions.py | 14 +++++++------- desktop/toolkit/gtk/gtk2/pspec.xml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/desktop/toolkit/gtk/gtk2/actions.py b/desktop/toolkit/gtk/gtk2/actions.py index ae75d08f9b..e83462910a 100644 --- a/desktop/toolkit/gtk/gtk2/actions.py +++ b/desktop/toolkit/gtk/gtk2/actions.py @@ -19,10 +19,10 @@ def setup(): #Avoid "Only can be included directly error" shelltools.export("CPPFLAGS", "-DGTK_COMPILATION") - if get.buildTYPE() == "_emul32": + if get.buildTYPE() == "emul32": options += " --libdir=/usr/lib32 \ - --bindir=/_emul32/bin \ - --sbindir=/_emul32/sbin \ + --bindir=/emul32/bin \ + --sbindir=/emul32/sbin \ --disable-cups" shelltools.export("CC", "%s -m32" % get.CC()) @@ -47,9 +47,9 @@ def install(): pisitools.dodoc("AUTHORS", "README*", "HACKING", "ChangeLog*", "NEWS*") - if get.buildTYPE() == "_emul32": + 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("/emul32/bin/%s" % binaries, "/usr/bin/", "%s-32bit" % binaries) + pisitools.removeDir("/emul32") #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") \ No newline at end of file + 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 786b334dad..d9b0a7ce4e 100644 --- a/desktop/toolkit/gtk/gtk2/pspec.xml +++ b/desktop/toolkit/gtk/gtk2/pspec.xml @@ -134,7 +134,7 @@ gtk2-32bit emul32 32-bit shared libraries for gtk2 - _emul32 + emul32 glibc-32bit cairo-32bit From 4472c718bb0a5f6241f36f5794e72256970bd08b Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Mon, 14 Mar 2016 14:13:15 +0200 Subject: [PATCH 4/4] gtk3:fixed typo for emul32 --- desktop/toolkit/gtk/gtk3/actions.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/desktop/toolkit/gtk/gtk3/actions.py b/desktop/toolkit/gtk/gtk3/actions.py index bfc7127e4a..6e3fae81e6 100644 --- a/desktop/toolkit/gtk/gtk3/actions.py +++ b/desktop/toolkit/gtk/gtk3/actions.py @@ -23,10 +23,10 @@ def setup(): shelltools.export("CFLAGS", get.CFLAGS().replace("-fomit-frame-pointer","")) - if get.buildTYPE() == "_emul32": + if get.buildTYPE() == "emul32": options += " --libdir=/usr/lib32 \ - --bindir=/_emul32/bin \ - --sbindir=/_emul32/sbin \ + --bindir=/emul32/bin \ + --sbindir=/emul32/sbin \ --enable-colord=no \ " @@ -56,6 +56,6 @@ def install(): 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("/emul32/bin/%s" % binaries, "/usr/bin/", "%s-32bit" % binaries) + pisitools.removeDir("/emul32") pisitools.rename("/usr/bin/gtk-update-icon-cache", "gtk3-update-icon-cache")