Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=778fee82cb7ee3fdeeba5d1dd29f1019d45edbc9
commit 778fee82cb7ee3fdeeba5d1dd29f1019d45edbc9 Merge: ad609a2 c7b5251 Author: Baste <[email protected]> Date: Thu Mar 21 09:13:27 2013 +0100 Merge ../current Conflicts: source/gnome/gconf/FrugalBuild source/gnome/gnome-icon-theme/FrugalBuild source/gnome/gnome-themes-standard/FrugalBuild source/xlib/gtk+3/FrugalBuild diff --cc source/xlib/gtk+3/FrugalBuild index 99173ba,da0b0f7..b744755 --- a/source/xlib/gtk+3/FrugalBuild +++ b/source/xlib/gtk+3/FrugalBuild @@@ -2,31 -2,30 +2,32 @@@ # Maintainer: Baste <[email protected]> # Contributor: bouleetbil <[email protected]> +options+=('asneeded') + pkgname=gtk+3 _F_gnome_name=gtk+ -pkgver=3.6.4 -pkgrel=3 +pkgver=3.7.14 - pkgrel=1 ++pkgrel=2 pkgdesc="The GTK+ Toolkit (3.x series)" depends=('libxext' 'libxfixes' 'cairo' 'libgcc' 'libjpeg' 'libtiff' 'libcups' \ - 'atk>=2.6.0' 'pango' 'libxinerama' 'libxcomposite' 'libxcursor' \ - 'gdk-pixbuf2>=2.26.3' 'libxrandr' 'libxml2>=2.7.8' 'libkrb5' \ - 'libtasn1' 'gnutls>=2.12.12' 'colord' 'at-spi2-atk') + 'atk>=2.7.5' 'pango>=1.33.7' 'libxinerama' 'libxcomposite' 'libxcursor' \ + 'gdk-pixbuf2>=2.27.1' 'libxrandr' 'libxml2>=2.7.8' 'libkrb5' \ + 'libtasn1' 'gnutls>=2.12.12' 'colord' 'at-spi2-atk>=2.7.5' 'avahi-glib') rodepends=('gnome-icon-theme' 'shared-mime-info' 'gtk+3-tools') groups=('xlib') -makedepends=('gtk-doc' 'cups' 'inputproto' 'gobject-introspection>=1.29.15' 'krb5') -archs=('i686' 'x86_64' 'arm') -_F_gnome_git="n" +makedepends=('gtk-doc' 'cups' 'inputproto' 'gobject-introspection>=1.35.4' 'krb5') +archs=('i686' 'x86_64') _F_gnome_glib="y" _F_gnome_ext=".tar.xz" -_F_gnome_devel="n" +_F_gnome_devel="y" +_F_gnome_immodules="y" Finclude gnome gnome-scriptlet url="http://www.gtk.org/"; _F_cd_path="gtk+-$pkgver" -source=($source im-cedilla.conf) -sha1sums=('2f592b78c32c21ce452f2e6864c24adee62b3665' \ - 'f8a64241bcc873c1f1110e16306e48577a41852b') +source=($source settings.ini) +sha1sums=('b7f8ebbc4ae30572f272b57f21094f0c5768a0ae' \ + 'c185e2d6f535281a19cfa67970357ae082e3d33b') + backup=(/etc/gtk-3.0/settings.ini) if [ "$_F_gnome_git" != "n" ]; then unset sha1sums _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
