Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=30fa9ef142b5b5297181b20d030aba2e747091d3

commit 30fa9ef142b5b5297181b20d030aba2e747091d3
Merge: d432464 d739e87
Author: James Buren <[email protected]>
Date:   Sun May 13 10:57:50 2012 -0500

Merge branch 'master' of ../current

Conflicts:
source/kde/knemo/FrugalBuild
source/xlib-extra/cegui/FrugalBuild

diff --cc source/xlib-extra/cegui/FrugalBuild
index a4f9d82,ae6f621..9468530
--- a/source/xlib-extra/cegui/FrugalBuild
+++ b/source/xlib-extra/cegui/FrugalBuild
@@@ -6,8 -6,8 +6,8 @@@ pkgname=cegu
pkgver=0.7.6
pkgrel=3
pkgdesc="Crazy Eddie's GUI System is a free library providing windowing and 
widgets for graphics APIs/engines"
-depends=('freetype2' 'pcre' 'xerces-c>=2.8.0' 'libgcc' 'freeglut' 'libgl' 
'libsm' 'libxext' 'libxdamage' 'expat' \
+depends=('freetype2' 'pcre>=8.30' 'xerces-c>=2.8.0' 'libgcc' 'freeglut' 
'libgl' 'libsm' 'libxext' 'libxdamage' 'expat' \
-       'libxml2' 'silly' 'ogre' 'devil' 'libglu' 'glew')
+       'libxml2' 'silly' 'ogre>=1.8.0RC1' 'devil' 'libglu' 'glew')
makedepends=('doxygen' 'boost')
groups=('xlib-extra')
archs=('i686' 'x86_64')
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to