From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#39306] [PATCH] gnu: Add xsettingsd. Resent-Message-ID: References: <87r1zlvymv.fsf@daviwil.com> <87zhe5nnss.fsf@devup.no> 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 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Marius Bakke Cc: 39306@debbugs.gnu.org --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain 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 --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEU8QebkGq/lUzWspeRGou1NlAvxQFAl4y5hgACgkQRGou1NlA vxR+QxAAqPJ4lOspTjVxhCLDB8SHuKDlSnxDbF6hF8Imr5zew+IcjFHrrFVlmqTL mXsCFG7+E9vPjrmMMSpgjXxIAoB25/dKGxmNvoneD8euOMHZckTKXlcdSZq50voe s+i5X3xoSb01g5PTuzbewXIpoR+H4rdpEawk3NTZ3pbY9WI3xNTBOpyXSsEcdkls EOWNApMCw4yxy+wq6eBIUVZglNKzHqL+fTPCjpwNOkfcehUNBtZY9qgmlEigoaUb Pjl8e9hIv55NrFiASeQPclTRJ64pTlfZZDuoELuPIG8SyLLx9C0ar+XKqrBp2EEi ABXQ8K6MEw3vwfIM6tMIvLbyYMTyP3DtYbYwkmaj6VeSTIS19A0IhEC3qAVJQKy8 jC602YfETyDHFXFbbmeqJBcW9YL4hRFaY+PdmnVoPp6WLEGCKEapsYymTaOMbvyA cX2cX6InFmQOsdNLusP17MKkd+MtBDBvnSLilbPQuZfEZgU69wVsz/MVDcygABqq kwJe8pF1yzpeNOiFIKbfUDn9civSknq2fA9htTS77tuQAgAjhlvOprRk9xMcMDk0 9xTzzHzv+hHC7uKcQoDFsf1tJmLpD9Fb9bs023fUW5IJKc76KLZqOqxOkNd7jJKB zAXtklfez4zPZlHmrQtTeJTeIP0fx4ceiNTpso1Iafa3gEE8lR4= =+rVG -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-xsettingsd.patch Content-Transfer-Encoding: quoted-printable Content-Description: Updated patch file >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 =C2=A9 2019 Josh Holland ;;; Copyright =C2=A9 2019 Tanguy Le Carrour ;;; Copyright =C2=A9 2020 Guillaume Le Vaillant +;;; Copyright =C2=A9 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 syn= chronized.") 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=3Dgcc") + #: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 =3D Environment\\(") + "env =3D Environment( + ENV =3D { + '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=3Dsign-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 setting= s 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))) --=20 2.24.1 --=-=-=--