From patchwork Fri Sep 23 05:00:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 42869 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 5B50A27BBE9; Fri, 23 Sep 2022 06:06:53 +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,URIBL_BLOCKED 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 ABBA927BBEB for ; Fri, 23 Sep 2022 06:06:48 +0100 (BST) Received: from localhost ([::1]:37640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1obatj-0005rA-Qb for patchwork@mira.cbaines.net; Fri, 23 Sep 2022 01:06:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34818) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obapD-0003W6-RV for guix-patches@gnu.org; Fri, 23 Sep 2022 01:02:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39968) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1obapD-00028q-JY for guix-patches@gnu.org; Fri, 23 Sep 2022 01:02:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1obapD-00055w-E8 for guix-patches@gnu.org; Fri, 23 Sep 2022 01:02:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58014] [PATCH 12/15] gnu: dconf: Set sysconfdir to /etc. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Sep 2022 05:02:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58014 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58014@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 58014-submit@debbugs.gnu.org id=B58014.166390931719476 (code B ref 58014); Fri, 23 Sep 2022 05:02:07 +0000 Received: (at 58014) by debbugs.gnu.org; 23 Sep 2022 05:01:57 +0000 Received: from localhost ([127.0.0.1]:39031 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obap2-000544-Vv for submit@debbugs.gnu.org; Fri, 23 Sep 2022 01:01:57 -0400 Received: from mail-qt1-f178.google.com ([209.85.160.178]:45665) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obap0-00053i-IA for 58014@debbugs.gnu.org; Fri, 23 Sep 2022 01:01:55 -0400 Received: by mail-qt1-f178.google.com with SMTP id r20so7739035qtn.12 for <58014@debbugs.gnu.org>; Thu, 22 Sep 2022 22:01:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=IQZko2oOGrA/f8sPxCUQ3/noROWlUX5hkYy3q9mAWjw=; b=gVQKJMPHUFjXs+Idx/obq0CQp90wccYQuJUfC4gDvmsyC1KNykNr7rg9Dq5Fj0Jb2Y 9HztuEjxFtKM5W7Y/0d1rOuQhwiJoisAG306uX07XtcFkHJTE7fegbwD6lG6NVJroGZk Kenjf1rPmqb9RFFIIRrE0/mnnVuTuakh2/6p84grdfgEf9wQKASUhBPZ0prw5xEuwKE0 IA/Br0vMQ49nCbE3/Jgjb7bt1a1OeDs9iQzq5ET5ZLPWrIxIlewUksaXDtyAaJoyWsG2 8Z5L+IiAh3d9pS71atMw8MkC3WKkJ4/+P/A0j8ZFkNqiakn7opKIlcPoeJbNIlXZMqqi ehpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=IQZko2oOGrA/f8sPxCUQ3/noROWlUX5hkYy3q9mAWjw=; b=EFQwBRBSR5H65oVstct4lDANv/L/Z0jjKzZ69v/JOvkg8ydG1SE76xJrj+cIOKAFwL /pE2+DdEO8cWuv9ad0/obnUeyQIubrYMq4n4/LNK2obhdILOYX8A6OxzwGw+jthHBhjf NV7dBO74FhSR4jbYKtDhnQ/ub6KHiHuqE7kw5zx1u6F3BY68lcieF+v11MIXVHircMcs Cb6QA3z8iurEJyjQQCmE70dxRVPs5ULY0CAwYjEvdYzIn+OtOMUEQECivbxITU0Lq7dF iFB86BOhEZpxacDs4ECvDbKoPqteXjCnjyYXE4OaIQLCZpF5vGx8p7A8kqaoZV+I28tb GAag== X-Gm-Message-State: ACrzQf1PQBAQm23kYdOP8TvN/HUBIz+15CTXOQGZeBuFfyc9+z1SZNPi V/64jkReOMajhMjXjpq1Bs7GkccTr0A= X-Google-Smtp-Source: AMsMyM43uQhY4Mdop4PcXrSkPD5/jrFufatx6DbCUo2Iu1bplI4s96ibZQzPCgW0el1vVbcX0P/m2A== X-Received: by 2002:a05:622a:110b:b0:35c:d403:6d95 with SMTP id e11-20020a05622a110b00b0035cd4036d95mr5980034qty.495.1663909308983; Thu, 22 Sep 2022 22:01:48 -0700 (PDT) Received: from localhost.localdomain ([2607:fad8:4:3::1001]) by smtp.gmail.com with ESMTPSA id de4-20020a05620a370400b006bbb07ebd83sm5263534qkb.108.2022.09.22.22.01.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Sep 2022 22:01:48 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 23 Sep 2022 01:00:39 -0400 Message-Id: <20220923050042.29893-12-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220923050042.29893-1-maxim.cournoyer@gmail.com> References: <20220923050042.29893-1-maxim.cournoyer@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/gnome.scm (dconf) [arguments]: Use gexps. [configure-flags]: Add --sysconfdir=/etc. [native-inputs]: Remove labels. --- gnu/packages/gnome.scm | 54 +++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index facc8515f5..24d869f496 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4719,33 +4719,39 @@ (define-public dconf (base32 "0cs5nayg080y8pb9b7qccm1ni8wkicdmqp1jsgc22110r6j24zyg")))) (build-system meson-build-system) + (arguments + (list + #:glib-or-gtk? #t + ;; Configure sysconfdir to /etc so that gconf profiles can be written + ;; there and loaded without having to set GCONF_PROFILE, which cannot be + ;; safely set globally (as a gconf profile is a per-user thing). + #:configure-flags #~(list "--sysconfdir=/etc" + "-Dgtk_doc=true") + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'increase-test-timeout + (lambda _ + ;; On big-memory systems, the engine test may take + ;; much longer than the default of 30 seconds. + (substitute* "tests/meson.build" + (("test\\(unit_test\\[0\\], exe" all) + (string-append all ", timeout: 300")))))))) + (native-inputs + (list bash-completion + libxslt ;for xsltproc + libxml2 ;for XML_CATALOG_FILES + docbook-xml-4.2 + docbook-xsl + `(,glib "bin") + gtk-doc/stable + pkg-config + python + vala)) + (inputs + (list gtk+ + dbus)) (propagated-inputs ;; In Requires of dconf.pc. (list glib)) - (inputs - (list gtk+ dbus)) - (native-inputs - `(("bash-completion" ,bash-completion) - ("libxslt" ,libxslt) ;for xsltproc - ("libxml2" ,libxml2) ;for XML_CATALOG_FILES - ("docbook-xml" ,docbook-xml-4.2) - ("docbook-xsl" ,docbook-xsl) - ("glib:bin" ,glib "bin") - ("gtk-doc" ,gtk-doc/stable) - ("pkg-config" ,pkg-config) - ("python" ,python) - ("vala" ,vala))) - (arguments - `(#:glib-or-gtk? #t - #:configure-flags '("-Dgtk_doc=true") - #:phases (modify-phases %standard-phases - (add-after 'unpack 'increase-test-timeout - (lambda _ - ;; On big-memory systems, the engine test may take - ;; much longer than the default of 30 seconds. - (substitute* "tests/meson.build" - (("test\\(unit_test\\[0\\], exe" all) - (string-append all ", timeout: 300")))))))) (home-page "https://developer.gnome.org/dconf/") (synopsis "Low-level GNOME configuration system") (description "Dconf is a low-level configuration system. Its main purpose