diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2017-01-21 02:00:31 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-01-21 17:11:58 +0100 |
commit | 7eadc62d590350189b07428c49914e2c54e68a03 (patch) | |
tree | 00f2746d53f888a6cbd0e13c885a7880e13d71c5 /sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_version_check.patch | |
parent | sci-libs/shapelib: Drop obsolete patches (diff) | |
download | gentoo-7eadc62d590350189b07428c49914e2c54e68a03.tar.gz gentoo-7eadc62d590350189b07428c49914e2c54e68a03.tar.bz2 gentoo-7eadc62d590350189b07428c49914e2c54e68a03.zip |
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
Diffstat (limited to 'sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_version_check.patch')
-rw-r--r-- | sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_version_check.patch | 45 |
1 files changed, 45 insertions, 0 deletions
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 000000000000..e9d56d0a460b --- /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))) + { |