diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-21 11:27:08 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-21 11:27:08 -0300 |
commit | 840283e9012eff70d83361c5ae058c4fb855979e (patch) | |
tree | a0f93f9812348b55c9dfbf1cc6b81eba78caf6ee /community/qgis/PKGBUILD | |
parent | 93c61adf5995517ceecb6308255ff7fb85d59fcb (diff) | |
parent | f02c28de0bbcb85e152fc19d0008805021fe1a33 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ascii/PKGBUILD
extra/gnome-utils/PKGBUILD
extra/libmodplug/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/rox/PKGBUILD
extra/totem/PKGBUILD
kde-unstable/calligra/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-libcups/PKGBUILD
multilib/zsnes/PKGBUILD
testing/perl-compress-bzip2/PKGBUILD
Diffstat (limited to 'community/qgis/PKGBUILD')
-rw-r--r-- | community/qgis/PKGBUILD | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/community/qgis/PKGBUILD b/community/qgis/PKGBUILD index 5fb698d32..e919541a7 100644 --- a/community/qgis/PKGBUILD +++ b/community/qgis/PKGBUILD @@ -1,28 +1,27 @@ -# $Id: PKGBUILD 46475 2011-05-07 18:42:52Z tdziedzic $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> pkgname=qgis -pkgver=1.6.0 -pkgrel=6 +pkgver=1.7.0 +pkgrel=1 pkgdesc='A Geographic Information System (GIS) that supports vector, raster & database formats' url='http://qgis.org/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') # update to http://www.qgis.org/wiki/Building_QGIS_from_Source#Overview depends=('libmysqlclient' 'postgresql-libs' 'sqlite3' 'jasper' 'curl' 'qt' 'python2' 'python2-qt' 'giflib' 'xerces-c' 'cfitsio' 'qwt' 'gdal') -makedepends=('grass' 'gsl' 'postgis' 'netcdf' 'cmake' 'fcgi' 'python2-sip') +makedepends=('cmake' 'grass' 'gsl' 'postgis' 'netcdf' 'fcgi' 'python2-sip' 'txt2tags') optdepends=('postgis: postgis support and SPIT plugin' 'fcgi: qgis mapserver' 'python2-sip: python-support' 'grass: grass plugin' 'gsl: georeferencer ') options=('!makeflags') -source=("http://qgis.org/downloads/${pkgname}-${pkgver}.tar.bz2" +source=("http://qgis.org/downloads/qgis-${pkgver}.tar.bz2" 'qgis.desktop' 'ticket_3378.diff') -md5sums=('9ea8a784d970f5009b0e6271820248f6' +md5sums=('d8506990f52563d39c7b916f500f282f' '8ab66039f2aba519b92f52272ec3c13e' '402f3d39a344367fd55bdaa324deb797') @@ -30,16 +29,16 @@ build() { # Fix insecure RPATH is weird, but just works ;) # echo "os.system(\"sed -i '/^LFLAGS/s|-Wl,-rpath,.\+ ||g' gui/Makefile core/Makefile\")" >> python/configure.py.in - cd ${pkgname}-${pkgver} + #cd qgis-${pkgver} # fix compilation error https://trac.osgeo.org/qgis/ticket/3378 - patch -Np3 -i ${srcdir}/ticket_3378.diff - cd ${srcdir} + #patch -Np3 -i ${srcdir}/ticket_3378.diff + #cd ${srcdir} rm -rf build mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../qgis-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -55,6 +54,6 @@ package() { make DESTDIR=${pkgdir} install # install some freedesktop.org compatibility - install -D -m644 ${srcdir}/${pkgname}.desktop \ - ${pkgdir}/usr/share/applications/${pkgname}.desktop + install -D -m644 ${srcdir}/qgis.desktop \ + ${pkgdir}/usr/share/applications/qgis.desktop } |