From patchwork Mon Jan 27 13:04:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Wilson X-Patchwork-Id: 19990 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 5E4EA17B8A; Mon, 27 Jan 2020 13:05:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 06B0917B87 for ; Mon, 27 Jan 2020 13:05:15 +0000 (GMT) Received: from localhost ([::1]:45018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iw44o-0005tv-HN for patchwork@mira.cbaines.net; Mon, 27 Jan 2020 08:05:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45337) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iw44d-0005qk-Sk for guix-patches@gnu.org; Mon, 27 Jan 2020 08:05:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iw44c-0008WT-AY for guix-patches@gnu.org; Mon, 27 Jan 2020 08:05:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51917) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iw44c-0008WO-7k for guix-patches@gnu.org; Mon, 27 Jan 2020 08:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iw44c-0008Vi-2D for guix-patches@gnu.org; Mon, 27 Jan 2020 08:05: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: Mon, 27 Jan 2020 13:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 39306 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39306@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158013029532694 (code B ref -1); Mon, 27 Jan 2020 13:05:01 +0000 Received: (at submit) by debbugs.gnu.org; 27 Jan 2020 13:04:55 +0000 Received: from localhost ([127.0.0.1]:57890 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iw44Q-0008VC-HX for submit@debbugs.gnu.org; Mon, 27 Jan 2020 08:04:55 -0500 Received: from lists.gnu.org ([209.51.188.17]:55533) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iw44N-0008V0-70 for submit@debbugs.gnu.org; Mon, 27 Jan 2020 08:04:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45226) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iw44L-0005qC-PB for guix-patches@gnu.org; Mon, 27 Jan 2020 08:04:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iw44K-0008L1-Fr for guix-patches@gnu.org; Mon, 27 Jan 2020 08:04:45 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:37441) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iw44K-0008KJ-3m for guix-patches@gnu.org; Mon, 27 Jan 2020 08:04:44 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id C55BB497 for ; Mon, 27 Jan 2020 08:04:42 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Mon, 27 Jan 2020 08:04:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daviwil.com; h= from:to:subject:date:message-id:mime-version:content-type; s= fm1; bh=SSVzet6IKpq5XWy+jVfrhjaRalC1lpBjEvtT5PXEEk0=; b=giadktju FwBtoub+D1JBRl57xr7xjz77D5v5Ge0gUVaMWqJr7FAxcwgmOf2M4HLDeAcq/hUJ uuygs1vMshqD3n/Jee9rQH5T44vD6I0gtAVvKe8R5ATWPktDN66gB19q2XiPywaL 9CvVadHxr6lNLH6m96uhKrtjBJkKyAEpr1MP/a9zTdxilA5v3GFZZr6rh7l7wXZG NPFw741JFYAjRjwlauscc3a4MnXf6UoOUCETrfugPh0fx08Oi9+QlFYNqVCG85j6 vNjRZD3R3GwOUcZ6+EH73+hyqwIpwjJtW/0kFaF2kP2U5gCepX774T66qefNZx3S 4zBhOLwjTskyqw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=SSVzet6IKpq5XWy+jVfrhjaRalC1l pBjEvtT5PXEEk0=; b=mV6uYgbGpmNuW2sqtuJsc4woqugtGW5YFdvgn3YFgT3f+ /px/xMURhg0LOuTpp8CdWiuXDSJEuXglzWE5l9Ddc/UzyBYNorXFJkqQh2na9uPU jlkRRYzfifPGCh7tPawgyBx7CrckbbL2j6u9dKr8b6NsmU0PxdF7qbRn9V5jgDPt dwEOGxfIAJLQt5HNFGMhm0sOwkk0q8u8SSTN/e9HcwVCQ59XbCbVfi7sQn+kXYX7 xYB8fSDzU+TL0pQb8f4lTUIW0vudePMIwoqbFJJr/RiqURZM6fX1dLmQiIP7vMRV 9QUFMhd3DUVIHxb7Zp5x8HpN49hwxEtSlaWTxDdGQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedrfedvgdegjecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepfgfhvffufffkgggtsehgtderredtre ejnecuhfhrohhmpeffrghvihguucghihhlshhonhcuoegurghvihgusegurghvihifihhl rdgtohhmqeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeeijedrudejud drhedurddvvddunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhf rhhomhepuggrvhhiugesuggrvhhifihilhdrtghomh 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 D23BE3280059 for ; Mon, 27 Jan 2020 08:04:41 -0500 (EST) User-agent: mu4e 1.2.0; emacs 26.3 From: David Wilson Date: Mon, 27 Jan 2020 05:04:40 -0800 Message-ID: <87r1zlvymv.fsf@daviwil.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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 * gnu/packages/wm.scm (xsettingsd): New variable. --- gnu/packages/wm.scm | 63 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) -- 2.24.1 diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 52d7042806..4fb18e9f67 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2019 Noodles! ;;; Copyright © 2019 Alexandru-Sergiu Marton +;;; Copyright © 2020 David Wilson ;;; ;;; This file is part of GNU Guix. ;;; @@ -59,6 +60,7 @@ #:use-module (guix build-system meson) #:use-module (guix build-system perl) #:use-module (guix build-system python) + #:use-module (guix build-system scons) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages autotools) @@ -94,6 +96,7 @@ #:use-module (gnu packages pretty-print) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages serialization) #:use-module (gnu packages suckless) #:use-module (gnu packages texinfo) @@ -1670,3 +1673,63 @@ bar entirely based on XCB. Provides full UTF-8 support, basic formatting, RandR and Xinerama support and EWMH compliance without wasting your precious memory.") (license license:x11)))) + +(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))) + (arguments + `(#:scons ,scons-python2 + #:scons-flags + (list "CC=gcc" + (string-append "PREFIX=" %output)) + #:tests? #f ;; Tests require Google's gtest framework + #:phases + (modify-phases %standard-phases + (add-before 'build 'patch-sconstruct + (lambda _ + ;; scons doesn't pick up environment variables automatically + ;; so it needs some help to find path variables. + (substitute* "SConstruct" + (("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'] + },")) + #t)) + ;; The install task uses gtest to install the binaries. + ;; Since we don't have gtest, install binaries manually. + (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)))