From unknown Fri Jun 20 07:09:47 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#45681 <45681@debbugs.gnu.org> To: bug#45681 <45681@debbugs.gnu.org> Subject: Status: [PATCH] gnu: gpsbabel: Update to 1.7.0. Reply-To: bug#45681 <45681@debbugs.gnu.org> Date: Fri, 20 Jun 2025 14:09:47 +0000 retitle 45681 [PATCH] gnu: gpsbabel: Update to 1.7.0. reassign 45681 guix-patches submitter 45681 Bj=C3=B6rn H=C3=B6fling severity 45681 normal tag 45681 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 05 16:54:33 2021 Received: (at submit) by debbugs.gnu.org; 5 Jan 2021 21:54:33 +0000 Received: from localhost ([127.0.0.1]:42846 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kwuHZ-0008A9-Sj for submit@debbugs.gnu.org; Tue, 05 Jan 2021 16:54:33 -0500 Received: from lists.gnu.org ([209.51.188.17]:35138) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kwuHX-0008A1-T2 for submit@debbugs.gnu.org; Tue, 05 Jan 2021 16:54:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kwuHX-0002CI-CI for guix-patches@gnu.org; Tue, 05 Jan 2021 16:54:23 -0500 Received: from m4s11.vlinux.de ([83.151.27.109]:50258 helo=bjoernhoefling.de) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kwuHU-000488-VC for guix-patches@gnu.org; Tue, 05 Jan 2021 16:54:22 -0500 Received: from alma-ubu.fritz.box (p57b522b0.dip0.t-ipconnect.de [87.181.34.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bjoernhoefling.de (Postfix) with ESMTPSA id 7FF203F988 for ; Tue, 5 Jan 2021 22:54:18 +0100 (CET) Date: Tue, 5 Jan 2021 22:54:17 +0100 From: =?UTF-8?B?QmrDtnJuIEjDtmZsaW5n?= To: Subject: [PATCH] gnu: gpsbabel: Update to 1.7.0. Message-ID: <20210105225417.7bfa3c8b@alma-ubu.fritz.box> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/h2Jxf_0YHqZGbEBQSQccQYn"; protocol="application/pgp-signature" Received-SPF: none client-ip=83.151.27.109; envelope-from=bjoern.hoefling@bjoernhoefling.de; helo=bjoernhoefling.de X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, KHOP_HELO_FCRDNS=0.195, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --Sig_/h2Jxf_0YHqZGbEBQSQccQYn Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable * gnu/packages/gps.scm (gpsbabel): Update to 1.7.0. [source]: Use git-fetch, remove obsolete patches. [inputs]: Add libusb. * gnu/packages/patches/gpsbabel-minizip.patch: Remove file. * gnu/packages/patches/gpsbabel-qstring.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove entries. --- gnu/local.mk | 3 +- gnu/packages/gps.scm | 27 ++++---- gnu/packages/patches/gpsbabel-minizip.patch | 13 ---- gnu/packages/patches/gpsbabel-qstring.patch | 69 --------------------- 4 files changed, 14 insertions(+), 98 deletions(-) delete mode 100644 gnu/packages/patches/gpsbabel-minizip.patch delete mode 100644 gnu/packages/patches/gpsbabel-qstring.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2e026cb252..396baae4ab 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -39,6 +39,7 @@ # Copyright =C2=A9 2020 Martin Becze # Copyright =C2=A9 2020 Malte Frank Gerdes # Copyright =C2=A9 2020 Vinicius Monego +# Copyright =C2=A9 2021 Bj=C3=B6rn H=C3=B6fling # # This file is part of GNU Guix. # @@ -1113,8 +1114,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/go-skip-gc-test.patch \ %D%/packages/patches/gpm-glibc-2.26.patch \ %D%/packages/patches/gpodder-disable-updater.patch \ - %D%/packages/patches/gpsbabel-minizip.patch \ - %D%/packages/patches/gpsbabel-qstring.patch \ %D%/packages/patches/grantlee-merge-theme-dirs.patch \ %D%/packages/patches/grep-timing-sensitive-test.patch \ %D%/packages/patches/grocsvs-dont-use-admiral.patch \ diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index e0f489f8de..fdb64f0902 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -6,6 +6,7 @@ ;;; Copyright =C2=A9 2020 Guillaume Le Vaillant ;;; Copyright =C2=A9 2020 Vincent Legoll ;;; Copyright =C2=A9 2020 Marius Bakke +;;; Copyright =C2=A9 2021 Bj=C3=B6rn H=C3=B6fling ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,21 +52,18 @@ (define-public gpsbabel (package (name "gpsbabel") - (version "1.5.4") + (version "1.7.0") (source (origin - (method url-fetch) - ;; XXX: Downloads from gpsbabel.org are hidden behind a POST= , so - ;; get it from elsewhere. - (uri (string-append - "mirror://debian/pool/main/g/gpsbabel/gpsbabel_" - version ".orig.tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/gpsbabel/gpsbabel") + (commit (string-append + "gpsbabel_" + (string-replace-substring version "." "_"))))) + (file-name (git-file-name name version)) (sha256 (base32 - "19hykxhyl567gf8qcrl33qhv95w0g4vxw9r3h9b8d8plx9bnaf8l")) - (patches (search-patches - "gpsbabel-minizip.patch" - ;; XXX: Remove this patch on the next release. - "gpsbabel-qstring.patch")) + "010g0vd2f5knpq5p7qfnl31kv3r8m5sjdsafcinbj5gh02j2nzpy")) (modules '((guix build utils))) (snippet '(begin @@ -87,8 +85,9 @@ #:tests? #f)) (inputs `(("expat" ,expat) - ("zlib" ,zlib) - ("qtbase" ,qtbase))) + ("libusb" ,libusb) + ("qtbase" ,qtbase) + ("zlib" ,zlib))) (native-inputs `(("which" ,which) ("qttools" ,qttools) diff --git a/gnu/packages/patches/gpsbabel-minizip.patch b/gnu/packages/pat= ches/gpsbabel-minizip.patch deleted file mode 100644 index 8f3bb36f57..0000000000 --- a/gnu/packages/patches/gpsbabel-minizip.patch +++ /dev/null @@ -1,13 +0,0 @@ -Patch taken from https://sources.debian.org/data/main/g/gpsbabel/1.5.3-2/d= ebian/patches/use_minizip. - ---- a/Makefile.in -+++ b/Makefile.in -@@ -120,7 +120,7 @@ LIBOBJS =3D queue.o route.o waypt.o filter - src/core/usasciicodec.o\ - src/core/ziparchive.o \ - $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS) --OBJS =3D main.o globals.o $(LIBOBJS) @FILEINFO@ -+OBJS =3D main.o globals.o $(MINIZIP) $(LIBOBJS) @FILEINFO@ -=20 - DEPFILES =3D $(OBJS:.o=3D.d) -=20 \ No newline at end of file diff --git a/gnu/packages/patches/gpsbabel-qstring.patch b/gnu/packages/pat= ches/gpsbabel-qstring.patch deleted file mode 100644 index 8ba1a7213b..0000000000 --- a/gnu/packages/patches/gpsbabel-qstring.patch +++ /dev/null @@ -1,69 +0,0 @@ -Extracted from following patch of gpsbabel: -https://github.com/gpsbabel/gpsbabel/commit/604178aa8ad4d3c3ad218df24c1e9a= 6a1f683bb3 - -From 604178aa8ad4d3c3ad218df24c1e9a6a1f683bb3 Mon Sep 17 00:00:00 2001 -From: Harel Mazor -Date: Tue, 24 Jan 2017 00:35:04 +0200 -Subject: [PATCH] Added geojson read capablity, moved magic strings to - constants, fixed windows compilation issues. - ---- a/tef_xml.cc -+++ b/tef_xml.cc -@@ -72,11 +72,11 @@ tef_start(xg_string args, const QXmlStreamAttributes* = attrv) - bool valid =3D false; -=20 - foreach(QXmlStreamAttribute attr, *attrv) { -- if (attr.name().compare("Comment", Qt::CaseInsensitive) =3D=3D 0) { -- if (attr.value().compare("TourExchangeFormat", Qt::CaseInsensitive)= =3D=3D 0) { -+ if (attr.name().compare(QString("Comment"), Qt::CaseInsensitive) =3D= =3D 0) { -+ if (attr.value().compare(QString("TourExchangeFormat"), Qt::CaseIns= ensitive) =3D=3D 0) { - valid =3D true; - } -- } else if (attr.name().compare("Version", Qt::CaseInsensitive) =3D=3D= 0) { -+ } else if (attr.name().compare(QString("Version"), Qt::CaseInsensitiv= e) =3D=3D 0) { - version =3D attr.value().toString().toDouble(); - } - } -@@ -95,9 +95,9 @@ tef_header(xg_string args, const QXmlStreamAttributes* a= ttrv) - { - route =3D route_head_alloc(); - foreach(QXmlStreamAttribute attr, *attrv) { -- if (attr.name().compare("Name", Qt::CaseInsensitive) =3D=3D 0) { -+ if (attr.name().compare(QString("Name"), Qt::CaseInsensitive) =3D=3D = 0) { - route->rte_name =3D attr.value().toString().trimmed(); -- } else if (attr.name().compare("Software", Qt::CaseInsensitive) =3D= =3D 0) { -+ } else if (attr.name().compare(QString("Software"), Qt::CaseInsensiti= ve) =3D=3D 0) { - route->rte_desc =3D attr.value().toString().trimmed(); - } - } -@@ -248,20 +248,20 @@ tef_item_start(xg_string args, const QXmlStreamAttri= butes* attrv) - QString attrstr =3D attr.value().toString(); - QByteArray attrtext =3D attrstr.toUtf8(); -=20 -- if (attr.name().compare("SegDescription", Qt::CaseInsensitive) =3D=3D= 0) { -+ if (attr.name().compare(QString("SegDescription"), Qt::CaseInsensitiv= e) =3D=3D 0) { - wpt_tmp->shortname =3D attrstr.trimmed(); -- } else if (attr.name().compare("PointDescription", Qt::CaseInsensitiv= e) =3D=3D 0) { -+ } else if (attr.name().compare(QString("PointDescription"), Qt::CaseI= nsensitive) =3D=3D 0) { - wpt_tmp->description =3D attrstr.trimmed(); -- } else if (attr.name().compare("ViaStation", Qt::CaseInsensitive) =3D= =3D 0 && -- attr.value().compare("true", Qt::CaseInsensitive) =3D=3D 0= ) { -+ } else if (attr.name().compare(QString("ViaStation"), Qt::CaseInsensi= tive) =3D=3D 0 && -+ attr.value().compare(QString("true"), Qt::CaseInsensitive)= =3D=3D 0) { - wpt_tmp->wpt_flags.fmt_use =3D 1; /* only a flag */ -=20 - /* new in TEF V2 */ -- } else if (attr.name().compare("Instruction", Qt::CaseInsensitive) = =3D=3D 0) { -+ } else if (attr.name().compare(QString("Instruction"), Qt::CaseInsens= itive) =3D=3D 0) { - wpt_tmp->description =3D attrstr.trimmed(); -- } else if (attr.name().compare("Altitude", Qt::CaseInsensitive) =3D= =3D 0) { -+ } else if (attr.name().compare(QString("Altitude"), Qt::CaseInsensiti= ve) =3D=3D 0) { - wpt_tmp->altitude =3D attrstr.toDouble(); -- } else if (attr.name().compare("TimeStamp", Qt::CaseInsensitive) =3D= =3D 0) { -+ } else if (attr.name().compare(QString("TimeStamp"), Qt::CaseInsensit= ive) =3D=3D 0) { - /* nothing for the moment */ - } - } ---=20 -2.16.1 - --=20 2.29.2 --Sig_/h2Jxf_0YHqZGbEBQSQccQYn Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iF0EAREKAB0WIQQiGUP0np8nb5SZM4K/KGy2WT5f/QUCX/TgCQAKCRC/KGy2WT5f /SF4AKCORxrrqIuhEePSMAq9Z8+mDbhnbACgipdByBZAh6Sa7lQVvrVljclfXTw= =ubye -----END PGP SIGNATURE----- --Sig_/h2Jxf_0YHqZGbEBQSQccQYn-- From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 06 04:20:31 2021 Received: (at 45681-done) by debbugs.gnu.org; 6 Jan 2021 09:20:31 +0000 Received: from localhost ([127.0.0.1]:43411 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kx4zW-00013p-Qy for submit@debbugs.gnu.org; Wed, 06 Jan 2021 04:20:31 -0500 Received: from flashner.co.il ([178.62.234.194]:59574) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kx4zU-00013V-FW for 45681-done@debbugs.gnu.org; Wed, 06 Jan 2021 04:20:29 -0500 Received: from localhost (unknown [5.102.238.249]) by flashner.co.il (Postfix) with ESMTPSA id 5F95540215; Wed, 6 Jan 2021 09:20:22 +0000 (UTC) Date: Wed, 6 Jan 2021 11:19:48 +0200 From: Efraim Flashner To: =?utf-8?B?QmrDtnJuIEjDtmZsaW5n?= Subject: Re: [bug#45681] [PATCH] gnu: gpsbabel: Update to 1.7.0. Message-ID: References: <20210105225417.7bfa3c8b@alma-ubu.fritz.box> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="mdevBvj1SKZTdwzC" Content-Disposition: inline In-Reply-To: <20210105225417.7bfa3c8b@alma-ubu.fritz.box> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Looks good! I was able to follow-up with removing the bundled zlib and enabling the tests. Patch pushed! -- Efraim Flashner אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [5.102.238.249 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: flashner.co.il] X-Debbugs-Envelope-To: 45681-done Cc: 45681-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Looks good! I was able to follow-up with removing the bundled zlib and enabling the tests. Patch pushed! -- Efraim Flashner אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: flashner.co.il] 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [5.102.238.249 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager --mdevBvj1SKZTdwzC Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Looks good! I was able to follow-up with removing the bundled zlib and enabling the tests. Patch pushed! --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --mdevBvj1SKZTdwzC Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAl/1gLQACgkQQarn3Mo9 g1Hg9BAAhhbjquW/s1ZMzWJgWtHMa0AXd72zDy+NfWiYWqYcpAHqBvObyKNODoqc moSVDm/rM3y3wwJS6f0dJyO4Owa1pHg3t2rbs/KBL/y5ehlY1oYUlMEYT7SFymAs RMuIzhAkrfh++Pup24bifK0C22gILquv+OI1F7+DL2/lK95vV3KcBQ4W6oAL9RkN Dzlqg3JJ1ug73YnX4fmVAGbpXCvgTHK3zKzczUtw5OocS4o0zv2PGs5q8MHa5675 NGaj3ZBDzbcE8rbbwQ+Z+xjIMvxV654h8yyOiJMsEwy7rouQ0z3+KvbmbxxWaLiM 3oGfTV6PLtpN5hibQIKF+ZKjWEDc5V+bxaFHNElInGyETjFVgT7qQCbiP1p0z/W9 lulNx+yxxhCswOls1tY1J5BkJt6SYrQNhnw+CB98dbW43P4NTBDAXnb1KJ4Jl54a r3Peb6Ar4jH5xTO7hw9Ck937r8TV+T5gA2ODNL8ZinxfhDysTTQ2wemHuZDpAzGU D1cPawMmn7cyHCEFPlS5XDSRGV6hFjNu7DO0KAuvIl+oD/5VfWiMPMi/Dcr+pfsD HaReQgoMX7qlue6DuQ76zare7NuMLz4caPl5xOrdi+TB8Ugomf9thO2zBQlFb+TD yet5+Bd0Xfx3a8vFfvFbszCz+a7ahmU96u4mF1ICqaQdKwLRtJ8= =FVYL -----END PGP SIGNATURE----- --mdevBvj1SKZTdwzC-- From unknown Fri Jun 20 07:09:47 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 03 Feb 2021 12:24:10 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator