Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1241 from ayhanyalcinsoy/master

Browse Source 
gtk2 and gtk3:cups removed from build deps to avoid circle
This commit is contained in:
Ertuğrul Erata
2016-03-14 16:17:11 +02:00
parent 074a172ae7 4472c718bb
commit 3a27ec4150
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/gtk/gtk2/actions.py
+7 -7
View File
@@ -19,10 +19,10 @@ def setup():
#Avoid "Only <gtk/gtk.h> 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")
pisitools.dosym("/usr/lib/gtk-2.0/include/gdkconfig.h","/usr/include/gtk-2.0/gdk/gdkconfig.h")
desktop/toolkit/gtk/gtk2/pspec.xml
+2 -2
View File
@@ -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>
<!--<Dependency>cups-devel</Dependency> --><!--It was disabled to avoid circle-->
<Dependency>libXi-devel</Dependency>
<Dependency>cairo-devel</Dependency>
<Dependency>libXext-devel</Dependency>
@@ -134,7 +134,7 @@
<Name>gtk2-32bit</Name>
<PartOf>emul32</PartOf>
<Summary>32-bit shared libraries for gtk2</Summary>
<BuildType>_emul32</BuildType>
<BuildType>emul32</BuildType>
<BuildDependencies>
<Dependency>glibc-32bit</Dependency>
<Dependency>cairo-32bit</Dependency>
desktop/toolkit/gtk/gtk3/actions.py
+5 -5
View File
@@ -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")
desktop/toolkit/gtk/gtk3/pspec.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<Archive sha1sum="e7dd8a397031316c57b845bc76744ed5886385b1" type="tarxz">mirrors://gnome/gtk+/3.18/gtk+-3.18.6.tar.xz</Archive>
<BuildDependencies>
<Dependency>atk-devel</Dependency>
<Dependency>cups-devel</Dependency>
<!-- <Dependency>cups-devel</Dependency> --><!--It was disabled to avoid circle-->
<Dependency>at-spi2-atk-devel</Dependency>
<Dependency>pango-devel</Dependency>
<Dependency>json-glib-devel</Dependency>