(unknown),

(unknown),

[John Darrington]

In my opinion the changelog conventions are achronistic, unintuitive,
and bring benefit neither to developers nor users.

However thanks for showing me the correct format.

Updated patches follow

[PATCH 1/3] gnu: boost: New module

[John Darrington]

* gnu/packages/boost.scm  New file
* gnu-system.am (GNU_SYSTEM_MODULES): Add boost.scm
---
 gnu-system.am          |    1 +
 gnu/packages/boost.scm |   88 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+)
 create mode 100644 gnu/packages/boost.scm

diff --git a/gnu-system.am b/gnu-system.am
index e87f671..43b9457 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -40,6 +40,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/bdb.scm				\
   gnu/packages/bdw-gc.scm			\
   gnu/packages/bison.scm			\
+  gnu/packages/boost.scm			\
   gnu/packages/bootstrap.scm			\
   gnu/packages/cdrom.scm			\
   gnu/packages/cflow.scm			\
diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
new file mode 100644
index 0000000..3275fe0
--- /dev/null
+++ b/gnu/packages/boost.scm
@@ -0,0 +1,88 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 John Darrington <jmd@gnu.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; 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.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages boost)
+  #:use-module ((guix licenses)
+                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages tcsh)
+  #:use-module (gnu packages perl))
+
+(define-public boost
+  (package
+    (name "boost")
+    (version "1.55.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://sourceforge/boost/boost_"
+                    (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version)
+                    ".tar.bz2"))
+              (sha256
+               (base32
+                "0lkv5dzssbl5fmh2nkaszi8x9qbj80pr4acf9i26sj3rvlih1w7z"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("perl" ,perl)
+       ("python" ,python-2)
+       ("tcsh" ,tcsh)))
+    (arguments
+     `(#:phases
+       (alist-replace
+        'configure 
+        (lambda* (#:key outputs #:allow-other-keys) 
+          (let ((out (assoc-ref outputs "out")))
+            (substitute* '("libs/config/configure"
+                           "libs/spirit/classic/phoenix/test/runtest.sh"
+                           "tools/build/v2/doc/bjam.qbk"
+                           "tools/build/v2/engine/execunix.c"
+                           "tools/build/v2/engine/Jambase"
+                           "tools/build/v2/engine/jambase.c")
+              (("/bin/sh") (which "sh")))
+
+            (setenv "SHELL" (which "sh"))
+            (setenv "CONFIG_SHELL" (which "sh"))
+            
+            (zero? (system* "./bootstrap.sh" 
+                            (string-append "--prefix=" out) 
+                            "--with-toolset=gcc"))))
+        (alist-replace
+         'build
+         (lambda _
+           (zero? (system* "./b2" "threading=multi" "link=shared")))
+         
+         (alist-replace
+          'check
+          (lambda _ #t)
+          
+          (alist-replace
+           'install
+           (lambda _
+             (zero? (system* "./b2" "install" "threading=multi" "link=shared")))
+           %standard-phases))))))
+    
+    (home-page "http://boost.org")
+    (synopsis "Peer-reviewed portable C++ source libraries")
+    (description  "A collection of libraries intended to be widely useful, and
+usable across a broad spectrum of applications.") 
+    (license (license:x11-style "http://www.boost.org/LICENSE_1_0.txt" 
+             "Some components have other similar licences."))))
-- 
1.7.10.4

[PATCH 2/3] gnu: inkscape: New module

[John Darrington]

* gnu/packages/inkscape.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add inkscape.scm.
---
 gnu-system.am                                   |    2 +
 gnu/packages/inkscape.scm                       |   79 +++++++++++++++++++++++
 gnu/packages/patches/inkscape-stray-comma.patch |   13 ++++
 3 files changed, 94 insertions(+)
 create mode 100644 gnu/packages/inkscape.scm
 create mode 100644 gnu/packages/patches/inkscape-stray-comma.patch

diff --git a/gnu-system.am b/gnu-system.am
index 43b9457..33b29c9 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -110,6 +110,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/idutils.scm			\
   gnu/packages/imagemagick.scm			\
   gnu/packages/indent.scm			\
+  gnu/packages/inkscape.scm			\
   gnu/packages/irssi.scm			\
   gnu/packages/iso-codes.scm			\
   gnu/packages/kde.scm				\
@@ -270,6 +271,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \
   gnu/packages/patches/gtkglext-remove-pangox-dependency.patch  \
   gnu/packages/patches/hop-bigloo-4.0b.patch			\
+  gnu/packages/patches/inkscape-stray-comma.patch               \
   gnu/packages/patches/libevent-dns-tests.patch			\
   gnu/packages/patches/libffi-mips-n32-fix.patch		\
   gnu/packages/patches/liboop-mips64-deplibs-fix.patch		\
diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm
new file mode 100644
index 0000000..5837c32
--- /dev/null
+++ b/gnu/packages/inkscape.scm
@@ -0,0 +1,79 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 John Darrington <jmd@gnu.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; 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.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages inkscape)
+  #:use-module ((guix licenses)
+                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages aspell)
+  #:use-module (gnu packages bdw-gc)
+  #:use-module (gnu packages boost)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages maths)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages pdf)
+  #:use-module (gnu packages popt)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages xml)
+  #:use-module (gnu packages ghostscript)
+  #:use-module (gnu packages fontutils)
+  #:use-module (gnu packages libpng)
+  #:use-module (gnu packages pkg-config))
+
+(define-public inkscape
+  (package
+    (name "inkscape")
+    (version "0.48.4")
+    (source (origin
+              (method url-fetch)
+             (uri (string-append
+                   "mirror://sourceforge/inkscape/inkscape-" version ".tar.gz"))
+             (sha256
+              (base32
+               "0nhxsgrgsx6zrgpkd1akxjvmdqjp8ccnsvlwxh62l0brg84fw6bf"))
+             (patches (list (search-patch "inkscape-stray-comma.patch")))))
+    (build-system gnu-build-system)
+    (inputs 
+     `(("aspell" ,aspell) 
+       ("gtkmm" ,gtkmm-2)
+       ("gtk" ,gtk+-2)
+       ("gsl" ,gsl)
+       ("poppler" ,poppler)
+       ("libpng" ,libpng)
+       ("libxml2" ,libxml2)
+       ("libxslt" ,libxslt)
+       ("libgc" ,libgc)
+       ("freetype" ,freetype)
+       ("popt" ,popt)
+       ("python" ,python-2)
+       ("lcms" ,lcms)
+       ("boost" ,boost)))
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("perl" ,perl)
+       ("pkg-config" ,pkg-config)))
+    (home-page "http://inkscape.org/")
+    (synopsis "vector graphics editor")
+    (description "Inkscape is a free vector graphics editor similar to
+proprietary competitors. What sets Inkscape apart is its use of Scalable
+Vector Graphics (SVG), an open XML-based W3C standard, as the native format.")   
+    (license license:gpl2))) ;; Somewhat ambiguous whether v2 or v2+ is intended
diff --git a/gnu/packages/patches/inkscape-stray-comma.patch b/gnu/packages/patches/inkscape-stray-comma.patch
new file mode 100644
index 0000000..0b000d9
--- /dev/null
+++ b/gnu/packages/patches/inkscape-stray-comma.patch
@@ -0,0 +1,13 @@
+This is verbatim from Upstream:        http://bazaar.launchpad.net/~inkscape.dev/inkscape/RELEASE_0_48_BRANCH/diff/9943
+--- a/src/widgets/desktop-widget.h	2011-06-06 06:43:00 +0000
++++ b/src/widgets/desktop-widget.h	2013-01-05 14:34:09 +0000
+@@ -239,7 +239,7 @@
+ private:
+     GtkWidget *tool_toolbox;
+     GtkWidget *aux_toolbox;
+-    GtkWidget *commands_toolbox,;
++    GtkWidget *commands_toolbox;
+     GtkWidget *snap_toolbox;
+ 
+     static void init(SPDesktopWidget *widget);
+
-- 
1.7.10.4

