Re: [PATCH] Add MAFFT.

2015-07-26 Thread Andreas Enge 
On Sun, Jul 26, 2015 at 11:43:38AM +0200, Andreas Enge wrote:
 I would use a snippet for something internal to Guix, or specific to the
 way we handle things, while a patch is intended to be passed upstream (or
 sometimes taken from upstream already) to correct a bug in the software.

Well, I am contradicting myself. Right now, I am creating a patch for some-
thing internal to Guix, just because it is much easier to do so than to
use a snippet. I think there are no fixed rules...

Andreas

[PATCH] gnu: Add GVFS.

2015-07-26 Thread 宋文武 
* gnu/packages/gnome.scm (gvfs): New variable.
---
 gnu/packages/gnome.scm | 55 ++
 1 file changed, 55 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 0feb5b4..d44cb80 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -83,6 +83,9 @@
   #:use-module (gnu packages backup)
   #:use-module (gnu packages nettle)
   #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages video)
+  #:use-module (gnu packages cdrom)
+  #:use-module (gnu packages samba)
   #:use-module (srfi srfi-1))
 
 (define-public brasero
@@ -3107,3 +3110,55 @@ supports image conversion, rotation, and slideshows.)
  This library provides GObject bindings for libudev.  It was originally
 part of udev-extras, then udev, then systemd.  It's now a project on its own.)
 (license license:lgpl2.1+)))
