From 967de7c5b0100e49acf2ea1fd85bf8503b9d2057 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Jul 2018 12:36:45 +0300 Subject: gnu: Add ephoto. * gnu/packages/enlightenment.scm (ephoto): New variable. --- gnu/packages/enlightenment.scm | 47 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index cff5ab14a9..15ec492793 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -421,3 +421,50 @@ (define-public lekha "Simple PDF viewer based on the Enlightenment Foundation Libraries.") (home-page "https://github.com/kaihu/lekha") (license license:gpl3+))) + +(define-public ephoto + (package + (name "ephoto") + (version "1.5") + (source + (origin + (method url-fetch) + (uri (list (string-append "http://www.smhouston.us/stuff/ephoto-" + version ".tar.xz") + (string-append "https://download.enlightenment.org/rel/" + "apps/ephoto/ephoto-" version ".tar.xz"))) + (sha256 + (base32 + "04kli43sfsy6s660g13pjc0kjmgdcmq8m4qh02vvpcwv60mf9mgz")))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-home-directory + ;; FATAL: Cannot create run dir '/homeless-shelter/.run' - errno=2 + (lambda _ (setenv "HOME" "/tmp") #t))))) + (native-inputs + `(("check" ,check) + ("pkg-config" ,pkg-config))) + (inputs + `(("efl" ,efl))) + (home-page "http://smhouston.us/ephoto/") + (synopsis "EFL image viewer/editor/manipulator/slideshow creator") + (description "Ephoto is an image viewer and editor written using the +@dfn{Enlightenment Foundation Libraries} (EFL). It focuses on simplicity and ease +of use, while taking advantage of the speed and small footprint the EFL provide. + +Ephoto’s features include: +@enumerate +@item Browsing the filesystem and displaying images in an easy to use grid view. +@item Browsing images in a single image view format. +@item Viewing images in a slideshow. +@item Editing your image with features such as cropping, auto enhance, +blurring, sharpening, brightness/contrast/gamma adjustments, hue/saturation/value +adjustments, and color level adjustment. +@item Applying artistic filters to your image such as black and white and old photo. +@item Drag And Drop along with file operations to easy maintain your photo directories. +@end enumerate\n") + (license (list + license:bsd-2 ; Ephoto's thumbnailing code + license:bsd-3)))) -- cgit v1.2.3 From 290bef39f689f8c36807533214bc1a450be32522 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 3 Sep 2018 13:10:58 +0300 Subject: gnu: efl: Update to 1.21.0. * gnu/packages/enlightenment.scm (efl): Update to 1.21.0. --- gnu/packages/enlightenment.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 15ec492793..0cc9bb9575 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -62,7 +62,7 @@ (define-module (gnu packages enlightenment) (define-public efl (package (name "efl") - (version "1.20.7") + (version "1.21.0") (source (origin (method url-fetch) (uri (string-append @@ -70,7 +70,7 @@ (define-public efl version ".tar.xz")) (sha256 (base32 - "1zkn5ix81xck3n84dxvkjh4alwc6zj8x989d0zqi5c6ppijvgadh")))) + "0jxfrcz2aq1synxzd6sh9nhxz7fg9qgz0idr8zj6gaiplmwbwrby")))) (outputs '("out" ; 49 MB "include")) ; 17 MB (build-system gnu-build-system) -- cgit v1.2.3 From 0cc64476691dd47b79d93a38c89c488b1c985323 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 3 Sep 2018 17:32:21 +0300 Subject: gnu: python-efl: Update to 1.21.0. * gnu/packages/enlightenment.scm (python-efl): Update to 1.21.0. [source]: Don't use pypi source. [arguments]: Delete network tests. --- gnu/packages/enlightenment.scm | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 0cc9bb9575..40a5ec1cf4 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -312,35 +312,36 @@ (define-public enlightenment (define-public python-efl (package (name "python-efl") - (version "1.20.0") + (version "1.21.0") (source (origin (method url-fetch) - (uri (list - (pypi-uri "python-efl" version) - (string-append "http://download.enlightenment.org/rel/bindings/" - "python/python-efl-" version ".tar.gz"))) + (uri (string-append "http://download.enlightenment.org/rel/bindings/" + "python/python-efl-" version ".tar.xz")) (sha256 (base32 - "1680pgpf501nhbc9arm0nfj6rpcw17aryh0pgmmmszxlgpifpdzy")))) + "08x2cv8hnf004c3711250wrax21ffj5y8951pvk77h98als4pq47")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases - (replace 'build - (lambda _ - (zero? - (system* "env" "ENABLE_CYTHON=1" "python" "setup.py" "build")))) + (replace 'build + (lambda _ + (setenv "ENABLE_CYTHON" "1") + (invoke "python" "setup.py" "build"))) (add-before 'build 'set-flags - (lambda _ - (setenv "CFLAGS" - (string-append "-I" (assoc-ref %build-inputs "python-dbus") - "/include/dbus-1.0")) - #t)) + (lambda _ + (setenv "CFLAGS" + (string-append "-I" (assoc-ref %build-inputs "python-dbus") + "/include/dbus-1.0")) + #t)) (add-before 'check 'set-environment (lambda _ ;; Some tests require write access to HOME. (setenv "HOME" "/tmp") + ;; These tests try to connect to the internet. + (delete-file "tests/ecore/test_09_file_download.py") + (delete-file "tests/ecore/test_11_con.py") #t))))) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From ee127549a371e72f217598f38a81f8b8d16206b4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Sep 2018 11:36:15 +0200 Subject: gnu: efl: Update to 1.21.1. * gnu/packages/enlightenment.scm (efl): Update to 1.21.1. --- gnu/packages/enlightenment.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 40a5ec1cf4..87c2f2e58e 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -62,7 +62,7 @@ (define-module (gnu packages enlightenment) (define-public efl (package (name "efl") - (version "1.21.0") + (version "1.21.1") (source (origin (method url-fetch) (uri (string-append @@ -70,7 +70,7 @@ (define-public efl version ".tar.xz")) (sha256 (base32 - "0jxfrcz2aq1synxzd6sh9nhxz7fg9qgz0idr8zj6gaiplmwbwrby")))) + "0a5907h896pvpix7a6idc2fspzy6d78xrzf84k8y9fyvnd14nxs4")))) (outputs '("out" ; 49 MB "include")) ; 17 MB (build-system gnu-build-system) -- cgit v1.2.3 From d68aa41573bff6614a73ea28249cfd88fe206d38 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Sep 2018 11:36:31 +0200 Subject: gnu: enlightenment: Update to 0.22.4. * gnu/packages/enlightenment.scm (enlightenment): Update to 0.22.4. --- gnu/packages/enlightenment.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 87c2f2e58e..45dc1dbbeb 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -251,7 +251,7 @@ (define-public rage (define-public enlightenment (package (name "enlightenment") - (version "0.22.3") + (version "0.22.4") (source (origin (method url-fetch) (uri @@ -259,7 +259,7 @@ (define-public enlightenment name "/" name "-" version ".tar.xz")) (sha256 (base32 - "16zydv7z94aw3rywmb9gr8ya85k7b75h22wng95lfx1x0y1yb0ad")) + "0ygy891rrw5c7lhk539nhif77j88phvz2h0fhx172iaridy9kx2r")) (patches (search-patches "enlightenment-fix-setuid-path.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From e15ede6e28cfaf5fe951faf88d7c1e3213a476a4 Mon Sep 17 00:00:00 2001 From: Timo Eisenmann Date: Wed, 26 Sep 2018 17:01:33 +0200 Subject: gnu: enlightenment: Fix initial locale and keyboard selection. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/enlightenment.scm (enlightenment)[arguments]: In 'set-system-actions', set absolute file name to 'locale' and 'xorg.lst'. Signed-off-by: Ludovic Courtès --- gnu/packages/enlightenment.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 45dc1dbbeb..c7812e8874 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Timo Eisenmann ;;; ;;; This file is part of GNU Guix. ;;; @@ -268,13 +269,19 @@ (define-public enlightenment (add-before 'configure 'set-system-actions (lambda* (#:key inputs #:allow-other-keys) (let ((xkeyboard (assoc-ref inputs "xkeyboard-config")) - (utils (assoc-ref inputs "util-linux"))) + (utils (assoc-ref inputs "util-linux")) + (libc (assoc-ref inputs "libc"))) ;; We need to patch the path to 'base.lst' to be able ;; to switch the keyboard layout in E. - (substitute* "src/modules/xkbswitch/e_mod_parse.c" + (substitute* (list "src/modules/xkbswitch/e_mod_parse.c" + "src/modules/wizard/page_011.c") (("/usr/share/X11/xkb/rules/xorg.lst") (string-append xkeyboard "/share/X11/xkb/rules/base.lst"))) + (substitute* (list "src/bin/e_intl.c" + "src/modules/conf_intl/e_int_config_intl.c" + "src/modules/wizard/page_010.c") + (("locale -a") (string-append libc "/bin/locale -a"))) (substitute* "src/modules/everything/evry_plug_apps.c" (("/usr/bin/") "")) (substitute* "configure" -- cgit v1.2.3 From 1df4abc7dcf03f0655fc2fa26de7a6c91bac8b4e Mon Sep 17 00:00:00 2001 From: Timo Eisenmann Date: Mon, 1 Oct 2018 18:10:35 +0200 Subject: gnu: enlightenment: Fix keyboard switching MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/enlightenment.scm (enlightenment)[inputs]: Add 'setxkbmap' [arguments]: Set absolute file name to 'setxkbmap' Signed-off-by: Ludovic Courtès --- gnu/packages/enlightenment.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index c7812e8874..c0335016f8 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -269,6 +269,7 @@ (define-public enlightenment (add-before 'configure 'set-system-actions (lambda* (#:key inputs #:allow-other-keys) (let ((xkeyboard (assoc-ref inputs "xkeyboard-config")) + (setxkbmap (assoc-ref inputs "setxkbmap")) (utils (assoc-ref inputs "util-linux")) (libc (assoc-ref inputs "libc"))) ;; We need to patch the path to 'base.lst' to be able @@ -278,6 +279,9 @@ (define-public enlightenment (("/usr/share/X11/xkb/rules/xorg.lst") (string-append xkeyboard "/share/X11/xkb/rules/base.lst"))) + (substitute* "src/bin/e_xkb.c" + (("\"setxkbmap \"") + (string-append "\"" setxkbmap "/bin/setxkbmap \""))) (substitute* (list "src/bin/e_intl.c" "src/modules/conf_intl/e_int_config_intl.c" "src/modules/wizard/page_010.c") @@ -305,6 +309,7 @@ (define-public enlightenment ("libxcb" ,libxcb) ("libxext" ,libxext) ("linux-pam" ,linux-pam) + ("setxkbmap" ,setxkbmap) ("xcb-util-keysyms" ,xcb-util-keysyms) ("xkeyboard-config" ,xkeyboard-config))) (home-page "https://www.enlightenment.org/about-enlightenment") -- cgit v1.2.3 From fe30eb6d24dd750a124cb0c1f6300fc3d5518d7f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 05:50:49 +0200 Subject: gnu: ephoto: Fix typos in description. * gnu/packages/enlightenment.scm (ephoto)[description]: Fix typos. Wrap at 80 columns. --- gnu/packages/enlightenment.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index c0335016f8..1a0ebba304 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -464,19 +464,22 @@ (define-public ephoto (home-page "http://smhouston.us/ephoto/") (synopsis "EFL image viewer/editor/manipulator/slideshow creator") (description "Ephoto is an image viewer and editor written using the -@dfn{Enlightenment Foundation Libraries} (EFL). It focuses on simplicity and ease -of use, while taking advantage of the speed and small footprint the EFL provide. +@dfn{Enlightenment Foundation Libraries} (EFL). It focuses on simplicity and +ease of use, while taking advantage of the speed and small footprint the EFL +provide. Ephoto’s features include: @enumerate -@item Browsing the filesystem and displaying images in an easy to use grid view. +@item Browsing the file system and displaying images in an easy-to-use grid view. @item Browsing images in a single image view format. @item Viewing images in a slideshow. @item Editing your image with features such as cropping, auto enhance, blurring, sharpening, brightness/contrast/gamma adjustments, hue/saturation/value adjustments, and color level adjustment. -@item Applying artistic filters to your image such as black and white and old photo. -@item Drag And Drop along with file operations to easy maintain your photo directories. +@item Applying artistic filters to your image such as black and white and old +photo. +@item Drag And Drop along with file operations to easily maintain your photo +directories. @end enumerate\n") (license (list license:bsd-2 ; Ephoto's thumbnailing code -- cgit v1.2.3 From 4bd610f09e4f2080c4b5989240d4dc614165e477 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 26 Nov 2018 12:21:54 +0200 Subject: gnu: efl: Build with 'release' profile. * gnu/packages/enlightenment.scm (efl)[arguments]: Add 'configure-flag to build the 'release' profile. --- gnu/packages/enlightenment.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 1a0ebba304..4427dd033b 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -139,6 +139,7 @@ (define-public efl (arguments `(#:configure-flags '("--disable-silent-rules" "--disable-systemd" + "--with-profile=release" "--enable-liblz4" "--enable-xinput22" "--enable-image-loader-webp" -- cgit v1.2.3 From 3b160bdccfd541660b9df7337979d88c3ce9bb25 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 26 Nov 2018 12:23:05 +0200 Subject: gnu: efl: Build with full opengl support except on armhf-linux. * gnu/packages/enlightenment.scm (efl)[arguments]: Add 'configure-flags to use full opengl on all architectures except for armhf-linux, which will continue to use opengl-es. --- gnu/packages/enlightenment.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 4427dd033b..fb77642f5f 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -58,7 +58,8 @@ (define-module (gnu packages enlightenment) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages xdisorg) - #:use-module (gnu packages xorg)) + #:use-module (gnu packages xorg) + #:use-module (ice-9 match)) (define-public efl (package @@ -144,8 +145,11 @@ (define-public efl "--enable-xinput22" "--enable-image-loader-webp" "--enable-multisense" - "--with-opengl=es" - "--enable-egl" + ,@(match (%current-system) + ("armhf-linux" + '("--with-opengl=es" "--with-egl")) + (_ + '("--with-opengl=full"))) "--enable-harfbuzz" ;; for wayland "--enable-wayland" -- cgit v1.2.3 From 24b765b6a6b2e7080bc9b4e345537e409c0e3b68 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 29 Nov 2018 22:20:19 -0600 Subject: terminology: Update to 1.3.0. * gnu/packages/enlightenment.scm (terminology): Update to 1.3.0. --- gnu/packages/enlightenment.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index fb77642f5f..43ac388b25 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -183,7 +183,7 @@ (define-public efl (define-public terminology (package (name "terminology") - (version "1.2.1") + (version "1.3.0") (source (origin (method url-fetch) (uri @@ -191,10 +191,9 @@ (define-public terminology "terminology/terminology-" version ".tar.xz")) (sha256 (base32 - "1ii8332bl88l8md3gvz5dhi9bjpm6shyf14ck9kfyy7d56hp71mc")) + "07vw28inkimi9avp16j0rqcfqjq16081554qsv29pcqhz18xp59r")) (modules '((guix build utils))) ;; Remove the bundled fonts. - ;; TODO: Remove bundled lz4. (snippet '(begin (delete-file-recursively "data/fonts") -- cgit v1.2.3