diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2020-05-10 10:55:41 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2020-05-10 11:15:09 +0300 |
| commit | 279569ca8251b9ae3f96e4486e4614e340d0fe4f (patch) | |
| tree | abe8ebce51752864fd685b59537885908b1145e3 | |
| parent | 628030e4c8158a37a7740762441d20ca6ecb8e86 (diff) | |
| download | guix-279569ca8251b9ae3f96e4486e4614e340d0fe4f.tar.gz guix-279569ca8251b9ae3f96e4486e4614e340d0fe4f.zip | |
Revert "gnu: efl: Update to 1.24.0."
There is a bug where with efl-1.24 no user input is accepted with any
efl-based pop-up dialogs. Revert until we can find a fix.
This reverts commit b34793c14372fbda2246d68ef6270f1207e53e98.
| -rw-r--r-- | gnu/packages/enlightenment.scm | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 4ac99e9fe7..244ac7dcd8 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz> ;;; Copyright © 2015 Daniel Pimentel <d4n1@member.fsf.org> -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 ng0 <ng0@n0.is> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Timo Eisenmann <eisenmann@fn.de> @@ -69,7 +69,7 @@ (define-public efl (package (name "efl") - (version "1.24.0") + (version "1.23.3") (source (origin (method url-fetch) (uri (string-append @@ -77,7 +77,7 @@ version ".tar.xz")) (sha256 (base32 - "1yhck2g4rwlzgnzqa4wjxw3lf6k6rd730hz4bwzajdjy7i26xfdk")))) + "00b9lp3h65254kdb1ys15fv7p3ln7qsvf15jkw4kli5ymagadkjk")))) (build-system meson-build-system) (native-inputs `(("check" ,check) @@ -93,7 +93,6 @@ ("libraw" ,libraw) ("librsvg" ,librsvg) ("libspectre" ,libspectre) - ("libtiff" ,libtiff) ("libxau" ,libxau) ("libxcomposite" ,libxcomposite) ("libxcursor" ,libxcursor) @@ -103,18 +102,18 @@ ("libxi" ,libxi) ("libxfixes" ,libxfixes) ("libxinerama" ,libxinerama) + ("libxp" ,libxp) ("libxrandr" ,libxrandr) ("libxrender" ,libxrender) ("libxss" ,libxscrnsaver) ("libxtst" ,libxtst) - ("libwebp" ,libwebp) - ("openjpeg" ,openjpeg) ("poppler" ,poppler) ("wayland-protocols" ,wayland-protocols))) (propagated-inputs ;; All these inputs are in package config files in section ;; Requires.private. `(("avahi" ,avahi) + ("bullet" ,bullet) ("dbus" ,dbus) ("elogind" ,elogind) ("eudev" ,eudev) @@ -123,13 +122,15 @@ ("fribidi" ,fribidi) ("glib" ,glib) ("harfbuzz" ,harfbuzz) + ("luajit" ,luajit) ("libinput" ,libinput-minimal) ("libjpeg" ,libjpeg-turbo) - ("libsndfile" ,libsndfile) ("libpng" ,libpng) + ("libsndfile" ,libsndfile) + ("libtiff" ,libtiff) + ("libwebp" ,libwebp) ("libx11" ,libx11) ("libxkbcommon" ,libxkbcommon) - ("luajit" ,luajit) ("lz4" ,lz4) ("openssl" ,openssl) ("pulseaudio" ,pulseaudio) @@ -138,18 +139,13 @@ ("zlib" ,zlib))) (arguments `(#:configure-flags '("-Dsystemd=false" - "-Delogind=true" "-Dembedded-lz4=false" "-Devas-loaders-disabler=json" "-Dbuild-examples=false" - "-Decore-imf-loaders-disabler=scim" - "-Davahi=true" - "-Dglib=true" - "-Dmount-path=/run/setuid-programs/mount" - "-Dunmount-path=/run/setuid-programs/umount" ;(string-append "-Ddictionaries-hyphen-dir=" ; (assoc-ref %build-inputs "hyphen") ; "/share/hyphen") + "-Delogind=true" "-Dnetwork-backend=connman" ,@(match (%current-system) ("armhf-linux" @@ -157,8 +153,8 @@ (_ '("-Dopengl=full"))) ;; for wayland - "-Dwl-deprecated=true" ; ecore_wayland - "-Ddrm-deprecated=true" ; ecore_drm + "-Dwl-deprecated=true" ; ecore_wayland + "-Ddrm-deprecated=true" ; ecore_drm "-Dwl=true" "-Ddrm=true") #:tests? #f ; Many tests fail due to timeouts and network requests. |