From patchwork Tue Aug 20 21:50:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: L p R n d n X-Patchwork-Id: 15053 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 E9E65172F9; Tue, 20 Aug 2019 21:01:02 +0100 (BST) 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,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 9F320172CD for ; Tue, 20 Aug 2019 21:01:02 +0100 (BST) Received: from localhost ([::1]:40998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0AJS-0004CL-7b for patchwork@mira.cbaines.net; Tue, 20 Aug 2019 16:01:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43209) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0AAo-0006xJ-PF for guix-patches@gnu.org; Tue, 20 Aug 2019 15:52:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0AAm-00014E-Df for guix-patches@gnu.org; Tue, 20 Aug 2019 15:52:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53543) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0AAl-00013f-Lk for guix-patches@gnu.org; Tue, 20 Aug 2019 15:52:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0AAl-0003cD-JI for guix-patches@gnu.org; Tue, 20 Aug 2019 15:52:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37121] [PATCH 17/40] gnu: xfce4-session: Update to 4.14.0. Resent-From: L p R n d n Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Aug 2019 19:52:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37121 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 37121@debbugs.gnu.org Received: via spool by 37121-submit@debbugs.gnu.org id=B37121.156633070613806 (code B ref 37121); Tue, 20 Aug 2019 19:52:03 +0000 Received: (at 37121) by debbugs.gnu.org; 20 Aug 2019 19:51:46 +0000 Received: from localhost ([127.0.0.1]:34114 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0AAU-0003aW-GX for submit@debbugs.gnu.org; Tue, 20 Aug 2019 15:51:46 -0400 Received: from mout02.posteo.de ([185.67.36.142]:55773) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0A9f-0003Q2-VW for 37121@debbugs.gnu.org; Tue, 20 Aug 2019 15:50:58 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id A52E82400FC for <37121@debbugs.gnu.org>; Tue, 20 Aug 2019 21:50:40 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 46ChH42WNHz9rxQ for <37121@debbugs.gnu.org>; Tue, 20 Aug 2019 21:50:40 +0200 (CEST) From: L p R n d n Date: Tue, 20 Aug 2019 23:50:20 +0200 Message-Id: <20190820215043.32077-17-guix@lprndn.info> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190820215043.32077-1-guix@lprndn.info> References: <20190820215043.32077-1-guix@lprndn.info> 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 * gnu/packages/xfce.scm (xfce4-session): Update to 4.14.0. [inputs] Add libwnck. Remove libwnck-2. [source] Remove patch. * gnu/packages/patches/xfce4-session-fix-xfclock4.patch: Delete file. --- .../patches/xfce4-session-fix-xflock4.patch | 31 ------------------- gnu/packages/xfce.scm | 9 ++---- 2 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 gnu/packages/patches/xfce4-session-fix-xflock4.patch diff --git a/gnu/packages/patches/xfce4-session-fix-xflock4.patch b/gnu/packages/patches/xfce4-session-fix-xflock4.patch deleted file mode 100644 index 74769e4257..0000000000 --- a/gnu/packages/patches/xfce4-session-fix-xflock4.patch +++ /dev/null @@ -1,31 +0,0 @@ -From cbb9c769316b4d32956a2c78aa01a38b473f0cfc Mon Sep 17 00:00:00 2001 -From: David Thompson -Date: Fri, 30 Oct 2015 08:30:43 -0400 -Subject: [PATCH] xflock4: Do not override PATH with hardcoded value. - -The PATH "/bin:/usr/bin" may not be a valid search path on the user's -machine. The screen locking program may be in /usr/local/bin or -elsewhere. Distros that do not conform to the FHS, such as GuixSD and -NixOS, will not have their executables in either location. Thus, we -simply leave PATH alone. ---- - scripts/xflock4 | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/scripts/xflock4 b/scripts/xflock4 -index ec4d05d..e7981ac 100644 ---- a/scripts/xflock4 -+++ b/scripts/xflock4 -@@ -21,9 +21,6 @@ - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - # - --PATH=/bin:/usr/bin --export PATH -- - # Lock by xscreensaver or gnome-screensaver, if a respective daemon is running - for lock_cmd in \ - "xscreensaver-command -lock" \ --- -2.5.0 - diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index b8d2999468..6ab299e919 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -540,7 +540,7 @@ your system in categories, so you can quickly find and launch them.") (define-public xfce4-session (package (name "xfce4-session") - (version "4.12.1") + (version "4.14.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -548,10 +548,7 @@ your system in categories, so you can quickly find and launch them.") name "-" version ".tar.bz2")) (sha256 (base32 - "1z88klls3j161n5snpamz4l3p4823q4h87wdnqikczxgs2ig5mwp")) - (patches - ;; See: https://bugzilla.xfce.org/show_bug.cgi?id=12282 - (search-patches "xfce4-session-fix-xflock4.patch")) + "0gq4a8yiw58hb4d5dhvprxvzamqfg8qblmiqcw0b97mn9svnvyql")) (modules '((guix build utils))) (snippet '(begin @@ -576,7 +573,7 @@ your system in categories, so you can quickly find and launch them.") ("upower" ,upower) ("polkit" ,polkit) ("libsm" ,libsm) - ("libwnck" ,libwnck-2) + ("libwnck" ,libwnck) ("libxfce4ui" ,libxfce4ui))) (home-page "https://www.xfce.org/") (synopsis "Xfce session manager")