Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=b14e5ca01fb0f50cb26ec53824fe0305b5ee16de
commit b14e5ca01fb0f50cb26ec53824fe0305b5ee16de Merge: 9a1c382 0492625 Author: bouleetbil <[email protected]> Date: Mon Nov 14 23:17:21 2011 +0100 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/gnome/cheese/FrugalBuild source/gnome/empathy/FrugalBuild source/gnome/evolution-data-server/FrugalBuild source/gnome/evolution/FrugalBuild source/gnome/gnome-keyring/FrugalBuild source/gnome/gtkhtml/FrugalBuild source/gnome/gucharmap/FrugalBuild source/gnome/vinagre/FrugalBuild source/gnome/vino/FrugalBuild source/network/networkmanager/FrugalBuild source/xlib/librsvg/FrugalBuild diff --cc source/gnome/evolution/FrugalBuild index 2821851,e67a0be..9b04fda --- a/source/gnome/evolution/FrugalBuild +++ b/source/gnome/evolution/FrugalBuild @@@ -163,8 -163,6 +163,9 @@@ build() Fbuild_gnome_scriptlet } -sha1sums=('300f85137dc97552d2675a78ca54f48be354d2d4') ++ +source=($source glib.diff) +sha1sums=('91d105c11df97d49f5180e290461edf677f3471d' \ + 'deb44abb956751eca4675946e384dedb651f6742') # optimization OK diff --cc source/network/networkmanager/FrugalBuild index 00aa7ed,51cd029..93dfe4b --- a/source/network/networkmanager/FrugalBuild +++ b/source/network/networkmanager/FrugalBuild @@@ -3,8 -3,8 +3,8 @@@ pkgname=networkmanager _F_gnome_name=NetworkManager -pkgver=0.9.1.90 +pkgver=0.9.2.0 - pkgrel=1 + pkgrel=2 pkgdesc="Network Management daemon" depends=('wireless_tools' 'iproute2' 'dhcpcd>=5.1.3' 'nss' 'libgcrypt' \ 'libnl' 'ppp' 'wpa_supplicant' 'iptables' 'polkit' 'libgudev' 'ca-certificates' \ diff --cc source/xlib/librsvg/FrugalBuild index 58089c0,e867d96..976765d --- a/source/xlib/librsvg/FrugalBuild +++ b/source/xlib/librsvg/FrugalBuild @@@ -3,11 -3,11 +3,11 @@@ # Contributor: Miklos Vajna <[email protected]> pkgname=librsvg - pkgver=2.34.1 + pkgver=2.34.2 -pkgrel=1 +pkgrel=2 pkgdesc="A high performance SVG rendering library for GNOME" depends=('gtk+3>=2.99.3' 'gdk-pixbuf2' 'libxml2>=2.7.8' 'popt' 'libart_lgpl' 'libcroco>=0.6.1-4' 'libgsf>=1.14.8') -makedepends=('gtk-doc') +makedepends=('gtk-doc' 'gtk+2') groups=('xlib') archs=('i686' 'x86_64' 'ppc' 'arm') Finclude gnome _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
