From patchwork Thu Jan 30 16:01:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Wilson X-Patchwork-Id: 20037 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 9ECB2166FA; Thu, 30 Jan 2020 16:02:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id B0A7C166F4 for ; Thu, 30 Jan 2020 16:02:15 +0000 (GMT) Received: from localhost ([::1]:34636 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixCGl-0003z9-6B for patchwork@mira.cbaines.net; Thu, 30 Jan 2020 11:02:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39015) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixCGa-0003xW-2S for guix-patches@gnu.org; Thu, 30 Jan 2020 11:02:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ixCGY-00033v-HE for guix-patches@gnu.org; Thu, 30 Jan 2020 11:02:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58411) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ixCGY-00030q-2z for guix-patches@gnu.org; Thu, 30 Jan 2020 11:02:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ixCGY-0001f9-08 for guix-patches@gnu.org; Thu, 30 Jan 2020 11:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39306] [PATCH] gnu: Add xsettingsd. Resent-From: David Wilson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Jan 2020 16:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39306 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Marius Bakke Cc: 39306@debbugs.gnu.org Received: via spool by 39306-submit@debbugs.gnu.org id=B39306.15804001016362 (code B ref 39306); Thu, 30 Jan 2020 16:02:01 +0000 Received: (at 39306) by debbugs.gnu.org; 30 Jan 2020 16:01:41 +0000 Received: from localhost ([127.0.0.1]:36151 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ixCG5-0001eQ-TS for submit@debbugs.gnu.org; Thu, 30 Jan 2020 11:01:41 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:54595) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ixCG3-0001eD-CK for 39306@debbugs.gnu.org; Thu, 30 Jan 2020 11:01:32 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id 65BB8371; Thu, 30 Jan 2020 11:01:25 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Thu, 30 Jan 2020 11:01:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daviwil.com; h= references:from:to:cc:subject:in-reply-to:date:message-id :mime-version:content-type; s=fm1; bh=udCpZguGm5fkBDuTewb/fwXG0S fdljIkUeRYPhit9uc=; b=j2p4+zomM/eVFNCzDsWHZNKDcCefZD2lyaWcf3n1fL jXeJt5b7aqnUp6v+RpguWqPAMdrlwfU103clYDa/uXkJS+OWE/TQTi+AUnTjxEhN vBXCvG7ZvEIWpIgmXyRudBRrW2GlK2t6YM9X+xrffSOYoW9lPoVFcgiCNQFAKaU3 776UyBtzQ/WAn+RX+RGRLkqTyvT+/k0H0vJQv2ARhLf9yOIIYGYZTeabe+kD5VEV hLC29bvJ68yWGEMzIGyzeFNsrIA/1cRBMTkaHykGFgQ5POpO/uqnn9s3zG4IY0Wc CacFuSwn14D9RT8MXU1iW4S/UvJklHtyFDv6BzzBQNkw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=udCpZg uGm5fkBDuTewb/fwXG0SfdljIkUeRYPhit9uc=; b=Qs5jthz9bmLyqjem9XfLfD dFtMLTm/9ZrHaCiU67EiywtiTe+nRvVSPV00uXvy/YO6fdXdg2Y3H2zphS9jjQvv Jkx8GW/q7xVhTkcoxuKTcJIpJlPzcYEiDdlbqZoZc+2G+dNwVGxut2zKlvx45m2Z O/VC5nsqZESPClGVUmPC4j4O0wkv5hD2iMRAjMkcqI65xBk7Ry86cGLg2qNFZkO5 76K4EumetQaoo2kUPYLJLftcRFiiKMaYwkGs24gJKkiZpzOukIv3VPNdfjWswXRe Y8cIU1NdboHTplLRunDND1GODMNnUptMqQIO8T9qqbGrJpOHh0t7KDKXpK9t/8ig == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedrfeekgdekudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpehffgfhvffujgffkfggtgesmhdtreertdertdenucfhrhhomhepffgrvhhiugcu hghilhhsohhnuceouggrvhhiugesuggrvhhifihilhdrtghomheqnecuffhomhgrihhnpe hgnhhurdhorhhgnecukfhppeeijedrudejuddrhedurddvvddunecuvehluhhsthgvrhfu ihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepuggrvhhiugesuggrvhhifihilh drtghomh X-ME-Proxy: Received: from zerocool (c-67-171-51-221.hsd1.wa.comcast.net [67.171.51.221]) by mail.messagingengine.com (Postfix) with ESMTPA id 42F2B3060986; Thu, 30 Jan 2020 11:01:24 -0500 (EST) References: <87r1zlvymv.fsf@daviwil.com> <87zhe5nnss.fsf@devup.no> <87lfpp6n6v.fsf@daviwil.com> <87o8ulngsc.fsf@devup.no> User-agent: mu4e 1.2.0; emacs 26.3 From: David Wilson In-reply-to: <87o8ulngsc.fsf@devup.no> Date: Thu, 30 Jan 2020 08:01:21 -0800 Message-ID: <87k1596ii6.fsf@daviwil.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 Marius Bakke writes: > It is definitively OK to disable warnings coming from dependencies. In > fact, that is what we are supposed to do, and used to do until the > switch to GCC 7. > > To clarify, when we switched to GCC 7, its search paths were changed > from C{,PLUS}_INCLUDE_PATH to CPATH. The only[*] difference between > these search paths is that headers found on the former are treated as > "system headers", which disables warnings. > > [*] Besides the fact that GCC 6 and later is very picky about the order > of entries in C_INCLUDE_PATH, which is why we had to switch; see > for details. Thanks for the background, that was helpful! I've been out of the loop on GCC changes for a while so it's good to know that this happened. I've made the suggested changes to the summary and description, attached the updated patch. David From 7c9daaf8ab86c84d4bb4ad554912746dacbca5cd Mon Sep 17 00:00:00 2001 From: David Wilson Date: Sun, 26 Jan 2020 05:55:47 -0800 Subject: [PATCH] gnu: Add xsettingsd. * gnu/packages/xdisorg.scm (xsettingsd): New variable. --- gnu/packages/xdisorg.scm | 68 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index ecefab1dbb..10c5201e5e 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -30,6 +30,7 @@ ;;; Copyright © 2019 Josh Holland ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2020 Guillaume Le Vaillant +;;; Copyright © 2020 David Wilson ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,6 +58,7 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system meson) #:use-module (guix build-system python) + #:use-module (guix build-system scons) #:use-module (gnu packages) #:use-module (gnu packages documentation) #:use-module (gnu packages admin) @@ -2005,3 +2007,69 @@ The cutbuffer and clipboard selection are always synchronized.") can optionally use some appearance settings from XSettings, tint2 and GTK.") (home-page "https://jgmenu.github.io/") (license license:gpl2))) + +(define-public xsettingsd + (package + (name "xsettingsd") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/derat/xsettingsd.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "05m4jlw0mgwp24cvyklncpziq1prr2lg0cq9c055sh4n9d93d07v")))) + (build-system scons-build-system) + (inputs + `(("libx11" ,libx11))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("googletest" ,googletest) + ("googletest-source" ,(package-source googletest)))) + (arguments + `(#:scons ,scons-python2 + #:scons-flags + (list "CC=gcc") + #:phases + (modify-phases %standard-phases + (add-before 'build 'patch-sconstruct + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "SConstruct" + ;; scons doesn't pick up environment variables automatically + ;; so it needs help to find path variables + (("env = Environment\\(") + "env = Environment( + ENV = { + 'PATH': os.environ['PATH'], + 'CPATH': os.environ['CPATH'], + 'LIBRARY_PATH': os.environ['LIBRARY_PATH'], + 'PKG_CONFIG_PATH': os.environ['PKG_CONFIG_PATH'] + },") + ;; Update path to gtest source files used in tests + (("/usr/src/gtest") (string-append + (assoc-ref inputs "googletest-source") + "/googletest")) + ;; Exclude one warning that causes a build error + (("-Werror") "-Werror -Wno-error=sign-compare")) + #t)) + ;; The SConstruct script doesn't configure installation so + ;; binaries must be copied to the output path directly + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (mkdir-p bin) + (install-file "xsettingsd" bin) + (install-file "dump_xsettings" bin) + #t)))))) + (home-page "https://github.com/derat/xsettingsd") + (synopsis "Xorg settings daemon") + (description "@command{xsettingsd} is a lightweight daemon that provides settings to +Xorg applications via the XSETTINGS specification. It is used for defining +font and theme settings when a complete desktop environment (GNOME, KDE) is +not running. With a simple @file{.xsettingsd} configuration file one can avoid +configuring visual settings in different UI toolkits separately.") + (license license:bsd-3))) -- 2.24.1