Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=b77e6b8961828559113d600b9487e1e57bf2fe3b

commit b77e6b8961828559113d600b9487e1e57bf2fe3b
Merge: 006fa5a 3934064
Author: Baste <[email protected]>
Date:   Thu Feb 21 08:46:12 2013 +0100

Merge ../current

Conflicts:
source/gnome/gnome-themes-standard/FrugalBuild
source/xlib/pango/FrugalBuild

diff --cc source/xlib/pango/FrugalBuild
index 0e7f2dd,7f04ad6..129cbe8
--- a/source/xlib/pango/FrugalBuild
+++ b/source/xlib/pango/FrugalBuild
@@@ -2,42 -2,22 +2,42 @@@
# Maintainer: Baste <[email protected]>
# Contributor: bouleetbil <[email protected]>

+options+=('asneeded')
+
+USE_DOC=${USE_DOC:-"y"}
+
pkgname=pango
-pkgver=1.32.5
-pkgrel=2
+pkgver=1.33.7
+pkgrel=5
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')
-makedepends=('gtk-doc' 'perl' 'gobject-introspection>=0.9.6' 'dri2proto')
+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=('perl' 'gobject-introspection>=0.9.6' 'dri2proto')
groups=('xlib')
archs=('i686' 'x86_64')
+ options=('force')
# 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
Fconfopts+=" --enable-gtk-doc --enable-debug=minimum 
--with-included-modules=basic-fc"
-#source=($source fix.patch)
-sha1sums=('0f390c43ba51e851d35e8dd9eb7eb8f72eef4035')
+sha1sums=('c45387435d8ad31979b43566c19a0e256ca24955')
+if Fuse $USE_DOC; then
+        makedepends=("${makedepends[@]}" 'gtk-doc>=1.11')
+        Fconfopts+=" --enable-gtk-doc"
+        subpkgs=("$pkgname-docs")
+        subdescs=("Pango Documentation")
+        subdepends=()
+        subgroups=('docs-extra')
+        subarchs=('i686 x86_64')
+fi
+
+build() {
+       Fbuild
+        if Fuse $USE_DOC; then
+               Fsplit $pkgname-docs usr/share/gtk-doc
+        fi
+}

# optimization OK
-
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to