From patchwork Thu Oct 19 05:16:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 55023 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 670AD27BBE2; Thu, 19 Oct 2023 06:54:42 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable 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 0F0ED27BBEC for ; Thu, 19 Oct 2023 06:54:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtLyW-0003kq-E8; Thu, 19 Oct 2023 01:53:40 -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 1qtLyU-0003iw-C7 for guix-patches@gnu.org; Thu, 19 Oct 2023 01:53:38 -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 1qtLyU-0002OE-3c for guix-patches@gnu.org; Thu, 19 Oct 2023 01:53:38 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtLyu-0000wD-EJ; Thu, 19 Oct 2023 01:54:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66624] [PATCH emacs-team 08/15] gnu: uim: Keep Emacs files in subdirectory. Resent-From: Liliana Marie Prikler 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: Thu, 19 Oct 2023 05:54:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66624 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66624@debbugs.gnu.org Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com Received: via spool by 66624-submit@debbugs.gnu.org id=B66624.16976948253485 (code B ref 66624); Thu, 19 Oct 2023 05:54:04 +0000 Received: (at 66624) by debbugs.gnu.org; 19 Oct 2023 05:53:45 +0000 Received: from localhost ([127.0.0.1]:35498 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLya-0000u2-Ql for submit@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:45 -0400 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:55400) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyT-0000ry-9b for 66624@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:37 -0400 Received: by mail-ed1-x541.google.com with SMTP id 4fb4d7f45d1cf-53e751aeb3cso8484975a12.2 for <66624@debbugs.gnu.org>; Wed, 18 Oct 2023 22:53:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697694785; x=1698299585; darn=debbugs.gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=7WHDWRyQ+W+mHGqL/QEJaM5BX2Xq5/tV9Yd7+XXJT8o=; b=nnOZ1F9yLE+b/31HVSKd6PfWlqCt+iwsgziC9Ujhb5jqcMkB/wSNTDByMf6nMCJ64d QxsFSAC6heAqJtzlCKARnj4wBe6E/TU4Vvn9W1BPPrv7ECqkRI5Zr0QCZ+QxFlLQocIS /Q/mLpx5asPkxes50hak5vLiaZ5vrJS7jdoPM5WvAuGJ8EeUipvqy62582NjFe0KCuUt D3mSso7aMuplzH+z+q7H9CNePt8qCj9SwvmxDoTTWikQG/ROHLv09PzpioNAFr6s07M7 ikz4bZ/t5FfFLul3ri5YyuZAKL/TwDpPVIDbBeeqUVx/6SfKkEN+r01QDQ16WOGRnx81 9zcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697694785; x=1698299585; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7WHDWRyQ+W+mHGqL/QEJaM5BX2Xq5/tV9Yd7+XXJT8o=; b=L/RBUfIYhzHNRVW0NERKkWTBvLHPceKB28t+/mYxlr3CIXLsDs1MFI+9M/IYCAUONd UozaZ0FVBc8sgA4MCRgiA7BC1hGWUuPueQmQ5rqCcya2yvz7dc0ByvQ4jHZapVw+CvPP 0xVIbDa+5iSzV9vSbKgqb9XMOpB5dLsIzcznl9RnYygn+JJJGggGq+tHSf/Ic9D625xG dmHm9Y100DzXbVbPeO9WIKyoFyfNJWyo91nEyocdjLTaDjRtHQ+FsBtzIl2Jq0+CNfXC /KwqTcgfmVytBgUxiO/mjvBMkRGXdfpHTtz3k7UeVWrpTDG8sxawgkjAFMihy3MnG5+7 Jgjw== X-Gm-Message-State: AOJu0YwP7UFhZ3OX3Hx5JgAEvST0XHht4sGOyH2/xCrkbijG3Z5QeJXt 2BiFTj4iKbTUBHbSRvQdz2FSZo+JajYMXQ== X-Google-Smtp-Source: AGHT+IGgjAuEWmIcYCpO6/mHHgd7JyNCGpJfoPufQpIfFhJxXEeK7xf1IPAQyIejNH2Dbc2uPQivzg== X-Received: by 2002:a05:6402:42d6:b0:53e:7818:b7e8 with SMTP id i22-20020a05640242d600b0053e7818b7e8mr892441edc.19.1697694785103; Wed, 18 Oct 2023 22:53:05 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id s22-20020a50ab16000000b0053e589016a7sm3605507edc.16.2023.10.18.22.53.04 for <66624@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 22:53:04 -0700 (PDT) Message-ID: <4e2491379a04e4bd17f29f39b2e415e79e38e37e.1697694142.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 19 Oct 2023 07:16:18 +0200 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 * gnu/packages/xorg.scm (uim)[arguments]<#:configure-flags>: Drop “--with-lispdir”. <#:phases>: Drop ‘fix-install-path’. Adjust ‘make-autoloads’ accordingly. --- gnu/packages/xorg.scm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 66ba88f773..4fefb6f123 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6298,7 +6298,6 @@ (define-public uim (guix build emacs-utils)) #:configure-flags (list "--with-anthy-utf8" - (string-append "--with-lispdir=" %output "/share/emacs") ;; Set proper runpath (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib") "CFLAGS=-O2 -g -fcommon") @@ -6312,21 +6311,11 @@ (define-public uim ("uim-el-agent" (string-append out "/bin/uim-el-agent")) ("uim-el-helper-agent" (string-append out "/bin/uim-el-helper-agent")))) #t)) - ;; Fix installation path by renaming share/emacs/uim-el to - ;; share/emacs/site-lisp - (add-after 'install 'fix-install-path - (lambda* (#:key outputs #:allow-other-keys) - (let ((share-emacs (string-append (assoc-ref outputs "out") - "/share/emacs"))) - (rename-file (string-append share-emacs "/uim-el") - (string-append share-emacs "/site-lisp"))) - #t)) - ;; Generate emacs autoloads for uim.el (add-after 'fix-install-path 'make-autoloads (lambda* (#:key outputs #:allow-other-keys) (emacs-generate-autoloads ,name (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp")) + "/share/emacs/site-lisp/uim-el")) #t))))) (home-page "https://github.com/uim/uim") (synopsis "Multilingual input method framework")