From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:36387) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4QH0-0005na-HM for guix-patches@gnu.org; Sun, 01 Sep 2019 09:52:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4QGw-0003so-L1 for guix-patches@gnu.org; Sun, 01 Sep 2019 09:52:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47433) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4QGw-0003sX-Eb for guix-patches@gnu.org; Sun, 01 Sep 2019 09:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4QGw-0006gT-AX for guix-patches@gnu.org; Sun, 01 Sep 2019 09:52:02 -0400 Subject: [bug#37121] [PATCH 00/40] Update Xfce to 4.14 Resent-Message-ID: From: L p R n d n References: <87blwj35an.fsf@lprndn.info> <87ftllgskz.fsf@gnu.org> <877e6x10nw.fsf@lprndn.info> <871rx4jh5p.fsf@gnu.org> Date: Mon, 02 Sep 2019 15:51:22 +0200 In-Reply-To: <871rx4jh5p.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Thu, 29 Aug 2019 14:21:54 +0200") Message-ID: <87ftlezu05.fsf@lprndn.info> 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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 37121@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello, Ludovic Court=C3=A8s writes: > Hello, > > L p R n d n skribis: > >> Ludovic Court=C3=A8s writes: >> >>> Hello, >>> >>> L p R n d n skribis: >>> >>>> Here is my take on updating xfce to 4.14. >>> >>> Woow, thanks for all the work! >>> >>>> The update switches Xfce to gtk-3 but gtk-2 compatibility is kept. >>>> Also there a few changes to add or clarify some features like vala API >>>> or gobject introspection. >>>> Testing is welcome. >>> >>> So, I hope you won=E2=80=99t hate me for asking, but=E2=80=A6 can we se= parate the bits >>> that are really part of the Xfce upgrade or required by the upgrade, >>> from those that are not directly related? The libxklavier, mousepad, >>> and =E2=80=9Cfix tests=E2=80=9D changes come to mind. That would make = the review work >>> less intimidating. :-) >>> >>> Also, I suspect all the xfce* and libxf* packages need to be upgraded in >>> lockstep; that is, they all need to be either 4.14 or 4.12, but not a >>> mixture thereof. Thus, I=E2=80=99d actually prefer a single commit upg= rading >>> all of these. WDYT? >>> >>> There are probably exceptions such as Thunar that do not strictly need >>> to be upgraded at the same time; these can remain in a separate commit. >> >> No problem. It's more git training! > > :-) > >> I'll make a single commit for all xfce4-core packages and leave the rest >> sepearate. Is it ok? > > Yes, all those that need to be updated together (which I think are the > libxf* and xfce* packages, but again I=E2=80=99m no Xfce expert) should g= o in > one patch. > >> Also, do you need me to send them at this bug report or a new one? > > Please send the Xfce upgrade here, and the patches that are not > Xfce-specific elsewhere. > Here are the new patches. Hope everything it's ok. I took the liberty to send the as attachment to avoid scambling them. There is one main patch for base xfce components' update + patches for other packages part of xfce. I also added two new components of xfce. I'll send the rest in their own bug report. Reminder, those patches should not be merged before patch #37253: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D37253 Thanks, > Thank you! > > Ludo=E2=80=99. Have a nice day, L p R n d n --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-Update-Xfce-base-to-4.14.0.patch >From 7acadd245c92f2b5e701b59ad3e54865fad968a4 Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Sun, 18 Aug 2019 21:24:37 +0200 Subject: [PATCH 01/11] gnu: Update Xfce base to 4.14.0. * gnu/packages/xfce.scm (libxfce4util): Update to 4.14.0. * gnu/packages/xfce.scm (xfconf): Update to 4.14.1. [native-inputs] Add glib:bin. [propagated-inputs] Remove dbus and dbus-glib. * gnu/packages/xfce.scm (libxfce4ui): Update to 4.14.1. * gnu/packages/xfce.scm (exo): Update to 0.12.8. [propagated-inputs] Add gtk+-3. Remove gtk+-2. [inputs] Add gtk+-2. * gnu/packages/xfce.scm (garcon): Update to 0.6.4. [inputs] Rename gtk+ to gtk+-2. [propagated-inputs] Add gtk+-3. * gnu/packages/xfce.scm (tumbler): Update to 0.2.7. * gnu/packages/xfce.scm (xfce4-appfinder): Update to 4.14.0. [inputs] Updte gtk+ from gtk+-2 to gtk+. * gnu/packages/xfce.scm (xcfe4-panel): Update to 4.14.0 [arguments] Remove #:configure-flags [native-inputs] Add glib:bin. [inputs] Add gtk+-2, libwnck and xfconf. Remove libwnck-2. [propagated-inputs] Add gtk+-3. * 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. * gnu/packages/xfce.scm (xfce4-settings): Update to 4.14.0. [arguments] Add #:configure flags. * gnu/packages/xfce.scm (xfwm4): Update to 4.14.0. [inputs] Add libwnck. Remove libwnck-2. * gnu/packages/xfce.scm (xfdesktop): Update to 4.14.1. [inputs] Add libwnck. Remove libwnck-2. * gnu/packages/xfce.scm (xfce4-power-manager): Update to 4.6.5. [inputs] Add gtk+. Remove gtk+-2. --- .../patches/xfce4-session-fix-xflock4.patch | 31 ----- gnu/packages/xfce.scm | 107 +++++++++--------- 2 files changed, 56 insertions(+), 82 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 93c36dac1e..60f1586f06 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -54,6 +54,7 @@ #:use-module (gnu packages pdf) #:use-module (gnu packages polkit) #:use-module (gnu packages gstreamer) + #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) #:use-module (gnu packages photo) #:use-module (gnu packages pcre) @@ -86,7 +87,7 @@ (define-public libxfce4util (package (name "libxfce4util") - (version "4.12.1") + (version "4.14.0") (source (origin (method url-fetch) (uri (string-append "http://archive.xfce.org/xfce/" @@ -94,7 +95,7 @@ "/src/" name "-" version ".tar.bz2")) (sha256 (base32 - "07c8r3xwx5is298zk77m3r784gmr5y4mh8bbca5zdjqk5vxdwsw7")))) + "093338faqqsrlc8dkmzr7qv411ysxczg1wlg7s3gvhrfk6vpkb9j")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -110,7 +111,7 @@ Xfce Desktop Environment.") (define-public xfconf (package (name "xfconf") - (version "4.12.1") + (version "4.14.1") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -118,7 +119,7 @@ Xfce Desktop Environment.") name "-" version ".tar.bz2")) (sha256 (base32 - "0dns190bwb615wy9ma2654sw4vz1d0rcv061zmaalkv9wmj8bx1m")))) + "0n8d55c98ff7wgwv3qa4g369sv4iasgm1w62zq10kq5f56iy14xq")))) (build-system gnu-build-system) (arguments '(#:phases @@ -136,12 +137,12 @@ Xfce Desktop Environment.") (delete 'check)))) (native-inputs `(("pkg-config" ,pkg-config) - ("intltool" ,intltool))) + ("intltool" ,intltool) + ("glib:bin" ,glib "bin") ;; for gdbus-codegen + )) (propagated-inputs ;; libxfconf-0.pc refers to all these. - `(("glib" ,glib) - ("dbus" ,dbus) - ("dbus-glib" ,dbus-glib))) + `(("glib" ,glib))) (inputs `(("libxfce4util" ,libxfce4util))) (home-page "https://www.xfce.org/") @@ -154,7 +155,7 @@ storage system.") (define-public libxfce4ui (package (name "libxfce4ui") - (version "4.12.1") + (version "4.14.1") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -162,7 +163,7 @@ storage system.") name "-" version ".tar.bz2")) (sha256 (base32 - "0hzzhiiwmqsrbv17nninhs2x1b8ck0ym85jck2xphx5ypw8rhq9x")))) + "1npjhznmnckhnylsv3l7p1zvhckhmp9d7vifs8w12kdfmrg0fjf4")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -188,7 +189,7 @@ to share commonly used Xfce widgets among the Xfce applications.") (define-public exo (package (name "exo") - (version "0.12.6") + (version "0.12.8") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -196,17 +197,19 @@ to share commonly used Xfce widgets among the Xfce applications.") "exo-" version ".tar.bz2")) (sha256 (base32 - "00qh8ihrf09jvd26kilybihkgvv6rvi0l1bvlldxc99jb7ygy5ql")))) + "1ppwi6n40aphh0dqsnfrk234zsp7pl4lkjnspqjxw7m49bka401l")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) (propagated-inputs - ;; exo-1.pc refers to all these. - `(("gtk+" ,gtk+-2) + ;; exo-2.pc refers to all these. + `(("gtk+-3" ,gtk+) ("libxfce4util" ,libxfce4util))) (inputs - `(("libxfce4ui" ,libxfce4ui) + `(;; FIXME Refered to in exo-1.pc but conflict with gtk+-3 + ("gtk+-2" ,gtk+-2) + ("libxfce4ui" ,libxfce4ui) ("perl-uri" ,perl-uri))) (home-page "https://www.xfce.org/") (synopsis "Extension library for Xfce") @@ -220,7 +223,7 @@ development.") (define-public garcon (package (name "garcon") - (version "0.6.3") + (version "0.6.4") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -228,16 +231,17 @@ development.") "garcon-" version ".tar.bz2")) (sha256 (base32 - "00c4g4gmbr8710k0yv1zybnm9s2gkc1rj63zfrg9qgin66jzxcbn")))) + "0bbngb4bn1m325j7y40gky36kn2nlsvqs6xp0wy76x3s0d9lfpnp")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool) ("glib:bin" ,glib "bin"))) (inputs - `(("gtk+" ,gtk+-2))) + `(("gtk+-2" ,gtk+-2))); required by garcon-gtk2-1.pc (propagated-inputs - `(("libxfce4ui" ,libxfce4ui))) ; required by garcon-gtk2-1.pc + `(("gtk+-3" ,gtk+) ; required by garcon-gtk3-1.pc + ("libxfce4ui" ,libxfce4ui))) ; required by garcon-gtk3-1.pc (home-page "https://www.xfce.org/") (synopsis "Implementation of the freedesktop.org menu specification") (description @@ -250,7 +254,7 @@ merging features essential for loading menus modified with menu editors.") (define-public tumbler (package (name "tumbler") - (version "0.2.5") + (version "0.2.7") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -258,7 +262,7 @@ merging features essential for loading menus modified with menu editors.") "tumbler-" version ".tar.bz2")) (sha256 (base32 - "0nfld1lvrdpsjfvm08y5487km45pm1mdr928hgqm8j0shrx6jiv4")))) + "1r0l0ghcrj71ax7yil1m4p7yjrfqm3icx0s8r7ivwv3i2rgw617p")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -286,7 +290,7 @@ management D-Bus specification.") (define-public xfce4-panel (package (name "xfce4-panel") - (version "4.12.2") + (version "4.14.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -294,20 +298,22 @@ management D-Bus specification.") name "-" version ".tar.bz2")) (sha256 (base32 - "1s8cvsrgmkmmm84g6mghpj2k4777gm22g5lrsf8pdy5qh6xql1a2")) + "1x3flv86jh9vqah7mr5mmfx2991mc6icsqjygsc3j88lgsyz7y6m")) (patches (search-patches "xfce4-panel-plugins.patch")))) (build-system gnu-build-system) - (arguments - '(#:configure-flags '("--enable-gtk3"))) (native-inputs `(("pkg-config" ,pkg-config) - ("intltool" ,intltool))) + ("intltool" ,intltool) + ("glib:bin" ,glib "bin"))) (propagated-inputs - `(("libxfce4util" ,libxfce4util))) ; required by libxfce4panel-1.0.pc + `(("gtk+-3" ,gtk+) ; required by libxfce4panel-2.0.pc + ("libxfce4util" ,libxfce4util))) ; required by libxfce4panel-2.0.pc (inputs `(("exo" ,exo) + ("gtk+-2" ,gtk+-2) + ("xfconf" ,xfconf) ("garcon" ,garcon) - ("libwnck" ,libwnck-2) + ("libwnck" ,libwnck) ("libxfce4ui" ,libxfce4ui))) (native-search-paths (list (search-path-specification @@ -486,7 +492,7 @@ per window.") (define-public xfce4-appfinder (package (name "xfce4-appfinder") - (version "4.12.0") + (version "4.14.0") (source (origin (method url-fetch) (uri (string-append "http://archive.xfce.org/xfce/" @@ -494,14 +500,14 @@ per window.") "/src/" name "-" version ".tar.bz2")) (sha256 (base32 - "0ry5hin8xhgnkmm9vs7jq8blk1cnbyr0s18nm1j6nsm7360abm1a")))) + "162dibl6ipp72x0s35yhk7kkzxd4qimagg5zdkkv5kjgjpa7bhby")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) (inputs `(("garcon" ,garcon) - ("gtk+" ,gtk+-2) + ("gtk+" ,gtk+) ("libxfce4ui" ,libxfce4ui))) (home-page "https://www.xfce.org/") (synopsis "Xfce application finder") @@ -513,7 +519,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/" @@ -521,10 +527,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 @@ -549,7 +552,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") @@ -561,7 +564,7 @@ allows you to shutdown the computer from Xfce.") (define-public xfce4-settings (package (name "xfce4-settings") - (version "4.12.4") + (version "4.14.0") (source (origin (method url-fetch) (uri (string-append "http://archive.xfce.org/src/xfce/" @@ -569,9 +572,13 @@ allows you to shutdown the computer from Xfce.") name "-" version ".tar.bz2")) (sha256 (base32 - "16vgidhhc19dz0p0i6fp5iiwxd53ky143j6h14a9b7mz92nlr872")) + "0g0ipkg2fyg8r1z95ynx0xjr78bp49c2dwh4mli05nmb4gb40c70")) (patches (search-patches "xfce4-settings-defaults.patch")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--enable-pluggable-dialogs" + "--enable-sound-settings" + "--enable-xrandr"))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) @@ -659,7 +666,7 @@ and import the new pictures from your camera.") (define-public xfwm4 (package (name "xfwm4") - (version "4.12.5") + (version "4.14.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -667,14 +674,14 @@ and import the new pictures from your camera.") name "-" version ".tar.bz2")) (sha256 (base32 - "1jnav0wcqlswl2v7nh61big9czg5hmnyvrvm6812sv362qic0xbp")))) + "05dn4a1i0nm6wm3nyj7qli5bvfalxghcl7x543qr5l33vkw2n65l")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) (inputs `(("libdrm" ,libdrm) - ("libwnck" ,libwnck-2) + ("libwnck" ,libwnck) ("libxcomposite" ,libxcomposite) ("libxdamage" ,libxdamage) ("libxfce4ui" ,libxfce4ui) @@ -689,7 +696,7 @@ on the screen.") (define-public xfdesktop (package (name "xfdesktop") - (version "4.12.4") + (version "4.14.1") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -697,7 +704,7 @@ on the screen.") name "-" version ".tar.bz2")) (sha256 (base32 - "1jzi851arljq5lza9inyq4ss513l62lbzbfm64a7x4320m8kb2h9")) + "10pqxgpj7b57wpcsh2k98sj4aavcgxbs1lc8qsq4mibf4hba01gp")) (modules '((guix build utils))) (snippet #~(begin @@ -735,7 +742,7 @@ on the screen.") `(("exo" ,exo) ("garcon" ,garcon) ("libnotify" ,libnotify) - ("libwnck" ,libwnck-2) + ("libwnck" ,libwnck) ("libxfce4ui" ,libxfce4ui) ("thunar" ,thunar))) (home-page "https://www.xfce.org/") @@ -831,7 +838,7 @@ system resources, while still being visually appealing and user friendly.") (define-public xfce4-power-manager (package (name "xfce4-power-manager") - (version "1.6.1") + (version "1.6.5") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -839,16 +846,14 @@ system resources, while still being visually appealing and user friendly.") name "-" version ".tar.bz2")) (sha256 (base32 - "0sv5927q8jxvdfx7b06f8s7qyq3qa1nqn0b8c1b9bf234d2jba0y")))) + "0x3s2bdwfhp65dz5yn3k43j99ywqlsvrpz3pqmgwm0dik5wbdb8h")))) (build-system gnu-build-system) - (arguments - '(#:configure-flags '("--enable-gtk3"))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) (inputs - `(("lbxrandr" ,libxrandr) - ("gtk+" ,gtk+-2) + `(("libxrandr" ,libxrandr) + ("gtk+" ,gtk+) ("upower" ,upower) ("libnotify" ,libnotify) ("libxfce4ui" ,libxfce4ui))) -- 2.22.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-xfce4-terminal-Update-to-0.8.8.patch >From 37398ebc1a979c2e956d172111a6327c6f49b7dc Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Mon, 19 Aug 2019 14:41:22 +0200 Subject: [PATCH 02/11] gnu: xfce4-terminal: Update to 0.8.8. * gnu/packages/xfce.scm (xfce4-terminal): Update to 0.8.8. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 60f1586f06..fcbdbe26c9 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -756,7 +756,7 @@ devices and folders.") (define-public xfce4-terminal (package (name "xfce4-terminal") - (version "0.8.7.4") + (version "0.8.8") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/" name "/" @@ -764,7 +764,7 @@ devices and folders.") name "-" version ".tar.bz2")) (sha256 (base32 - "1as2dh5ccmv3hdvsbxm4b0xhmv2ky2q18zxxrzr988x79npri3x8")))) + "1zc7hkq77ajia099wxgh4wdvwifcg2zkcz5d2xsf1zm0sdh6mflg")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- 2.22.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0003-gnu-xfce4-whiskermenu-plugin-Update-to-2.3.3.patch >From a0856837d2317bb4ecf006298fc0e38d4f2f1915 Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Mon, 19 Aug 2019 14:45:47 +0200 Subject: [PATCH 03/11] gnu: xfce4-whiskermenu-plugin: Update to 2.3.3. * gnu/packages/xfce.scm (xfce4-whiskermenu-plugin): Update to 2.3.3. [inputs] Add gtk+. Remove gtk+-2. --- gnu/packages/xfce.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index fcbdbe26c9..91fec5f2f1 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -421,7 +421,7 @@ keys for controlling the audio volume.") (define-public xfce4-whiskermenu-plugin (package (name "xfce4-whiskermenu-plugin") - (version "2.3.1") + (version "2.3.3") (source (origin (method url-fetch) (uri (string-append "http://archive.xfce.org/src/panel-plugins/" @@ -429,7 +429,7 @@ keys for controlling the audio volume.") name "-" version ".tar.bz2")) (sha256 (base32 - "1cnas2x7xi53v6ylq44040narhzd828dc0ysz8yk3qn2mmvp5yr2")))) + "0j0qmk372130avq8n07lfqrcm2al7n07l8gc06bbr1g6q57wrip0")))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -438,7 +438,8 @@ keys for controlling the audio volume.") `(("xfce4-panel" ,xfce4-panel) ("garcon" ,garcon) ("exo" ,exo) - ("gtk+" ,gtk+-2))) + ("gtk+" ,gtk+) + ("libxfce4ui" ,libxfce4ui))) (arguments `(#:tests? #f)) ; no tests (home-page "https://goodies.xfce.org/projects/panel-plugins/xfce4-whiskermenu-plugin") -- 2.22.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0004-gnu-xfce4-battery-plugin-Update-tp-1.1.3.patch >From 06c92906d32d52123f14ceb0a2667b9756668d38 Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Mon, 19 Aug 2019 14:50:46 +0200 Subject: [PATCH 04/11] gnu: xfce4-battery-plugin: Update tp 1.1.3. * gnu/packages/xfce.scm (xfce4-battery-plugin): Update to 1.1.3. Switch from gtk+-2 to gtk+-3. [inputs] Add gtk+. Remove gtk+2. --- gnu/packages/xfce.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 91fec5f2f1..cad3f7583b 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -330,7 +330,7 @@ applications menu, workspace switcher and more.") (define-public xfce4-battery-plugin (package (name "xfce4-battery-plugin") - (version "1.1.2") + (version "1.1.3") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -338,12 +338,12 @@ applications menu, workspace switcher and more.") name "-" version ".tar.bz2")) (sha256 (base32 - "1nypi0zazrcrbbm5vb221yw64zxrk56v4fffkblxlyd9m6gk80fn")))) + "18s0s004nidii8cc3ldp5n3jajc18vwn9vhkhmhy3lbbs520mghj")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) (inputs `(("glib" ,glib) - ("gtk+" ,gtk+-2) + ("gtk+" ,gtk+) ("libxfce4util" ,libxfce4util) ("libxfce4ui" ,libxfce4ui) ("xfce4-panel" ,xfce4-panel))) -- 2.22.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0005-gnu-xfce4-pulseaudio-plugin-Update-to-0.4.2.patch >From f4eae7fa6d92f4898cacfb25843a2b2c00e0bee5 Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Mon, 19 Aug 2019 15:51:42 +0200 Subject: [PATCH 05/11] gnu: xfce4-pulseaudio-plugin: Update to 0.4.2. * gnu/packages/xfce.scm (xfce4-pulseaudio-plugin): Update to 0.4.2. [arguments] Add augment-cflags phase. [native-inputs] Add dbus and dbus-glib. --- gnu/packages/xfce.scm | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index cad3f7583b..1256578b1b 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -390,7 +390,7 @@ matching them against regular expressions.") (define-public xfce4-pulseaudio-plugin (package (name "xfce4-pulseaudio-plugin") - (version "0.4.1") + (version "0.4.2") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -398,11 +398,26 @@ matching them against regular expressions.") name "-" version ".tar.bz2")) (sha256 (base32 - "1w29y0a066y8as12xrkbfqcn7dpdsvx97idzw7028gmcvca87a3c")))) + "0851b0vs5xmy3cq899khcghmkqwvh9rnzwavi17msrsq4jyaxs2a")))) (build-system gnu-build-system) + (arguments + `(#:phases + ;; For dbus/dbus-glib.h in pulseaudio-config.h + (modify-phases %standard-phases + (add-after 'set-paths 'augment-cflags + (lambda* (#:key inputs #:allow-other-keys) + (setenv "C_INCLUDE_PATH" + (string-append (assoc-ref inputs "dbus-glib") + "/include/dbus-1.0" ":" + (assoc-ref inputs "dbus") + "/include/dbus-1.0" ":" + (getenv "C_INCLUDE_PATH"))) + #t))))) (native-inputs `(("intltool" ,intltool) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("dbus-glib" ,dbus-glib) + ("dbus" ,dbus))) (inputs `(("exo" ,exo) ("libnotify" ,libnotify) -- 2.22.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0006-gnu-xfce4-xkb-plugin-Update-to-0.8.1.patch >From 1a1d1e09552c9791d7fa7b9243be208cdd513401 Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Mon, 19 Aug 2019 16:37:58 +0200 Subject: [PATCH 06/11] gnu: xfce4-xkb-plugin: Update to 0.8.1. * gnu/packages/xfce.scm (xfce4-xkb-plugin): Update to 0.8.1. [inputs] Add libwnck. Remove libwnck-2. --- gnu/packages/xfce.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 1256578b1b..dcdcc3089f 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -470,7 +470,7 @@ applications, and includes a search bar to search for applications.") (define-public xfce4-xkb-plugin (package (name "xfce4-xkb-plugin") - (version "0.7.1") + (version "0.8.1") (source (origin (method url-fetch) (uri (string-append "http://archive.xfce.org/src/panel-plugins/" @@ -478,7 +478,7 @@ applications, and includes a search bar to search for applications.") name "-" version ".tar.bz2")) (sha256 (base32 - "10g65j5ia389ahhn3b9hr52ghpp0817fk0m60rfrv4wrzqrjxzk1")))) + "18b7cnaf3zxm598p2i47vim3kbbi8w923ia1hwabdph1c89cz7n1")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) @@ -486,7 +486,7 @@ applications, and includes a search bar to search for applications.") (inputs `(("garcon" ,garcon) ("librsvg" ,librsvg) - ("libwnck" ,libwnck-2) + ("libwnck" ,libwnck) ("libx11" ,libx11) ("libxfce4ui" ,libxfce4ui) ("libxklavier" ,libxklavier) -- 2.22.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0007-gnu-xfce4-notifyd-Update-to-0.4.4.patch >From 0b570d20ed5eab70f8b3eaf916971d993b6557f5 Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Mon, 19 Aug 2019 16:59:57 +0200 Subject: [PATCH 07/11] gnu: xfce4-notifyd: Update to 0.4.4. * gnu/packages/xfce.scm (xfce4-notifyd): Update to 0.4.4. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index dcdcc3089f..3243ef2377 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -982,7 +982,7 @@ several different time zones.") (define-public xfce4-notifyd (package (name "xfce4-notifyd") - (version "0.4.3") + (version "0.4.4") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/" @@ -990,7 +990,7 @@ several different time zones.") name "-" version ".tar.bz2")) (sha256 (base32 - "1h7avj149cafj9dabiza22y14i66vxgp5qj0wxx8i97w9h4dlg99")))) + "0m8vlbwdxiw9nmimaj5np9l5qm784gxpkdvc881k0hjcz6n72189")))) (build-system glib-or-gtk-build-system) (native-inputs `(("intltool" ,intltool) -- 2.22.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0008-gnu-xfce4-taskmanager-Switch-from-libwnck-2-to-libwn.patch >From 0727d602798606b44eb337dee9e9921a9d730c21 Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Mon, 19 Aug 2019 16:42:12 +0200 Subject: [PATCH 08/11] gnu: xfce4-taskmanager: Switch from libwnck-2 to libwnck. * gnu/packages/xfce.scm (xfce4-taskmanager)[inputs]: Switch from libwnck-2 to libwnck. --- gnu/packages/xfce.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 3243ef2377..6d2155fc53 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -934,7 +934,7 @@ the desktop wallpaper.") `(("intltool" ,intltool) ("pkg-config" ,pkg-config))) (inputs - `(("libwnck" ,libwnck-2) + `(("libwnck" ,libwnck) ("libxmu" ,libxmu) ("gtk+" ,gtk+) ;; FIXME: Remove libxext and libxt when libxmu propagates them. -- 2.22.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0009-gnu-Add-xfce4-screenshooter.patch >From 0f3a487b35539f58e5b61252c2a73fc3ba13f40b Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Fri, 23 Aug 2019 18:34:53 +0200 Subject: [PATCH 09/11] gnu: Add xfce4-screenshooter. * gnu/packages/xfce.scm (xfce4-screenshooter): New variable. --- gnu/packages/xfce.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 6d2155fc53..e41e5caf10 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1087,3 +1087,34 @@ of data to either CD/DVD/BD.") (description "Mousepad is a graphical text editor for Xfce based on Leafpad.") (license gpl2+))) + +(define-public xfce4-screenshooter + (package + (name "xfce4-screenshooter") + (version "1.9.5") + (source (origin + (method url-fetch) + (uri (string-append "http://archive.xfce.org/src/apps/" + "xfce4-screenshooter/" + (version-major+minor version) + "/xfce4-screenshooter-" + version ".tar.bz2")) + (sha256 + (base32 + "135kad07922jxjs05amn48sdgm2x1rh97wbzdmy9h85r5i1vaddz")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("glib:bin" ,glib "bin"))) ; glib-genmarshal + (inputs + `(("exo" ,exo) + ("libsoup" ,libsoup) + ("libxfce4ui" ,libxfce4ui) + ("xfce4-panel" ,xfce4-panel))) + (home-page "https://goodies.xfce.org/projects/applications/xfce4-screenshooter") + ;; TODO + (synopsis "Simple text editor for Xfce") + (description + "Mousepad is a graphical text editor for Xfce based on Leafpad.") + (license gpl2+))) -- 2.22.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0010-gnu-Add-xfce4-screensaver.patch >From 67e3ea90c5196125f35e285690f28355d41181af Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Fri, 23 Aug 2019 19:36:01 +0200 Subject: [PATCH 10/11] gnu: Add xfce4-screensaver. --- gnu/packages/xfce.scm | 46 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index e41e5caf10..98918883ce 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1118,3 +1118,49 @@ of data to either CD/DVD/BD.") (description "Mousepad is a graphical text editor for Xfce based on Leafpad.") (license gpl2+))) + +(define-public xfce4-screensaver + (package + (name "xfce4-screensaver") + (version "0.1.8") + (source (origin + (method url-fetch) + (uri (string-append "http://archive.xfce.org/src/apps/" + "xfce4-screensaver/" + (version-major+minor version) + "/xfce4-screensaver-" + version ".tar.bz2")) + (sha256 + (base32 + "1mv0r150yb29kji2rr2462g9p574bqjax1lb6bzcqgpxlmg08mj0")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-dbus-1-path + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dbus-dir (string-append out "/share/dbus-1/services"))) + (substitute* "configure" + (("dbus-1") "")))))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("glib" ,glib) ; glib-compile-schemas + ("glib:bin" ,glib "bin"))) ; glib-compile-schemas + (inputs + `(("dbus-glib" ,dbus-glib) + ("libux-pam" ,linux-pam) + ("elogind" ,elogind) + ("garcon" ,garcon) + ("libxklavier" ,libxklavier) + ("libwnxk" ,libwnck) + ("libxscrnsaver" ,libxscrnsaver) + ("xfconf" ,xfconf))) + (home-page "https://docs.xfce.org/apps/screensaver/start") + ;; TODO + (synopsis "Screensaver for the Xfce desktop") + (description + "Xfce Screensaver is a screen saver and locker that aims to have simple, + sane, secure defaults and be well integrated with the Xfce desktop. ") + (license gpl2+))) -- 2.22.0 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0011-gnu-Add-copyright-header.patch Content-Transfer-Encoding: quoted-printable >From 3ae5ddbc88527419e3f64e42aad5e7aa351fdb24 Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Tue, 20 Aug 2019 22:39:34 +0200 Subject: [PATCH 11/11] gnu: Add copyright header. * gnu/packages/xfce.scm: Add copyright header. --- gnu/packages/xfce.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 98918883ce..752513db89 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -9,6 +9,7 @@ ;;; Copyright =C2=A9 2017 ng0 ;;; Copyright =C2=A9 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2019 Pkill -9 +;;; Copyright =C2=A9 2019 L p R n d n ;;; ;;; This file is part of GNU Guix. ;;; --=20 2.22.0 --=-=-=--