From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id QNyyJkjg9F9PWwAA0tVLHw (envelope-from ) for ; Tue, 05 Jan 2021 21:55:20 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id qFeDIkjg9F9BCgAAB5/wlQ (envelope-from ) for ; Tue, 05 Jan 2021 21:55:20 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 337619403CB for ; Tue, 5 Jan 2021 21:55:20 +0000 (UTC) Received: from localhost ([::1]:41242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kwuIR-0002Kw-4V for larch@yhetil.org; Tue, 05 Jan 2021 16:55:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35186) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kwuIA-0002Kh-G5 for guix-patches@gnu.org; Tue, 05 Jan 2021 16:55:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59533) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kwuI9-0004MO-RF for guix-patches@gnu.org; Tue, 05 Jan 2021 16:55:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kwuI9-0008B7-Oe for guix-patches@gnu.org; Tue, 05 Jan 2021 16:55:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45681] [PATCH] gnu: gpsbabel: Update to 1.7.0. Resent-From: =?UTF-8?Q?Bj=C3=B6rn_?= =?UTF-8?Q?H=C3=B6fling?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 Jan 2021 21:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45681 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45681@debbugs.gnu.org X-Debbugs-Original-To: Received: via spool by submit@debbugs.gnu.org id=B.160988367331395 (code B ref -1); Tue, 05 Jan 2021 21:55:01 +0000 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?Q?Bj=C3=B6rn_?= =?UTF-8?Q?H=C3=B6fling?= 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -2.44 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 337619403CB X-Spam-Score: -2.44 X-Migadu-Scanner: scn0.migadu.com X-TUID: qu1/rOM6le9Y --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--