[arch-commits] Commit in gpsbabel/repos (6 files)
Sergej Pupykin
spupykin at archlinux.org
Thu Feb 16 13:42:31 UTC 2017
Date: Thursday, February 16, 2017 @ 13:42:30
Author: spupykin
Revision: 212576
archrelease: copy trunk to community-i686, community-x86_64
Added:
gpsbabel/repos/community-i686/PKGBUILD
(from rev 212575, gpsbabel/trunk/PKGBUILD)
gpsbabel/repos/community-i686/build-fix.patch
(from rev 212575, gpsbabel/trunk/build-fix.patch)
gpsbabel/repos/community-x86_64/PKGBUILD
(from rev 212575, gpsbabel/trunk/PKGBUILD)
gpsbabel/repos/community-x86_64/build-fix.patch
(from rev 212575, gpsbabel/trunk/build-fix.patch)
Deleted:
gpsbabel/repos/community-i686/PKGBUILD
gpsbabel/repos/community-x86_64/PKGBUILD
----------------------------------+
/PKGBUILD | 104 +++++++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 45 ----------------
community-i686/build-fix.patch | 58 ++++++++++++++++++++
community-x86_64/PKGBUILD | 45 ----------------
community-x86_64/build-fix.patch | 58 ++++++++++++++++++++
5 files changed, 220 insertions(+), 90 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-02-16 13:42:12 UTC (rev 212575)
+++ community-i686/PKGBUILD 2017-02-16 13:42:30 UTC (rev 212576)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgname=gpsbabel
-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' '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=('2ff4dd37aba85e0211fd818d653f5943')
-
-build() {
- cd $srcdir
- ./configure --prefix=/usr --with-doc=babelweb
- make
- make doc
- (cd gui && qmake-qt5 && make)
-}
-
-package() {
- cd $srcdir
- 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 $srcdir/babelweb/* $pkgdir/usr/share/doc/$pkgname/
- cp README* $pkgdir/usr/share/doc/$pkgname/
-}
Copied: gpsbabel/repos/community-i686/PKGBUILD (from rev 212575, gpsbabel/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-02-16 13:42:30 UTC (rev 212576)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
+# Contributor: William Rea <sillywilly at 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/build-fix.patch (from rev 212575, gpsbabel/trunk/build-fix.patch)
===================================================================
--- community-i686/build-fix.patch (rev 0)
+++ community-i686/build-fix.patch 2017-02-16 13:42:30 UTC (rev 212576)
@@ -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 */
+ }
+ }
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-02-16 13:42:12 UTC (rev 212575)
+++ community-x86_64/PKGBUILD 2017-02-16 13:42:30 UTC (rev 212576)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgname=gpsbabel
-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' '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=('2ff4dd37aba85e0211fd818d653f5943')
-
-build() {
- cd $srcdir
- ./configure --prefix=/usr --with-doc=babelweb
- make
- make doc
- (cd gui && qmake-qt5 && make)
-}
-
-package() {
- cd $srcdir
- 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 $srcdir/babelweb/* $pkgdir/usr/share/doc/$pkgname/
- cp README* $pkgdir/usr/share/doc/$pkgname/
-}
Copied: gpsbabel/repos/community-x86_64/PKGBUILD (from rev 212575, gpsbabel/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-02-16 13:42:30 UTC (rev 212576)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
+# Contributor: William Rea <sillywilly at 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/build-fix.patch (from rev 212575, gpsbabel/trunk/build-fix.patch)
===================================================================
--- community-x86_64/build-fix.patch (rev 0)
+++ community-x86_64/build-fix.patch 2017-02-16 13:42:30 UTC (rev 212576)
@@ -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 */
+ }
+ }
More information about the arch-commits
mailing list