archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2025-01-27 23:44:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed community/qlandkartegt

Browse source
This commit is contained in:
Kevin Mihelich 2017-02-08 01:59:05 +00:00
parent eba7b40852
commit f00c4a3d33
5 changed files with 0 additions and 334 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
community/qlandkartegt/PKGBUILD
View file

@ -1,58 +0,0 @@
# $Id$
# Maintainer: Jaroslav Lichtblau <svetlemodry@archlinux.org>
# Contributor: Matthias Maennich <arch@maennich.net>
# Contributor: <boenki@gmx.de>
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - patch from Fedora to fix signed char usage
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
qlandkartegt-1.8.1-char.patch)
sha256sums=('9e0605ab8f4cbd27741b507f252f08370e9ccca4e05ec35878256c59b22a9be7'
'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0'
'e71d843289f8f1099388a431bf488281232344b9ce6c0a28d1a60f68b6ec3e4b'
'60388727cc8416bddff05af1251661db4e6b3022436dcf80b4d8251f0437900a')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
# Fix build with Qt5
patch -Np1 -i ../fix-qt5-build.patch
patch -p1 -i ../qlandkartegt-1.8.1-char.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
}

141
community/qlandkartegt/fix-qt5-build.patch
View file

@ -1,141 +0,0 @@
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
{

38
community/qlandkartegt/qlandkartegt-1.8.1-char.patch
View file

@ -1,38 +0,0 @@
diff -up qlandkartegt-1.8.1/3rdparty/map2rmp/CFileGenerator.cpp.char qlandkartegt-1.8.1/3rdparty/map2rmp/CFileGenerator.cpp
--- qlandkartegt-1.8.1/3rdparty/map2rmp/CFileGenerator.cpp.char 2016-02-15 17:17:32.000000000 +0100
+++ qlandkartegt-1.8.1/3rdparty/map2rmp/CFileGenerator.cpp 2016-02-15 17:27:02.000000000 +0100
@@ -57,7 +57,7 @@ extern "C"
static std::vector<JOCTET> jpgbuf;
-static const char bmp2bit[] =
+static const signed char bmp2bit[] =
{
73, 99, 111, 110, 32, 102, 105, 108, 101, 32, 118, 101,
114, 115, 105, 111, 110, 32, 49, 46, 48, 46, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0,
@@ -82,7 +82,7 @@ static const char bmp2bit[] =
-1, -1, 0, -1, -1
};
-static const char bmp4bit[] =
+static const signed char bmp4bit[] =
{
73, 99, 111, 110, 32, 102, 105, 108, 101, 32, 118, 101,
114, 115, 105, 111, 110, 32, 49, 46, 48, 46, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0,
@@ -764,14 +764,14 @@ void CFileGenerator::writeBmp2Bit(QDataS
{
rmp.directory[INDEX_BMP2BIT].offset = stream.device()->pos();
rmp.directory[INDEX_BMP2BIT].length = sizeof(bmp2bit);
- stream.writeRawData(bmp2bit, sizeof(bmp2bit));
+ stream.writeRawData((const char *)bmp2bit, sizeof(bmp2bit));
}
void CFileGenerator::writeBmp4Bit(QDataStream& stream, rmp_file_t& rmp)
{
rmp.directory[INDEX_BMP4BIT].offset = stream.device()->pos();
rmp.directory[INDEX_BMP4BIT].length = sizeof(bmp4bit);
- stream.writeRawData(bmp4bit, sizeof(bmp4bit));
+ stream.writeRawData((const char *)bmp4bit, sizeof(bmp4bit));
}
void CFileGenerator::writeCvgMap(QDataStream& stream, rmp_file_t& rmp)

7
community/qlandkartegt/qlandkartegt-mimetypes.xml
View file

@ -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>

90
community/qlandkartegt/qlandkartegt.changelog
View file

@ -1,90 +0,0 @@
2016-09-14 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.8.1-7 proj 4.9.3 rebuild
2016-04-29 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.8.1-6 pacman hooks rebuild
2015-06-28 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.8.1-4 gdal 2.0.0 rebuild
2015-03-10 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.8.1-1
2015-02-09 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.8.0-1
2014-07-13 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.7.7-1
2014-02-22 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.7.6-1
2013-10-16 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.7.5-1
2013-09-28 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.7.4-1
2013-09-02 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.7.3-1
2013-07-14 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.7.1-1
2013-03-28 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.7.0-1
2012-12-04 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.6.0-1
2012-10-22 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.5.3-1
2012-09-06 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.5.1-1
2012-07-07 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.5.0-1
2012-05-24 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.4.2-1
2012-05-20 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.4.1-1
2012-03-08 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.4.0-1
2012-02-21 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.3.2-1
2011-12-08 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.3.1-1
2011-10-09 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.2.4-1
2011-09-09 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.2.3-1
2011-07-19 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.2.2-1
2011-07-07 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.2.1-1
2011-06-22 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.2.0-1
2011-05-22 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.1.2-1
2011-03-21 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.1.1-1
2011-02-23 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.1.0-1
2011-02-05 Jaroslav Lichtblau <svetlemodry@archlinux.org>
* qlandkartegt 1.0.1-2
* moved to [community] with 59 AUR votes