From patchwork Sat Apr 19 06:31:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 41803 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 E8E2227BC4B; Sat, 19 Apr 2025 08:53:06 +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=-4.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, 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 7158727BC4A for ; Sat, 19 Apr 2025 08:53:06 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u62zf-00035M-ST; Sat, 19 Apr 2025 03:52: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 1u62zd-00034d-Rg for guix-patches@gnu.org; Sat, 19 Apr 2025 03:52: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 1u62zd-0007R8-Dv for guix-patches@gnu.org; Sat, 19 Apr 2025 03:52: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:References:In-Reply-To:From:Date:To:Subject; bh=R/cEvJOI69GZ9l5tt9SKRXnbBQtBILBiAzcOLOySMMA=; b=s1hVzaUQEYSrrBsk+XklAHExHlb4WprVaXQLXdbNIU/x3IFFLCbjGg0ZRfxNwXMHMo8nG5V+u/5D7jjtYciZP1Ak2Gwail6DhtZFERCWXHBpR1alScEhYMCp4fu+oNujuVEjOkUufJrp0hnA2ZeY6XAnNpgDdeUp4BLGpIR7/ZzGmAW+ZG10zOYZ30PM1cSpIlKFOhu0vlilz8Upp3o/xzyDawwd29pa58n8MW4lMyGrQRe6AkuoHIqCytW8e8NXSqfRjeGwp67s70lRNo8wKtSEA8CbkxO7W9phjGkCMLfRNW5/L/qCXxmnNXrlCaqSkvzCCpq6Hw0ViQRWS51R7A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u62zd-0000aW-5C for guix-patches@gnu.org; Sat, 19 Apr 2025 03:52:05 -0400 Subject: bug#77890: [PATCH] gnu: libskk: Fix tests. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Sat, 19 Apr 2025 07:52:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 77890 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Kurome Cc: iyzsong@envs.net, 77890-done@debbugs.gnu.org Mail-Followup-To: 77890@debbugs.gnu.org, hako@ultrarare.space, hunt31999@gmail.com Received: via spool by 77890-done@debbugs.gnu.org id=D77890.17450490871860 (code D ref 77890); Sat, 19 Apr 2025 07:52:04 +0000 Received: (at 77890-done) by debbugs.gnu.org; 19 Apr 2025 07:51:27 +0000 Received: from localhost ([127.0.0.1]:57057 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u62z1-0000Tv-BB for submit@debbugs.gnu.org; Sat, 19 Apr 2025 03:51:27 -0400 Received: from mail.boiledscript.com ([2a01:4f8:242:4aeb::42]:57250) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u62yy-0000TV-08 for 77890-done@debbugs.gnu.org; Sat, 19 Apr 2025 03:51:25 -0400 Date: Sat, 19 Apr 2025 14:31:44 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=mail; t=1745049080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=R/cEvJOI69GZ9l5tt9SKRXnbBQtBILBiAzcOLOySMMA=; b=ebC+tCkpnPoNlDwKycWZlKgf5o7MMIY30wFIKZcYRoTAKOaVB0sU75hSPkgrzZq9Sh62cv /a1/jmG4MAfhAkALMuj4o0ypM/AAP7miLrlO0I3cdjt8NJce4Ti2KWWsXyhaspKr0pcn89 rUdFhQaMtapbg75Xu2tcoUgCTq82W4HiCdV6OKY8fhaR5SZtGZwzFskMujPziamfc9wrir oQgjcAafct2eHVu4oe9W9++3nB0ZGwI/xgpnI3cF4Uvvbnu7gNxI1rja5tMLV48f9tmgbQ 6yYlQ1ANrHuSC89YoN1KfqUM8n/gyCqmc3Vj0OGDkdOJqw1cmZvFsnCH8NK/Ww== Message-ID: <87cyd8achb.wl-hako@ultrarare.space> From: Hilton Chain In-Reply-To: <20250418061948.28269-2-hunt31999@gmail.com> References: <20250418061948.28269-2-hunt31999@gmail.com> MIME-Version: 1.0 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 On Fri, 18 Apr 2025 14:19:34 +0800, Kurome wrote: > > 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 Applied as b0d0f0f9051f45f44fb592afe5dcb50ac0e405f7 with following change, thanks! diff --git a/gnu/local.mk b/gnu/local.mk index 3e29c67453..dc8d00742d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1765,6 +1765,7 @@ dist_patch_DATA = \ %D%/packages/patches/libquicktime-ffmpeg.patch \ %D%/packages/patches/libsecret-fix-test-paths.patch \ %D%/packages/patches/libsepol-versioned-docbook.patch \ + %D%/packages/patches/libskk-fix-invalid-escape.patch \ %D%/packages/patches/libtar-CVE-2013-4420.patch \ %D%/packages/patches/libtar-CVE-2021-33643-CVE-2021-33644.patch \ %D%/packages/patches/libtar-CVE-2021-33645-CVE-2021-33646.patch \ diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index b7d908b25b..b15cdc2e73 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -931,17 +931,14 @@ (define-public libskk "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))))))) + (list #:parallel-tests? #f ;Concurrency issues in tests. + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'symlink-skk-jisyo + (lambda* (#:key inputs #:allow-other-keys) + (let ((dict-dir "share/skk")) + (symlink (search-input-directory inputs dict-dir) + (in-vicinity #$output dict-dir)))))))) (native-inputs (list autoconf automake gettext-minimal @@ -949,10 +946,7 @@ (define-public libskk libtool pkg-config vala)) - (inputs (list libgee - json-glib - libxkbcommon - skk-jisyo)) + (inputs (list libgee json-glib libxkbcommon skk-jisyo)) (home-page "https://github.com/ueno/libskk") (synopsis "Dealing with Japanese kana-to-kanji conversion") (description