From patchwork Sat May 10 06:10:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nigko Yerden X-Patchwork-Id: 42495 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 B60A327BC4B; Sat, 10 May 2025 07:12:22 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 E4E9E27BC49 for ; Sat, 10 May 2025 07:12:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uDdRQ-000769-CE; Sat, 10 May 2025 02:12:08 -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 1uDdRO-00075M-6v for guix-patches@gnu.org; Sat, 10 May 2025 02:12:06 -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 1uDdRN-0007Gb-Mc for guix-patches@gnu.org; Sat, 10 May 2025 02:12:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=P603FhgfEV+YD7Y1C3qL83Iq/UmzoH/bQ02PdAlMUVE=; b=rbKt2BOhlgf6yzhhaKwp0m/uKTxtUpToef02gIDQ34VMF6yVvFL23tJUNm55cHN1H1BP+fZF/zQzwG9Vf6/cgmONUP1D+Smu2Q2on66N+DoVeKlbjlba62QRblWTBHIxcitqOu49G00AKNOwPYR3uM4288YvMPL1FesXWvgRiL6w/L7KtsPtHOH5WMVkfNTCAxlMcaSaugwGbH2W0hTNf1GJ6F0zRoiDgknlC4ZJzOUQDaujLqVbhAeG1dvTd/heGb6KwRLDL8zBzXudC4RBMjI9cyWvhBMPIrc0/ex1tVs+oTFeyzjCIZ6TDSAvu9AgMcs2+sYDNoCc1wmSfLc8tw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uDdRJ-0002Hp-V9; Sat, 10 May 2025 02:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78342] [PATCH] gnu: torcs: Update to 1.3.8. Resent-From: Nigko Yerden Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sat, 10 May 2025 06:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78342 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78342@debbugs.gnu.org Cc: Nigko Yerden , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by submit@debbugs.gnu.org id=B.17468575008730 (code B ref -1); Sat, 10 May 2025 06:12:01 +0000 Received: (at submit) by debbugs.gnu.org; 10 May 2025 06:11:40 +0000 Received: from localhost ([127.0.0.1]:42980 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uDdQu-0002GZ-OB for submit@debbugs.gnu.org; Sat, 10 May 2025 02:11:40 -0400 Received: from lists.gnu.org ([2001:470:142::17]:38094) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uDdQq-0002GA-VX for submit@debbugs.gnu.org; Sat, 10 May 2025 02:11:34 -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 1uDdQk-00072e-VG for guix-patches@gnu.org; Sat, 10 May 2025 02:11:26 -0400 Received: from mail-yb1-xb42.google.com ([2607:f8b0:4864:20::b42]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uDdQi-0007Fj-O8 for guix-patches@gnu.org; Sat, 10 May 2025 02:11:26 -0400 Received: by mail-yb1-xb42.google.com with SMTP id 3f1490d57ef6-e78fc91f30dso1853495276.3 for ; Fri, 09 May 2025 23:11:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746857482; x=1747462282; 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=P603FhgfEV+YD7Y1C3qL83Iq/UmzoH/bQ02PdAlMUVE=; b=NtigUBvZYP3ZvO1vrW2BiSjwGGvIHzJirdgaB+bWy46gzL716R+9NHeh7+1vOWal4b InDDrUPlAh75dBr6JxrLY2qSe0/A8Eze30pECf0oS2iEif/PxyJKgOL/2Z+raXMgkIkU 0z0cMeMKxhSelSY36dHPfXDy1DQF+tgaWvS0VEN0lGeuFywXlNRfwnX/VYtygh5VSjzg C9PC4l8FVzugoDUFSIU/GJLeEkEipvJE8j4mHQc16d+VCod67+7ITQPMTYpiAHTJG/kS sDrZKDDTBp3w+dMV9FtsuT4FRkkWaaftQdgAt19IQEkxMiE1N4nglSKAwf2cZWUaTmqn aSTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746857482; x=1747462282; 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=P603FhgfEV+YD7Y1C3qL83Iq/UmzoH/bQ02PdAlMUVE=; b=mWQ1/p1I2IzxZ5WYbuyt/frCFepYf0h8MRrljkg5JfJR5yEPKVH8mIL2qY/MLLTpNu SldkKJfvoJbrZOwxEORbdNZziRo1Fa60RBVahzBDnwE4Rx9o9SdTGG66quAYn0R5drjL CkmnOs1eAXOePMzHkDRNLyQuRmSRrmESaXPls/ceGsZuuH2aoUDGySnifFyrsj7gJaMM /GHY+bdB/FYY9xR5VvP/luuVObyiEuqrhNIpSUhDJwl0QAGrRE1kRmTi413xw/dCYPGh N+u6GrOMraEsaGbi3OMLZB89gNttGzQ/u+75JOIhWid5bytUBf+Dk1Af/bVTyn73DauZ Wqxw== X-Gm-Message-State: AOJu0YwL8+ZzXXUJX/FRJ4mCmjKOw+nVqdK0rAPYKZNVoU9RYEowzRy5 KK1rW8gi9THhQdpoEC1PZ2B5O1Z1b1K69gh+fPFhWt/0dLe1k/RlNe2GTdSM X-Gm-Gg: ASbGncsOOPIN9udBETzOUHfM2XAJ2Sse9cQOBPnW5eT8Vb/m+UVOtlLV3i2LwE1P7fX 2uqrLaeQFRz27/iqwVQUj6Xx6fi+IxAqQAW7FIvAK3/a8jsE9ctacGBBIHC0mjFBZr7Po/NNIyD 7gZY68HasfvZpXWStwGqtUlK63gpIJSSvVOs/MpHhTRWWR2Ec2ZwW/Dr5d9GV60rnvuNDKh9EAb w0x2Myop+bGkx6AK6y0dz5+NLc19mK0c2YjkBfm84x0Ijq7sUzKnck2WvHAFmH66xLBoko4Ti6I iIxNage304zer9KJwA5eKhhcf5S4dTf/DU0+uT4SgZuS3QbLG3rsfIlwdXENdX5aooM= X-Google-Smtp-Source: AGHT+IEGF0LYPSIVug64MLtRfHCDs4WKQ7Kp+mVQpFrX+sBrrhHOi/Do5a2AKHxR8xy6tLamM9RkGg== X-Received: by 2002:a05:6902:158f:b0:e75:c5ab:ed64 with SMTP id 3f1490d57ef6-e78fdc4f5b9mr8347931276.2.1746857482362; Fri, 09 May 2025 23:11:22 -0700 (PDT) Received: from localhost.localdomain ([62.33.150.136]) by smtp.gmail.com with ESMTPSA id 3f1490d57ef6-e78fd4a5d2asm914814276.18.2025.05.09.23.11.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 23:11:21 -0700 (PDT) From: Nigko Yerden Date: Sat, 10 May 2025 11:10:11 +0500 Message-ID: <570381880d77c2ae0b5378f2165a2da2e89e4af7.1746857411.git.nigko.yerden@gmail.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::b42; envelope-from=nigko.yerden@gmail.com; helo=mail-yb1-xb42.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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/games.scm (torcs): Update to 1.3.8. * gnu/packages/patches/torcs-glibc-default-source.patch: Delete file. * gnu/packages/patches/torcs-isnan.patch: Delete file. * gnu/packages/patches/torcs-nullptr.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Unregister torcs-glibc-default-source.patch, torcs-isnan.patch, and torcs-nullptr.patch. Change-Id: Ieb7b3db0c1ee66e62fb2873722326141815a2008 --- gnu/local.mk | 3 - gnu/packages/games.scm | 55 +++++++++---------- .../patches/torcs-glibc-default-source.patch | 25 --------- gnu/packages/patches/torcs-isnan.patch | 15 ----- gnu/packages/patches/torcs-nullptr.patch | 14 ----- 5 files changed, 27 insertions(+), 85 deletions(-) delete mode 100644 gnu/packages/patches/torcs-glibc-default-source.patch delete mode 100644 gnu/packages/patches/torcs-isnan.patch delete mode 100644 gnu/packages/patches/torcs-nullptr.patch base-commit: c3b6b57521404d223ae37d3dd91f7bb60ed0cebc diff --git a/gnu/local.mk b/gnu/local.mk index e6ece8cc48..4aa991dcba 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2325,9 +2325,6 @@ dist_patch_DATA = \ %D%/packages/patches/tla2tools-build-xml.patch \ %D%/packages/patches/tlf-support-hamlib-4.2+.patch \ %D%/packages/patches/tofi-32bit-compat.patch \ - %D%/packages/patches/torcs-glibc-default-source.patch \ - %D%/packages/patches/torcs-isnan.patch \ - %D%/packages/patches/torcs-nullptr.patch \ %D%/packages/patches/torbrowser-compare-paths.patch \ %D%/packages/patches/tpetra-remove-duplicate-using.patch \ %D%/packages/patches/transcode-ffmpeg.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index d75d21e6f7..0c932479ee 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -89,6 +89,7 @@ ;;; Copyright © 2025 Sharlatan Hellseher ;;; Copyright © 2023-2025 Adam Faiz ;;; Copyright © 2025 Andrew Wong +;;; Copyright © 2025 Nigko Yerden ;;; ;;; This file is part of GNU Guix. ;;; @@ -8147,39 +8148,37 @@ (define-public tome4 (define-public torcs (package (name "torcs") - (version "1.3.7") + (version "1.3.8") (source (origin (method url-fetch) - (uri (string-append "https://sourceforge.net/projects/" name - "/files/all-in-one/" version "/" - name "-" version ".tar.bz2/download")) - (file-name (string-append name "-" version ".tar.bz2")) + (uri (string-append "mirror://sourceforge/" name + "/all-in-one/" version "/" + name "-" version ".tar.bz2")) + ;; Source archive is in fact in gzip format, rename it. + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0kdq0sc7dsfzlr0ggbxggcbkivc6yp30nqwjwcaxg9295s3b06wa")) - (patches (search-patches "torcs-isnan.patch" - "torcs-nullptr.patch" - "torcs-glibc-default-source.patch")) + "1bx7i67b01yfy9lyak4x4xrdb3zb0mr8kwx6h8cl2dpv8lspg5jb")) + (modules '((guix build utils) + (ice-9 ftw) + (ice-9 regex) + (srfi srfi-26))) (snippet - '(begin - (use-modules (guix build utils) - (ice-9 ftw) - (ice-9 regex) - (srfi srfi-26)) - ;; Delete Windows-specific sources and pre-built binaries. - (delete-file-recursively "src/windows") - ;; The license of the kw-* and pw-* car models includes a - ;; non-commercial clause, hence does not comply with the GNU FSDG. - (with-directory-excursion "data/cars/models" - (for-each delete-file-recursively - (scandir "." (cut string-match "^(kc|pw)-" <>)))) - ;; Delete extraneous CVS directories. - (for-each delete-file-recursively - (find-files "." (lambda (file stat) - (and (eq? 'directory (stat:type stat)) - (string=? "CVS" (basename file)))) - #:directories? #t)))))) + #~(begin + ;; Delete Windows-specific sources and pre-built binaries. + (delete-file-recursively "src/windows") + ;; The license of the kw-* and pw-* car models includes a + ;; non-commercial clause, hence does not comply with the GNU FSDG. + (with-directory-excursion "data/cars/models" + (for-each delete-file-recursively + (scandir "." (cut string-match "^(kc|pw)-" <>)))) + ;; Delete extraneous CVS directories. + (for-each delete-file-recursively + (find-files "." (lambda (file stat) + (and (eq? 'directory (stat:type stat)) + (string=? "CVS" (basename file)))) + #:directories? #t)))))) (build-system gnu-build-system) (arguments ;; Building in parallel fails due to a race where include files have not @@ -8229,7 +8228,7 @@ (define-public torcs ;; ownership or permission on /gnu/store/xxx-torcs-1.3.7', ;; rejecting this build output". (lambda _ - (chmod #$output #o744)))))) + (chmod #$output #o755)))))) (inputs (list bash-minimal freealut diff --git a/gnu/packages/patches/torcs-glibc-default-source.patch b/gnu/packages/patches/torcs-glibc-default-source.patch deleted file mode 100644 index eb74cfd4ce..0000000000 --- a/gnu/packages/patches/torcs-glibc-default-source.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Aurelien Jarno -Date: Mon, 1 May 2017 15:58:31 +0200 -Subject: glibc default source - -_SVID_SOURCE and _BSD_SOURCE are deprecated, using _DEFAULT_SOURCE -instead. - -Forwarded: https://sourceforge.net/p/torcs/mailman/message/35831161/ ---- - Make-config.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Make-config.in b/Make-config.in -index f0e0a12..8041327 100644 ---- a/Make-config.in -+++ b/Make-config.in -@@ -48,7 +48,7 @@ INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - --CFLAGSD = -D_SVID_SOURCE -D_BSD_SOURCE -DSHM -DHAVE_CONFIG_H -+CFLAGSD = -D_DEFAULT_SOURCE -DSHM -DHAVE_CONFIG_H - CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@ ${CFLAGSD} - CFLAGS = @CFLAGS@ ${CFLAGSD} - diff --git a/gnu/packages/patches/torcs-isnan.patch b/gnu/packages/patches/torcs-isnan.patch deleted file mode 100644 index 2ec0c4e1c1..0000000000 --- a/gnu/packages/patches/torcs-isnan.patch +++ /dev/null @@ -1,15 +0,0 @@ -Source: https://src.fedoraproject.org/rpms/torcs/raw/rawhide/f/torcs-1.3.7-isnan.patch -Upstream-status: https://sourceforge.net/p/torcs/mailman/torcs-devel/thread/0bd466b7-e158-471b-13ad-504167587d01%40embecosm.com/#msg35836767 - -diff -up torcs-1.3.7/src/drivers/olethros/geometry.cpp.orig torcs-1.3.7/src/drivers/olethros/geometry.cpp ---- torcs-1.3.7/src/drivers/olethros/geometry.cpp.orig 2016-06-07 19:49:11.347896827 +0100 -+++ torcs-1.3.7/src/drivers/olethros/geometry.cpp 2016-06-07 19:49:46.532894257 +0100 -@@ -27,6 +27,8 @@ - #ifdef WIN32 - #include - #define isnan _isnan -+#else -+#define isnan std::isnan - #endif - - diff --git a/gnu/packages/patches/torcs-nullptr.patch b/gnu/packages/patches/torcs-nullptr.patch deleted file mode 100644 index a002c48169..0000000000 --- a/gnu/packages/patches/torcs-nullptr.patch +++ /dev/null @@ -1,14 +0,0 @@ -Source: https://src.fedoraproject.org/rpms/torcs/raw/rawhide/f/torcs-1.3.7-nullptr.patch -Upstream-status: https://sourceforge.net/p/torcs/mailman/message/36490328/ - ---- torcs-1.3.7/src/libs/musicplayer/OpenALMusicPlayer.cpp.orig 2014-02-05 10:54:43.000000000 +0100 -+++ torcs-1.3.7/src/libs/musicplayer/OpenALMusicPlayer.cpp 2018-07-09 20:56:42.521607205 +0100 -@@ -161,7 +161,7 @@ - { - char pcm[BUFFERSIZE]; - int size = 0; -- const char* error = '\0'; -+ const char* error = nullptr; - - if (!stream->read(pcm, BUFFERSIZE, &size, &error)) { - GfError("OpenALMusicPlayer: Stream read error: %s\n", error);