From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 2DAfNw8482ZscgAA62LTzQ:P1 (envelope-from ) for ; Tue, 24 Sep 2024 22:07:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 2DAfNw8482ZscgAA62LTzQ (envelope-from ) for ; Wed, 25 Sep 2024 00:07:12 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=kFL3ebF6; dkim=fail ("headers rsa verify failed") header.d=tobias.gr header.s=2018 header.b=L3YFbJGW; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1727215631; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=6gBF5YiEux992C5IR1K5L71Zcu5k2myYruANHreHVnI=; b=tbKh5Pf8obLDbgMJxS/DMXSRw1aVsm3/m3EQF31sUmoLuttE1QzOxLfn3N9aHrUrNBl/Ts zQmOXOVSZnfZyiZhy/voetM0qizwf3Qm82e7LC/mSWZbS3PawEau0u6EOqe4SWeRPaKCDI zjWSAiP8K5kGXbYll8uUX11lwxCqm0unReEh3Pw+IW962J4LTZCQLTzub18gg3uNlT3mES ubf55npOHGnJAKZ4jTKWXwMMcvbPILut9NJsOi63rLwF8Tmruzgww+PasQMYVlErL5Va13 /HMVPK2Y5k6XCxXefae84qJUiiMT0cPpgYraq4zKqzqHVc1e6Tzz0QZsEeGUuw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=kFL3ebF6; dkim=fail ("headers rsa verify failed") header.d=tobias.gr header.s=2018 header.b=L3YFbJGW; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1727215631; a=rsa-sha256; cv=none; b=WFIboxUr3NcfiW7HYi1DPHdlWXLITAURrdo7nBFlwpwcL8VWY+5haFuwQImvw+jF7Bc1KJ gVsctHeVu0+Hh8RTrThFXJRkTwnvFCXEH+KgMGik+giEUgRgKFVps/Ckm/J0KYmpPNgN9f hO/7yE1yXI3buOiiCjidVSytNbLsWyGVpHFlWlX2PtXfug44JAP42jGAetUTr5iSXnkVie FxRheJjTpXD4CiIgiFpup8RSC0Pc0+6YFGdnDSRJPQ4iINDuPl4jN+Q8DmGXvn5VGi1qGy t6gi5ZJ4MGufhPFR8ZEKIjhKv1svUziBkdBsaO2v54TOlYJnZhJXAA85UGcNuA== 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 CC01D57BD for ; Wed, 25 Sep 2024 00:07:10 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1stDgB-0001ue-JF; Tue, 24 Sep 2024 18:06:43 -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 1stDg7-0001uL-Ak for bug-guix@gnu.org; Tue, 24 Sep 2024 18:06:39 -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 1stDg7-0000OO-0t for bug-guix@gnu.org; Tue, 24 Sep 2024 18:06:39 -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:In-Reply-To:References:Subject; bh=6gBF5YiEux992C5IR1K5L71Zcu5k2myYruANHreHVnI=; b=kFL3ebF65zyxy3PpXzQqv4XpklxzGWutuANn+MvMT1D5f74d1fp4BZIzBGUw1TRJanaipjDJr1/t0WAkNoZnyXQfkJ5XthjK3J30zjKjaCXoqlIGp+b5dK2Glopen9T9ODXSwzRZMdxu8dMxRqgzdIu1LJgwOES51FM8LDR8aYIoXMyaNM6VmGuGRUJAzL+ahJNPUk04PhirHZ50yin2kmEffcrW9T2DQ4lx4LFtGf3nEj7toXncP4QH3dwba/3bFvEINqZcnbEFYjiQYYN0Idm0zdDNtPBQMN+iIMwxcqTvjZA1iXuIQVAq0hwvqDSOeSVZolyCgimTBSgxTuxZjw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1stDgU-00046U-L5; Tue, 24 Sep 2024 18:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#73435: [PATCH v2] gnu: gzdoom: Delete files that might prevent commercial distribution. References: In-Reply-To: Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, bug-guix@gnu.org Resent-Date: Tue, 24 Sep 2024 22:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73435 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 73435@debbugs.gnu.org Cc: Adam Faiz , Liliana Marie Prikler , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 73435-submit@debbugs.gnu.org id=B73435.172721557915635 (code B ref 73435); Tue, 24 Sep 2024 22:07:02 +0000 Received: (at 73435) by debbugs.gnu.org; 24 Sep 2024 22:06:19 +0000 Received: from localhost ([127.0.0.1]:43878 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stDfm-000447-K4 for submit@debbugs.gnu.org; Tue, 24 Sep 2024 18:06:19 -0400 Received: from tobias.gr ([80.241.217.52]:51338) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stDfj-00043r-2E for 73435@debbugs.gnu.org; Tue, 24 Sep 2024 18:06:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=2018; bh=6gBF5YiEux992 C5IR1K5L71Zcu5k2myYruANHreHVnI=; h=date:subject:to:from; d=tobias.gr; b=L3YFbJGWa2vsr93L/RazwDTnu2b14fFr3YhJ8P3Kp3DxzM+4vJWp7gbmApvgVCHSFali gFW1SvToX2gLx3xwAZlC/7CYHcmAWEPo7mMjt+ic0IBhyAX1HbKcA0Mw5Bj9kst3MEob+M bUi8UkIoddYixFB16aDbn0IC928A7psZKCnHYxfHSPvIu8B4GeNrJDV/gRKzpQM+oZM5mQ o9jy7bQQBjOVAx8j4c0t4uhEPRvvVnXHhPL6iCXUtYCJ4Ww07ip6F2mvZEfPqOVq/7uh/z jHBg3vo1+jIS3CW2zwLUhnwGlM3rD1HpT55m3MlEW8t93Rl0zIQca2G/zZb299ZQ== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 624e428f (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <73435@debbugs.gnu.org>; Tue, 24 Sep 2024 22:05:44 +0000 (UTC) Date: Sun, 22 Sep 2024 02:00:01 +0200 Message-ID: <82144a28256c392b568b57644c331a4ad7d7dd50.1726963201.git.me@tobias.gr> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Tobias Geerinckx-Rice From: Tobias Geerinckx-Rice via Bug reports for GNU Guix Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -0.91 X-Spam-Score: -0.91 X-Migadu-Queue-Id: CC01D57BD X-Migadu-Scanner: mx10.migadu.com X-TUID: LTXGlBfcHuhJ * gnu/packages/games.scm (gzdoom)[source]: Delete files in the snippet. Change-Id: I601bb251e9b690e375f707786bb5789a6a664b92 --- gnu/packages/games.scm | 38 +++++++++++++++++++++++++++++++++++++- gnu/packages/vim.scm | 4 ++-- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8aa828a8a4..0c695f5dca 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -8065,9 +8065,45 @@ (define-public gzdoom (base32 "0i4hyg72z84fc6ca2ic9q82q5cbgrbd7bynl3kpkypxvyasq08wz")) (patches (search-patches "gzdoom-search-in-installed-share.patch" "gzdoom-find-system-libgme.patch")) - (modules '((guix build utils))) + (modules '((guix build utils) + (ice-9 regex))) (snippet '(begin + ;; Remove files which mustn't be commercially redistributed. See + ;; , the ‘Contribution + ;; Guidelines’ at , and Guix issue #73435. + (for-each + (lambda (directory) + (delete-file-recursively directory) + (substitute* "CMakeLists.txt" + (((string-append "add_subdirectory\\([[:blank:]]*" + directory + "[[:blank:]]*\\)")) + ""))) + '( ;; "wadsrc_extra" ;game_support.pk3 + "wadsrc_bm")) ;brightmaps.pk3 + + ;; Removing game_support.pk3 entirely would break Freedoom & remove + ;; users' ability to play commercial games, despite owning (only) the + ;; non-functional data. That can't be right. Out of an abundance of + ;; caution, remove anything from the PK3 that could conceivably be + ;; derived from copyrightable data that's not freely redistributable. + (display "Keeping only the following game_support.pk3 files:\n") + (let* ((regexps (list "/font\\.inf$" + "/harmony/.*\\.(txt|zs)$" + "/(iwadinfo|mapinfo|sprofs)\\.txt$" + "\\.z$")) + (regexp* (format #f "(~{~a~^|~})" regexps)) + (regexp (make-regexp regexp* regexp/icase))) + (define (keep-file? file stat) + (let ((keep? (regexp-exec regexp file))) + (when keep? + (format #t " ~a~%" file)) + keep?)) + + (for-each delete-file (find-files "wadsrc_extra/static" + (negate keep-file?)))) + ;; Remove some bundled libraries. XXX There are more, but removing ;; them would require, at least, patching the build system. (with-directory-excursion "libraries" diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 786a85ab58..136ed5f0c9 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -86,7 +86,7 @@ (define-module (gnu packages vim) (define-public vim (package (name "vim") - (version "9.1.0146") + (version "9.1.0737") (source (origin (method git-fetch) (uri (git-reference @@ -95,7 +95,7 @@ (define-public vim (file-name (git-file-name name version)) (sha256 (base32 - "05lz8ai39p9ypk22n7qc7g21868m08pl12sn4028jshx5nxwy2zn")))) + "1777vbr43prh9pqhz1lr5b1nym61iyy66yzxbhwichd3spnlrblk")))) (build-system gnu-build-system) (arguments `(#:test-target "test" base-commit: 2da3c37e7d732f6d2744f70be9fd98858a433b5e prerequisite-patch-id: 3aa23428693688751bb14a2fbe464f5693ae13d7 prerequisite-patch-id: 3f0ca744a21be95e47c8c9105dfe1e7fd0dc59c7 -- 2.46.0