From patchwork Thu Jan 30 14:20:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Wilson X-Patchwork-Id: 20035 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 91E7F16697; Thu, 30 Jan 2020 14:21:18 +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 EE954163AA for ; Thu, 30 Jan 2020 14:21:17 +0000 (GMT) Received: from localhost ([::1]:33242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixAh3-0006Ed-Ga for patchwork@mira.cbaines.net; Thu, 30 Jan 2020 09:21:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33376) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixAgu-0006EX-P2 for guix-patches@gnu.org; Thu, 30 Jan 2020 09:21:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ixAgp-0000As-Fx for guix-patches@gnu.org; Thu, 30 Jan 2020 09:21:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57368) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ixAgp-0000AH-7G for guix-patches@gnu.org; Thu, 30 Jan 2020 09:21:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ixAgo-0005VX-2e for guix-patches@gnu.org; Thu, 30 Jan 2020 09:21: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 14:21:02 +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.158039403121100 (code B ref 39306); Thu, 30 Jan 2020 14:21:02 +0000 Received: (at 39306) by debbugs.gnu.org; 30 Jan 2020 14:20:31 +0000 Received: from localhost ([127.0.0.1]:35104 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ixAgD-0005UB-2n for submit@debbugs.gnu.org; Thu, 30 Jan 2020 09:20:31 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:35667) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ixAgA-0005Tt-C6 for 39306@debbugs.gnu.org; Thu, 30 Jan 2020 09:20:23 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id 70EA9469; Thu, 30 Jan 2020 09:20:14 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Thu, 30 Jan 2020 09:20:14 -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=FB678h+vlk1Bxd1nxnS4tbDp2A 7oQYIq1BpBi2NkosQ=; b=JqCO/2IqgVPlDp0kCoWHW4UNmn53uzIzKMZ9jPf8A/ loRS0Ih6495Ha0MMb7/ko9nrjSjH/R10bQX3nI3CmfkVjJ4eBtfb0TFSoesvZjAt 5r1s4bDE/1hoxI7RjF7ngaJQhGbZqZPBuEpOsLrtfbVqvVh4Nh9CugGbyCpcX+hr QulOb2G0m0Ws7CTmtFnn7GNtojPsulhYFNGEwctiQgN0a0zgqD6VzjtafhoJxdfr rhCsK0GZyJZKmiukh/R2oNiMLrC5LF2lC9rtpaQNUn5AHw9Ch82Dq0oZPnqYfJ2D V/u8jbblaZ4umvTGe+vyCzg/I2G71+DFS6oh5a8hhCcw== 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=FB678h +vlk1Bxd1nxnS4tbDp2A7oQYIq1BpBi2NkosQ=; b=V/V7bDbs+ag5F1AA/GjPKz NiHeBwEC/dwH1/z8IcTtiRfSSpGsOqx+iapqZKR6hQ7xogjx2bEQp+dR7v34Z3oE vWL1OQAduhWdEC7P1294aBp1AyOSUNoku4NoEp8HHlTzlz46RqehEq1nqzs2lFak 2nZ7Gof6KRPnNDBrOcUG+w5R0qn97fecBd625ZVeBkBfZPS9l8/IazI0AXTKCLKk Q2e+QOb3IjhWFTnw2vYQi5GiA1TQVJNy5uoj5Q+aGfXsEf/4bBB96LslC5k5EdKY v9OhbOq6QajChf95JghFpiaSIDiT6gfiGfTUEWb3fWnIQYf+Z/Or1I7pQzS4yuXA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedrfeekgdeivdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpehffgfhvffujgffkfggtgesmhdtreertdertdenucfhrhhomhepffgrvhhiugcu hghilhhsohhnuceouggrvhhiugesuggrvhhifihilhdrtghomheqnecukfhppeeijedrud ejuddrhedurddvvddunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghi lhhfrhhomhepuggrvhhiugesuggrvhhifihilhdrtghomh 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 7CFC63060B27; Thu, 30 Jan 2020 09:20:13 -0500 (EST) References: <87r1zlvymv.fsf@daviwil.com> <87zhe5nnss.fsf@devup.no> User-agent: mu4e 1.2.0; emacs 26.3 From: David Wilson In-reply-to: <87zhe5nnss.fsf@devup.no> Date: Thu, 30 Jan 2020 06:20:08 -0800 Message-ID: <87lfpp6n6v.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 Hi Marius! Marius Bakke writes: > I wonder if xdisorg.scm is better suited for this package, as it seems > mostly unrelated to window management. WDYT? Agreed, that's a more appropriate place. > gtest is provided by the 'googletest' package. Can you try adding it? Thanks! I didn't think to check with that name, I've got tests enabled using that now. > Also, for margin comments, we only use one ';', without capitalizing the > comment. Margin comment no longer needed, but I'll keep this in mind for future commits. I've attached an updated patch file with the suggested changes. The only thing I'm unsure about is disabling a particular warning-as-error that showed up in the gtest.h header: ---- SNIP ---- /gnu/store/bxapb1f1l8frjpbjckk3zdxhmcig3xzk-googletest-1.10.0/include/gtest/gtest.h:1527:11: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] if (lhs == rhs) { ~~~~^~~~~~ cc1plus: all warnings being treated as errors ---- SNIP ---- Since this is a warning in gtest's own header file rather than the package source, would it be OK to disable errors for it? Thanks! David From b5ca2c0377d677c0e3b9e288a8229d54ccd89125 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..501ef53d3e 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 "Minimal Xorg settings daemon") + (description "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 .xsettingsd configuration file one can avoid +configuring visual settings in different UI toolkits separately.") + (license license:bsd-3))) -- 2.24.1