Date: Thursday, February 16, 2017 @ 13:42:12 Author: spupykin Revision: 212575
upgpkg: gpsbabel 1.5.4-1 upd Added: gpsbabel/trunk/build-fix.patch Modified: gpsbabel/trunk/PKGBUILD -----------------+ PKGBUILD | 21 +++++++++++++------ build-fix.patch | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-02-16 12:02:23 UTC (rev 212574) +++ PKGBUILD 2017-02-16 13:42:12 UTC (rev 212575) @@ -4,21 +4,28 @@ # Contributor: William Rea <sillywi...@gmail.com> pkgname=gpsbabel -pkgver=1.5.3 +pkgver=1.5.4 pkgrel=1 pkgdesc="Reads, writes, and manipulates GPS waypoints in a variety of formats" arch=('i686' 'x86_64') url="http://www.gpsbabel.org" license=('GPL') -depends=('libusb-compat' 'expat' 'qt5-base') +depends=('libusb-compat' 'expat' 'qt5-base' 'qt5-webengine') makedepends=('fop' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qt5-webkit' 'java-environment' 'docbook-xsl') optdepends=('qt5-webkit') options=('docs') -source=("https://arch.p5n.pp.ru/~sergej/dl/gpsbabel-$pkgver.tar.gz") -sha256sums=('7599beb312488a96d8b8e646c357fbc122970522a7c9ae0a2777862a0ef39351') +source=("https://arch.p5n.pp.ru/~sergej/dl/gpsbabel-$pkgver.tar.gz" + "build-fix.patch") +sha256sums=('59e29b83a16af16556fffc9315d3d3626d11fc7f2f50d6ec1f99dfc64412989e' + '537752bd5d097d836d4d5a77b4f7a5ea68d408d6a648511e4a98865d2742fb46') +prepare() { + cd "$srcdir"/$pkgname-$pkgver + patch -p1 <../build-fix.patch +} + build() { - cd "$srcdir" + cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr --with-doc=babelweb make make doc @@ -26,7 +33,7 @@ } package() { - cd "$srcdir" + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install # GUI @@ -40,6 +47,6 @@ # Doc install mkdir -p "$pkgdir"/usr/share/doc/$pkgname - cp -r "$srcdir"/babelweb/* "$pkgdir"/usr/share/doc/$pkgname/ + cp -r babelweb/* "$pkgdir"/usr/share/doc/$pkgname/ cp README* "$pkgdir"/usr/share/doc/$pkgname/ } Added: build-fix.patch =================================================================== --- build-fix.patch (rev 0) +++ build-fix.patch 2017-02-16 13:42:12 UTC (rev 212575) @@ -0,0 +1,58 @@ +diff -wbBur gpsbabel-1.5.4/tef_xml.cc gpsbabel-1.5.4.my/tef_xml.cc +--- gpsbabel-1.5.4/tef_xml.cc 2017-01-02 08:05:19.000000000 +0300 ++++ gpsbabel-1.5.4.my/tef_xml.cc 2017-02-16 16:20:22.788961096 +0300 +@@ -72,11 +72,11 @@ + bool valid = false; + + foreach(QXmlStreamAttribute attr, *attrv) { +- if (attr.name().compare("Comment", Qt::CaseInsensitive) == 0) { +- if (attr.value().compare("TourExchangeFormat", Qt::CaseInsensitive) == 0) { ++ if (attr.name().compare((QString&)"Comment", Qt::CaseInsensitive) == 0) { ++ if (attr.value().compare((QString&)"TourExchangeFormat", Qt::CaseInsensitive) == 0) { + valid = true; + } +- } else if (attr.name().compare("Version", Qt::CaseInsensitive) == 0) { ++ } else if (attr.name().compare((QString&)"Version", Qt::CaseInsensitive) == 0) { + version = attr.value().toString().toDouble(); + } + } +@@ -95,9 +95,9 @@ + { + route = route_head_alloc(); + foreach(QXmlStreamAttribute attr, *attrv) { +- if (attr.name().compare("Name", Qt::CaseInsensitive) == 0) { ++ if (attr.name().compare((QString&)"Name", Qt::CaseInsensitive) == 0) { + route->rte_name = attr.value().toString().trimmed(); +- } else if (attr.name().compare("Software", Qt::CaseInsensitive) == 0) { ++ } else if (attr.name().compare((QString&)"Software", Qt::CaseInsensitive) == 0) { + route->rte_desc = attr.value().toString().trimmed(); + } + } +@@ -248,20 +248,20 @@ + QString attrstr = attr.value().toString(); + QByteArray attrtext = attrstr.toUtf8(); + +- if (attr.name().compare("SegDescription", Qt::CaseInsensitive) == 0) { ++ if (attr.name().compare((QString&)"SegDescription", Qt::CaseInsensitive) == 0) { + wpt_tmp->shortname = attrstr.trimmed(); +- } else if (attr.name().compare("PointDescription", Qt::CaseInsensitive) == 0) { ++ } else if (attr.name().compare((QString&)"PointDescription", Qt::CaseInsensitive) == 0) { + wpt_tmp->description = attrstr.trimmed(); +- } else if (attr.name().compare("ViaStation", Qt::CaseInsensitive) == 0 && +- attr.value().compare("true", Qt::CaseInsensitive) == 0) { ++ } else if (attr.name().compare((QString&)"ViaStation", Qt::CaseInsensitive) == 0 && ++ attr.value().compare((QString&)"true", Qt::CaseInsensitive) == 0) { + wpt_tmp->wpt_flags.fmt_use = 1; /* only a flag */ + + /* new in TEF V2 */ +- } else if (attr.name().compare("Instruction", Qt::CaseInsensitive) == 0) { ++ } else if (attr.name().compare((QString&)"Instruction", Qt::CaseInsensitive) == 0) { + wpt_tmp->description = attrstr.trimmed(); +- } else if (attr.name().compare("Altitude", Qt::CaseInsensitive) == 0) { ++ } else if (attr.name().compare((QString&)"Altitude", Qt::CaseInsensitive) == 0) { + wpt_tmp->altitude = attrstr.toDouble(); +- } else if (attr.name().compare("TimeStamp", Qt::CaseInsensitive) == 0) { ++ } else if (attr.name().compare((QString&)"TimeStamp", Qt::CaseInsensitive) == 0) { + /* nothing for the moment */ + } + }