From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#39306] [PATCH] gnu: Add xsettingsd. Resent-Message-ID: References: <87r1zlvymv.fsf@daviwil.com> <87zhe5nnss.fsf@devup.no> <87lfpp6n6v.fsf@daviwil.com> <87o8ulngsc.fsf@devup.no> 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 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 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 --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEU8QebkGq/lUzWspeRGou1NlAvxQFAl4y/dIACgkQRGou1NlA vxSsOQ//aZyk53J8Ui015j/QnSk1UieeYWDzegwojLEx+mG5GZzjqHnvq+C+IdQf MNtweKf+eQ60jeEDbPdlm+3/Rm9sdJI4q7bAwVg30lGl1eTxo/bMAhMsJQKyYg59 kV81QHMTk/hCLy9y6WjWk3Y1eX4IK722KhtfVBdjuuVBFjCg/T2Kf6DncSHM2e7o Ta4D4i1hkERWQl7NOcMQm2yJNc57Zkq49TG4/qbgbPnD7yP3vs3uB93dRPGxVsWL iDMYb6BjgDIhZoWtFcsUeHZvWJ16Xplhgkh5xDQ1vFcdO+h4kE/qi7KCU9nPfh4N Oa6fj/smynEta9BdZrMIx8aHoD3CEIUVKG0FHJ6h/bWfkb/rhKErRoZ0a5+rCTOe pdXeiFe0zF11jjl2dRaMY4/A587l74Yndn6FixKI5Y8CO6TAxaOZbe5Y565BwFrf 5+oM+xLvw8TS5NvHkVSq/f3iLyJ0SKNOezxU6RikQ21FOa1bWiekrecOTjiYfg7F oJZhD3gsFIM86S1s1O7WjT3G8cwgZPT+WcZPvpZIF5n4XgeN5+rOs++scwIv0Zdc pgDf/tIN0kwtER+5CBFWIRvi5nFNGirYDtJizNEh87WK50qwAvN4EPiPIW90ui7s SCUve5M8LFfrwN1gp1u62fkihGQU8iJ+s9BIwtypNH0EpQQtGWQ= =0K96 -----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 >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 =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 "Xorg settings daemon") + (description "@command{xsettingsd} is a lightweight daemon that provid= es 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))) --=20 2.24.1 --=-=-=--