Re: none

[Ludovic Courtès]

John Darrington <jmd@gnu.org> skribis:

> In my opinion the changelog conventions are achronistic, unintuitive,
> and bring benefit neither to developers nor users.

Well, opinions may vary.

It benefits me when I review other people’s patches, because it helps me
understand the structure of the change.  And it benefits me before I
commit something, because it forces me to review all of my patch, make
sure it’s consistent, make sure there’s no leftover, and giving me an
opportunity to add comments to code that appears non-obvious in
hindsight.

I think the rationale at
<http://www.gnu.org/prep/standards/standards.html#Change-Logs> still
holds.

Ludo’.

Re: [PATCH 1/3] gnu: boost: New module

[Ludovic Courtès]

John Darrington <jmd@gnu.org> skribis:

> * gnu/packages/boost.scm  New file
> * gnu-system.am (GNU_SYSTEM_MODULES): Add boost.scm

Applied with trailing whitespace removed, thanks!

Ludo’.

Re: [PATCH 2/3] gnu: inkscape: New module

[Ludovic Courtès]

John Darrington <jmd@gnu.org> skribis:

> * gnu/packages/inkscape.scm: New file.
> * gnu-system.am (GNU_SYSTEM_MODULES): Add inkscape.scm.

Cool, applied (added the missing part of the log, for the patch.)

> +    (synopsis "vector graphics editor")

I capitalized this.

> +    (description "Inkscape is a free vector graphics editor similar to
> +proprietary competitors. What sets Inkscape apart is its use of Scalable
> +Vector Graphics (SVG), an open XML-based W3C standard, as the native format.")   

I removed the “free” and the reference to proprietary competitors.

> +    (license license:gpl2))) ;; Somewhat ambiguous whether v2 or v2+ is intended

It’s actually GPLv2+ since the source files do not specify the version.

Thank you!

Ludo’.

Re: [PATCH 2/3] gnu: inkscape: New module

[John Darrington]

On Wed, Feb 05, 2014 at 12:09:02AM +0100, Ludovic Court??s wrote:
     
     > * gnu/packages/inkscape.scm: New file.
     > * gnu-system.am (GNU_SYSTEM_MODULES): Add inkscape.scm.
     
     Cool, applied (added the missing part of the log, for the patch.)
     
     > +    (synopsis "vector graphics editor")
     
     I capitalized this.

Sorry for not noticising these.
     
     > +    (description "Inkscape is a free vector graphics editor similar to
     > +proprietary competitors. What sets Inkscape apart is its use of Scalable
     > +Vector Graphics (SVG), an open XML-based W3C standard, as the native format.")   
     
     I removed the ???free??? and the reference to proprietary competitors.

Fair enough.  The blurb on the website mentions them by name. I decided to drop
the names.  If you want to omit any mention altogether, I don't have any objection.
     
     > +    (license license:gpl2))) ;; Somewhat ambiguous whether v2 or v2+ is intended
     
     It???s actually GPLv2+ since the source files do not specify the version.

It kind of does indirectly. It says "Under GPL - See the file COPYING" and
COPYING contains the text for v2.   I thought it safer to assume v2 only.
     
     

-- 
PGP Public key ID: 1024D/2DE827B3 
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.

Re: [PATCH 2/3] gnu: inkscape: New module

[Ludovic Courtès]

John Darrington <john@darrington.wattle.id.au> skribis:

> On Wed, Feb 05, 2014 at 12:09:02AM +0100, Ludovic Court??s wrote:

[...]

>      > +    (description "Inkscape is a free vector graphics editor similar to
>      > +proprietary competitors. What sets Inkscape apart is its use of Scalable
>      > +Vector Graphics (SVG), an open XML-based W3C standard, as the native format.")   
>      
>      I removed the ???free??? and the reference to proprietary competitors.
>
> Fair enough.  The blurb on the website mentions them by name. I decided to drop
> the names.  If you want to omit any mention altogether, I don't have any objection.

Yeah, what we agreed on long ago was to not mention “free” in
descriptions (or similar), because everything is free in the distro.
Also the GCS have long recommended against referring to non-free
software, and it clearly doesn’t bring much here (the situation may be
different for software that aims for interoperability with non-free
software, like LibreDWG or Octave.)

>      > +    (license license:gpl2))) ;; Somewhat ambiguous whether v2 or v2+ is intended
>      
>      It???s actually GPLv2+ since the source files do not specify the version.
>
> It kind of does indirectly. It says "Under GPL - See the file COPYING" and
> COPYING contains the text for v2.   I thought it safer to assume v2 only.

GPLv2 reads:

  If the Program does not specify a version number of this License, you
  may choose any version ever published by the Free Software Foundation.

Thanks,
Ludo’.

Re: [PATCH 2/3] gnu: inkscape: New module

[John Darrington]

On Wed, Feb 05, 2014 at 02:49:17PM +0100, Ludovic Court??s wrote:
     GPLv2 reads:
     
       If the Program does not specify a version number of this License, you
       may choose any version ever published by the Free Software Foundation.
     
Yes. I know.  - And in this case, the program DOES (indirectly) specify a version 
number, by refering to a file which contains a specific version.   But if you want
to interpret this differently, I won't argue.

J'


-- 
PGP Public key ID: 1024D/2DE827B3 
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.

Re: none

[Mark H Weaver]

ludo@gnu.org (Ludovic Courtès) writes:

> John Darrington <jmd@gnu.org> skribis:
>
>> In my opinion the changelog conventions are achronistic, unintuitive,
>> and bring benefit neither to developers nor users.
>
> Well, opinions may vary.
>
> It benefits me when I review other people’s patches, because it helps me
> understand the structure of the change.  And it benefits me before I
> commit something, because it forces me to review all of my patch, make
> sure it’s consistent, make sure there’s no leftover, and giving me an
> opportunity to add comments to code that appears non-obvious in
> hindsight.

I also find them very useful when digging through (possibly ancient)
commit history.  Although all the information is in the actual patch,
when looking through many commits it is much more convenient to read a
summary of the changes.  One summary line is not enough detail.

Of course, it's extra work to write these summaries, but IMO it's
worthwhile.

      Mark

> I think the rationale at
> <http://www.gnu.org/prep/standards/standards.html#Change-Logs> still
> holds.
>
> Ludo’.

Re: none

[John Darrington]

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

On Wed, Feb 05, 2014 at 11:17:25AM -0500, Mark H Weaver wrote:
     ludo@gnu.org (Ludovic Court??s) writes:
     
     > John Darrington <jmd@gnu.org> skribis:
     >
     >> In my opinion the changelog conventions are achronistic, unintuitive,
     >> and bring benefit neither to developers nor users.
     >
     > Well, opinions may vary.
     >
     > It benefits me when I review other people???s patches, because it helps me
     > understand the structure of the change.  And it benefits me before I
     > commit something, because it forces me to review all of my patch, make
     > sure it???s consistent, make sure there???s no leftover, and giving me an
     > opportunity to add comments to code that appears non-obvious in
     > hindsight.
     
     I also find them very useful when digging through (possibly ancient)
     commit history.  Although all the information is in the actual patch,
     when looking through many commits it is much more convenient to read a
     summary of the changes.  One summary line is not enough detail.
     
     Of course, it's extra work to write these summaries, but IMO it's
     worthwhile.

I don't object to the spending time of writing changelogs.  I just think the 
information that the GCS suggests is not helpful.  It is not usefull to say 
changed file foo.scm, because using git show that is obvious.  There is even a 
perl script out in the wild somewhere to generate exactly that.  Typing it 
in is redundant. 

What would be  useful (but in general) we don't put in the changelogs is WHY a
developer changed foo.scm  Put yourself in the shoes of a person investigating a
problem in 3 years' time.  He can see that developer fred did X.  He doesn't
need fred to tell him that.  What he needs is fred to explain his reasoning for 
doing X not a statement that he has done it.  That way he can make an informed
decision about which way to take the code now.
     
J'
     

-- 
PGP Public key ID: 1024D/2DE827B3 
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: none

[Ludovic Courtès]

John Darrington <john@darrington.wattle.id.au> skribis:

> I don't object to the spending time of writing changelogs.  I just think the 
> information that the GCS suggests is not helpful.  It is not usefull to say 
> changed file foo.scm, because using git show that is obvious.  There is even a 
> perl script out in the wild somewhere to generate exactly that.  Typing it 
> in is redundant. 
>
> What would be  useful (but in general) we don't put in the changelogs is WHY a
> developer changed foo.scm

I disagree.  90% of the time, if something needs explanation, then the
explanation belongs as comments in the code.  Well, I’m just
paraphrasing the GCS.

If you would like to propose amendments to the GCS, please use
bug-standards@gnu.org.

(Though I would instead recommend keeping up the good packaging work. ;-))

Thanks,
Ludo’.