From unknown Thu Jun 19 12:26:19 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#72458 <72458@debbugs.gnu.org> To: bug#72458 <72458@debbugs.gnu.org> Subject: Status: [PATCH] gnu: gpsbabel: Update to 1.9.0. Reply-To: bug#72458 <72458@debbugs.gnu.org> Date: Thu, 19 Jun 2025 19:26:19 +0000 retitle 72458 [PATCH] gnu: gpsbabel: Update to 1.9.0. reassign 72458 guix-patches submitter 72458 Sergey Trofimov severity 72458 normal tag 72458 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 04 01:35:02 2024 Received: (at submit) by debbugs.gnu.org; 4 Aug 2024 05:35:02 +0000 Received: from localhost ([127.0.0.1]:55257 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1saTtV-0006Ln-Be for submit@debbugs.gnu.org; Sun, 04 Aug 2024 01:35:02 -0400 Received: from lists.gnu.org ([209.51.188.17]:44666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1saTtS-0006LX-Di for submit@debbugs.gnu.org; Sun, 04 Aug 2024 01:34:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1saTt7-00068Y-FZ for guix-patches@gnu.org; Sun, 04 Aug 2024 01:34:37 -0400 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1saTt4-0003Lx-8V for guix-patches@gnu.org; Sun, 04 Aug 2024 01:34:37 -0400 Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-5b5b67d0024so6465756a12.0 for ; Sat, 03 Aug 2024 22:34:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1722749670; x=1723354470; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Y2lgGicwyrWm/+jvWj1rQaUnV1Rna6RpBT48XPLgymE=; b=GPZw8+Rdfmgdy2Qjvfcx3EUqtkrdfalSCUgsI4n5avYsFK9rmTHV0/eY1TmXiHyeIP DiRhChaJGXX1b9UltocBGITz/tz+7Ojnm58PiDhP4GN+gG21GEb9iucY8ULDUvDMVzwk BjoVoL7KE8Ot8A0TYnzssen54iscZMFI8MRIg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722749670; x=1723354470; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Y2lgGicwyrWm/+jvWj1rQaUnV1Rna6RpBT48XPLgymE=; b=UPq4mz62DoErqSmppuH4SOx2oBTJOj3pEvAmF+U6BH0g/lJwTDVmb4/M90i2hC++5Q OUUOXG3WZV1y8eEAht/STh9I/14JooS4nk1HJWHE1oHShqJiu6Z4jkug3g2hQaeeJbdr 5REcWwa0iE+VIPtDFz1aU7bYjKM2grepAVVIVqnkP3iZrRWjn0iMJYp7lHkav40UcKnK D08r4beFqQaC5UAjV9dnznv0QypDovwUWUj9UbepJrXhG/CNeawhB/xSHDFZwacUe7IY cR4tONkHYKV03Hm3YIt2ICndJDklgkfcHgdQN4H4LkDOgiiBEY/gAISqbkpmQMOWYMEt hOUQ== X-Gm-Message-State: AOJu0Yz3G4DIY3H0g2FBq5SmDB7N/Obd+KYaQrZBFcs3HwdhLFxp6eDw DF/53QrpbGoRXKvYOujQMGWH9eLvJuYL26tCuSPWQpSc2TluahdiEcCirtO2jRh33h0Xc4/HgYZ pqvM= X-Google-Smtp-Source: AGHT+IGl0C17nqtKObNiWYUo+601rBVwnrdHluhTgATH9Ze7n66bYyR5XjYnxrhd2jsA3BQY8IMu+A== X-Received: by 2002:a05:6402:14d0:b0:5b5:2048:ba8d with SMTP id 4fb4d7f45d1cf-5b7f3ad6ea8mr5648524a12.16.1722749669667; Sat, 03 Aug 2024 22:34:29 -0700 (PDT) Received: from localhost ([2a02:2454:a09d:d000:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5b83b9324a0sm3154254a12.66.2024.08.03.22.34.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Aug 2024 22:34:29 -0700 (PDT) From: Sergey Trofimov To: guix-patches@gnu.org Subject: [PATCH] gnu: gpsbabel: Update to 1.9.0. Date: Sun, 4 Aug 2024 07:34:20 +0200 Message-ID: <2194c3d93e588ed03380d63360bd510fb23c4a2a.1722749638.git.sarg@sarg.org.ru> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=2a00:1450:4864:20::530; envelope-from=sarg@sarg.org.ru; helo=mail-ed1-x530.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit Cc: Sergey Trofimov 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: -3.3 (---) * gnu/packages/gps.scm (gpsbabel): Update to 1.9.0. [build-system]: Use cmake-build-system. [arguments]: Adjust for the new build system. * gnu/packages/patches/gpsbabel-fix-i686-test.patch: Delete no longer needed patch. * gnu/local.mk: Delete patch line. --- gnu/local.mk | 1 - gnu/packages/gps.scm | 42 ++++++++++------- .../patches/gpsbabel-fix-i686-test.patch | 46 ------------------- 3 files changed, 26 insertions(+), 63 deletions(-) delete mode 100644 gnu/packages/patches/gpsbabel-fix-i686-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index fac7b5973b..f739ae74c1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1428,7 +1428,6 @@ dist_patch_DATA = \ %D%/packages/patches/gpaste-fix-paths.patch \ %D%/packages/patches/gpm-glibc-2.26.patch \ %D%/packages/patches/gpodder-disable-updater.patch \ - %D%/packages/patches/gpsbabel-fix-i686-test.patch \ %D%/packages/patches/grantlee-fix-i586-precision.patch \ %D%/packages/patches/grantlee-register-metaenumvariable.patch \ %D%/packages/patches/grep-timing-sensitive-test.patch \ diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index ebb7eed99c..d79656494f 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -29,6 +29,7 @@ (define-module (gnu packages gps) #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix git-download) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system scons) #:use-module (guix build-system qt) @@ -40,6 +41,7 @@ (define-module (gnu packages gps) #:use-module (gnu packages build-tools) #:use-module (gnu packages compression) #:use-module (gnu packages docbook) + #:use-module (gnu packages geo) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages image) @@ -58,7 +60,7 @@ (define-module (gnu packages gps) (define-public gpsbabel (package (name "gpsbabel") - (version "1.7.0") + (version "1.9.0") (source (origin (method git-fetch) (uri (git-reference @@ -69,28 +71,37 @@ (define-public gpsbabel (file-name (git-file-name name version)) (sha256 (base32 - "010g0vd2f5knpq5p7qfnl31kv3r8m5sjdsafcinbj5gh02j2nzpy")) - (patches (search-patches "gpsbabel-fix-i686-test.patch")) + "0pyrbykf15znn63y9j1npdv148i9b8sgc947xq6dqw8gwx023ji5")) (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "zlib") - (substitute* "Makefile.in" - ((" zlib/z.*\\.h") "")) - ;; Delete files under GPL-compatible licences but never used - ;; on GNU systems, rather than bloating the LICENSE field. - (delete-file "gui/serial_mac.cc") ; Apple MIT - (delete-file "mingw/include/ddk/hidsdi.h") ; public domain + (delete-file-recursively "shapelib") + (delete-file-recursively "mac") #t)))) - (build-system gnu-build-system) ;; TODO: "make doc" requires Docbook & co. + (build-system cmake-build-system) (arguments - `(#:configure-flags - '("--with-zlib=system"))) + (list #:phases + #~(modify-phases %standard-phases + (add-before 'check 'set-up-test-environment + (lambda* (#:key inputs #:allow-other-keys) + (setenv "TZDIR" (search-input-directory inputs "share/zoneinfo")))) + + (replace 'install + (lambda _ + (install-file "gpsbabel" (string-append #$output "/bin"))))) + + #:configure-flags + #~(list + "-DGPSBABEL_MAPPREVIEW=OFF" + "-DGPSBABEL_WITH_LIBUSB=pkgconfig" + "-DGPSBABEL_WITH_SHAPELIB=pkgconfig" + "-DGPSBABEL_WITH_ZLIB=pkgconfig"))) (inputs - (list expat libusb qtbase-5 zlib)) + (list expat libusb libxkbcommon shapelib qt5compat qtbase qtserialport qttranslations zlib)) (native-inputs - (list which qttools-5 libxml2)) ;'xmllint' needed for the KML tests + (list which pkg-config qttools libxml2 tzdata-for-tests)) ;'xmllint' needed for the KML tests (home-page "https://www.gpsbabel.org/") (synopsis "Convert and exchange data with GPS and map programs") (description @@ -99,8 +110,7 @@ (define-public gpsbabel manipulation abilities making it a convenient for server-side processing or as the back-end for other tools. It does not convert, transfer, send, or manipulate maps.") - (license (list license:expat ; shapelib/*.[ch] - license:gpl2+)))) ; everything else + (license (list license:gpl2+)))) (define-public gpscorrelate (package diff --git a/gnu/packages/patches/gpsbabel-fix-i686-test.patch b/gnu/packages/patches/gpsbabel-fix-i686-test.patch deleted file mode 100644 index 5ba0305113..0000000000 --- a/gnu/packages/patches/gpsbabel-fix-i686-test.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://github.com/gpsbabel/gpsbabel/commit/465a74194d53acea5c8d74c5cf3cb2940546ec92.patch -Can be removed next release - -From 465a74194d53acea5c8d74c5cf3cb2940546ec92 Mon Sep 17 00:00:00 2001 -From: tsteven4 <13596209+tsteven4@users.noreply.github.com> -Date: Fri, 7 Aug 2020 11:29:22 -0600 -Subject: [PATCH] fix i386 regression error with engima. (#620) - -this was motivated by the test failure seen at -https://buildd.debian.org/status/fetch.php?pkg=gpsbabel&arch=i386&ver=1.7.0%2Bds-4&stamp=1596794554&raw=0 ---- - enigma.cc | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/enigma.cc b/enigma.cc -index 850f27b4e..32fea92d6 100644 ---- a/enigma.cc -+++ b/enigma.cc -@@ -21,9 +21,16 @@ - - */ - -+#include // for fabs, lround -+#include // for int32_t, uint8_t, uint32_t -+#include // for abs -+#include // for strlen, memcpy, memset -+ -+#include // for QString -+ - #include "defs.h" --#include --#include -+#include "gbfile.h" // for gbfclose, gbfopen_le, gbfread, gbfwrite, gbfile -+ - - #define MYNAME "Enigma binary route and waypoint file format" - -@@ -177,7 +184,7 @@ enigma_waypt_disp(const Waypoint* wpt) - le_write32(&ewpt.longitude, decToEnigmaPosition(wpt->longitude)); - ewpt.waypoint_type = WTYPE_WAYPOINT; - if (wpt->altitude != unknown_alt) { -- le_write32(&ewpt.data.wp_altitude, METERS_TO_FEET(wpt->altitude) + 1000); -+ le_write32(&ewpt.data.wp_altitude, lround(METERS_TO_FEET(wpt->altitude)) + 1000); - } - if (wpt->shortname != nullptr) { - ewpt.shortname_len = (uint8_t) min(6, strlen(CSTRc(wpt->shortname))); base-commit: 46a64c7fdd057283063aae6df058579bb07c4b6a -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 22 07:45:50 2024 Received: (at 72458-done) by debbugs.gnu.org; 22 Aug 2024 11:45:50 +0000 Received: from localhost ([127.0.0.1]:36924 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sh6GE-0007go-3J for submit@debbugs.gnu.org; Thu, 22 Aug 2024 07:45:50 -0400 Received: from mira.cbaines.net ([212.71.252.8]:44066) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sh6GB-0007gd-3h for 72458-done@debbugs.gnu.org; Thu, 22 Aug 2024 07:45:48 -0400 Received: from localhost (unknown [212.132.255.81]) by mira.cbaines.net (Postfix) with ESMTPSA id DD9A027BBE2; Thu, 22 Aug 2024 12:45:00 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id b34b03f8; Thu, 22 Aug 2024 11:45:00 +0000 (UTC) From: Christopher Baines To: Sergey Trofimov Subject: Re: [bug#72458] [PATCH] gnu: gpsbabel: Update to 1.9.0. In-Reply-To: <2194c3d93e588ed03380d63360bd510fb23c4a2a.1722749638.git.sarg@sarg.org.ru> (Sergey Trofimov's message of "Sun, 4 Aug 2024 07:34:20 +0200") References: <2194c3d93e588ed03380d63360bd510fb23c4a2a.1722749638.git.sarg@sarg.org.ru> User-Agent: mu4e 1.12.4; emacs 29.3 Date: Thu, 22 Aug 2024 12:45:00 +0100 Message-ID: <874j7cpyrn.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 72458-done Cc: 72458-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: -1.0 (-) --=-=-= Content-Type: text/plain Sergey Trofimov writes: > * gnu/packages/gps.scm (gpsbabel): Update to 1.9.0. > [build-system]: Use cmake-build-system. > [arguments]: Adjust for the new build system. > * gnu/packages/patches/gpsbabel-fix-i686-test.patch: Delete no longer > needed patch. > * gnu/local.mk: Delete patch line. > --- > gnu/local.mk | 1 - > gnu/packages/gps.scm | 42 ++++++++++------- > .../patches/gpsbabel-fix-i686-test.patch | 46 ------------------- > 3 files changed, 26 insertions(+), 63 deletions(-) > delete mode 100644 gnu/packages/patches/gpsbabel-fix-i686-test.patch Thanks, I pushed this to master as 2e884407c4c23fe2b19fa0ba4661680a0b59bc50. Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmbHJLxfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9Xfw4hAAm2e8uavuaASGT4E+C9/vzr8m9yA4fknU vCoDsk97z6RYo3Se7y4HwTOa8LQl0LLjEq6zZ3TWvCu+/zP9GW4vkfIcn4WBJ9Nz vUGGjQFUWtfod3+ng2wAvveQhChTIwMPNqOMyxgS29/fRiLIBEWdsJ1HGSbPNBqV sgTADdrBvWMBoranImgsT5I6z+f6fyXbYeHVR52KtfrT/I5xBcKZHn2sTW57Qy+J iWY8Gyc9afj8zvCOAab36DV/b4RdcXwQDUlISW3u0+ulU4reDGBZ90Rljn3g8ILt 8sdhRnr3SMYDfYkB7b+T4OXA8OszGATnTvX+JlQvwSr5pcaB5Ij3HrM48RFIW/7G LyWBpsiBbasFc51JHo+/2W5GZVwXssnf7kQ00xdnczUhq5so/tY0U8cVMjWDNd8v Xehp4JlAXJAcfe0XSAuv6WcUCwd0mx26yThDy1xccBrZKnjQo0lk+gFXk7bD8BTs sbyC3sss/W67YzEzp91tKLxtV6licwp8LFxxdSebm7GrK8TLPNB1R0UJNQtYA+N1 1tz7McXMvcQMXS1O278SxdUzgRtjQDe1TkOjJkOnn6u6IjrKOv4XCEkbUPxD8cys oJfYea+8b069unHSXu+bQzJXK3r79PjQnxfYaTnh9mx5IwoJn5i+5BmpumtcCZ9q BCcQtYz+SW4= =LOmG -----END PGP SIGNATURE----- --=-=-=-- From unknown Thu Jun 19 12:26:19 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 20 Sep 2024 11: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