From patchwork Fri Jul 12 19:30:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 29248 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6E0E927BBEA; Fri, 12 Jul 2024 20:37:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2B13027BBE2 for ; Fri, 12 Jul 2024 20:37:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sSM4p-0004Wh-Q3; Fri, 12 Jul 2024 15:37:07 -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 1sSM4k-0004W9-Du for guix-patches@gnu.org; Fri, 12 Jul 2024 15:37:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sSM4k-0000j5-2z for guix-patches@gnu.org; Fri, 12 Jul 2024 15:37:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sSM4k-0005Ng-6Y for guix-patches@gnu.org; Fri, 12 Jul 2024 15:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72082] [PATCH] gnu: gpxsee: Update to 13.22. Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 Jul 2024 19:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72082 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72082@debbugs.gnu.org Cc: Morgan Smith X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172081297420624 (code B ref -1); Fri, 12 Jul 2024 19:37:01 +0000 Received: (at submit) by debbugs.gnu.org; 12 Jul 2024 19:36:14 +0000 Received: from localhost ([127.0.0.1]:54829 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSM3y-0005MZ-6u for submit@debbugs.gnu.org; Fri, 12 Jul 2024 15:36:14 -0400 Received: from lists.gnu.org ([209.51.188.17]:53308) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSM3u-0005MQ-PR for submit@debbugs.gnu.org; Fri, 12 Jul 2024 15:36:13 -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 1sSM3t-0004Sg-Vz for guix-patches@gnu.org; Fri, 12 Jul 2024 15:36:10 -0400 Received: from mail-bn1nam02olkn2050.outbound.protection.outlook.com ([40.92.15.50] helo=NAM02-BN1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sSM3q-0000Wo-DC for guix-patches@gnu.org; Fri, 12 Jul 2024 15:36:09 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qCE3tiEN7vFINpxcc65bVSPPs+oEAWvyD6z8wKMRZjl+Onr5PlJEnPTXuuK96Znkj1XOdkNwwS7YvAUpZyPT/RCeCoMNagqc1W/LHDWrgHyP6p1sDRVwbpMDEeNF80MhqAHqAJlZHsu46mAB53ZdsL7nMDrXogq30MhNI64T6ZlFtERZudCdWx5mqNAnfwhdI11CYrC7JXiO05O1FVKEFroWOPair4VZ+U0oqJa9E1DuLvReX7N9/TIpShXLIKbUi+BvOKMWUi5HPaGHDuHOypRrDXMioqHSMWx8t9xNU6x2FZdNe9hj1m7Hqq9df3Bf6muORrwvg0NGtEKe0eNt3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2IstHwAmkBAXajR1SinZnuuMXjFP5peoH8/FE5HpYGc=; b=EoTvYs/5iMir3gVMf5lbBmrKsz8BcD52KrYxNyve8dSngbync+Iuw1P4KqENXHrE0d585AUXFyBF8ANpgJNUi4dp8t4iKUqIZHJMIdXVm3Q62k6H2x0+/PzpVogTGxE7JLS1+zhJ1AOoTRstF6tMhhOKEnss+pnObVIXm2BhrWBFku6uIlWE+iZ4MVb7VFWGIe2mK0ImwVLZ9bek0qt+ylAZSOWf6bjENi8kG9ufZjKRemWAL5qVa6BXAGCGU5L/iGuRYO8k/QurHCCITeZnjsLL2Cfo/4125GBAB5vtnXm4HHt0ysyA4I354DJIJt4Y0ijMfokExTyRbXKq0LgeZw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2IstHwAmkBAXajR1SinZnuuMXjFP5peoH8/FE5HpYGc=; b=fr0YdPTFo3k9QMOfsmknJYvenS+Ojnx9hKj//fsqHOD+O+BhdSO2L7UnsbWUNWG1OIhm0SjLnfVb8Bwb0RlAiEriRJNyaAW+B8riXWNA/us4UdHgfWo5/A17roeSx9j64Bz6IBOKJbeTPCCFodvzaHyeTb02wZwEj4dTO5CPQ27jm7nFMJNNPWzEptjVn/iENIuEzGuNklM9SnR+5zjP79cRwsjT4nnjOMp1QlVYmJNA9SgLOCG4BHb2Vd716yYFBujfcCJL2V1fiQChRSzej1X6KyDPSTQ3wm/YJungQlXu8t14d0aIZWARk74aiAgzVOfdW21fQt1qsxV/gFe0NQ== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by MW5PR84MB1916.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:303:1c6::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.34; Fri, 12 Jul 2024 19:31:01 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef%4]) with mapi id 15.20.7762.020; Fri, 12 Jul 2024 19:31:01 +0000 From: Morgan Smith Date: Fri, 12 Jul 2024 15:30:15 -0400 Message-ID: X-Mailer: git-send-email 2.45.2 X-TMN: [Qm1mBoPm/7X0FvJMCC8q9hHo7CutARCx] X-ClientProxiedBy: YT4PR01CA0342.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:fc::11) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|MW5PR84MB1916:EE_ X-MS-Office365-Filtering-Correlation-Id: ddcce073-21b9-43f7-94f7-08dca2a929be X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicBN3jMkX1QgqrETGOe1DjntN2UvgbEykrQhS04eTdNb+hVBbHX+lBRhSEVfTZweD0s9Ytm4m1u8wBwrPoGcRXDWzqMeVCLuWOqBsU+UgSS5Cs24spGapJBvVTEXr23BPuKYZdaExFoG/xV9j/vV1EBooaQMgw2A7Oks7HfoG7OrZdC6q34fed5znfVig1KpflR4HCkDAWFGJmJxCWvC4aORZreysqCvufkpGcMYq3VT52VLd8JA13mQIWHupluTo1E78sgTaSk/n98WeY61LE1ThetIraTmcIgcdY8ieOs0ehqfS5WSnPq7qXCLJ5w2PI4Rga4RE/xwubsGUEYffgijPBmWDBTviW598MOhS4oLcsBAYv5WTKImvQC4YyMCk1St3j8gCrv34k5aLbdoRo3hlpBUs0ad681d3OjwwqAhBZXKbOS4ber6FrCMjfAW9ddmwqJJpaHkZz52L2idkDMiM8H/srM3Du/TL6R/6OVNJB3jTWULUrqAmyx5yhtMDZLXS6VaRX7ItsiAbZiUdpMZTeXmx1AiPwMKlEOEEbegxZn5ZKQKR5RBWvD+AdPEuXktoIItNihFAYjl+xTK92MnefcA64BMjPtQj9Ql5PaSuhUK5QeVpyv1SpuvgVjCJryU9yFQq+MD7e01UovwFziszdDM8KniGpV2mU5pLRfqwQ9h7T0uqXzeegnXc7QfjLl2PMg1z4jBar2dX7SZSKeCuXZJdXOpc8kDLobjyfVKsw== X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|8060799006|19110799003|440099028|4302099013|3412199025|1602099012|1710799026; X-Microsoft-Antispam-Message-Info: Fie7i3+hXUKrNh+DSiXjRDfO3F4Sm9ywAOu2B4CyOj6YYx5RHNHFfOH6AqAopUuvKqW6dpBw5xKkX3flySHl4blJWhU7sb1hE3WivSBOt76f941rlh+eswkQVSjGBJxKeV9gRC4FO9JebRqAYxX/j379Dfc+8qBmeySgT2VR7D6zatKIAKYeND6+auTA0BeU0EZXHJ6Snalzw8Sq/2Y7q6AFVbxwMacgg7YUsPTBRx3roaDDbJYepLGN0diZnPprui3CxJyyRz+6ijssMkseCHMwJ4Ay6vftOtgcLmdl85a0WvBoog89KGKByle7TCSxj2JVLSlBX/NBakAopXmPqwjUMAUUVLXo/3OBCasLF67+SRTEp9MV8uoUT4Vz1YSFqnnOjFd6fm7XCvbNR42VbWAp3cUVLi6fwsAVcvxd8AH6ShZo5VAKCeq3HVfxzp/JiHvHXzy3otrFyyxKUYBgI1Ih4Tc/zEDPtDVBe+tO8KQ7rmDNSgxa9fKdvq4TwprbzKWisF/XonFYIlVqIAA84rbjRCm2z6y+GOidxdfNDzCTbLqhqDsTCfyfccL4MkX4MRctfEHhOoXX5lvN0jIzOIeQug4x7v7B9PURIOvq47YbagdTgjG2ryAGyxCm8fq6kKzrE+ewNc40V7kNkKUfLee1bhzXvu4LW+GDmM2d+HufmBNRUMbTyqj7LFxKWc3eF1d6kmcQFfTN7+94mmBi6P4uA1Gn2/VZ+PYbzjnMu44O9IoQZpv6EIq1irUmi+jfX6wfitkZu1Z98LYySE4GJ9nHshw0d3TLhbYHIkyGWGg= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xNS25pdoPUa3+9ZNVQ/qwXKfn2TAW1f7mTkA3qIatFT6SNnTEj706BikOcKk5DTk/47+sO2f9F/6eLtlswZGD4Crb0wD/F3mHOiN2rpi1BGMtwveQ9OPx7DV1IIAenxg3eTbKP21qBhIClGvZxR92nHlK6tb7k0ElGZJCK3Q03hdoYVEU/FLfQnW/2UslYrqH588EiidloFbSKcClyEO7N37QxC7CiydCCXC7lJml1xgChlHT/ToB72eb5KGNKpsiZe088Bg2aHR6/Qqni3nH3uSGM26alywAhvAfyhr459Ht0JCQHOu50ZmcetI69dW4MRdeF/mWLXAc3UYSeJtPmxypD0qXGyiI3DF8g6MKuA7rDaqzq0KxOp3sfZ/HLJcpSntJmiDk0btMl8aoTk/yjKZVwM3Kzs4znPjmhJf2JLjFSY2TH1F67voj+cZwIIRqhTKhf8viO2gexcwFJUH8+VQNr3dw3xX0dAyZ62PHOHSbwrvvNv5iUu4f+wfv0Qqs+junyHh8GP3ZxZFXweHEqjWWy6iQRUapbs0OabQSQaXuYK0Z0ArjMvS1cRyMrnhD8wLjSDhVXstSQbtu1qUXT/qqnhIFwkfatdgGiAocShMnNv6UN42onSmFUnidh5orh3k14uV2uKirv/U2x1yPuGZolUKKhWBAgaRCd8f3LaAIWpDlHh+E3TzPF3YNc6bf3wXtQ7dqXDOgRKnTCDH2jy9wnwItlxqPaMNyY5Ju2bb6PkyB5MTmYFDo8LBFFdMQLGnDu2opsCaEzdkvgeA/9Y8yizrY42OXhMCUI8O/3h+7KeoHJkSzf3iOaxiBo0g5bD5ojj9cK17fXZsnPZzpSaYU3LHrzC0+oEyinLB2s2kzAJTBvuL9wWy8XpLVjsQjvOwEITgOTH4uXEUDUiesUcjMgG8wKkc7vRJYDG/ukmiWvcU/KqcB7N0/bfJdj6/tCl9mQsE86E+zCZK8OuBtG8N99I2jWeh9islVWxCNsZyAh/F08f8LfRUJEfS06oqyhh/yQbXxDNC27Hx3fb9Ix6GH/xwWlTBenLFr2Wepjgcg5jh0gNEUwQbjeGb+MSUvKonrSfGDfcJxVzr9RjtvVeeGvmxZeoKnyjiDLoTWrBINYLEGTunaRD1e9+GOn8rRowVzw2L+vzOxHAkJ0iFwsDGROMfYtIOygpPwMyERNcdKK6NM5WaIj9wJhsR2Q8dXNCOdO7iuALdyS/xRnzE/pHZxKR9Pd1Mqa3ZEdJfUmMWYRd/okv60gh788qgK8up X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ddcce073-21b9-43f7-94f7-08dca2a929be X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 19:31:01.5080 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR84MB1916 Received-SPF: pass client-ip=40.92.15.50; envelope-from=Morgan.J.Smith@outlook.com; helo=NAM02-BN1-obe.outbound.protection.outlook.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gps.scm (gpxsee): Update to 13.22. Use qt-build-system. Use qt6 instead of qt5. Change-Id: I9101a6f763be198549aca8e5aea95987b14e58e4 --- gnu/packages/gps.scm | 53 ++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 09a419d7e9..d78c581ad0 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -31,6 +31,7 @@ (define-module (gnu packages gps) #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system scons) + #:use-module (guix build-system qt) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) #:use-module (gnu packages) @@ -51,6 +52,7 @@ (define-module (gnu packages gps) #:use-module (gnu packages qt) #:use-module (gnu packages serialization) #:use-module (gnu packages sqlite) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml)) (define-public gpsbabel @@ -179,33 +181,32 @@ (define-public gama (define-public gpxsee (package (name "gpxsee") - (version "11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tumic0/GPXSee") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1klpjiqsvpvhlg5hsfjaszsyqr817hig9r7y7w4cp0kyn8z5fzfj")))) - (build-system gnu-build-system) + (version "13.22") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tumic0/GPXSee") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15m5rqky2fwsq5n6x531350x39wwhpv1hz56m1yfaxj7acxhb2p5")))) + (build-system qt-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'configure - ;; Use lrelease to convert TS translation files into QM files. - (lambda* (#:key inputs outputs #:allow-other-keys) - (for-each (lambda (file) - (invoke "lrelease" file)) - (find-files "lang" "\\.ts")) - (invoke "qmake" - (string-append "PREFIX=" - (assoc-ref outputs "out")))))))) - (inputs - (list qtbase-5 qtlocation qtsvg-5)) - (native-inputs - (list qttools-5)) + (list + #:qtbase qtbase + #:tests? #f + #:phases #~(modify-phases %standard-phases + (replace 'configure + ;; Use lrelease to convert TS translation files into QM files. + (lambda _ + (apply invoke "lrelease" + (find-files "lang" ".*\\.ts")) + (invoke "qmake" + (string-append "PREFIX=" + #$output))))))) + (inputs (list libxkbcommon qtbase qtpositioning qtserialport qtsvg)) + (native-inputs (list qttools)) (home-page "https://www.gpxsee.org") (synopsis "GPS log file viewer and analyzer") (description