2 patches

2 patches

[Efraim Flashner]

[-- Attachment #1.1: Type: text/plain, Size: 841 bytes --]

I've been holding on to these for a bit, waiting to integrate them before
submitting them.

cmocka: This is supposed to be used by mpv for running the tests, but the
tests fail. Since mpv works I wasn't super motivated to try to get it to
work, but I'm guessing other programs might also use it.

python-efl: There are a couple of programs that rely on this, none of which
are packaged in guix (obviously). The one that I can think of is econnman, an
enlightenment front-end to connman, which I was unable to determine if it had
been absorbed by the enlightenemnt codebase in the time since econnman's last
release.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-Add-cmocka.patch --]
[-- Type: text/x-patch, Size: 1685 bytes --]

From 1db7bfc722c0a486cc10cae7853a81484bfb41bc Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Mon, 21 Dec 2015 11:11:01 +0200
Subject: [PATCH 1/2] gnu: Add cmocka.

* gnu/packages/video.scm (cmocka): New variable.
---
 gnu/packages/video.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index a319a2d..ee8b7a3 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -765,6 +765,29 @@ fork of mplayer2 and MPlayer.  It shares some features with the former
 projects while introducing many more.")
     (license license:gpl2+)))
 
+(define-public cmocka
+  (package
+    (name "cmocka")
+    (version "1.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://cmocka.org/files/1.0/cmocka-"
+                                  version ".tar.xz"))
+              (sha256
+               (base32
+                "0fvm6rdalqcxckbddch8ycdw6n2ckldblv117n09chi2l7bm0q5k"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f)) ; No test target
+    (home-page "https://cmocka.org/")
+    (synopsis "Unit testing framework for C")
+    (description "Cmocka is a unit testing framework for C with support for
+mock objects.  It only requires the standard C library, and works with
+different compilers.  Cmocka supports several different message output formats
+like Test Anything Protocol, Subunit, xUnit XML or the original cmockery output
+format.")
+    (license license:asl2.0)))
+
 (define-public libvpx
   (package
     (name "libvpx")
-- 
2.7.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: 0001-gnu-Add-python-efl.patch --]
[-- Type: text/x-patch, Size: 2771 bytes --]

From 53336fe873bc639bc2ed65186384e9d6ca7ed34f Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 15 Nov 2015 13:54:22 +0200
Subject: [PATCH] gnu: Add python-efl.

* gnu/packages/enlightenment.scm (python-efl, python2-efl): New variables.
---
 gnu/packages/enlightenment.scm | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index 3fec6c6..cd6253d 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -23,6 +23,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system python)
   #:use-module (gnu packages)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages compression)
@@ -41,9 +42,10 @@
   #:use-module (gnu packages linux)
   #:use-module (gnu packages lua)
   #:use-module (gnu packages pdf)
-  #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages photo)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages pulseaudio)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages valgrind)
   #:use-module (gnu packages video)
@@ -306,3 +308,39 @@ file manager, wide range of configuration options, plugin system allowing to
 unload unused functionality, with support for touchscreen and suitable for
 embedded systems.")
     (license license:bsd-2)))
+
+(define-public python-efl
+  (package
+    (name "python-efl")
+    (version "1.16.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "python-efl" version))
+        (sha256
+         (base32
+          "1ihay90agl2jx12m7jj8j1cspd7vsak1w7q95rhb6r2srkq0ppxk"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+        (add-before 'build 'set-flags
+         (lambda _
+           (setenv "CFLAGS"
+                   (string-append "-I" (assoc-ref %build-inputs "python-dbus")
+                                  "/include/dbus-1.0")))))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("efl" ,efl)
+       ("elementary" ,elementary)
+       ("python-dbus" ,python-dbus)))
+    (home-page "https://www.enlightenment.org/")
+    (synopsis "Python bindings for EFL")
+    (description
+     "PYTHON-EFL are the python bindings for the whole EFL stack (eo, evas,
+ecore, edje, emotion, ethumb and elementary).")
+    (license (list license:lgpl3 license:gpl3))))
+
+(define-public python2-efl
+  (package-with-python2 python-efl))
-- 
2.7.0


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: 2 patches

[Leo Famulari]

On Thu, Jan 21, 2016 at 10:53:56AM +0200, Efraim Flashner wrote:
> I've been holding on to these for a bit, waiting to integrate them before
> submitting them.
> 
> cmocka: This is supposed to be used by mpv for running the tests, but the
> tests fail. Since mpv works I wasn't super motivated to try to get it to
> work, but I'm guessing other programs might also use it.
> 
> python-efl: There are a couple of programs that rely on this, none of which
> are packaged in guix (obviously). The one that I can think of is econnman, an
> enlightenment front-end to connman, which I was unable to determine if it had
> been absorbed by the enlightenemnt codebase in the time since econnman's last
> release.
> 
> -- 
> Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
> GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
> Confidentiality cannot be guaranteed on emails sent or received unencrypted

