* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/, sci-geosciences/gpsbabel/files/
@ 2017-01-21 16:14 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2017-01-21 16:14 UTC (permalink / raw
To: gentoo-commits
commit: 7eadc62d590350189b07428c49914e2c54e68a03
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 01:00:31 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 21 16:11:58 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eadc62d
sci-geosciences/gpsbabel: 1.5.4 version bump, EAPI 6 and Qt5
Gentoo-bug: 421699, 518392
Rebased all patches, unbundled zlib[minizip].
Restrict tests - some fail, some require network connection, wrong path...
Package-Manager: portage-2.3.0
sci-geosciences/gpsbabel/Manifest | 1 +
...psbabel-1.5.4-disable_statistic_uploading.patch | 11 ++
.../gpsbabel-1.5.4-disable_update_check.patch | 108 +++++++++++++++++++
.../gpsbabel-1.5.4-disable_version_check.patch | 45 ++++++++
.../files/gpsbabel-1.5.4-use_system_shapelib.patch | 68 ++++++++++++
.../files/gpsbabel-1.5.4-use_system_zlib.patch | 80 ++++++++++++++
.../gpsbabel/files/gpsbabel-1.5.4-xmldoc.patch | 13 +++
sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild | 117 +++++++++++++++++++++
8 files changed, 443 insertions(+)
diff --git a/sci-geosciences/gpsbabel/Manifest b/sci-geosciences/gpsbabel/Manifest
index 6d4d414..e7520da 100644
--- a/sci-geosciences/gpsbabel/Manifest
+++ b/sci-geosciences/gpsbabel/Manifest
@@ -1,3 +1,4 @@
DIST gpsbabel-1.4.3.tar.gz 5616398 SHA256 c9b81ebbd65a34e7fe741c18985c1ead65123fd09fa0ecbf882bc47a87c4f5d8 SHA512 4e0e5c6bb04a55a4ed809a769bbcf6eb61bdc115cbf24745d8ce51875d7e1044129a8c7249f560c652626317f44a56efb2eb2da4c2d564996793b0aa75e0cf75 WHIRLPOOL 70fe1f7a486bab21f04d2cd328ae49466f442b1a8532d4cdc33e4fd6fce2ef9d9c38caa76a6db7ee9fc4d462f502776bb05b67105f308369604ec1c75552c917
DIST gpsbabel-1.4.4.tar.gz 7811264 SHA256 9dd2a06e887cb286c9a07164a8f2ede11aed1147e6419007370c528412321944 SHA512 07b12dfe2127a399d973fa793fe3437cbda8f3425f3317100767b7fda549d9ea6bdda1429822ade671e219c99d95bc7feb16a8d177779b457aafb373141c515a WHIRLPOOL 576c60b0868648500552b4058c385af7912d0eaf1f63541cbcdf568c5dc96f46a5f204a981e525eced267a2060aeb4f04935ae45f67f0236c03f57f3a52bfaf9
+DIST gpsbabel-1.5.4.tar.gz 9099765 SHA256 59e29b83a16af16556fffc9315d3d3626d11fc7f2f50d6ec1f99dfc64412989e SHA512 5fdc3bc07ad52d6c1e3532b287dcb506aba612ae9bc8db393b4837d79d773d6e22ad31f8f8e65770ec52b1afbda556e452af20dada1e411de93ca6e18054225b WHIRLPOOL a3de57048f43582fa64b85a3d37de5d378226842c7eca634f4334481f3dbbc99cee8b9d14bccb949fdc1976116a5b9bcc6318033138501e197c44b48cc244aec
DIST gpsbabel.org-style3.css 2171 SHA256 3f87b917e014e94562b44070c2b885abeef56e6459ce08d2cac785db197964ff SHA512 33b843e0431de6d71a83c58da35ede28435e5a4746f59e52350c6e4451659e1b443d3c0dd52df1c68001e9937787820fb96afc363ec1ae7d23430bfed31dbc83 WHIRLPOOL 419e1b8c386e3cbf96247ec231873bb0263e35e540451dfcda50e6c6f6452cef03825f527e3c970e452600d869721260e7970dabbe89070b9117d09c95da815a
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_statistic_uploading.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_statistic_uploading.patch
new file mode 100644
index 00000000..b65413c
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_statistic_uploading.patch
@@ -0,0 +1,11 @@
+--- a/gui/babeldata.h 2017-01-02 06:05:19.000000000 +0100
++++ b/gui/babeldata.h 2017-01-21 00:33:30.858046004 +0100
+@@ -64,7 +64,7 @@
+ upgradeOffers_(0),
+ runCount_(0),
+ startupVersionCheck_(true),
+- reportStatistics_(true),
++ reportStatistics_(false),
+ allowBetaUpgrades_(false),
+ ignoreVersionMismatch_(false),
+ disableDonateDialog_(false),
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_update_check.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_update_check.patch
new file mode 100644
index 00000000..b618106
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_update_check.patch
@@ -0,0 +1,108 @@
+Disable check for newer versions on start.
+
+--- a/gui/preferences.ui 2017-01-02 06:05:19.000000000 +0100
++++ b/gui/preferences.ui 2017-01-21 00:38:44.929972188 +0100
+@@ -40,13 +40,6 @@
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <item>
+- <widget class="QCheckBox" name="startupCheck">
+- <property name="text">
+- <string>Check for newer version on start.</string>
+- </property>
+- </widget>
+- </item>
+- <item>
+ <widget class="QCheckBox" name="reportStatisticsCheck">
+ <property name="text">
+ <string>Anonymously report usage data.</string>
+--- a/gui/preferences.cc 2017-01-02 06:05:19.000000000 +0100
++++ b/gui/preferences.cc 2017-01-21 00:39:20.648418701 +0100
+@@ -39,7 +39,6 @@
+ {
+ ui_.setupUi(this);
+
+- ui_.startupCheck->setChecked(babelData_.startupVersionCheck_);
+ ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_);
+ ui_.ignoreVersionMismatchCheck->setChecked(babelData_.ignoreVersionMismatch_);
+ // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1.
+@@ -82,7 +81,6 @@
+ formatList_[i].setHidden(item->checkState() == Qt::Unchecked);
+ }
+
+- babelData_.startupVersionCheck_ = ui_.startupCheck->isChecked();
+ babelData_.reportStatistics_ = ui_.reportStatisticsCheck->isChecked();
+ babelData_.ignoreVersionMismatch_ = ui_.ignoreVersionMismatchCheck->isChecked();
+ accept();
+--- a/gui/babeldata.h 2017-01-21 00:33:30.858046004 +0100
++++ b/gui/babeldata.h 2017-01-21 00:40:03.888959247 +0100
+@@ -63,7 +63,7 @@
+ upgradeErrors_(0),
+ upgradeOffers_(0),
+ runCount_(0),
+- startupVersionCheck_(true),
++ startupVersionCheck_(false),
+ reportStatistics_(false),
+ allowBetaUpgrades_(false),
+ ignoreVersionMismatch_(false),
+--- a/gui/mainwinui.ui 2017-01-02 06:05:19.000000000 +0100
++++ b/gui/mainwinui.ui 2017-01-21 00:40:40.453416335 +0100
+@@ -637,7 +637,6 @@
+ <addaction name="actionHelp"/>
+ <addaction name="separator"/>
+ <addaction name="actionAbout"/>
+- <addaction name="actionUpgradeCheck"/>
+ <addaction name="separator"/>
+ <addaction name="actionVisit_Website"/>
+ <addaction name="actionMake_a_Donation"/>
+@@ -666,11 +665,6 @@
+ <string>Preferences...</string>
+ </property>
+ </action>
+- <action name="actionUpgradeCheck">
+- <property name="text">
+- <string>Check for Upgrade</string>
+- </property>
+- </action>
+ <action name="actionVisit_Website">
+ <property name="text">
+ <string>Visit Website...</string>
+--- a/gui/mainwindow.cc 2017-01-02 06:05:19.000000000 +0100
++++ b/gui/mainwindow.cc 2017-01-21 00:42:02.939447485 +0100
+@@ -147,7 +147,6 @@
+ connect(ui_.actionAbout, SIGNAL(triggered()), this, SLOT(aboutActionX()));
+ connect(ui_.actionVisit_Website, SIGNAL(triggered()), this, SLOT(visitWebsiteActionX()));
+ connect(ui_.actionMake_a_Donation, SIGNAL(triggered()), this, SLOT(donateActionX()));
+- connect(ui_.actionUpgradeCheck, SIGNAL(triggered()), this, SLOT(upgradeCheckActionX()));
+ connect(ui_.actionPreferences, SIGNAL(triggered()), this, SLOT(preferencesActionX()));
+
+ connect(ui_.inputFormatCombo, SIGNAL(currentIndexChanged(int)),
+@@ -208,17 +208,6 @@
+ restoreSettings();
+
+ upgrade = new UpgradeCheck(parent, formatList_, babelData_);
+- if (babelData_.startupVersionCheck_) {
+- upgrade->checkForUpgrade(babelVersion_, babelData_.upgradeCheckTime_,
+- allowBetaUpgrades());
+- }
+-
+- if (!babelData_.ignoreVersionMismatch_ && babelVersion_ != VERSION) {
+- VersionMismatch vm(0, babelVersion_, QString(VERSION));
+-
+- vm.exec();
+- babelData_.ignoreVersionMismatch_ = vm.neverAgain();
+- }
+ }
+
+ //------------------------------------------------------------------------
+@@ -1021,10 +1010,6 @@
+ //------------------------------------------------------------------------
+ void MainWindow::closeActionX()
+ {
+- QDateTime wt= upgrade->getUpgradeWarningTime();
+- if (wt.isValid()) {
+- babelData_.upgradeCheckTime_ = wt;
+- }
+ babelData_.runCount_++;
+
+ QDateTime now = QDateTime::currentDateTime();
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_version_check.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_version_check.patch
new file mode 100644
index 00000000..e9d56d0
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_version_check.patch
@@ -0,0 +1,45 @@
+--- a/gui/preferences.ui 2017-01-21 00:38:44.929972188 +0100
++++ b/gui/preferences.ui 2017-01-21 00:50:05.314477610 +0100
+@@ -46,13 +46,6 @@
+ </property>
+ </widget>
+ </item>
+- <item>
+- <widget class="QCheckBox" name="ignoreVersionMismatchCheck">
+- <property name="text">
+- <string>Ignore mismatch between command line and GUI version.</string>
+- </property>
+- </widget>
+- </item>
+ </layout>
+ </widget>
+ </widget>
+--- a/gui/preferences.cc 2017-01-21 00:39:20.648418701 +0100
++++ b/gui/preferences.cc 2017-01-21 00:50:33.451829352 +0100
+@@ -40,7 +40,6 @@
+ ui_.setupUi(this);
+
+ ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_);
+- ui_.ignoreVersionMismatchCheck->setChecked(babelData_.ignoreVersionMismatch_);
+ // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1.
+ if (VERSION == QString("1.4.1"))
+ babelData_.ignoreVersionMismatch_ = false;
+@@ -82,7 +81,6 @@
+ }
+
+ babelData_.reportStatistics_ = ui_.reportStatisticsCheck->isChecked();
+- babelData_.ignoreVersionMismatch_ = ui_.ignoreVersionMismatchCheck->isChecked();
+ accept();
+ }
+
+--- a/gui/babeldata.h 2017-01-21 00:40:03.888959247 +0100
++++ b/gui/babeldata.h 2017-01-21 00:51:05.753233149 +0100
+@@ -66,7 +66,7 @@
+ startupVersionCheck_(false),
+ reportStatistics_(false),
+ allowBetaUpgrades_(false),
+- ignoreVersionMismatch_(false),
++ ignoreVersionMismatch_(true),
+ disableDonateDialog_(false),
+ donateSplashed_(QDateTime(QDate(2010, 1, 1), QTime(0, 0, 0)))
+ {
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_shapelib.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_shapelib.patch
new file mode 100644
index 00000000..d3a4fa0
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_shapelib.patch
@@ -0,0 +1,68 @@
+--- a/configure.in 2017-01-02 06:05:19.000000000 +0100
++++ b/configure.in 2017-01-21 00:26:02.239786037 +0100
+@@ -402,7 +402,7 @@
+ AC_SUBST(QT_SYSINC_OPT)
+ AC_SUBST(QT_LIBS)
+
+-AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile shapelib/Makefile zlib/empty])
++AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile zlib/empty])
+ AC_CONFIG_FILES([gui/makelinuxdist.sh], [chmod +x gui/makelinuxdist.sh])
+ AC_OUTPUT
+
+--- a/Makefile.in 2017-01-02 06:05:19.000000000 +0100
++++ b/Makefile.in 2017-01-21 00:29:05.715731486 +0100
+@@ -100,7 +100,7 @@
+ # Extra modules in Jeeps that we don't use
+ # jeeps/gpsfmt.o jeeps/gpsinput.o jeeps/gpsproj.o
+
+-SHAPE=shapelib/shpopen.o shapelib/dbfopen.o shapelib/safileio.o
++SHAPE=-lshp
+
+ MINIZIP=zlib/contrib/minizip/zip.o \
+ zlib/contrib/minizip/ioapi.o
+@@ -119,7 +119,7 @@
+ src/core/xmlstreamwriter.o \
+ src/core/usasciicodec.o\
+ src/core/ziparchive.o \
+- $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS)
++ $(GARMIN) $(JEEPS) @ZLIB@ $(FMTS) $(FILTERS)
+ OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@
+
+ DEPFILES = $(OBJS:.o=.d)
+@@ -148,10 +148,10 @@
+ all: gpsbabel$(EXEEXT)
+
+ gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@
+- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
+
+ gpsbabel-debug: $(OBJS)
+- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
+
+ Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \
+ gbversion.h.in gui/setup.iss.in
+@@ -894,11 +894,7 @@
+ session.o: session.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
+ gbfile.h cet.h inifile.h session.h src/core/datetime.h
+ shape.o: shape.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
+- gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+- shapelib/shapefil.h
+-shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h
+-shapelib/safileio.o: shapelib/safileio.c shapelib/shapefil.h
+-shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h
++ gbfile.h cet.h inifile.h session.h src/core/datetime.h
+ skyforce.o: skyforce.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
+ gbfile.h cet.h inifile.h session.h src/core/datetime.h
+ skytraq.o: skytraq.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
+--- a/shape.cc 2017-01-02 06:05:19.000000000 +0100
++++ b/shape.cc 2017-01-21 00:29:58.514391517 +0100
+@@ -20,7 +20,7 @@
+
+ */
+ #include "defs.h"
+-#include "shapelib/shapefil.h"
++#include <libshp/shapefil.h>
+ #include <stdlib.h>
+
+ #if SHAPELIB_ENABLED
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_zlib.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_zlib.patch
new file mode 100644
index 00000000..ce35917
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_zlib.patch
@@ -0,0 +1,80 @@
+--- a/configure.in 2017-01-21 03:17:05.480317203 +0100
++++ b/configure.in 2017-01-21 03:26:53.743671224 +0100
+@@ -402,7 +402,7 @@
+ AC_SUBST(QT_SYSINC_OPT)
+ AC_SUBST(QT_LIBS)
+
+-AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile zlib/empty])
++AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile])
+ AC_CONFIG_FILES([gui/makelinuxdist.sh], [chmod +x gui/makelinuxdist.sh])
+ AC_OUTPUT
+
+--- a/Makefile.in 2017-01-21 03:17:05.530317828 +0100
++++ b/Makefile.in 2017-01-21 03:32:19.447032690 +0100
+@@ -102,14 +102,7 @@
+
+ SHAPE=-lshp
+
+-MINIZIP=zlib/contrib/minizip/zip.o \
+- zlib/contrib/minizip/ioapi.o
+-
+-ZLIB=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o \
+- zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/trees.o \
+- zlib/uncompr.o zlib/gzlib.o zlib/gzclose.o zlib/gzread.o \
+- zlib/gzwrite.o zlib/zutil.o $(MINIZIP)
+-
++ZLIB=-lz -lminizip
+
+ LIBOBJS = queue.o route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \
+ csv_util.o strptime.o grtcirc.o util_crc.o xmlgeneric.o \
+@@ -119,7 +112,7 @@
+ src/core/xmlstreamwriter.o \
+ src/core/usasciicodec.o\
+ src/core/ziparchive.o \
+- $(GARMIN) $(JEEPS) @ZLIB@ $(FMTS) $(FILTERS)
++ $(GARMIN) $(JEEPS) $(FMTS) $(FILTERS)
+ OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@
+
+ DEPFILES = $(OBJS:.o=.d)
+@@ -148,10 +141,10 @@
+ all: gpsbabel$(EXEEXT)
+
+ gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@
+- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) $(ZLIB) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
+
+ gpsbabel-debug: $(OBJS)
+- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) $(ZLIB) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
+
+ Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \
+ gbversion.h.in gui/setup.iss.in
+--- a/src/core/ziparchive.cc 2017-01-02 06:05:19.000000000 +0100
++++ b/src/core/ziparchive.cc 2017-01-21 03:51:30.402421165 +0100
+@@ -23,7 +23,7 @@
+
+ #include "defs.h"
+ #include "src/core/logging.h"
+-#include "zlib/contrib/minizip/zip.h"
++#include <minizip/zip.h>
+
+ #include <QtCore/QFile>
+ #include <QtCore/QDebug>
+@@ -89,4 +89,4 @@
+ return true;
+ }
+ return false;
+-}
+\ No newline at end of file
++}
+--- a/src/core/ziparchive.h 2017-01-02 06:05:19.000000000 +0100
++++ b/src/core/ziparchive.h 2017-01-21 03:51:05.931115241 +0100
+@@ -21,7 +21,7 @@
+
+ #include <QtCore/QString>
+ #include <QtCore/QStringList>
+-#include "zlib/contrib/minizip/zip.h"
++#include <minizip/zip.h>
+
+ class ZipArchive
+ {
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-xmldoc.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-xmldoc.patch
new file mode 100644
index 00000000..3fdd274
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-xmldoc.patch
@@ -0,0 +1,13 @@
+--- a/Makefile.in 2017-01-21 00:32:50.921546762 +0100
++++ b/Makefile.in 2017-01-21 00:55:45.362728521 +0100
+@@ -278,8 +278,8 @@
+ --stringparam html.cleanup "1" \
+ --stringparam make.clean.html "1" \
+ --stringparam html.valid.html "1" \
+- --stringparam html.stylesheet \
+- "http://www.gpsbabel.org/style3.css" \
++ --nonet \
++ --stringparam html.stylesheet "gpsbabel.org-style3.css" \
+ http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
+ xmldoc/readme.xml
+
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild
new file mode 100644
index 00000000..01af5b8
--- /dev/null
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools qmake-utils
+
+DESCRIPTION="GPS waypoints, tracks and routes converter"
+HOMEPAGE="http://www.gpsbabel.org/"
+SRC_URI="
+ https://dev.gentoo.org/~asturm/${P}.tar.gz
+ doc? ( http://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="doc qt5"
+
+RDEPEND="
+ dev-libs/expat
+ sci-libs/shapelib:=
+ sys-libs/zlib[minizip]
+ virtual/libusb:0
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwebchannel:5
+ dev-qt/qtwebengine:5[widgets]
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ )
+"
+DEPEND="${RDEPEND}
+ doc? (
+ dev-lang/perl
+ dev-libs/libxslt
+ app-text/docbook-xml-dtd:4.1.2
+ )
+ qt5? ( dev-qt/linguist:5 )
+"
+
+DOCS=( AUTHORS README.{contrib,igc,mapconverter,md,xmapwpt} )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.4.3-fix_binary_name.patch"
+ "${FILESDIR}/${P}-disable_statistic_uploading.patch"
+ "${FILESDIR}/${P}-disable_update_check.patch"
+ "${FILESDIR}/${P}-disable_version_check.patch"
+ "${FILESDIR}/${P}-use_system_shapelib.patch"
+ "${FILESDIR}/${P}-use_system_zlib.patch"
+ "${FILESDIR}/${P}-xmldoc.patch"
+)
+
+RESTRICT="test" # bug 421699
+
+src_prepare() {
+ default
+
+ # remove bundled libs and cleanup
+ rm -r shapelib zlib || die
+ sed -i -e "s: zlib\/[a-z]*\.h::g" Makefile.in || die
+
+ mv configure.in configure.ac || die
+ sed -i -e "/^configure:/s/configure.in/configure.ac/" Makefile.in || die
+
+ use doc && cp "${DISTDIR}/gpsbabel.org-style3.css" "${S}"
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_with doc doc "${S}"/doc/manual) \
+ $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') \
+ $(usex qt5 LUPDATE=$(qt5_get_bindir)/lupdate '') \
+ $(usex qt5 QMAKE=$(qt5_get_bindir)/qmake '') \
+ --with-zlib=system
+
+ if use qt5; then
+ pushd "${S}/gui" > /dev/null || die
+ lrelease *.ts || die
+ eqmake5
+ popd > /dev/null
+ fi
+}
+
+src_compile() {
+ default
+ if use qt5; then
+ pushd "${S}/gui" > /dev/null || die
+ emake
+ popd > /dev/null
+ fi
+
+ if use doc; then
+ perl xmldoc/makedoc || die
+ emake gpsbabel.html
+ fi
+}
+
+src_install() {
+ if use doc; then
+ HTML_DOCS=( "${S}"/${PN}.html "${S}"/${PN}.org-style3.css )
+ fi
+
+ default
+
+ if use qt5; then
+ dobin gui/objects/gpsbabelfe
+ insinto /usr/share/${PN}/translations/
+ doins gui/gpsbabel*_*.qm
+ newicon gui/images/appicon.png ${PN}.png
+ make_desktop_entry gpsbabelfe ${PN} ${PN} "Science;Geoscience"
+ fi
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/, sci-geosciences/gpsbabel/files/
@ 2017-03-10 1:15 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2017-03-10 1:15 UTC (permalink / raw
To: gentoo-commits
commit: 117d90998da0fe7b1128b6638e3b74515ac6fa4c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 10 01:15:20 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 10 01:15:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=117d9099
sci-geosciences/gpsbabel: Drop old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sci-geosciences/gpsbabel/Manifest | 1 -
.../gpsbabel-disable_statistic_uploading.patch | 12 ---
.../files/gpsbabel-disable_update_check.patch | 110 ---------------------
.../files/gpsbabel-disable_version_check.patch | 47 ---------
.../gpsbabel/files/gpsbabel-freebsd.patch | 11 ---
.../files/gpsbabel-use_system_shapelib.patch | 76 --------------
.../gpsbabel/files/gpsbabel-xmldoc.patch | 14 ---
sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild | 100 -------------------
8 files changed, 371 deletions(-)
diff --git a/sci-geosciences/gpsbabel/Manifest b/sci-geosciences/gpsbabel/Manifest
index 3ea15a21663..4fc921d511f 100644
--- a/sci-geosciences/gpsbabel/Manifest
+++ b/sci-geosciences/gpsbabel/Manifest
@@ -1,3 +1,2 @@
-DIST gpsbabel-1.4.4.tar.gz 7811264 SHA256 9dd2a06e887cb286c9a07164a8f2ede11aed1147e6419007370c528412321944 SHA512 07b12dfe2127a399d973fa793fe3437cbda8f3425f3317100767b7fda549d9ea6bdda1429822ade671e219c99d95bc7feb16a8d177779b457aafb373141c515a WHIRLPOOL 576c60b0868648500552b4058c385af7912d0eaf1f63541cbcdf568c5dc96f46a5f204a981e525eced267a2060aeb4f04935ae45f67f0236c03f57f3a52bfaf9
DIST gpsbabel-1.5.4.tar.gz 9099765 SHA256 59e29b83a16af16556fffc9315d3d3626d11fc7f2f50d6ec1f99dfc64412989e SHA512 5fdc3bc07ad52d6c1e3532b287dcb506aba612ae9bc8db393b4837d79d773d6e22ad31f8f8e65770ec52b1afbda556e452af20dada1e411de93ca6e18054225b WHIRLPOOL a3de57048f43582fa64b85a3d37de5d378226842c7eca634f4334481f3dbbc99cee8b9d14bccb949fdc1976116a5b9bcc6318033138501e197c44b48cc244aec
DIST gpsbabel.org-style3.css 2171 SHA256 3f87b917e014e94562b44070c2b885abeef56e6459ce08d2cac785db197964ff SHA512 33b843e0431de6d71a83c58da35ede28435e5a4746f59e52350c6e4451659e1b443d3c0dd52df1c68001e9937787820fb96afc363ec1ae7d23430bfed31dbc83 WHIRLPOOL 419e1b8c386e3cbf96247ec231873bb0263e35e540451dfcda50e6c6f6452cef03825f527e3c970e452600d869721260e7970dabbe89070b9117d09c95da815a
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-disable_statistic_uploading.patch b/sci-geosciences/gpsbabel/files/gpsbabel-disable_statistic_uploading.patch
deleted file mode 100644
index 2d26f64aa13..00000000000
--- a/sci-geosciences/gpsbabel/files/gpsbabel-disable_statistic_uploading.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Make statistics reporting an opt-in option.
---- a/gui/babeldata.h
-+++ b/gui/babeldata.h
-@@ -64,7 +64,7 @@ public:
- upgradeOffers(0),
- runCount(0),
- startupVersionCheck(true),
-- reportStatistics(true),
-+ reportStatistics(false),
- allowBetaUpgrades(false),
- ignoreVersionMismatch(true),
- disableDonateDialog(false),
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-disable_update_check.patch b/sci-geosciences/gpsbabel/files/gpsbabel-disable_update_check.patch
deleted file mode 100644
index a429fdf1fba..00000000000
--- a/sci-geosciences/gpsbabel/files/gpsbabel-disable_update_check.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-Disable check for newer versions on start.
-
---- a/gui/preferences.ui
-+++ b/gui/preferences.ui
-@@ -40,13 +40,6 @@
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_4">
- <item>
-- <widget class="QCheckBox" name="startupCheck">
-- <property name="text">
-- <string>Check for newer version on start.</string>
-- </property>
-- </widget>
-- </item>
-- <item>
- <widget class="QCheckBox" name="reportStatisticsCheck">
- <property name="text">
- <string>Anonymously report usage data.</string>
---- a/gui/preferences.cpp
-+++ b/gui/preferences.cpp
-@@ -39,7 +39,6 @@ Preferences::Preferences(QWidget* parent
- {
- ui_.setupUi(this);
-
-- ui_.startupCheck->setChecked(bd_.startupVersionCheck);
- ui_.reportStatisticsCheck->setChecked(bd_.reportStatistics);
- // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1.
- if (VERSION == "1.4.1")
-@@ -81,7 +80,6 @@ void Preferences::acceptClicked()
- formatList_[i].setHidden(item->checkState() == Qt::Unchecked);
- }
-
-- bd_.startupVersionCheck = ui_.startupCheck->isChecked();
- bd_.reportStatistics = ui_.reportStatisticsCheck->isChecked();
- accept();
- }
---- a/gui/babeldata.h
-+++ b/gui/babeldata.h
-@@ -63,7 +63,7 @@ public:
- upgradeErrors(0),
- upgradeOffers(0),
- runCount(0),
-- startupVersionCheck(true),
-+ startupVersionCheck(false),
- reportStatistics(false),
- allowBetaUpgrades(false),
- ignoreVersionMismatch(true),
---- a/gui/mainwinui.ui
-+++ b/gui/mainwinui.ui
-@@ -641,7 +641,6 @@
- <addaction name="actionHelp"/>
- <addaction name="separator"/>
- <addaction name="actionAbout"/>
-- <addaction name="actionUpgradeCheck"/>
- <addaction name="separator"/>
- <addaction name="actionVisit_Website"/>
- <addaction name="actionMake_a_Donation"/>
-@@ -670,11 +669,6 @@
- <string>Preferences...</string>
- </property>
- </action>
-- <action name="actionUpgradeCheck">
-- <property name="text">
-- <string>Check for Upgrade</string>
-- </property>
-- </action>
- <action name="actionVisit_Website">
- <property name="text">
- <string>Visit Website...</string>
---- a/gui/mainwindow.cpp
-+++ b/gui/mainwindow.cpp
-@@ -153,7 +153,6 @@ MainWindow::MainWindow(QWidget* parent):
- connect(ui.actionAbout, SIGNAL(triggered()), this, SLOT(aboutActionX()));
- connect(ui.actionVisit_Website, SIGNAL(triggered()), this, SLOT(visitWebsiteActionX()));
- connect(ui.actionMake_a_Donation, SIGNAL(triggered()), this, SLOT(donateActionX()));
-- connect(ui.actionUpgradeCheck, SIGNAL(triggered()), this, SLOT(upgradeCheckActionX()));
- connect(ui.actionPreferences, SIGNAL(triggered()), this, SLOT(preferencesActionX()));
-
- connect(ui.inputFormatCombo, SIGNAL(currentIndexChanged(int)),
-@@ -197,19 +196,8 @@ MainWindow::MainWindow(QWidget* parent):
-
- //--- Restore from registry
- restoreSettings();
--
- upgrade = new UpgradeCheck(parent, formatList, bd);
-- if (bd.startupVersionCheck) {
-- upgrade->checkForUpgrade(babelVersion, bd.upgradeCheckTime,
-- allowBetaUpgrades());
-- }
--
-- if (!bd.ignoreVersionMismatch && babelVersion != VERSION) {
-- VersionMismatch vm(0, babelVersion, QString(VERSION));
-
-- vm.exec();
-- bd.ignoreVersionMismatch = vm.neverAgain();
-- }
- }
-
- //------------------------------------------------------------------------
-@@ -926,10 +914,6 @@ void MainWindow::applyActionX()
- //------------------------------------------------------------------------
- void MainWindow::closeActionX()
- {
-- QDateTime wt= upgrade->getUpgradeWarningTime();
-- if (wt.isValid()) {
-- bd.upgradeCheckTime = wt;
-- }
- bd.runCount++;
-
- QDateTime now = QDateTime::currentDateTime();
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-disable_version_check.patch b/sci-geosciences/gpsbabel/files/gpsbabel-disable_version_check.patch
deleted file mode 100644
index b4bd1a9e2a7..00000000000
--- a/sci-geosciences/gpsbabel/files/gpsbabel-disable_version_check.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Disable version mismatch check.
-
---- a/gui/preferences.ui
-+++ b/gui/preferences.ui
-@@ -53,13 +53,6 @@
- </property>
- </widget>
- </item>
-- <item>
-- <widget class="QCheckBox" name="ignoreVersionMismatchCheck">
-- <property name="text">
-- <string>Ignore mismatch between command line and GUI version.</string>
-- </property>
-- </widget>
-- </item>
- </layout>
- </widget>
- </widget>
---- a/gui/preferences.cpp
-+++ b/gui/preferences.cpp
-@@ -41,7 +41,6 @@ Preferences::Preferences(QWidget* parent
-
- ui_.startupCheck->setChecked(bd_.startupVersionCheck);
- ui_.reportStatisticsCheck->setChecked(bd_.reportStatistics);
-- ui_.ignoreVersionMismatchCheck->setChecked(bd_.ignoreVersionMismatch);
- // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1.
- if (VERSION == "1.4.1")
- bd_.ignoreVersionMismatch = false;
-@@ -84,7 +83,6 @@ void Preferences::acceptClicked()
-
- bd_.startupVersionCheck = ui_.startupCheck->isChecked();
- bd_.reportStatistics = ui_.reportStatisticsCheck->isChecked();
-- bd_.ignoreVersionMismatch = ui_.ignoreVersionMismatchCheck->isChecked();
- accept();
- }
-
---- a/gui/babeldata.h
-+++ b/gui/babeldata.h
-@@ -66,7 +66,7 @@ public:
- startupVersionCheck(true),
- reportStatistics(true),
- allowBetaUpgrades(false),
-- ignoreVersionMismatch(false),
-+ ignoreVersionMismatch(true),
- disableDonateDialog(false),
- donateSplashed(QDateTime(QDate(2010, 1, 1), QTime(0, 0, 0)))
- {
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-freebsd.patch b/sci-geosciences/gpsbabel/files/gpsbabel-freebsd.patch
deleted file mode 100644
index 2467c2ee041..00000000000
--- a/sci-geosciences/gpsbabel/files/gpsbabel-freebsd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig 2009-11-17 15:32:05.846189916 +0200
-+++ configure.in 2009-11-17 15:33:11.111187610 +0200
-@@ -277,7 +276,7 @@
- fi
- ;;
- *-gentoo-freebsd*)
-- EXPAT_LIB=-lexpa
-+ EXPAT_LIB=-lexpat
- ;;
- *-*-freebsd*)
- if test -f /usr/local/lib/libexpat.a ; then
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-use_system_shapelib.patch b/sci-geosciences/gpsbabel/files/gpsbabel-use_system_shapelib.patch
deleted file mode 100644
index 68ea430e368..00000000000
--- a/sci-geosciences/gpsbabel/files/gpsbabel-use_system_shapelib.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -urN gpsbabel-1.4.2.old/configure.in gpsbabel-1.4.2/configure.in
---- gpsbabel-1.4.2.old/configure.in 2011-06-10 10:30:54.888410566 +0200
-+++ gpsbabel-1.4.2/configure.in 2011-06-10 10:42:08.800985499 +0200
-@@ -421,6 +421,6 @@
- else
- AC_MSG_RESULT(no)
- fi
--AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss gui/makelinuxdist.sh xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile shapelib/Makefile zlib/empty])
-+AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss gui/makelinuxdist.sh xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile zlib/empty])
- AC_OUTPUT
-
-diff -urN gpsbabel-1.4.2.old/Makefile.in gpsbabel-1.4.2/Makefile.in
---- gpsbabel-1.4.2.old/Makefile.in 2011-06-10 10:30:54.899410428 +0200
-+++ gpsbabel-1.4.2/Makefile.in 2011-06-10 10:43:13.973170735 +0200
-@@ -87,7 +87,7 @@
-
- @PALM_DB_CMT@PALM_DB=pdbfile.o
-
--SHAPE=shapelib/shpopen.o shapelib/dbfopen.o
-+SHAPE=-lshp
-
- ZLIB=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o \
- zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/trees.o \
-@@ -98,7 +98,7 @@
- uuid.o formspec.o xmltag.o cet.o cet_util.o fatal.o rgbcolors.o \
- inifile.o garmin_fs.o gbsleep.o units.o @GBSER@ gbser.o \
- gbfile.o parse.o avltree.o session.o \
-- $(PALM_DB) $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS)
-+ $(PALM_DB) $(GARMIN) $(JEEPS) @ZLIB@ $(FMTS) $(FILTERS)
- OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@
-
- .c.o:
-@@ -113,10 +113,10 @@
- all: gpsbabel$(EXEEXT)
-
- gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@
-- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@
-
- gpsbabel-debug: $(OBJS)
-- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ @EFENCE_LIB@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@
-
- Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \
- gbversion.h.in gui/setup.iss.in
-@@ -818,8 +818,7 @@
- session.o: session.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
- zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h
- shape.o: shape.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
-- zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
-- shapelib/shapefil.h
-+ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h
- skyforce.o: skyforce.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
- zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h strptime.h
- skytraq.o: skytraq.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
-@@ -1092,8 +1091,6 @@
- jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \
- jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \
- jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h
--shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h config.h
--shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h config.h
- zlib/adler32.o: zlib/adler32.c zlib/zlib.h zlib/zconf.h
- zlib/compress.o: zlib/compress.c zlib/zlib.h zlib/zconf.h
- zlib/crc32.o: zlib/crc32.c zlib/zutil.h zlib/zlib.h zlib/zconf.h \
-diff -urN gpsbabel-1.4.2.old/shape.c gpsbabel-1.4.2/shape.c
---- gpsbabel-1.4.2.old/shape.c 2011-06-10 10:30:54.932410016 +0200
-+++ gpsbabel-1.4.2/shape.c 2011-06-10 10:42:08.802985475 +0200
-@@ -20,7 +20,7 @@
-
- */
- #include "defs.h"
--#include "shapelib/shapefil.h"
-+#include <libshp/shapefil.h>
-
- #if SHAPELIB_ENABLED
- static SHPHandle ihandle;
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-xmldoc.patch b/sci-geosciences/gpsbabel/files/gpsbabel-xmldoc.patch
deleted file mode 100644
index 2373fe125c8..00000000000
--- a/sci-geosciences/gpsbabel/files/gpsbabel-xmldoc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru gpsbabel-1.4.2/Makefile.in gpsbabel-1.4.2-xmldoc/Makefile.in
---- gpsbabel-1.4.2/Makefile.in 2011-01-11 17:57:47.075777307 +0100
-+++ gpsbabel-1.4.2-xmldoc/Makefile.in 2011-01-11 17:58:53.134094491 +0100
-@@ -234,8 +234,8 @@
- xsltproc \
- --output $@ \
- --stringparam toc.section.depth "1" \
-- --stringparam html.stylesheet \
-- "http://www.gpsbabel.org/style3.css" \
-+ --nonet \
-+ --stringparam html.stylesheet "gpsbabel.org-style3.css" \
- http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
- xmldoc/readme.xml
-
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild
deleted file mode 100644
index dae61aaa742..00000000000
--- a/sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils qt4-r2 autotools
-
-DESCRIPTION="GPS waypoints, tracks and routes converter"
-HOMEPAGE="http://www.gpsbabel.org/"
-SRC_URI="
- https://dev.gentoo.org/~patrick/${P}.tar.gz
- doc? ( http://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
-IUSE="doc qt4"
-
-RDEPEND="
- dev-libs/expat
- sci-libs/shapelib
- virtual/libusb:0
- qt4? (
- dev-qt/qtgui:4
- dev-qt/qtwebkit:4
- )
-"
-DEPEND="${RDEPEND}
- doc? (
- dev-lang/perl
- dev-libs/libxslt
- app-text/docbook-xml-dtd:4.1.2
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-disable_statistic_uploading.patch"
- "${FILESDIR}/${PN}-disable_update_check.patch"
- "${FILESDIR}/${PN}-disable_version_check.patch"
- "${FILESDIR}/${PN}-1.4.3-fix_binary_name.patch"
- "${FILESDIR}/${PN}-freebsd.patch"
- "${FILESDIR}/${PN}-use_system_shapelib.patch"
- "${FILESDIR}/${PN}-xmldoc.patch"
-)
-
-RESTRICT="test" # bug 421699
-
-src_prepare() {
- epatch "${PATCHES[@]}"
- epatch_user
- rm -rf shapelib || die
-
- use doc && cp "${DISTDIR}/gpsbabel.org-style3.css" "${S}"
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_with doc doc "${S}"/doc/manual) \
- --with-zlib=system
-
- if use qt4; then
- pushd "${S}/gui" > /dev/null || die
- lrelease *.ts || die
- eqmake4
- popd > /dev/null
- fi
-}
-
-src_compile() {
- emake
- if use qt4; then
- pushd "${S}/gui" > /dev/null || die
- emake
- popd > /dev/null
- fi
-
- if use doc; then
- perl xmldoc/makedoc || die
- emake gpsbabel.html
- fi
-}
-
-src_install() {
- default
- dodoc README*
-
- if use qt4; then
- dobin gui/objects/gpsbabelfe
- insinto /usr/share/qt4/translations/
- doins gui/gpsbabel*_*.qm
- newicon gui/images/appicon.png ${PN}.png
- make_desktop_entry gpsbabelfe ${PN} ${PN} "Science;Geoscience"
- fi
-
- if use doc; then
- dohtml gpsbabel.*
- fi
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/, sci-geosciences/gpsbabel/files/
@ 2017-09-16 12:47 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2017-09-16 12:47 UTC (permalink / raw
To: gentoo-commits
commit: 1ef37c47a0260323f090525092ecc4875244b893
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 16 12:47:12 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 12:47:32 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ef37c47
sci-geosciences/gpsbabel: Fix build with Qt-5.9
Reported-by: Markus <M4rkusXXL <AT> web.de>
Gentoo-bug: 629560
Package-Manager: Portage-2.3.8, Repoman-2.3.3
.../gpsbabel/files/gpsbabel-1.5.4-qt-5.9.patch | 105 +++++++++++++++++++++
sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild | 5 +-
2 files changed, 108 insertions(+), 2 deletions(-)
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9.patch
new file mode 100644
index 00000000000..36db615f9de
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9.patch
@@ -0,0 +1,105 @@
+From 30a345577a644125502f6e4f8b58ea3077ec8dad Mon Sep 17 00:00:00 2001
+From: Robert Lipe <robertlipe@gpsbabel.org>
+Date: Mon, 4 Sep 2017 23:20:00 -0500
+Subject: [PATCH] Prefer QStringLiteral over implicit conversion from Latin1
+ for Q5 5.9. Based on work by Bernd Zeimetz.
+
+---
+ gpx.cc | 14 +++++++-------
+ magproto.cc | 6 +++---
+ unicsv.cc | 8 ++++----
+ 3 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/gpx.cc b/gpx.cc
+index 3b3b963c..36701e52 100644
+--- a/gpx.cc
++++ b/gpx.cc
+@@ -494,7 +494,7 @@ tag_cache_desc(const QXmlStreamAttributes& attr)
+ {
+ cache_descr_is_html = 0;
+ if (attr.hasAttribute("html")) {
+- if (attr.value("html").toString().compare("True") == 0) {
++ if (attr.value("html").toString() == QStringLiteral("True")) {
+ cache_descr_is_html = 1;
+ }
+ }
+@@ -509,16 +509,16 @@ tag_gs_cache(const QXmlStreamAttributes& attr)
+ gc_data->id = attr.value("id").toString().toInt();
+ }
+ if (attr.hasAttribute("available")) {
+- if (attr.value("available").toString().compare("True", Qt::CaseInsensitive) == 0) {
++ if (attr.value("available").toString().compare(QStringLiteral("True"), Qt::CaseInsensitive) == 0) {
+ gc_data->is_available = status_true;
+- } else if (attr.value("available").toString().compare("False", Qt::CaseInsensitive) == 0) {
++ } else if (attr.value("available").toString().compare(QStringLiteral("False"), Qt::CaseInsensitive) == 0) {
+ gc_data->is_available = status_false;
+ }
+ }
+ if (attr.hasAttribute("archived")) {
+- if (attr.value("archived").toString().compare("True", Qt::CaseInsensitive) == 0) {
++ if (attr.value("archived").toString().compare(QStringLiteral("True"), Qt::CaseInsensitive) == 0) {
+ gc_data->is_archived = status_true;
+- } else if (attr.value("archived").toString().compare("False", Qt::CaseInsensitive) == 0) {
++ } else if (attr.value("archived").toString().compare(QStringLiteral("False"), Qt::CaseInsensitive) == 0) {
+ gc_data->is_archived = status_false;
+ }
+ }
+@@ -972,7 +972,7 @@ gpx_end(const QString& el)
+ * last date we saw in this log.
+ */
+ case tt_cache_log_type:
+- if ((cdatastr.compare("Found it") == 0) &&
++ if ((cdatastr.compare(QStringLiteral("Found it")) == 0) &&
+ (0 == wpt_tmp->gc_data->last_found.toTime_t())) {
+ wpt_tmp->AllocGCData()->last_found = gc_log_date;
+ }
+@@ -1423,7 +1423,7 @@ fprint_xml_chain(xml_tag* tag, const Waypoint* wpt)
+ fprint_xml_chain(tag->child, wpt);
+ }
+ if (wpt && wpt->gc_data->exported.isValid() &&
+- tag->tagname.compare("groundspeak:cache") == 0) {
++ tag->tagname.compare(QStringLiteral("groundspeak:cache")) == 0) {
+ writer->writeTextElement("time",
+ wpt->gc_data->exported.toPrettyString());
+ }
+diff --git a/magproto.cc b/magproto.cc
+index 7c82e9fb..0deb7f33 100644
+--- a/magproto.cc
++++ b/magproto.cc
+@@ -819,11 +819,11 @@ mag_rd_init_common(const QString& portname)
+ */
+ QString exten = QFileInfo(curfname).suffix();
+ if (exten.length() > 0) {
+- if (0 == exten.compare("upt", Qt::CaseInsensitive)) {
++ if (0 == exten.compare(QStringLiteral("upt"), Qt::CaseInsensitive)) {
+ extension_hint = WPTDATAMASK;
+- } else if (0 == exten.compare("log", Qt::CaseInsensitive)) {
++ } else if (0 == exten.compare(QStringLiteral("log"), Qt::CaseInsensitive)) {
+ extension_hint = TRKDATAMASK;
+- } else if (0 == exten.compare("rte", Qt::CaseInsensitive)) {
++ } else if (0 == exten.compare(QStringLiteral("rte"), Qt::CaseInsensitive)) {
+ extension_hint = RTEDATAMASK;
+ }
+ }
+diff --git a/unicsv.cc b/unicsv.cc
+index 4a7d78ed..6312e9d2 100644
+--- a/unicsv.cc
++++ b/unicsv.cc
+@@ -430,13 +430,13 @@ unicsv_parse_time(const QString& str, int* msec, time_t* date)
+ static status_type
+ unicsv_parse_status(const QString& str)
+ {
+- if (str.compare("true", Qt::CaseInsensitive) == 0 ||
+- str.compare("yes", Qt::CaseInsensitive) == 0 ||
++ if (str.compare(QStringLiteral("true"), Qt::CaseInsensitive) == 0 ||
++ str.compare(QStringLiteral("yes"), Qt::CaseInsensitive) == 0 ||
+ str == "1") {
+ return status_true;
+ }
+- if (str.compare("false", Qt::CaseInsensitive) == 0 ||
+- str.compare("no", Qt::CaseInsensitive) == 0 ||
++ if (str.compare(QStringLiteral("false"), Qt::CaseInsensitive) == 0 ||
++ str.compare(QStringLiteral("no"), Qt::CaseInsensitive) == 0 ||
+ str == "0") {
+ return status_false;
+ }
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild
index 5e68061b6b0..992aea9a44c 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild
@@ -6,10 +6,10 @@ EAPI=6
inherit autotools eutils qmake-utils
DESCRIPTION="GPS waypoints, tracks and routes converter"
-HOMEPAGE="http://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel"
+HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel"
SRC_URI="
https://dev.gentoo.org/~asturm/${P}.tar.gz
- doc? ( http://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )"
+ doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )"
LICENSE="GPL-2"
SLOT="0"
@@ -50,6 +50,7 @@ PATCHES=(
"${FILESDIR}/${P}-use_system_shapelib.patch"
"${FILESDIR}/${P}-use_system_zlib.patch"
"${FILESDIR}/${P}-xmldoc.patch"
+ "${FILESDIR}/${P}-qt-5.9.patch"
)
RESTRICT="test" # bug 421699
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/, sci-geosciences/gpsbabel/files/
@ 2017-09-25 11:18 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2017-09-25 11:18 UTC (permalink / raw
To: gentoo-commits
commit: 52f7b74352b325b3980c4922e980701066c79a18
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 25 11:15:08 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 11:18:21 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52f7b743
sci-geosciences/gpsbabel: Fix build with Qt-5.9 again
Tested-by: Markus <M4rkusXXL <AT> web.de>
Gentoo-bug: 629560
Package-Manager: Portage-2.3.10, Repoman-2.3.3
...-qt-5.9.patch => gpsbabel-1.5.4-qt-5.9-1.patch} | 0
.../gpsbabel/files/gpsbabel-1.5.4-qt-5.9-2.patch | 70 ++++++++++++++++++++++
sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild | 16 ++---
3 files changed, 78 insertions(+), 8 deletions(-)
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-1.patch
similarity index 100%
rename from sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9.patch
rename to sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-1.patch
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-2.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-2.patch
new file mode 100644
index 00000000000..ce1b0489146
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-2.patch
@@ -0,0 +1,70 @@
+From 604178aa8ad4d3c3ad218df24c1e9a6a1f683bb3 Mon Sep 17 00:00:00 2001
+From: Harel Mazor <harel.mazor@gmail.com>
+Date: Tue, 24 Jan 2017 00:35:04 +0200
+Subject: [PATCH] Added geojson read capablity, moved magic strings to
+ constants, fixed windows compilation issues.
+
+---
+ tef_xml.cc | 24 +++----
+
+* Removed any unrelated changes except for s/windows/Qt-5.9/ compilation issues.
+
+diff --git a/tef_xml.cc b/tef_xml.cc
+index b32d69b3..37dd85ba 100644
+--- a/tef_xml.cc
++++ b/tef_xml.cc
+@@ -72,11 +72,11 @@ tef_start(xg_string args, const QXmlStreamAttributes* attrv)
+ 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 @@ tef_header(xg_string args, const QXmlStreamAttributes* attrv)
+ {
+ 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 @@ tef_item_start(xg_string args, const QXmlStreamAttributes* attrv)
+ 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 */
+ }
+ }
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild
index 992aea9a44c..14286808591 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild
@@ -43,14 +43,14 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS README.{contrib,igc,mapconverter,md,xmapwpt} )
PATCHES=(
- "${FILESDIR}/${PN}-1.4.3-fix_binary_name.patch"
- "${FILESDIR}/${P}-disable_statistic_uploading.patch"
- "${FILESDIR}/${P}-disable_update_check.patch"
- "${FILESDIR}/${P}-disable_version_check.patch"
- "${FILESDIR}/${P}-use_system_shapelib.patch"
- "${FILESDIR}/${P}-use_system_zlib.patch"
- "${FILESDIR}/${P}-xmldoc.patch"
- "${FILESDIR}/${P}-qt-5.9.patch"
+ "${FILESDIR}"/${PN}-1.4.3-fix_binary_name.patch
+ "${FILESDIR}"/${P}-disable_statistic_uploading.patch
+ "${FILESDIR}"/${P}-disable_update_check.patch
+ "${FILESDIR}"/${P}-disable_version_check.patch
+ "${FILESDIR}"/${P}-use_system_shapelib.patch
+ "${FILESDIR}"/${P}-use_system_zlib.patch
+ "${FILESDIR}"/${P}-xmldoc.patch
+ "${FILESDIR}"/${P}-qt-5.9-{1,2}.patch
)
RESTRICT="test" # bug 421699
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/, sci-geosciences/gpsbabel/files/
@ 2020-03-12 20:49 Andreas K. Hüttel
0 siblings, 0 replies; 9+ messages in thread
From: Andreas K. Hüttel @ 2020-03-12 20:49 UTC (permalink / raw
To: gentoo-commits
commit: 3d86808536be2d4244912dcf890ed93d858d068c
Author: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 12 20:48:20 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Mar 12 20:48:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d868085
sci-geosciences/gpsbabel: Add live ebuild, tested with git master
See https://github.com/akhuettel/gpsbabel/tree/gentoo for the Gentoo patchset.
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas K. Huettel <dilfridge <AT> gentoo.org>
.../files/gpsbabel-9999-disable_update_check.patch | 132 ++++++++++++++++++++
.../files/gpsbabel-9999-use_system_shapelib.patch | 133 +++++++++++++++++++++
.../gpsbabel/files/gpsbabel-9999-xmldoc.patch | 27 +++++
sci-geosciences/gpsbabel/gpsbabel-9999.ebuild | 116 ++++++++++++++++++
4 files changed, 408 insertions(+)
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-9999-disable_update_check.patch b/sci-geosciences/gpsbabel/files/gpsbabel-9999-disable_update_check.patch
new file mode 100644
index 00000000000..6adeef664a5
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-9999-disable_update_check.patch
@@ -0,0 +1,132 @@
+From e24573dc7fce7c48da6b960a722b567f24e1318e Mon Sep 17 00:00:00 2001
+From: "Andreas K. Huettel" <dilfridge@gentoo.org>
+Date: Thu, 12 Mar 2020 19:48:16 +0100
+Subject: [PATCH] Gentoo: Disable update check
+
+---
+ gui/babeldata.h | 2 +-
+ gui/mainwindow.cc | 16 ----------------
+ gui/mainwinui.ui | 6 ------
+ gui/preferences.cc | 2 --
+ gui/preferences.ui | 7 -------
+ 5 files changed, 1 insertion(+), 32 deletions(-)
+
+diff --git a/gui/babeldata.h b/gui/babeldata.h
+index a8586f30..4d73a4e4 100644
+--- a/gui/babeldata.h
++++ b/gui/babeldata.h
+@@ -64,7 +64,7 @@ public:
+ upgradeErrors_(0),
+ upgradeOffers_(0),
+ runCount_(0),
+- startupVersionCheck_(true),
++ startupVersionCheck_(false),
+ reportStatistics_(false),
+ allowBetaUpgrades_(false),
+ ignoreVersionMismatch_(false),
+diff --git a/gui/mainwindow.cc b/gui/mainwindow.cc
+index adbac733..b0a8483a 100644
+--- a/gui/mainwindow.cc
++++ b/gui/mainwindow.cc
+@@ -174,7 +174,6 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent)
+ connect(ui_.actionAbout, SIGNAL(triggered()), this, SLOT(aboutActionX()));
+ connect(ui_.actionVisit_Website, SIGNAL(triggered()), this, SLOT(visitWebsiteActionX()));
+ connect(ui_.actionMake_a_Donation, SIGNAL(triggered()), this, SLOT(donateActionX()));
+- connect(ui_.actionUpgradeCheck, SIGNAL(triggered()), this, SLOT(upgradeCheckActionX()));
+ connect(ui_.actionPreferences, SIGNAL(triggered()), this, SLOT(preferencesActionX()));
+
+ connect(ui_.inputFormatCombo, SIGNAL(currentIndexChanged(int)),
+@@ -233,17 +232,6 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent)
+ restoreSettings();
+
+ upgrade = new UpgradeCheck(parent, formatList_, babelData_);
+- if (babelData_.startupVersionCheck_) {
+- upgrade->checkForUpgrade(babelVersion_, babelData_.upgradeCheckTime_,
+- allowBetaUpgrades());
+- }
+-
+- if (!babelData_.ignoreVersionMismatch_ && babelVersion_ != VERSION) {
+- VersionMismatch vm(nullptr, babelVersion_, QString(VERSION));
+-
+- vm.exec();
+- babelData_.ignoreVersionMismatch_ = vm.neverAgain();
+- }
+ }
+
+ //------------------------------------------------------------------------
+@@ -1067,10 +1055,6 @@ void MainWindow::applyActionX()
+ //------------------------------------------------------------------------
+ void MainWindow::closeActionX()
+ {
+- QDateTime wt= upgrade->getUpgradeWarningTime();
+- if (wt.isValid()) {
+- babelData_.upgradeCheckTime_ = wt;
+- }
+ babelData_.runCount_++;
+
+ QDateTime now = QDateTime::currentDateTime();
+diff --git a/gui/mainwinui.ui b/gui/mainwinui.ui
+index f5765e10..4533f234 100644
+--- a/gui/mainwinui.ui
++++ b/gui/mainwinui.ui
+@@ -691,7 +691,6 @@
+ <addaction name="actionHelp"/>
+ <addaction name="separator"/>
+ <addaction name="actionAbout"/>
+- <addaction name="actionUpgradeCheck"/>
+ <addaction name="separator"/>
+ <addaction name="actionVisit_Website"/>
+ <addaction name="actionMake_a_Donation"/>
+@@ -720,11 +719,6 @@
+ <string>Preferences...</string>
+ </property>
+ </action>
+- <action name="actionUpgradeCheck">
+- <property name="text">
+- <string>Check for Upgrade</string>
+- </property>
+- </action>
+ <action name="actionVisit_Website">
+ <property name="text">
+ <string>Visit Website...</string>
+diff --git a/gui/preferences.cc b/gui/preferences.cc
+index f648324b..ea398f7c 100644
+--- a/gui/preferences.cc
++++ b/gui/preferences.cc
+@@ -41,7 +41,6 @@ Preferences::Preferences(QWidget* parent, QList<Format>& formatList,
+ {
+ ui_.setupUi(this);
+
+- ui_.startupCheck->setChecked(babelData_.startupVersionCheck_);
+ ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_);
+ ui_.ignoreVersionMismatchCheck->setChecked(babelData_.ignoreVersionMismatch_);
+ // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1.
+@@ -85,7 +84,6 @@ void Preferences::acceptClicked()
+ formatList_[i].setHidden(item->checkState() == Qt::Unchecked);
+ }
+
+- babelData_.startupVersionCheck_ = ui_.startupCheck->isChecked();
+ babelData_.reportStatistics_ = ui_.reportStatisticsCheck->isChecked();
+ babelData_.ignoreVersionMismatch_ = ui_.ignoreVersionMismatchCheck->isChecked();
+ accept();
+diff --git a/gui/preferences.ui b/gui/preferences.ui
+index 3bea6c2c..48f5deb3 100644
+--- a/gui/preferences.ui
++++ b/gui/preferences.ui
+@@ -39,13 +39,6 @@
+ </rect>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+- <item>
+- <widget class="QCheckBox" name="startupCheck">
+- <property name="text">
+- <string>Check for newer version on start.</string>
+- </property>
+- </widget>
+- </item>
+ <item>
+ <widget class="QCheckBox" name="reportStatisticsCheck">
+ <property name="text">
+--
+2.24.1
+
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-9999-use_system_shapelib.patch b/sci-geosciences/gpsbabel/files/gpsbabel-9999-use_system_shapelib.patch
new file mode 100644
index 00000000000..8df45d839cd
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-9999-use_system_shapelib.patch
@@ -0,0 +1,133 @@
+From b69718b85b4ea9025f0f91d1e5de8b051a3c102d Mon Sep 17 00:00:00 2001
+From: "Andreas K. Huettel" <dilfridge@gentoo.org>
+Date: Thu, 12 Mar 2020 20:10:59 +0100
+Subject: [PATCH] Gentoo: Use system shapelib
+
+---
+ Makefile.in | 23 ++++++++++-------------
+ shape.cc | 2 +-
+ shape.h | 3 +--
+ 3 files changed, 12 insertions(+), 16 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index f04c6408..5365cf56 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -105,7 +105,7 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \
+ # Extra modules in Jeeps that we don't use
+ # jeeps/gpsfmt.o jeeps/gpsinput.o jeeps/gpsproj.o
+
+-SHAPE=shapelib/shpopen.o shapelib/dbfopen.o shapelib/safileio.o
++SHAPE=-lshp
+
+ ZLIB=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o \
+ zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/trees.o \
+@@ -121,7 +121,7 @@ LIBOBJS = route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \
+ src/core/textstream.o \
+ src/core/usasciicodec.o \
+ src/core/xmlstreamwriter.o \
+- $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS)
++ $(GARMIN) $(JEEPS) @ZLIB@ $(FMTS) $(FILTERS)
+ OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@
+
+ DEPFILES = $(OBJS:.o=.d)
+@@ -154,10 +154,10 @@ toolinfo
+ all: gpsbabel$(EXEEXT)
+
+ gpsbabel$(EXEEXT): configure Makefile $(OBJS) @USB_DEPS@ @GPSBABEL_DEBUG@
+- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
+
+ gpsbabel-debug: $(OBJS) @USB_DEPS@
+- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
+
+ Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \
+ gbversion.h.in gui/setup.iss.in
+@@ -511,7 +511,7 @@ filter_vecs.o: filter_vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
+ position.h radius.h reverse_route.h smplrout.h sort.h stackfilter.h \
+ swapdata.h trackfilter.h transform.h validate.h gbversion.h vecs.h \
+ format.h ggv_bin.h gpx.h src/core/file.h src/core/xmlstreamwriter.h \
+- src/core/xmltag.h shape.h shapelib/shapefil.h yahoo.h xmlgeneric.h \
++ src/core/xmltag.h shape.h yahoo.h xmlgeneric.h \
+ legacyformat.h mynav.h xcsv.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \
+ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \
+ jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \
+@@ -535,7 +535,7 @@ garmin.o: garmin.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
+ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \
+ jeeps/gpsrqst.h garmin_tables.h grtcirc.h jeeps/gpsserial.h vecs.h \
+ ggv_bin.h gpx.h src/core/file.h src/core/xmlstreamwriter.h \
+- src/core/xmltag.h shape.h shapelib/shapefil.h yahoo.h xmlgeneric.h \
++ src/core/xmltag.h shape.h yahoo.h xmlgeneric.h \
+ legacyformat.h mynav.h xcsv.h src/core/textstream.h
+ garmin_device_xml.o: garmin_device_xml.cc defs.h config.h zlib/zlib.h \
+ zlib/zconf.h formspec.h inifile.h gbfile.h session.h \
+@@ -817,7 +817,7 @@ magproto.o: magproto.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
+ formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
+ src/core/optional.h explorist_ini.h format.h gbser.h magellan.h vecs.h \
+ ggv_bin.h gpx.h src/core/file.h src/core/xmlstreamwriter.h \
+- src/core/xmltag.h shape.h shapelib/shapefil.h yahoo.h xmlgeneric.h \
++ src/core/xmltag.h shape.h yahoo.h xmlgeneric.h \
+ legacyformat.h mynav.h xcsv.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \
+ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \
+ jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \
+@@ -831,7 +831,7 @@ main.o: main.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
+ stackfilter.h swapdata.h trackfilter.h transform.h validate.h format.h \
+ src/core/file.h src/core/usasciicodec.h vecs.h ggv_bin.h gpx.h \
+ src/core/xmlstreamwriter.h src/core/xmltag.h shape.h \
+- shapelib/shapefil.h yahoo.h xmlgeneric.h legacyformat.h mynav.h xcsv.h \
++ yahoo.h xmlgeneric.h legacyformat.h mynav.h xcsv.h \
+ garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \
+ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
+ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
+@@ -954,10 +954,7 @@ session.o: session.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
+ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h
+ shape.o: shape.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
+ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
+- shape.h format.h shapelib/shapefil.h
+-shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h
+-shapelib/safileio.o: shapelib/safileio.c shapelib/shapefil.h
+-shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h
++ shape.h format.h
+ skyforce.o: skyforce.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
+ formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
+ src/core/optional.h
+@@ -1048,7 +1045,7 @@ vecs.o: vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
+ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
+ vecs.h format.h ggv_bin.h gpx.h src/core/file.h \
+ src/core/xmlstreamwriter.h src/core/xmltag.h shape.h \
+- shapelib/shapefil.h yahoo.h xmlgeneric.h legacyformat.h mynav.h xcsv.h \
++ yahoo.h xmlgeneric.h legacyformat.h mynav.h xcsv.h \
+ garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \
+ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
+ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
+diff --git a/shape.cc b/shape.cc
+index 933eb95a..f2ec5365 100644
+--- a/shape.cc
++++ b/shape.cc
+@@ -32,7 +32,7 @@
+
+ #include "defs.h"
+ #include "shape.h"
+-#include "shapelib/shapefil.h"
++#include <libshp/shapefil.h>
+
+
+ #if SHAPELIB_ENABLED
+diff --git a/shape.h b/shape.h
+index 75ec82c2..3bf1072f 100644
+--- a/shape.h
++++ b/shape.h
+@@ -27,8 +27,7 @@
+
+ #include "defs.h" // for arglist_t, ARGTYPE_STRING, Waypoint, route_head, CET_CHARSET_ASCII, FF_CAP_RW_ALL, ff_cap, ff_type, ff_type_file
+ #include "format.h" // for Format
+-#include "shapelib/shapefil.h" // for DBFHandle, SHPAPI_CALL, SHPHandle
+-
++#include <libshp/shapefil.h>
+
+ #if SHAPELIB_ENABLED
+ class ShapeFormat : public Format
+--
+2.24.1
+
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-9999-xmldoc.patch b/sci-geosciences/gpsbabel/files/gpsbabel-9999-xmldoc.patch
new file mode 100644
index 00000000000..32728e04df2
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-9999-xmldoc.patch
@@ -0,0 +1,27 @@
+From 7930deeee0c6f00a092b73c9d098873c2344ffdf Mon Sep 17 00:00:00 2001
+From: "Andreas K. Huettel" <dilfridge@gentoo.org>
+Date: Thu, 12 Mar 2020 21:25:04 +0100
+Subject: [PATCH] Gentoo: Use xml stylesheet from distdir instead of net access
+
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 091db602..0093e581 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -282,8 +282,8 @@ gpsbabel.html: FORCE # gpsbabel
+ --stringparam html.cleanup "1" \
+ --stringparam make.clean.html "1" \
+ --stringparam html.valid.html "1" \
+- --stringparam html.stylesheet \
+- "https://www.gpsbabel.org/style3.css" \
++ --nonet \
++ --stringparam html.stylesheet "gpsbabel.org-style3.css" \
+ http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
+ xmldoc/readme.xml
+
+--
+2.24.1
+
diff --git a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
new file mode 100644
index 00000000000..7a58d881c90
--- /dev/null
+++ b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils qmake-utils
+
+DESCRIPTION="GPS waypoints, tracks and routes converter"
+HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel"
+LICENSE="GPL-2"
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/gpsbabel/gpsbabel.git"
+ SRC_URI="doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )"
+else
+ SRC_URI="
+ https://dev.gentoo.org/~asturm/${P}.tar.gz
+ doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )
+ "
+ KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+SLOT="0"
+IUSE="doc +gui"
+
+RDEPEND="
+ dev-libs/expat
+ dev-qt/qtcore:5
+ sci-libs/shapelib:=
+ sys-libs/zlib[minizip]
+ virtual/libusb:0
+ gui? (
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwebchannel:5
+ dev-qt/qtwebengine:5[widgets]
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ )
+"
+DEPEND="${RDEPEND}
+ doc? (
+ app-text/docbook-xml-dtd:4.1.2
+ dev-lang/perl
+ dev-libs/libxslt
+ )
+ gui? ( dev-qt/linguist-tools:5 )
+"
+
+DOCS=( AUTHORS README.{contrib,igc,mapconverter,md,xmapwpt} )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.5.4-disable_statistic_uploading.patch
+ "${FILESDIR}"/${PN}-9999-disable_update_check.patch
+ "${FILESDIR}"/${PN}-1.5.4-disable_version_check.patch
+ "${FILESDIR}"/${PN}-9999-use_system_shapelib.patch
+ "${FILESDIR}"/${PN}-9999-xmldoc.patch
+)
+
+RESTRICT="test" # bug 421699
+
+src_prepare() {
+ default
+
+ # remove bundled libs and cleanup
+ rm -r shapelib || die
+
+ use doc && cp "${DISTDIR}/gpsbabel.org-style3.css" "${S}"
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_with doc doc "${S}"/doc/manual) \
+ LRELEASE=$(qt5_get_bindir)/lrelease \
+ LUPDATE=$(qt5_get_bindir)/lupdate \
+ QMAKE=$(qt5_get_bindir)/qmake \
+ --with-zlib=system
+
+ if use gui; then
+ pushd "${S}/gui" > /dev/null || die
+ $(qt5_get_bindir)/lrelease *.ts || die
+ eqmake5
+ popd > /dev/null
+ fi
+}
+
+src_compile() {
+ default
+ if use gui; then
+ pushd "${S}/gui" > /dev/null || die
+ emake
+ popd > /dev/null
+ fi
+
+ if use doc; then
+ perl xmldoc/makedoc || die
+ emake gpsbabel.html
+ fi
+}
+
+src_install() {
+ use doc && HTML_DOCS=( "${S}"/${PN}.html "${S}"/${PN}.org-style3.css )
+
+ default
+
+ if use gui; then
+ dobin gui/objects/gpsbabelfe
+ insinto /usr/share/${PN}/translations/
+ doins gui/gpsbabel*_*.qm
+ newicon gui/images/appicon.png ${PN}.png
+ make_desktop_entry gpsbabelfe ${PN} ${PN} "Science;Geoscience"
+ fi
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/, sci-geosciences/gpsbabel/files/
@ 2020-03-12 21:22 Andreas K. Hüttel
0 siblings, 0 replies; 9+ messages in thread
From: Andreas K. Hüttel @ 2020-03-12 21:22 UTC (permalink / raw
To: gentoo-commits
commit: 5ea6d06a9c5ad52c156a27bc7f84ec5bcbe193d3
Author: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 12 21:22:08 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Mar 12 21:22:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ea6d06a
sci-geosciences/gpsbabel: Start preparing for 1.6.0
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas K. Huettel <dilfridge <AT> gentoo.org>
...pdate_check.patch => gpsbabel-1.6.0-disable_update_check.patch} | 0
sci-geosciences/gpsbabel/gpsbabel-9999.ebuild | 7 +++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-9999-disable_update_check.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.6.0-disable_update_check.patch
similarity index 100%
rename from sci-geosciences/gpsbabel/files/gpsbabel-9999-disable_update_check.patch
rename to sci-geosciences/gpsbabel/files/gpsbabel-1.6.0-disable_update_check.patch
diff --git a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
index 7a58d881c90..e7b3f8abc91 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
@@ -5,6 +5,8 @@ EAPI=6
inherit autotools eutils qmake-utils
+MY_PV=${PV//./_}
+
DESCRIPTION="GPS waypoints, tracks and routes converter"
HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel"
LICENSE="GPL-2"
@@ -15,10 +17,11 @@ if [[ ${PV} == 9999 ]] ; then
SRC_URI="doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )"
else
SRC_URI="
- https://dev.gentoo.org/~asturm/${P}.tar.gz
+ https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz
doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )
"
KEYWORDS="~amd64 ~ppc ~x86"
+ S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}"
fi
SLOT="0"
@@ -52,7 +55,7 @@ DOCS=( AUTHORS README.{contrib,igc,mapconverter,md,xmapwpt} )
PATCHES=(
"${FILESDIR}"/${PN}-1.5.4-disable_statistic_uploading.patch
- "${FILESDIR}"/${PN}-9999-disable_update_check.patch
+ "${FILESDIR}"/${PN}-1.6.0-disable_update_check.patch
"${FILESDIR}"/${PN}-1.5.4-disable_version_check.patch
"${FILESDIR}"/${PN}-9999-use_system_shapelib.patch
"${FILESDIR}"/${PN}-9999-xmldoc.patch
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/, sci-geosciences/gpsbabel/files/
@ 2021-05-28 1:14 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2021-05-28 1:14 UTC (permalink / raw
To: gentoo-commits
commit: 637f5c37176bb8ab803447ff947d6c609006de00
Author: Chris Mayo <aklhfex <AT> gmail <DOT> com>
AuthorDate: Fri Jul 10 16:03:05 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 28 01:09:08 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=637f5c37
sci-geosciences/gpsbabel: 1.7.0 version bump, EAPI 7
GUI support is dropped because of multiple issues with resource paths.
Closes: https://bugs.gentoo.org/689586
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Chris Mayo <aklhfex <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14242
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/gpsbabel/Manifest | 1 +
.../files/gpsbabel-1.7.0-use_system_shapelib.patch | 118 +++++++++++++++++++++
.../gpsbabel/files/gpsbabel-1.7.0-xmldoc.patch | 13 +++
sci-geosciences/gpsbabel/gpsbabel-1.7.0.ebuild | 79 ++++++++++++++
4 files changed, 211 insertions(+)
diff --git a/sci-geosciences/gpsbabel/Manifest b/sci-geosciences/gpsbabel/Manifest
index 5e230661d07..7a5ed8964bd 100644
--- a/sci-geosciences/gpsbabel/Manifest
+++ b/sci-geosciences/gpsbabel/Manifest
@@ -1,2 +1,3 @@
DIST gpsbabel-1.5.4.tar.gz 9099765 BLAKE2B 339cc78f94fed883b73c9f74cc6e27dd214438ba86917079b27459f543a9cb360bd8ec12408af1f23b9114d774a3b8eeccfb6b9f4fa9e7dc73b63e11bac20d43 SHA512 5fdc3bc07ad52d6c1e3532b287dcb506aba612ae9bc8db393b4837d79d773d6e22ad31f8f8e65770ec52b1afbda556e452af20dada1e411de93ca6e18054225b
DIST gpsbabel.org-style3.css 2171 BLAKE2B 7fafef65e37d7c7cd183be06caafdbf303ac334484d7c09b4e668e8845f156f850b6f4cc6ac1aa081627367e999fa30d3505400e2aabd03fa117f6389318254f SHA512 33b843e0431de6d71a83c58da35ede28435e5a4746f59e52350c6e4451659e1b443d3c0dd52df1c68001e9937787820fb96afc363ec1ae7d23430bfed31dbc83
+DIST gpsbabel_1_7_0.tar.gz 16718984 BLAKE2B 8b824eb2a024f61e30abed80afe5e8ba8943771aff401171e7622eb3eb3d16cd2890964ccf0abfd28925d604087c57f013dc37bfac5d16ccdb97d2386a92ec29 SHA512 9df9d9cd65c3f33c0f39b4064e448834ad651ead368a3be3ea107f754ff0ac1500eb2111cddf43ecad61fe65b3412181842571fbba3387dd3dd36ff5c23e2911
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-use_system_shapelib.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-use_system_shapelib.patch
new file mode 100644
index 00000000000..74440090696
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-use_system_shapelib.patch
@@ -0,0 +1,118 @@
+diff --git a/Makefile.in b/Makefile.in
+index 5ace8da1..1acadf3e 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -104,7 +104,7 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \
+ # Extra modules in Jeeps that we don't use
+ # jeeps/gpsfmt.o jeeps/gpsinput.o jeeps/gpsproj.o
+
+-SHAPE=shapelib/shpopen.o shapelib/dbfopen.o shapelib/safileio.o
++SHAPE=-lshp
+
+ ZLIB=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o \
+ zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/trees.o \
+@@ -120,7 +120,7 @@ LIBOBJS = route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \
+ src/core/textstream.o \
+ src/core/usasciicodec.o \
+ src/core/xmlstreamwriter.o \
+- $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS)
++ $(GARMIN) $(JEEPS) @ZLIB@ $(FMTS) $(FILTERS)
+ OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@
+
+ DEPFILES = $(OBJS:.o=.d)
+@@ -153,10 +153,10 @@ toolinfo
+ all: gpsbabel$(EXEEXT)
+
+ gpsbabel$(EXEEXT): configure Makefile $(OBJS) @USB_DEPS@ @GPSBABEL_DEBUG@
+- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
+
+ gpsbabel-debug: $(OBJS) @USB_DEPS@
+- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
+
+ Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \
+ gbversion.h.in gui/setup.iss.in
+@@ -513,7 +513,7 @@ filter_vecs.o: filter_vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
+ ggv_bin.h globalsat_sport.h gpx.h src/core/xmlstreamwriter.h \
+ src/core/xmltag.h kml.h xmlgeneric.h legacyformat.h lowranceusr.h \
+ mynav.h nmea.h osm.h qstarz_bl_1000.h random.h shape.h \
+- shapelib/shapefil.h subrip.h unicsv.h src/core/textstream.h xcsv.h \
++ subrip.h unicsv.h src/core/textstream.h xcsv.h \
+ garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \
+ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
+ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
+@@ -538,7 +538,7 @@ garmin.o: garmin.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
+ dg-100.h energympro.h garmin_fit.h geojson.h src/core/file.h ggv_bin.h \
+ globalsat_sport.h gpx.h src/core/xmlstreamwriter.h src/core/xmltag.h \
+ kml.h xmlgeneric.h legacyformat.h lowranceusr.h mynav.h nmea.h osm.h \
+- qstarz_bl_1000.h random.h shape.h shapelib/shapefil.h subrip.h \
++ qstarz_bl_1000.h random.h shape.h subrip.h \
+ unicsv.h src/core/textstream.h xcsv.h yahoo.h
+ garmin_device_xml.o: garmin_device_xml.cc defs.h config.h zlib/zlib.h \
+ zlib/zconf.h formspec.h inifile.h gbfile.h session.h \
+@@ -825,7 +825,7 @@ magproto.o: magproto.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
+ dg-100.h energympro.h garmin_fit.h geojson.h src/core/file.h ggv_bin.h \
+ globalsat_sport.h gpx.h src/core/xmlstreamwriter.h src/core/xmltag.h \
+ kml.h xmlgeneric.h legacyformat.h lowranceusr.h mynav.h nmea.h osm.h \
+- qstarz_bl_1000.h random.h shape.h shapelib/shapefil.h subrip.h \
++ qstarz_bl_1000.h random.h shape.h subrip.h \
+ unicsv.h src/core/textstream.h xcsv.h garmin_fs.h jeeps/gps.h \
+ jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \
+ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \
+@@ -841,7 +841,7 @@ main.o: main.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
+ garmin_fit.h geojson.h ggv_bin.h globalsat_sport.h gpx.h \
+ src/core/xmlstreamwriter.h src/core/xmltag.h kml.h xmlgeneric.h \
+ legacyformat.h lowranceusr.h mynav.h nmea.h osm.h qstarz_bl_1000.h \
+- random.h shape.h shapelib/shapefil.h subrip.h unicsv.h \
++ random.h shape.h subrip.h unicsv.h \
+ src/core/textstream.h xcsv.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \
+ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \
+ jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \
+@@ -961,10 +961,7 @@ session.o: session.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
+ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h
+ shape.o: shape.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
+ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
+- shape.h format.h shapelib/shapefil.h
+-shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h
+-shapelib/safileio.o: shapelib/safileio.c shapelib/shapefil.h
+-shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h
++ shape.h format.h
+ skyforce.o: skyforce.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
+ formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
+ src/core/optional.h
+@@ -1059,7 +1056,7 @@ vecs.o: vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
+ src/core/file.h ggv_bin.h globalsat_sport.h gpx.h \
+ src/core/xmlstreamwriter.h src/core/xmltag.h kml.h xmlgeneric.h \
+ legacyformat.h lowranceusr.h mynav.h nmea.h osm.h qstarz_bl_1000.h \
+- random.h shape.h shapelib/shapefil.h subrip.h unicsv.h \
++ random.h shape.h subrip.h unicsv.h \
+ src/core/textstream.h xcsv.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \
+ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \
+ jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \
+diff --git a/shape.cc b/shape.cc
+index 933eb95a..f2ec5365 100644
+--- a/shape.cc
++++ b/shape.cc
+@@ -32,7 +32,7 @@
+
+ #include "defs.h"
+ #include "shape.h"
+-#include "shapelib/shapefil.h"
++#include <libshp/shapefil.h>
+
+
+ #if SHAPELIB_ENABLED
+diff --git a/shape.h b/shape.h
+index 0ce05af7..09931eff 100644
+--- a/shape.h
++++ b/shape.h
+@@ -27,7 +27,7 @@
+
+ #include "defs.h" // for arglist_t, ARGTYPE_STRING, Waypoint, route_head, CET_CHARSET_ASCII, FF_CAP_RW_ALL, ff_cap, ff_type, ff_type_file
+ #include "format.h" // for Format
+-#include "shapelib/shapefil.h" // for DBFHandle, SHPAPI_CALL, SHPHandle
++#include <libshp/shapefil.h> // for DBFHandle, SHPAPI_CALL, SHPHandle
+
+
+ #if SHAPELIB_ENABLED
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-xmldoc.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-xmldoc.patch
new file mode 100644
index 00000000000..56c60a55348
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-xmldoc.patch
@@ -0,0 +1,13 @@
+--- a/Makefile.in 2017-01-21 00:32:50.921546762 +0100
++++ b/Makefile.in 2017-01-21 00:55:45.362728521 +0100
+@@ -278,8 +278,8 @@
+ --stringparam html.cleanup "1" \
+ --stringparam make.clean.html "1" \
+ --stringparam html.valid.html "1" \
+- --stringparam html.stylesheet \
+- "https://www.gpsbabel.org/style3.css" \
++ --nonet \
++ --stringparam html.stylesheet "gpsbabel.org-style3.css" \
+ http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
+ xmldoc/readme.xml
+
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.7.0.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.7.0.ebuild
new file mode 100644
index 00000000000..51a9005c067
--- /dev/null
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.7.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+MY_PV="${PV//./_}"
+MY_P="${PN}_${MY_PV}"
+
+DESCRIPTION="GPS waypoints, tracks and routes converter"
+HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel"
+SRC_URI="
+ https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz
+ doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+
+DEPEND="
+ dev-libs/expat
+ dev-qt/qtcore:5
+ sci-libs/shapelib:=
+ sys-libs/zlib
+ virtual/libusb:0
+"
+BDEPEND="
+ virtual/pkgconfig
+ doc? (
+ app-text/docbook-xml-dtd:4.1.2
+ dev-lang/perl
+ dev-libs/libxslt
+ )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-xmldoc.patch
+ "${FILESDIR}"/${P}-use_system_shapelib.patch
+)
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+src_prepare() {
+ default
+
+ # ensure bundled libs are not used
+ rm -r shapelib zlib || die
+ # remove prerequisite zlib/zlib.h
+ sed -i -e "s: zlib\/[a-z]*\.h::g" Makefile.in || die
+ # remove failing test (fixed by f91d28bf)
+ rm testo.d/arc-project.test || die
+
+ use doc && cp "${DISTDIR}/gpsbabel.org-style3.css" "${S}"
+}
+
+src_configure() {
+ econf \
+ $(use_with doc doc "${S}"/doc/manual) \
+ QMAKE=$(qt5_get_bindir)/qmake \
+ --with-zlib=system
+}
+
+src_compile() {
+ default
+
+ if use doc; then
+ perl xmldoc/makedoc || die
+ emake gpsbabel.html
+ fi
+}
+
+src_install() {
+ use doc && HTML_DOCS=( "${S}"/${PN}.html "${S}"/${PN}.org-style3.css )
+
+ default
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/, sci-geosciences/gpsbabel/files/
@ 2022-08-25 1:23 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2022-08-25 1:23 UTC (permalink / raw
To: gentoo-commits
commit: 10fbf2f60e4a495a7e741419bb9fcf0afddf6d73
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 25 01:21:51 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 25 01:21:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10fbf2f6
sci-geosciences/gpsbabel: drop 1.5.4-r1
Bug: https://bugs.gentoo.org/820080
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/gpsbabel/Manifest | 1 -
.../files/gpsbabel-1.4.3-fix_binary_name.patch | 12 ---
...psbabel-1.5.4-disable_statistic_uploading.patch | 11 --
.../gpsbabel-1.5.4-disable_update_check.patch | 108 -------------------
.../gpsbabel-1.5.4-disable_version_check.patch | 45 --------
.../gpsbabel/files/gpsbabel-1.5.4-qt-5.9-1.patch | 105 ------------------
.../gpsbabel/files/gpsbabel-1.5.4-qt-5.9-2.patch | 70 ------------
.../files/gpsbabel-1.5.4-use_system_shapelib.patch | 68 ------------
.../files/gpsbabel-1.5.4-use_system_zlib.patch | 80 --------------
.../gpsbabel/files/gpsbabel-1.5.4-xmldoc.patch | 13 ---
sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild | 120 ---------------------
11 files changed, 633 deletions(-)
diff --git a/sci-geosciences/gpsbabel/Manifest b/sci-geosciences/gpsbabel/Manifest
index 7a5ed8964bd7..62174a8748c6 100644
--- a/sci-geosciences/gpsbabel/Manifest
+++ b/sci-geosciences/gpsbabel/Manifest
@@ -1,3 +1,2 @@
-DIST gpsbabel-1.5.4.tar.gz 9099765 BLAKE2B 339cc78f94fed883b73c9f74cc6e27dd214438ba86917079b27459f543a9cb360bd8ec12408af1f23b9114d774a3b8eeccfb6b9f4fa9e7dc73b63e11bac20d43 SHA512 5fdc3bc07ad52d6c1e3532b287dcb506aba612ae9bc8db393b4837d79d773d6e22ad31f8f8e65770ec52b1afbda556e452af20dada1e411de93ca6e18054225b
DIST gpsbabel.org-style3.css 2171 BLAKE2B 7fafef65e37d7c7cd183be06caafdbf303ac334484d7c09b4e668e8845f156f850b6f4cc6ac1aa081627367e999fa30d3505400e2aabd03fa117f6389318254f SHA512 33b843e0431de6d71a83c58da35ede28435e5a4746f59e52350c6e4451659e1b443d3c0dd52df1c68001e9937787820fb96afc363ec1ae7d23430bfed31dbc83
DIST gpsbabel_1_7_0.tar.gz 16718984 BLAKE2B 8b824eb2a024f61e30abed80afe5e8ba8943771aff401171e7622eb3eb3d16cd2890964ccf0abfd28925d604087c57f013dc37bfac5d16ccdb97d2386a92ec29 SHA512 9df9d9cd65c3f33c0f39b4064e448834ad651ead368a3be3ea107f754ff0ac1500eb2111cddf43ecad61fe65b3412181842571fbba3387dd3dd36ff5c23e2911
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.4.3-fix_binary_name.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.4.3-fix_binary_name.patch
deleted file mode 100644
index 2ab8d5e10c69..000000000000
--- a/sci-geosciences/gpsbabel/files/gpsbabel-1.4.3-fix_binary_name.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Rename gpsbabelfe binary.
---- gpsbabel-1.4.3/gui/app.pro
-+++ gpsbabel-1.4.3/gui/app.pro
-@@ -30,7 +30,7 @@
- TARGET=GPSBabelFE
- QMAKE_LFLAGS_RELEASE += -static-libgcc
- }
--unix:TARGET=gpsbabelfe-bin
-+unix:TARGET=gpsbabelfe
- mac:TARGET=GPSBabelFE
-
- FORMS += aboutui.ui
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_statistic_uploading.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_statistic_uploading.patch
deleted file mode 100644
index b65413c3d7c5..000000000000
--- a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_statistic_uploading.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gui/babeldata.h 2017-01-02 06:05:19.000000000 +0100
-+++ b/gui/babeldata.h 2017-01-21 00:33:30.858046004 +0100
-@@ -64,7 +64,7 @@
- upgradeOffers_(0),
- runCount_(0),
- startupVersionCheck_(true),
-- reportStatistics_(true),
-+ reportStatistics_(false),
- allowBetaUpgrades_(false),
- ignoreVersionMismatch_(false),
- disableDonateDialog_(false),
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_update_check.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_update_check.patch
deleted file mode 100644
index b618106df3f0..000000000000
--- a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_update_check.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-Disable check for newer versions on start.
-
---- a/gui/preferences.ui 2017-01-02 06:05:19.000000000 +0100
-+++ b/gui/preferences.ui 2017-01-21 00:38:44.929972188 +0100
-@@ -40,13 +40,6 @@
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_4">
- <item>
-- <widget class="QCheckBox" name="startupCheck">
-- <property name="text">
-- <string>Check for newer version on start.</string>
-- </property>
-- </widget>
-- </item>
-- <item>
- <widget class="QCheckBox" name="reportStatisticsCheck">
- <property name="text">
- <string>Anonymously report usage data.</string>
---- a/gui/preferences.cc 2017-01-02 06:05:19.000000000 +0100
-+++ b/gui/preferences.cc 2017-01-21 00:39:20.648418701 +0100
-@@ -39,7 +39,6 @@
- {
- ui_.setupUi(this);
-
-- ui_.startupCheck->setChecked(babelData_.startupVersionCheck_);
- ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_);
- ui_.ignoreVersionMismatchCheck->setChecked(babelData_.ignoreVersionMismatch_);
- // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1.
-@@ -82,7 +81,6 @@
- formatList_[i].setHidden(item->checkState() == Qt::Unchecked);
- }
-
-- babelData_.startupVersionCheck_ = ui_.startupCheck->isChecked();
- babelData_.reportStatistics_ = ui_.reportStatisticsCheck->isChecked();
- babelData_.ignoreVersionMismatch_ = ui_.ignoreVersionMismatchCheck->isChecked();
- accept();
---- a/gui/babeldata.h 2017-01-21 00:33:30.858046004 +0100
-+++ b/gui/babeldata.h 2017-01-21 00:40:03.888959247 +0100
-@@ -63,7 +63,7 @@
- upgradeErrors_(0),
- upgradeOffers_(0),
- runCount_(0),
-- startupVersionCheck_(true),
-+ startupVersionCheck_(false),
- reportStatistics_(false),
- allowBetaUpgrades_(false),
- ignoreVersionMismatch_(false),
---- a/gui/mainwinui.ui 2017-01-02 06:05:19.000000000 +0100
-+++ b/gui/mainwinui.ui 2017-01-21 00:40:40.453416335 +0100
-@@ -637,7 +637,6 @@
- <addaction name="actionHelp"/>
- <addaction name="separator"/>
- <addaction name="actionAbout"/>
-- <addaction name="actionUpgradeCheck"/>
- <addaction name="separator"/>
- <addaction name="actionVisit_Website"/>
- <addaction name="actionMake_a_Donation"/>
-@@ -666,11 +665,6 @@
- <string>Preferences...</string>
- </property>
- </action>
-- <action name="actionUpgradeCheck">
-- <property name="text">
-- <string>Check for Upgrade</string>
-- </property>
-- </action>
- <action name="actionVisit_Website">
- <property name="text">
- <string>Visit Website...</string>
---- a/gui/mainwindow.cc 2017-01-02 06:05:19.000000000 +0100
-+++ b/gui/mainwindow.cc 2017-01-21 00:42:02.939447485 +0100
-@@ -147,7 +147,6 @@
- connect(ui_.actionAbout, SIGNAL(triggered()), this, SLOT(aboutActionX()));
- connect(ui_.actionVisit_Website, SIGNAL(triggered()), this, SLOT(visitWebsiteActionX()));
- connect(ui_.actionMake_a_Donation, SIGNAL(triggered()), this, SLOT(donateActionX()));
-- connect(ui_.actionUpgradeCheck, SIGNAL(triggered()), this, SLOT(upgradeCheckActionX()));
- connect(ui_.actionPreferences, SIGNAL(triggered()), this, SLOT(preferencesActionX()));
-
- connect(ui_.inputFormatCombo, SIGNAL(currentIndexChanged(int)),
-@@ -208,17 +208,6 @@
- restoreSettings();
-
- upgrade = new UpgradeCheck(parent, formatList_, babelData_);
-- if (babelData_.startupVersionCheck_) {
-- upgrade->checkForUpgrade(babelVersion_, babelData_.upgradeCheckTime_,
-- allowBetaUpgrades());
-- }
--
-- if (!babelData_.ignoreVersionMismatch_ && babelVersion_ != VERSION) {
-- VersionMismatch vm(0, babelVersion_, QString(VERSION));
--
-- vm.exec();
-- babelData_.ignoreVersionMismatch_ = vm.neverAgain();
-- }
- }
-
- //------------------------------------------------------------------------
-@@ -1021,10 +1010,6 @@
- //------------------------------------------------------------------------
- void MainWindow::closeActionX()
- {
-- QDateTime wt= upgrade->getUpgradeWarningTime();
-- if (wt.isValid()) {
-- babelData_.upgradeCheckTime_ = wt;
-- }
- babelData_.runCount_++;
-
- QDateTime now = QDateTime::currentDateTime();
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_version_check.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_version_check.patch
deleted file mode 100644
index e9d56d0a460b..000000000000
--- a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_version_check.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/gui/preferences.ui 2017-01-21 00:38:44.929972188 +0100
-+++ b/gui/preferences.ui 2017-01-21 00:50:05.314477610 +0100
-@@ -46,13 +46,6 @@
- </property>
- </widget>
- </item>
-- <item>
-- <widget class="QCheckBox" name="ignoreVersionMismatchCheck">
-- <property name="text">
-- <string>Ignore mismatch between command line and GUI version.</string>
-- </property>
-- </widget>
-- </item>
- </layout>
- </widget>
- </widget>
---- a/gui/preferences.cc 2017-01-21 00:39:20.648418701 +0100
-+++ b/gui/preferences.cc 2017-01-21 00:50:33.451829352 +0100
-@@ -40,7 +40,6 @@
- ui_.setupUi(this);
-
- ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_);
-- ui_.ignoreVersionMismatchCheck->setChecked(babelData_.ignoreVersionMismatch_);
- // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1.
- if (VERSION == QString("1.4.1"))
- babelData_.ignoreVersionMismatch_ = false;
-@@ -82,7 +81,6 @@
- }
-
- babelData_.reportStatistics_ = ui_.reportStatisticsCheck->isChecked();
-- babelData_.ignoreVersionMismatch_ = ui_.ignoreVersionMismatchCheck->isChecked();
- accept();
- }
-
---- a/gui/babeldata.h 2017-01-21 00:40:03.888959247 +0100
-+++ b/gui/babeldata.h 2017-01-21 00:51:05.753233149 +0100
-@@ -66,7 +66,7 @@
- startupVersionCheck_(false),
- reportStatistics_(false),
- allowBetaUpgrades_(false),
-- ignoreVersionMismatch_(false),
-+ ignoreVersionMismatch_(true),
- disableDonateDialog_(false),
- donateSplashed_(QDateTime(QDate(2010, 1, 1), QTime(0, 0, 0)))
- {
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-1.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-1.patch
deleted file mode 100644
index 36db615f9dec..000000000000
--- a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-1.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 30a345577a644125502f6e4f8b58ea3077ec8dad Mon Sep 17 00:00:00 2001
-From: Robert Lipe <robertlipe@gpsbabel.org>
-Date: Mon, 4 Sep 2017 23:20:00 -0500
-Subject: [PATCH] Prefer QStringLiteral over implicit conversion from Latin1
- for Q5 5.9. Based on work by Bernd Zeimetz.
-
----
- gpx.cc | 14 +++++++-------
- magproto.cc | 6 +++---
- unicsv.cc | 8 ++++----
- 3 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/gpx.cc b/gpx.cc
-index 3b3b963c..36701e52 100644
---- a/gpx.cc
-+++ b/gpx.cc
-@@ -494,7 +494,7 @@ tag_cache_desc(const QXmlStreamAttributes& attr)
- {
- cache_descr_is_html = 0;
- if (attr.hasAttribute("html")) {
-- if (attr.value("html").toString().compare("True") == 0) {
-+ if (attr.value("html").toString() == QStringLiteral("True")) {
- cache_descr_is_html = 1;
- }
- }
-@@ -509,16 +509,16 @@ tag_gs_cache(const QXmlStreamAttributes& attr)
- gc_data->id = attr.value("id").toString().toInt();
- }
- if (attr.hasAttribute("available")) {
-- if (attr.value("available").toString().compare("True", Qt::CaseInsensitive) == 0) {
-+ if (attr.value("available").toString().compare(QStringLiteral("True"), Qt::CaseInsensitive) == 0) {
- gc_data->is_available = status_true;
-- } else if (attr.value("available").toString().compare("False", Qt::CaseInsensitive) == 0) {
-+ } else if (attr.value("available").toString().compare(QStringLiteral("False"), Qt::CaseInsensitive) == 0) {
- gc_data->is_available = status_false;
- }
- }
- if (attr.hasAttribute("archived")) {
-- if (attr.value("archived").toString().compare("True", Qt::CaseInsensitive) == 0) {
-+ if (attr.value("archived").toString().compare(QStringLiteral("True"), Qt::CaseInsensitive) == 0) {
- gc_data->is_archived = status_true;
-- } else if (attr.value("archived").toString().compare("False", Qt::CaseInsensitive) == 0) {
-+ } else if (attr.value("archived").toString().compare(QStringLiteral("False"), Qt::CaseInsensitive) == 0) {
- gc_data->is_archived = status_false;
- }
- }
-@@ -972,7 +972,7 @@ gpx_end(const QString& el)
- * last date we saw in this log.
- */
- case tt_cache_log_type:
-- if ((cdatastr.compare("Found it") == 0) &&
-+ if ((cdatastr.compare(QStringLiteral("Found it")) == 0) &&
- (0 == wpt_tmp->gc_data->last_found.toTime_t())) {
- wpt_tmp->AllocGCData()->last_found = gc_log_date;
- }
-@@ -1423,7 +1423,7 @@ fprint_xml_chain(xml_tag* tag, const Waypoint* wpt)
- fprint_xml_chain(tag->child, wpt);
- }
- if (wpt && wpt->gc_data->exported.isValid() &&
-- tag->tagname.compare("groundspeak:cache") == 0) {
-+ tag->tagname.compare(QStringLiteral("groundspeak:cache")) == 0) {
- writer->writeTextElement("time",
- wpt->gc_data->exported.toPrettyString());
- }
-diff --git a/magproto.cc b/magproto.cc
-index 7c82e9fb..0deb7f33 100644
---- a/magproto.cc
-+++ b/magproto.cc
-@@ -819,11 +819,11 @@ mag_rd_init_common(const QString& portname)
- */
- QString exten = QFileInfo(curfname).suffix();
- if (exten.length() > 0) {
-- if (0 == exten.compare("upt", Qt::CaseInsensitive)) {
-+ if (0 == exten.compare(QStringLiteral("upt"), Qt::CaseInsensitive)) {
- extension_hint = WPTDATAMASK;
-- } else if (0 == exten.compare("log", Qt::CaseInsensitive)) {
-+ } else if (0 == exten.compare(QStringLiteral("log"), Qt::CaseInsensitive)) {
- extension_hint = TRKDATAMASK;
-- } else if (0 == exten.compare("rte", Qt::CaseInsensitive)) {
-+ } else if (0 == exten.compare(QStringLiteral("rte"), Qt::CaseInsensitive)) {
- extension_hint = RTEDATAMASK;
- }
- }
-diff --git a/unicsv.cc b/unicsv.cc
-index 4a7d78ed..6312e9d2 100644
---- a/unicsv.cc
-+++ b/unicsv.cc
-@@ -430,13 +430,13 @@ unicsv_parse_time(const QString& str, int* msec, time_t* date)
- static status_type
- unicsv_parse_status(const QString& str)
- {
-- if (str.compare("true", Qt::CaseInsensitive) == 0 ||
-- str.compare("yes", Qt::CaseInsensitive) == 0 ||
-+ if (str.compare(QStringLiteral("true"), Qt::CaseInsensitive) == 0 ||
-+ str.compare(QStringLiteral("yes"), Qt::CaseInsensitive) == 0 ||
- str == "1") {
- return status_true;
- }
-- if (str.compare("false", Qt::CaseInsensitive) == 0 ||
-- str.compare("no", Qt::CaseInsensitive) == 0 ||
-+ if (str.compare(QStringLiteral("false"), Qt::CaseInsensitive) == 0 ||
-+ str.compare(QStringLiteral("no"), Qt::CaseInsensitive) == 0 ||
- str == "0") {
- return status_false;
- }
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-2.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-2.patch
deleted file mode 100644
index ce1b0489146f..000000000000
--- a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-2.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 604178aa8ad4d3c3ad218df24c1e9a6a1f683bb3 Mon Sep 17 00:00:00 2001
-From: Harel Mazor <harel.mazor@gmail.com>
-Date: Tue, 24 Jan 2017 00:35:04 +0200
-Subject: [PATCH] Added geojson read capablity, moved magic strings to
- constants, fixed windows compilation issues.
-
----
- tef_xml.cc | 24 +++----
-
-* Removed any unrelated changes except for s/windows/Qt-5.9/ compilation issues.
-
-diff --git a/tef_xml.cc b/tef_xml.cc
-index b32d69b3..37dd85ba 100644
---- a/tef_xml.cc
-+++ b/tef_xml.cc
-@@ -72,11 +72,11 @@ tef_start(xg_string args, const QXmlStreamAttributes* attrv)
- 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 @@ tef_header(xg_string args, const QXmlStreamAttributes* attrv)
- {
- 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 @@ tef_item_start(xg_string args, const QXmlStreamAttributes* attrv)
- 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 */
- }
- }
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_shapelib.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_shapelib.patch
deleted file mode 100644
index d3a4fa0c16a3..000000000000
--- a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_shapelib.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/configure.in 2017-01-02 06:05:19.000000000 +0100
-+++ b/configure.in 2017-01-21 00:26:02.239786037 +0100
-@@ -402,7 +402,7 @@
- AC_SUBST(QT_SYSINC_OPT)
- AC_SUBST(QT_LIBS)
-
--AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile shapelib/Makefile zlib/empty])
-+AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile zlib/empty])
- AC_CONFIG_FILES([gui/makelinuxdist.sh], [chmod +x gui/makelinuxdist.sh])
- AC_OUTPUT
-
---- a/Makefile.in 2017-01-02 06:05:19.000000000 +0100
-+++ b/Makefile.in 2017-01-21 00:29:05.715731486 +0100
-@@ -100,7 +100,7 @@
- # Extra modules in Jeeps that we don't use
- # jeeps/gpsfmt.o jeeps/gpsinput.o jeeps/gpsproj.o
-
--SHAPE=shapelib/shpopen.o shapelib/dbfopen.o shapelib/safileio.o
-+SHAPE=-lshp
-
- MINIZIP=zlib/contrib/minizip/zip.o \
- zlib/contrib/minizip/ioapi.o
-@@ -119,7 +119,7 @@
- src/core/xmlstreamwriter.o \
- src/core/usasciicodec.o\
- src/core/ziparchive.o \
-- $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS)
-+ $(GARMIN) $(JEEPS) @ZLIB@ $(FMTS) $(FILTERS)
- OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@
-
- DEPFILES = $(OBJS:.o=.d)
-@@ -148,10 +148,10 @@
- all: gpsbabel$(EXEEXT)
-
- gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@
-- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
-
- gpsbabel-debug: $(OBJS)
-- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
-
- Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \
- gbversion.h.in gui/setup.iss.in
-@@ -894,11 +894,7 @@
- session.o: session.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
- gbfile.h cet.h inifile.h session.h src/core/datetime.h
- shape.o: shape.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
-- gbfile.h cet.h inifile.h session.h src/core/datetime.h \
-- shapelib/shapefil.h
--shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h
--shapelib/safileio.o: shapelib/safileio.c shapelib/shapefil.h
--shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h
-+ gbfile.h cet.h inifile.h session.h src/core/datetime.h
- skyforce.o: skyforce.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
- gbfile.h cet.h inifile.h session.h src/core/datetime.h
- skytraq.o: skytraq.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
---- a/shape.cc 2017-01-02 06:05:19.000000000 +0100
-+++ b/shape.cc 2017-01-21 00:29:58.514391517 +0100
-@@ -20,7 +20,7 @@
-
- */
- #include "defs.h"
--#include "shapelib/shapefil.h"
-+#include <libshp/shapefil.h>
- #include <stdlib.h>
-
- #if SHAPELIB_ENABLED
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_zlib.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_zlib.patch
deleted file mode 100644
index ce3591715492..000000000000
--- a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_zlib.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- a/configure.in 2017-01-21 03:17:05.480317203 +0100
-+++ b/configure.in 2017-01-21 03:26:53.743671224 +0100
-@@ -402,7 +402,7 @@
- AC_SUBST(QT_SYSINC_OPT)
- AC_SUBST(QT_LIBS)
-
--AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile zlib/empty])
-+AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile])
- AC_CONFIG_FILES([gui/makelinuxdist.sh], [chmod +x gui/makelinuxdist.sh])
- AC_OUTPUT
-
---- a/Makefile.in 2017-01-21 03:17:05.530317828 +0100
-+++ b/Makefile.in 2017-01-21 03:32:19.447032690 +0100
-@@ -102,14 +102,7 @@
-
- SHAPE=-lshp
-
--MINIZIP=zlib/contrib/minizip/zip.o \
-- zlib/contrib/minizip/ioapi.o
--
--ZLIB=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o \
-- zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/trees.o \
-- zlib/uncompr.o zlib/gzlib.o zlib/gzclose.o zlib/gzread.o \
-- zlib/gzwrite.o zlib/zutil.o $(MINIZIP)
--
-+ZLIB=-lz -lminizip
-
- LIBOBJS = queue.o route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \
- csv_util.o strptime.o grtcirc.o util_crc.o xmlgeneric.o \
-@@ -119,7 +112,7 @@
- src/core/xmlstreamwriter.o \
- src/core/usasciicodec.o\
- src/core/ziparchive.o \
-- $(GARMIN) $(JEEPS) @ZLIB@ $(FMTS) $(FILTERS)
-+ $(GARMIN) $(JEEPS) $(FMTS) $(FILTERS)
- OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@
-
- DEPFILES = $(OBJS:.o=.d)
-@@ -148,10 +141,10 @@
- all: gpsbabel$(EXEEXT)
-
- gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@
-- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) $(ZLIB) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
-
- gpsbabel-debug: $(OBJS)
-- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) $(ZLIB) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
-
- Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \
- gbversion.h.in gui/setup.iss.in
---- a/src/core/ziparchive.cc 2017-01-02 06:05:19.000000000 +0100
-+++ b/src/core/ziparchive.cc 2017-01-21 03:51:30.402421165 +0100
-@@ -23,7 +23,7 @@
-
- #include "defs.h"
- #include "src/core/logging.h"
--#include "zlib/contrib/minizip/zip.h"
-+#include <minizip/zip.h>
-
- #include <QtCore/QFile>
- #include <QtCore/QDebug>
-@@ -89,4 +89,4 @@
- return true;
- }
- return false;
--}
-\ No newline at end of file
-+}
---- a/src/core/ziparchive.h 2017-01-02 06:05:19.000000000 +0100
-+++ b/src/core/ziparchive.h 2017-01-21 03:51:05.931115241 +0100
-@@ -21,7 +21,7 @@
-
- #include <QtCore/QString>
- #include <QtCore/QStringList>
--#include "zlib/contrib/minizip/zip.h"
-+#include <minizip/zip.h>
-
- class ZipArchive
- {
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-xmldoc.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-xmldoc.patch
deleted file mode 100644
index 3fdd274927eb..000000000000
--- a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-xmldoc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile.in 2017-01-21 00:32:50.921546762 +0100
-+++ b/Makefile.in 2017-01-21 00:55:45.362728521 +0100
-@@ -278,8 +278,8 @@
- --stringparam html.cleanup "1" \
- --stringparam make.clean.html "1" \
- --stringparam html.valid.html "1" \
-- --stringparam html.stylesheet \
-- "http://www.gpsbabel.org/style3.css" \
-+ --nonet \
-+ --stringparam html.stylesheet "gpsbabel.org-style3.css" \
- http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
- xmldoc/readme.xml
-
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild
deleted file mode 100644
index 3b07666bdf59..000000000000
--- a/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop qmake-utils
-
-DESCRIPTION="GPS waypoints, tracks and routes converter"
-HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel"
-SRC_URI="
- https://dev.gentoo.org/~asturm/${P}.tar.gz
- doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc +gui"
-
-BDEPEND="
- doc? (
- app-text/docbook-xml-dtd:4.1.2
- dev-lang/perl
- dev-libs/libxslt
- )
- gui? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
- dev-libs/expat
- dev-qt/qtcore:5
- sci-libs/shapelib:=
- sys-libs/zlib[minizip]
- virtual/libusb:0
- gui? (
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwebchannel:5
- dev-qt/qtwebengine:5[widgets]
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS README.{contrib,igc,mapconverter,md,xmapwpt} )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.4.3-fix_binary_name.patch
- "${FILESDIR}"/${P}-disable_statistic_uploading.patch
- "${FILESDIR}"/${P}-disable_update_check.patch
- "${FILESDIR}"/${P}-disable_version_check.patch
- "${FILESDIR}"/${P}-use_system_shapelib.patch
- "${FILESDIR}"/${P}-use_system_zlib.patch
- "${FILESDIR}"/${P}-xmldoc.patch
- "${FILESDIR}"/${P}-qt-5.9-{1,2}.patch
-)
-
-RESTRICT="test" # bug 421699
-
-src_prepare() {
- default
-
- # remove bundled libs and cleanup
- rm -r shapelib zlib || die
- sed -i -e "s: zlib\/[a-z]*\.h::g" Makefile.in || die
-
- mv configure.in configure.ac || die
- sed -i -e "/^configure:/s/configure.in/configure.ac/" Makefile.in || die
-
- if use doc; then
- cp "${DISTDIR}/gpsbabel.org-style3.css" . || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_with doc doc doc/manual)
- LRELEASE=$(qt5_get_bindir)/lrelease
- LUPDATE=$(qt5_get_bindir)/lupdate
- QMAKE=$(qt5_get_bindir)/qmake
- --with-zlib=system
- )
- econf "${myeconfargs[@]}"
-
- if use gui; then
- pushd gui > /dev/null || die
- $(qt5_get_bindir)/lrelease *.ts || die
- eqmake5
- popd > /dev/null
- fi
-}
-
-src_compile() {
- default
- if use gui; then
- pushd gui > /dev/null || die
- emake
- popd > /dev/null
- fi
-
- if use doc; then
- perl xmldoc/makedoc || die
- emake gpsbabel.html
- fi
-}
-
-src_install() {
- use doc && local HTML_DOCS=( ${PN}.html ${PN}.org-style3.css )
-
- default
-
- if use gui; then
- dobin gui/objects/gpsbabelfe
- insinto /usr/share/${PN}/translations/
- doins gui/gpsbabel*_*.qm
- newicon gui/images/appicon.png ${PN}.png
- make_desktop_entry gpsbabelfe ${PN} ${PN} "Science;Geoscience"
- fi
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/, sci-geosciences/gpsbabel/files/
@ 2023-01-30 8:19 Andrew Ammerlaan
0 siblings, 0 replies; 9+ messages in thread
From: Andrew Ammerlaan @ 2023-01-30 8:19 UTC (permalink / raw
To: gentoo-commits
commit: 612ad41ff7c2e1766aa2e9e807f142fe256b1ce6
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 08:12:52 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 08:19:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=612ad41f
sci-geosciences/gpsbabel: drop use gui, add use qt6
Though the build system provides separate targets for
the gui and cli tools, the cmake configure files do not
reflect this and they will search for qt unconditionally.
Patching is non-trivial because the source files for the
gui and for the cli are not completely separated.
The package does support qt6 but the upstream cmake files
do not provide a means of selecting which to use and will
choose a version automagically. A simple patch is enough
to fix this.
Closes: https://bugs.gentoo.org/852836
Closes: https://bugs.gentoo.org/892559
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../gpsbabel-1.8.0-no-automagic-qt5-qt6.patch | 34 +++++++++++++++
...babel-1.8.0.ebuild => gpsbabel-1.8.0-r1.ebuild} | 48 ++++++++++++++--------
2 files changed, 64 insertions(+), 18 deletions(-)
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.8.0-no-automagic-qt5-qt6.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.8.0-no-automagic-qt5-qt6.patch
new file mode 100644
index 000000000000..47a1a37e1ba3
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-1.8.0-no-automagic-qt5-qt6.patch
@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2a7d805..65bd4db 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,7 +26,11 @@ set(CMAKE_AUTORCC ON)
+ add_executable(gpsbabel)
+
+ # Find the QtCore library
+-find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
++if(USE_QT6)
++ find_package(QT NAMES Qt6 COMPONENTS Core REQUIRED)
++else()
++ find_package(QT NAMES Qt5 COMPONENTS Core REQUIRED)
++endif()
+ find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED)
+ list(APPEND QT_LIBRARIES Qt${QT_VERSION_MAJOR}::Core)
+ if(${Qt${QT_VERSION_MAJOR}Core_VERSION} VERSION_LESS 5.12)
+diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
+index 4c839c2..ac329dd 100644
+--- a/gui/CMakeLists.txt
++++ b/gui/CMakeLists.txt
+@@ -23,7 +23,11 @@ endif()
+ add_executable(${TARGET} WIN32 MACOSX_BUNDLE)
+
+ # Find the QtCore library
+-find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
++if(USE_QT6)
++ find_package(QT NAMES Qt6 COMPONENTS Core REQUIRED)
++else()
++ find_package(QT NAMES Qt5 COMPONENTS Core REQUIRED)
++endif()
+ find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui Network SerialPort Widgets Xml REQUIRED)
+ list(APPEND QT_LIBRARIES Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::SerialPort Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Xml)
+ if(${Qt${QT_VERSION_MAJOR}Core_VERSION} VERSION_LESS 5.12)
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.8.0.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild
similarity index 68%
rename from sci-geosciences/gpsbabel/gpsbabel-1.8.0.ebuild
rename to sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild
index 47952f41dd2f..cfe639e603e8 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.8.0.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild
@@ -23,7 +23,7 @@ fi
LICENSE="GPL-2"
SLOT="0"
-IUSE="doc gui"
+IUSE="doc qt6"
BDEPEND="
virtual/pkgconfig
@@ -32,29 +32,42 @@ BDEPEND="
dev-lang/perl
dev-libs/libxslt
)
- gui? ( dev-qt/linguist-tools:5 )
+ !qt6? ( dev-qt/linguist-tools:5 )
+ qt6? ( dev-qt/qttools:6[linguist] )
"
-# Even with gui disabled, still links with qtcore
+
RDEPEND="
dev-libs/expat
sci-libs/shapelib:=
sys-libs/zlib:=[minizip]
virtual/libusb:1
- dev-qt/qtcore:5
- gui? (
+ !qt6? (
+ dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
- dev-qt/qttranslations:5
+ dev-qt/qtserialport:5
dev-qt/qtwebchannel:5
dev-qt/qtwebengine:5[widgets]
dev-qt/qtwidgets:5
dev-qt/qtxml:5
)
+ qt6? (
+ dev-qt/qtbase:6[gui,network,widgets,xml]
+ dev-qt/qtserialport:6
+ dev-qt/qtwebchannel:6
+ dev-qt/qtwebengine:6[widgets]
+ dev-qt/qt5compat:6
+ )
"
+
DEPEND="${RDEPEND}"
DOCS=( AUTHORS NEWS README.{contrib,igc,mapconverter,md} gui/README.{contrib,gui} )
+PATCHES=(
+ "${FILESDIR}/${PN}-1.8.0-no-automagic-qt5-qt6.patch"
+)
+
src_prepare() {
cmake_src_prepare
@@ -63,13 +76,14 @@ src_prepare() {
}
src_configure() {
- mycmakeargs=(
+ local mycmakeargs=(
-DGPSBABEL_WITH_LIBUSB=pkgconfig
-DGPSBABEL_WITH_SHAPELIB=pkgconfig
-DGPSBABEL_WITH_ZLIB=pkgconfig
- -DGPSBABEL_MAPPREVIEW=$(usex gui)
- -DGPSBABEL_EMBED_MAP=$(usex gui)
- -DGPSBABEL_EMBED_TRANSLATIONS=$(usex gui)
+ -DGPSBABEL_MAPPREVIEW=ON
+ -DGPSBABEL_EMBED_MAP=ON
+ -DGPSBABEL_EMBED_TRANSLATIONS=ON
+ -DUSE_QT6="$(usex qt6)"
)
cmake_src_configure
@@ -77,7 +91,7 @@ src_configure() {
cmake_src_compile() {
cmake_build gpsbabel
- use gui && cmake_build gpsbabelfe
+ cmake_build gpsbabelfe
use doc && cmake_build gpsbabel.html
}
@@ -86,11 +100,9 @@ src_install() {
einstalldocs
dobin gpsbabel
- if use gui; then
- dobin gui/GPSBabelFE/gpsbabelfe
- insinto /usr/share/${PN}/translations/
- doins gui/gpsbabel*_*.qm
- newicon gui/images/appicon.png ${PN}.png
- domenu gui/gpsbabel.desktop
- fi
+ dobin gui/GPSBabelFE/gpsbabelfe
+ insinto /usr/share/${PN}/translations/
+ doins gui/gpsbabel*_*.qm
+ newicon gui/images/appicon.png ${PN}.png
+ domenu gui/gpsbabel.desktop
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-01-30 8:19 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-28 1:14 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/, sci-geosciences/gpsbabel/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-01-30 8:19 Andrew Ammerlaan
2022-08-25 1:23 Sam James
2020-03-12 21:22 Andreas K. Hüttel
2020-03-12 20:49 Andreas K. Hüttel
2017-09-25 11:18 Andreas Sturmlechner
2017-09-16 12:47 Andreas Sturmlechner
2017-03-10 1:15 Andreas Sturmlechner
2017-01-21 16:14 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox