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 b34793c143
.
This commit is contained in:
parent
628030e4c8
commit
279569ca82
@ -1,7 +1,7 @@
|
|||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
|
;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
|
||||||
;;; Copyright © 2015 Daniel Pimentel <d4n1@member.fsf.org>
|
;;; 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 © 2017 ng0 <ng0@n0.is>
|
||||||
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
;;; Copyright © 2018 Timo Eisenmann <eisenmann@fn.de>
|
;;; Copyright © 2018 Timo Eisenmann <eisenmann@fn.de>
|
||||||
@ -69,7 +69,7 @@
|
|||||||
(define-public efl
|
(define-public efl
|
||||||
(package
|
(package
|
||||||
(name "efl")
|
(name "efl")
|
||||||
(version "1.24.0")
|
(version "1.23.3")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append
|
||||||
@ -77,7 +77,7 @@
|
|||||||
version ".tar.xz"))
|
version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1yhck2g4rwlzgnzqa4wjxw3lf6k6rd730hz4bwzajdjy7i26xfdk"))))
|
"00b9lp3h65254kdb1ys15fv7p3ln7qsvf15jkw4kli5ymagadkjk"))))
|
||||||
(build-system meson-build-system)
|
(build-system meson-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("check" ,check)
|
`(("check" ,check)
|
||||||
@ -93,7 +93,6 @@
|
|||||||
("libraw" ,libraw)
|
("libraw" ,libraw)
|
||||||
("librsvg" ,librsvg)
|
("librsvg" ,librsvg)
|
||||||
("libspectre" ,libspectre)
|
("libspectre" ,libspectre)
|
||||||
("libtiff" ,libtiff)
|
|
||||||
("libxau" ,libxau)
|
("libxau" ,libxau)
|
||||||
("libxcomposite" ,libxcomposite)
|
("libxcomposite" ,libxcomposite)
|
||||||
("libxcursor" ,libxcursor)
|
("libxcursor" ,libxcursor)
|
||||||
@ -103,18 +102,18 @@
|
|||||||
("libxi" ,libxi)
|
("libxi" ,libxi)
|
||||||
("libxfixes" ,libxfixes)
|
("libxfixes" ,libxfixes)
|
||||||
("libxinerama" ,libxinerama)
|
("libxinerama" ,libxinerama)
|
||||||
|
("libxp" ,libxp)
|
||||||
("libxrandr" ,libxrandr)
|
("libxrandr" ,libxrandr)
|
||||||
("libxrender" ,libxrender)
|
("libxrender" ,libxrender)
|
||||||
("libxss" ,libxscrnsaver)
|
("libxss" ,libxscrnsaver)
|
||||||
("libxtst" ,libxtst)
|
("libxtst" ,libxtst)
|
||||||
("libwebp" ,libwebp)
|
|
||||||
("openjpeg" ,openjpeg)
|
|
||||||
("poppler" ,poppler)
|
("poppler" ,poppler)
|
||||||
("wayland-protocols" ,wayland-protocols)))
|
("wayland-protocols" ,wayland-protocols)))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
;; All these inputs are in package config files in section
|
;; All these inputs are in package config files in section
|
||||||
;; Requires.private.
|
;; Requires.private.
|
||||||
`(("avahi" ,avahi)
|
`(("avahi" ,avahi)
|
||||||
|
("bullet" ,bullet)
|
||||||
("dbus" ,dbus)
|
("dbus" ,dbus)
|
||||||
("elogind" ,elogind)
|
("elogind" ,elogind)
|
||||||
("eudev" ,eudev)
|
("eudev" ,eudev)
|
||||||
@ -123,13 +122,15 @@
|
|||||||
("fribidi" ,fribidi)
|
("fribidi" ,fribidi)
|
||||||
("glib" ,glib)
|
("glib" ,glib)
|
||||||
("harfbuzz" ,harfbuzz)
|
("harfbuzz" ,harfbuzz)
|
||||||
|
("luajit" ,luajit)
|
||||||
("libinput" ,libinput-minimal)
|
("libinput" ,libinput-minimal)
|
||||||
("libjpeg" ,libjpeg-turbo)
|
("libjpeg" ,libjpeg-turbo)
|
||||||
("libsndfile" ,libsndfile)
|
|
||||||
("libpng" ,libpng)
|
("libpng" ,libpng)
|
||||||
|
("libsndfile" ,libsndfile)
|
||||||
|
("libtiff" ,libtiff)
|
||||||
|
("libwebp" ,libwebp)
|
||||||
("libx11" ,libx11)
|
("libx11" ,libx11)
|
||||||
("libxkbcommon" ,libxkbcommon)
|
("libxkbcommon" ,libxkbcommon)
|
||||||
("luajit" ,luajit)
|
|
||||||
("lz4" ,lz4)
|
("lz4" ,lz4)
|
||||||
("openssl" ,openssl)
|
("openssl" ,openssl)
|
||||||
("pulseaudio" ,pulseaudio)
|
("pulseaudio" ,pulseaudio)
|
||||||
@ -138,18 +139,13 @@
|
|||||||
("zlib" ,zlib)))
|
("zlib" ,zlib)))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:configure-flags '("-Dsystemd=false"
|
`(#:configure-flags '("-Dsystemd=false"
|
||||||
"-Delogind=true"
|
|
||||||
"-Dembedded-lz4=false"
|
"-Dembedded-lz4=false"
|
||||||
"-Devas-loaders-disabler=json"
|
"-Devas-loaders-disabler=json"
|
||||||
"-Dbuild-examples=false"
|
"-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="
|
;(string-append "-Ddictionaries-hyphen-dir="
|
||||||
; (assoc-ref %build-inputs "hyphen")
|
; (assoc-ref %build-inputs "hyphen")
|
||||||
; "/share/hyphen")
|
; "/share/hyphen")
|
||||||
|
"-Delogind=true"
|
||||||
"-Dnetwork-backend=connman"
|
"-Dnetwork-backend=connman"
|
||||||
,@(match (%current-system)
|
,@(match (%current-system)
|
||||||
("armhf-linux"
|
("armhf-linux"
|
||||||
@ -157,8 +153,8 @@
|
|||||||
(_
|
(_
|
||||||
'("-Dopengl=full")))
|
'("-Dopengl=full")))
|
||||||
;; for wayland
|
;; for wayland
|
||||||
"-Dwl-deprecated=true" ; ecore_wayland
|
"-Dwl-deprecated=true" ; ecore_wayland
|
||||||
"-Ddrm-deprecated=true" ; ecore_drm
|
"-Ddrm-deprecated=true" ; ecore_drm
|
||||||
"-Dwl=true"
|
"-Dwl=true"
|
||||||
"-Ddrm=true")
|
"-Ddrm=true")
|
||||||
#:tests? #f ; Many tests fail due to timeouts and network requests.
|
#:tests? #f ; Many tests fail due to timeouts and network requests.
|
||||||
|
Loading…
Reference in New Issue
Block a user