> From 1db7bfc722c0a486cc10cae7853a81484bfb41bc Mon Sep 17 00:00:00 2001
> From: Efraim Flashner <efraim@flashner.co.il>
> Date: Mon, 21 Dec 2015 11:11:01 +0200
> Subject: [PATCH 1/2] gnu: Add cmocka.
> 
> * gnu/packages/video.scm (cmocka): New variable.
> ---
>  gnu/packages/video.scm | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)

Is it specific to video programs? Otherwise, I think it should go
somewhere else. How about check.scm?

> +(define-public cmocka

[...]

> +    (arguments
> +     `(#:tests? #f)) ; No test target

Ironic!

> From 53336fe873bc639bc2ed65186384e9d6ca7ed34f Mon Sep 17 00:00:00 2001
> From: Efraim Flashner <efraim@flashner.co.il>
> Date: Sun, 15 Nov 2015 13:54:22 +0200
> Subject: [PATCH] gnu: Add python-efl.
> 
> * gnu/packages/enlightenment.scm (python-efl, python2-efl): New variables.
> ---
>  gnu/packages/enlightenment.scm | 40 +++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 39 insertions(+), 1 deletion(-)

[...]

> +    (synopsis "Python bindings for EFL")
> +    (description
> +     "PYTHON-EFL are the python bindings for the whole EFL stack (eo, evas,
                                                          
Can you expand this acronym EFL in the description? ------^

> +ecore, edje, emotion, ethumb and elementary).")
> +    (license (list license:lgpl3 license:gpl3))))

Perhaps add a short note explaining what parts are under which license?

Otherwise they both look good to me.

> +
> +(define-public python2-efl
> +  (package-with-python2 python-efl))
> -- 
> 2.7.0
> 

Re: 2 patches

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 2962 bytes --]

On Fri, 22 Jan 2016 15:25:43 -0500
Leo Famulari <leo@famulari.name> wrote:

> On Thu, Jan 21, 2016 at 10:53:56AM +0200, Efraim Flashner wrote:
> > I've been holding on to these for a bit, waiting to integrate them before
> > submitting them.
> > 
> > cmocka: This is supposed to be used by mpv for running the tests, but the
> > tests fail. Since mpv works I wasn't super motivated to try to get it to
> > work, but I'm guessing other programs might also use it.
> > 
> > python-efl: There are a couple of programs that rely on this, none of which
> > are packaged in guix (obviously). The one that I can think of is econnman, an
> > enlightenment front-end to connman, which I was unable to determine if it had
> > been absorbed by the enlightenemnt codebase in the time since econnman's last
> > release.
> > 
> 
> > From 1db7bfc722c0a486cc10cae7853a81484bfb41bc Mon Sep 17 00:00:00 2001
> > From: Efraim Flashner <efraim@flashner.co.il>
> > Date: Mon, 21 Dec 2015 11:11:01 +0200
> > Subject: [PATCH 1/2] gnu: Add cmocka.
> > 
> > * gnu/packages/video.scm (cmocka): New variable.
> > ---
> >  gnu/packages/video.scm | 23 +++++++++++++++++++++++
> >  1 file changed, 23 insertions(+)  
> 
> Is it specific to video programs? Otherwise, I think it should go
> somewhere else. How about check.scm?

Not video specific, so check.scm does make more sense.
 
> > +(define-public cmocka  
> 
> [...]
> 
> > +    (arguments
> > +     `(#:tests? #f)) ; No test target  
> 
> Ironic!

It does also have the happy benefit of not depending on anything :)

> 
> > From 53336fe873bc639bc2ed65186384e9d6ca7ed34f Mon Sep 17 00:00:00 2001
> > From: Efraim Flashner <efraim@flashner.co.il>
> > Date: Sun, 15 Nov 2015 13:54:22 +0200
> > Subject: [PATCH] gnu: Add python-efl.
> > 
> > * gnu/packages/enlightenment.scm (python-efl, python2-efl): New variables.
> > ---
> >  gnu/packages/enlightenment.scm | 40 +++++++++++++++++++++++++++++++++++++++-
> >  1 file changed, 39 insertions(+), 1 deletion(-)  
> 
> [...]
> 
> > +    (synopsis "Python bindings for EFL")
> > +    (description
> > +     "PYTHON-EFL are the python bindings for the whole EFL stack (eo, evas,  
>                                                           
> Can you expand this acronym EFL in the description? ------^

Fixed.

> > +ecore, edje, emotion, ethumb and elementary).")
> > +    (license (list license:lgpl3 license:gpl3))))  
> 
> Perhaps add a short note explaining what parts are under which license?

It turns out that while the repo has COPYING and COPYING.LESSER, every file
with a copyright notice lists the LGPL so I changed the license listed to
that.

> Otherwise they both look good to me.
> 


-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]