From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:45657) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iT1IG-0003ua-Sq for guix-patches@gnu.org; Fri, 08 Nov 2019 05:15:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iT1IF-0003eX-0z for guix-patches@gnu.org; Fri, 08 Nov 2019 05:15:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35852) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iT1IE-0003eL-5v for guix-patches@gnu.org; Fri, 08 Nov 2019 05:15:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iT1ID-00071H-Vj for guix-patches@gnu.org; Fri, 08 Nov 2019 05:15:02 -0500 Subject: [bug#37991] [PATCH] gnu: redshift: Use fork with support for Wayland. References: <20191030130836.728314-1-josh@inv.alid.pw> In-Reply-To: <20191030130836.728314-1-josh@inv.alid.pw> Resent-Message-ID: From: Josh Holland Date: Fri, 8 Nov 2019 10:13:59 +0000 Message-Id: <20191108101359.369333-1-josh@inv.alid.pw> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: 37991@debbugs.gnu.org Cc: Josh Holland * gnu/packages/xdisorg.scm (redshift): Change source to fork adding Wayland support. --- gnu/packages/xdisorg.scm | 113 +++++++++++++++++++++++++++++---------- 1 file changed, 84 insertions(+), 29 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 17dc16b44c..05b17d0be5 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1070,38 +1070,93 @@ the X.Org X Server version 1.7 and later (X11R7.5 or later).") (license license:x11))) (define-public redshift - (package - (name "redshift") - (version "1.12") - (source - (origin - (method url-fetch) - (uri - (string-append "https://github.com/jonls/redshift/" - "releases/download/v" version - "/redshift-" version ".tar.xz")) - (sha256 - (base32 - "1fi27b73x85qqar526dbd33av7mahca2ykaqwr7siqiw1qqcby6j")))) - (build-system gnu-build-system) - (native-inputs - `(("pkg-config" ,pkg-config) - ("intltool" ,intltool))) - (inputs - `(("libdrm" ,libdrm) - ("libx11" ,libx11) - ("libxcb" ,libxcb) - ("libxxf86vm" ,libxxf86vm) - ("glib" ,glib))) ; for Geoclue2 support - (home-page "https://github.com/jonls/redshift") - (synopsis "Adjust the color temperature of your screen") - (description - "Redshift adjusts the color temperature according to the position of the + (let ((commit "7da875d34854a6a34612d5ce4bd8718c32bec804") + (revision "1")) + (package + (name "redshift") + (version (string-append "1.12-" + revision "." (string-take commit 7))) + ;; This is not the original upstream source (that is + ;; https://github.com/jonls/redshift.git). This snapshot adds Wayland + ;; support via the wlr_gamma_control_unstable_v1 protocol. + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minus7/redshift.git") + (commit commit))) + (file-name (string-append name "-" version)) + (sha256 + (base32 + "0nbkcw3avmzjg1jr1g9yfpm80kzisy55idl09b6wvzv2sz27n957")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("intltool" ,intltool))) + (inputs + `(("libdrm" ,libdrm) + ("libx11" ,libx11) + ("libxcb" ,libxcb) + ("libxxf86vm" ,libxxf86vm) + ("glib" ,glib) ; for Geoclue2 support + ("wayland" ,wayland))) + (home-page "https://github.com/minus7/redshift") + (synopsis "Adjust the color temperature of your screen") + (description + "Redshift adjusts the color temperature according to the position of the sun. A different color temperature is set during night and daytime. During twilight and early morning, the color temperature transitions smoothly from night to daytime temperature to allow your eyes to slowly adapt. At night the -color temperature should be set to match the lamps in your room.") - (license license:gpl3+))) +color temperature should be set to match the lamps in your room. + +This is a fork with added support for Wayland using the wlr-gamma-control +protocol.") + (license license:gpl3+)))) + +(define-public redshift-wayland + (let ((commit "7da875d34854a6a34612d5ce4bd8718c32bec804") + (revision "1")) + (package + (name "redshift-wayland") + (version (string-append "1.12-" + revision "." (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minus7/redshift.git") + (commit commit))) + (file-name (string-append name "-" version)) + (sha256 + (base32 + "0nbkcw3avmzjg1jr1g9yfpm80kzisy55idl09b6wvzv2sz27n957")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("intltool" ,intltool))) + (inputs + `(("libdrm" ,libdrm) + ("libx11" ,libx11) + ("libxcb" ,libxcb) + ("libxxf86vm" ,libxxf86vm) + ("glib" ,glib) ; for Geoclue2 support + ("wayland" ,wayland))) + (home-page "https://github.com/minus7/redshift") + (synopsis "Adjust the color temperature of your screen (with Wayland support)") + (description + "Redshift adjusts the color temperature according to the position of the +sun. A different color temperature is set during night and daytime. During +twilight and early morning, the color temperature transitions smoothly from +night to daytime temperature to allow your eyes to slowly adapt. At night the +color temperature should be set to match the lamps in your room. + +This is a fork with added support for Wayland using the wlr-gamma-control +protocol.") + (license license:gpl3+)))) (define-public xscreensaver (package -- 2.24.0