Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=cd83ed1eef7f7b0c7a89c208d4caff6b6742974c
commit cd83ed1eef7f7b0c7a89c208d4caff6b6742974c Merge: bc55f73 782d896 Author: Baste <[email protected]> Date: Mon Jul 16 12:19:26 2012 +0200 Merge ../current Conflicts: source/base/glib2/FrugalBuild source/xlib/gtk+3/FrugalBuild diff --cc source/gnome/evolution/FrugalBuild index 6377148,6377148..b882992 --- a/source/gnome/evolution/FrugalBuild +++ b/source/gnome/evolution/FrugalBuild @@@ -3,8 -3,8 +3,8 @@@ # Contributor: bouleetbil <[email protected]> pkgname=evolution --pkgver=3.4.3 --evo_major=3.4 ++pkgver=3.5.3.1 ++evo_major=3.6 pkgrel=1 pkgdesc="Integrated mail, calendar and address book suite for GNOME" depends=('unique' 'gst-plugins-base' 'gnome-desktop>=3.3.1' 'libcanberra-gtk' 'xcb-util>=0.3.8' 'clutter-gtk') @@@ -114,7 -114,7 +114,9 @@@ build() --enable-cairo-calendar=yes \ --enable-nm \ --enable-pst-import \ -- --disable-image-inline ++ --disable-image-inline \ ++ --disable-weather ++ Fsed '.*KILL_PROCESS_CMD.*' '#define KILL_PROCESS_CMD "killall"' config.h make || Fdie @@@ -167,6 -167,6 +169,6 @@@ } #source=($source glib.diff) --sha1sums=('1d7e6be740a157a5660f54a6b23c84c3d87391cf') ++sha1sums=('7cbf51cc362ebcbbaece8dfb99e41ef3d5576416') # optimization OK diff --cc source/xlib/gtk+3/FrugalBuild index 428853e,ca4901a..e975ea0 --- a/source/xlib/gtk+3/FrugalBuild +++ b/source/xlib/gtk+3/FrugalBuild @@@ -4,7 -4,7 +4,11 @@@ pkgname=gtk+3 _F_gnome_name=gtk+ ++<<<<<<< HEAD +pkgver=3.5.6 ++======= + pkgver=3.4.4 ++>>>>>>> 782d8965929409f08616a5b570c59db5a5ecace2 pkgrel=1 pkgdesc="The GTK+ Toolkit (3.x series)" depends=('libxext' 'libxfixes' 'cairo' 'libgcc' 'libjpeg' 'libtiff' 'libcups' \ @@@ -22,7 -22,7 +26,11 @@@ Finclude gnome gnome-scriptle url="http://www.gtk.org/"; _F_cd_path="gtk+-$pkgver" source=($source im-cedilla.conf) ++<<<<<<< HEAD +sha1sums=('2e9e8eb166ecca5048e1468f43d761fbe0470b33' \ ++======= + sha1sums=('f260cc9b1750afb99da144c8abdf1198c0386d5f' \ ++>>>>>>> 782d8965929409f08616a5b570c59db5a5ecace2 'f8a64241bcc873c1f1110e16306e48577a41852b') if [ "$_F_gnome_git" != "n" ]; then _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
