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 =================================================================== --- PKGBUILD 2020-07-10 21:18:42 UTC (rev 663200) +++ PKGBUILD 2020-07-10 21:23:46 UTC (rev 663201) @@ -4,30 +4,27 @@ # Contributor: William Rea <sillywi...@gmail.com> 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.000000000 +0200 +++ gpsbabel-gpsbabel_1_6_0/gui/app.pro 2019-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