From f45471d03535c3db9e55c179a33380be13244db0 Mon Sep 17 00:00:00 2001 From: Michael Mair-Keimberger Date: Wed, 2 Jun 2021 19:16:18 +0200 Subject: sci-geosciences/gpsbabel: remove unused patches Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger Closes: https://github.com/gentoo/gentoo/pull/21088 Signed-off-by: Andrew Ammerlaan --- .../gpsbabel-1.6.0-disable_update_check.patch | 132 -------------------- .../files/gpsbabel-9999-use_system_shapelib.patch | 133 --------------------- .../gpsbabel/files/gpsbabel-9999-xmldoc.patch | 27 ----- 3 files changed, 292 deletions(-) delete mode 100644 sci-geosciences/gpsbabel/files/gpsbabel-1.6.0-disable_update_check.patch delete mode 100644 sci-geosciences/gpsbabel/files/gpsbabel-9999-use_system_shapelib.patch delete mode 100644 sci-geosciences/gpsbabel/files/gpsbabel-9999-xmldoc.patch (limited to 'sci-geosciences') diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.6.0-disable_update_check.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.6.0-disable_update_check.patch deleted file mode 100644 index 6adeef664a52..000000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-1.6.0-disable_update_check.patch +++ /dev/null @@ -1,132 +0,0 @@ -From e24573dc7fce7c48da6b960a722b567f24e1318e Mon Sep 17 00:00:00 2001 -From: "Andreas K. Huettel" -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 @@ - - - -- - - - -@@ -720,11 +719,6 @@ - Preferences... - - -- -- -- Check for Upgrade -- -- - - - Visit Website... -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& 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 @@ - - - -- -- -- -- Check for newer version on start. -- -- -- - - - --- -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 deleted file mode 100644 index 8df45d839cdc..000000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-9999-use_system_shapelib.patch +++ /dev/null @@ -1,133 +0,0 @@ -From b69718b85b4ea9025f0f91d1e5de8b051a3c102d Mon Sep 17 00:00:00 2001 -From: "Andreas K. Huettel" -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 - - - #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 - - #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 deleted file mode 100644 index 32728e04df28..000000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-9999-xmldoc.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7930deeee0c6f00a092b73c9d098873c2344ffdf Mon Sep 17 00:00:00 2001 -From: "Andreas K. Huettel" -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 - -- cgit v1.2.3-65-gdbad