From patchwork Sat May 14 22:07:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 39259 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 B201127BBEA; Sat, 14 May 2022 23:33:11 +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 7EA3927BBE9 for ; Sat, 14 May 2022 23:33:11 +0100 (BST) Received: from localhost ([::1]:56922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nq0Jy-0004uU-LZ for patchwork@mira.cbaines.net; Sat, 14 May 2022 18:33:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nq0Jq-0004rq-7S for guix-patches@gnu.org; Sat, 14 May 2022 18:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53769) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nq0Jp-0008MT-UL for guix-patches@gnu.org; Sat, 14 May 2022 18:33:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nq0Jp-0001nb-QL for guix-patches@gnu.org; Sat, 14 May 2022 18:33:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55419] [PATCH 1/5] gnu: emacs-next-pgtk: Use new package style. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 14 May 2022 22:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55419 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55419@debbugs.gnu.org Received: via spool by 55419-submit@debbugs.gnu.org id=B55419.16525675676858 (code B ref 55419); Sat, 14 May 2022 22:33:01 +0000 Received: (at 55419) by debbugs.gnu.org; 14 May 2022 22:32:47 +0000 Received: from localhost ([127.0.0.1]:47657 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq0Ja-0001mS-Se for submit@debbugs.gnu.org; Sat, 14 May 2022 18:32:47 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:34523) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq0JZ-0001lv-BJ for 55419@debbugs.gnu.org; Sat, 14 May 2022 18:32:45 -0400 Received: by mail-ej1-f66.google.com with SMTP id g6so22338105ejw.1 for <55419@debbugs.gnu.org>; Sat, 14 May 2022 15:32:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:content-transfer-encoding:message-id :mime-version; bh=AUcUwWdNHfx5oKTOnipZo9UpWLwim993nTnBXcLQnP8=; b=YA3yAECwPoV+YY0E0Exf9ialSiGxzXvGpe+E7JN9ugTCRnB9tQuXQkkpXSUzM+PH0w 91CFRdQPx8LIXSSoWPaQYjPMZYhfuTJNnN3uODLhgDFzD6E7egEJYUIKbbeh7R11FX8+ l7HrpAF/Qmepn6k2XZYauRwiZN5EeFd9sbLnJFTyFMt3ZLbah2nPq7Ql7ssI4UKKGGsH /UlUAEYSsWu2KHWpKptKstZx6wTGLpWlfFqAuAufg4c/zRM6hje5o1pJdGpGE22eZSgP evquCSkOmuwJJl0QZv7YzlttvSfJPOR1BwEeqXQaegUHOiabCVR9W60mAQnMSUb37hQj q6Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:content-transfer-encoding :message-id:mime-version; bh=AUcUwWdNHfx5oKTOnipZo9UpWLwim993nTnBXcLQnP8=; b=hvju4sRKrzZFNJU1e9S0UzYj5tkjVpgxOimj4tDEOlPsSDTDJH8mqbVt/hKX7O4UmG witooB1ucpVJ4kp94Mmy9O/5SgqJgFDFs7Lb9n7LA6McZ+ORw8MWu8OeHnK9dpMwySha ZMKvGG/49Bb9nExA2+45SrFIsYd7NmxoRjlnKC1xVpBo0J7KyvgAGQIWvrkrqLxDolTm cdHwkhV4n3gSU2LYOkMp76Tx19tJGVg9bv8yUV/J8oti7aBNacg8bjdu5F7t+L3kHetG 0g3pFmYx7DPsh3cd416ecWRhwXQZXaptdM4D4p8NoofEpSPcf8pKNHkNbV+QSf3T8aPY MdPQ== X-Gm-Message-State: AOAM530Hg1//aAbpMxQzvHqnyJKt0ca4uQ35pePLVyEmi6mJN1l3uZDR 1LVFgzYMI+21ooXBieZSzm5gp7NVF90= X-Google-Smtp-Source: ABdhPJzA/Ax8RKw7r6er1e1aPykfcCf5JZuzKrrq/M5IDG/i6hjkRUyEk0lQSojyl38QMMAGsojBVg== X-Received: by 2002:a17:907:3e21:b0:6f4:6c7c:c781 with SMTP id hp33-20020a1709073e2100b006f46c7cc781mr9379192ejc.735.1652567559426; Sat, 14 May 2022 15:32:39 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id qx16-20020a170907b59000b006f3ef214e53sm2064161ejc.185.2022.05.14.15.32.38 for <55419@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 15:32:39 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 15 May 2022 00:07:43 +0200 Message-ID: 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs.scm (emacs-next-pgtk)[arguments]: Convert to list of G-Expressions. [inputs]: Use modify-inputs. --- gnu/packages/emacs.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 9649334e45..af902ac9f9 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -348,13 +348,13 @@ (define-public emacs-next-pgtk (name "emacs-next-pgtk") (arguments (substitute-keyword-arguments (package-arguments emacs-next) - ((#:configure-flags flags ''()) - `(cons* "--with-pgtk" "--with-xwidgets" ,flags)))) + ((#:configure-flags flags #~'()) + #~(cons* "--with-pgtk" "--with-xwidgets" #$flags)))) (propagated-inputs (list gsettings-desktop-schemas glib-networking)) (inputs - `(("webkitgtk" ,webkitgtk-with-libsoup2) - ,@(package-inputs emacs-next))) + (modify-inputs (package-inputs emacs-next) + (prepend webkitgtk-with-libsoup2))) (home-page "https://github.com/masm11/emacs") (synopsis "Emacs text editor with @code{pgtk} and @code{xwidgets} support") (description "This Emacs build implements graphical UI purely in terms of From patchwork Sat May 14 22:10:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 39260 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 A0AEB27BBEA; Sat, 14 May 2022 23:33:12 +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 7205F27BBE9 for ; Sat, 14 May 2022 23:33:12 +0100 (BST) Received: from localhost ([::1]:56954 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nq0Jz-0004vo-JY for patchwork@mira.cbaines.net; Sat, 14 May 2022 18:33:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nq0Jq-0004sY-Ik for guix-patches@gnu.org; Sat, 14 May 2022 18:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53770) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nq0Jq-0008Mc-9c for guix-patches@gnu.org; Sat, 14 May 2022 18:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nq0Jq-0001ni-6d for guix-patches@gnu.org; Sat, 14 May 2022 18:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55419] [PATCH 2/5] gnu: emacs-xwidgets: Use new package style. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 14 May 2022 22:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55419 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55419@debbugs.gnu.org Received: via spool by 55419-submit@debbugs.gnu.org id=B55419.16525675676864 (code B ref 55419); Sat, 14 May 2022 22:33:02 +0000 Received: (at 55419) by debbugs.gnu.org; 14 May 2022 22:32:47 +0000 Received: from localhost ([127.0.0.1]:47659 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq0Jb-0001mZ-3s for submit@debbugs.gnu.org; Sat, 14 May 2022 18:32:47 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:34523) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq0JZ-0001lx-Ka for 55419@debbugs.gnu.org; Sat, 14 May 2022 18:32:45 -0400 Received: by mail-ej1-f65.google.com with SMTP id g6so22338123ejw.1 for <55419@debbugs.gnu.org>; Sat, 14 May 2022 15:32:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:content-transfer-encoding:message-id :mime-version; bh=uTIXZX5cnQPFq5SFh9ZgbNb7YJooRISDDnLevd2H7w4=; b=ktS0Sb1RVvJAy+6ZABh4PlyzAHtAMgtApdFBF9YjguFICAt79JyeoB974+cdoiVb8t JZvhJcdMHKEiqofQ3e3vpcdN/OF6pI87R9zO4tbQdGEvMJP+Drl2sNk0alkMZFmEClLU 7PHpuSba5azjA0SJ3l7JMNrTMQaBPxObRwLmdx8WmIJbNF2x4CjG7e6qzmZo2Lz+3/PJ dg9fKRCv257rkX82Y2WVs+tggDmzSIZwpPQ9G3ZF1CEvrTNBE1fMztYbnH44lBC8P7Z7 c3DoX89ErqHtaJY/e3p5kp3mef1BZPMhUXmEkcNDilO/QS9+Orf67S2OIR49mRmx9MAQ Ukww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:content-transfer-encoding :message-id:mime-version; bh=uTIXZX5cnQPFq5SFh9ZgbNb7YJooRISDDnLevd2H7w4=; b=iyRzkvGdTT6m9bO8hsf67MX8xif8JjiYCt9A5sSbuXHS8CzX1wQjaHdlFqhv8RSgAn sgHArMB27keTUJK+kK+Rb7Mkn5gvRHP69mhJ+5oid3u5+sFugg6wIlyN2nkXhfspv1HD uX052zBZaT89kTfK3/GOAHcfybBqXMI790t9JRDxpnqMHs9TSAP0fc6Iq2m0rnBONDze 43jkPI5T3x5+dF1uCtTwSaChsS99N3sNbjpbVI8ntfEzOElXuZLoNoX9c+vYlNVXlCaO 4CTeDOzXIomRlbvJwxY4bEkSRPO4OjwR/er9N/NkGIU8osJf/yv8dqeCLUC/6lAYNVPi QcVg== X-Gm-Message-State: AOAM533mrf92ktQY4Bc+7kQigYjEUQ0knraWKTOARjtuTsUoCfwpch4P RROHGsHiMi3Kn39RDu3U4GfXJDEjGjQ= X-Google-Smtp-Source: ABdhPJw5cNvFhoWANwTVkaZgSOnjz0vrI6fuSU8r2/UxdWLq3Ji3XITiYRzqTG091scqIOgJwEC6BQ== X-Received: by 2002:a17:907:9711:b0:6f4:6989:6afb with SMTP id jg17-20020a170907971100b006f469896afbmr9902838ejc.618.1652567560084; Sat, 14 May 2022 15:32:40 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id qx16-20020a170907b59000b006f3ef214e53sm2064161ejc.185.2022.05.14.15.32.39 for <55419@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 15:32:39 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 15 May 2022 00:10:19 +0200 Message-ID: <1ebe47f9ebc26746dce56d7b71094b067f98b0c4.camel@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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs.scm (emacs-xwidgets)[arguments]: Convert to list of G-Expressions. [inputs]: Use modify-inputs. --- gnu/packages/emacs.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index af902ac9f9..e3eba851ff 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -391,16 +391,15 @@ (define-public emacs-xwidgets (build-system gnu-build-system) (arguments (substitute-keyword-arguments (package-arguments emacs) - ((#:configure-flags flags ''()) - `(cons "--with-xwidgets" ,flags)) + ((#:configure-flags flags #~'()) + #~(cons "--with-xwidgets" #$flags)) ((#:phases phases) - `(modify-phases ,phases - (delete 'restore-emacs-pdmp) - (delete 'strip-double-wrap))))) + #~(modify-phases #$phases + (delete 'restore-emacs-pdmp) + (delete 'strip-double-wrap))))) (inputs - `(("webkitgtk" ,webkitgtk-with-libsoup2) - ("libxcomposite" ,libxcomposite) - ,@(package-inputs emacs))))) + (modify-inputs (package-inputs emacs) + (prepend webkitgtk-with-libsoup2 libxcomposite))))) (define-public emacs-no-x (package/inherit emacs From patchwork Sat May 14 22:10:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 39263 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 A469427BBEB; Sat, 14 May 2022 23:34:01 +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=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 6CFF427BBEA for ; Sat, 14 May 2022 23:34:01 +0100 (BST) Received: from localhost ([::1]:59266 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nq0Km-0006WU-Kt for patchwork@mira.cbaines.net; Sat, 14 May 2022 18:34:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56936) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nq0Jq-0004tb-VD for guix-patches@gnu.org; Sat, 14 May 2022 18:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53771) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nq0Jq-0008Mi-MH for guix-patches@gnu.org; Sat, 14 May 2022 18:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nq0Jq-0001np-JN for guix-patches@gnu.org; Sat, 14 May 2022 18:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55419] [PATCH 3/5] gnu: emacs-no-x: Use new package style. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 14 May 2022 22:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55419 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55419@debbugs.gnu.org Received: via spool by 55419-submit@debbugs.gnu.org id=B55419.16525675706880 (code B ref 55419); Sat, 14 May 2022 22:33:02 +0000 Received: (at 55419) by debbugs.gnu.org; 14 May 2022 22:32:50 +0000 Received: from localhost ([127.0.0.1]:47662 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq0Je-0001mt-CO for submit@debbugs.gnu.org; Sat, 14 May 2022 18:32:50 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:39621) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq0Ja-0001lz-EC for 55419@debbugs.gnu.org; Sat, 14 May 2022 18:32:46 -0400 Received: by mail-ej1-f68.google.com with SMTP id bv19so22305829ejb.6 for <55419@debbugs.gnu.org>; Sat, 14 May 2022 15:32:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:content-transfer-encoding:message-id :mime-version; bh=K9BHyIFW5Q30k6EsP8nusleFZUDRNShJYifzzMDAbXQ=; b=hnoGO1NQdrGHxr/jRA3MoyVR5g8RthVT6hit/kNaMAR4Mj47s2GmGNCt/BMLNCoCbI fx325XtVNmqhZ30fzjwWCflqZFYl6a7P7fzHbAKrn3TYhKl1MaX2LQp2VoePFbNLg5tW zfCH7O5MbuenOtPzLl0S0rQepuxsmd+NNc3geaNz9MHkW6PmAbVOKeiToOcSEZhxy4R8 aEgwbevxoyTzpLaRBk0wfo7fwd7CQvneuR/co5Ln75fYHYrVHEWKir5xr+LYC0OnKSGr En1cv01U39T3IjlXRFIlKUSZFrcJYX/wukuQii0Lytu4GEr6TGhD+EKaMoHSIAydmIl1 qTUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:content-transfer-encoding :message-id:mime-version; bh=K9BHyIFW5Q30k6EsP8nusleFZUDRNShJYifzzMDAbXQ=; b=4OcXYYd/42SJyVrhBSKAH++B4M0WQ09qXPTPjCbXeotiWEjN0g+gMMJFK3jJxs8gtY TgX8DvAyAUOm48nYtwGHgV5PNT3QI8ja9zPqPNrQqbbo1JqtjhABW/Z2vWVnQ/0rnhre DfzqCQiYGr8z0y1yGDru6XN27UGufEZlTtIWyl8+zYsvmqPVKFKNYiKtVxXjpV9kHq4e +4GgfWKjDJh4nBe1I3MG48WoELsSfQqAAAEDOLrUBkYMhflr4l5utdue6fkcnc6H4UE8 Vktuku5AM5bMhX7D/891BzR3pAofoKFpZIXa9KGS/eNEgGGpBKTfPPPz+wzlKCBOmPfi fVTw== X-Gm-Message-State: AOAM530w4DH6BNAggGoJCqzb7QcuMV4aVzHVuZxw1QcL6a+fOAbRk4hc fycTlW7Nq7npREv7RS6QCUEYXyck9JE= X-Google-Smtp-Source: ABdhPJw45Ydjiv+20w+InBPLM/WxSiNaMVsXDBXTE7tgb7Nv9uQesKls68v3buKsSWFommJWAQfm5A== X-Received: by 2002:a17:906:d54b:b0:6f4:d14b:bb91 with SMTP id cr11-20020a170906d54b00b006f4d14bbb91mr9671939ejc.314.1652567560677; Sat, 14 May 2022 15:32:40 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id qx16-20020a170907b59000b006f3ef214e53sm2064161ejc.185.2022.05.14.15.32.40 for <55419@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 15:32:40 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 15 May 2022 00:10:59 +0200 Message-ID: <45ccc5b1953f1388438d774e9de63b8ec6e4b6ee.camel@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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs.scm (emacs-no-x)[arguments]: Convert to list of G-Expressions. [inputs]: Use modify-inputs. --- gnu/packages/emacs.scm | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index e3eba851ff..027afc811a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -407,22 +407,20 @@ (define-public emacs-no-x (synopsis "The extensible, customizable, self-documenting text editor (console only)") (build-system gnu-build-system) - (inputs (fold alist-delete - (package-inputs emacs) - '("libx11" "gtk+" "libxft" "libtiff" "giflib" "libjpeg" - "imagemagick" "libpng" "librsvg" "libxpm" "libice" - "libsm" "cairo" "pango" "harfbuzz" - - ;; These depend on libx11, so remove them as well. - "libotf" "m17n-lib" "dbus"))) + (inputs (modify-inputs (package-inputs emacs) + (delete "libx11" "gtk+" "libxft" "libtiff" "giflib" "libjpeg" + "imagemagick" "libpng" "librsvg" "libxpm" "libice" + "libsm" "cairo" "pango" "harfbuzz" + ;; These depend on libx11, so remove them as well. + "libotf" "m17n-lib" "dbus"))) (arguments (substitute-keyword-arguments (package-arguments emacs) - ((#:configure-flags flags ''()) - `(delete "--with-cairo" ,flags)) + ((#:configure-flags flags #~'()) + #~(delete "--with-cairo" #$flags)) ((#:phases phases) - `(modify-phases ,phases - (delete 'restore-emacs-pdmp) - (delete 'strip-double-wrap))))))) + #~(modify-phases #$phases + (delete 'restore-emacs-pdmp) + (delete 'strip-double-wrap))))))) (define-public emacs-no-x-toolkit (package/inherit emacs From patchwork Sat May 14 22:11:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 39262 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 ED2AC27BBEA; Sat, 14 May 2022 23:33:22 +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 C1F1D27BBE9 for ; Sat, 14 May 2022 23:33:22 +0100 (BST) Received: from localhost ([::1]:57656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nq0K9-0005Pw-QQ for patchwork@mira.cbaines.net; Sat, 14 May 2022 18:33:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nq0Jr-0004ua-AW for guix-patches@gnu.org; Sat, 14 May 2022 18:33:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53772) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nq0Jr-0008Mp-1o for guix-patches@gnu.org; Sat, 14 May 2022 18:33:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nq0Jq-0001nw-VD for guix-patches@gnu.org; Sat, 14 May 2022 18:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55419] [PATCH 4/5] gnu: emacs-no-x-toolkit: Use new package style. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 14 May 2022 22:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55419 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55419@debbugs.gnu.org Received: via spool by 55419-submit@debbugs.gnu.org id=B55419.16525675706887 (code B ref 55419); Sat, 14 May 2022 22:33:02 +0000 Received: (at 55419) by debbugs.gnu.org; 14 May 2022 22:32:50 +0000 Received: from localhost ([127.0.0.1]:47664 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq0Je-0001mv-Jg for submit@debbugs.gnu.org; Sat, 14 May 2022 18:32:50 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:42753) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq0Ja-0001m0-OC for 55419@debbugs.gnu.org; Sat, 14 May 2022 18:32:47 -0400 Received: by mail-ej1-f65.google.com with SMTP id i27so22264280ejd.9 for <55419@debbugs.gnu.org>; Sat, 14 May 2022 15:32:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:content-transfer-encoding:message-id :mime-version; bh=RYDGJCCxu9ImClh8oZOSGnoBtrfqWktIld3cIp+w5u8=; b=LeIEYYFho596VAezUc1ux3Ixfmt0UpzM5orurzJPz7INbkNicnwtvU4UDUXSlCpqil M5kLDH8eXTOvrqoJmeDiiHppqngyGMNEpFopzu0SHmIvDcPQtQOcMadopyxmVSIeh4aO g4ZikW1hmfEHONsGzSsTiQp7+JjE/EUfV1iZxnOPUK5lOKYHkkHxxSUBMn69tGHbVTR/ 4dZ/znlNypJBtvNg/gwt4P07TKLGIVyBOIMtEHhXaokmzGk8PgZ05ljVS4Wz3xazqUGT kaZfMSP3HLdQu4sWgSFfjp2260Q4HA+ageazld/OWprg4ZxGkS+koJ6pMF0k5PkFFM4i 7vsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:content-transfer-encoding :message-id:mime-version; bh=RYDGJCCxu9ImClh8oZOSGnoBtrfqWktIld3cIp+w5u8=; b=hyaCJIbltBJ5edJjYXPKIZ8qK0xiqzZl0AD6MPtdd8FOAsKENP2lJe7LJR9sinHuDi PEpcXF2gjVWkhYMn3fAMytl39UiDbpJ2j9rOcSOy+ng3ve5/N/t5WPNCqXql4LEfNEyV vgEeGH/yV7q8VI24Wk4KySXhmdYXgqJPlA2MPENPi9k0EmhJ45N15Enfhaj2CxyzLhN8 NmaQIl72QOK7X2MvC5GDtbm0tBVbYOnVi8x5qpH3B1HLT7ebG36JdWAsHxyDxv7nYpAD 0kKAfxcSGdR7Jv3WC7GqUuq92t3mgStwSNDV2653mMGOE9kzEVSugFqRkwyABVEfwMyC LIlA== X-Gm-Message-State: AOAM532vU7hHpQ5gnsFTV8xkvPr+xDtRbJxyYElxtqd1mKHzqlKzBQNt cM/tqLSXX4MFFW4vE3APFJd7OXvvmGw= X-Google-Smtp-Source: ABdhPJwhEsP2U51ML92nph/AkS1SutO7caErwJ3VkDroDJw72h/coxa+ogeu5e7uL38wiqsAg092jw== X-Received: by 2002:a17:907:97c4:b0:6f8:5ec5:61e2 with SMTP id js4-20020a17090797c400b006f85ec561e2mr9882005ejc.559.1652567561267; Sat, 14 May 2022 15:32:41 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id qx16-20020a170907b59000b006f3ef214e53sm2064161ejc.185.2022.05.14.15.32.40 for <55419@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 15:32:40 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 15 May 2022 00:11:22 +0200 Message-ID: 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs.scm (emacs-no-x-toolkit)[arguments]: Convert to list of G-Expressions. [inputs]: Use modify-inputs. --- gnu/packages/emacs.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 027afc811a..392b3297b0 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -428,14 +428,15 @@ (define-public emacs-no-x-toolkit (synopsis "The extensible, customizable, self-documenting text editor (without an X toolkit)" ) (build-system gnu-build-system) - (inputs (append `(("inotify-tools" ,inotify-tools)) - (alist-delete "gtk+" (package-inputs emacs)))) + (inputs (modify-inputs (package-inputs emacs) + (delete "gtk+") + (prepend inotify-tools))) (arguments (substitute-keyword-arguments (package-arguments emacs) - ((#:configure-flags flags ''()) - `(cons "--with-x-toolkit=no" ,flags)) + ((#:configure-flags flags #~'()) + #~(cons "--with-x-toolkit=no" #$flags)) ((#:phases phases) - `(modify-phases ,phases + #~(modify-phases #$phases (delete 'restore-emacs-pdmp) (delete 'strip-double-wrap))))))) From patchwork Sat May 14 22:11:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 39261 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 C9C6B27BBEA; Sat, 14 May 2022 23:33:21 +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 955CD27BBE9 for ; Sat, 14 May 2022 23:33:21 +0100 (BST) Received: from localhost ([::1]:57592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nq0K8-0005NG-DS for patchwork@mira.cbaines.net; Sat, 14 May 2022 18:33:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56940) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nq0Jr-0004vd-Nx for guix-patches@gnu.org; Sat, 14 May 2022 18:33:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53773) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nq0Jr-0008Mv-ER for guix-patches@gnu.org; Sat, 14 May 2022 18:33:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nq0Jr-0001o4-BZ for guix-patches@gnu.org; Sat, 14 May 2022 18:33:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55419] [PATCH 5/5] gnu: emacs-wide-int: Use new package style. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 14 May 2022 22:33:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55419 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55419@debbugs.gnu.org Received: via spool by 55419-submit@debbugs.gnu.org id=B55419.16525675716893 (code B ref 55419); Sat, 14 May 2022 22:33:03 +0000 Received: (at 55419) by debbugs.gnu.org; 14 May 2022 22:32:51 +0000 Received: from localhost ([127.0.0.1]:47666 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq0Je-0001n2-Qy for submit@debbugs.gnu.org; Sat, 14 May 2022 18:32:50 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:33383) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq0Jb-0001m2-II for 55419@debbugs.gnu.org; Sat, 14 May 2022 18:32:47 -0400 Received: by mail-ed1-f68.google.com with SMTP id p4so14023337edx.0 for <55419@debbugs.gnu.org>; Sat, 14 May 2022 15:32:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:content-transfer-encoding:message-id :mime-version; bh=5sjZ3psCM1bOOAJ47/R/UY46XNBGmW8/mS/c/ZCiT3U=; b=NUJ1uBESdVzrMn9FPEY+ssbvMwpX+mQ3iAivVbP968zI8zmym5kuq6KNTJ+bbzhnxo 4wlDEcZjth70fBPVqw/k4yeG77VZHL5nG7NGyiVlXquN8Psqjy6dFzPhF6zquzFvsTJp WXtGOeqZs6w5aghthFuTKAjsYIqRjyWT4BFs/dU9AL6VI6l+/XRCikXHL31coa81eidC nQ1QogcNp+Kniz9T52evF4XA8mi1ef34y2V8mI3kzsdCCum0bDzy+55ychFqqyH9IhzH H79PDH3a31uduVJS/Z5Hrq21m/FUE/qbpHYhofG3ni0Olv1i3xH7qZ1gCmg7JQPKyP9m s6LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:content-transfer-encoding :message-id:mime-version; bh=5sjZ3psCM1bOOAJ47/R/UY46XNBGmW8/mS/c/ZCiT3U=; b=Y312UeIUZUVROwBZ4m1DKUv9TEVe94lj7jVLQGYbHywi326Eq5r/NxggxIb1fnzXnB ews/MTpqlRsL+yjPPjDbYjmDlYstWZZdXcH0ysWl/F7LQNngVVj3IHJNfFHTYYTbTpoU h422wHG3KIyTm1xAVAZMU9wwQhcWGXuvzJxLmylP1btLb6bM6+HUyufbMEGGOP5oUYqe Bsa6uY6RtBAc9jLbjkoQtrazefk+4gIe12NOWHhxbtDHMiFtenzEgHIQkUrLrZvG2NbG 5ORSdsi0B56kJREO5d4yGkWZXUwZ5ulMt9DW4pOfu+6NTFiltT8Z/sGwLdhhb4iqAChH EoDw== X-Gm-Message-State: AOAM533XvVGTP83f3VfiZxVvv3Ey8SHXoo75BuuGN+GXSDONb0E3juLb G6sH+EwygXo4JpwryISA/KznmiIXD1o= X-Google-Smtp-Source: ABdhPJxb2Dm2E72B4LtKenhLoz06C3lrpzngHydzIneH6bVqMi8ipLG4xm9M2gAfgIT0dN7tuCrTVg== X-Received: by 2002:aa7:d6d4:0:b0:42a:a2ab:3b4f with SMTP id x20-20020aa7d6d4000000b0042aa2ab3b4fmr2366682edr.278.1652567561885; Sat, 14 May 2022 15:32:41 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id qx16-20020a170907b59000b006f3ef214e53sm2064161ejc.185.2022.05.14.15.32.41 for <55419@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 15:32:41 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 15 May 2022 00:11:41 +0200 Message-ID: <220a63dc235f44310ac1ca789beabdd09f7fbdb9.camel@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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs.scm (emacs-wide-int)[arguments]: Convert to list of G-Expressions. [inputs]: Use modify-inputs. --- gnu/packages/emacs.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 392b3297b0..25dab7ef59 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -448,7 +448,7 @@ (define-public emacs-wide-int (arguments (substitute-keyword-arguments (package-arguments emacs) ((#:configure-flags flags) - `(cons "--with-wide-int" ,flags)))))) + #~(cons "--with-wide-int" #$flags)))))) (define-public guile-emacs (let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b")