Date: Wednesday, February 22, 2017 @ 05:21:29 Author: bgyorgy Revision: 213408
upgpkg: gpsbabel 1.5.4-2 Cleanup dependencies, enable translations, disable broken map support Added: gpsbabel/trunk/drop-map.patch Modified: gpsbabel/trunk/PKGBUILD ----------------+ PKGBUILD | 39 ++++++++++++++------ drop-map.patch | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+), 11 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-02-22 05:18:48 UTC (rev 213407) +++ PKGBUILD 2017-02-22 05:21:29 UTC (rev 213408) @@ -5,23 +5,31 @@ pkgname=gpsbabel pkgver=1.5.4 -pkgrel=1 +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' 'expat' 'qt5-base' 'qt5-webengine') -makedepends=('fop' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qt5-webkit' 'java-environment' 'docbook-xsl') -optdepends=('qt5-webkit') +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") + "build-fix.patch" + "drop-map.patch") sha256sums=('59e29b83a16af16556fffc9315d3d3626d11fc7f2f50d6ec1f99dfc64412989e' - '537752bd5d097d836d4d5a77b4f7a5ea68d408d6a648511e4a98865d2742fb46') + '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() { @@ -29,7 +37,13 @@ ./configure --prefix=/usr --with-doc=babelweb make make doc - (cd gui && qmake-qt5 && make) + + # GUI + pushd gui + qmake-qt5 + lrelease-qt5 *.ts + make + popd } package() { @@ -40,13 +54,16 @@ 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 - mkdir -p "$pkgdir"/usr/include/gpsbabel - cp *.h "$pkgdir"/usr/include/gpsbabel + install -dm755 "$pkgdir"/usr/include/gpsbabel/ + install -Dm644 *.h "$pkgdir"/usr/include/gpsbabel/ # Doc install - mkdir -p "$pkgdir"/usr/share/doc/$pkgname + install -dm755 "$pkgdir"/usr/share/doc/$pkgname/ cp -r babelweb/* "$pkgdir"/usr/share/doc/$pkgname/ - cp README* "$pkgdir"/usr/share/doc/$pkgname/ + install -Dm644 README* "$pkgdir"/usr/share/doc/$pkgname/ } Added: drop-map.patch =================================================================== --- drop-map.patch (rev 0) +++ drop-map.patch 2017-02-22 05:21:29 UTC (rev 213408) @@ -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));