Date: Wednesday, February 22, 2017 @ 05:21:36 Author: bgyorgy Revision: 213409
archrelease: copy trunk to community-i686, community-x86_64 Added: gpsbabel/repos/community-i686/PKGBUILD (from rev 213408, gpsbabel/trunk/PKGBUILD) gpsbabel/repos/community-i686/build-fix.patch (from rev 213408, gpsbabel/trunk/build-fix.patch) gpsbabel/repos/community-i686/drop-map.patch (from rev 213408, gpsbabel/trunk/drop-map.patch) gpsbabel/repos/community-x86_64/PKGBUILD (from rev 213408, gpsbabel/trunk/PKGBUILD) gpsbabel/repos/community-x86_64/build-fix.patch (from rev 213408, gpsbabel/trunk/build-fix.patch) gpsbabel/repos/community-x86_64/drop-map.patch (from rev 213408, gpsbabel/trunk/drop-map.patch) Deleted: gpsbabel/repos/community-i686/PKGBUILD gpsbabel/repos/community-i686/build-fix.patch gpsbabel/repos/community-x86_64/PKGBUILD gpsbabel/repos/community-x86_64/build-fix.patch ----------------------------------+ /PKGBUILD | 138 +++++++++++++++++++++++++++++++++++++ /build-fix.patch | 116 +++++++++++++++++++++++++++++++ community-i686/PKGBUILD | 52 ------------- community-i686/build-fix.patch | 58 --------------- community-i686/drop-map.patch | 106 ++++++++++++++++++++++++++++ community-x86_64/PKGBUILD | 52 ------------- community-x86_64/build-fix.patch | 58 --------------- community-x86_64/drop-map.patch | 106 ++++++++++++++++++++++++++++ 8 files changed, 466 insertions(+), 220 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2017-02-22 05:21:29 UTC (rev 213408) +++ community-i686/PKGBUILD 2017-02-22 05:21:36 UTC (rev 213409) @@ -1,52 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org -# Contributor: William Rea <sillywi...@gmail.com> - -pkgname=gpsbabel -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' '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" - "build-fix.patch") -sha256sums=('59e29b83a16af16556fffc9315d3d3626d11fc7f2f50d6ec1f99dfc64412989e' - '537752bd5d097d836d4d5a77b4f7a5ea68d408d6a648511e4a98865d2742fb46') - -prepare() { - cd "$srcdir"/$pkgname-$pkgver - patch -p1 <../build-fix.patch -} - -build() { - cd "$srcdir"/$pkgname-$pkgver - ./configure --prefix=/usr --with-doc=babelweb - make - make doc - (cd gui && qmake-qt5 && make) -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install - - # GUI - install -Dm755 gui/objects/gpsbabelfe-bin "$pkgdir"/usr/bin/gpsbabelfe-bin - install -Dm644 gui/images/appicon.png "$pkgdir"/usr/share/pixmaps/gpsbabel.png - install -Dm644 gui/gpsbabel.desktop "$pkgdir"/usr/share/applications/gpsbabel.desktop - - # Header install - mkdir -p "$pkgdir"/usr/include/gpsbabel - cp *.h "$pkgdir"/usr/include/gpsbabel - - # Doc install - mkdir -p "$pkgdir"/usr/share/doc/$pkgname - cp -r babelweb/* "$pkgdir"/usr/share/doc/$pkgname/ - cp README* "$pkgdir"/usr/share/doc/$pkgname/ -} Copied: gpsbabel/repos/community-i686/PKGBUILD (from rev 213408, gpsbabel/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2017-02-22 05:21:36 UTC (rev 213409) @@ -0,0 +1,69 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org +# Contributor: William Rea <sillywi...@gmail.com> + +pkgname=gpsbabel +pkgver=1.5.4 +pkgrel=2 +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' 'qt5-base') +makedepends=('docbook-xsl' 'fop' 'qt5-tools') # 'qt5-webengine' +# optdepends=('qt5-webengine: run the GUI') +options=('docs') +source=("https://arch.p5n.pp.ru/~sergej/dl/gpsbabel-$pkgver.tar.gz" + "build-fix.patch" + "drop-map.patch") +sha256sums=('59e29b83a16af16556fffc9315d3d3626d11fc7f2f50d6ec1f99dfc64412989e' + '537752bd5d097d836d4d5a77b4f7a5ea68d408d6a648511e4a98865d2742fb46' + 'bee2cc0549fe9d2aacb7266520428569438c7d7e40c283722eb403676d9aef7a') + +prepare() { + cd "$srcdir"/$pkgname-$pkgver + patch -p1 <../build-fix.patch + + # Map support is currently broken + patch -p1 <../drop-map.patch + + sed -i 's|langPath_ = QApplication::applicationDirPath();|langPath_ = "/usr/share/gpsbabel";|' gui/mainwindow.cc + sed -i 's|baseFile = QApplication::applicationDirPath() |baseFile = "/usr/share/gpsbabel" |' gui/map.cc +} + +build() { + cd "$srcdir"/$pkgname-$pkgver + ./configure --prefix=/usr --with-doc=babelweb + make + make doc + + # GUI + pushd gui + qmake-qt5 + lrelease-qt5 *.ts + make + popd +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" install + + # GUI + install -Dm755 gui/objects/gpsbabelfe-bin "$pkgdir"/usr/bin/gpsbabelfe-bin + install -Dm644 gui/images/appicon.png "$pkgdir"/usr/share/pixmaps/gpsbabel.png + install -Dm644 gui/gpsbabel.desktop "$pkgdir"/usr/share/applications/gpsbabel.desktop + install -Dm644 gui/gmapbase.html "$pkgdir"/usr/share/gpsbabel/gmapbase.html + install -dm755 "$pkgdir"/usr/share/gpsbabel/translations/ + install -Dm644 gui/*.qm "$pkgdir"/usr/share/gpsbabel/translations/ + + # Header install + install -dm755 "$pkgdir"/usr/include/gpsbabel/ + install -Dm644 *.h "$pkgdir"/usr/include/gpsbabel/ + + # Doc install + install -dm755 "$pkgdir"/usr/share/doc/$pkgname/ + cp -r babelweb/* "$pkgdir"/usr/share/doc/$pkgname/ + install -Dm644 README* "$pkgdir"/usr/share/doc/$pkgname/ +} Deleted: community-i686/build-fix.patch =================================================================== --- community-i686/build-fix.patch 2017-02-22 05:21:29 UTC (rev 213408) +++ community-i686/build-fix.patch 2017-02-22 05:21:36 UTC (rev 213409) @@ -1,58 +0,0 @@ -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 */ - } - } Copied: gpsbabel/repos/community-i686/build-fix.patch (from rev 213408, gpsbabel/trunk/build-fix.patch) =================================================================== --- community-i686/build-fix.patch (rev 0) +++ community-i686/build-fix.patch 2017-02-22 05:21:36 UTC (rev 213409) @@ -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 */ + } + } Copied: gpsbabel/repos/community-i686/drop-map.patch (from rev 213408, gpsbabel/trunk/drop-map.patch) =================================================================== --- community-i686/drop-map.patch (rev 0) +++ community-i686/drop-map.patch 2017-02-22 05:21:36 UTC (rev 213409) @@ -0,0 +1,106 @@ +diff -Naur gpsbabel-1.5.4.orig/gui/app.pro gpsbabel-1.5.4/gui/app.pro +--- gpsbabel-1.5.4.orig/gui/app.pro 2017-01-02 06:05:19.000000000 +0100 ++++ gpsbabel-1.5.4/gui/app.pro 2017-02-22 05:52:04.650462935 +0100 +@@ -15,13 +15,7 @@ + gui \ + network \ + xml \ +- +-greaterThan(QT_MINOR_VERSION, 5) { +- QT += webenginewidgets +- DEFINES += HAVE_WEBENGINE +-} else { +- QT += webkit webkitwidgets +-} ++ widgets \ + + unix:DESTDIR = objects + unix:MOC_DIR = objects +@@ -72,13 +66,11 @@ + SOURCES += filterwidgets.cc + SOURCES += format.cc + SOURCES += formatload.cc +-SOURCES += gmapdlg.cc + SOURCES += gpx.cc + SOURCES += help.cc + SOURCES += latlng.cc + SOURCES += main.cc + SOURCES += mainwindow.cc +-SOURCES += map.cc + SOURCES += optionsdlg.cc + SOURCES += preferences.cc + SOURCES += processwait.cc +@@ -98,11 +90,9 @@ + HEADERS += filterwidgets.h + HEADERS += format.h + HEADERS += formatload.h +-HEADERS += gmapdlg.h + HEADERS += gpx.h + HEADERS += help.h + HEADERS += mainwindow.h +-HEADERS += map.h + HEADERS += optionsdlg.h + HEADERS += preferences.h + HEADERS += processwait.h +diff -Naur gpsbabel-1.5.4.orig/gui/main.cc gpsbabel-1.5.4/gui/main.cc +--- gpsbabel-1.5.4.orig/gui/main.cc 2017-01-02 06:05:19.000000000 +0100 ++++ gpsbabel-1.5.4/gui/main.cc 2017-02-22 05:20:03.449272478 +0100 +@@ -29,7 +29,6 @@ + #include <QTextCodec> + + #include "mainwindow.h" +-#include "gmapdlg.h" + + #ifdef _WIN32 + const char *pathSeparator = ";"; +diff -Naur gpsbabel-1.5.4.orig/gui/mainwindow.cc gpsbabel-1.5.4/gui/mainwindow.cc +--- gpsbabel-1.5.4.orig/gui/mainwindow.cc 2017-01-02 06:05:19.000000000 +0100 ++++ gpsbabel-1.5.4/gui/mainwindow.cc 2017-02-22 06:03:27.026789219 +0100 +@@ -38,7 +38,6 @@ + #include "donate.h" + #include "filterdlg.h" + #include "formatload.h" +-#include "gmapdlg.h" + #include "help.h" + #include "optionsdlg.h" + #include "preferences.h" +@@ -976,24 +975,6 @@ + formatList_[fidx].bumpWriteUseCount(1); + } + +- // Now output for preview in google maps +- QString tempName; +- if (babelData_.previewGmap_) { +- QTemporaryFile ftemp; +- ftemp.open(); +- tempName = ftemp.fileName(); +- ftemp.close(); +- +- // Ideally, expost this in the UI. For now, just split the track +- // if we've no recorded fixes for > 5 mins and we've moved > 300 meters. +- //args << "-x"; +- //args << "track,pack,sdistance=0.3k,split=5m"; +- +- args << "-o"; +- args << "gpx"; +- args << "-F" << tempName; +- } +- + ui_.outputWindow->clear(); + ui_.outputWindow->appendPlainText("gpsbabel " + args.join(" ")); + +@@ -1005,14 +986,6 @@ + ui_.outputWindow->appendPlainText(outputString); + if (x) { + ui_.outputWindow->appendPlainText(tr("Translation successful")); +- if (babelData_.previewGmap_) { +- this->hide(); +- GMapDialog dlg(0, tempName, babelData_.debugLevel_ >=1 ? ui_.outputWindow : 0); +- dlg.show(); +- dlg.exec(); +- QFile(tempName).remove(); +- this->show(); +- } + } + else + ui_.outputWindow->appendPlainText(tr("Error running gpsbabel: %1\n").arg(errorString)); Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2017-02-22 05:21:29 UTC (rev 213408) +++ community-x86_64/PKGBUILD 2017-02-22 05:21:36 UTC (rev 213409) @@ -1,52 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org -# Contributor: William Rea <sillywi...@gmail.com> - -pkgname=gpsbabel -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' '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" - "build-fix.patch") -sha256sums=('59e29b83a16af16556fffc9315d3d3626d11fc7f2f50d6ec1f99dfc64412989e' - '537752bd5d097d836d4d5a77b4f7a5ea68d408d6a648511e4a98865d2742fb46') - -prepare() { - cd "$srcdir"/$pkgname-$pkgver - patch -p1 <../build-fix.patch -} - -build() { - cd "$srcdir"/$pkgname-$pkgver - ./configure --prefix=/usr --with-doc=babelweb - make - make doc - (cd gui && qmake-qt5 && make) -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install - - # GUI - install -Dm755 gui/objects/gpsbabelfe-bin "$pkgdir"/usr/bin/gpsbabelfe-bin - install -Dm644 gui/images/appicon.png "$pkgdir"/usr/share/pixmaps/gpsbabel.png - install -Dm644 gui/gpsbabel.desktop "$pkgdir"/usr/share/applications/gpsbabel.desktop - - # Header install - mkdir -p "$pkgdir"/usr/include/gpsbabel - cp *.h "$pkgdir"/usr/include/gpsbabel - - # Doc install - mkdir -p "$pkgdir"/usr/share/doc/$pkgname - cp -r babelweb/* "$pkgdir"/usr/share/doc/$pkgname/ - cp README* "$pkgdir"/usr/share/doc/$pkgname/ -} Copied: gpsbabel/repos/community-x86_64/PKGBUILD (from rev 213408, gpsbabel/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2017-02-22 05:21:36 UTC (rev 213409) @@ -0,0 +1,69 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org +# Contributor: William Rea <sillywi...@gmail.com> + +pkgname=gpsbabel +pkgver=1.5.4 +pkgrel=2 +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' 'qt5-base') +makedepends=('docbook-xsl' 'fop' 'qt5-tools') # 'qt5-webengine' +# optdepends=('qt5-webengine: run the GUI') +options=('docs') +source=("https://arch.p5n.pp.ru/~sergej/dl/gpsbabel-$pkgver.tar.gz" + "build-fix.patch" + "drop-map.patch") +sha256sums=('59e29b83a16af16556fffc9315d3d3626d11fc7f2f50d6ec1f99dfc64412989e' + '537752bd5d097d836d4d5a77b4f7a5ea68d408d6a648511e4a98865d2742fb46' + 'bee2cc0549fe9d2aacb7266520428569438c7d7e40c283722eb403676d9aef7a') + +prepare() { + cd "$srcdir"/$pkgname-$pkgver + patch -p1 <../build-fix.patch + + # Map support is currently broken + patch -p1 <../drop-map.patch + + sed -i 's|langPath_ = QApplication::applicationDirPath();|langPath_ = "/usr/share/gpsbabel";|' gui/mainwindow.cc + sed -i 's|baseFile = QApplication::applicationDirPath() |baseFile = "/usr/share/gpsbabel" |' gui/map.cc +} + +build() { + cd "$srcdir"/$pkgname-$pkgver + ./configure --prefix=/usr --with-doc=babelweb + make + make doc + + # GUI + pushd gui + qmake-qt5 + lrelease-qt5 *.ts + make + popd +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" install + + # GUI + install -Dm755 gui/objects/gpsbabelfe-bin "$pkgdir"/usr/bin/gpsbabelfe-bin + install -Dm644 gui/images/appicon.png "$pkgdir"/usr/share/pixmaps/gpsbabel.png + install -Dm644 gui/gpsbabel.desktop "$pkgdir"/usr/share/applications/gpsbabel.desktop + install -Dm644 gui/gmapbase.html "$pkgdir"/usr/share/gpsbabel/gmapbase.html + install -dm755 "$pkgdir"/usr/share/gpsbabel/translations/ + install -Dm644 gui/*.qm "$pkgdir"/usr/share/gpsbabel/translations/ + + # Header install + install -dm755 "$pkgdir"/usr/include/gpsbabel/ + install -Dm644 *.h "$pkgdir"/usr/include/gpsbabel/ + + # Doc install + install -dm755 "$pkgdir"/usr/share/doc/$pkgname/ + cp -r babelweb/* "$pkgdir"/usr/share/doc/$pkgname/ + install -Dm644 README* "$pkgdir"/usr/share/doc/$pkgname/ +} Deleted: community-x86_64/build-fix.patch =================================================================== --- community-x86_64/build-fix.patch 2017-02-22 05:21:29 UTC (rev 213408) +++ community-x86_64/build-fix.patch 2017-02-22 05:21:36 UTC (rev 213409) @@ -1,58 +0,0 @@ -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 */ - } - } Copied: gpsbabel/repos/community-x86_64/build-fix.patch (from rev 213408, gpsbabel/trunk/build-fix.patch) =================================================================== --- community-x86_64/build-fix.patch (rev 0) +++ community-x86_64/build-fix.patch 2017-02-22 05:21:36 UTC (rev 213409) @@ -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 */ + } + } Copied: gpsbabel/repos/community-x86_64/drop-map.patch (from rev 213408, gpsbabel/trunk/drop-map.patch) =================================================================== --- community-x86_64/drop-map.patch (rev 0) +++ community-x86_64/drop-map.patch 2017-02-22 05:21:36 UTC (rev 213409) @@ -0,0 +1,106 @@ +diff -Naur gpsbabel-1.5.4.orig/gui/app.pro gpsbabel-1.5.4/gui/app.pro +--- gpsbabel-1.5.4.orig/gui/app.pro 2017-01-02 06:05:19.000000000 +0100 ++++ gpsbabel-1.5.4/gui/app.pro 2017-02-22 05:52:04.650462935 +0100 +@@ -15,13 +15,7 @@ + gui \ + network \ + xml \ +- +-greaterThan(QT_MINOR_VERSION, 5) { +- QT += webenginewidgets +- DEFINES += HAVE_WEBENGINE +-} else { +- QT += webkit webkitwidgets +-} ++ widgets \ + + unix:DESTDIR = objects + unix:MOC_DIR = objects +@@ -72,13 +66,11 @@ + SOURCES += filterwidgets.cc + SOURCES += format.cc + SOURCES += formatload.cc +-SOURCES += gmapdlg.cc + SOURCES += gpx.cc + SOURCES += help.cc + SOURCES += latlng.cc + SOURCES += main.cc + SOURCES += mainwindow.cc +-SOURCES += map.cc + SOURCES += optionsdlg.cc + SOURCES += preferences.cc + SOURCES += processwait.cc +@@ -98,11 +90,9 @@ + HEADERS += filterwidgets.h + HEADERS += format.h + HEADERS += formatload.h +-HEADERS += gmapdlg.h + HEADERS += gpx.h + HEADERS += help.h + HEADERS += mainwindow.h +-HEADERS += map.h + HEADERS += optionsdlg.h + HEADERS += preferences.h + HEADERS += processwait.h +diff -Naur gpsbabel-1.5.4.orig/gui/main.cc gpsbabel-1.5.4/gui/main.cc +--- gpsbabel-1.5.4.orig/gui/main.cc 2017-01-02 06:05:19.000000000 +0100 ++++ gpsbabel-1.5.4/gui/main.cc 2017-02-22 05:20:03.449272478 +0100 +@@ -29,7 +29,6 @@ + #include <QTextCodec> + + #include "mainwindow.h" +-#include "gmapdlg.h" + + #ifdef _WIN32 + const char *pathSeparator = ";"; +diff -Naur gpsbabel-1.5.4.orig/gui/mainwindow.cc gpsbabel-1.5.4/gui/mainwindow.cc +--- gpsbabel-1.5.4.orig/gui/mainwindow.cc 2017-01-02 06:05:19.000000000 +0100 ++++ gpsbabel-1.5.4/gui/mainwindow.cc 2017-02-22 06:03:27.026789219 +0100 +@@ -38,7 +38,6 @@ + #include "donate.h" + #include "filterdlg.h" + #include "formatload.h" +-#include "gmapdlg.h" + #include "help.h" + #include "optionsdlg.h" + #include "preferences.h" +@@ -976,24 +975,6 @@ + formatList_[fidx].bumpWriteUseCount(1); + } + +- // Now output for preview in google maps +- QString tempName; +- if (babelData_.previewGmap_) { +- QTemporaryFile ftemp; +- ftemp.open(); +- tempName = ftemp.fileName(); +- ftemp.close(); +- +- // Ideally, expost this in the UI. For now, just split the track +- // if we've no recorded fixes for > 5 mins and we've moved > 300 meters. +- //args << "-x"; +- //args << "track,pack,sdistance=0.3k,split=5m"; +- +- args << "-o"; +- args << "gpx"; +- args << "-F" << tempName; +- } +- + ui_.outputWindow->clear(); + ui_.outputWindow->appendPlainText("gpsbabel " + args.join(" ")); + +@@ -1005,14 +986,6 @@ + ui_.outputWindow->appendPlainText(outputString); + if (x) { + ui_.outputWindow->appendPlainText(tr("Translation successful")); +- if (babelData_.previewGmap_) { +- this->hide(); +- GMapDialog dlg(0, tempName, babelData_.debugLevel_ >=1 ? ui_.outputWindow : 0); +- dlg.show(); +- dlg.exec(); +- QFile(tempName).remove(); +- this->show(); +- } + } + else + ui_.outputWindow->appendPlainText(tr("Error running gpsbabel: %1\n").arg(errorString));