Date: Tuesday, February 7, 2017 @ 13:50:53 Author: bgyorgy Revision: 210789
archrelease: copy trunk to community-i686, community-x86_64 Added: qlandkartegt/repos/community-i686/PKGBUILD (from rev 210788, qlandkartegt/trunk/PKGBUILD) qlandkartegt/repos/community-i686/fix-qt5-build.patch (from rev 210788, qlandkartegt/trunk/fix-qt5-build.patch) qlandkartegt/repos/community-i686/qlandkartegt-mimetypes.xml (from rev 210788, qlandkartegt/trunk/qlandkartegt-mimetypes.xml) qlandkartegt/repos/community-i686/qlandkartegt.changelog (from rev 210788, qlandkartegt/trunk/qlandkartegt.changelog) qlandkartegt/repos/community-x86_64/PKGBUILD (from rev 210788, qlandkartegt/trunk/PKGBUILD) qlandkartegt/repos/community-x86_64/fix-qt5-build.patch (from rev 210788, qlandkartegt/trunk/fix-qt5-build.patch) qlandkartegt/repos/community-x86_64/qlandkartegt-mimetypes.xml (from rev 210788, qlandkartegt/trunk/qlandkartegt-mimetypes.xml) qlandkartegt/repos/community-x86_64/qlandkartegt.changelog (from rev 210788, qlandkartegt/trunk/qlandkartegt.changelog) Deleted: qlandkartegt/repos/community-i686/PKGBUILD qlandkartegt/repos/community-i686/qlandkartegt-mimetypes.xml qlandkartegt/repos/community-i686/qlandkartegt.changelog qlandkartegt/repos/community-x86_64/PKGBUILD qlandkartegt/repos/community-x86_64/qlandkartegt-mimetypes.xml qlandkartegt/repos/community-x86_64/qlandkartegt.changelog ---------------------------------------------+ /PKGBUILD | 104 +++++++++++++++ /qlandkartegt-mimetypes.xml | 14 ++ /qlandkartegt.changelog | 180 ++++++++++++++++++++++++++ community-i686/PKGBUILD | 44 ------ community-i686/fix-qt5-build.patch | 141 ++++++++++++++++++++ community-i686/qlandkartegt-mimetypes.xml | 7 - community-i686/qlandkartegt.changelog | 90 ------------- community-x86_64/PKGBUILD | 44 ------ community-x86_64/fix-qt5-build.patch | 141 ++++++++++++++++++++ community-x86_64/qlandkartegt-mimetypes.xml | 7 - community-x86_64/qlandkartegt.changelog | 90 ------------- 11 files changed, 580 insertions(+), 282 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2017-02-07 13:50:46 UTC (rev 210788) +++ community-i686/PKGBUILD 2017-02-07 13:50:53 UTC (rev 210789) @@ -1,44 +0,0 @@ -# $Id$ -# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org> -# Contributor: Matthias Maennich <a...@maennich.net> -# Contributor: <boe...@gmx.de> - -pkgname=qlandkartegt -pkgver=1.8.1 -pkgrel=7 -pkgdesc="Use your GPS with Linux" -arch=('i686' 'x86_64') -url="http://www.qlandkarte.org/" -license=('GPL') -depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmariadbclient' 'glu' - 'postgresql-libs' 'shared-mime-info' 'qtwebkit' 'proj') -makedepends=('cmake' 'garmindev' 'mesa') -optdepends=('garmindev: to connect garmin devices') -changelog=$pkgname.changelog -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - $pkgname-mimetypes.xml) -sha256sums=('9e0605ab8f4cbd27741b507f252f08370e9ccca4e05ec35878256c59b22a9be7' - 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') - -prepare() { - cd "${srcdir}" - mkdir build -} - -build() { - cd "${srcdir}"/build - - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release - make -} - -package(){ - cd "${srcdir}"/build - - make DESTDIR="${pkgdir}" install - - install -Dm644 "${srcdir}"/$pkgname-mimetypes.xml \ - "${pkgdir}"/usr/share/mime/packages/$pkgname-mimetypes.xml -} Copied: qlandkartegt/repos/community-i686/PKGBUILD (from rev 210788, qlandkartegt/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2017-02-07 13:50:53 UTC (rev 210789) @@ -0,0 +1,52 @@ +# $Id$ +# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org> +# Contributor: Matthias Maennich <a...@maennich.net> +# Contributor: <boe...@gmx.de> + +pkgname=qlandkartegt +pkgver=1.8.1 +pkgrel=8 +pkgdesc="Use your GPS with Linux" +arch=('i686' 'x86_64') +url="http://www.qlandkarte.org/" +license=('GPL') +depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmariadbclient' 'glu' + 'postgresql-libs' 'shared-mime-info' 'qt5-script' 'qt5-multimedia' + 'qt5-webkit' 'qt5-serialport' 'proj') +makedepends=('cmake' 'garmindev' 'mesa' 'qt5-tools') +optdepends=('garmindev: to connect garmin devices') +changelog=$pkgname.changelog +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + $pkgname-mimetypes.xml + fix-qt5-build.patch) +sha256sums=('9e0605ab8f4cbd27741b507f252f08370e9ccca4e05ec35878256c59b22a9be7' + 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0' + 'e71d843289f8f1099388a431bf488281232344b9ce6c0a28d1a60f68b6ec3e4b') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + # Fix build with Qt5 + patch -Np1 -i ../fix-qt5-build.patch + + cd "${srcdir}" + mkdir build +} + +build() { + cd "${srcdir}"/build + + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DQK_QT5_PORT=ON + make +} + +package(){ + cd "${srcdir}"/build + + make DESTDIR="${pkgdir}" install + + install -Dm644 "${srcdir}"/$pkgname-mimetypes.xml \ + "${pkgdir}"/usr/share/mime/packages/$pkgname-mimetypes.xml +} Copied: qlandkartegt/repos/community-i686/fix-qt5-build.patch (from rev 210788, qlandkartegt/trunk/fix-qt5-build.patch) =================================================================== --- community-i686/fix-qt5-build.patch (rev 0) +++ community-i686/fix-qt5-build.patch 2017-02-07 13:50:53 UTC (rev 210789) @@ -0,0 +1,141 @@ +diff -Naur qlandkartegt-1.8.1.orig/3rdparty/cache2gtiff/CMakeLists.txt qlandkartegt-1.8.1/3rdparty/cache2gtiff/CMakeLists.txt +--- qlandkartegt-1.8.1.orig/3rdparty/cache2gtiff/CMakeLists.txt 2014-08-08 11:53:46.000000000 +0200 ++++ qlandkartegt-1.8.1/3rdparty/cache2gtiff/CMakeLists.txt 2017-02-07 14:29:11.273321944 +0100 +@@ -50,9 +50,16 @@ + ${GDAL_INCLUDE_DIRS} + ${PROJ_INCLUDE_DIRS} + ${JPEG_INCLUDE_DIRS} +- ${QT_QTXML_INCLUDE_DIR} + ../../src/ + ) ++ ++if (NOT QK_QT5_PORT) ++include_directories( ++ ${QT_QTXML_INCLUDE_DIR} ++) ++endif(NOT QK_QT5_PORT) ++ ++ + if(WIN32) + include_directories( + ${CMAKE_SOURCE_DIR}/Win32/ +@@ -89,6 +96,7 @@ + ) + + ++ + if(QK_QT5_PORT) + qt5_use_modules(cache2gtiff Widgets) + qt5_use_modules(cache2gtiff Xml) +diff -Naur qlandkartegt-1.8.1.orig/src/CDlgEditWpt.cpp qlandkartegt-1.8.1/src/CDlgEditWpt.cpp +--- qlandkartegt-1.8.1.orig/src/CDlgEditWpt.cpp 2015-02-03 09:38:09.000000000 +0100 ++++ qlandkartegt-1.8.1/src/CDlgEditWpt.cpp 2017-02-07 14:29:03.253103094 +0100 +@@ -531,7 +531,7 @@ + { + barcode = barcode.left(177) + "..."; + } +- dmtxEncodeDataMatrix( enc, barcode.size(), (unsigned char*)barcode.toAscii().data() ); ++ dmtxEncodeDataMatrix( enc, barcode.size(), (unsigned char*)barcode.toLatin1().data() ); + + QImage curBarCode( enc->image->pxl, enc->image->width, enc->image->height, QImage::Format_RGB32 ); + labelBarcode->setPixmap(QPixmap::fromImage(curBarCode)); +diff -Naur qlandkartegt-1.8.1.orig/src/CExchangeGarmin.cpp qlandkartegt-1.8.1/src/CExchangeGarmin.cpp +--- qlandkartegt-1.8.1.orig/src/CExchangeGarmin.cpp 2014-08-08 11:53:40.000000000 +0200 ++++ qlandkartegt-1.8.1/src/CExchangeGarmin.cpp 2017-02-07 14:29:03.253103094 +0100 +@@ -21,6 +21,7 @@ + #include <QtDBus> + #include <QtXml> + #include <QtGui> ++#include <QMessageBox> + + CGarminTreeWidgetItem::CGarminTreeWidgetItem(const QString& id, QTreeWidget *parent) + : IDeviceTreeWidgetItem(id,parent) +diff -Naur qlandkartegt-1.8.1.orig/src/CMakeLists.txt qlandkartegt-1.8.1/src/CMakeLists.txt +--- qlandkartegt-1.8.1.orig/src/CMakeLists.txt 2014-08-28 08:22:28.000000000 +0200 ++++ qlandkartegt-1.8.1/src/CMakeLists.txt 2017-02-07 14:29:11.276655368 +0100 +@@ -668,20 +668,13 @@ + add_definitions(-D_TTY_POSIX_ -Wall) + endif(UNIX) + ++ + set(qlandkarte_include_dirs + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${OPENGL_INCLUDE_DIR} + ${GDAL_INCLUDE_DIRS} + ${PROJ_INCLUDE_DIRS} +- ${QT_QTXML_INCLUDE_DIR} +- ${QT_QTSQL_INCLUDE_DIR} +- ${QT_QTOPENGL_INCLUDE_DIR} +- ${QT_QTNETWORK_INCLUDE_DIR} +- ${QT_QTDBUS_INCLUDE_DIR} +- ${QT_QTWEBKIT_INCLUDE_DIR} +- ${QT_QTSCRIPT_INCLUDE_DIR} +- ${QT_OPENGL_INCLUDE_DIR} + ${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/3rdparty/QZip + ${CMAKE_SOURCE_DIR}/3rdparty/QTextHtmlExporter +@@ -694,6 +687,19 @@ + ${QEXTSERIALPORT_INCLUDE_DIRS} + ) + ++if (NOT QK_QT5_PORT) ++set(qlandkarte_include_dirs ${qlandkarte_include_dirs} ++ ${QT_QTXML_INCLUDE_DIR} ++ ${QT_QTSQL_INCLUDE_DIR} ++ ${QT_QTOPENGL_INCLUDE_DIR} ++ ${QT_QTNETWORK_INCLUDE_DIR} ++ ${QT_QTDBUS_INCLUDE_DIR} ++ ${QT_QTWEBKIT_INCLUDE_DIR} ++ ${QT_QTSCRIPT_INCLUDE_DIR} ++ ${QT_OPENGL_INCLUDE_DIR} ++) ++endif(NOT QK_QT5_PORT) ++ + + if(NOT QK_QT5_SERIAL_PORT) + set(qlandkarte_include_dirs +diff -Naur qlandkartegt-1.8.1.orig/src/CRouteToolWidget.cpp qlandkartegt-1.8.1/src/CRouteToolWidget.cpp +--- qlandkartegt-1.8.1.orig/src/CRouteToolWidget.cpp 2015-02-16 11:34:56.000000000 +0100 ++++ qlandkartegt-1.8.1/src/CRouteToolWidget.cpp 2017-02-07 14:29:03.253103094 +0100 +@@ -1016,13 +1016,25 @@ + } + } + ++#ifdef QK_QT5_PORT ++ QList< QPair<QString, QString> > queryItems; ++ queryItems << QPair<QString, QString>("lonlats",lonlats.toLatin1()); ++ queryItems << QPair<QString, QString>("nogos", ""); ++ queryItems << QPair<QString, QString>("profile", comboBRPreference->itemData(comboBRPreference->currentIndex()).toString()); ++ queryItems << QPair<QString, QString>("alternativeidx", QString::number(rte.getRouteIdx())); ++ queryItems << QPair<QString, QString>("format", "gpx"); ++ QUrlQuery urlQuery; ++ urlQuery.setQueryItems(queryItems); ++ url.setQuery(urlQuery); ++#else + QList< QPair<QByteArray, QByteArray> > queryItems; +- queryItems << QPair<QByteArray, QByteArray>(QByteArray("lonlats"),QByteArray(lonlats.toAscii())); ++ queryItems << QPair<QByteArray, QByteArray>(QByteArray("lonlats"),QByteArray(lonlats.toLatin1())); + queryItems << QPair<QByteArray, QByteArray>(QByteArray("nogos"), QByteArray("")); + queryItems << QPair<QByteArray, QByteArray>(QByteArray("profile"), comboBRPreference->itemData(comboBRPreference->currentIndex()).toByteArray()); + queryItems << QPair<QByteArray, QByteArray>(QByteArray("alternativeidx"), QVariant(rte.getRouteIdx()).toByteArray()); + queryItems << QPair<QByteArray, QByteArray>(QByteArray("format"), QByteArray("gpx")); + url.setEncodedQueryItems(queryItems); ++#endif + + QNetworkRequest request; + +diff -Naur qlandkartegt-1.8.1.orig/src/CTrackEditWidget.cpp qlandkartegt-1.8.1/src/CTrackEditWidget.cpp +--- qlandkartegt-1.8.1.orig/src/CTrackEditWidget.cpp 2015-02-03 09:59:03.000000000 +0100 ++++ qlandkartegt-1.8.1/src/CTrackEditWidget.cpp 2017-02-07 14:29:11.276655368 +0100 +@@ -769,7 +769,9 @@ + // azimuth + if(trkpt->azimuth != WPT_NOFLOAT) + { +- str.sprintf("%1.0f\260",trkpt->azimuth); ++ const QChar degreeChar(0260); ++ str.sprintf("%1.0f",trkpt->azimuth); ++ str.append(degreeChar); + } + else + { Deleted: community-i686/qlandkartegt-mimetypes.xml =================================================================== --- community-i686/qlandkartegt-mimetypes.xml 2017-02-07 13:50:46 UTC (rev 210788) +++ community-i686/qlandkartegt-mimetypes.xml 2017-02-07 13:50:53 UTC (rev 210789) @@ -1,7 +0,0 @@ -<?xml version="1.0"?> -<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'> - <mime-type type="application/vnd.qlandkartegt.qlb"> - <comment>QLandkarteGT File</comment> - <glob pattern="*.qlb"/> - </mime-type> -</mime-info> Copied: qlandkartegt/repos/community-i686/qlandkartegt-mimetypes.xml (from rev 210788, qlandkartegt/trunk/qlandkartegt-mimetypes.xml) =================================================================== --- community-i686/qlandkartegt-mimetypes.xml (rev 0) +++ community-i686/qlandkartegt-mimetypes.xml 2017-02-07 13:50:53 UTC (rev 210789) @@ -0,0 +1,7 @@ +<?xml version="1.0"?> +<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'> + <mime-type type="application/vnd.qlandkartegt.qlb"> + <comment>QLandkarteGT File</comment> + <glob pattern="*.qlb"/> + </mime-type> +</mime-info> Deleted: community-i686/qlandkartegt.changelog =================================================================== --- community-i686/qlandkartegt.changelog 2017-02-07 13:50:46 UTC (rev 210788) +++ community-i686/qlandkartegt.changelog 2017-02-07 13:50:53 UTC (rev 210789) @@ -1,90 +0,0 @@ -2016-09-14 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.8.1-7 proj 4.9.3 rebuild - -2016-04-29 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.8.1-6 pacman hooks rebuild - -2015-06-28 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.8.1-4 gdal 2.0.0 rebuild - -2015-03-10 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.8.1-1 - -2015-02-09 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.8.0-1 - -2014-07-13 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.7.7-1 - -2014-02-22 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.7.6-1 - -2013-10-16 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.7.5-1 - -2013-09-28 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.7.4-1 - -2013-09-02 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.7.3-1 - -2013-07-14 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.7.1-1 - -2013-03-28 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.7.0-1 - -2012-12-04 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.6.0-1 - -2012-10-22 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.5.3-1 - -2012-09-06 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.5.1-1 - -2012-07-07 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.5.0-1 - -2012-05-24 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.4.2-1 - -2012-05-20 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.4.1-1 - -2012-03-08 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.4.0-1 - -2012-02-21 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.3.2-1 - -2011-12-08 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.3.1-1 - -2011-10-09 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.2.4-1 - -2011-09-09 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.2.3-1 - -2011-07-19 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.2.2-1 - -2011-07-07 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.2.1-1 - -2011-06-22 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.2.0-1 - -2011-05-22 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.1.2-1 - -2011-03-21 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.1.1-1 - -2011-02-23 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.1.0-1 - -2011-02-05 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.0.1-2 - * moved to [community] with 59 AUR votes Copied: qlandkartegt/repos/community-i686/qlandkartegt.changelog (from rev 210788, qlandkartegt/trunk/qlandkartegt.changelog) =================================================================== --- community-i686/qlandkartegt.changelog (rev 0) +++ community-i686/qlandkartegt.changelog 2017-02-07 13:50:53 UTC (rev 210789) @@ -0,0 +1,90 @@ +2016-09-14 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.8.1-7 proj 4.9.3 rebuild + +2016-04-29 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.8.1-6 pacman hooks rebuild + +2015-06-28 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.8.1-4 gdal 2.0.0 rebuild + +2015-03-10 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.8.1-1 + +2015-02-09 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.8.0-1 + +2014-07-13 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.7.7-1 + +2014-02-22 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.7.6-1 + +2013-10-16 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.7.5-1 + +2013-09-28 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.7.4-1 + +2013-09-02 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.7.3-1 + +2013-07-14 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.7.1-1 + +2013-03-28 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.7.0-1 + +2012-12-04 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.6.0-1 + +2012-10-22 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.5.3-1 + +2012-09-06 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.5.1-1 + +2012-07-07 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.5.0-1 + +2012-05-24 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.4.2-1 + +2012-05-20 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.4.1-1 + +2012-03-08 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.4.0-1 + +2012-02-21 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.3.2-1 + +2011-12-08 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.3.1-1 + +2011-10-09 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.2.4-1 + +2011-09-09 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.2.3-1 + +2011-07-19 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.2.2-1 + +2011-07-07 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.2.1-1 + +2011-06-22 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.2.0-1 + +2011-05-22 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.1.2-1 + +2011-03-21 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.1.1-1 + +2011-02-23 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.1.0-1 + +2011-02-05 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.0.1-2 + * moved to [community] with 59 AUR votes Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2017-02-07 13:50:46 UTC (rev 210788) +++ community-x86_64/PKGBUILD 2017-02-07 13:50:53 UTC (rev 210789) @@ -1,44 +0,0 @@ -# $Id$ -# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org> -# Contributor: Matthias Maennich <a...@maennich.net> -# Contributor: <boe...@gmx.de> - -pkgname=qlandkartegt -pkgver=1.8.1 -pkgrel=7 -pkgdesc="Use your GPS with Linux" -arch=('i686' 'x86_64') -url="http://www.qlandkarte.org/" -license=('GPL') -depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmariadbclient' 'glu' - 'postgresql-libs' 'shared-mime-info' 'qtwebkit' 'proj') -makedepends=('cmake' 'garmindev' 'mesa') -optdepends=('garmindev: to connect garmin devices') -changelog=$pkgname.changelog -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - $pkgname-mimetypes.xml) -sha256sums=('9e0605ab8f4cbd27741b507f252f08370e9ccca4e05ec35878256c59b22a9be7' - 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') - -prepare() { - cd "${srcdir}" - mkdir build -} - -build() { - cd "${srcdir}"/build - - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release - make -} - -package(){ - cd "${srcdir}"/build - - make DESTDIR="${pkgdir}" install - - install -Dm644 "${srcdir}"/$pkgname-mimetypes.xml \ - "${pkgdir}"/usr/share/mime/packages/$pkgname-mimetypes.xml -} Copied: qlandkartegt/repos/community-x86_64/PKGBUILD (from rev 210788, qlandkartegt/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2017-02-07 13:50:53 UTC (rev 210789) @@ -0,0 +1,52 @@ +# $Id$ +# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org> +# Contributor: Matthias Maennich <a...@maennich.net> +# Contributor: <boe...@gmx.de> + +pkgname=qlandkartegt +pkgver=1.8.1 +pkgrel=8 +pkgdesc="Use your GPS with Linux" +arch=('i686' 'x86_64') +url="http://www.qlandkarte.org/" +license=('GPL') +depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmariadbclient' 'glu' + 'postgresql-libs' 'shared-mime-info' 'qt5-script' 'qt5-multimedia' + 'qt5-webkit' 'qt5-serialport' 'proj') +makedepends=('cmake' 'garmindev' 'mesa' 'qt5-tools') +optdepends=('garmindev: to connect garmin devices') +changelog=$pkgname.changelog +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + $pkgname-mimetypes.xml + fix-qt5-build.patch) +sha256sums=('9e0605ab8f4cbd27741b507f252f08370e9ccca4e05ec35878256c59b22a9be7' + 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0' + 'e71d843289f8f1099388a431bf488281232344b9ce6c0a28d1a60f68b6ec3e4b') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + # Fix build with Qt5 + patch -Np1 -i ../fix-qt5-build.patch + + cd "${srcdir}" + mkdir build +} + +build() { + cd "${srcdir}"/build + + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DQK_QT5_PORT=ON + make +} + +package(){ + cd "${srcdir}"/build + + make DESTDIR="${pkgdir}" install + + install -Dm644 "${srcdir}"/$pkgname-mimetypes.xml \ + "${pkgdir}"/usr/share/mime/packages/$pkgname-mimetypes.xml +} Copied: qlandkartegt/repos/community-x86_64/fix-qt5-build.patch (from rev 210788, qlandkartegt/trunk/fix-qt5-build.patch) =================================================================== --- community-x86_64/fix-qt5-build.patch (rev 0) +++ community-x86_64/fix-qt5-build.patch 2017-02-07 13:50:53 UTC (rev 210789) @@ -0,0 +1,141 @@ +diff -Naur qlandkartegt-1.8.1.orig/3rdparty/cache2gtiff/CMakeLists.txt qlandkartegt-1.8.1/3rdparty/cache2gtiff/CMakeLists.txt +--- qlandkartegt-1.8.1.orig/3rdparty/cache2gtiff/CMakeLists.txt 2014-08-08 11:53:46.000000000 +0200 ++++ qlandkartegt-1.8.1/3rdparty/cache2gtiff/CMakeLists.txt 2017-02-07 14:29:11.273321944 +0100 +@@ -50,9 +50,16 @@ + ${GDAL_INCLUDE_DIRS} + ${PROJ_INCLUDE_DIRS} + ${JPEG_INCLUDE_DIRS} +- ${QT_QTXML_INCLUDE_DIR} + ../../src/ + ) ++ ++if (NOT QK_QT5_PORT) ++include_directories( ++ ${QT_QTXML_INCLUDE_DIR} ++) ++endif(NOT QK_QT5_PORT) ++ ++ + if(WIN32) + include_directories( + ${CMAKE_SOURCE_DIR}/Win32/ +@@ -89,6 +96,7 @@ + ) + + ++ + if(QK_QT5_PORT) + qt5_use_modules(cache2gtiff Widgets) + qt5_use_modules(cache2gtiff Xml) +diff -Naur qlandkartegt-1.8.1.orig/src/CDlgEditWpt.cpp qlandkartegt-1.8.1/src/CDlgEditWpt.cpp +--- qlandkartegt-1.8.1.orig/src/CDlgEditWpt.cpp 2015-02-03 09:38:09.000000000 +0100 ++++ qlandkartegt-1.8.1/src/CDlgEditWpt.cpp 2017-02-07 14:29:03.253103094 +0100 +@@ -531,7 +531,7 @@ + { + barcode = barcode.left(177) + "..."; + } +- dmtxEncodeDataMatrix( enc, barcode.size(), (unsigned char*)barcode.toAscii().data() ); ++ dmtxEncodeDataMatrix( enc, barcode.size(), (unsigned char*)barcode.toLatin1().data() ); + + QImage curBarCode( enc->image->pxl, enc->image->width, enc->image->height, QImage::Format_RGB32 ); + labelBarcode->setPixmap(QPixmap::fromImage(curBarCode)); +diff -Naur qlandkartegt-1.8.1.orig/src/CExchangeGarmin.cpp qlandkartegt-1.8.1/src/CExchangeGarmin.cpp +--- qlandkartegt-1.8.1.orig/src/CExchangeGarmin.cpp 2014-08-08 11:53:40.000000000 +0200 ++++ qlandkartegt-1.8.1/src/CExchangeGarmin.cpp 2017-02-07 14:29:03.253103094 +0100 +@@ -21,6 +21,7 @@ + #include <QtDBus> + #include <QtXml> + #include <QtGui> ++#include <QMessageBox> + + CGarminTreeWidgetItem::CGarminTreeWidgetItem(const QString& id, QTreeWidget *parent) + : IDeviceTreeWidgetItem(id,parent) +diff -Naur qlandkartegt-1.8.1.orig/src/CMakeLists.txt qlandkartegt-1.8.1/src/CMakeLists.txt +--- qlandkartegt-1.8.1.orig/src/CMakeLists.txt 2014-08-28 08:22:28.000000000 +0200 ++++ qlandkartegt-1.8.1/src/CMakeLists.txt 2017-02-07 14:29:11.276655368 +0100 +@@ -668,20 +668,13 @@ + add_definitions(-D_TTY_POSIX_ -Wall) + endif(UNIX) + ++ + set(qlandkarte_include_dirs + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${OPENGL_INCLUDE_DIR} + ${GDAL_INCLUDE_DIRS} + ${PROJ_INCLUDE_DIRS} +- ${QT_QTXML_INCLUDE_DIR} +- ${QT_QTSQL_INCLUDE_DIR} +- ${QT_QTOPENGL_INCLUDE_DIR} +- ${QT_QTNETWORK_INCLUDE_DIR} +- ${QT_QTDBUS_INCLUDE_DIR} +- ${QT_QTWEBKIT_INCLUDE_DIR} +- ${QT_QTSCRIPT_INCLUDE_DIR} +- ${QT_OPENGL_INCLUDE_DIR} + ${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/3rdparty/QZip + ${CMAKE_SOURCE_DIR}/3rdparty/QTextHtmlExporter +@@ -694,6 +687,19 @@ + ${QEXTSERIALPORT_INCLUDE_DIRS} + ) + ++if (NOT QK_QT5_PORT) ++set(qlandkarte_include_dirs ${qlandkarte_include_dirs} ++ ${QT_QTXML_INCLUDE_DIR} ++ ${QT_QTSQL_INCLUDE_DIR} ++ ${QT_QTOPENGL_INCLUDE_DIR} ++ ${QT_QTNETWORK_INCLUDE_DIR} ++ ${QT_QTDBUS_INCLUDE_DIR} ++ ${QT_QTWEBKIT_INCLUDE_DIR} ++ ${QT_QTSCRIPT_INCLUDE_DIR} ++ ${QT_OPENGL_INCLUDE_DIR} ++) ++endif(NOT QK_QT5_PORT) ++ + + if(NOT QK_QT5_SERIAL_PORT) + set(qlandkarte_include_dirs +diff -Naur qlandkartegt-1.8.1.orig/src/CRouteToolWidget.cpp qlandkartegt-1.8.1/src/CRouteToolWidget.cpp +--- qlandkartegt-1.8.1.orig/src/CRouteToolWidget.cpp 2015-02-16 11:34:56.000000000 +0100 ++++ qlandkartegt-1.8.1/src/CRouteToolWidget.cpp 2017-02-07 14:29:03.253103094 +0100 +@@ -1016,13 +1016,25 @@ + } + } + ++#ifdef QK_QT5_PORT ++ QList< QPair<QString, QString> > queryItems; ++ queryItems << QPair<QString, QString>("lonlats",lonlats.toLatin1()); ++ queryItems << QPair<QString, QString>("nogos", ""); ++ queryItems << QPair<QString, QString>("profile", comboBRPreference->itemData(comboBRPreference->currentIndex()).toString()); ++ queryItems << QPair<QString, QString>("alternativeidx", QString::number(rte.getRouteIdx())); ++ queryItems << QPair<QString, QString>("format", "gpx"); ++ QUrlQuery urlQuery; ++ urlQuery.setQueryItems(queryItems); ++ url.setQuery(urlQuery); ++#else + QList< QPair<QByteArray, QByteArray> > queryItems; +- queryItems << QPair<QByteArray, QByteArray>(QByteArray("lonlats"),QByteArray(lonlats.toAscii())); ++ queryItems << QPair<QByteArray, QByteArray>(QByteArray("lonlats"),QByteArray(lonlats.toLatin1())); + queryItems << QPair<QByteArray, QByteArray>(QByteArray("nogos"), QByteArray("")); + queryItems << QPair<QByteArray, QByteArray>(QByteArray("profile"), comboBRPreference->itemData(comboBRPreference->currentIndex()).toByteArray()); + queryItems << QPair<QByteArray, QByteArray>(QByteArray("alternativeidx"), QVariant(rte.getRouteIdx()).toByteArray()); + queryItems << QPair<QByteArray, QByteArray>(QByteArray("format"), QByteArray("gpx")); + url.setEncodedQueryItems(queryItems); ++#endif + + QNetworkRequest request; + +diff -Naur qlandkartegt-1.8.1.orig/src/CTrackEditWidget.cpp qlandkartegt-1.8.1/src/CTrackEditWidget.cpp +--- qlandkartegt-1.8.1.orig/src/CTrackEditWidget.cpp 2015-02-03 09:59:03.000000000 +0100 ++++ qlandkartegt-1.8.1/src/CTrackEditWidget.cpp 2017-02-07 14:29:11.276655368 +0100 +@@ -769,7 +769,9 @@ + // azimuth + if(trkpt->azimuth != WPT_NOFLOAT) + { +- str.sprintf("%1.0f\260",trkpt->azimuth); ++ const QChar degreeChar(0260); ++ str.sprintf("%1.0f",trkpt->azimuth); ++ str.append(degreeChar); + } + else + { Deleted: community-x86_64/qlandkartegt-mimetypes.xml =================================================================== --- community-x86_64/qlandkartegt-mimetypes.xml 2017-02-07 13:50:46 UTC (rev 210788) +++ community-x86_64/qlandkartegt-mimetypes.xml 2017-02-07 13:50:53 UTC (rev 210789) @@ -1,7 +0,0 @@ -<?xml version="1.0"?> -<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'> - <mime-type type="application/vnd.qlandkartegt.qlb"> - <comment>QLandkarteGT File</comment> - <glob pattern="*.qlb"/> - </mime-type> -</mime-info> Copied: qlandkartegt/repos/community-x86_64/qlandkartegt-mimetypes.xml (from rev 210788, qlandkartegt/trunk/qlandkartegt-mimetypes.xml) =================================================================== --- community-x86_64/qlandkartegt-mimetypes.xml (rev 0) +++ community-x86_64/qlandkartegt-mimetypes.xml 2017-02-07 13:50:53 UTC (rev 210789) @@ -0,0 +1,7 @@ +<?xml version="1.0"?> +<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'> + <mime-type type="application/vnd.qlandkartegt.qlb"> + <comment>QLandkarteGT File</comment> + <glob pattern="*.qlb"/> + </mime-type> +</mime-info> Deleted: community-x86_64/qlandkartegt.changelog =================================================================== --- community-x86_64/qlandkartegt.changelog 2017-02-07 13:50:46 UTC (rev 210788) +++ community-x86_64/qlandkartegt.changelog 2017-02-07 13:50:53 UTC (rev 210789) @@ -1,90 +0,0 @@ -2016-09-14 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.8.1-7 proj 4.9.3 rebuild - -2016-04-29 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.8.1-6 pacman hooks rebuild - -2015-06-28 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.8.1-4 gdal 2.0.0 rebuild - -2015-03-10 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.8.1-1 - -2015-02-09 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.8.0-1 - -2014-07-13 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.7.7-1 - -2014-02-22 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.7.6-1 - -2013-10-16 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.7.5-1 - -2013-09-28 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.7.4-1 - -2013-09-02 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.7.3-1 - -2013-07-14 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.7.1-1 - -2013-03-28 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.7.0-1 - -2012-12-04 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.6.0-1 - -2012-10-22 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.5.3-1 - -2012-09-06 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.5.1-1 - -2012-07-07 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.5.0-1 - -2012-05-24 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.4.2-1 - -2012-05-20 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.4.1-1 - -2012-03-08 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.4.0-1 - -2012-02-21 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.3.2-1 - -2011-12-08 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.3.1-1 - -2011-10-09 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.2.4-1 - -2011-09-09 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.2.3-1 - -2011-07-19 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.2.2-1 - -2011-07-07 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.2.1-1 - -2011-06-22 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.2.0-1 - -2011-05-22 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.1.2-1 - -2011-03-21 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.1.1-1 - -2011-02-23 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.1.0-1 - -2011-02-05 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * qlandkartegt 1.0.1-2 - * moved to [community] with 59 AUR votes Copied: qlandkartegt/repos/community-x86_64/qlandkartegt.changelog (from rev 210788, qlandkartegt/trunk/qlandkartegt.changelog) =================================================================== --- community-x86_64/qlandkartegt.changelog (rev 0) +++ community-x86_64/qlandkartegt.changelog 2017-02-07 13:50:53 UTC (rev 210789) @@ -0,0 +1,90 @@ +2016-09-14 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.8.1-7 proj 4.9.3 rebuild + +2016-04-29 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.8.1-6 pacman hooks rebuild + +2015-06-28 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.8.1-4 gdal 2.0.0 rebuild + +2015-03-10 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.8.1-1 + +2015-02-09 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.8.0-1 + +2014-07-13 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.7.7-1 + +2014-02-22 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.7.6-1 + +2013-10-16 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.7.5-1 + +2013-09-28 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.7.4-1 + +2013-09-02 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.7.3-1 + +2013-07-14 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.7.1-1 + +2013-03-28 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.7.0-1 + +2012-12-04 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.6.0-1 + +2012-10-22 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.5.3-1 + +2012-09-06 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.5.1-1 + +2012-07-07 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.5.0-1 + +2012-05-24 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.4.2-1 + +2012-05-20 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.4.1-1 + +2012-03-08 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.4.0-1 + +2012-02-21 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.3.2-1 + +2011-12-08 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.3.1-1 + +2011-10-09 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.2.4-1 + +2011-09-09 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.2.3-1 + +2011-07-19 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.2.2-1 + +2011-07-07 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.2.1-1 + +2011-06-22 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.2.0-1 + +2011-05-22 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.1.2-1 + +2011-03-21 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.1.1-1 + +2011-02-23 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.1.0-1 + +2011-02-05 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * qlandkartegt 1.0.1-2 + * moved to [community] with 59 AUR votes