Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost149.git;a=commitdiff;h=cc9b3b182324d5c300b1db197798d38201c834fd
commit cc9b3b182324d5c300b1db197798d38201c834fd Merge: d23f740 235fe06 Author: Elentir <[email protected]> Date: Tue May 1 12:33:11 2012 +0200 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/kde-extra/koffice/FrugalBuild source/xapps-extra/inkscape/FrugalBuild source/xapps-extra/merkaartor/FrugalBuild diff --cc source/xapps-extra/inkscape/FrugalBuild index d096d27,5f9b1d6..2bfb036 --- a/source/xapps-extra/inkscape/FrugalBuild +++ b/source/xapps-extra/inkscape/FrugalBuild @@@ -4,12 -4,12 +4,12 @@@ pkgname=inkscape pkgver=0.48.3.1 --pkgrel=2 ++pkgrel=3 pkgdesc="A vector illustrator program" depends=('openssl>=1.0.0' 'lcms' 'cairomm' 'libgcc' 'atk' 'gtkmm2>=2.10.10-3' 'glibmm' 'freetype2' 'libxcb>=1.3-1' \ 'pango>=1.14.3' 'libgc>=7.0' 'glib2' 'gtkspell' 'popt' 'gtk+2>=2.20.0-2' 'python>=2.7' 'perl' \ - 'poppler-glib>=0.18.0' 'imagemagick>=6.6.8_5-3' 'gsl') + 'poppler-glib>=0.18.4' 'imagemagick>=6.6.8_5-3' 'gsl') -makedepends=('boost>=1.46.1' 'intltool' 'perl-xml-parser') +makedepends=('boost>=1.49.0' 'intltool' 'perl-xml-parser') rodepends=('libxml2>=2.6.20' 'pyxml' 'libxslt' 'lxml') groups=('xapps-extra') archs=('i686' 'x86_64') diff --cc source/xapps-extra/merkaartor/FrugalBuild index 0523bf2,10d404e..37f3b58 --- a/source/xapps-extra/merkaartor/FrugalBuild +++ b/source/xapps-extra/merkaartor/FrugalBuild @@@ -3,10 -3,10 +3,10 @@@ pkgname=merkaartor pkgver=0.17.2 --pkgrel=4 ++pkgrel=5 pkgdesc="An editor for the OpenStreetMap project" url="http://merkaartor.be"; - depends=('libqtsvg' 'libqtgui' 'libqtwebkit' 'libqtscript' 'exiv2>=0.22' 'libxml2' 'libxslt' 'libboost>=1.49.0') -depends=('libqtsvg' 'libqtgui' 'libqtwebkit' 'libqtscript' 'exiv2>=0.23' 'libxml2' 'libxslt' 'libboost>=1.46.1') ++depends=('libqtsvg' 'libqtgui' 'libqtwebkit' 'libqtscript' 'exiv2>=0.23' 'libxml2' 'libxslt' 'libboost>=1.49.0') makedepends=('boost') options=('scriptlet') _F_gnome_desktop="y" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
