Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=bde1f931b8260a40b1a3cfa4728bf3ed55d5e98c
commit bde1f931b8260a40b1a3cfa4728bf3ed55d5e98c Merge: b17c590 d7bf285 Author: bouleetbil <[email protected]> Date: Fri Aug 5 17:13:18 2011 +0200 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/gnome/gnome-desktop/FrugalBuild source/gnome/gnome-settings-daemon/FrugalBuild source/gnome/vinagre/FrugalBuild source/gnome/vino/FrugalBuild source/xlib/gtk+3/FrugalBuild diff --cc source/xlib/gtk+3/FrugalBuild index 06deecc,001308d..e8c9ba4 --- a/source/xlib/gtk+3/FrugalBuild +++ b/source/xlib/gtk+3/FrugalBuild @@@ -11,10 -11,11 +11,11 @@@ depends=('libxext' 'libxfixes' 'cairo' 'gdk-pixbuf2>=2.23.0' 'libxrandr' 'libxml2>=2.7.8') rodepends=('gnome-icon-theme' 'shared-mime-info' 'gtk+3-tools') groups=('xlib') -makedepends=('gtk-doc' 'cups' 'inputproto' 'gobject-introspection') +makedepends=('gtk-doc' 'cups' 'inputproto' 'gobject-introspection>=1.29.15') archs=('i686' 'x86_64' 'ppc' 'arm') _F_gnome_git="n" - Finclude gnome + _F_gnome_glib="y" + Finclude gnome gnome-scriptlet url="http://www.gtk.org/" _F_cd_path="gtk+-$pkgver" source=($source im-cedilla.conf) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
