Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=c67017d47fc097314da218bf74aa58a801ae962c
commit c67017d47fc097314da218bf74aa58a801ae962c
Merge: 338adf3 adcab94
Author: bouleetbil <bouleet...@frogdev.info>
Date: Tue Jul 5 18:03:57 2011 +0200
Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
Conflicts:
source/base/glib2/FrugalBuild
source/xlib/gtk+3/FrugalBuild
diff --cc source/base/glib2/FrugalBuild
index fd97be8,ed0bd78..0109b22
--- a/source/base/glib2/FrugalBuild
+++ b/source/base/glib2/FrugalBuild
@@@ -19,10 -19,12 +19,11 @@@ _F_cd_path="glib-$pkgver
## DON'T remove nor change the debug level or it breaks again ..
source=($source \
glib2.sh \
- glib2.csh)
- sha1sums=('173d6f5fea773c99b03336438db415c155e3316c' \
+ glib2.csh \
+ 71_gio_launch_handler.patch)
+ sha1sums=('20cd63705a8805260da0320c65b979233f2e3c18' \
'bfe05590a6498259f1045a591fd886a8572f271a' \
- '6db09da816d69aab7a5cbf3460ee082bef200891' \
- '794b92b0088043adcf67e8bf3c34b0bddc59eb13')
+ '6db09da816d69aab7a5cbf3460ee082bef200891')
if Fuse $USE_DOC; then
makedepends=("${makedepends[@]}" 'gtk-doc>=1.11')
Fconfopts="$Fconfopts --enable-gtk-doc"
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
