From patchwork Fri Apr 18 06:19:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kurome X-Patchwork-Id: 41755 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 7E0DB27BC4B; Fri, 18 Apr 2025 07:22:47 +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=-6.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_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 5977F27BC49 for ; Fri, 18 Apr 2025 07:22:44 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u5f76-0007qM-Ga; Fri, 18 Apr 2025 02:22:12 -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 1u5f74-0007oy-OA for guix-patches@gnu.org; Fri, 18 Apr 2025 02:22:10 -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 1u5f72-0005jT-TW for guix-patches@gnu.org; Fri, 18 Apr 2025 02:22:10 -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=1uKtvhgnizB6tR+eKsDMA70Goy6PDM6gMO1nM19xPuA=; b=lQHl+++sr5iPbWS/GeeRg5EmNDPhKMNt61e/nRcwj1bZCtt3As8ls0+SOC9esXfmeqDP3cHb8jgXuwZiP6yko9m3kMGmOoqLRUKEhPhFnAh/NMWc2kHnFYOilWCotYAK3Hco9Ba9ONVESULmnaItDNbzr6P/MNvMbzkwqgUiZ1mloQlYCTJPC70Bs+xUrILyXiisyBRR4fs4xFg/sbA+AqFTvop7uuGtA9C1QE9rsz+TE89M4KnILjcI93rl6XC5qvIkCDt1XWr+XT2BJEDo9q5qoGRC4sOjQpAuerkFK7q/T8O5YIGyC4HBS1uojsq33RjibKiT6TokkTv10etT0g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u5f71-0006UP-4D; Fri, 18 Apr 2025 02:22:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77890] [PATCH] gnu: libskk: Fix tests. Resent-From: Kurome Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Fri, 18 Apr 2025 06:22:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77890 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77890@debbugs.gnu.org Cc: Kurome , hako@ultrarare.space, iyzsong@envs.net X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: hako@ultrarare.space, iyzsong@envs.net Received: via spool by submit@debbugs.gnu.org id=B.174495727224399 (code B ref -1); Fri, 18 Apr 2025 06:22:05 +0000 Received: (at submit) by debbugs.gnu.org; 18 Apr 2025 06:21:12 +0000 Received: from localhost ([127.0.0.1]:49394 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u5f65-0006L9-78 for submit@debbugs.gnu.org; Fri, 18 Apr 2025 02:21:11 -0400 Received: from lists.gnu.org ([2001:470:142::17]:45934) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u5f61-0006In-5Y for submit@debbugs.gnu.org; Fri, 18 Apr 2025 02:21: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 1u5f5t-0007Vs-I0 for guix-patches@gnu.org; Fri, 18 Apr 2025 02:20:57 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u5f5q-0005Pu-K2 for guix-patches@gnu.org; Fri, 18 Apr 2025 02:20:57 -0400 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-22401f4d35aso19423455ad.2 for ; Thu, 17 Apr 2025 23:20:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744957249; x=1745562049; 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=1uKtvhgnizB6tR+eKsDMA70Goy6PDM6gMO1nM19xPuA=; b=M+pSv7JISz/dgWRw0MquUOejl9A3y0m/e0wYsaoMRZWmNJhsVkwRrC2XYsXQ+8kONa qSLvhJ7LgtagSgKAfOl7MropzfH2RNZGk1fdG9zhlg3hO8EOUe2QouTmUSgDVH2U3CBm HCL8DB539WHcu1VEohQXmy599z/z9uoWx7XhbYr4rssfkhOwoHHevE/2CDeZ7J4apljE aA7XVxDylxf+/rnKTfMV9du7ii6zY/q6DsxrcVgRUKAXe7Ie8LdrDE5N/zkQL8aZNBD5 Sd8NNWy6tRl2ZFh7/pu+bHBHCLLj5DhQoWgEXLFZPLhY+l6ZIBTNMHzLRJ8z0kBexgWC 77vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744957249; x=1745562049; 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=1uKtvhgnizB6tR+eKsDMA70Goy6PDM6gMO1nM19xPuA=; b=etfpvZaPlkSQv038HrMuyisxPBlSLaMlj1s0JJosPCHj87i/6RjkgS2pmXSUwv2IPB mgJyxMfHxiqgz2geeG2VPIw5Yk2Q9tGpiN4aRnljgIFfKcdtqDrRhhb4i0QpCXpGrwlT 9pDyQvUo7p4T+BBp4/8fG/a5C1bZHbwnM+39M0Xnvk3Q+1EwcuLQU3VnKvX8LdhHwlGY UMS9mMQvEjb9z/nQs7tEl8Pii+RWsvSG/P2BBdwrOXkDC4qmhhtADoIjwzKhA6Uy+qL1 3cGCg2Iqlo0VSI9Q0cj78LX/Qtoh+eKmSu6gnM+pi53MP4uyapsICmH3K5O0K81Iva0m L23g== X-Gm-Message-State: AOJu0YwwU21dp3LlKrR8J6BwkOmZ83lkeW5ie80TNsZYIWtsojOHI8SG okSrWcoyGaSYd4KwHdZJR7hU38+fV/YZIduVXyWoh3UypLJ+Hc1K2kXZYoo+ X-Gm-Gg: ASbGncslGiLgIrJMbI7t5nbVHmo7qwDqPB6IK/1/OEsFJyAVm/DFMBKY1v6lJFaNoSz L859cyPfpQuvYnTXHWg0mTKIrElKgV3nH6gQtSGb5ChzLonOKdAVaZLYsyObqJd62TLfHR1qoBi JleteGNm18P7FeQdR4nXnG0dnH3zT7DEGzdB8v0vgtUoSvzeQtrL2Qpoa4c3OQcWBjwffuK/5EL fk2iWel1Rn85Rh88K6BTZ6BVKvb9f1Q89oUTbsdimtNm/zW7q+JW2CFKAQ4YzjFrarneFo2iIA7 Hjy3ZTVGk9oxzudAHUN0JFIEFwK4WnoIK0EkzeToehZEsOZAqLWqpVW3ww== X-Google-Smtp-Source: AGHT+IGI6Y+EQdAAm6uo7i5bNBC2a9iCy3o/dNm2imfqMvTbmhXN7HnxjiXDBDs0LsJJ2Sh/fci4aA== X-Received: by 2002:a17:902:e54b:b0:22c:33e4:fa5a with SMTP id d9443c01a7336-22c5356841cmr22620105ad.9.1744957249067; Thu, 17 Apr 2025 23:20:49 -0700 (PDT) Received: from kuroputer.flets-east.jp ([240b:10:3481:ee00:8906:977f:5873:985e]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22c50bf3bbdsm10367265ad.79.2025.04.17.23.20.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Apr 2025 23:20:48 -0700 (PDT) From: Kurome Date: Fri, 18 Apr 2025 15:19:34 +0900 Message-ID: <20250418061948.28269-2-hunt31999@gmail.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=hunt31999@gmail.com; helo=mail-pl1-x630.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, 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 Add a patch file to fix invalid escape: https://github.com/ueno/libskk/pull/90 and symlink skk-jisyo. * gnu/packages/patches/libskk-fix-invalid-escape.patch: New file. * gnu/packages/language.scm: Import (gnu packages dictionaries). (libskk) [source]: Use the patch. [arguments] <#:prallel-tests?>: Disable parallel tests. <#:phases>: Add `symlink-skk-jisyo`. [inputs]: Add skk-jisyo. Change-Id: I3d086f2a691a42b4df9083ca711261744b8ad418 --- gnu/packages/language.scm | 23 +++++++++++++++++-- .../patches/libskk-fix-invalid-escape.patch | 16 +++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/libskk-fix-invalid-escape.patch diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 13957e12a0..b7d908b25b 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -40,6 +40,7 @@ (define-module (gnu packages language) #:use-module (gnu packages crates-database) #:use-module (gnu packages crates-tls) #:use-module (gnu packages dbm) + #:use-module (gnu packages dictionaries) #:use-module (gnu packages docbook) #:use-module (gnu packages emacs) #:use-module (gnu packages freedesktop) @@ -924,8 +925,23 @@ (define-public libskk (file-name (git-file-name name version)) (sha256 (base32 - "0y279pcgs3jrsi9vzx086xhz9jbz23dqqijp4agygc9ackp9sxy5")))) + "0y279pcgs3jrsi9vzx086xhz9jbz23dqqijp4agygc9ackp9sxy5")) + (patches + (search-patches + "libskk-fix-invalid-escape.patch")))) (build-system gnu-build-system) + (arguments + (list + #:parallel-tests? #f ; concurrency issues in tests + #:phases + #~(modify-phases %standard-phases + (add-before 'install 'symlink-skk-jisyo + (lambda _ + (let ((dict-dir (string-append #$output "/share/skk"))) + (mkdir-p dict-dir) + (invoke "ln" "-s" + (string-append #$skk-jisyo "/share/skk") + dict-dir))))))) (native-inputs (list autoconf automake gettext-minimal @@ -933,7 +949,10 @@ (define-public libskk libtool pkg-config vala)) - (inputs (list libgee json-glib libxkbcommon)) + (inputs (list libgee + json-glib + libxkbcommon + skk-jisyo)) (home-page "https://github.com/ueno/libskk") (synopsis "Dealing with Japanese kana-to-kanji conversion") (description diff --git a/gnu/packages/patches/libskk-fix-invalid-escape.patch b/gnu/packages/patches/libskk-fix-invalid-escape.patch new file mode 100644 index 0000000000..2f443e83c9 --- /dev/null +++ b/gnu/packages/patches/libskk-fix-invalid-escape.patch @@ -0,0 +1,16 @@ +fix parse error: +https://github.com/ueno/libskk/pull/90 + +diff --git a/rules/default/rom-kana/default.json b/rules/default/rom-kana/default.json +index 6ddfce6..68dcff9 100644 +--- a/rules/default/rom-kana/default.json ++++ b/rules/default/rom-kana/default.json +@@ -108,7 +108,7 @@ + "myi": ["", "みぃ" ], + "myo": ["", "みょ" ], + "myu": ["", "みゅ" ], +- "n\'": ["", "ん" ], ++ "n'": ["", "ん" ], + "na": ["", "な" ], + "ne": ["", "ね" ], + "ni": ["", "に" ],