Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=b94c4b0a276225a886ab3ff4c55900b83346266a
commit b94c4b0a276225a886ab3ff4c55900b83346266a Merge: bf61384 1b71272 Author: Baste <[email protected]> Date: Fri Mar 1 14:17:56 2013 +0100 Merge ../current Conflicts: source/gnome/folks/FrugalBuild source/xlib/clutter/FrugalBuild source/xlib/gdk-pixbuf2/FrugalBuild diff --cc source/devel-extra/vala/FrugalBuild index 9453f72,ead3f33..68370f4 --- a/source/devel-extra/vala/FrugalBuild +++ b/source/devel-extra/vala/FrugalBuild @@@ -13,11 -11,13 +13,12 @@@ depends=('glib2>=2.33.14' makedepends=('libxslt') groups=('devel-extra') archs=('i686' 'x86_64' 'arm') +options+=('asneeded') _F_gnome_ext=".tar.xz" + _F_gnome_devel="n" Finclude gnome -sha1sums=('c6d24efb9a093b7b67b876b484c612a5af90b9bb') +sha1sums=('9b45e569cdb798cbe100d4c15acd43cf9cc6f7fa') Fconfopts+=" --enable-vapigen" - -#IDE not ready for vala 0.14 replaces=('vtg' 'valide') provides=('vtg' 'valide') diff --cc source/gnome/folks/FrugalBuild index be3c0f7,b1c61b4..7cc5bb4 --- a/source/gnome/folks/FrugalBuild +++ b/source/gnome/folks/FrugalBuild @@@ -12,11 -10,11 +12,12 @@@ depends=('evolution-data-server>=3.5.3 makedepends=('vala' 'gobject-introspection' 'intltool' 'krb5') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64') -options=('scriptlet') +options+=('scriptlet') ++_F_gnome_devel="y" _F_gnome_ext=".tar.xz" -_F_gnome_devel="n" -Finclude gnome -sha1sums=('0c9dcd4db046e7b7a35cf35679d6107653b750d9') +_F_gnome_glib="y" +Finclude gnome gnome-scriptlet +sha1sums=('1534be9f9aaef8c0b07954f434cd040aac56d86a') Fconfopts+=" --enable-vala" # optimization OK diff --cc source/xlib/pango/FrugalBuild index 129cbe8,2779b75..60b66f8 --- a/source/xlib/pango/FrugalBuild +++ b/source/xlib/pango/FrugalBuild @@@ -18,26 -14,11 +18,27 @@@ 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_devel="n" _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
