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

Merge pull request #1248 from ayhanyalcinsoy/master

Browse Source 
gtk2 and gtk3:removed unneeded dep
This commit is contained in:
Ertuğrul Erata
2016-03-15 14:00:00 +02:00
parent 86f6fe9786 ef17ac6648
commit 160241fbb9
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/gtk/gtk2/actions.py
+4 -4
View File
@@ -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")
desktop/toolkit/gtk/gtk2/pspec.xml
+1 -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> --><!--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>
desktop/toolkit/gtk/gtk3/actions.py
+5 -5
View File
@@ -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")
desktop/toolkit/gtk/gtk3/pspec.xml
-1
View File
@@ -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>-->