gtk3:fixed deps and file conflict

This commit is contained in:
2015-07-29 17:15:24 +03:00
parent b8690d0ff8
commit 19ecd6c5e7
2 changed files with 5 additions and 3 deletions
+1 -1
View File
@@ -17,7 +17,6 @@ def setup():
--disable-silent-rules \
--disable-schemas-compile \
--enable-introspection \
--enable-gtk2-dependency \
--disable-papi \
--disable-wayland-backend \
"
@@ -59,3 +58,4 @@ def install():
for binaries in ["gtk-query-immodules-3.0"]:
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")
+4 -2
View File
@@ -52,9 +52,9 @@
<Dependency>cups</Dependency>
<Dependency>pango</Dependency>
<Dependency>libXi</Dependency>
<Dependency>json-glib</Dependency>
<!--<Dependency>json-glib</Dependency>-->
<Dependency>cairo</Dependency>
<Dependency>gobject-introspection</Dependency>
<!--<Dependency>gobject-introspection</Dependency>-->
<Dependency>libXext</Dependency>
<Dependency>libXrandr</Dependency>
<Dependency>libXfixes</Dependency>
@@ -124,8 +124,10 @@
<Dependency release="current">gtk3</Dependency>
<Dependency>atk-devel</Dependency>
<Dependency>pango-devel</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>libXi-devel</Dependency>
<Dependency>cairo-devel</Dependency>
<Dependency>glib2-devel</Dependency>
<Dependency>libXext-devel</Dependency>
<Dependency>libepoxy-devel</Dependency>
<Dependency>libXfixes-devel</Dependency>