Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=a759464b662414fc1188d95ed053cf1ae9bb86e1
commit a759464b662414fc1188d95ed053cf1ae9bb86e1 Merge: 997d119 d87eac8 Author: Baste <[email protected]> Date: Tue Feb 19 15:03:41 2013 +0100 Merge ../current Conflicts: source/gnome/gnome-themes-standard/FrugalBuild source/xlib/pango/FrugalBuild diff --cc source/xlib/pango/FrugalBuild index bddf018,d104df5..e4781b8 --- a/source/xlib/pango/FrugalBuild +++ b/source/xlib/pango/FrugalBuild @@@ -3,22 -3,21 +3,34 @@@ # Contributor: bouleetbil <[email protected]> pkgname=pango ++<<<<<<< HEAD +pkgver=1.33.7 +pkgrel=3 ++======= + pkgver=1.32.6 + pkgrel=2 ++>>>>>>> d87eac879ec1432639a6d93da6ef65c078943610 pkgdesc="A library for layout and rendering of text" url="http://www.gtk.org/"; -depends=('libxml2>=2.7.8' 'cairo>=1.8.10-2' 'glib2>=2.34.0' 'libxft>=2.1.13-2' 'libxmu' 'libxi' 'libxrender' 'harfbuzz' 'libxft') +depends=('libxml2>=2.7.8' 'cairo>=1.8.10-2' 'glib2>=2.34.0' 'libxft>=2.1.13-2' 'libxmu' 'libxi' 'libxrender' 'harfbuzz>=0.9.9' 'libxft') makedepends=('gtk-doc' 'perl' 'gobject-introspection>=0.9.6' 'dri2proto') groups=('xlib') archs=('i686' 'x86_64') # modules.cache find now /usr/lib/pango and not in /etc/pango/pango.modules backup=(etc/pango/pango.modules) _F_gnome_ext=".tar.xz" +_F_gnome_devel="y" Finclude gnome ++<<<<<<< HEAD + +Fconfopts+=" --enable-gtk-doc --enable-debug=minimum --with-included-modules=basic-fc" +sha1sums=('c45387435d8ad31979b43566c19a0e256ca24955') ++======= + Fconfopts+=" --enable-gtk-doc --enable-debug=minimum --with-included-modules=basic-fc" + source=($source fix.patch) + sha1sums=('eb8f0731787cb02f185d1fadfcb756e784678f98' \ + '8cd5dab96eee83e5c0fa2dfca8c15ecdbadee5c9') ++>>>>>>> d87eac879ec1432639a6d93da6ef65c078943610 # optimization OK + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
