Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=acdf358bcb80a58e6acd04b4c94e5f222118ff62
commit acdf358bcb80a58e6acd04b4c94e5f222118ff62
Merge: ee5678e 0d53912
Author: Baste <ba...@frugalware.org>
Date: Mon Jan 27 13:02:43 2014 +0100
Merge ../current
Conflicts:
source/gnome/gnome-shell/FrugalBuild
source/gnome/mutter/FrugalBuild
source/xlib/clutter/FrugalBuild
source/xlib/cogl/FrugalBuild
source/xlib/pygobject3/FrugalBuild
diff --cc source/xlib/clutter/FrugalBuild
index 2e1d5e3,fd91407..08ac0c6
--- a/source/xlib/clutter/FrugalBuild
+++ b/source/xlib/clutter/FrugalBuild
@@@ -24,7 -24,7 +24,8 @@@ replaces=('clutter-cairo'
provides=('clutter-cairo')
unset MAKEFLAGS
Fconfopts="$Fconfopts --enable-xinput --enable-wayland-backend"
-sha1sums=('20a4b88040686c42a8d16df63753cee5ec93264d')
+sha1sums=('f3d0aa89ac85bafea5e91620fc3d6bde7c41e84f')
++
if Fuse $USE_DOC; then
makedepends=("${makedepends[@]}" 'gtk-doc>=1.18')
Fconfopts+=" --enable-gtk-doc"
diff --cc source/xlib/cogl/FrugalBuild
index 6c4b133,88b759e..6f0876f
--- a/source/xlib/cogl/FrugalBuild
+++ b/source/xlib/cogl/FrugalBuild
@@@ -18,8 -18,8 +18,9 @@@ _F_gnome_devel="y
Finclude clutter gnome
groups=('xlib')
archs=('i686' 'x86_64')
-sha1sums=('a97b917ae6033aba7b132c0095e24bd8bfb62aee')
-Fconfopts+=" --enable-wayland-egl-platform"
+sha1sums=('26a0ac86d0f335a44197b9c7c58ae1194196f4f1')
+Fconfopts+=" --enable-wayland-egl-platform --enable-cogl-gst"
++
if Fuse $USE_DOC; then
makedepends=("${makedepends[@]}" 'gtk-doc>=1.11')
Fconfopts+=" --enable-gtk-doc"
diff --cc source/xlib/pygobject3/FrugalBuild
index 746ec8a,64384df..f56c809
--- a/source/xlib/pygobject3/FrugalBuild
+++ b/source/xlib/pygobject3/FrugalBuild
@@@ -6,14 -6,14 +6,14 @@@ options+=('asneeded'
pkgname=pygobject3
_F_gnome_name=pygobject
-pkgver=3.10.2
-pkgrel=2
+pkgver=3.11.4
+pkgrel=1
pkgdesc="Python bindings for GObject"
-depends=('python>=2.7' 'glib2>=2.36.0' 'gobject-introspection')
+depends=('python>=2.7' 'glib2>=2.39.3' 'gobject-introspection>=1.39.0')
rodepends=("$pkgname-devel")
- groups=('lib')
+ groups=('xlib')
archs=('i686' 'x86_64')
-_F_gnome_devel="n"
+_F_gnome_devel="y"
_F_gnome_ext=".tar.xz"
Finclude gnome python
#source=($source detect_libffi.patch)
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
