Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=235fe06e40e732ac9074027243e88bf8c23e73bd
commit 235fe06e40e732ac9074027243e88bf8c23e73bd Author: Melko <me...@frugalware.org> Date: Tue May 1 12:26:54 2012 +0200 merkaartor-0.17.2-4-i686 * rebuild with exiv2>=0.23 * add patch for gcc470 diff --git a/source/xapps-extra/merkaartor/FrugalBuild b/source/xapps-extra/merkaartor/FrugalBuild index 4b5ee75..10d404e 100644 --- a/source/xapps-extra/merkaartor/FrugalBuild +++ b/source/xapps-extra/merkaartor/FrugalBuild @@ -3,10 +3,10 @@ pkgname=merkaartor pkgver=0.17.2 -pkgrel=3 +pkgrel=4 pkgdesc="An editor for the OpenStreetMap project" url="http://merkaartor.be"; -depends=('libqtsvg' 'libqtgui' 'libqtwebkit' 'libqtscript' 'exiv2>=0.22' 'libxml2' 'libxslt' 'libboost>=1.46.1') +depends=('libqtsvg' 'libqtgui' 'libqtwebkit' 'libqtscript' 'exiv2>=0.23' 'libxml2' 'libxslt' 'libboost>=1.46.1') makedepends=('boost') options=('scriptlet') _F_gnome_desktop="y" @@ -15,12 +15,15 @@ Finclude gnome-scriptlet groups=('xapps-extra') archs=('i686' 'x86_64') up2date="Flasttar $url/wiki/merkaartor/Download" -source=(http://www.merkaartor.be/attachments/download/253/$pkgname-$pkgver.tar.bz2) -sha1sums=('f789141db427bf25bb3b61801fefc98ab0430012') +source=(http://www.merkaartor.be/attachments/download/253/$pkgname-$pkgver.tar.bz2 \ + gcc470.patch) +sha1sums=('f789141db427bf25bb3b61801fefc98ab0430012' \ + '5920ca64a345f9b97da407fad85988f7fb87f648') build() { Fcd - qmake Merkaartor.pro PREFIX=/usr NODEBUG=1 || Fdie + Fpatchall + qmake Merkaartor.pro PREFIX=/usr NODEBUG=1 QMAKE_CXXFLAGS='-fpermissive' || Fdie Fmake make INSTALL_ROOT="$Fdestdir" install || Fdie Fbuild_gnome_scriptlet diff --git a/source/xapps-extra/merkaartor/gcc470.patch b/source/xapps-extra/merkaartor/gcc470.patch new file mode 100644 index 0000000..52775ec --- /dev/null +++ b/source/xapps-extra/merkaartor/gcc470.patch @@ -0,0 +1,11 @@ +--- merkaartor-0.17.2/3rdparty/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp.old 2012-05-01 11:40:08.539279638 +0200 ++++ merkaartor-0.17.2/3rdparty/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp 2012-05-01 11:40:58.835282311 +0200 +@@ -57,6 +57,8 @@ + #endif + #if defined(Q_OS_UNIX) + #include <time.h> ++#include <sys/types.h> ++#include <unistd.h> + #endif + + namespace QtLP_Private { _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
