[arch-commits] Commit in gpsbabel/trunk (PKGBUILD desktop-file.patch)
Date: Monday, July 13, 2020 @ 19:41:26 Author: bgyorgy Revision: 663532 Remove obsoleted patch Modified: gpsbabel/trunk/PKGBUILD Deleted: gpsbabel/trunk/desktop-file.patch + PKGBUILD |2 -- desktop-file.patch | 23 --- 2 files changed, 25 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-07-13 19:41:10 UTC (rev 663531) +++ PKGBUILD2020-07-13 19:41:26 UTC (rev 663532) @@ -14,11 +14,9 @@ makedepends=(libicns qt5-tools) source=(https://github.com/gpsbabel/$pkgname/archive/${pkgname}_${pkgver//./_}.tar.gz gpsbabel.appdata.xml -desktop-file.patch drop-map.patch) sha256sums=('30b186631fb43db576b8177385ed5c31a5a15c02a6bc07bae1e0d7af9058a797' '5eb52ab0c4bdde61c747856e849f9bce9ca660e942c15f730a4330a38fd6a39a' -'e66a786dc5592388f651f2bcabb4205809a42e0a937bb034cb469bd2cd50d1a1' 'd18fd718973cc9efc6bee95ec7741b7d63a0fd46fd9e2d281f687fd465b7c19e') prepare() { Deleted: desktop-file.patch === --- desktop-file.patch 2020-07-13 19:41:10 UTC (rev 663531) +++ desktop-file.patch 2020-07-13 19:41:26 UTC (rev 663532) @@ -1,23 +0,0 @@ -From 76c8ee6fffedbe6a5625995dc8fc9a4ae1766ab9 Mon Sep 17 00:00:00 2001 -From: tsteven4 <13596209+tstev...@users.noreply.github.com> -Date: Tue, 14 May 2019 16:50:14 -0600 -Subject: [PATCH] correct name of Exec in desktop file. (#353) - -The name of the Exec changed in -https://github.com/gpsbabel/gpsbabel/pull/310 - gui/gpsbabel.desktop | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gui/gpsbabel.desktop b/gui/gpsbabel.desktop -index 4ae452581..fe956c2b7 100644 a/gui/gpsbabel.desktop -+++ b/gui/gpsbabel.desktop -@@ -4,6 +4,6 @@ Name=GPSBabel - Comment=Qt GUI interface for GPSBabel - GenericName=GPSBabel - Icon=gpsbabel --Exec=gpsbabelfe-bin -+Exec=gpsbabelfe - Terminal=false - Categories=Geography;Education;Utility;
[arch-commits] Commit in gpsbabel/trunk (PKGBUILD drop-map.patch)
Date: Friday, July 10, 2020 @ 21:23:46 Author: bgyorgy Revision: 663201 upgpkg: gpsbabel 1.7.0-1: Update to new version Modified: gpsbabel/trunk/PKGBUILD gpsbabel/trunk/drop-map.patch + PKGBUILD | 40 drop-map.patch |8 +++- 2 files changed, 23 insertions(+), 25 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-07-10 21:18:42 UTC (rev 663200) +++ PKGBUILD2020-07-10 21:23:46 UTC (rev 663201) @@ -4,30 +4,27 @@ # Contributor: William Rea pkgname=gpsbabel -pkgver=1.6.0 -_pkgver=1_6_0 -pkgrel=3 +pkgver=1.7.0 +pkgrel=1 pkgdesc="Read, write and manipulate GPS waypoints in a variety of formats" -arch=('x86_64') +arch=(x86_64) url="https://www.gpsbabel.org/; -license=('GPL') -depends=('hicolor-icon-theme' 'libusb-compat' 'qt5-base') # 'qt5-webengine' -makedepends=('imagemagick' 'qt5-tools') -source=(https://github.com/gpsbabel/$pkgname/archive/${pkgname}_$_pkgver.tar.gz +license=(GPL) +depends=(hicolor-icon-theme libusb qt5-base) # qt5-webengine +makedepends=(libicns qt5-tools) +source=(https://github.com/gpsbabel/$pkgname/archive/${pkgname}_${pkgver//./_}.tar.gz gpsbabel.appdata.xml desktop-file.patch drop-map.patch) -sha256sums=('ad56796f725dcdb7f52d9a9509d4922f11198c382fe10fc2d6c9efa8159f2090' +sha256sums=('30b186631fb43db576b8177385ed5c31a5a15c02a6bc07bae1e0d7af9058a797' '5eb52ab0c4bdde61c747856e849f9bce9ca660e942c15f730a4330a38fd6a39a' 'e66a786dc5592388f651f2bcabb4205809a42e0a937bb034cb469bd2cd50d1a1' -'5377f1a6f0d52d93f7d604c171ce1f6b18bb389c9e4c67ff4910c4079a2696fd') +'d18fd718973cc9efc6bee95ec7741b7d63a0fd46fd9e2d281f687fd465b7c19e') prepare() { - cd $pkgname-${pkgname}_$_pkgver + icns2png -x $pkgname-${pkgname}_${pkgver//./_}/gui/images/appicon.icns - # Correct name of Exec in desktop file - # https://github.com/gpsbabel/gpsbabel/pull/353 - patch -Np1 -i ../desktop-file.patch + cd $pkgname-${pkgname}_${pkgver//./_} # Remove map due to heavy WebEngine dependency patch -Np1 -i ../drop-map.patch @@ -36,31 +33,34 @@ sed -i 's|langPath_ = QApplication::applicationDirPath();|langPath_ = "/usr/share/gpsbabel";|' gui/mainwindow.cc sed -i 's|baseFile = QApplication::applicationDirPath() + "/gmapbase.html";|baseFile = "/usr/share/gpsbabel/gmapbase.html";|' gui/map.cc - convert gui/images/appicon.png +set date:create +set date:modify -background none -gravity center -extent 512x512 gui/images/appicon.png } build() { - cd $pkgname-${pkgname}_$_pkgver + cd $pkgname-${pkgname}_${pkgver//./_} ./configure --prefix=/usr make # GUI cd gui - qmake-qt5 - lrelease-qt5 *.ts + qmake + lrelease *.ts make } package() { - cd $pkgname-${pkgname}_$_pkgver + cd $pkgname-${pkgname}_${pkgver//./_} make DESTDIR="$pkgdir" install # GUI install -Dm755 gui/objects/gpsbabelfe "$pkgdir"/usr/bin/gpsbabelfe - install -Dm644 gui/images/appicon.png "$pkgdir"/usr/share/icons/hicolor/512x512/apps/gpsbabel.png install -Dm644 gui/gpsbabel.desktop "$pkgdir"/usr/share/applications/gpsbabel.desktop install -Dm644 ../$pkgname.appdata.xml "$pkgdir/usr/share/metainfo/$pkgname.appdata.xml" 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/ + + for res in 16 32 128 256 512; do +install -Dm644 ../appicon_${res}x${res}x32.png \ + "$pkgdir/usr/share/icons/hicolor/${res}x${res}/apps/$pkgname.png" + done } Modified: drop-map.patch === --- drop-map.patch 2020-07-10 21:18:42 UTC (rev 663200) +++ drop-map.patch 2020-07-10 21:23:46 UTC (rev 663201) @@ -37,11 +37,11 @@ diff -Naur gpsbabel-gpsbabel_1_6_0.orig/gui/app.pro gpsbabel-gpsbabel_1_6_0/gui/app.pro --- gpsbabel-gpsbabel_1_6_0.orig/gui/app.pro 2019-05-02 10:26:47.0 +0200 +++ gpsbabel-gpsbabel_1_6_0/gui/app.pro2019-06-19 13:10:54.800233673 +0200 -@@ -11,14 +11,8 @@ - QT += core \ +@@ -11,14 +11,7 @@ gui \ network \ -- xml + widgets \ + xml - -qtHaveModule(webenginewidgets) { - QT += webenginewidgets webchannel @@ -49,8 +49,6 @@ -} else { - QT += webkit webkitwidgets -} -+ xml \ -+ widgets unix:DESTDIR = objects unix:MOC_DIR = objects
[arch-commits] Commit in gpsbabel/trunk (PKGBUILD desktop-file.patch)
Date: Monday, August 5, 2019 @ 18:17:47 Author: bgyorgy Revision: 497506 upgpkg: gpsbabel 1.6.0-2 Correct name of Exec in desktop file (FS#63375) Added: gpsbabel/trunk/desktop-file.patch Modified: gpsbabel/trunk/PKGBUILD + PKGBUILD |8 +++- desktop-file.patch | 23 +++ 2 files changed, 30 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-08-05 18:13:38 UTC (rev 497505) +++ PKGBUILD2019-08-05 18:17:47 UTC (rev 497506) @@ -6,7 +6,7 @@ pkgname=gpsbabel pkgver=1.6.0 _pkgver=1_6_0 -pkgrel=1 +pkgrel=2 pkgdesc="Read, write and manipulate GPS waypoints in a variety of formats" arch=('x86_64') url="https://www.gpsbabel.org/; @@ -15,14 +15,20 @@ makedepends=('imagemagick' 'qt5-tools') source=(https://github.com/gpsbabel/$pkgname/archive/${pkgname}_$_pkgver.tar.gz gpsbabel.appdata.xml +desktop-file.patch drop-map.patch) sha256sums=('ad56796f725dcdb7f52d9a9509d4922f11198c382fe10fc2d6c9efa8159f2090' '5eb52ab0c4bdde61c747856e849f9bce9ca660e942c15f730a4330a38fd6a39a' +'e66a786dc5592388f651f2bcabb4205809a42e0a937bb034cb469bd2cd50d1a1' '5377f1a6f0d52d93f7d604c171ce1f6b18bb389c9e4c67ff4910c4079a2696fd') prepare() { cd $pkgname-${pkgname}_$_pkgver + # Correct name of Exec in desktop file + # https://github.com/gpsbabel/gpsbabel/pull/353 + patch -Np1 -i ../desktop-file.patch + # Remove map due to heavy WebEngine dependency patch -Np1 -i ../drop-map.patch Added: desktop-file.patch === --- desktop-file.patch (rev 0) +++ desktop-file.patch 2019-08-05 18:17:47 UTC (rev 497506) @@ -0,0 +1,23 @@ +From 76c8ee6fffedbe6a5625995dc8fc9a4ae1766ab9 Mon Sep 17 00:00:00 2001 +From: tsteven4 <13596209+tstev...@users.noreply.github.com> +Date: Tue, 14 May 2019 16:50:14 -0600 +Subject: [PATCH] correct name of Exec in desktop file. (#353) + +The name of the Exec changed in +https://github.com/gpsbabel/gpsbabel/pull/310 +--- + gui/gpsbabel.desktop | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gui/gpsbabel.desktop b/gui/gpsbabel.desktop +index 4ae452581..fe956c2b7 100644 +--- a/gui/gpsbabel.desktop b/gui/gpsbabel.desktop +@@ -4,6 +4,6 @@ Name=GPSBabel + Comment=Qt GUI interface for GPSBabel + GenericName=GPSBabel + Icon=gpsbabel +-Exec=gpsbabelfe-bin ++Exec=gpsbabelfe + Terminal=false + Categories=Geography;Education;Utility;
[arch-commits] Commit in gpsbabel/trunk (PKGBUILD gpsbabel.appdata.xml)
Date: Saturday, December 29, 2018 @ 17:03:19 Author: bgyorgy Revision: 418857 upgpkg: gpsbabel 1.5.4-5 Add AppStream metadata Added: gpsbabel/trunk/gpsbabel.appdata.xml Modified: gpsbabel/trunk/PKGBUILD --+ PKGBUILD | 13 + gpsbabel.appdata.xml | 19 +++ 2 files changed, 28 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-12-29 17:02:42 UTC (rev 418856) +++ PKGBUILD2018-12-29 17:03:19 UTC (rev 418857) @@ -6,19 +6,21 @@ pkgname=gpsbabel pkgver=1.5.4 _pkgver=1_5_4 -pkgrel=4 +pkgrel=5 pkgdesc="Read, write and manipulate GPS waypoints in a variety of formats" arch=('x86_64') url="https://www.gpsbabel.org/; license=('GPL') -depends=('libusb-compat' 'qt5-base') # 'qt5-webengine' -makedepends=('qt5-tools') +depends=('hicolor-icon-theme' 'libusb-compat' 'qt5-base') # 'qt5-webengine' +makedepends=('imagemagick' 'qt5-tools') source=(https://github.com/gpsbabel/$pkgname/archive/${pkgname}_$_pkgver.tar.gz +gpsbabel.appdata.xml build-fix.patch drop-map.patch fix-map.patch 0008-Correctly-read-diff-and-terr-from-geo-format.patch) sha256sums=('8cd740db0b92610abff71e942e8a987df58cd6ca5f25cca86e15f2b00e190704' +'5eb52ab0c4bdde61c747856e849f9bce9ca660e942c15f730a4330a38fd6a39a' '537752bd5d097d836d4d5a77b4f7a5ea68d408d6a648511e4a98865d2742fb46' '69b4fad0bc5b33e332dc79c1c65482f942bf5a596b2d82b3d6a565cdd444b6ee' 'e00530f3b40a6c516cb45c59bbdfd5f4a801f7bb55e02205e7fc975c262db3a1' @@ -42,6 +44,8 @@ # Fix path sed -i 's|langPath_ = QApplication::applicationDirPath();|langPath_ = "/usr/share/gpsbabel";|' gui/mainwindow.cc # sed -i 's|baseFile = QApplication::applicationDirPath() + "/gmapbase.html";|baseFile = "/usr/share/gpsbabel/gmapbase.html";|' gui/map.cc + + convert gui/images/appicon.png +set date:create +set date:modify -background none -gravity center -extent 512x512 gui/images/appicon.png } build() { @@ -62,8 +66,9 @@ # 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/images/appicon.png "$pkgdir"/usr/share/icons/hicolor/512x512/apps/gpsbabel.png install -Dm644 gui/gpsbabel.desktop "$pkgdir"/usr/share/applications/gpsbabel.desktop + install -Dm644 ../$pkgname.appdata.xml "$pkgdir/usr/share/metainfo/$pkgname.appdata.xml" # 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/ Added: gpsbabel.appdata.xml === --- gpsbabel.appdata.xml(rev 0) +++ gpsbabel.appdata.xml2018-12-29 17:03:19 UTC (rev 418857) @@ -0,0 +1,19 @@ + + + org.gpsbabel.gpsbabel + gpsbabel.desktop + GPSBabel + Qt GUI interface for GPSBabel + CC0-1.0 + GPL-2.0 + +GPSBabel converts waypoints, tracks, and routes between popular GPS receivers such as Garmin or Magellan and mapping programs like Google Earth or Basecamp. Literally hundreds of GPS receivers and programs are supported. It also has powerful manipulation tools for such data. such as filtering duplicates points or simplifying tracks. + + + + https://screenshots.debian.net/screenshots/000/015/197/large.png + + + https://github.com/gpsbabel/gpsbabel/issues + https://www.gpsbabel.org/ +
[arch-commits] Commit in gpsbabel/trunk (PKGBUILD)
Date: Friday, January 12, 2018 @ 13:51:10 Author: bgyorgy Revision: 281581 gpsbabel: Some minor changes Modified: gpsbabel/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-01-12 13:37:02 UTC (rev 281580) +++ PKGBUILD2018-01-12 13:51:10 UTC (rev 281581) @@ -8,7 +8,7 @@ pkgver=1.5.4 _pkgver=1_5_4 pkgrel=3 -pkgdesc="Read, write, and manipulate GPS waypoints in a variety of formats" +pkgdesc="Read, write and manipulate GPS waypoints in a variety of formats" arch=('x86_64') url="https://www.gpsbabel.org/; license=('GPL') @@ -15,8 +15,8 @@ depends=('libusb-compat' 'qt5-base') # 'qt5-webengine' makedepends=('qt5-tools') source=(https://github.com/gpsbabel/$pkgname/archive/${pkgname}_$_pkgver.tar.gz - build-fix.patch - drop-map.patch +build-fix.patch +drop-map.patch fix-map.patch) sha256sums=('8cd740db0b92610abff71e942e8a987df58cd6ca5f25cca86e15f2b00e190704' '537752bd5d097d836d4d5a77b4f7a5ea68d408d6a648511e4a98865d2742fb46'
[arch-commits] Commit in gpsbabel/trunk (PKGBUILD drop-map.patch fix-map.patch)
Date: Friday, January 12, 2018 @ 13:19:55 Author: bgyorgy Revision: 281571 upgpkg: gpsbabel 1.5.4-3 Adopt the package, use upstream source, remove unneeded headers and broken documentation Added: gpsbabel/trunk/fix-map.patch Modified: gpsbabel/trunk/PKGBUILD gpsbabel/trunk/drop-map.patch + PKGBUILD | 65 - drop-map.patch | 54 + fix-map.patch | 2183 +++ 3 files changed, 2259 insertions(+), 43 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-01-12 13:19:24 UTC (rev 281570) +++ PKGBUILD2018-01-12 13:19:55 UTC (rev 281571) @@ -1,53 +1,59 @@ # $Id$ -# Maintainer: Sergej Pupykin+# Maintainer: Balló György +# Contributor: Sergej Pupykin # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea pkgname=gpsbabel pkgver=1.5.4 -pkgrel=2 -pkgdesc="Reads, writes, and manipulates GPS waypoints in a variety of formats" +_pkgver=1_5_4 +pkgrel=3 +pkgdesc="Read, write, and manipulate GPS waypoints in a variety of formats" arch=('x86_64') -url="http://www.gpsbabel.org; +url="https://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' +depends=('libusb-compat' 'qt5-base') # 'qt5-webengine' +makedepends=('qt5-tools') +source=(https://github.com/gpsbabel/$pkgname/archive/${pkgname}_$_pkgver.tar.gz + build-fix.patch + drop-map.patch +fix-map.patch) +sha256sums=('8cd740db0b92610abff71e942e8a987df58cd6ca5f25cca86e15f2b00e190704' '537752bd5d097d836d4d5a77b4f7a5ea68d408d6a648511e4a98865d2742fb46' -'bee2cc0549fe9d2aacb7266520428569438c7d7e40c283722eb403676d9aef7a') +'69b4fad0bc5b33e332dc79c1c65482f942bf5a596b2d82b3d6a565cdd444b6ee' +'e00530f3b40a6c516cb45c59bbdfd5f4a801f7bb55e02205e7fc975c262db3a1') prepare() { - cd "$srcdir"/$pkgname-$pkgver - patch -p1 <../build-fix.patch + cd $pkgname-${pkgname}_$_pkgver - # Map support is currently broken - patch -p1 <../drop-map.patch + # Fix build + patch -Np1 -i ../build-fix.patch + # Drop map + patch -Np1 -i ../drop-map.patch + + # Fix map + # patch -Np1 -i ../fix-map.patch + + # Fix path 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 + # sed -i 's|baseFile = QApplication::applicationDirPath() + "/gmapbase.html";|baseFile = "/usr/share/gpsbabel/gmapbase.html";|' gui/map.cc } build() { - cd "$srcdir"/$pkgname-$pkgver - ./configure --prefix=/usr --with-doc=babelweb + cd $pkgname-${pkgname}_$_pkgver + ./configure --prefix=/usr make - make doc # GUI - pushd gui + cd gui qmake-qt5 lrelease-qt5 *.ts make - popd } package() { - cd "$srcdir"/$pkgname-$pkgver + cd $pkgname-${pkgname}_$_pkgver make DESTDIR="$pkgdir" install # GUI @@ -54,16 +60,7 @@ 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 -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/ } Modified: drop-map.patch === --- drop-map.patch 2018-01-12 13:19:24 UTC (rev 281570) +++ drop-map.patch 2018-01-12 13:19:55 UTC (rev 281571) @@ -1,6 +1,42 @@ -diff -Naur gpsbabel-1.5.4.orig/gui/app.pro gpsbabel-1.5.4/gui/app.pro gpsbabel-1.5.4.orig/gui/app.pro2017-01-02 06:05:19.0 +0100 -+++ gpsbabel-1.5.4/gui/app.pro 2017-02-22 05:52:04.650462935 +0100 +diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advdlg.cc gpsbabel-gpsbabel_1_5_4/gui/advdlg.cc +--- gpsbabel-gpsbabel_1_5_4.orig/gui/advdlg.cc 2017-01-02 06:05:19.0 +0100
[arch-commits] Commit in gpsbabel/trunk (PKGBUILD drop-map.patch)
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 === --- PKGBUILD2017-02-22 05:18:48 UTC (rev 213407) +++ PKGBUILD2017-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.pro2017-01-02 06:05:19.0 +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.cc2017-01-02 06:05:19.0 +0100 gpsbabel-1.5.4/gui/main.cc 2017-02-22 05:20:03.449272478 +0100 +@@ -29,7 +29,6 @@ + #include + + #include "mainwindow.h" +-#include "gmapdlg.h" + + #ifdef _WIN32 + const char *pathSeparator = ";"; +diff -Naur
[arch-commits] Commit in gpsbabel/trunk (PKGBUILD build-fix.patch)
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 === --- PKGBUILD2017-02-16 12:02:23 UTC (rev 212574) +++ PKGBUILD2017-02-16 13:42:12 UTC (rev 212575) @@ -4,21 +4,28 @@ # Contributor: William Reapkgname=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.0 +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 =
[arch-commits] Commit in gpsbabel/trunk (PKGBUILD)
Date: Monday, November 14, 2016 @ 15:49:06 Author: spupykin Revision: 195724 Modified: gpsbabel/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-11-14 15:48:30 UTC (rev 195723) +++ PKGBUILD2016-11-14 15:49:06 UTC (rev 195724) @@ -14,8 +14,8 @@ makedepends=('fop' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qt5-webkit' 'java-environment' 'docbook-xsl') optdepends=('qt5-webkit') options=('docs') -source=("http://arch.p5n.pp.ru/~sergej/dl/gpsbabel-$pkgver.tar.gz;) -md5sums=('2ff4dd37aba85e0211fd818d653f5943') +source=("https://arch.p5n.pp.ru/~sergej/dl/gpsbabel-$pkgver.tar.gz;) +sha256sums=('7599beb312488a96d8b8e646c357fbc122970522a7c9ae0a2777862a0ef39351') build() { cd "$srcdir"
[arch-commits] Commit in gpsbabel/trunk (PKGBUILD)
Date: Tuesday, January 12, 2016 @ 19:20:57 Author: spupykin Revision: 156180 upgpkg: gpsbabel 1.5.3-1 upd Modified: gpsbabel/trunk/PKGBUILD --+ PKGBUILD | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-01-12 17:07:04 UTC (rev 156179) +++ PKGBUILD2016-01-12 18:20:57 UTC (rev 156180) @@ -4,29 +4,29 @@ # Contributor: William Reapkgname=gpsbabel -pkgver=1.5.2 -pkgrel=2 +pkgver=1.5.3 +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' 'qt4') -makedepends=('fop' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit' 'java-environment' 'docbook-xsl') -optdepends=('qtwebkit') +depends=('libusb-compat' 'expat' 'qt5-base') +makedepends=('fop' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qt5-webkit' 'java-environment' 'docbook-xsl') +optdepends=('qt5-webkit') options=('docs') source=("http://arch.p5n.pp.ru/~sergej/dl/gpsbabel-$pkgver.tar.gz;) -md5sums=('a5f04f0b32554567118bbac1f4dbb379') +md5sums=('2ff4dd37aba85e0211fd818d653f5943') build() { - cd $srcdir/gpsbabel-$pkgver - ./configure --prefix=/usr + cd $srcdir + ./configure --prefix=/usr --with-doc=babelweb make make doc - (cd gui && qmake-qt4 && make) + (cd gui && qmake-qt5 && make) } package() { - cd $srcdir/gpsbabel-$pkgver + cd $srcdir make DESTDIR=$pkgdir install # GUI
[arch-commits] Commit in gpsbabel/trunk (PKGBUILD)
Date: Sunday, December 6, 2015 @ 21:47:35 Author: allan Revision: 149199 C++11 ABI rebuild Modified: gpsbabel/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-12-06 20:46:35 UTC (rev 149198) +++ PKGBUILD2015-12-06 20:47:35 UTC (rev 149199) @@ -5,7 +5,7 @@ pkgname=gpsbabel pkgver=1.5.2 -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;
[arch-commits] Commit in gpsbabel/trunk (PKGBUILD)
Date: Monday, February 2, 2015 @ 15:05:42 Author: spupykin Revision: 126988 upgpkg: gpsbabel 1.5.2-1 upd Modified: gpsbabel/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-02-02 11:32:24 UTC (rev 126987) +++ PKGBUILD2015-02-02 14:05:42 UTC (rev 126988) @@ -4,8 +4,8 @@ # Contributor: William Rea sillywi...@gmail.com pkgname=gpsbabel -pkgver=1.5.1 -pkgrel=2 +pkgver=1.5.2 +pkgrel=1 pkgdesc=Reads, writes, and manipulates GPS waypoints in a variety of formats arch=('i686' 'x86_64') url=http://www.gpsbabel.org; @@ -14,8 +14,8 @@ makedepends=('fop' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit' 'java-environment' 'docbook-xsl') optdepends=('qtwebkit') options=('docs') -source=(http://arch.p5n.pp.ru/~sergej/dl/2014/gpsbabel-$pkgver.tar.gz;) -md5sums=('0016c6313b3a5b97afd8d1d8f23abbe1') +source=(http://arch.p5n.pp.ru/~sergej/dl/gpsbabel-$pkgver.tar.gz;) +md5sums=('a5f04f0b32554567118bbac1f4dbb379') build() { cd $srcdir/gpsbabel-$pkgver
[arch-commits] Commit in gpsbabel/trunk (PKGBUILD)
Date: Monday, June 16, 2014 @ 13:33:02 Author: spupykin Revision: 113231 upgpkg: gpsbabel 1.5.1-2 upd Modified: gpsbabel/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-06-16 11:25:54 UTC (rev 113230) +++ PKGBUILD2014-06-16 11:33:02 UTC (rev 113231) @@ -5,14 +5,14 @@ pkgname=gpsbabel pkgver=1.5.1 -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') -makedepends=('fop' 'qt4' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit' 'java-environment' 'docbook-xsl') -optdepends=('qt4' 'qtwebkit') +depends=('libusb-compat' 'expat' 'qt4') +makedepends=('fop' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit' 'java-environment' 'docbook-xsl') +optdepends=('qtwebkit') options=('docs') source=(http://arch.p5n.pp.ru/~sergej/dl/2014/gpsbabel-$pkgver.tar.gz;) md5sums=('0016c6313b3a5b97afd8d1d8f23abbe1')
[arch-commits] Commit in gpsbabel/trunk (PKGBUILD)
Date: Wednesday, May 21, 2014 @ 16:03:46 Author: spupykin Revision: 111626 upgpkg: gpsbabel 1.5.1-1 upd Modified: gpsbabel/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-05-21 10:41:38 UTC (rev 111625) +++ PKGBUILD2014-05-21 14:03:46 UTC (rev 111626) @@ -4,7 +4,7 @@ # Contributor: William Rea sillywi...@gmail.com pkgname=gpsbabel -pkgver=1.5.0 +pkgver=1.5.1 pkgrel=1 pkgdesc=Reads, writes, and manipulates GPS waypoints in a variety of formats arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ optdepends=('qt4' 'qtwebkit') options=('docs') source=(http://arch.p5n.pp.ru/~sergej/dl/2014/gpsbabel-$pkgver.tar.gz;) -md5sums=('fe536f1e091522a4bb0676700f195187') +md5sums=('0016c6313b3a5b97afd8d1d8f23abbe1') build() { cd $srcdir/gpsbabel-$pkgver
[arch-commits] Commit in gpsbabel/trunk (PKGBUILD)
Date: Wednesday, April 16, 2014 @ 12:40:29 Author: spupykin Revision: 109583 upgpkg: gpsbabel 1.5.0-1 upd Modified: gpsbabel/trunk/PKGBUILD --+ PKGBUILD | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-04-16 10:39:57 UTC (rev 109582) +++ PKGBUILD2014-04-16 10:40:29 UTC (rev 109583) @@ -4,8 +4,8 @@ # Contributor: William Rea sillywi...@gmail.com pkgname=gpsbabel -pkgver=1.4.4 -pkgrel=2 +pkgver=1.5.0 +pkgrel=1 pkgdesc=Reads, writes, and manipulates GPS waypoints in a variety of formats arch=('i686' 'x86_64') url=http://www.gpsbabel.org; @@ -14,8 +14,8 @@ makedepends=('fop' 'qt4' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit' 'java-environment' 'docbook-xsl') optdepends=('qt4' 'qtwebkit') options=('docs') -source=(gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz;) -md5sums=('6c4c8f0cb9fcf9f8302585148878f174') +source=(http://arch.p5n.pp.ru/~sergej/dl/2014/gpsbabel-$pkgver.tar.gz;) +md5sums=('fe536f1e091522a4bb0676700f195187') build() { cd $srcdir/gpsbabel-$pkgver @@ -22,7 +22,7 @@ ./configure --prefix=/usr make make doc - (cd gui qmake make) + (cd gui qmake-qt4 make) } package() { @@ -36,8 +36,7 @@ # Header install mkdir -p $pkgdir/usr/include/gpsbabel - cp {defs.h,queue.h,gbtypes.h,filterdefs.h,cet.h,cet_util.h,garmin_tables.h} \ - $pkgdir/usr/include/gpsbabel + cp *.h $pkgdir/usr/include/gpsbabel # Doc install mkdir -p $pkgdir/usr/share/doc/$pkgname
[arch-commits] Commit in gpsbabel/trunk (PKGBUILD)
Date: Tuesday, February 26, 2013 @ 18:03:56 Author: spupykin Revision: 84994 upgpkg: gpsbabel 1.4.4-2 upd Modified: gpsbabel/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-02-26 17:03:54 UTC (rev 84993) +++ PKGBUILD2013-02-26 17:03:56 UTC (rev 84994) @@ -11,7 +11,7 @@ url=http://www.gpsbabel.org; license=('GPL') depends=('libusb-compat' 'expat') -makedepends=('fop' 'qt4' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit' 'java-environment=6' 'docbook-xsl') +makedepends=('fop' 'qt4' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit' 'java-environment' 'docbook-xsl') optdepends=('qt4' 'qtwebkit') options=('docs') source=(gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz;)