+
+(define-public gvfs
+  (package
+(name gvfs)
+(version 1.24.1)
+(source (origin
+  (method url-fetch)
+  (uri (string-append mirror://gnome/sources/ name /
+  (version-major+minor version) /
+  name - version .tar.xz))
+  (sha256
+   (base32
+1ygiknnd24qgzds8wif3jns981mqr65lgjlxs5pw65cl3376g0yk
+(build-system gnu-build-system)
+(arguments
+ '(#:tests? #f)) ; XXX: requiring `pidof'
+(native-inputs
+ `((glib:bin ,glib bin) ; for glib-genmarshal, etc.
+   (intltool ,intltool)
+   (pkg-config ,pkg-config)
+   (xsltproc ,libxslt)))
+(inputs
+ `((avahi ,avahi)
+   (docbook-xml ,docbook-xml-4.2)
+   (docbook-xsl ,docbook-xsl)
+   (dbus ,dbus)
+   (fuse ,fuse)
+   (glib ,glib)
+   (libarchive ,libarchive)
+   (libbluray ,libbluray)
+   (libcdio-paranoia ,libcdio-paranoia)
+   (libgcrypt ,libgcrypt)
+   (libgphoto2 ,libgphoto2)
+   (libgudev ,libgudev)
+   (libmtp ,libmtp)
+   (libsecret ,libsecret)
+   (libsoup ,libsoup)
+   (libxml2 ,libxml2)
+   (nettle ,nettle) ; XXX: required by libarchive.pc
+   (libsmbclient ,samba)
+   (udisks ,udisks)))
+(home-page https://wiki.gnome.org/gvfs/;)
+(synopsis Userspace virtual filesystem for GIO)
+(description
+ GVFS is a userspace virtual filesystem designed to work with the I/O
+abstraction of GIO.  It contains a GIO module that seamlessly adds GVFS support
+to all applications using the GIO API.  It also supports exposing the GVFS
+mounts to non-GIO applications using FUSE.
+
+GVFS comes with a set of backends, including trash support, SFTP, SMB, HTTP,
+DAV, and others.)
+(license license:lgpl2.0+)))
-- 
2.4.3

Re: [PATCH 08/12] gnu: Add python-mistune.

2015-07-26 Thread Andreas Enge 
On Sun, Jul 26, 2015 at 12:08:25PM +0200, Andreas Enge wrote:
 On Fri, Jul 24, 2015 at 04:18:20PM +0200, Federico Beffa wrote:
  +(inputs
  + `((python-setuptools ,python-setuptools)
  +   (python-nose ,python-nose)
  +   (python-cython ,python-cython)))
 
 Should these not be native-inputs?
 
  +(description A fast markdown parser in pure Python.)
 
 Please use a full sentence, Mistune is a 

The same comments actually apply to your other patches.

Andreas

Re: [PATCH 4/7] emacs: Add 'guix-devel-use-current-module'.

2015-07-26 Thread Alex Kost 
Mathieu Lirzin (2015-07-25 21:51 +0300) wrote:

 Alex Kost alez...@gmail.com writes:

 * emacs/guix-guile.el (guix-guile-current-module): New function.
 * emacs/guix-devel.el: New file.
   (guix-devel-use-modules, guix-devel-use-current-module): New functions.
 * doc/emacs.texi (Emacs Development): New node.  Document
   'guix-devel-use-current-module'.

 [...]

 @@ -19,7 +19,8 @@ guix package}).  Specifically, ``guix.el'' makes it easy 
 to:
  * Usage: Emacs Usage.   Using the interface.
  * Configuration: Emacs Configuration.   Configuring the interface.
  * Prettify Mode: Emacs Prettify.Abbreviating @file{/gnu/store/@dots{}} 
 file names.
 -* Completions: Emacs Completions.   Completing @command{guix} shell 
 command.
 +* Completions: Emacs Completions.   Completing @command{guix} shell command.
 +* Development: Emacs Development.   Tools for Guix developers.
  @end menu

 What do you think about integrating it in section Contributing instead?

Maybe, I don't have a preference here.

 +And as always if you use a command often, it is a good idea to bind a
 +key to it, for example like this:
 +
 +@example
 +(with-eval-after-load 'scheme
 +  (define-key scheme-mode-map (kbd C-c u)
 +'guix-devel-use-current-module))
 +@end example

 I remember reading somewhere in the Emacs manual that C-c Letter is
 meant for user customization in the global key map (can't remember where
 ;)). So what suggesting C-c C-u which is a mode specific key binding?

I don't know whether there is such (or any other) suggestion anywhere.
But since that was just an example, not a recommendation (not even a
suggestion), I think it doesn't matter what key binding to use there.
Do you have any preference?  What about C-H-M-s-u? :-)

-- 
Alex

Re: guix-config.el ?

2015-07-26 Thread Mathieu Lirzin 
Alex Kost alez...@gmail.com writes:

 Following the discussion for bug#21127
 https://debbugs.gnu.org/cgi/bugreport.cgi?bug=21127, I was asking
 myself if it would be possible and/or desirable to have an equivalent of
 config.scm for the Emacs interface, in order to avoid having multiple
 *.el.in files?

 Great idea!  I think it is the best solution.  Would you like to make a
 patch for that?

I will try something.

--
Mathieu Lirzin

Re: [PATCH] Add MAFFT.

2015-07-26 Thread Andreas Enge 
On Sun, Jul 26, 2015 at 01:10:14PM +1000, Ben Woodcroft wrote:
 I'm actually a bit confused as to the difference between a snippet vs. a
 patch stage as above - when is each appropriate? Snippets are only for
 removing non-free software?

I would use a snippet for something internal to Guix, or specific to the
way we handle things, while a patch is intended to be passed upstream (or
sometimes taken from upstream already) to correct a bug in the software.

Andreas

Re: [PATCH] Add MAFFT.

2015-07-26 Thread Ricardo Wurmus 

Andreas Enge andr...@enge.fr writes:

 On Sun, Jul 26, 2015 at 01:10:14PM +1000, Ben Woodcroft wrote:
 I'm actually a bit confused as to the difference between a snippet vs. a
 patch stage as above - when is each appropriate? Snippets are only for
 removing non-free software?

 I would use a snippet for something internal to Guix, or specific to the
 way we handle things, while a patch is intended to be passed upstream (or
 sometimes taken from upstream already) to correct a bug in the software.

It should be noted that changes performed by snippets directly affect
the resulting tarball produced by ‘guix build -S’.  Whenever you want
the sources for a package to be permanently modified for the users, a
snippet would be the right way to achieve that.

Re: [PATCH 4/7] emacs: Add 'guix-devel-use-current-module'.

2015-07-26 Thread Mathieu Lirzin 
Alex Kost alez...@gmail.com writes:

 Mathieu Lirzin (2015-07-25 21:51 +0300) wrote:
 What do you think about integrating it in section Contributing instead?

 Maybe, I don't have a preference here.

Since it's not really related to package management, I think it would be
preferable to move this in the node The perfect Setup.

 I remember reading somewhere in the Emacs manual that C-c Letter is
 meant for user customization in the global key map (can't remember where
 ;)). So what suggesting C-c C-u which is a mode specific key binding?

 I don't know whether there is such (or any other) suggestion anywhere.
 But since that was just an example, not a recommendation (not even a
 suggestion), I think it doesn't matter what key binding to use there.
 Do you have any preference?  What about C-H-M-s-u? :-)

I agree it's not really important for advanced Emacs users who will have
no problem choosing something adapted to their setup. Nonetheless IMHO
consistency and simplicity helps newcomers to understand, So I will be
in favour of anything that follows this convention. :)

--8---cut here---start-8---
(global-set-key (kbd C-c letter) foo-function-callable-anywhere)

(define-key bar-mode-map
(kbd C-c C-letter)
'foo-function-for-bar-mode)
--8---cut here---end---8---

--
Mathieu Lirzin

Re: [PATCH 08/12] gnu: Add python-mistune.

2015-07-26 Thread Andreas Enge 
On Fri, Jul 24, 2015 at 04:18:20PM +0200, Federico Beffa wrote:
 +(inputs
 + `((python-setuptools ,python-setuptools)
 +   (python-nose ,python-nose)
 +   (python-cython ,python-cython)))

Should these not be native-inputs?

 +(description A fast markdown parser in pure Python.)

Please use a full sentence, Mistune is a 

Andreas

Re: [PATCH 01/12] gnu: Add fastcap.

2015-07-26 Thread Andreas Enge 
On Fri, Jul 24, 2015 at 04:17:39PM +0200, Federico Beffa wrote:
 The function 'broken-tarball-fetch' was provided by Ludovic on IRC.
 I'm not 100% sure about the license.
 +(license license:bsd-3)))

If you compare the license texts, it is not bsd-3, but inspired from it;
I would use non-copyleft.

Andreas

Re: Qtwebengine

2015-07-26 Thread Andreas Enge 
Attached is the patch.

Vlc still compiles with the new qt. Liblxqt does not; we might need to
add qt 5.4 again as a separate package. Hydra should tell us if there is
more damage...

Andreas

From 544976bc995182440ab07f6e02dbc4deb6a3f320 Mon Sep 17 00:00:00 2001
From: Andreas Enge andr...@enge.fr
Date: Sat, 25 Jul 2015 16:02:38 +0200
Subject: [PATCH] gnu: qt: Update to 5.5.0.

* gnu/packages/qt.scm (qt): Update to 5.5.0. Update download location.
  Drop patch and snippet.
  [arguments]: Add configure flag to drop qtwebengine module bundling
  chromium.
  [inputs]: Add harfbuzz to avoid use of bundled copy.
  (qt-4)[inputs]: Remove inherited harfbuzz again.
* gnu/packages/patches/qt5-conflicting-typedefs.patch: Delete file.
* gnu-system.am (dist_patch_DATA): Unregister patch.
* gnu/packages/patches/qt5-runpath.patch: Adapt patch.
---
 gnu-system.am  |  1 -
 .../patches/qt5-conflicting-typedefs.patch | 70 --
 gnu/packages/patches/qt5-runpath.patch | 16 ++---
 gnu/packages/qt.scm| 51 +---
 4 files changed, 37 insertions(+), 101 deletions(-)
 delete mode 100644 gnu/packages/patches/qt5-conflicting-typedefs.patch

diff --git a/gnu-system.am b/gnu-system.am
index d6635fe..560f0ca 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -602,7 +602,6 @@ dist_patch_DATA =   
\
   gnu/packages/patches/qemu-CVE-2015-4106-pt8.patch\
   gnu/packages/patches/qt4-ldflags.patch   \
   gnu/packages/patches/qt4-tests.patch \
-  gnu/packages/patches/qt5-conflicting-typedefs.patch  \
   gnu/packages/patches/qt5-runpath.patch   \
   gnu/packages/patches/ratpoison-shell.patch   \
   gnu/packages/patches/readline-link-ncurses.patch \
diff --git a/gnu/packages/patches/qt5-conflicting-typedefs.patch 
b/gnu/packages/patches/qt5-conflicting-typedefs.patch
deleted file mode 100644
index 751452c..000
--- a/gnu/packages/patches/qt5-conflicting-typedefs.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-See https://bugreports.qt.io/browse/QTBUG-45205.
-
-diff --git a/qtwebengine/src/core/chromium_gpu_helper.cpp 
b/qtwebengine/src/core/chromium_gpu_helper.cpp
-index c7c97e6..ef574ec 100644
 a/qtwebengine/src/core/chromium_gpu_helper.cpp
-+++ b/qtwebengine/src/core/chromium_gpu_helper.cpp
-@@ -40,13 +40,15 @@
- 
- #include chromium_gpu_helper.h
- 
--#include content/common/gpu/gpu_channel_manager.h
--#include content/common/gpu/sync_point_manager.h
--#include content/gpu/gpu_child_thread.h
-+// Including gpu/command_buffer headers before content/gpu headers makes sure 
that
-+// guards are defined to prevent duplicate definition errors with forward 
declared
-+// GL typedefs cascading through content header includes.
- #include gpu/command_buffer/service/mailbox_manager.h
- #include gpu/command_buffer/service/texture_manager.h
- 
--#include QtGlobal // We need this for the Q_OS_QNX define.
-+#include content/common/gpu/gpu_channel_manager.h
-+#include content/common/gpu/sync_point_manager.h
-+#include content/gpu/gpu_child_thread.h
- 
- #ifdef Q_OS_QNX
- #include content/common/gpu/stream_texture_qnx.h
-diff --git a/qtwebengine/src/core/gl_surface_qt.cpp 
b/qtwebengine/src/core/gl_surface_qt.cpp
-index 4fe2f21..5a27aa9 100644
 a/qtwebengine/src/core/gl_surface_qt.cpp
-+++ b/qtwebengine/src/core/gl_surface_qt.cpp
-@@ -49,8 +49,6 @@
- #include base/logging.h
- #include base/memory/scoped_ptr.h
- #include content/common/gpu/image_transport_surface.h
--#include content/common/gpu/gpu_channel_manager.h
--#include content/common/gpu/gpu_command_buffer_stub.h
- #include ui/gl/egl_util.h
- #include ui/gl/gl_context.h
- #include ui/gl/gl_implementation.h
-@@ -544,7 +542,9 @@ GLSurface::CreateViewGLSurface(gfx::AcceleratedWidget 
window)
- }  // namespace gfx
- 
- namespace content {
--scoped_refptrgfx::GLSurface 
ImageTransportSurface::CreateNativeSurface(GpuChannelManager* manager, 
GpuCommandBufferStub* stub, const gfx::GLSurfaceHandle handle)
-+class GpuCommandBufferStub;
-+class GpuChannelManager;
-+scoped_refptrgfx::GLSurface 
ImageTransportSurface::CreateNativeSurface(GpuChannelManager*, 
GpuCommandBufferStub*, const gfx::GLSurfaceHandle)
- {
- QT_NOT_USED
- return scoped_refptrgfx::GLSurface();
-diff --git 
a/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/gles2_cmd_format.h
 
b/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/gles2_cmd_format.h
-index 04a3dc3..506cf00 100644
 
a/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/gles2_cmd_format.h
-+++ 
b/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/gles2_cmd_format.h
-@@ -20,6 +20,7 @@
- #include gpu/command_buffer/common/cmd_buffer_common.h
- #include gpu/command_buffer/common/gles2_cmd_ids.h
- 
-+#ifndef GL_VERSION_1_5
- // GL types are forward declared to avoid

gpl3 vs. gpl3+

2015-07-26 Thread Alex Kost 
I see that only several packages uses 'gpl3' license.  And I don't
really understand the cases when it should be used instead of 'gpl3+'.

I looked at aarddict and weechat.  They have the same
COPYING/LICENSE files as http://www.gnu.org/licenses/gpl.txt.  So it
should be gpl3+, right?

Then I looked at flexbar.  The only license-related mention in the
source code is (GPLv3) in the commentary of src/Flexbar.cpp:

--8---cut here---start-8---
   Flexbar - flexible barcode and adapter removal

   Version 2.5  (GPLv3)
--8---cut here---end---8---

Is it the case for 'gpl3'?  Are there other cases to use 'gpl3'?

-- 
Alex

Re: [PATCH] gnu: Add GVFS.

2015-07-26 Thread Mark H Weaver 
宋文武 iyzs...@gmail.com writes:
 * gnu/packages/gnome.scm (gvfs): New variable.

Looks good to me, please push!

Thanks,
  Mark

Re: [PATCH 4/7] emacs: Add 'guix-devel-use-current-module'.

2015-07-26 Thread Alex Kost 
Mathieu Lirzin (2015-07-26 17:00 +0300) wrote:

 Alex Kost alez...@gmail.com writes:

 Mathieu Lirzin (2015-07-25 21:51 +0300) wrote:
 What do you think about integrating it in section Contributing instead?

 Maybe, I don't have a preference here.

 Since it's not really related to package management, I think it would be
 preferable to move this in the node The perfect Setup.

OK, you convinced me :-) I'll put the docs there.

 I remember reading somewhere in the Emacs manual that C-c Letter is
 meant for user customization in the global key map (can't remember where
 ;)). So what suggesting C-c C-u which is a mode specific key binding?

 I don't know whether there is such (or any other) suggestion anywhere.
 But since that was just an example, not a recommendation (not even a
 suggestion), I think it doesn't matter what key binding to use there.
 Do you have any preference?  What about C-H-M-s-u? :-)

 I agree it's not really important for advanced Emacs users who will have
 no problem choosing something adapted to their setup. Nonetheless IMHO
 consistency and simplicity helps newcomers to understand, So I will be
 in favour of anything that follows this convention. :)

 (global-set-key (kbd C-c letter) foo-function-callable-anywhere)

 (define-key bar-mode-map
 (kbd C-c C-letter)
 'foo-function-for-bar-mode)

According to (info (elisp) Key Binding Conventions), 'C-c LETTER'
bindings are reserved for users, so I think using C-c u in that
example is absolutely fine, don't you agree?

-- 
Alex

Re: gpl3 vs. gpl3+

2015-07-26 Thread Alex Kost 
Mark H Weaver (2015-07-26 18:54 +0300) wrote:

 Alex Kost alez...@gmail.com writes:

 I see that only several packages uses 'gpl3' license.  And I don't
 really understand the cases when it should be used instead of 'gpl3+'.

 I looked at aarddict and weechat.  They have the same
 COPYING/LICENSE files as http://www.gnu.org/licenses/gpl.txt.  So it
 should be gpl3+, right?

 The license of a program is determined by the copyright notices in the
 files themselves, not by the mere existence of a copy of a license
 somewhere in the tarball.

 Language like this in the files means gpl3+:

 ;;; GNU Guix is free software; you can redistribute it and/or modify it
 ;;; under the terms of the GNU General Public License as published by
 ;;; the Free Software Foundation; either version 3 of the License, or (at
 ;;; your option) any later version.

 If the or (at your option) any later version language is missing, then
 it's just gpl3.

 To ease the labor of looking at the copyright notices on every file, I
 look at the corresponding Debian copyright file.  Debian tends to do a
 fairly thorough job of license checking.  I search for the package using
 http://packages.debian.org/PACKAGE-NAME, I select a package whose
 version number is the same (or quite close) to the one I'm packaging,
 and then I select the Copyright File link in the Debian Resources
 section on the right side of the web page.

 Also beware that the Debian copyright file only documents licenses on
 files that they have not removed.  Just below the Debian Resources
 section on the right is a section Download Source Package.  If you see
 DFSG in the name of the original tarball file, that means that they've
 removed files for copyright reasons.

 Hope this helps,

Yes, thank you for the explanation and the Debian copyright file hint.

So I think, that the license of weechat should be changed to 'gpl3+'.
I quickly looked at the source files and at
http://metadata.ftp-master.debian.org/changelogs//main/w/weechat/weechat_1.0.1-1_copyright
and there is any later version everywhere.

I didn't look at other 'gpl3' packages, but I belive weechat is not the
only package with a mistake in license field.  (I should probably just
walk through all these packages and fix licenses all at once)

Also what to do with flexbar?  It has neither COPYING/LICENSE file,
nor copyright notices in the source files.  As I mentioned earlier only
src/Flexbar.cpp file has (GPLv3) in its commentary and nothing more.

-- 
Alex

Re: Qtwebengine

2015-07-26 Thread Mark H Weaver 
宋文武 iyzs...@gmail.com writes:
 +1 for remove qtwebengine.

Agreed.

 (I tried to split Qt into submodules, but it seems to require a lot of
 effort which I couldn't give now :-( )

On that subject: I vaguely recall you saying that the system 'pcre'
couldn't be used by Qt before because it wasn't built with
--enable-pcre16.  I added that feature to 'pcre' in the last
core-updates cycle, in commit 16f71908308106d098fa44104e177e328c593359.

  Mark

Qtwebengine

2015-07-26 Thread Andreas Enge 
Hello,

I am trying to update Qt to 5.5.0. Unfortunately, it does not compile;
there are error messages such as
../../../src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc: In function ‘boolean 
gfx::
{anonymous}::FillInputBuffer(j_decompress_ptr)’:
../../../src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc:362:10: error: cannot 
conve
rt ‘bool’ to ‘boolean’ in return
   return false;
../../../src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc:276:32: error: 
invalid conv
ersion from ‘int’ to ‘boolean’ [-fpermissive]
   jpeg_start_compress(cinfo, 1);

We might use too aggressive type checking here. Anyway, I seem to recall that
we discussed leaving out the building of chromium altogether due to security
considerations?

In this case, it should be enough to pass the configure flag
-skip qtwebengine. I am trying out a build now, and if you agree and
everything goes well, would push like this.

Andreas

Re: [PATCH] python2-ansible, python-ccm and dependencies

2015-07-26 Thread Alex Kost 
Eric Dvorsak (2015-07-25 22:58 +0300) wrote:

 Thank you Ricardo and Alex for taking the time to review and comment my
 patch. I edited it to take your advices into account. I hope I did not miss
 anything this time

Please add the following line to python.scm:

;;; Copyright © 2015 Eric Dvorsak yen...@gmail.com

I think you can do it in the first patch.

[...]
 +(synopsis Cassandra Cluster Manager)
 +(description A script/library to create, launch and remove an Apache 
 Cassandra cluster on localhost.)

Please, do not use long lines (more than 72-78 chars).  If you use
Emacs, you may just M-q inside descriptions.

[...]
 +(define-public python2-ansible
 +  (package
 +(name python2-ansible)
 +(version 1.9.2)
 +(source
 + (origin
 +   (method url-fetch)
 +   (uri (string-append
 + https://pypi.python.org/packages/source/a/ansible/ansible-;
 + version
 + .tar.gz))
 +   (sha256
 +(base32
 + 007fzgsqaahb0y4gjdxxmir9kcni7wph2z14jhqgpz88idrz8pn2
 +(build-system python-build-system)
 +(native-inputs
 + `((python2-setuptools ,python2-setuptools)
 +   (python2-pycrypto ,python2-pycrypto)
 +   (python2-httplib2 ,python2-httplib2)
 +   (python2-passlib ,python2-passlib)
 +   (python2-nose ,python2-nose)
 +   (python2-mock ,python2-mock)
 +   (python2-jinja2 ,python2-jinja2)
 +   (python2-pyyaml ,python2-pyyaml)
 +   (python2-paramiko ,python2-paramiko)))
 +(inputs
 + `((python2-pycrypto ,python2-pycrypto)
 +   (python2-jinja2 ,python2-jinja2)
 +   (python2-pyyaml ,python2-pyyaml)
 +   (python2-paramiko ,python2-paramiko)))
 +(arguments
 + `(#:python ,python-2)) ; incompatible with Python 3
 +(home-page http://ansible.com/;)
 +(synopsis Radically simple IT automation)
 +(description Ansible is a radically simple IT automation system.  It 
 handles configuration-management, application deployment, cloud provisioning, 
 ad-hoc task-execution, and multinode orchestration - including trivializing 
 things like zero downtime rolling updates with load balancers.)
 +(license gpl3)))

I think it should be 'gpl3+'.  AFAICS
https://github.com/ansible/ansible/blob/devel/COPYING is a usual GPL
license http://www.gnu.org/licenses/gpl.txt which has or any later
version in it, so we use 'gpl3+' for this.

Otherwise, the patches look good to me, perhaps the others will notice
more.  I can only confirm that the packages built successfully here.

-- 
Alex

Re: [PATCH] python2-ansible, python-ccm and dependencies

2015-07-26 Thread Eric Dvorsak 
Ok I have made all the changes you recommended. Thank you for your help.

2015-07-26 11:56 GMT+02:00 Alex Kost alez...@gmail.com:

 Eric Dvorsak (2015-07-25 22:58 +0300) wrote:

  Thank you Ricardo and Alex for taking the time to review and comment my
  patch. I edited it to take your advices into account. I hope I did not
 miss
  anything this time

 Please add the following line to python.scm:

 ;;; Copyright © 2015 Eric Dvorsak yen...@gmail.com

 I think you can do it in the first patch.

 [...]
  +(synopsis Cassandra Cluster Manager)
  +(description A script/library to create, launch and remove an
 Apache Cassandra cluster on localhost.)

 Please, do not use long lines (more than 72-78 chars).  If you use
 Emacs, you may just M-q inside descriptions.

 [...]
  +(define-public python2-ansible
  +  (package
  +(name python2-ansible)
  +(version 1.9.2)
  +(source
  + (origin
  +   (method url-fetch)
  +   (uri (string-append
  + 
 https://pypi.python.org/packages/source/a/ansible/ansible-;
  + version
  + .tar.gz))
  +   (sha256
  +(base32
  + 007fzgsqaahb0y4gjdxxmir9kcni7wph2z14jhqgpz88idrz8pn2
  +(build-system python-build-system)
  +(native-inputs
  + `((python2-setuptools ,python2-setuptools)
  +   (python2-pycrypto ,python2-pycrypto)
  +   (python2-httplib2 ,python2-httplib2)
  +   (python2-passlib ,python2-passlib)
  +   (python2-nose ,python2-nose)
  +   (python2-mock ,python2-mock)
  +   (python2-jinja2 ,python2-jinja2)
  +   (python2-pyyaml ,python2-pyyaml)
  +   (python2-paramiko ,python2-paramiko)))
  +(inputs
  + `((python2-pycrypto ,python2-pycrypto)
  +   (python2-jinja2 ,python2-jinja2)
  +   (python2-pyyaml ,python2-pyyaml)
  +   (python2-paramiko ,python2-paramiko)))
  +(arguments
  + `(#:python ,python-2)) ; incompatible with Python 3
  +(home-page http://ansible.com/;)
  +(synopsis Radically simple IT automation)
  +(description Ansible is a radically simple IT automation system.
 It handles configuration-management, application deployment, cloud
 provisioning, ad-hoc task-execution, and multinode orchestration -
 including trivializing things like zero downtime rolling updates with load
 balancers.)
  +(license gpl3)))

 I think it should be 'gpl3+'.  AFAICS
 https://github.com/ansible/ansible/blob/devel/COPYING is a usual GPL
 license http://www.gnu.org/licenses/gpl.txt which has or any later
 version in it, so we use 'gpl3+' for this.

 Otherwise, the patches look good to me, perhaps the others will notice
 more.  I can only confirm that the packages built successfully here.

 --
 Alex

From 7bc1543f231993e6e04c2a79e6840663f14c0def Mon Sep 17 00:00:00 2001
From: Eric Dvorsak yen...@gmail.com
Date: Sat, 25 Jul 2015 21:31:05 +0200
Subject: [PATCH 1/8] gnu: Add python2-pycrypto.

* gnu/packages/python.scm (python2-pycrypto): New variable.
---
 gnu/packages/python.scm | 4 
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 7709fbd..b70d937 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2015 Pierre-Antoine Rault p...@rigelk.eu
 ;;; Copyright © 2015 Ricardo Wurmus rek...@elephly.net
 ;;; Copyright © 2015 Christopher Allan Webber cweb...@dustycloud.org
+;;; Copyright © 2015 Eric Dvorsak yen...@gmail.com
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -538,6 +539,9 @@ and RIPEMD160), and various encryption algorithms (AES, DES, RSA, ElGamal,
 etc.).  The package is structured to make adding new modules easy.)
 (license public-domain)))
 
+(define-public python2-pycrypto
+  (package-with-python2 python-pycrypto))
+
 (define-public python-keyring
   (package
 (name python-keyring)
-- 
2.4.3

From d15941992f1a8b882902990641cee2b1e89c2b6d Mon Sep 17 00:00:00 2001
From: Eric Dvorsak yen...@gmail.com
Date: Sat, 25 Jul 2015 21:34:19 +0200
Subject: [PATCH 2/8] gnu: Add python-ccm.

* gnu/packages/python.scm (python-ccm, python2-ccm): New variables.
---
 gnu/packages/python.scm | 29 +
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index b70d937..d78e9df 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -298,6 +298,35 @@ pidof, tty, taskset, pmap.)
 (define-public python2-psutil
   (package-with-python2 python-psutil))
 
+(define-public python-ccm
+  (package
+(name python-ccm)
+(version 2.0.4.1)
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append
+ https://pypi.python.org/packages/source/c/ccm/ccm-;
+ version
+ .tar.gz))
+   (sha256
+(base32
+ 199jw221albs2iv6xczczq88fxnh0aw8hzmys8qkbzkd99dssng9
+(build-system python-build-system)
+(native-inputs
+ `((python-setuptools ,python-setuptools)))
+

Re: Qtwebengine

2015-07-26 Thread 宋文武 
Andreas Enge andr...@enge.fr writes:

 Attached is the patch.

 Vlc still compiles with the new qt. Liblxqt does not; we might need to
 add qt 5.4 again as a separate package. Hydra should tell us if there is
 more damage...

 Andreas

 From 544976bc995182440ab07f6e02dbc4deb6a3f320 Mon Sep 17 00:00:00 2001
 From: Andreas Enge andr...@enge.fr
 Date: Sat, 25 Jul 2015 16:02:38 +0200
 Subject: [PATCH] gnu: qt: Update to 5.5.0.

 * gnu/packages/qt.scm (qt): Update to 5.5.0. Update download location.
   Drop patch and snippet.
   [arguments]: Add configure flag to drop qtwebengine module bundling
   chromium.
   [inputs]: Add harfbuzz to avoid use of bundled copy.
   (qt-4)[inputs]: Remove inherited harfbuzz again.
 * gnu/packages/patches/qt5-conflicting-typedefs.patch: Delete file.
 * gnu-system.am (dist_patch_DATA): Unregister patch.
 * gnu/packages/patches/qt5-runpath.patch: Adapt patch.
 ---
  gnu-system.am  |  1 -
  .../patches/qt5-conflicting-typedefs.patch | 70 
 --
  gnu/packages/patches/qt5-runpath.patch | 16 ++---
  gnu/packages/qt.scm| 51 +---
  4 files changed, 37 insertions(+), 101 deletions(-)
  delete mode 100644 gnu/packages/patches/qt5-conflicting-typedefs.patch

 diff --git a/gnu-system.am b/gnu-system.am
 index d6635fe..560f0ca 100644
 --- a/gnu-system.am
 +++ b/gnu-system.am
 @@ -602,7 +602,6 @@ dist_patch_DATA = 
 \
gnu/packages/patches/qemu-CVE-2015-4106-pt8.patch  \
gnu/packages/patches/qt4-ldflags.patch \
gnu/packages/patches/qt4-tests.patch   \
 -  gnu/packages/patches/qt5-conflicting-typedefs.patch\
gnu/packages/patches/qt5-runpath.patch \
gnu/packages/patches/ratpoison-shell.patch \
gnu/packages/patches/readline-link-ncurses.patch   \
 diff --git a/gnu/packages/patches/qt5-conflicting-typedefs.patch 
 b/gnu/packages/patches/qt5-conflicting-typedefs.patch
 deleted file mode 100644
 index 751452c..000
 --- a/gnu/packages/patches/qt5-conflicting-typedefs.patch
 +++ /dev/null
 @@ -1,70 +0,0 @@
 -See https://bugreports.qt.io/browse/QTBUG-45205.
 -
 -diff --git a/qtwebengine/src/core/chromium_gpu_helper.cpp 
 b/qtwebengine/src/core/chromium_gpu_helper.cpp
 -index c7c97e6..ef574ec 100644
  a/qtwebengine/src/core/chromium_gpu_helper.cpp
 -+++ b/qtwebengine/src/core/chromium_gpu_helper.cpp
 -@@ -40,13 +40,15 @@
 - 
 - #include chromium_gpu_helper.h
 - 
 --#include content/common/gpu/gpu_channel_manager.h
 --#include content/common/gpu/sync_point_manager.h
 --#include content/gpu/gpu_child_thread.h
 -+// Including gpu/command_buffer headers before content/gpu headers makes 
 sure that
 -+// guards are defined to prevent duplicate definition errors with forward 
 declared
 -+// GL typedefs cascading through content header includes.
 - #include gpu/command_buffer/service/mailbox_manager.h
 - #include gpu/command_buffer/service/texture_manager.h
 - 
 --#include QtGlobal // We need this for the Q_OS_QNX define.
 -+#include content/common/gpu/gpu_channel_manager.h
 -+#include content/common/gpu/sync_point_manager.h
 -+#include content/gpu/gpu_child_thread.h
 - 
 - #ifdef Q_OS_QNX
 - #include content/common/gpu/stream_texture_qnx.h
 -diff --git a/qtwebengine/src/core/gl_surface_qt.cpp 
 b/qtwebengine/src/core/gl_surface_qt.cpp
 -index 4fe2f21..5a27aa9 100644
  a/qtwebengine/src/core/gl_surface_qt.cpp
 -+++ b/qtwebengine/src/core/gl_surface_qt.cpp
 -@@ -49,8 +49,6 @@
 - #include base/logging.h
 - #include base/memory/scoped_ptr.h
 - #include content/common/gpu/image_transport_surface.h
 --#include content/common/gpu/gpu_channel_manager.h
 --#include content/common/gpu/gpu_command_buffer_stub.h
 - #include ui/gl/egl_util.h
 - #include ui/gl/gl_context.h
 - #include ui/gl/gl_implementation.h
 -@@ -544,7 +542,9 @@ GLSurface::CreateViewGLSurface(gfx::AcceleratedWidget 
 window)
 - }  // namespace gfx
 - 
 - namespace content {
 --scoped_refptrgfx::GLSurface 
 ImageTransportSurface::CreateNativeSurface(GpuChannelManager* manager, 
 GpuCommandBufferStub* stub, const gfx::GLSurfaceHandle handle)
 -+class GpuCommandBufferStub;
 -+class GpuChannelManager;
 -+scoped_refptrgfx::GLSurface 
 ImageTransportSurface::CreateNativeSurface(GpuChannelManager*, 
 GpuCommandBufferStub*, const gfx::GLSurfaceHandle)
 - {
 - QT_NOT_USED
 - return scoped_refptrgfx::GLSurface();
 -diff --git 
 a/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/gles2_cmd_format.h
  
 b/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/gles2_cmd_format.h
 -index 04a3dc3..506cf00 100644
  
 a/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/gles2_cmd_format.h
 -+++ 
 b/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/gles2_cmd_format.h
 -@@ -20,6 +20,7 @@
 - #include

Re: gpl3 vs. gpl3+

2015-07-26 Thread Mark H Weaver 
Alex Kost alez...@gmail.com writes:

 I see that only several packages uses 'gpl3' license.  And I don't
 really understand the cases when it should be used instead of 'gpl3+'.

 I looked at aarddict and weechat.  They have the same
 COPYING/LICENSE files as http://www.gnu.org/licenses/gpl.txt.  So it
 should be gpl3+, right?

The license of a program is determined by the copyright notices in the
files themselves, not by the mere existence of a copy of a license
somewhere in the tarball.

Language like this in the files means gpl3+:

;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.

If the or (at your option) any later version language is missing, then
it's just gpl3.

To ease the labor of looking at the copyright notices on every file, I
look at the corresponding Debian copyright file.  Debian tends to do a
fairly thorough job of license checking.  I search for the package using
http://packages.debian.org/PACKAGE-NAME, I select a package whose
version number is the same (or quite close) to the one I'm packaging,
and then I select the Copyright File link in the Debian Resources
section on the right side of the web page.

Also beware that the Debian copyright file only documents licenses on
files that they have not removed.  Just below the Debian Resources
section on the right is a section Download Source Package.  If you see
DFSG in the name of the original tarball file, that means that they've
removed files for copyright reasons.

Hope this helps,

  Mark

Re: [PATCH 3/3] gnu: Add python-pelican

2015-07-26 Thread Thompson, David 
On Mon, Jul 20, 2015 at 9:22 PM, Christopher Allan Webber
cweb...@dustycloud.org wrote:
 Ludovic Courtès writes:

 Could you send an updated patch?

 TIA,
 Ludo’.

 Done!  And thank you!

Looks good!  I made some minor changes and pushed.

Thanks!

- Dave

Re: [PATCH 2/3] gnu: Add python-blinker

2015-07-26 Thread Thompson, David 
On Mon, Jul 20, 2015 at 9:21 PM, Christopher Allan Webber
cweb...@dustycloud.org wrote:
 Ludovic Courtès writes:

 Could you send an updated patch?

 Yep, below!

Pushed, thanks!

- Dave