diff options
author | Michael Rohleder <mike@rohleder.de> | 2020-12-25 13:44:33 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2021-01-14 17:15:18 +0100 |
commit | d88408b25e61ca7df7436d42b5c6695ae8061658 (patch) | |
tree | 54abfd836c338b0f4a04c3b4aa8f4687ab3dcaa2 | |
parent | 795db9d2199200e69d0acc7ffad4546a75679f95 (diff) | |
download | guix-d88408b25e61ca7df7436d42b5c6695ae8061658.tar.gz |
gnu: xfce: Update to 4.16.0.
* gnu/packages/xfce.scm (libxfce4util): Update to 4.16.0. (xfconf): Update to 4.16.0. [arguments]: Add phase to disable hanging test. (libxfce4ui): Update to 4.16.0. [inputs]: Remove unneeded gtk+-2. (exo): Update to 4.16.0. [arguments]: Remove wrap-exo-compose-mail phase. [inputs]: Remove unneeded gtk+-2 and perl-uri. (garcon): Update to 0.8.0. [inputs]: Remove unneeded gtk+-2. (tumbler): Update to 4.16.0. (xfce4-panel): Update to 4.16.0. (xfce4-appfinder): Update to 4.16.0. (xfce4-session): Update to 4.16.0. (xfce4-settings): Update to 4.16.0. [inputs]: Add python. (thunar): Update to 4.16.0. (thunar-volman): Update to 4.16.0. (xfwm4): Update to 4.16.0. (xfdesktop): Update to 4.16.0. (xfce4-power-manager): Update to 4.16.0. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r-- | gnu/packages/xfce.scm | 96 |
1 files changed, 41 insertions, 55 deletions
diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index d5f68a321d..a5c9482c01 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -54,6 +54,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages popt) + #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages search) @@ -100,7 +101,7 @@ (define-public libxfce4util (package (name "libxfce4util") - (version "4.14.0") + (version "4.16.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -108,7 +109,7 @@ "/" name "-" version ".tar.bz2")) (sha256 (base32 - "093338faqqsrlc8dkmzr7qv411ysxczg1wlg7s3gvhrfk6vpkb9j")))) + "10svnpc8ggasym1pfgh24bfr0ndqs6lc7v1wmpsizj0zbms8snb0")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -126,7 +127,7 @@ Xfce Desktop Environment.") (define-public xfconf (package (name "xfconf") - (version "4.14.4") + (version "4.16.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -134,12 +135,17 @@ Xfce Desktop Environment.") "xfconf-" version ".tar.bz2")) (sha256 (base32 - "0wszp93z64112jq5wm4133s64in2ndvnzbgsbn8dh7p5xhp64dyc")))) + "09al5bkq89b8pb3xyxnw0cnz6crxj8678ymwq2k9nzf60y812ak5")))) (build-system gnu-build-system) (arguments '(#:phases ;; Run check after install phase to test dbus activation. (modify-phases %standard-phases + ;; tests-end seems to hang forever + (add-before 'configure 'patchout-tests-end + (lambda _ + (substitute* "tests/Makefile.in" + (("tests-end") "")))) (add-after 'install 'custom-check (lambda _ (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME @@ -147,7 +153,7 @@ Xfce Desktop Environment.") (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service (string-append %output "/share")) ;; For the missing '/etc/machine-id'. - (setenv "DBUS_FATAL_WARNINGS" "0"); + (setenv "DBUS_FATAL_WARNINGS" "0") (invoke "dbus-launch" "make" "check"))) (delete 'check)))) (native-inputs @@ -172,7 +178,7 @@ storage system.") (define-public libxfce4ui (package (name "libxfce4ui") - (version "4.14.1") + (version "4.16.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -180,7 +186,7 @@ storage system.") name "-" version ".tar.bz2")) (sha256 (base32 - "1npjhznmnckhnylsv3l7p1zvhckhmp9d7vifs8w12kdfmrg0fjf4")))) + "1anfj3n28abv9kbcpybs7q3k5g3c3d0r4xf4hyfqms2b9zlwj1lb")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -191,14 +197,11 @@ storage system.") ("gobject-introspection" ,gobject-introspection))) (propagated-inputs `(("gtk+-3" ,gtk+) ; required by libxfce4ui-2.pc - ;; libxfce4kbd-private-2.pc refers to all these. + ;; libxfce4kbd-private-3.pc refers to all these. ("libxfce4util" ,libxfce4util) ("xfconf" ,xfconf))) (inputs `(("libsm" ,libsm) ("libice" ,libice) - ;; FIXME: required by libxfce4ui-1.pc, so should be propagated, - ;; but will lead to a conflict with gtk+. - ("gtk+-2" ,gtk+-2) ("startup-notification" ,startup-notification))) (home-page "https://www.xfce.org/") (synopsis "Widgets library for Xfce") @@ -303,7 +306,7 @@ upstream occasionally.") (define-public exo (package (name "exo") - (version "0.12.11") + (version "4.16.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -311,21 +314,8 @@ upstream occasionally.") "exo-" version ".tar.bz2")) (sha256 (base32 - "1dp5s64g6572h9zvx9js7qc72s728qsd9y7hl7hg6rwaq0cjb2gc")))) + "1k5sfm9cmg8k5zzzv0wb2cciqwwklnpfzcpak7wa32lsxl7b0x8r")))) (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; exo won't find URI::Escape otherwise - (add-after 'install 'wrap-exo-compose-mail - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (perl5lib (getenv "PERL5LIB"))) - (wrap-program (string-append out "/lib/xfce4/exo/exo-compose-mail") - `("PERL5LIB" ":" prefix - (,(string-append perl5lib ":" out - "/lib/perl5/site_perl"))))) - #t))))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) @@ -334,10 +324,7 @@ upstream occasionally.") `(("gtk+-3" ,gtk+) ("libxfce4util" ,libxfce4util))) (inputs - `(;; FIXME Referred to in exo-1.pc but conflict with gtk+-3. - ("gtk+-2" ,gtk+-2) - ("libxfce4ui" ,libxfce4ui) - ("perl-uri" ,perl-uri))) + `(("libxfce4ui" ,libxfce4ui))) (home-page "https://www.xfce.org/") (synopsis "Extension library for Xfce") (description @@ -350,7 +337,7 @@ development.") (define-public garcon (package (name "garcon") - (version "0.7.0") + (version "0.8.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -358,14 +345,12 @@ development.") "garcon-" version ".tar.bz2")) (sha256 (base32 - "08r4dfvdvl178cjajm7ww16lwb7jsfqh3yz614mn84c0a0dvdhw2")))) + "1fx19953fnrk93lak66y3zqbn4n1qvpc77ynzzgdnj5wwngdh4a8")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool) ("glib:bin" ,glib "bin"))) - (inputs - `(("gtk+-2" ,gtk+-2))) ; required by garcon-gtk2-1.pc (propagated-inputs `(("gtk+-3" ,gtk+) ; required by garcon-gtk3-1.pc ("libxfce4ui" ,libxfce4ui))) ; required by garcon-gtk3-1.pc @@ -381,7 +366,7 @@ merging features essential for loading menus modified with menu editors.") (define-public tumbler (package (name "tumbler") - (version "0.2.9") + (version "4.16.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -389,7 +374,7 @@ merging features essential for loading menus modified with menu editors.") "tumbler-" version ".tar.bz2")) (sha256 (base32 - "1dh7h0jcbf8brvv9vwq4amnk6zgldl2ipdq3clzsx9p50dpr0235")))) + "0rmga1l7da0pjrs6jlyq1nfn513r543v7cchshrif1341knpy2wv")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -420,7 +405,7 @@ management D-Bus specification.") (define-public xfce4-panel (package (name "xfce4-panel") - (version "4.14.0") + (version "4.16.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -428,7 +413,7 @@ management D-Bus specification.") name "-" version ".tar.bz2")) (sha256 (base32 - "1x3flv86jh9vqah7mr5mmfx2991mc6icsqjygsc3j88lgsyz7y6m")) + "0gf57hgx6v44bc2hj570inkafbi291scc6wbhmr6sc3xngp9m5sy")) (patches (search-patches "xfce4-panel-plugins.patch")))) (build-system gnu-build-system) (arguments @@ -659,7 +644,7 @@ per window.") (define-public xfce4-appfinder (package (name "xfce4-appfinder") - (version "4.14.0") + (version "4.16.0") (source (origin (method url-fetch) (uri (string-append "http://archive.xfce.org/xfce/" @@ -667,7 +652,7 @@ per window.") "/src/" name "-" version ".tar.bz2")) (sha256 (base32 - "162dibl6ipp72x0s35yhk7kkzxd4qimagg5zdkkv5kjgjpa7bhby")))) + "0m09vwgs5i1dy484r2y4w14kp38n469zhg0n4gnj10pcxsm2mf9p")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -686,7 +671,7 @@ your system in categories, so you can quickly find and launch them.") (define-public xfce4-session (package (name "xfce4-session") - (version "4.14.2") + (version "4.16.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -694,7 +679,7 @@ your system in categories, so you can quickly find and launch them.") "xfce4-session-" version ".tar.bz2")) (sha256 (base32 - "1bwpylcn7x9i301yz45wvkzah9bncv9b44nf4hh9ln4i1jka9qzv")) + "1dqpgnq1hy9z170aapjglyp6jpyq1iqn5331nph727a82br77wi2")) (modules '((guix build utils))) (snippet '(begin @@ -731,7 +716,7 @@ allows you to shut down the computer from Xfce.") (define-public xfce4-settings (package (name "xfce4-settings") - (version "4.14.0") + (version "4.16.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -739,7 +724,7 @@ allows you to shut down the computer from Xfce.") name "-" version ".tar.bz2")) (sha256 (base32 - "0g0ipkg2fyg8r1z95ynx0xjr78bp49c2dwh4mli05nmb4gb40c70")) + "1hnx88a8xmi38mdf5gxdvx7n8yax1vzah8hy8g37bijlqx7l18b7")) (patches (search-patches "xfce4-settings-defaults.patch")))) (build-system gnu-build-system) (arguments @@ -758,7 +743,8 @@ allows you to shut down the computer from Xfce.") ("libxklavier" ,libxklavier) ("libxrandr" ,libxrandr) ("libxfce4ui" ,libxfce4ui) - ("upower" ,upower) + ("upower" ,upower) ;; TODO needs upower-glib + ("python" ,python) ;; for xfce4-compose-mail ("xf86-input-libinput" ,xf86-input-libinput))) (home-page "https://www.xfce.org/") (synopsis "Xfce settings manager") @@ -770,7 +756,7 @@ like appearance, display, keyboard and mouse settings.") (define-public thunar (package (name "thunar") - (version "1.8.16") + (version "4.16.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -778,7 +764,7 @@ like appearance, display, keyboard and mouse settings.") "thunar-" version ".tar.bz2")) (sha256 (base32 - "0k1w2zwa8z6sc8vi3frva74npks79x79n7q9p7ibwk7irfqkh4r2")))) + "16zxznc3zcdpcjqjp84j9636kvvrimfn8wj9avxfp4ba254c8xv2")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -802,7 +788,7 @@ fast.") (define-public thunar-volman (package (name "thunar-volman") - (version "0.9.5") + (version "4.16.0") (source (origin (method url-fetch) @@ -810,7 +796,7 @@ fast.") (version-major+minor version) "/" "thunar-volman-" version ".tar.bz2")) (sha256 - (base32 "0dqqkbhn43hhmhqyx1fnmawpvysdjzw6ln4ryf629wil6dlwd9vy")))) + (base32 "0zaliahfz9ci2md7g6w9mb7z5azi5n56gihbnwyzvds2n8cygh6j")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -833,7 +819,7 @@ and import the new pictures from your camera.") (define-public xfwm4 (package (name "xfwm4") - (version "4.14.3") + (version "4.16.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -841,7 +827,7 @@ and import the new pictures from your camera.") "xfwm4-" version ".tar.bz2")) (sha256 (base32 - "1gw3fbiwraylarl1bqbvfh7nxlss5w8w0im5ahfg3a9mkrdfr6w2")))) + "1czyy4vck4yh6bbxyk6f15mvzv3ndrhabc2k2zyynv5npghyl8hy")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -863,7 +849,7 @@ on the screen.") (define-public xfdesktop (package (name "xfdesktop") - (version "4.14.3") + (version "4.16.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -871,7 +857,7 @@ on the screen.") "xfdesktop-" version ".tar.bz2")) (sha256 (base32 - "14sp5a4n21prwmh2l5mjq5fjaq7r2pbjxddfx4wzaix8867x1mq6")) + "1bjv2mpkv7zmpzssbvvzh0x4pn8cqm8dvhgsv5i1xwngzspsajwk")) (modules '((guix build utils))) (snippet #~(begin @@ -1007,7 +993,7 @@ system resources, while still being visually appealing and user friendly.") (define-public xfce4-power-manager (package (name "xfce4-power-manager") - (version "1.7.1") + (version "4.16.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -1015,7 +1001,7 @@ system resources, while still being visually appealing and user friendly.") "xfce4-power-manager-" version ".tar.bz2")) (sha256 (base32 - "1ki088iyr266cfyq9bmmhhd27wrsrmbhsblyf4yqby03hlvqif3k")))) + "1wrvqiifaxsgcn1kh4vm2hwxi9lgm6mw4zrfld2zl0mm05y5i77b")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) |