From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.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 0HgTEr0HdmZFZAEAqHPOHw:P1 (envelope-from ) for ; Fri, 21 Jun 2024 23:07:41 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id 0HgTEr0HdmZFZAEAqHPOHw (envelope-from ) for ; Sat, 22 Jun 2024 01:07:41 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=HrCNgQs1; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1719011260; h=from:from:sender:sender: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=1JWNSctRekOk5LEuX5N/vv7/e7RBz7zgOgdeGG9ABt4=; b=tXv03tizFwday5AYPbLEoIFtN+HLneFpJSlsejt5mNSnHfezYWy4+7DPqgi4tsICg2pG9c /WxiqSEuf0r1IMSLmkOBqTrFVsVOtQPyGb0KyKBlPJiaIilaEHj6bTQP6leUe1amLwMwdP 5mRPlAXwFt36clNCyymvvSZpUIJnvJ/htkMftbjlK42Z8sPb1gBys+Gw2mp56hL6ZFisIf 2sYbOZOItIDMNfxDekTK6n+o8MM5lP1jInSuU+SmhIS2jlzPsJ6FjGuNypPLvmNHin3YUT IZEYxZpOo2d0isD9QlrdWf6TkskVuNjgTqKm8+YnNUuPzWDom0zLK7NE9FSn3w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=HrCNgQs1; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1719011260; a=rsa-sha256; cv=none; b=Wyk0Fb5urDAaQfLe3Xjhoxd7o9KX0cV2TSA9LIqN80nNIxlgHtlGgzJTOmGl1pDsT6Cprn zSxANDBKZP6A0wcphIyUczfBXeqryC4TQwpGY7LLagEtcD90MQ6WBGUT/9pxF73k0bvKId Uob2E/uRVNlstSdvK0N4IQMuqqQkhFcR5a683gWcYgSDwI0G1ALkg3Ee/0iIeXpYAp0FEs 31KEJWDvw0nrooB0sUOzzAIuvs4p0djKahutLkVn6a2M7Podq9QMk0pgs+XQPvNXuxXvyf ZVHchltQWIIzXDmckHwdFyQFMp3OGPrL3jQh3qGKyXJXOIn3zbdLG3Lxc9vEMQ== 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 D575E201DD for ; Sat, 22 Jun 2024 01:07:39 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sKnLV-0000U7-BS; Fri, 21 Jun 2024 19:07:05 -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 1sKnLT-0000S7-Q7 for guix-patches@gnu.org; Fri, 21 Jun 2024 19:07:03 -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 1sKnLT-0005ya-IE for guix-patches@gnu.org; Fri, 21 Jun 2024 19:07:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sKnLR-0008Ix-Qg; Fri, 21 Jun 2024 19:07:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71319] [PATCH v4 1/3] gnu: emacs-ddskk: Update to 17.1 revision 0. References: In-Reply-To: Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 21 Jun 2024 23:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71319 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71319@debbugs.gnu.org Cc: gemmaro , Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-Xcc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by 71319-submit@debbugs.gnu.org id=B71319.171901118031842 (code B ref 71319); Fri, 21 Jun 2024 23:07:01 +0000 Received: (at 71319) by debbugs.gnu.org; 21 Jun 2024 23:06:20 +0000 Received: from localhost ([127.0.0.1]:43996 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKnKl-0008HV-Mb for submit@debbugs.gnu.org; Fri, 21 Jun 2024 19:06:20 -0400 Received: from mail-pg1-f172.google.com ([209.85.215.172]:48224) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKnKh-0008HG-AN for 71319@debbugs.gnu.org; Fri, 21 Jun 2024 19:06:17 -0400 Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-6bce380eb9bso1610585a12.0 for <71319@debbugs.gnu.org>; Fri, 21 Jun 2024 16:06:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719011110; x=1719615910; darn=debbugs.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=1JWNSctRekOk5LEuX5N/vv7/e7RBz7zgOgdeGG9ABt4=; b=HrCNgQs1C1RrGGKI4G4Ub8jwgbcRnFOE4H+IhaULEkECJ/tsDdZ8wYt/TKaFIKdQky FGO0fQ+xi+TL43P6ZpV7uSffrfcfsJ5ysrm3t9jO19tG15mJLSSVdaEmUt2tBO2x92eE wjpN71lvNZPiPXSFP/1y39kEXtSbtWebDZW7a8CZEpkpm0hDjHOL2SsJyshp9HbxYVcb VaHUG1c1W9fhhWAbagbkTzAn6MDk6/7rWxAacGOO3xh4HEwYHjUWiGT9zonZ2QzNd/nC 5vX8FRT4PmNVgdYNEEM88U74PVfx1L/3ayPfrYUQtA0Z5QNgPgGztTp+TXoxOClEc1dY wATw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719011110; x=1719615910; 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=1JWNSctRekOk5LEuX5N/vv7/e7RBz7zgOgdeGG9ABt4=; b=gs13MH57v1ehzncuyEUWr+kVEG19Q90bCz9XH+qaxu8EMttWd7leIFKIbn1Nqpji+o dRIo0vfkU1d7sRqkE0wLjyzCEYd6jsXVpYkg7yr3p6ScnfEmJAv9TRudrGE6g/v4xFE3 6PSxNhjgH9OKReLTXcXMQY7wVs832uBi+GUoic8dbaDlIehPxd6gNutZDCu5x9ocTz7R SS/HBfytR3AZ8CmJK9Sdwe0uEgo9ZjJtlPh0ANyCJZm7jG6IKJhjEc+T8z7dd2qkAMV4 P0wlUsWNvxY2RromMn0ovUjBibbmYqOpwx2pkHN5OEQ+qXT5ATclnWCuZjrXUlZnITz0 wK1A== X-Gm-Message-State: AOJu0Yx5FghaYxhEgv0cif4Uq2QUS0kaTWduMay3nScFdrKUfPP3KuOf UdtZBQJieLYF8HE4/fYrDYTJxb/5JvN9il4ENSPQRX+/x5t69WrJ8kX3ZSfn X-Google-Smtp-Source: AGHT+IHBJXVhGaIOkcYRd/fWDDotUzD8Tu9gLWRgdu1zO0Y4IwOg2VL+yDqaiDeqkiHxxxyzN7TLdA== X-Received: by 2002:a17:902:a3ce:b0:1f9:b807:21ac with SMTP id d9443c01a7336-1f9b80721fcmr69253745ad.51.1719011109794; Fri, 21 Jun 2024 16:05:09 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:1883:f3d1:907f:a2e3]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f9eb32b9f8sm19347715ad.114.2024.06.21.16.05.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jun 2024 16:05:09 -0700 (PDT) From: gemmaro Date: Sat, 22 Jun 2024 08:02:54 +0900 Message-ID: <6364a0f1d329f7600523d9e27cc71fbebc4655be.1719010975.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.45.1 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: 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: 4.14 X-Migadu-Queue-Id: D575E201DD X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: 4.14 X-TUID: WH6SdxHGLX5W * gnu/packages/emacs-xyz.scm (emacs-ddskk): Update to 17.1 revision 0 (commit 8c47f46). [arguments]: The SKK-MK and the doc files are now not explicitly made writable. The rm in nicola/Makefile is fixed. (emacs-ddskk-nicola)[arguments]: Move the chdir phase after the fix-test phase. The NICOLA-DDSKK-CFG file is now not explicitly made writable. Change-Id: I7a312f1dbbeb93666121646dd79becdd08f16b79 --- gnu/packages/emacs-xyz.scm | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d000e7fd02..ae6f1ed3d9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -141,6 +141,7 @@ ;;; Copyright © 2024 Ilya Chernyshov ;;; Copyright © 2024 Wilko Meyer ;;; Copyright © 2024 Noé Lopez +;;; Copyright © 2024 gemmaro ;;; ;;; This file is part of GNU Guix. ;;; @@ -37016,22 +37017,20 @@ (define-public emacs-org-static-blog (license license:bsd-3))) (define-public emacs-ddskk - ;; XXX: Upstream adds code names to their release tags, so version and code - ;; name below need to be updated together. - (let ((version "17.1") - (code-name "Neppu")) + (let ((commit "8c47f46e38a29a0f3eabcd524268d20573102467") + (revision "0")) (package (name "emacs-ddskk") - (version version) + (version (git-version "17.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/skk-dev/ddskk") - (commit (string-append "ddskk-" version "_" code-name)))) + (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0xm53rybxki2784gyjkafg6956viyhhcq51kbmnrwc6aw3yzh7aw")))) + (base32 "0vfdbab3ncns8wwrna8h6y2w0grkphzr9s65sgxq98lpqmxbbr72")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) @@ -37044,17 +37043,17 @@ (define-public emacs-ddskk (modify-phases %standard-phases (replace 'configure (lambda* (#:key outputs #:allow-other-keys) - (make-file-writable "SKK-MK") (emacs-substitute-variables "SKK-MK" ("PREFIX" (assoc-ref outputs "out")) ("LISPDIR" '(expand-file-name "/share/emacs/site-lisp" PREFIX)) ("SKK_PREFIX" "") ("SKK_INFODIR" '(expand-file-name "info" PREFIX))) - (for-each make-file-writable (find-files "./doc")) #t)) (add-after 'unpack 'fix-test (lambda _ (substitute* "Makefile" + (("/bin/rm") (which "rm"))) + (substitute* "nicola/Makefile" (("/bin/rm") (which "rm")))))))) (native-inputs (list emacs-minimal ruby)) @@ -37081,13 +37080,12 @@ (define-public emacs-ddskk-nicola ,@(substitute-keyword-arguments (package-arguments emacs-ddskk) ((#:phases phases) `(modify-phases ,phases - (add-after 'unpack 'chdir + (add-after 'fix-test 'chdir (lambda _ (chdir "nicola") #t)) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) - (make-file-writable "NICOLA-DDSKK-CFG") (emacs-substitute-sexps "NICOLA-DDSKK-CFG" ("setq NICOLA-DDSKK_PREFIX" "")) #t))))))) base-commit: 594419b09e124b84d3d6141f1e47b5c346eeb704 -- 2.45.1