Re: [PATCH] gnu: windowmaker: Fix invocation of 'wmsetbg'.
Kei Kebreau writes: > Marius Bakke writes: > >> Kei Kebreau writes: >> >>> This patch allows Window Maker to run wmsetbg properly instead of >>> showing an error as it has been. >>> From a113116da6f9f6574e9fde12e69a9d3acdc87769 Mon Sep 17 00:00:00 2001 >>> From: Kei Kebreau >>> Date: Sun, 23 Oct 2016 13:50:05 -0400 >>> Subject: [PATCH] gnu: windowmaker: Fix invocation of 'wmsetbg'. >>> >>> * gnu/packages/gnustep.scm (windowmaker)[arguments]: Add substitution of >>> 40-character limit with a 107-character limit. >>> --- >>> gnu/packages/gnustep.scm | 8 +++- >>> 1 file changed, 7 insertions(+), 1 deletion(-) >> >> I haven't tested this, but the diff looks reasonable. Good catch. Any >> chance you can submit this upstream as well? > > I could bring it up, but I'm not so sure that it would be a change worth > considering. The Window Maker mailing list is very low volume, and no > one seems to have complained about this. If it's okay with you, I'd like to push this change. I've heard nothing from upstream yet. signature.asc Description: PGP signature
[PATCH] gnu: Add denemo.
Here is an updated patch for GNU Denemo.
Everything seems fine except for grafting (i.e. disabling grafting
renders the issue invisible). For some reason, "find-files"
does not recognize a file with a Unicode-encoded filename when called
inside "rename-matching-files" from guix/build/graft.scm. When
"find-files" is used on its own, the file is recognized properly.
Is anyone familiar with the grafting code available to help figure out
what is happening to the file name?
Thank you.
From 6bd5843bef06a02ecf1235090350562c8b096aca Mon Sep 17 00:00:00 2001
From: Kei Kebreau
Date: Thu, 8 Dec 2016 14:00:43 -0500
Subject: [PATCH] gnu: Add denemo.
* gnu/packages/music.scm (denemo): New variable.
---
gnu/packages/music.scm | 59 ++
1 file changed, 59 insertions(+)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index b0ed51298..296f7cfd3 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -231,6 +231,65 @@ score, keyboard, guitar, drum and controller views.")
many input formats and provides a customisable Vi-style user interface.")
(license license:gpl2+)))
+(define-public denemo
+ (package
+(name "denemo")
+(version "2.0.14")
+(source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/denemo/denemo-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+"1a7g38695g7jjypx25qp0dx0asrh72xwdj0mdhmb9pfyzlppq0wh"
+(build-system gnu-build-system)
+(arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda _
+ (zero? (system* "make" "-C" "tests" "check")))
+(native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("glib:bin", glib "bin") ; for gtester
+ ("pkg-config" ,pkg-config)))
+(inputs
+ `(("alsa-lib" ,alsa-lib)
+ ("aubio" ,aubio)
+ ("evince" ,evince)
+ ("fftw" ,fftw)
+ ("fluidsynth" ,fluidsynth)
+ ("glib" ,glib)
+ ("gtk+" ,gtk+)
+ ("gtk-doc" ,gtk-doc)
+ ("gtksourceview" ,gtksourceview)
+ ("guile" ,guile-2.0)
+ ("intltool" ,intltool)
+ ("librsvg" ,librsvg)
+ ("libsndfile" ,libsndfile)
+ ("libtool" ,libtool)
+ ("libxml2" ,libxml2)
+ ("lilypond" ,lilypond)
+ ("portaudio" ,portaudio)
+ ("portmidi" ,portmidi)
+ ("rubberband" ,rubberband)))
+(synopsis "Graphical music notation, front-end to GNU Lilypond")
+(description
+ "GNU Denemo is a music notation editor that provides a convenient
+interface to the powerful music engraving program Lilypond. Music can be
+typed in using the computer keyboard, played in using a MIDI keyboard, or
+even input via a microphone connected to the sound card. The final product
+is publication-quality music notation that is continuously generated in the
+background while you work.")
+(home-page "http://www.denemo.org";)
+(license (list license:cc-by-sa3.0
+ license:lgpl2.1+
+ license:gpl2
+ license:gpl2+
+ license:gpl3
+ license:gpl3+
+
(define-public hydrogen
(package
(name "hydrogen")
--
2.11.0
signature.asc
Description: PGP signature
Re: cairo CVE-2016-9082
Efraim Flashner writes:
> The previous patch somehow stopped working for me, and I was getting
> complaints about unbound variable cairo/fixed, so I rewrote the patch to
> have every cairo use the patch separately.
>
>
> --
> Efraim Flashner אפרים פלשנר
> GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
> Confidentiality cannot be guaranteed on emails sent or received unencrypted
>
> From 14cdf8d6b0827912fd9bf8ec2a061d6eae3acd79 Mon Sep 17 00:00:00 2001
> From: Efraim Flashner
> Date: Mon, 28 Nov 2016 19:25:21 +0200
> Subject: [PATCH] gnu: cairo: Fix CVE-2016-9082.
>
> * gnu/packages/gtk.scm (cairo)[replacement]: New field.
> (cairo/fixed): New variable.
> (cairo-xcb)[source]: Use patch.
> [replacement]: Set false.
> * gnu/packages/pdf.scm (poppler)[inputs]: Custom cairo should be
> replaced by a new custom patched cairo.
> * gnu/packages/patches/cairo-CVE-2016-9082.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Register it.
> ---
> gnu/local.mk | 1 +
> gnu/packages/gtk.scm | 12 +++
> gnu/packages/patches/cairo-CVE-2016-9082.patch | 121
> +
> gnu/packages/pdf.scm | 11 +++
> 4 files changed, 145 insertions(+)
> create mode 100644 gnu/packages/patches/cairo-CVE-2016-9082.patch
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index c50ef25..ea8aa73 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -488,6 +488,7 @@ dist_patch_DATA =
> \
>%D%/packages/patches/binutils-loongson-workaround.patch\
>%D%/packages/patches/binutils-mips-bash-bug.patch \
>%D%/packages/patches/byobu-writable-status.patch \
> + %D%/packages/patches/cairo-CVE-2016-9082.patch \
>%D%/packages/patches/calibre-drop-unrar.patch \
>%D%/packages/patches/calibre-no-updates-dialog.patch \
>%D%/packages/patches/cdparanoia-fpic.patch \
> diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
> index 17bd9c9..8a258b5 100644
> --- a/gnu/packages/gtk.scm
> +++ b/gnu/packages/gtk.scm
> @@ -100,6 +100,7 @@ tools have full access to view and control running
> applications.")
> (define-public cairo
>(package
> (name "cairo")
> + (replacement cairo/fixed)
> (version "1.14.6")
> (source (origin
> (method url-fetch)
> @@ -153,6 +154,10 @@ affine transformation (scale, rotation, shear, etc.).")
>(package
> (inherit cairo)
> (name "cairo-xcb")
> +(source (origin
> + (inherit (package-source cairo))
> + (patches (search-patches "cairo-CVE-2016-9082.patch"
> +(replacement #f)
> (inputs
> `(("mesa" ,mesa)
> ,@(package-inputs cairo)))
> @@ -162,6 +167,13 @@ affine transformation (scale, rotation, shear, etc.).")
> '("--enable-xlib-xcb" "--enable-gl" "--enable-egl")))
> (synopsis "2D graphics library (with X11 support)")))
>
> +(define cairo/fixed
> + (package
> +(inherit cairo)
> +(source (origin
> + (inherit (package-source cairo))
> + (patches (search-patches "cairo-CVE-2016-9082.patch"))
> +
> (define-public harfbuzz
>(package
> (name "harfbuzz")
> diff --git a/gnu/packages/patches/cairo-CVE-2016-9082.patch
> b/gnu/packages/patches/cairo-CVE-2016-9082.patch
> new file mode 100644
> index 000..1dd57a0
> --- /dev/null
> +++ b/gnu/packages/patches/cairo-CVE-2016-9082.patch
> @@ -0,0 +1,121 @@
> +From: Adrian Johnson
> +Date: Thu, 20 Oct 2016 21:12:30 +1030
> +Subject: [PATCH] image: prevent invalid ptr access for > 4GB images
> +
> +Image data is often accessed using:
> +
> + image->data + y * image->stride
> +
> +On 64-bit achitectures if the image data is > 4GB, this computation
> +will overflow since both y and stride are 32-bit types.
> +
> +https://bugs.freedesktop.org/show_bug.cgi?id=98165
> +---
> + boilerplate/cairo-boilerplate.c | 4 +++-
> + src/cairo-image-compositor.c| 4 ++--
> + src/cairo-image-surface-private.h | 2 +-
> + src/cairo-mesh-pattern-rasterizer.c | 2 +-
> + src/cairo-png.c | 2 +-
> + src/cairo-script-surface.c | 3 ++-
> + 6 files changed, 10 insertions(+), 7 deletions(-)
> +
> +diff --git a/boilerplate/cairo-boilerplate.c
> b/boilerplate/cairo-boilerplate.c
> +index 7fdbf79..4804dea 100644
> +--- a/boilerplate/cairo-boilerplate.c
> b/boilerplate/cairo-boilerplate.c
> +@@ -42,6 +42,7 @@
> + #undef CAIRO_VERSION_H
> + #include "../cairo-version.h"
> +
> ++#include
> + #include
> + #include
> + #include
> +@@ -976,7 +977,8 @@ cairo_surface_t *
> + cairo_boilerplate_image_surface_create_from_ppm_stream (FILE *file)
> + {
> + char format;
> +-int width, height, stride;
> ++int width, height;
> ++ptrdiff_t stride;
> + int x, y;
> + unsigned char *data;
> + cairo_surface_t *image = NULL;
> +
Re: [PATCH 1/3] gnu: Add xdot.
Theodoros Foradis writes:
> * gnu/packages/graphviz.scm (xdot): New variable.
> ---
> gnu/packages/graphviz.scm | 52
> ++-
> 1 file changed, 51 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
> index 610bd16..a336183 100644
> --- a/gnu/packages/graphviz.scm
> +++ b/gnu/packages/graphviz.scm
> @@ -1,6 +1,7 @@
> ;;; GNU Guix --- Functional package management for GNU
> ;;; Copyright © 2013, 2015 Ludovic Courtès
> ;;; Copyright © 2015 Efraim Flashner
> +;;; Copyright © 2016 Theodoros Foradis
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -20,6 +21,7 @@
> (define-module (gnu packages graphviz)
>#:use-module (guix packages)
>#:use-module (guix build-system gnu)
> + #:use-module (guix build-system python)
>#:use-module (guix download)
>#:use-module (gnu packages xorg)
>#:use-module (gnu packages gtk)
> @@ -30,11 +32,14 @@
>#:use-module (gnu packages image)
>#:use-module (gnu packages autotools)
>#:use-module (gnu packages pkg-config)
> + #:use-module (gnu packages glib)
> + #:use-module (gnu packages gtk)
> + #:use-module (gnu packages gnome)
>#:use-module (gnu packages fontutils)
>#:use-module (gnu packages compression)
>#:use-module (gnu packages gd)
>#:use-module (gnu packages swig)
> - #:use-module ((guix licenses) #:select (lgpl2.0+ epl1.0)))
> + #:use-module ((guix licenses) #:select (lgpl2.0+ epl1.0 lgpl3+)))
>
> (define-public graphviz
>(package
> @@ -148,3 +153,48 @@ interfaces for other technical domains.")
> "Library intended to provide a set of useful functions to deal with
> 3D surfaces meshed with interconnected triangles.")
> (license lgpl2.0+)))
> +
> +(define-public xdot
> + (package
> +(name "xdot")
> +(version "0.7")
> +(source
> + (origin
> + (method url-fetch)
> + (uri (pypi-uri "xdot" version))
> + (sha256
> + (base32
> +"1q0f3pskb09saw1qkd2s6vmk80rq5zjhq8l93dfr2x6r04r0q46j"
> +(build-system python-build-system)
> +(arguments
> + `(#:phases
> + (modify-phases %standard-phases
> + ;; We wrap xdot, so that we don't propagate gtk+ and graphviz
> + (add-after 'install 'wrap
> + (lambda* (#:key inputs outputs #:allow-other-keys)
> + (wrap-program (string-append (assoc-ref outputs "out")
> "/bin/xdot")
> + `("GI_TYPELIB_PATH" ":" prefix
> + (,(string-append
> +(assoc-ref inputs "gtk+") "/lib/girepository-1.0"
> +":" (assoc-ref inputs "pango") "/lib/girepository-1.0"
> +":" (assoc-ref inputs "gdk-pixbuf")
> "/lib/girepository-1.0"
> +":" (assoc-ref inputs "atk") "/lib/girepository-1.0")))
> + `("PATH" ":" prefix
> + (,(string-append (assoc-ref inputs "graphviz") "/bin"
> + #t)
Adding #:configure-flags '("--single-version-externally-managed"
"--root=/") to the arguments list makes xdot's handling of the .egg
files reproducible.
> +(inputs
> + `(("atk" ,atk)
> + ("gdk-pixbuf" ,gdk-pixbuf+svg)
> + ("graphviz" ,graphviz)
> + ("gtk+" ,gtk+)
> + ("python-pycairo" ,python-pycairo)
> + ("python-pygobject" ,python-pygobject)))
> +(home-page "https://pypi.python.org/pypi/xdot";)
> +(synopsis
> + "Interactive viewer for graphviz dot files")
> +(description
> + "Xdot is an interactive viewer for graphs written in @code{graphviz}’s
> dot language.
> + It uses internally the xdot output format as an intermediate format,and
> @code{gtk} and
> +@code{cairo} for rendering. Xdot can be used either as a standalone
> application, or as
> +a python library.")
> +(license lgpl3+)))
Other than the comment above, LGTM. Is there someone more experienced
with Python packages who can double check this?
signature.asc
Description: PGP signature
Re: [PATCH 1/2] gnu: Add dnscrypt-wrapper.
Marius Bakke writes:
> Kei Kebreau writes:
>
>> Marius Bakke writes:
>>
>>> * gnu/packages/dns.scm (dnscrypt-wrapper): New variable.
>>> ---
>>> gnu/packages/dns.scm | 42 ++
>>> 1 file changed, 42 insertions(+)
>>>
>>> diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
>>> index b49a0b7..0c8c547 100644
>>> --- a/gnu/packages/dns.scm
>>> +++ b/gnu/packages/dns.scm
>>> @@ -6,6 +6,7 @@
>>> ;;; Copyright © 2016 John Darrington
>>> ;;; Copyright © 2016 ng0
>>> ;;; Copyright © 2016 Tobias Geerinckx-Rice
>>> +;;; Copyright © 2016 Marius Bakke
>>> ;;;
>>> ;;; This file is part of GNU Guix.
>>> ;;;
>>> @@ -26,7 +27,9 @@
>>>#:use-module (gnu packages autotools)
>>>#:use-module (gnu packages base)
>>>#:use-module (gnu packages databases)
>>> + #:use-module (gnu packages crypto)
>>>#:use-module (gnu packages groff)
>>> + #:use-module (gnu packages libevent)
>>>#:use-module (gnu packages linux)
>>>#:use-module (gnu packages perl)
>>>#:use-module (gnu packages pkg-config)
>>> @@ -134,6 +137,45 @@ high-volume and high-reliability applications. The
>>> name BIND stands for
>>> (home-page "https://www.isc.org/downloads/bind";)
>>> (license (list license:isc
>>>
>>> +(define-public dnscrypt-wrapper
>>> + (package
>>> +(name "dnscrypt-wrapper")
>>> +(version "0.2.2")
>>> +(source (origin
>>> + (method url-fetch)
>>> + (uri (string-append
>>> +"https://github.com/cofyc/dnscrypt-wrapper/releases";
>>> +"/download/v" version "/" name "-v" version
>>> ".tar.bz2"))
>>> + (sha256
>>> + (base32
>>> +"1vhg4g0r687f51wcdn7z9w1hxapazx6vyh5rsr8wa48sljzd583g"
>>> +(build-system gnu-build-system)
>>> +(arguments
>>> + `(#:make-flags '("CC=gcc")
>>> + ;; TODO: Tests require ruby-cucumber and ruby-aruba.
>>> + #:tests? #f
>>> + #:phases
>>> + (modify-phases %standard-phases
>>> + (add-before 'configure 'create-configure
>>> + (lambda _
>>> + (zero? (system* "make" "configure")))
>>> +(native-inputs
>>> + `(("autoconf" ,autoconf)))
>>> +(inputs
>>> + `(("libevent" ,libevent)
>>> + ("libsodium" ,libsodium)))
>>> +(home-page "https://github.com/Cofyc/dnscrypt-wrapper";)
>>> +(synopsis "Server-side dnscrypt proxy")
>>> +(description
>>> + "Dnscrypt-wrapper can turn any DNS resolver into a @code{dnscrypt}
>>> +compliant name server.")
>>> +(license (list license:isc
>>> + ;; Bundled argparse is MIT. TODO: package and unbundle.
>>> + license:expat
>>> + ;; dns-protocol.h and rfc1035.{c,h} is gpl2 or gpl3
>>> (either).
>>> + license:gpl2
>>> + license:gpl3
>>> +
>>> (define-public libasr
>>>(package
>>> (name "libasr")
>>
>> I'm not sure how to test the functionality of the software, but the
>> patch itself LGTM.
>
> To test it, follow the steps in the README on a remote machine:
>
> https://github.com/Cofyc/dnscrypt-wrapper#usage
>
> ..and set up dnscrypt-proxy on your local computer to talk to it. Then
> add 'nameserver 127.0.0.1' to resolv.conf.
>
> I'm currently using this to bypass a DNS filter, so I know it works ;-)
Thanks for the instructions. This works for me! :)
signature.asc
Description: PGP signature
Re: [PATCH 1/2] gnu: Add dnscrypt-wrapper.
Marius Bakke writes:
> * gnu/packages/dns.scm (dnscrypt-wrapper): New variable.
> ---
> gnu/packages/dns.scm | 42 ++
> 1 file changed, 42 insertions(+)
>
> diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
> index b49a0b7..0c8c547 100644
> --- a/gnu/packages/dns.scm
> +++ b/gnu/packages/dns.scm
> @@ -6,6 +6,7 @@
> ;;; Copyright © 2016 John Darrington
> ;;; Copyright © 2016 ng0
> ;;; Copyright © 2016 Tobias Geerinckx-Rice
> +;;; Copyright © 2016 Marius Bakke
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -26,7 +27,9 @@
>#:use-module (gnu packages autotools)
>#:use-module (gnu packages base)
>#:use-module (gnu packages databases)
> + #:use-module (gnu packages crypto)
>#:use-module (gnu packages groff)
> + #:use-module (gnu packages libevent)
>#:use-module (gnu packages linux)
>#:use-module (gnu packages perl)
>#:use-module (gnu packages pkg-config)
> @@ -134,6 +137,45 @@ high-volume and high-reliability applications. The name
> BIND stands for
> (home-page "https://www.isc.org/downloads/bind";)
> (license (list license:isc
>
> +(define-public dnscrypt-wrapper
> + (package
> +(name "dnscrypt-wrapper")
> +(version "0.2.2")
> +(source (origin
> + (method url-fetch)
> + (uri (string-append
> +"https://github.com/cofyc/dnscrypt-wrapper/releases";
> +"/download/v" version "/" name "-v" version ".tar.bz2"))
> + (sha256
> + (base32
> +"1vhg4g0r687f51wcdn7z9w1hxapazx6vyh5rsr8wa48sljzd583g"
> +(build-system gnu-build-system)
> +(arguments
> + `(#:make-flags '("CC=gcc")
> + ;; TODO: Tests require ruby-cucumber and ruby-aruba.
> + #:tests? #f
> + #:phases
> + (modify-phases %standard-phases
> + (add-before 'configure 'create-configure
> + (lambda _
> + (zero? (system* "make" "configure")))
> +(native-inputs
> + `(("autoconf" ,autoconf)))
> +(inputs
> + `(("libevent" ,libevent)
> + ("libsodium" ,libsodium)))
> +(home-page "https://github.com/Cofyc/dnscrypt-wrapper";)
> +(synopsis "Server-side dnscrypt proxy")
> +(description
> + "Dnscrypt-wrapper can turn any DNS resolver into a @code{dnscrypt}
> +compliant name server.")
> +(license (list license:isc
> + ;; Bundled argparse is MIT. TODO: package and unbundle.
> + license:expat
> + ;; dns-protocol.h and rfc1035.{c,h} is gpl2 or gpl3
> (either).
> + license:gpl2
> + license:gpl3
> +
> (define-public libasr
>(package
> (name "libasr")
I'm not sure how to test the functionality of the software, but the
patch itself LGTM.
signature.asc
Description: PGP signature
Re: [PATCH 0/1] Libarchive 3.2.2 update
Leo Famulari writes: > This patch updates libarchive to 3.2.2. Besides integrating our bug-fix > patches, this release fixes some other bugs, too: > > https://github.com/libarchive/libarchive/compare/v3.2.1...v3.2.2 > > It's a little more than we want to do on staging... > > Building the following 551 packages would ensure 1222 dependent packages > are rebuilt > Yes, this is pretty close. I'll let someone more experienced with the build farm determine where this should go. > Leo Famulari (1): > gnu: libarchive: Update to 3.2.2. > > gnu/local.mk | 4 - > gnu/packages/backup.scm| 9 +- > .../patches/libarchive-7zip-heap-overflow.patch| 77 > .../libarchive-fix-filesystem-attacks.patch| 445 > - > .../patches/libarchive-fix-symlink-check.patch | 60 --- > .../libarchive-safe_fprintf-buffer-overflow.patch | 44 -- > 6 files changed, 2 insertions(+), 637 deletions(-) > delete mode 100644 gnu/packages/patches/libarchive-7zip-heap-overflow.patch > delete mode 100644 > gnu/packages/patches/libarchive-fix-filesystem-attacks.patch > delete mode 100644 gnu/packages/patches/libarchive-fix-symlink-check.patch > delete mode 100644 > gnu/packages/patches/libarchive-safe_fprintf-buffer-overflow.patch LGTM. signature.asc Description: PGP signature
Re: [PATCH 1/1] gnu: cyrus-sasl: Fix CVE-2013-4122.
Leo Famulari writes: > On Sat, Nov 26, 2016 at 03:03:46PM -0500, Leo Famulari wrote: >> * gnu/packages/patches/cyrus-sasl-CVE-2013-4122.patch: New file. >> * gnu/local.mk (dist_patch_DATA): Add it. >> * gnu/packages/cyrus-sasl.scm (cyrus-sasl)[replacement]: New field. >> (cyrus-sasl/fixed): New variable. >> [source]: Use patch. > >> diff --git a/gnu/packages/patches/cyrus-sasl-CVE-2013-4122.patch >> b/gnu/packages/patches/cyrus-sasl-CVE-2013-4122.patch >> new file mode 100644 >> index 000..4e79947 >> --- /dev/null >> +++ b/gnu/packages/patches/cyrus-sasl-CVE-2013-4122.patch >> @@ -0,0 +1,130 @@ >> +Fix CVE-2013-4122. >> + >> +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-4122 >> + >> +Upstream patch: >> +https://cgit.cyrus.foundation/cyrus-sasl/patch/?id=dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d > > I forgot to update this URL to the new repo: > > https://github.com/cyrusimap/cyrus-sasl/commit/dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d > > I can't reach the cyrus.foundation repo. Neither can I. This patch looks good with the new repo! signature.asc Description: PGP signature
Re: [PATCH] gnu: Add espeak.
Marius Bakke writes:
> Kei Kebreau writes:
>
>> I think the patch works fine, but I'd love to hear comments about its
>> clarity.
>
> Hi! Thanks for this patch. The source includes a pre-compiled 32-bit
> version in "linux_32bit". Can you remove that with a source snippet?
>
>> From d1031c30c57eb6f292a91963801f87b419d8bee2 Mon Sep 17 00:00:00 2001
>> From: Kei Kebreau
>> Date: Mon, 21 Nov 2016 17:35:00 -0500
>> Subject: [PATCH] gnu: Add espeak.
>>
>> * gnu/packages/audio.scm (espeak): New variable.
>> ---
>> gnu/packages/audio.scm | 46 ++
>> 1 file changed, 46 insertions(+)
>>
>> diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
>> index 77d3b53..8aba416 100644
>> --- a/gnu/packages/audio.scm
>> +++ b/gnu/packages/audio.scm
>> @@ -343,6 +343,52 @@ tools (analyzer, mono/stereo tools, crossovers).")
>> ;; The plugins are released under LGPLv2.1+
>> (license (list license:lgpl2.1+ license:gpl2+
>>
>> +(define-public espeak
>> + (package
>> +(name "espeak")
>> +(version "1.48.04")
>> +(source (origin
>> + (method url-fetch)
>> + (uri (string-append "mirror://sourceforge/espeak/espeak-1.48/"
>
> Two comments: The URL should be
> "mirror://sourceforge/espeak/espeak/espeak-1.48" (note the extra
> "espeak").
>
> In addition, you can use the "version-major+minor" procedure instead of
> hard coding "1.48" here.
>
> Other than that this LGTM!
>
>> + "espeak-" version "-source.zip"))
>> + (sha256
>> + (base32
>> +"0n86gwh9pw0jqqpdz7mxggllfr8k0r7pc67ayy7w5z6z79kig6mz"
>> +(build-system gnu-build-system)
>> +(arguments
>> + `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs
>> "out"))
>> + (string-append "DATADIR="
>> + (assoc-ref %outputs "out")
>> + "/share/espeak-data")
>> + (string-append "LDFLAGS=-Wl,-rpath="
>> + (assoc-ref %outputs "out")
>> + "/lib")
>> + "AUDIO=pulseaudio")
>> + #:tests? #f ; no check target
>> + #:phases
>> + (modify-phases %standard-phases
>> + (replace 'configure
>> + (lambda _
>> + (chdir "src")
>> + ;; We use version 19 of the PortAudio library, so we must copy
>> the
>> + ;; corresponding file to be sure that espeak compiles
>> correctly.
>> + (copy-file "portaudio19.h" "portaudio.h")
>> + (substitute* "Makefile"
>> + (("/bin/ln") "ln"))
>> + #t)
>> + (inputs
>> +`(("portaudio" ,portaudio)
>> + ("pulseaudio" ,pulseaudio)))
>> + (native-inputs `(("unzip" ,unzip)))
>> + (home-page "http://espeak.sourceforge.net/";)
>> + (synopsis "Software speech synthesizer")
>> + (description "eSpeak is a software speech synthesizer for English and
>> +other languages. eSpeak uses a \"formant synthesis\" method. This allows
>> many
>> +languages to be provided in a small size. The speech is clear, and can be
>> used
>> +at high speeds, but is not as natural or smooth as larger synthesizers
>> which are
>> +based on human speech recordings.")
>> + (license license:gpl3+)))
>> +
>> (define-public infamous-plugins
>>(package
>> (name "infamous-plugins")
>> --
>> 2.10.2
>>
Thanks for the review! Pushed with your suggested changes. :)
signature.asc
Description: PGP signature
[PATCH] gnu: Add espeak.
I think the patch works fine, but I'd love to hear comments about its clarity. :-) 0001-gnu-Add-espeak.patch Description: tex/plain signature.asc Description: PGP signature
Re: [PATCH 1/1] gnu: libtiff: Fix CVE-2016-9297.
Leo Famulari writes:
> * gnu/packages/patches/libtiff-CVE-2016-9297.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add it.
> * gnu/packages/image.scm (libtiff/fixed)[source]: Use it.
> ---
> gnu/local.mk | 1 +
> gnu/packages/image.scm | 3 +-
> gnu/packages/patches/libtiff-CVE-2016-9297.patch | 52
>
> 3 files changed, 55 insertions(+), 1 deletion(-)
> create mode 100644 gnu/packages/patches/libtiff-CVE-2016-9297.patch
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index 08f99c4..513bd34 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -667,6 +667,7 @@ dist_patch_DATA =
> \
>%D%/packages/patches/libtiff-CVE-2016-5323.patch \
>%D%/packages/patches/libtiff-CVE-2016-5652.patch \
>%D%/packages/patches/libtiff-CVE-2016-9273.patch \
> + %D%/packages/patches/libtiff-CVE-2016-9297.patch \
>%D%/packages/patches/libtiff-oob-accesses-in-decode.patch \
>%D%/packages/patches/libtiff-oob-write-in-nextdecode.patch \
>%D%/packages/patches/libtool-skip-tests2.patch \
> diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
> index a40b212..d38344a 100644
> --- a/gnu/packages/image.scm
> +++ b/gnu/packages/image.scm
> @@ -300,7 +300,8 @@ collection of tools for doing simple manipulations of
> TIFF images.")
> "libtiff-CVE-2016-5321.patch"
> "libtiff-CVE-2016-5323.patch"
> "libtiff-CVE-2016-5652.patch"
> - "libtiff-CVE-2016-9273.patch"))
> + "libtiff-CVE-2016-9273.patch"
> + "libtiff-CVE-2016-9297.patch"))
>
> (define-public libwmf
>(package
> diff --git a/gnu/packages/patches/libtiff-CVE-2016-9297.patch
> b/gnu/packages/patches/libtiff-CVE-2016-9297.patch
> new file mode 100644
> index 000..c9207bb
> --- /dev/null
> +++ b/gnu/packages/patches/libtiff-CVE-2016-9297.patch
> @@ -0,0 +1,52 @@
> +Fix CVE-2016-9297:
> +
> +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-9297
> +http://bugzilla.maptools.org/show_bug.cgi?id=2590
> +
> +Patch copied from upstream source repository.
> +
> +2016-11-11 Even Rouault
> +
> +* libtiff/tif_dirread.c: in TIFFFetchNormalTag(), make sure that
> +values of tags with TIFF_SETGET_C16_ASCII / TIFF_SETGET_C32_ASCII
> +access are null terminated, to avoid potential read outside buffer
> +in _TIFFPrintField().
> +Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2590
> +
> +
> +/cvs/maptools/cvsroot/libtiff/ChangeLog,v <-- ChangeLog
> +new revision: 1.1154; previous revision: 1.1153
> +/cvs/maptools/cvsroot/libtiff/libtiff/tif_dirread.c,v <--
> +libtiff/tif_dirread.c
> +new revision: 1.203; previous revision: 1.202Index:
> libtiff/libtiff/tif_dirread.c
> +===
> +RCS file: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dirread.c,v
> +retrieving revision 1.202
> +retrieving revision 1.203
> +diff -u -r1.202 -r1.203
> +--- libtiff/libtiff/tif_dirread.c11 Nov 2016 20:01:55 - 1.202
> libtiff/libtiff/tif_dirread.c11 Nov 2016 20:22:01 - 1.203
> +@@ -5000,6 +5000,11 @@
> + if (err==TIFFReadDirEntryErrOk)
> + {
> + int m;
> ++if( data[dp->tdir_count-1] != '\0' )
> ++{
> ++
> TIFFWarningExt(tif->tif_clientdata,module,"ASCII value for tag \"%s\" does
> not end in null byte. Forcing it to be null",fip->field_name);
> ++data[dp->tdir_count-1] = '\0';
> ++}
> +
> m=TIFFSetField(tif,dp->tdir_tag,(uint16)(dp->tdir_count),data);
> + if (data!=0)
> + _TIFFfree(data);
> +@@ -5172,6 +5177,11 @@
> + if (err==TIFFReadDirEntryErrOk)
> + {
> + int m;
> ++if( data[dp->tdir_count-1] != '\0' )
> ++{
> ++TIFFWarningExt(tif->tif_clientdata,module,"ASCII
> value for tag \"%s\" does not end in null byte. Forcing it to be
> null",fip->field_name);
> ++data[dp->tdir_count-1] = '\0';
> ++}
> +
> m=TIFFSetField(tif,dp->tdir_tag,(uint32)(dp->tdir_count),data);
> + if (data!=0)
> + _TIFFfree(data);
LGTM.
signature.asc
Description: PGP signature
Re: [PATCH 1/1] gnu: libtiff: Fix some buffer overflows.
Leo Famulari writes:
> * gnu/packages/patches/libtiff-uint32-overflow.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add it.
> * gnu/packages/image.scm (libtiff/fixed)[source]: Use it.
> ---
> gnu/local.mk | 1 +
> gnu/packages/image.scm | 1 +
> gnu/packages/patches/libtiff-uint32-overflow.patch | 102
> +
> 3 files changed, 104 insertions(+)
> create mode 100644 gnu/packages/patches/libtiff-uint32-overflow.patch
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index 513bd34..1c27767 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -670,6 +670,7 @@ dist_patch_DATA =
> \
>%D%/packages/patches/libtiff-CVE-2016-9297.patch \
>%D%/packages/patches/libtiff-oob-accesses-in-decode.patch \
>%D%/packages/patches/libtiff-oob-write-in-nextdecode.patch \
> + %D%/packages/patches/libtiff-uint32-overflow.patch \
>%D%/packages/patches/libtool-skip-tests2.patch \
>%D%/packages/patches/libunwind-CVE-2015-3239.patch \
>%D%/packages/patches/libupnp-CVE-2016-6255.patch \
> diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
> index d38344a..7458f4e 100644
> --- a/gnu/packages/image.scm
> +++ b/gnu/packages/image.scm
> @@ -291,6 +291,7 @@ collection of tools for doing simple manipulations of
> TIFF images.")
>(patches (search-patches
> "libtiff-oob-accesses-in-decode.patch"
> "libtiff-oob-write-in-nextdecode.patch"
> + "libtiff-uint32-overflow.patch"
> "libtiff-CVE-2015-8665+CVE-2015-8683.patch"
> "libtiff-CVE-2016-3623.patch"
> "libtiff-CVE-2016-3945.patch"
> diff --git a/gnu/packages/patches/libtiff-uint32-overflow.patch
> b/gnu/packages/patches/libtiff-uint32-overflow.patch
> new file mode 100644
> index 000..b9b1bc2
> --- /dev/null
> +++ b/gnu/packages/patches/libtiff-uint32-overflow.patch
> @@ -0,0 +1,102 @@
> +Fix some buffer overflows:
> +
> +http://seclists.org/oss-sec/2016/q4/
> +http://bugzilla.maptools.org/show_bug.cgi?id=2592
> +
> +2016-11-11 Even Rouault
> +
> +* tools/tiffcrop.c: fix multiple uint32 overflows in
> +writeBufferToSeparateStrips(), writeBufferToContigTiles() and
> +writeBufferToSeparateTiles() that could cause heap buffer
> +overflows.
> +Reported by Henri Salo from Nixu Corporation.
> +Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2592
> +
> +
> +/cvs/maptools/cvsroot/libtiff/ChangeLog,v <-- ChangeLog
> +new revision: 1.1152; previous revision: 1.1151
> +/cvs/maptools/cvsroot/libtiff/tools/tiffcrop.c,v <-- tools/tiffcrop.c
> +new revision: 1.43; previous revision: 1.42
> +
> +===
> +RCS file: /cvs/maptools/cvsroot/libtiff/tools/tiffcrop.c,v
> +retrieving revision 1.42
> +retrieving revision 1.43
> +diff -u -r1.42 -r1.43
> +--- libtiff/tools/tiffcrop.c 14 Oct 2016 19:13:20 - 1.42
> libtiff/tools/tiffcrop.c 11 Nov 2016 19:33:06 - 1.43
> +@@ -148,6 +148,8 @@
> + #define PATH_MAX 1024
> + #endif
> +
> ++#define TIFF_UINT32_MAX 0xU
> ++
> + #ifndef streq
> + #define streq(a,b) (strcmp((a),(b)) == 0)
> + #endif
> +@@ -1164,7 +1166,24 @@
> + (void) TIFFGetFieldDefaulted(out, TIFFTAG_ROWSPERSTRIP, &rowsperstrip);
> + (void) TIFFGetField(out, TIFFTAG_BITSPERSAMPLE, &bps);
> + bytes_per_sample = (bps + 7) / 8;
> +- rowsize = ((bps * spp * width) + 7) / 8; /* source has interleaved
> samples */
> ++ if( width == 0 ||
> ++ (uint32)bps * (uint32)spp > TIFF_UINT32_MAX / width ||
> ++ bps * spp * width > TIFF_UINT32_MAX - 7U )
> ++ {
> ++ TIFFError(TIFFFileName(out),
> ++"Error, uint32 overflow when computing (bps * spp * width) +
> 7");
> ++ return 1;
> ++ }
> ++ rowsize = ((bps * spp * width) + 7U) / 8; /* source has interleaved
> samples */
> ++ if( bytes_per_sample == 0 ||
> ++ rowsperstrip > TIFF_UINT32_MAX / bytes_per_sample ||
> ++ rowsperstrip * bytes_per_sample > TIFF_UINT32_MAX / (width + 1) )
> ++ {
> ++ TIFFError(TIFFFileName(out),
> ++"Error, uint32 overflow when computing rowsperstrip * "
> ++"bytes_per_sample * (width + 1)");
> ++ return 1;
> ++ }
> + rowstripsize = rowsperstrip * bytes_per_sample * (width + 1);
> +
> + obuf = _TIFFmalloc (rowstripsize);
> +@@ -1251,11 +1270,19 @@
> + }
> + }
> +
> ++ if( imagewidth == 0 ||
> ++ (uint32)bps * (uint32)spp > TIFF_UINT32_MAX / imagewidth ||
> ++ bps * spp * imagewidth > TIFF_UINT32_MAX - 7U )
> ++ {
> ++ TIFFError(TIFFFileName(out),
> ++"Error, uint32 overflow when computing (imagewidth * bps * spp)
> + 7");
> ++ return 1;
> ++ }
> ++ src_rowsize =
Re: Libtiff buffer overflow fix
Leo Famulari writes: > This patch fixes a buffer overflow in libtiff: > > http://bugzilla.maptools.org/show_bug.cgi?id=2587 > http://seclists.org/oss-sec/2016/q4/381 > > There is no CVE ID assigned yet. LGTM! signature.asc Description: PGP signature
Re: Libxslt CVE-2016-4738
Marius Bakke writes: > Leo Famulari writes: > >> Here is a patch to fix CVE-2016-4738 in libxslt. >> From 1cbfeb5bb98924eddf1726fe56987fd1d282e7f8 Mon Sep 17 00:00:00 2001 >> From: Leo Famulari >> Date: Tue, 8 Nov 2016 17:12:01 -0500 >> Subject: [PATCH] gnu: libxslt: Fix CVE-2016-4738. >> >> * gnu/packages/patches/libxslt-CVE-2016-4738.patch: New file. >> * gnu/local.mk (dist_patch_DATA): Add it. >> * gnu/packages/xml.scm (libxslt)[replacement]: New field. >> (libxslt/fixed): New variable. > > Yay, more grafts ;) Aw yeah! > > Anyway, LGTM, thanks! LGTM as well! signature.asc Description: PGP signature
Re: [PATCH] gnu: w3m: Switch to Debian's actively maintained fork of w3m.
Leo Famulari writes: > On Fri, Nov 04, 2016 at 01:05:02PM -0400, Kei Kebreau wrote: >> From 1eede14194c83b70725b6de062b9d3e0acce6340 Mon Sep 17 00:00:00 2001 >> From: Kei Kebreau >> Date: Fri, 4 Nov 2016 12:43:28 -0400 >> Subject: [PATCH] gnu: w3m: Switch to Debian's actively maintained fork of >> w3m. >> >> Fixes some security issues seen here: >> <http://www.openwall.com/lists/oss-security/2016/11/03/3> >> >> * gnu/packages/w3m.scm (w3m): Switch it. >> [source]: Use Debian's git tree. Remove obsolete patches. >> [arguments]: Remove unnecessary modification of %standard-phases. >> * gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch, >> gnu/packages/patches/w3m-disable-weak-ciphers.patch, >> gnu/packages/patches/w3m-force-ssl_verify_server-on.patch, >> gnu/packages/patches/w3m-libgc.patch: Delete files. >> * gnu/local.mk (dist_patch_DATA): Remove them. > >> + (let ((commit "5cf75248f5833db00d53a33c30a525bb40f5512b") >> +(revision "1")) ; Guix package revision >> +(package >> + (name "w3m") >> + (version (string-append "0.5.3-" revision "." (string-take commit 7))) >> + (source (origin >> +(method git-fetch) >> +;; Debian's fork of w3m is the only one that is still >> +;; maintained. >> +(uri (git-reference >> + (url >> "https://anonscm.debian.org/cgit/collab-maint/w3m.git";) >> + (commit commit))) > > We can just use the Git tag as the version and the commit, like in this > stale package: > > https://github.com/lfam/pkgs/blob/master/leo/packages/w3m-debian.scm > > I think that's simpler. > > Looks good with this change :) Is this good? From 674a0f955809d40c2fe3e5092b2927c4c96e8351 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 4 Nov 2016 20:06:03 -0400 Subject: [PATCH] gnu: w3m: Switch to Debian's actively maintained fork of w3m. Fixes some security issues seen here: <http://www.openwall.com/lists/oss-security/2016/11/03/3> * gnu/packages/w3m.scm (w3m): Switch it. [source]: Use Debian's git tree. Remove obsolete patches. [arguments]: Remove an unneeded substitute* function. * gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch, gnu/packages/patches/w3m-disable-weak-ciphers.patch, gnu/packages/patches/w3m-force-ssl_verify_server-on.patch, gnu/packages/patches/w3m-libgc.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/local.mk | 4 --- .../patches/w3m-disable-sslv2-and-sslv3.patch | 24 .../patches/w3m-disable-weak-ciphers.patch | 24 .../patches/w3m-force-ssl_verify_server-on.patch | 24 gnu/packages/patches/w3m-libgc.patch | 28 -- gnu/packages/w3m.scm | 33 +- 6 files changed, 13 insertions(+), 124 deletions(-) delete mode 100644 gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch delete mode 100644 gnu/packages/patches/w3m-disable-weak-ciphers.patch delete mode 100644 gnu/packages/patches/w3m-force-ssl_verify_server-on.patch delete mode 100644 gnu/packages/patches/w3m-libgc.patch diff --git a/gnu/local.mk b/gnu/local.mk index 27848ac..49b6721 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -891,10 +891,6 @@ dist_patch_DATA = \ %D%/packages/patches/vte-CVE-2012-2738-pt1.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt2.patch \ %D%/packages/patches/vtk-mesa-10.patch \ - %D%/packages/patches/w3m-libgc.patch \ - %D%/packages/patches/w3m-force-ssl_verify_server-on.patch\ - %D%/packages/patches/w3m-disable-sslv2-and-sslv3.patch \ - %D%/packages/patches/w3m-disable-weak-ciphers.patch \ %D%/packages/patches/weechat-python.patch\ %D%/packages/patches/weex-vacopy.patch \ %D%/packages/patches/wicd-bitrate-none-fix.patch \ diff --git a/gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch b/gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch deleted file mode 100644 index 5b78f2d..000 --- a/gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch +++ /dev/null @@ -1,24 +0,0 @@ -Subject: Disable SSLv2 and SSLv3. - -The only remaining methods are TLSv1.* (the code never distinguishes -between TLSv1.0, TLSv1.1, and TLSv1.2). - fm.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fm.h b/fm.h -index 320906c..ddcd4fc 100644 a/fm.h -+++ b/fm.h -@@ -1144,7 +1144,7 @@ global in
Re: Add libidn2
Leo Famulari writes: > Libidn2 is a GNU internationalized domain name (IDN) processing library > implementing the IDNA2008 specification (libidn implements IDNA2003). > > This library is ostensibly used by the most recent release of curl, > although the curl maintainer has suggested distributors disable IDN > support altogether for now: > > https://curl.haxx.se/mail/lib-2016-11/0033.html > > In any case, here is a package definition for the latest libidn2 > release. LGTM! signature.asc Description: PGP signature
Re: [PATCH] gnu: w3m: Switch to Debian's actively maintained fork of w3m.
From 1eede14194c83b70725b6de062b9d3e0acce6340 Mon Sep 17 00:00:00 2001
From: Kei Kebreau
Date: Fri, 4 Nov 2016 12:43:28 -0400
Subject: [PATCH] gnu: w3m: Switch to Debian's actively maintained fork of w3m.
Fixes some security issues seen here:
<http://www.openwall.com/lists/oss-security/2016/11/03/3>
* gnu/packages/w3m.scm (w3m): Switch it.
[source]: Use Debian's git tree. Remove obsolete patches.
[arguments]: Remove unnecessary modification of %standard-phases.
* gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch,
gnu/packages/patches/w3m-disable-weak-ciphers.patch,
gnu/packages/patches/w3m-force-ssl_verify_server-on.patch,
gnu/packages/patches/w3m-libgc.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Remove them.
---
gnu/local.mk | 4 -
.../patches/w3m-disable-sslv2-and-sslv3.patch | 24 --
.../patches/w3m-disable-weak-ciphers.patch | 24 --
.../patches/w3m-force-ssl_verify_server-on.patch | 24 --
gnu/packages/patches/w3m-libgc.patch | 28 ---
gnu/packages/w3m.scm | 89 ++
6 files changed, 42 insertions(+), 151 deletions(-)
delete mode 100644 gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch
delete mode 100644 gnu/packages/patches/w3m-disable-weak-ciphers.patch
delete mode 100644 gnu/packages/patches/w3m-force-ssl_verify_server-on.patch
delete mode 100644 gnu/packages/patches/w3m-libgc.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index a23d536..a34d8ae 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -891,10 +891,6 @@ dist_patch_DATA =
\
%D%/packages/patches/vte-CVE-2012-2738-pt1.patch \
%D%/packages/patches/vte-CVE-2012-2738-pt2.patch \
%D%/packages/patches/vtk-mesa-10.patch \
- %D%/packages/patches/w3m-libgc.patch \
- %D%/packages/patches/w3m-force-ssl_verify_server-on.patch\
- %D%/packages/patches/w3m-disable-sslv2-and-sslv3.patch \
- %D%/packages/patches/w3m-disable-weak-ciphers.patch \
%D%/packages/patches/weechat-python.patch\
%D%/packages/patches/weex-vacopy.patch \
%D%/packages/patches/wicd-bitrate-none-fix.patch \
diff --git a/gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch
b/gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch
deleted file mode 100644
index 5b78f2d..000
--- a/gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Subject: Disable SSLv2 and SSLv3.
-
-The only remaining methods are TLSv1.* (the code never distinguishes
-between TLSv1.0, TLSv1.1, and TLSv1.2).
- fm.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fm.h b/fm.h
-index 320906c..ddcd4fc 100644
a/fm.h
-+++ b/fm.h
-@@ -1144,7 +1144,7 @@ global int ssl_path_modified init(FALSE);
- #endif/* defined(USE_SSL) &&
-* defined(USE_SSL_VERIFY) */
- #ifdef USE_SSL
--global char *ssl_forbid_method init(NULL);
-+global char *ssl_forbid_method init("2, 3");
- #endif
-
- global int is_redisplay init(FALSE);
---
-2.6.4
-
diff --git a/gnu/packages/patches/w3m-disable-weak-ciphers.patch
b/gnu/packages/patches/w3m-disable-weak-ciphers.patch
deleted file mode 100644
index 4780d54..000
--- a/gnu/packages/patches/w3m-disable-weak-ciphers.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Subject: Disable weak ciphers
-
-Disable RC4, "export ciphers", and all keys < 128 bits.
-
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/w3m/+bug/1325674
- url.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/url.c b/url.c
-index ed6062e..e86b1f3 100644
a/url.c
-+++ b/url.c
-@@ -326,6 +326,7 @@ openSSLHandle(int sock, char *hostname, char **p_cert)
- SSL_load_error_strings();
- if (!(ssl_ctx = SSL_CTX_new(SSLv23_client_method(
- goto eend;
-+ SSL_CTX_set_cipher_list(ssl_ctx, "DEFAULT:!LOW:!RC4:!EXP");
- option = SSL_OP_ALL;
- if (ssl_forbid_method) {
- if (strchr(ssl_forbid_method, '2'))
---
-2.6.4
-
diff --git a/gnu/packages/patches/w3m-force-ssl_verify_server-on.patch
b/gnu/packages/patches/w3m-force-ssl_verify_server-on.patch
deleted file mode 100644
index dc9f117..000
--- a/gnu/packages/patches/w3m-force-ssl_verify_server-on.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Subject: Force ssl_verify_server on.
-
-By default, SSL/TLS certificates are not verified. This enables the
-verification.
- fm.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fm.h b/fm.h
-index 8378939..320906c 100644
a/fm.h
-+++ b/fm.h
-@@ -1135,7 +1135,7 @@ global int view_unseenobject init(TRUE);
- #endif
-
- #if defined(USE_SSL) && defined(USE_SSL_VERIFY)
--global int ssl_verify_s
Re: [PATCH] gnu: chromium-bsu: Update to 0.9.16.1.
Leo Famulari writes: > On Fri, Nov 04, 2016 at 11:21:26AM -0400, Kei Kebreau wrote: >> Upstream Chromium B.S.U. fixed some issues in the code. Our package >> definition is simpler as a result. > > LGTM! Excellent! Pushed as 08722837b048e7d0b416e414f7e695a380e7784b. signature.asc Description: PGP signature
[PATCH] gnu: chromium-bsu: Update to 0.9.16.1.
Upstream Chromium B.S.U. fixed some issues in the code. Our package
definition is simpler as a result.
From 08722837b048e7d0b416e414f7e695a380e7784b Mon Sep 17 00:00:00 2001
From: Kei Kebreau
Date: Fri, 4 Nov 2016 11:17:09 -0400
Subject: [PATCH] gnu: chromium-bsu: Update to 0.9.16.1.
* gnu/packages/games.scm (chromium-bsu): Update to 0.9.16.1.
[arguments]: Remove 'set-sdl-paths phase.
[inputs]: Add gnu-gettext.
---
gnu/packages/games.scm | 15 ---
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 941e3a0..a663396 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2563,7 +2563,7 @@ in strikes against the evil corporation.")
(define-public chromium-bsu
(package
(name "chromium-bsu")
-(version "0.9.15.1")
+(version "0.9.16.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/" name
@@ -2571,18 +2571,11 @@ in strikes against the evil corporation.")
name "-" version ".tar.gz"))
(sha256
(base32
-"01c4mki0rpz6wrqbf18fj4vd7axln5v0xqm80cyksbv63g04s6w6"
+"0jk2w5b6s6nkzri585bbz16cif2fhqcnl5l1mq3rd98r9nil3hd1"
(build-system gnu-build-system)
-(arguments
- `(#:phases (modify-phases %standard-phases
- (add-after 'set-paths 'set-sdl-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (setenv "CPATH"
- (string-append (assoc-ref inputs
"sdl-union")
- "/include/SDL"))
- #t)
(native-inputs `(("pkg-config" ,pkg-config)))
-(inputs `(("glu" ,glu)
+(inputs `(("gettext" ,gnu-gettext)
+ ("glu" ,glu)
("quesoglc" ,quesoglc)
("sdl-union" ,(sdl-union (list sdl sdl-image sdl-mixer)
(home-page "http://chromium-bsu.sourceforge.net/";)
--
2.10.2
signature.asc
Description: PGP signature
Re: [PATCH] gnu: w3m: Switch to Debian's actively maintained fork of w3m.
l...@gnu.org (Ludovic Courtès) writes: > Leo Famulari skribis: > >> On Thu, Nov 03, 2016 at 10:17:18PM -0500, Eric Bavier wrote: >>> On Thu, 03 Nov 2016 18:54:55 -0400 >>> Kei Kebreau wrote: >>> >>> > From b837111e3ddf406a3b9235538f63af678e3ac741 Mon Sep 17 00:00:00 2001 >>> > From: Kei Kebreau >>> > Date: Thu, 3 Nov 2016 17:58:48 -0400 >>> > Subject: [PATCH] gnu: w3m: Switch to Debian's actively maintained fork of >>> > w3m. >>> > >>> > Fixes some security issues seen here: >>> > <http://www.openwall.com/lists/oss-security/2016/11/03/3> >>> > >>> > * gnu/packages/patches/w3m-upstream-20120522.patch: New file. >>> > * gnu/packages/patches/w3m-debian-updates.patch: New file. >>> > * gnu/packages/w3m.scm (w3m): Switch to Debian's actively maintained >>> > fork of w3m. >>> > [source]: Use Debian's tarball and patches. Remove obsolete patches. >>> > [arguments]: Remove unnecessary modification of %standard-phases. >>> > * gnu/local.mk (dist_patch_DATA): Register new patches. Remove obsolete >>> > patches. >>> > --- >>> > gnu/local.mk | 6 +- >>> > gnu/packages/patches/w3m-debian-updates.patch | 28498 >>> > +++ >>> >>> So theirs is the only actively maintained version of w3m and all they >>> can provide is a 28.5 thousand line patch? No VCS repository? There >>> must be some point at which it would be better for us to fetch the >>> patch in an origin rather than importing it into our repo. >> >> I think we build from their Git repo: >> >> https://anonscm.debian.org/cgit/collab-maint/w3m.git >> >> They even offer non-Debian-ized release tags, such as >> . > > Then we should use that instead of importing all the patches in our own > repo, IMO. > > Kei: would that work for you? > > Thanks, > Ludo’. Here it is! From cc7a61d61160817ceb395b648b18c885175441e8 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 4 Nov 2016 10:48:53 -0400 Subject: [PATCH] gnu: w3m: Switch to Debian's actively maintained fork of w3m. Fixes some security issues seen here: <http://www.openwall.com/lists/oss-security/2016/11/03/3> * gnu/packages/w3m.scm (w3m): Switch to Debian's actively maintained fork of w3m. [source]: Use Debian's git tree. Remove obsolete patches. [arguments]: Remove unnecessary modification of %standard-phases. * gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch: Delete file. * gnu/packages/patches/w3m-disable-weak-ciphers.patch: Delete file. * gnu/packages/patches/w3m-force-ssl_verify_server-on.patch: Delete file. * gnu/packages/patches/w3m-libgc.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/local.mk | 4 --- .../patches/w3m-disable-sslv2-and-sslv3.patch | 24 -- .../patches/w3m-disable-weak-ciphers.patch | 24 -- .../patches/w3m-force-ssl_verify_server-on.patch | 24 -- gnu/packages/patches/w3m-libgc.patch | 28 gnu/packages/w3m.scm | 38 +++--- 6 files changed, 11 insertions(+), 131 deletions(-) delete mode 100644 gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch delete mode 100644 gnu/packages/patches/w3m-disable-weak-ciphers.patch delete mode 100644 gnu/packages/patches/w3m-force-ssl_verify_server-on.patch delete mode 100644 gnu/packages/patches/w3m-libgc.patch diff --git a/gnu/local.mk b/gnu/local.mk index a23d536..a34d8ae 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -891,10 +891,6 @@ dist_patch_DATA = \ %D%/packages/patches/vte-CVE-2012-2738-pt1.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt2.patch \ %D%/packages/patches/vtk-mesa-10.patch \ - %D%/packages/patches/w3m-libgc.patch \ - %D%/packages/patches/w3m-force-ssl_verify_server-on.patch\ - %D%/packages/patches/w3m-disable-sslv2-and-sslv3.patch \ - %D%/packages/patches/w3m-disable-weak-ciphers.patch \ %D%/packages/patches/weechat-python.patch\ %D%/packages/patches/weex-vacopy.patch \ %D%/packages/patches/wicd-bitrate-none-fix.patch \ diff --git a/gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch b/gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch deleted file mode 100644 index 5b78f2d..000 --- a/gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch +++ /dev
Re: [PATCH] gnu: w3m: Switch to Debian's actively maintained fork of w3m.
l...@gnu.org (Ludovic Courtès) writes: > Leo Famulari skribis: > >> On Thu, Nov 03, 2016 at 10:17:18PM -0500, Eric Bavier wrote: >>> On Thu, 03 Nov 2016 18:54:55 -0400 >>> Kei Kebreau wrote: >>> >>> > From b837111e3ddf406a3b9235538f63af678e3ac741 Mon Sep 17 00:00:00 2001 >>> > From: Kei Kebreau >>> > Date: Thu, 3 Nov 2016 17:58:48 -0400 >>> > Subject: [PATCH] gnu: w3m: Switch to Debian's actively maintained >>> > fork of w3m. >>> > >>> > Fixes some security issues seen here: >>> > <http://www.openwall.com/lists/oss-security/2016/11/03/3> >>> > >>> > * gnu/packages/patches/w3m-upstream-20120522.patch: New file. >>> > * gnu/packages/patches/w3m-debian-updates.patch: New file. >>> > * gnu/packages/w3m.scm (w3m): Switch to Debian's actively maintained >>> > fork of w3m. >>> > [source]: Use Debian's tarball and patches. Remove obsolete patches. >>> > [arguments]: Remove unnecessary modification of %standard-phases. >>> > * gnu/local.mk (dist_patch_DATA): Register new patches. Remove obsolete >>> > patches. >>> > --- >>> > gnu/local.mk | 6 +- >>> > gnu/packages/patches/w3m-debian-updates.patch | 28498 >>> > +++ >>> >>> So theirs is the only actively maintained version of w3m and all they >>> can provide is a 28.5 thousand line patch? No VCS repository? There >>> must be some point at which it would be better for us to fetch the >>> patch in an origin rather than importing it into our repo. >> >> I think we build from their Git repo: >> >> https://anonscm.debian.org/cgit/collab-maint/w3m.git >> >> They even offer non-Debian-ized release tags, such as >> . > > Then we should use that instead of importing all the patches in our own > repo, IMO. > > Kei: would that work for you? > > Thanks, > Ludo’. It seems simple enough. I'll give it a go. signature.asc Description: PGP signature
Re: [PATCH] gnu: Add libjxr.
l...@gnu.org (Ludovic Courtès) writes: > Kei Kebreau skribis: > >> l...@gnu.org (Ludovic Courtès) writes: >> >>> Leo Famulari skribis: >>> >>>> On Sat, Oct 22, 2016 at 04:33:18AM -0400, Kei Kebreau wrote: >>> >>> [...] >>> >>>>> >> diff --git a/gnu/packages/patches/libjxr-use-cmake.patch >>>>> >> b/gnu/packages/patches/libjxr-use-cmake.patch >>>>> >> new file mode 100644 >>>>> >> index 000..cb5919e >>>>> >> --- /dev/null >>>>> >> +++ b/gnu/packages/patches/libjxr-use-cmake.patch >>>>> >> @@ -0,0 +1,143 @@ >>>>> >> +Description: Prefer a cmake based build system >>>>> >> +Author: Mathieu Malaterre >>>>> >> +Forwarded: https://jxrlib.codeplex.com/discussions/440294 >>>>> > >>>>> > Why doesn't upstream's build system work? >>>>> >>>>> Upstream's build system simply doesn't have configuration or >>>>> installation targets in the provided Makefile. Using the cmake patch >>>>> makes the definition cleaner at the cost of relying on outside work >>>>> [1]. If this is not acceptable, I can see about writing manual >>>>> replacement phases to the best of my ability. >>>>> >>>>> [1]: https://jxrlib.codeplex.com/discussions/440294 >>>> >>>> Hm, not an ideal situation. >>>> >>>> If Debian is using this patch, we should link to it's source on Debian's >>>> site instead of this message board. I don't know enough about CMake to >>>> judge the patch but I'd be more comfortable if Debian was using it. >>>> >>>> What do others think? >>> >>> Regarding the choice between writing our own installation phase in >>> Scheme and using this CMake thing instead, I think we should choose the >>> most concise approach (in terms of lines of code). >>> >>> If the winner here is the CMake patch, then indeed, we should take the >>> patch from Debian rather than from a message board (and include >>> provenance information in the patch, as you wrote.) >>> >>> That said, I suspect an ‘install’ phase in Scheme would be more concise >>> than this new CMakeLists.txt (134 lines). >>> >>> Kei: WDYT? >>> >> >> I have been working on writing our own installation phase, and it looks >> like it will be more concise. > > Cool, thanks! > >> However, the patches need to be in DOS format to apply. The patch >> doesn't seem to carry these line returns, which leads me to believe >> that a standard git configuration won't accept them. Is there way >> around this? > > But that’s unrelated to removing the CMakeLists.txt patch and adding > your own install phase, right? :-) > > From the description I’m not sure exactly what the problem is, but > perhaps the ‘--binary’ option of ‘patch’ can help? You can specify it > in ‘patch-flags’: > > https://www.gnu.org/software/guix/manual/html_node/origin-Reference.html > > Ludo’. I ended up using the '--binary' flag, but the libjxr patches still need to be converted to DOS format to function properly. The current procedure to get this patch running is: $ git am 0001-gnu-Add-libjxr.patch [whitespace complaints] $ sed -i -e 's/\r*$/\r/' gnu/packages/patches/libjxr-fix-* $ ./pre-inst-env guix build libjxr The DOS formatting issue also keeps me from using 'substitute*' to patch the Makefile to build both a shared and static version of the library. The current package only builds a static version. Everything seems to link properly for now, but I don't know if that will be required in the future. From 316a4f7a676bf6b8cc7a8f8795b74fa0ebab3e36 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 30 Oct 2016 11:05:30 -0400 Subject: [PATCH] gnu: Add libjxr. * gnu/packages/images.scm (libjxr): New variable. * gnu/packages/patches/libjxr-fix-function-signature.patch: New file. * gnu/packages/patches/libjxr-fix-typos.patch: New file. * gnu/local.mk (dist_patch_DATA): Register patches. --- gnu/local.mk | 2 + gnu/packages/image.scm | 54 ++ .../patches/libjxr-fix-function-signature.patch| 16 +++ gnu/packages/patches/libjxr-fix-typos.patch| 29 4 files changed, 101 insertions(+) create mode 100644 gnu/packages/patches/libjxr-fix-function-signature.patch create mode 100644 gnu/pac
Re: [PATCH] gnu: Add libjxr.
l...@gnu.org (Ludovic Courtès) writes: > Leo Famulari skribis: > >> On Sat, Oct 22, 2016 at 04:33:18AM -0400, Kei Kebreau wrote: > > [...] > >>> >> diff --git a/gnu/packages/patches/libjxr-use-cmake.patch >>> >> b/gnu/packages/patches/libjxr-use-cmake.patch >>> >> new file mode 100644 >>> >> index 000..cb5919e >>> >> --- /dev/null >>> >> +++ b/gnu/packages/patches/libjxr-use-cmake.patch >>> >> @@ -0,0 +1,143 @@ >>> >> +Description: Prefer a cmake based build system >>> >> +Author: Mathieu Malaterre >>> >> +Forwarded: https://jxrlib.codeplex.com/discussions/440294 >>> > >>> > Why doesn't upstream's build system work? >>> >>> Upstream's build system simply doesn't have configuration or >>> installation targets in the provided Makefile. Using the cmake patch >>> makes the definition cleaner at the cost of relying on outside work >>> [1]. If this is not acceptable, I can see about writing manual >>> replacement phases to the best of my ability. >>> >>> [1]: https://jxrlib.codeplex.com/discussions/440294 >> >> Hm, not an ideal situation. >> >> If Debian is using this patch, we should link to it's source on Debian's >> site instead of this message board. I don't know enough about CMake to >> judge the patch but I'd be more comfortable if Debian was using it. >> >> What do others think? > > Regarding the choice between writing our own installation phase in > Scheme and using this CMake thing instead, I think we should choose the > most concise approach (in terms of lines of code). > > If the winner here is the CMake patch, then indeed, we should take the > patch from Debian rather than from a message board (and include > provenance information in the patch, as you wrote.) > > That said, I suspect an ‘install’ phase in Scheme would be more concise > than this new CMakeLists.txt (134 lines). > > Kei: WDYT? > I have been working on writing our own installation phase, and it looks like it will be more concise. However, the patches need to be in DOS format to apply. The patch doesn't seem to carry these line returns, which leads me to believe that a standard git configuration won't accept them. Is there way around this? > Thanks! > > Ludo’. signature.asc Description: PGP signature
Re: [PATCH] gnu: windowmaker: Fix invocation of 'wmsetbg'.
Marius Bakke writes: > Kei Kebreau writes: > >> This patch allows Window Maker to run wmsetbg properly instead of >> showing an error as it has been. >> From a113116da6f9f6574e9fde12e69a9d3acdc87769 Mon Sep 17 00:00:00 2001 >> From: Kei Kebreau >> Date: Sun, 23 Oct 2016 13:50:05 -0400 >> Subject: [PATCH] gnu: windowmaker: Fix invocation of 'wmsetbg'. >> >> * gnu/packages/gnustep.scm (windowmaker)[arguments]: Add substitution of >> 40-character limit with a 107-character limit. >> --- >> gnu/packages/gnustep.scm | 8 +++- >> 1 file changed, 7 insertions(+), 1 deletion(-) > > I haven't tested this, but the diff looks reasonable. Good catch. Any > chance you can submit this upstream as well? I could bring it up, but I'm not so sure that it would be a change worth considering. The Window Maker mailing list is very low volume, and no one seems to have complained about this. signature.asc Description: PGP signature
Re: [PATCH] gnu: mupdf: Fix CVE-2016-8674.
Mark H Weaver writes: > Leo Famulari writes: > >> On Tue, Oct 25, 2016 at 12:53:28PM -0400, Kei Kebreau wrote: >>> Fix for >>> https://blogs.gentoo.org/ago/2016/09/22/mupdf-use-after-free-in-pdf_to_num-pdf-object-c/. >> >>> From 97312c3c9e13688081aa513d1c94a9fff1274f75 Mon Sep 17 00:00:00 2001 >>> From: Kei Kebreau >>> Date: Tue, 25 Oct 2016 12:49:52 -0400 >>> Subject: [PATCH] gnu: mupdf: Fix CVE-2016-8674. >>> >>> * gnu/packages/patches/mupdf-CVE-2016-8674.patch: New file. >>> * gnu/local.mk (dist_patch_DATA): Add it. >>> * gnu/packages/pdf.scm (mupdf): Use it. >> >> Thank you, please push! > > mupdf-CVE-2016-8674.patch fails to apply: > > https://hydra.gnu.org/build/1581228/nixlog/2/tail-reload > > Kei, did you test this? > > Mark I did not. It was a bad slip up, as I tested all of the rest of my patches today. I'll be significantly more careful with future security commits. Is it frowned upon to revert that commit on its own (it's the third to last commit as I write this), or should I attempt to patch on top of it? signature.asc Description: PGP signature
Re: [PATCH] gnu: imagemagick: Update to 7.0.3-4 [Fixes CVE-2016-{8677, 8862}].
Leo Famulari writes:
> On Tue, Oct 25, 2016 at 04:12:50PM -0400, Kei Kebreau wrote:
>> From 82f792a33f55e6514d3d4f8285e9be3b8c6e161a Mon Sep 17 00:00:00 2001
>> From: Kei Kebreau
>> Date: Tue, 25 Oct 2016 16:03:26 -0400
>> Subject: [PATCH] gnu: imagemagick: Update to 7.0.3-4 [Fixes
>> CVE-2016-{8677,8862}].
>>
>> * gnu/packages/imagemagick.scm (imagemagick): Update to 7.0.3-4.
>
> So far, we've packaged ImageMagick 6, which is still maintained.
> Apparently the API changed in 7. I don't know the status of adoption of
> the new version.
>
>> See:
>> https://blogs.gentoo.org/ago/2016/10/07/imagemagick-memory-allocate-failure-in-acquirequantumpixels-quantum-c
>
> On the ImageMagick-6 branch, this was fixed in
> 524349d2b3fed7fa0e53de2c908458474eb24418 and released as 6.9.5-10.
>
> http://git.imagemagick.org/repos/ImageMagick/commit/524349d2b3fed7fa0e53de2c908458474eb24418
>
>> and
>> https://blogs.gentoo.org/ago/2016/10/17/imagemagick-memory-allocation-failure-in-acquiremagickmemory-memory-c/.
>
> I don't see this fix on the 6 branch, but a similar change was made
> earlier in 3c9533980a9476caa649de3b248dfefd3f182866 and released in
> 6.9.4-0.
Well, I guess we were fine to begin with!
signature.asc
Description: PGP signature
[PATCH] gnu: imagemagick: Update to 7.0.3-4 [Fixes CVE-2016-{8677, 8862}].
See:
https://blogs.gentoo.org/ago/2016/10/07/imagemagick-memory-allocate-failure-in-acquirequantumpixels-quantum-c
and
https://blogs.gentoo.org/ago/2016/10/17/imagemagick-memory-allocation-failure-in-acquiremagickmemory-memory-c/.
From 82f792a33f55e6514d3d4f8285e9be3b8c6e161a Mon Sep 17 00:00:00 2001
From: Kei Kebreau
Date: Tue, 25 Oct 2016 16:03:26 -0400
Subject: [PATCH] gnu: imagemagick: Update to 7.0.3-4 [Fixes
CVE-2016-{8677,8862}].
* gnu/packages/imagemagick.scm (imagemagick): Update to 7.0.3-4.
---
gnu/packages/imagemagick.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index 4c3c636..0a95920 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -43,14 +43,14 @@
(define-public imagemagick
(package
(name "imagemagick")
-(version "6.9.6-2")
+(version "7.0.3-4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://imagemagick/ImageMagick-"
version ".tar.xz"))
(sha256
(base32
- "139h9lycxw3lszn052m34xm0rqyanin4nb529vxjcrkkzqilh91r"
+ "1jj7w9cg9qim0ib880mb4mxhd007045h721hm6318ayyfx0g18c6"
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch")
--
2.10.1
signature.asc
Description: PGP signature
Re: [PATCH] gnu: qemu: Patch CVE-2016-8910.
Leo Famulari writes: > On Tue, Oct 25, 2016 at 01:27:45PM -0400, Kei Kebreau wrote: >> One of the email address was hidden on the list I got this patch from. >> I don't know whether that's a potential problem. >> See: >> http://www.openwall.com/lists/oss-security/2016/10/24/2 and >> https://lists.gnu.org/archive/html/qemu-devel/2016-10/msg05495.html > > The patch doesn't appear to have been pushed to the QEMU Git repo yet. > > http://git.qemu.org/?p=qemu.git > > Let's wait for that in order to be sure the patch is correct. Plus, > then we'll be able to see that email address. > > I expect that to happen soon. Sounds good. :-) signature.asc Description: PGP signature
[PATCH] gnu: windowmaker: Fix invocation of 'wmsetbg'.
This patch allows Window Maker to run wmsetbg properly instead of
showing an error as it has been.
From a113116da6f9f6574e9fde12e69a9d3acdc87769 Mon Sep 17 00:00:00 2001
From: Kei Kebreau
Date: Sun, 23 Oct 2016 13:50:05 -0400
Subject: [PATCH] gnu: windowmaker: Fix invocation of 'wmsetbg'.
* gnu/packages/gnustep.scm (windowmaker)[arguments]: Add substitution of
40-character limit with a 107-character limit.
---
gnu/packages/gnustep.scm | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm
index 6c365cb..8f72bb3 100644
--- a/gnu/packages/gnustep.scm
+++ b/gnu/packages/gnustep.scm
@@ -60,7 +60,13 @@
(string-append "\"" bin "/wmaker.inst")))
(substitute* '("src/defaults.c" "WPrefs.app/Menu.c")
(("\"wmsetbg")
-(string-append "\"" bin "/wmsetbg")
+(string-append "\"" bin "/wmsetbg")))
+ ;; Add enough cells to the command character array to
+ ;; allow passing our large path to the wmsetbg binary.
+ ;; The path to wmsetbg in Guix requires 67 extra
characters.
+ (substitute* "src/defaults.c"
+ (("len = strlen\\(text\\) \\+ 40;")
+(string-append "len = strlen(text) + 107;")
(alist-cons-after
'install 'wrap
(lambda* (#:key outputs #:allow-other-keys)
--
2.10.1
signature.asc
Description: PGP signature
Re: [PATCH] gnu: qemu: Patch CVE-2016-8910.
Kei Kebreau writes:
> Kei Kebreau writes:
>
>> One of the email address was hidden on the list I got this patch from.
>> I don't know whether that's a potential problem.
>> See:
>> http://www.openwall.com/lists/oss-security/2016/10/24/2 and
>> https://lists.gnu.org/archive/html/qemu-devel/2016-10/msg05495.html
>
> Also, I just noticed an issue with the patch I submitted. Any advice on
> getting valid patches from online mailing list archives?
BTW, I just fixed the issue. It appears that inline patches can get
messed up in replies.
From a99ba6e18e063c08b0069fd59d98023427cb96aa Mon Sep 17 00:00:00 2001
From: Kei Kebreau
Date: Tue, 25 Oct 2016 13:42:23 -0400
Subject: [PATCH] gnu: qemu: Patch CVE-2016-8910.
* gnu/packages/qemu.scm (qemu)[source]: Add patch.
* gnu/packages/patches/qemu-CVE-2016-8910.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
---
gnu/local.mk | 1 +
gnu/packages/patches/qemu-CVE-2016-8910.patch | 30 +++
gnu/packages/qemu.scm | 3 ++-
3 files changed, 33 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/qemu-CVE-2016-8910.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index ff2d976..5577b69 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -814,6 +814,7 @@ dist_patch_DATA =
\
%D%/packages/patches/qemu-CVE-2016-8576.patch\
%D%/packages/patches/qemu-CVE-2016-8577.patch\
%D%/packages/patches/qemu-CVE-2016-8578.patch\
+ %D%/packages/patches/qemu-CVE-2016-8910.patch\
%D%/packages/patches/qt4-ldflags.patch \
%D%/packages/patches/quickswitch-fix-dmenu-check.patch \
%D%/packages/patches/rapicorn-isnan.patch\
diff --git a/gnu/packages/patches/qemu-CVE-2016-8910.patch
b/gnu/packages/patches/qemu-CVE-2016-8910.patch
new file mode 100644
index 000..7033c42
--- /dev/null
+++ b/gnu/packages/patches/qemu-CVE-2016-8910.patch
@@ -0,0 +1,30 @@
+From: Prasad J Pandit
+
+RTL8139 ethernet controller in C+ mode supports multiple
+descriptor rings, each with maximum of 64 descriptors. While
+processing transmit descriptor ring in 'rtl8139_cplus_transmit',
+it does not limit the descriptor count and runs forever. Add
+check to avoid it.
+
+Reported-by: Andrew Henderson
+Signed-off-by: Prasad J Pandit
+---
+ hw/net/rtl8139.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
+index 3345bc6..f05e59c 100644
+--- a/hw/net/rtl8139.c
b/hw/net/rtl8139.c
+@@ -2350,7 +2350,7 @@ static void rtl8139_cplus_transmit(RTL8139State *s)
+ {
+ int txcount = 0;
+
+-while (rtl8139_cplus_transmit_one(s))
++while (txcount < 64 && rtl8139_cplus_transmit_one(s))
+ {
+ ++txcount;
+ }
+--
+2.7.4
+
diff --git a/gnu/packages/qemu.scm b/gnu/packages/qemu.scm
index 9bf8c3a..a386426 100644
--- a/gnu/packages/qemu.scm
+++ b/gnu/packages/qemu.scm
@@ -79,7 +79,8 @@
"0lqyz01z90nvxpc3nx4djbci7hx62cwvs5zwd6phssds0sap6vij"))
(patches (search-patches "qemu-CVE-2016-8576.patch"
"qemu-CVE-2016-8577.patch"
- "qemu-CVE-2016-8578.patch"
+ "qemu-CVE-2016-8578.patch"
+ "qemu-CVE-2016-8910.patch"
(build-system gnu-build-system)
(arguments
'(;; Running tests in parallel can occasionally lead to failures, like:
--
2.10.1
signature.asc
Description: PGP signature
Re: [PATCH] gnu: qemu: Patch CVE-2016-8910.
Kei Kebreau writes: > One of the email address was hidden on the list I got this patch from. > I don't know whether that's a potential problem. > See: > http://www.openwall.com/lists/oss-security/2016/10/24/2 and > https://lists.gnu.org/archive/html/qemu-devel/2016-10/msg05495.html Also, I just noticed an issue with the patch I submitted. Any advice on getting valid patches from online mailing list archives? signature.asc Description: PGP signature
[PATCH] gnu: qemu: Patch CVE-2016-8910.
One of the email address was hidden on the list I got this patch from.
I don't know whether that's a potential problem.
See:
http://www.openwall.com/lists/oss-security/2016/10/24/2 and
https://lists.gnu.org/archive/html/qemu-devel/2016-10/msg05495.html
From 4bc4920a96481d5c1a5c7f42cf3ec573f5096d39 Mon Sep 17 00:00:00 2001
From: Kei Kebreau
Date: Tue, 25 Oct 2016 13:24:09 -0400
Subject: [PATCH] gnu: qemu: Patch CVE-2016-8910.
* gnu/packages/qemu.scm (qemu)[source]: Add patch.
* gnu/packages/patches/qemu-CVE-2016-8910.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
---
gnu/local.mk | 1 +
gnu/packages/patches/qemu-CVE-2016-8910.patch | 28 +++
gnu/packages/qemu.scm | 3 ++-
3 files changed, 31 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/qemu-CVE-2016-8910.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index ff2d976..5577b69 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -814,6 +814,7 @@ dist_patch_DATA =
\
%D%/packages/patches/qemu-CVE-2016-8576.patch\
%D%/packages/patches/qemu-CVE-2016-8577.patch\
%D%/packages/patches/qemu-CVE-2016-8578.patch\
+ %D%/packages/patches/qemu-CVE-2016-8910.patch\
%D%/packages/patches/qt4-ldflags.patch \
%D%/packages/patches/quickswitch-fix-dmenu-check.patch \
%D%/packages/patches/rapicorn-isnan.patch\
diff --git a/gnu/packages/patches/qemu-CVE-2016-8910.patch
b/gnu/packages/patches/qemu-CVE-2016-8910.patch
new file mode 100644
index 000..7a38b3c
--- /dev/null
+++ b/gnu/packages/patches/qemu-CVE-2016-8910.patch
@@ -0,0 +1,28 @@
+From: Prasad J Pandit
+
+RTL8139 ethernet controller in C+ mode supports multiple
+descriptor rings, each with maximum of 64 descriptors. While
+processing transmit descriptor ring in 'rtl8139_cplus_transmit',
+it does not limit the descriptor count and runs forever. Add
+check to avoid it.
+
+Reported-by: Andrew Henderson
+Signed-off-by: Prasad J Pandit
+---
+ hw/net/rtl8139.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
+index 3345bc6..f05e59c 100644
+--- a/hw/net/rtl8139.c
b/hw/net/rtl8139.c
+@@ -2350,7 +2350,7 @@ static void rtl8139_cplus_transmit(RTL8139State *s)
+ {
+ int txcount = 0;
+- while (rtl8139_cplus_transmit_one(s))
+
++while (txcount < 64 && rtl8139_cplus_transmit_one(s))
+ {
+ ++txcount;
+ }
+
diff --git a/gnu/packages/qemu.scm b/gnu/packages/qemu.scm
index 9bf8c3a..a386426 100644
--- a/gnu/packages/qemu.scm
+++ b/gnu/packages/qemu.scm
@@ -79,7 +79,8 @@
"0lqyz01z90nvxpc3nx4djbci7hx62cwvs5zwd6phssds0sap6vij"))
(patches (search-patches "qemu-CVE-2016-8576.patch"
"qemu-CVE-2016-8577.patch"
- "qemu-CVE-2016-8578.patch"
+ "qemu-CVE-2016-8578.patch"
+ "qemu-CVE-2016-8910.patch"
(build-system gnu-build-system)
(arguments
'(;; Running tests in parallel can occasionally lead to failures, like:
--
2.10.1
signature.asc
Description: PGP signature
[PATCH] gnu: mupdf: Fix CVE-2016-8674.
Fix for
https://blogs.gentoo.org/ago/2016/09/22/mupdf-use-after-free-in-pdf_to_num-pdf-object-c/.
From 97312c3c9e13688081aa513d1c94a9fff1274f75 Mon Sep 17 00:00:00 2001
From: Kei Kebreau
Date: Tue, 25 Oct 2016 12:49:52 -0400
Subject: [PATCH] gnu: mupdf: Fix CVE-2016-8674.
* gnu/packages/patches/mupdf-CVE-2016-8674.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/pdf.scm (mupdf): Use it.
---
gnu/local.mk | 1 +
gnu/packages/patches/mupdf-CVE-2016-8674.patch | 166 +
gnu/packages/pdf.scm | 3 +-
3 files changed, 169 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/mupdf-CVE-2016-8674.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 0d400e9..53c2bda 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -711,6 +711,7 @@ dist_patch_DATA =
\
%D%/packages/patches/mupdf-build-with-openjpeg-2.1.patch \
%D%/packages/patches/mupdf-CVE-2016-6265.patch \
%D%/packages/patches/mupdf-CVE-2016-6525.patch \
+ %D%/packages/patches/mupdf-CVE-2016-8674.patch \
%D%/packages/patches/mupen64plus-ui-console-notice.patch \
%D%/packages/patches/musl-CVE-2016-8859.patch\
%D%/packages/patches/mutt-store-references.patch \
diff --git a/gnu/packages/patches/mupdf-CVE-2016-8674.patch
b/gnu/packages/patches/mupdf-CVE-2016-8674.patch
new file mode 100644
index 000..62e4a02
--- /dev/null
+++ b/gnu/packages/patches/mupdf-CVE-2016-8674.patch
@@ -0,0 +1,166 @@
+Fix CVE-2016-8674 (use-after-free in pdf_to_num()).
+
+https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-8674
+https://security-tracker.debian.org/tracker/CVE-2016-8674
+
+Patch copied from upstream source repository:
+http://git.ghostscript.com/?p=mupdf.git;h=1e03c06456d997435019fb3526fa2d4be7dbc6ec
+
+diff --git a/include/mupdf/pdf/document.h b/include/mupdf/pdf/document.h
+index aabf05f..0078c4a 100644
+--- a/include/mupdf/pdf/document.h
b/include/mupdf/pdf/document.h
+@@ -269,6 +269,10 @@ struct pdf_document_s
+ fz_hash_table *images;
+ fz_hash_table *fonts;
+ } resources;
++
++ int orphans_max;
++ int orphans_count;
++ pdf_obj **orphans;
+ };
+
+ /*
+diff --git a/include/mupdf/pdf/object.h b/include/mupdf/pdf/object.h
+index 5bc3dca..bf57455 100644
+--- a/include/mupdf/pdf/object.h
b/include/mupdf/pdf/object.h
+@@ -110,6 +110,7 @@ pdf_obj *pdf_dict_gets(fz_context *ctx, pdf_obj *dict,
const char *key);
+ pdf_obj *pdf_dict_getsa(fz_context *ctx, pdf_obj *dict, const char *key,
const char *abbrev);
+ void pdf_dict_put(fz_context *ctx, pdf_obj *dict, pdf_obj *key, pdf_obj *val);
+ void pdf_dict_put_drop(fz_context *ctx, pdf_obj *dict, pdf_obj *key, pdf_obj
*val);
++void pdf_dict_get_put_drop(fz_context *ctx, pdf_obj *dict, pdf_obj *key,
pdf_obj *val, pdf_obj **old_val);
+ void pdf_dict_puts(fz_context *ctx, pdf_obj *dict, const char *key, pdf_obj
*val);
+ void pdf_dict_puts_drop(fz_context *ctx, pdf_obj *dict, const char *key,
pdf_obj *val);
+ void pdf_dict_putp(fz_context *ctx, pdf_obj *dict, const char *path, pdf_obj
*val);
+diff --git a/source/pdf/pdf-object.c b/source/pdf/pdf-object.c
+index b4e33f3..1c19ba4 100644
+--- a/source/pdf/pdf-object.c
b/source/pdf/pdf-object.c
+@@ -1265,11 +1265,14 @@ pdf_dict_geta(fz_context *ctx, pdf_obj *obj, pdf_obj
*key, pdf_obj *abbrev)
+ return pdf_dict_get(ctx, obj, abbrev);
+ }
+
+-void
+-pdf_dict_put(fz_context *ctx, pdf_obj *obj, pdf_obj *key, pdf_obj *val)
++static void
++pdf_dict_get_put(fz_context *ctx, pdf_obj *obj, pdf_obj *key, pdf_obj *val,
pdf_obj **old_val)
+ {
+ int i;
+
++ if (old_val)
++ *old_val = NULL;
++
+ RESOLVE(obj);
+ if (!OBJ_IS_DICT(obj))
+ fz_throw(ctx, FZ_ERROR_GENERIC, "not a dict (%s)",
pdf_objkindstr(obj));
+@@ -1295,7 +1298,10 @@ pdf_dict_put(fz_context *ctx, pdf_obj *obj, pdf_obj
*key, pdf_obj *val)
+ {
+ pdf_obj *d = DICT(obj)->items[i].v;
+ DICT(obj)->items[i].v = pdf_keep_obj(ctx, val);
+- pdf_drop_obj(ctx, d);
++ if (old_val)
++ *old_val = d;
++ else
++ pdf_drop_obj(ctx, d);
+ }
+ }
+ else
+@@ -1316,10 +1322,27 @@ pdf_dict_put(fz_context *ctx, pdf_obj *obj, pdf_obj
*key, pdf_obj *val)
+ }
+
+ void
++pdf_dict_put(fz_context *ctx, pdf_obj *obj, pdf_obj *key, pdf_obj *val)
++{
++ pdf_dict_get_put(ctx, obj, key, val, NULL);
++}
++
++void
+ pdf_dict_put_drop(fz_context *ctx, pdf_obj *obj, pdf_obj *key, pdf_obj *val)
+ {
+ fz_try(ctx)
+- pdf_dict_put(ctx, obj, key, val);
++ pdf_dict_get_put(ctx, obj, key, val, NULL);
++
Re: [PATCH] gnu: Add dbacl.
ng0 writes: > [PATCH] gnu: Add dbacl. > > Since the discussion we had about 2 weeks ago, I decided to just > remove the last occurence of the dbacl-jap.* this way it builds and > tests succeed. > > Why have I packaged this? Maybe it was needed for "afew", I'm really > not sure. The checkout is called guix-afew, the branch was 3 months > behind. What I meant to send in those last two messages (brain glitch, sorry) is that the patch looks good. Just make sure to remove the controversially licensed files in a snippet so 'guix build -S dbacl' returns only the "guaranteed free" source code. Also, the linter said to replace gpl-3 in the license field with gpl3. signature.asc Description: PGP signature
Re: [PATCH] gnu: Add dbacl.
ng0 writes: > [PATCH] gnu: Add dbacl. > > Since the discussion we had about 2 weeks ago, I decided to just > remove the last occurence of the dbacl-jap.* this way it builds and > tests succeed. > > Why have I packaged this? Maybe it was needed for "afew", I'm really > not sure. The checkout is called guix-afew, the branch was 3 months > behind.
Re: [PATCH] gnu: Add dbacl.
ng0 writes: > [PATCH] gnu: Add dbacl. > > Since the discussion we had about 2 weeks ago, I decided to just > remove the last occurence of the dbacl-jap.* this way it builds and > tests succeed. > > Why have I packaged this? Maybe it was needed for "afew", I'm really > not sure. The checkout is called guix-afew, the branch was 3 months > behind.
[PATCH] gnu: windowmaker: Add support for more image formats.
The subject is self-explanatory.
From f3a2a5366d00337673bfa590453b87587722a4ec Mon Sep 17 00:00:00 2001
From: Kei Kebreau
Date: Sun, 23 Oct 2016 11:26:25 -0400
Subject: [PATCH] gnu: windowmaker: Add support for more image formats.
* gnu/packages/gnustep.scm (windowmaker)[inputs]: Add giflib, libpng,
and libtiff.
---
gnu/packages/gnustep.scm | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm
index f49b254..6c365cb 100644
--- a/gnu/packages/gnustep.scm
+++ b/gnu/packages/gnustep.scm
@@ -76,7 +76,10 @@
("libxft" ,libxft)
("libx11" ,libx11)
("fontconfig" ,fontconfig)
- ("libjpeg" ,libjpeg)))
+ ("libjpeg" ,libjpeg)
+ ("giflib" ,giflib)
+ ("libpng" ,libpng)
+ ("libtiff" ,libtiff)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://windowmaker.org/";)
--
2.10.1
signature.asc
Description: PGP signature
[PATCH] gnu: windowmaker: Update to 0.95.7.
A version bump for Window Maker. There are some nifty new features in this release! From c2369b137a3525d8ac2a6250cbf37809e45aacae Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 23 Oct 2016 10:41:37 -0400 Subject: [PATCH] gnu: windowmaker: Update to 0.95.7. * gnu/packages/gnustep.scm (windowmaker): Update to 0.95.7. --- gnu/packages/gnustep.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm index 6c52286..f49b254 100644 --- a/gnu/packages/gnustep.scm +++ b/gnu/packages/gnustep.scm @@ -35,7 +35,7 @@ (define-public windowmaker (package (name "windowmaker") -(version "0.95.6") +(version "0.95.7") (source (origin (method url-fetch) (uri (string-append @@ -43,7 +43,7 @@ version ".tar.gz")) (sha256 (base32 -"1i3dw1yagsa3rs9x2na2ynqlgmbahayws0kz4vl00fla6550nns3" +"1acph0nq6fsb452sl7j7a7kcc87zqqaw7qms1p8ijar19dn4hbc4" (build-system gnu-build-system) (arguments '(#:phases (alist-cons-before -- 2.10.1 signature.asc Description: PGP signature
Re: [PATCH] gnu: Add libjxr.
Leo Famulari writes: > On Fri, Oct 21, 2016 at 04:47:14PM -0400, Kei Kebreau wrote: >> This is a patch I think we need before fixing up freeimage. Thoughts? > > Thanks for working on this! > >> + (uri (string-append "mirror://debian/pool/main/j/jxrlib/jxrlib_" >> + version ".orig.tar.gz")) > > Why not download it from the upstream site? We prefer to do that when > possible. > > https://jxrlib.codeplex.com/releases/view/107208 > The URL for the upstream site's tarball is http://download-codeplex.sec.s-msft.com/Download/Release?ProjectName=jxrlib&DownloadId=685250&FileTime=13014242805663&Build=21031. Is something like that acceptable in Guix code? I know it works with wget, but I was hesitant to use it as the source URL. >> +(license >> + (license:non-copyleft >> + "file://Makefile" >> + "See the header of the Makefile in the distribution.")) > > That looks like a 2 clause BSD license: > https://opensource.org/licenses/BSD-2-Clause > Indeed it does. I'll have it changed in the next patch I submit. >> diff --git a/gnu/packages/patches/libjxr-fix-typos.patch >> b/gnu/packages/patches/libjxr-fix-typos.patch >> new file mode 100644 >> index 000..3c051dd >> --- /dev/null >> +++ b/gnu/packages/patches/libjxr-fix-typos.patch >> @@ -0,0 +1,60 @@ >> +Description: Fix typos and remove some warnings >> +Author: Mathieu Malaterre > > Can you include a link to the source of this patch? > This patch comes from Debian's set of patches for the sources. Could I leave "This patch comes from Debian" with the link to it on the top, or is more detail necessary? >> diff --git a/gnu/packages/patches/libjxr-use-cmake.patch >> b/gnu/packages/patches/libjxr-use-cmake.patch >> new file mode 100644 >> index 000..cb5919e >> --- /dev/null >> +++ b/gnu/packages/patches/libjxr-use-cmake.patch >> @@ -0,0 +1,143 @@ >> +Description: Prefer a cmake based build system >> +Author: Mathieu Malaterre >> +Forwarded: https://jxrlib.codeplex.com/discussions/440294 > > Why doesn't upstream's build system work? Upstream's build system simply doesn't have configuration or installation targets in the provided Makefile. Using the cmake patch makes the definition cleaner at the cost of relying on outside work [1]. If this is not acceptable, I can see about writing manual replacement phases to the best of my ability. [1]: https://jxrlib.codeplex.com/discussions/440294 signature.asc Description: PGP signature
[PATCH] gnu: Add libjxr.
This is a patch I think we need before fixing up freeimage. Thoughts?From ac9a3c00c9b9a8232fa7cde26b2ecc46b94f809c Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 21 Oct 2016 16:39:50 -0400 Subject: [PATCH] gnu: Add libjxr. * gnu/packages/images.scm (libjxr): New variable. * gnu/packages/patches/libjxr-fix-function-signature.patch: New file. * gnu/packages/patches/libjxr-fix-typos.patch: New file. * gnu/packages/patches/libjxr-use-cmake.patch: New file. * gnu/local.mk (dist_patch_DATA): Register patches. --- gnu/local.mk | 3 + gnu/packages/image.scm | 26 .../patches/libjxr-fix-function-signature.patch| 16 +++ gnu/packages/patches/libjxr-fix-typos.patch| 60 + gnu/packages/patches/libjxr-use-cmake.patch| 143 + 5 files changed, 248 insertions(+) create mode 100644 gnu/packages/patches/libjxr-fix-function-signature.patch create mode 100644 gnu/packages/patches/libjxr-fix-typos.patch create mode 100644 gnu/packages/patches/libjxr-use-cmake.patch diff --git a/gnu/local.mk b/gnu/local.mk index c6cd586..911af78 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -633,6 +633,9 @@ dist_patch_DATA = \ %D%/packages/patches/libdrm-symbol-check.patch \ %D%/packages/patches/libevent-dns-tests.patch\ %D%/packages/patches/libextractor-ffmpeg-3.patch \ + %D%/packages/patches/libjxr-fix-function-signature.patch \ + %D%/packages/patches/libjxr-fix-typos.patch \ + %D%/packages/patches/libjxr-use-cmake.patch \ %D%/packages/patches/liboop-mips64-deplibs-fix.patch \ %D%/packages/patches/libotr-test-auth-fix.patch \ %D%/packages/patches/liblxqt-include.patch \ diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 4b064bb..b1b40b3 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2016 Tobias Geerinckx-Rice ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2016 Arun Isaac +;;; Copyright © 2016 Kei Kebreau ;;; ;;; This file is part of GNU Guix. ;;; @@ -129,6 +130,31 @@ image files in PBMPLUS PPM/PGM, GIF, BMP, and Targa file formats.") (sha256 (base32 "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0")) +(define-public libjxr + (package +(name "libjxr") +(version "1.1") +(source (origin + (method url-fetch) + (uri (string-append "mirror://debian/pool/main/j/jxrlib/jxrlib_" + version ".orig.tar.gz")) + (sha256 + (base32 +"00w3f3cmjsm3fiaxq5mxskmp5rl3mki8psrf9y8s1vqbg237na67")) + (patches (search-patches "libjxr-fix-function-signature.patch" + "libjxr-use-cmake.patch" + "libjxr-fix-typos.patch" +(build-system cmake-build-system) +(arguments '(#:tests? #f)) ; no check target +(synopsis "Implementation of the JPEG XR standard") +(description "JPEG XR is an approved ISO/IEC International standard (its +official designation is ISO/IEC 29199-2). This library is an implementation of that standard.") +(license + (license:non-copyleft + "file://Makefile" + "See the header of the Makefile in the distribution.")) +(home-page "https://jxrlib.codeplex.com/";))) + (define-public jpegoptim (package (name "jpegoptim") diff --git a/gnu/packages/patches/libjxr-fix-function-signature.patch b/gnu/packages/patches/libjxr-fix-function-signature.patch new file mode 100644 index 000..9efc339 --- /dev/null +++ b/gnu/packages/patches/libjxr-fix-function-signature.patch @@ -0,0 +1,16 @@ +Description: Fix function signature +Author: Mathieu Malaterre +Origin: upstream, https://jxrlib.codeplex.com/SourceControl/changeset/04cf339385b8196f98025b43a366a0790deac994 +Bug-Debian: http://bugs.debian.org/748590 + +--- jxrlib-1.1.orig/image/decode/JXRTranscode.c jxrlib-1.1/image/decode/JXRTranscode.c +@@ -47,7 +47,7 @@ EXTERN_C Void FreeCodingContextDec(CWMIm + EXTERN_C Int StrEncInit(CWMImageStrCodec *); + EXTERN_C Void StrIOEncTerm(CWMImageStrCodec *); + EXTERN_C Void FreeCodingContextEnc(CWMImageStrCodec *); +-EXTERN_C Void encodeMB(CWMImageStrCodec *, Int, Int); ++EXTERN_C Int encodeMB(CWMImageStrCodec *, Int, Int); + EXTERN_C Int writeIndexTableNull(CWMImageStrCodec *); + EXTERN_C Void writePacketHeader(BitIOInfo *, U8, U8); + diff --git a/gnu/packages/patches/libjxr-fix-typos.patch b/gnu/packages/patches/libjxr-fix-typos.patch new file mode 100644 index 000..3c051dd --- /dev/null +++ b/gnu/packages/
Re: [PATCH 2/2] gnu: network-manager-applet: Update to 1.4.2.
l...@gnu.org (Ludovic Courtès) writes: > ng0 skribis: > >> * gnu/packages/gnome.scm (network-manager-applet): Update to 1.4.2. > > Applied to core-updates, thanks! > > Ludo’. I have a question. The network-manager service doesn't seem to work in my VM, i.e. network-manager-applet gives the message "NetworkManager is not running". Is this the case with the current network-manager service? signature.asc Description: PGP signature
Re: [PATCH] Update networkmanager+nm-applet
ng0 writes: > [PATCH 1/2] gnu: network-manager: Update to 1.4.2. > [PATCH 2/2] gnu: network-manager-applet: Update to 1.4.2. > > Update to 1.4.2 for both, nm-applet is build without WWAN support > until we have glib updated to 2.50, > which should be done in core-updates if it isn't already being worked on. The patches look good, but I don't know how to test the service from within my Guix source tree. signature.asc Description: PGP signature
Re: [PATCH] gnu: Add xpad.
ren...@openmailbox.org writes: > Hello, > this patch is Xpad, a sticky note application. > > * I did not find the application in the GNOME repository. > > Built, linted and tested. > > Thank you Thanks for the good patch! Everything seems to work fine. Commited as 0bd697591bd5f020032cc2650fa6f0f43377ff67. signature.asc Description: PGP signature
Re: [PATCH] gnu: Add vim-full.
ng0 writes:
> * gnu/packages/vim.scm (vim-full): New variable.
> * gnu/packages/patches/vim-8.0.0003.patch: New file.
> * gnu/packages/patches/vim-8.0.0004.patch: New file.
> * gnu/packages/patches/vim-8.0.0005.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add patches.
> ---
> gnu/local.mk| 3 ++
> gnu/packages/patches/vim-8.0.0003.patch | 87
> +
> gnu/packages/patches/vim-8.0.0004.patch | 60 +++
> gnu/packages/patches/vim-8.0.0005.patch | 45 +
> gnu/packages/vim.scm| 81 ++
> 5 files changed, 276 insertions(+)
> create mode 100644 gnu/packages/patches/vim-8.0.0003.patch
> create mode 100644 gnu/packages/patches/vim-8.0.0004.patch
> create mode 100644 gnu/packages/patches/vim-8.0.0005.patch
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index 526756f..79c1326 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -874,6 +874,9 @@ dist_patch_DATA =
> \
>%D%/packages/patches/util-linux-tests.patch\
>%D%/packages/patches/upower-builddir.patch \
>%D%/packages/patches/valgrind-enable-arm.patch \
> + %D%/packages/patches/vim-8.0.0003.patch \
> + %D%/packages/patches/vim-8.0.0004.patch \
> + %D%/packages/patches/vim-8.0.0005.patch \
>%D%/packages/patches/vorbis-tools-CVE-2014-9638+CVE-2014-9639.patch
> \
>%D%/packages/patches/vorbis-tools-CVE-2014-9640.patch \
>%D%/packages/patches/vorbis-tools-CVE-2015-6749.patch \
> diff --git a/gnu/packages/patches/vim-8.0.0003.patch
> b/gnu/packages/patches/vim-8.0.0003.patch
> new file mode 100644
> index 000..11e9c91
> --- /dev/null
> +++ b/gnu/packages/patches/vim-8.0.0003.patch
> @@ -0,0 +1,87 @@
> +To: vim_...@googlegroups.com
> +Subject: Patch 8.0.0003
> +Fcc: outbox
> +From: Bram Moolenaar
> +Mime-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +
> +Patch 8.0.0003
> +Problem:getwinvar() returns wrong Value of boolean and number options,
> +especially non big endian systems. (James McCoy)
> +Solution: Cast the pointer to long or int. (closes #1060)
> +Files: src/option.c, src/testdir/test_bufwintabinfo.vim
> +
> +
> +*** vim80/src/option.c 2016-09-02 19:26:03.0 +0200
> +--- vim80/src/option.c 2016-09-12 19:20:38.051099762 +0200
> +***
> +*** 12363,12370
> + {
> + if (opt->flags & P_STRING)
> + dict_add_nr_str(d, opt->fullname, 0L, *(char_u **)varp);
> + else
> +!dict_add_nr_str(d, opt->fullname, *varp, NULL);
> + }
> + }
> + }
> +--- 12363,12372
> + {
> + if (opt->flags & P_STRING)
> + dict_add_nr_str(d, opt->fullname, 0L, *(char_u **)varp);
> ++else if (opt->flags & P_NUM)
> ++dict_add_nr_str(d, opt->fullname, *(long *)varp, NULL);
> + else
> +!dict_add_nr_str(d, opt->fullname, *(int *)varp, NULL);
> + }
> + }
> + }
> +*** vim80/src/testdir/test_bufwintabinfo.vim 2016-08-27 21:14:58.0
> +0200
> +--- vim80/src/testdir/test_bufwintabinfo.vim 2016-09-12 19:31:06.346360420
> +0200
> +***
> +*** 87,95
> +--- 87,103
> + endfunc
> +
> + function Test_get_win_options()
> ++ if has('folding')
> ++ set foldlevel=999
> ++ endif
> ++ set list
> +let opts = getwinvar(1, '&')
> +call assert_equal(v:t_dict, type(opts))
> +call assert_equal(0, opts.linebreak)
> ++ call assert_equal(1, opts.list)
> ++ if has('folding')
> ++ call assert_equal(999, opts.foldlevel)
> ++ endif
> +if has('signs')
> + call assert_equal('auto', opts.signcolumn)
> +endif
> +***
> +*** 97,103
> +--- 105,116
> +let opts = gettabwinvar(1, 1, '&')
> +call assert_equal(v:t_dict, type(opts))
> +call assert_equal(0, opts.linebreak)
> ++ call assert_equal(1, opts.list)
> +if has('signs')
> + call assert_equal('auto', opts.signcolumn)
> +endif
> ++ set list&
> ++ if has('folding')
> ++ set foldlevel=0
> ++ endif
> + endfunc
> +*** vim80/src/version.c 2016-09-12 16:30:42.348454179 +0200
> +--- vim80/src/version.c 2016-09-12 19:24:10.184148642 +0200
> +***
> +*** 766,767
> +--- 766,769
> + { /* Add new patch number below this line */
> ++ /**/
> ++ 3,
> + /**/
> +
> +--
> diff --git a/gnu/packages/patches/vim-8.0.0004.patch
> b/gnu/packages/patches/vim-8.0.0004.patch
> new file mode 100644
> index 000..5d4071b
> --- /dev/null
> +++ b/gnu/packages/patches/vim-8.0.0004.patch
> @@ -0,0 +1,60 @@
> +To: vim_...@googlegroups.com
> +Subject: Patch
Re: [PATCH] add kobodeluxe
Christopher Allan Webber writes: >> On Sun, Oct 16, 2016 at 9:06 PM, Kei Kebreau wrote: >>> When I applied the patch, git complained about trailing whitespace; a >>> trivial fix. > > Those whitespace "errors" were in the original patches we borrowed from > Debian, and weren't on any of the lines that patch in new code. > Nonetheless the patches seem to apply fine without them, so here's an > adjusted patch that fixes that. (It also fixes the commit line, since I > forgot to change the underscores to hyphens there in my last patch!) > > - Chris > > From 62bf271a6907bd5b0ec73662bc3f92c64aafa229 Mon Sep 17 00:00:00 2001 > From: Stephen Webber > Date: Sun, 16 Oct 2016 15:04:35 -0500 > Subject: [PATCH] gnu: Add kobodeluxe. > > * gnu/packages/games.scm (kobodeluxe): New variable. > * gnu/packages/patches/kobodeluxe-paths.patch: New file. > * gnu/packages/patches/kobodeluxe-spelling.patch: New file. > * gnu/packages/patches/kobodeluxe-enemies-pipe-decl.patch: New file. > * gnu/packages/patches/kobodeluxe-const-charp-conversion.patch: New file. > * gnu/packages/patches/kobodeluxe-manpage-minus-not-hyphen.patch: New file. > * gnu/packages/patches/kobodeluxe-midicon-segmentation-fault.patch: New file. > * gnu/packages/patches/kobodeluxe-graphics-window-signed-char.patch: New file. > * gnu/local.mk (dist_patch_DATA): Register it. > --- > gnu/local.mk | 7 +++ > gnu/packages/games.scm | 34 +++ > .../kobodeluxe-const-charp-conversion.patch| 17 ++ > .../patches/kobodeluxe-enemies-pipe-decl.patch | 67 > ++ > .../kobodeluxe-graphics-window-signed-char.patch | 38 > .../kobodeluxe-manpage-minus-not-hyphen.patch | 15 + > .../kobodeluxe-midicon-segmentation-fault.patch| 24 > gnu/packages/patches/kobodeluxe-paths.patch| 40 + > gnu/packages/patches/kobodeluxe-spelling.patch | 25 > 9 files changed, 267 insertions(+) > create mode 100644 > gnu/packages/patches/kobodeluxe-const-charp-conversion.patch > create mode 100644 gnu/packages/patches/kobodeluxe-enemies-pipe-decl.patch > create mode 100644 > gnu/packages/patches/kobodeluxe-graphics-window-signed-char.patch > create mode 100644 > gnu/packages/patches/kobodeluxe-manpage-minus-not-hyphen.patch > create mode 100644 > gnu/packages/patches/kobodeluxe-midicon-segmentation-fault.patch > create mode 100644 gnu/packages/patches/kobodeluxe-paths.patch > create mode 100644 gnu/packages/patches/kobodeluxe-spelling.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index 19dd9ae..a358939 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -621,6 +621,13 @@ dist_patch_DATA = > \ >%D%/packages/patches/jq-CVE-2015-8863.patch\ >%D%/packages/patches/khmer-use-libraries.patch\ >%D%/packages/patches/kmod-module-directory.patch \ > + %D%/packages/patches/kobodeluxe-paths.patch\ > + %D%/packages/patches/kobodeluxe-spelling.patch \ > + %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch\ > + %D%/packages/patches/kobodeluxe-const-charp-conversion.patch \ > + %D%/packages/patches/kobodeluxe-manpage-minus-not-hyphen.patch \ > + %D%/packages/patches/kobodeluxe-midicon-segmentation-fault.patch \ > + %D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch \ >%D%/packages/patches/laby-make-install.patch \ >%D%/packages/patches/ldc-disable-tests.patch \ >%D%/packages/patches/lftp-dont-save-unknown-host-fingerprint.patch \ > diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm > index 2bb53e0..7c43f84 100644 > --- a/gnu/packages/games.scm > +++ b/gnu/packages/games.scm > @@ -23,6 +23,7 @@ > ;;; Copyright © 2016 Alex Griffin > ;;; Copyright © 2016 Efraim Flashner > ;;; Copyright © 2016 Jan Nieuwenhuizen > +;;; Copyright © 2016 Steve Webber > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -2994,3 +2995,36 @@ symbols, the game needs graphics to render the > non-euclidean world.") > license:public-domain ; src/direntx.* > license:zlib ; src/savepng.* > license:gpl2+ ; remaining files > + > +(define-public kobodeluxe > + (package > +(name "kobodeluxe") > +(version "0.5.1") > +(source (origin > + (method url-fetch) > + (uri (string-append > "http://olofson.net/kobodl/download/KoboDe
Re: [PATCH] add kobodeluxe
Christopher Allan Webber writes: > I know Stephen, so I helped him put together this package, which is his > first. It's a long time favorite free software game. > > There were a lot of patches to Kobo Deluxe in Debian; we kept finding > that it wouldn't build without one or another of them, and we read the > summary of all of them and decided they were all probably worth > including. > > I think the package looks fine, but probably someone else should look it > over. If someone can give it an ACK, I'd love to merge it (or you can)! > > - Chris I love this game! It's a solid patch except for two things: I can't make a permanent user profile. This is a somewhat popular problem for games to have. When I applied the patch, git complained about trailing whitespace; a trivial fix. signature.asc Description: PGP signature
Re: [PATCH] Add lci.
ng0 writes: > This adds lci, a lolcode interpreter. This time I removed the typo with two > (native-input) so it works again. Looks and works fine for me! signature.asc Description: PGP signature
Re: [PATCH 3/3] gnu: Add mod-utilities.
Ricardo Wurmus writes:
> * gnu/packages/music.scm (mod-utilities): New variable.
> ---
> gnu/packages/music.scm | 34 ++
> 1 file changed, 34 insertions(+)
>
> diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
> index d2e252e..e5715de 100644
> --- a/gnu/packages/music.scm
> +++ b/gnu/packages/music.scm
> @@ -2442,3 +2442,37 @@ slow gear audio effect to produce volume swells."
>(synopsis "Wah emulation with switchless activation")
>(description "This package provides the LV2 plugin \"GxSwitchlessWah\",
> a simulation of an analog Wah pedal with switchless activation."
> +
> +(define-public mod-utilities
> + (let ((commit "7cdeeac26ae682730740105ece121d4dddb8ba3f")
> +(revision "1"))
> +(package
> + (name "mod-utilities")
> + (version (string-append "0-" revision "." (string-take commit 9)))
> + (source (origin
> +(method git-fetch)
> +(uri (git-reference
> + (url "https://github.com/moddevices/mod-utilities.git";)
> + (commit commit)))
> +(sha256
> + (base32
> + "1ilnkbrmwrszxvc21qlb86h29yz7cnc6rcp0jmna1y693ny2qhf4"))
> +(file-name (string-append name "-" version "-checkout"
> + (build-system gnu-build-system)
> + (arguments
> + `(#:tests? #f ; there are no tests
> + #:make-flags
> + (list (string-append "INSTALL_PATH="
> + (assoc-ref %outputs "out")
> + "/lib/lv2"))
> + #:phases
> + (modify-phases %standard-phases
> + (delete 'configure
> + (inputs
> + `(("lv2" ,lv2)))
> + (home-page "https://github.com/moddevices/mod-utilities";)
> + (synopsis "LV2 utility plugins")
> + (description "This package provides LV2 audio utility plugins, such as
> +filters, crossovers, simple gain plugins without zipper noise, switch box
> +plugins, a switch trigger, a toggle switch, and a peakmeter.")
> + (license license:gpl2+
All three patches are reproducible and linting is fine, except for
jalv-select's description; must start with an upper-case letter or digit!
signature.asc
Description: PGP signature
Re: [PATCH] add fbida
Julien Lepiller writes: > On Sat, 15 Oct 2016 16:51:00 -0400 > Kei Kebreau wrote: > >> Julien Lepiller writes: >> >> > Hi, >> > >> > I attached a patch to add fbida, a frame-buffer based image and pdf >> > viewer. I created a new file, since I didn't find an existing one >> > where it could go. Let me know if you prefer it in an existing >> > file. >> >> Hi Julien! Your patch looks fine as far as linting and reproducibility >> goes. Some pointers for your patch: >> >> In my opinion, this can go in pdf.scm, as the mupdf package is there >> and it has similar functions to fbida. Also, when you add fbida to >> pdf.scm, don't forget to add a copyright notice for yourself! > > I attached an updated patch. Thanks! This works just as well for me. Pushed as f3e222165e7c2393441346d4efd82d03a84a1fac. For future reference, when adding a package you only need gnu: Add [package]. * gnu/packages/[file].scm ([package]): New variable. as far as commit syntax goes. :-) signature.asc Description: PGP signature
Re: [PATCH] gnu: gd: Fix CVE-2016-8670.
Leo Famulari writes: > On Sat, Oct 15, 2016 at 10:55:52PM +0100, Marius Bakke wrote: >> Kei Kebreau writes: >> >> > This patch fixes the gd library's most recent published vulnerability on >> > the oss-security list. >> >> Looks like this was already applied by Leo in >> e1376e25a755a7368d095b4eb2daf42be9e63b0d. > > It's always good to see what somebody else would have done. I'm glad our > patches made the same change in this case :) I see. Sometimes my tree gets behind on changes. Good thing it was only a small patch! signature.asc Description: PGP signature
Re: Security bugs in freeimage bundled libraries [was Re: 01/02: gnu: freeimage: Fix CVE-2016-5684.]
Leo Famulari writes: > On Sat, Oct 15, 2016 at 02:57:37PM -0400, Kei Kebreau wrote: >> Efraim Flashner writes: >> > On Fri, Oct 14, 2016 at 08:09:08PM -0400, Kei Kebreau wrote: >> >> Leo Famulari writes: >> >> > Debian has a patch to make it use "system" copies of the libraries: >> >> > >> >> > https://anonscm.debian.org/cgit/debian-science/packages/freeimage.git/tree/debian/patches/Disable-vendored-dependencies.patch?h=debian/sid >> >> > >> >> > For now, our freeimage package is probably vulnerable to many publicly >> >> > disclosed security bugs. >> >> > >> >> > Who volunteers to try fixing this? >> >> >> >> The patch is attached. I've removed the bit from Debian that disables JPEG >> >> transformation functions, as seen below. JPEGTransform.cpp (in >> >> Source/FreeImageToolkit) gave me some trouble when I left that part of >> >> the patch alone. >> >> > I was looking at it and I thought it was going to be much more than 400 >> > lines in the end. >> > >> > Did we also need the other patch? >> > https://sources.debian.net/src/freeimage/3.17.0%2Bds1-3/debian/patches/Use-system-dependencies.patch/ >> > >> > On one hand we could carry a modified version of Debian's patch, on the >> > other hand some of these look like they could be a series of substitute* >> > commands. I started looking through the patch and thinking how to >> > convert them from "../path/to/header.h" to and realizing I >> > myself wouldn't want to do that, so that could easily be an option for >> > another time :). >> >> Looking at its contents, adding that patch would make a lot of sense. :-) > > Yes, I think we need to use both patches. Will you submit an updated > version of your patch? I intend to. The updated patch requires a JPEG XR library to be packaged (and maybe others), but I am having some trouble getting a source URL from CodePlex. signature.asc Description: PGP signature
Re: [PATCH] gnu: Add python-whoosh.
Ricardo Wurmus writes:
> * gnu/packages/python.scm (python-whoosh, python2-whoosh): New variables.
> ---
> gnu/packages/python.scm | 30 ++
> 1 file changed, 30 insertions(+)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 6207896..69c7d36 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -8823,6 +8823,36 @@ library.")
>(native-inputs `(("python2-setuptools" ,python2-setuptools)
> ,@(package-native-inputs responses))
>
> +(define-public python-whoosh
> + (package
> +(name "python-whoosh")
> +(version "2.7.4")
> +(source
> + (origin
> + (method url-fetch)
> + (uri (pypi-uri "Whoosh" version))
> + (sha256
> +(base32
> + "10qsqdjpbc85fykc1vgcs8xwbgn4l2l52c8d83xf1q59pwyn79bw"
> +(build-system python-build-system)
> +(native-inputs
> + `(("python-setuptools" ,python-setuptools)
> + ("python-pytest" ,python-pytest)))
> +(home-page "http://bitbucket.org/mchaput/whoosh";)
> +(synopsis "Full text indexing, search, and spell checking library")
> +(description
> + "Whoosh is a fast, pure-Python full text indexing, search, and spell
> +checking library.")
> +(license license:bsd-2)))
> +
> +(define-public python2-whoosh
> + (let ((whoosh (package-with-python2 (strip-python2-variant
> python-whoosh
> +(package (inherit whoosh)
> + (propagated-inputs
> + `(("python2-backport-ssl-match-hostname"
> + ,python2-backport-ssl-match-hostname)
> + ,@(package-propagated-inputs whoosh))
> +
> (define-public python-pathlib
>(package
> (name "python-pathlib")
Linting works fine, but outputs differ on each build. Is this a common
problem with python packages?
signature.asc
Description: PGP signature
Re: [PATCH] add fbida
Julien Lepiller writes: > Hi, > > I attached a patch to add fbida, a frame-buffer based image and pdf > viewer. I created a new file, since I didn't find an existing one > where it could go. Let me know if you prefer it in an existing file. Hi Julien! Your patch looks fine as far as linting and reproducibility goes. Some pointers for your patch: In my opinion, this can go in pdf.scm, as the mupdf package is there and it has similar functions to fbida. Also, when you add fbida to pdf.scm, don't forget to add a copyright notice for yourself! signature.asc Description: PGP signature
[PATCH] gnu: gd: Fix CVE-2016-8670.
This patch fixes the gd library's most recent published vulnerability on
the oss-security list.
From dc48d5c020c0795c966501b83ac2d4b4ae0e4caa Mon Sep 17 00:00:00 2001
From: Kei Kebreau
Date: Sat, 15 Oct 2016 15:57:21 -0400
Subject: [PATCH] gnu: gd: Fix CVE-2016-8670.
* gnu/packages/patches/gd-CVE-2016-8670.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/gd.scm (gd)[source]: Use it.
---
gnu/local.mk| 1 +
gnu/packages/gd.scm | 1 +
gnu/packages/patches/gd-CVE-2016-8670.patch | 12
3 files changed, 14 insertions(+)
create mode 100644 gnu/packages/patches/gd-CVE-2016-8670.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index a151d2b..68b4bf3 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -536,6 +536,7 @@ dist_patch_DATA =
\
%D%/packages/patches/gcc-libvtv-runpath.patch\
%D%/packages/patches/gcc-5.0-libvtv-runpath.patch\
%D%/packages/patches/gd-CVE-2016-7568.patch \
+ %D%/packages/patches/gd-CVE-2016-8670.patch \
%D%/packages/patches/gd-fix-gd2-read-test.patch \
%D%/packages/patches/gd-fix-tests-on-i686.patch \
%D%/packages/patches/gegl-CVE-2012-4433.patch\
diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm
index 6c94d35..0241a81 100644
--- a/gnu/packages/gd.scm
+++ b/gnu/packages/gd.scm
@@ -51,6 +51,7 @@
(base32
"0g3xz8jpz1pl2zzmssglrpa9nxiaa7rmcmvgpbrjz8k9cyynqsvl"))
(patches (search-patches "gd-CVE-2016-7568.patch"
+ "gd-CVE-2016-8670.patch"
"gd-fix-gd2-read-test.patch"
"gd-fix-tests-on-i686.patch"
(build-system gnu-build-system)
diff --git a/gnu/packages/patches/gd-CVE-2016-8670.patch
b/gnu/packages/patches/gd-CVE-2016-8670.patch
new file mode 100644
index 000..21d5fd9
--- /dev/null
+++ b/gnu/packages/patches/gd-CVE-2016-8670.patch
@@ -0,0 +1,12 @@
+diff -u -r libgd-2.2.3.old/src/gd_io_dp.c libgd-2.2.3/src/gd_io_dp.c
+--- libgd-2.2.3.old/src/gd_io_dp.c 1969-12-31 19:00:00.0 -0500
libgd-2.2.3/src/gd_io_dp.c 2016-10-15 15:49:04.478163658 -0400
+@@ -276,7 +276,7 @@
+ if(remain >= len) {
+ rlen = len;
+ } else {
+- if(remain == 0) {
++ if(remain <= 0) {
+ /* 2.0.34: EOF is incorrect. We use 0 for
+* errors and EOF, just like fileGetbuf,
+* which is a simple fread() wrapper.
--
2.10.1
signature.asc
Description: PGP signature
Re: Security bugs in freeimage bundled libraries [was Re: 01/02: gnu: freeimage: Fix CVE-2016-5684.]
Efraim Flashner writes:
> On Fri, Oct 14, 2016 at 08:09:08PM -0400, Kei Kebreau wrote:
>> Leo Famulari writes:
>>
>> > On Fri, Oct 14, 2016 at 10:44:05AM +, Efraim Flashner wrote:
>> >> efraim pushed a commit to branch master
>> >> in repository guix.
>> >>
>> >> commit 76e8566c1b3c4876d649e712a5c8c473fd48d134
>> >> Author: Efraim Flashner
>> >> Date: Fri Oct 14 11:28:21 2016 +0300
>> >>
>> >> gnu: freeimage: Fix CVE-2016-5684.
>> >>
>> >> * gnu/packages/image.scm (freeimage)[source]: Add patch.
>> >> * gnu/packages/patches/freeimage-CVE-2016-5684.patch: New file.
>> >> * gnu/local.mk (dist_patch_DATA): Register it.
>> >> ---
>> >> gnu/local.mk |1 +
>> >> gnu/packages/image.scm |3 +-
>> >> gnu/packages/patches/freeimage-CVE-2016-5684.patch | 34
>> >>
>> >> 3 files changed, 37 insertions(+), 1 deletion(-)
>> >
>> > Efraim pointed out on IRC that our freeimage packages bundles many
>> > 3rd-party libraries:
>> >
>> > $ ls -1 FreeImage/Source
>> > CacheFile.h
>> > DeprecationManager
>> > FreeImage
>> > FreeImage.h
>> > FreeImageIO.h
>> > FreeImageLib
>> > FreeImageToolkit
>> > LibJPEG
>> > LibJXR
>> > LibOpenJPEG
>> > LibPNG
>> > LibRawLite
>> > LibTIFF4
>> > LibWebP
>> > MapIntrospector.h
>> > Metadata
>> > OpenEXR
>> > Plugin.h
>> > Quantizers.h
>> > ToneMapping.h
>> > Utilities.h
>> > ZLib
>> >
>> > Debian has a patch to make it use "system" copies of the libraries:
>> >
>> > https://anonscm.debian.org/cgit/debian-science/packages/freeimage.git/tree/debian/patches/Disable-vendored-dependencies.patch?h=debian/sid
>> >
>> > For now, our freeimage package is probably vulnerable to many publicly
>> > disclosed security bugs.
>> >
>> > Who volunteers to try fixing this?
>>
>> The patch is attached. I've removed the bit from Debian that disables JPEG
>> transformation functions, as seen below. JPEGTransform.cpp (in
>> Source/FreeImageToolkit) gave me some trouble when I left that part of
>> the patch alone.
>>
>> @@ -473,6 +477,9 @@ FI_ENUM(FREE_IMAGE_DITHER) {
>> FID_BAYER16x16 = 6 //! Bayer ordered dispersed dot
>> dithering (order 4 dithering matrix)
>> };
>>
>> +/* Debian: The JPEGTransform functions are deliberately disabled in our
>> build
>> + of FreeImage, since they require usage of the vendored copy of libjpeg.
>> */
>> +#if 0
>> /** Lossless JPEG transformations
>> Constants used in FreeImage_JPEGTransform
>> */
>> @@ -486,6 +493,7 @@ FI_ENUM(FREE_IMAGE_JPEG_OPERATION) {
>> FIJPEG_OP_ROTATE_180= 6,//! 180-degree rotation
>> FIJPEG_OP_ROTATE_270= 7 //! 270-degree clockwise (or 90
>> ccw)
>> };
>> +#endif
>>
>> /** Tone mapping operators.
>> Constants used in FreeImage_ToneMapping.
>> @@ -1076,7 +1084,9 @@ DLL_API const char* DLL_CALLCONV
>> FreeImage_TagToString(FREE_IMAGE_MDMODEL model,
>> //
>> --
>> // JPEG lossless transformation routines
>> //
>> --
>> -
>> +/* Debian: The JPEGTransform functions are deliberately disabled in our
>> build
>> + of FreeImage, since they require usage of the vendored copy of libjpeg.
>> */
>> +#if 0
>> DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransform(const char *src_file,
>> const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect
>> FI_DEFAULT(TRUE));
>> DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformU(const wchar_t *src_file,
>> const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect
>> FI_DEFAULT(TRUE));
>> DLL_API BOOL DLL_CALLCONV FreeImage_JPEGCrop(const char *src_file, const
>> char *dst_file, int left, int top, int right, int bottom);
>> @@ -1085,6 +1095,7 @@ DLL_API BOOL DLL_CALLCONV
>> FreeImage_JPEGTransformFromHandle(FreeImageIO* src_io,
>> DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombined(const char
>> *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION
Re: Security bugs in freeimage bundled libraries [was Re: 01/02: gnu: freeimage: Fix CVE-2016-5684.]
Leo Famulari writes:
> On Fri, Oct 14, 2016 at 10:44:05AM +, Efraim Flashner wrote:
>> efraim pushed a commit to branch master
>> in repository guix.
>>
>> commit 76e8566c1b3c4876d649e712a5c8c473fd48d134
>> Author: Efraim Flashner
>> Date: Fri Oct 14 11:28:21 2016 +0300
>>
>> gnu: freeimage: Fix CVE-2016-5684.
>>
>> * gnu/packages/image.scm (freeimage)[source]: Add patch.
>> * gnu/packages/patches/freeimage-CVE-2016-5684.patch: New file.
>> * gnu/local.mk (dist_patch_DATA): Register it.
>> ---
>> gnu/local.mk |1 +
>> gnu/packages/image.scm |3 +-
>> gnu/packages/patches/freeimage-CVE-2016-5684.patch | 34
>>
>> 3 files changed, 37 insertions(+), 1 deletion(-)
>
> Efraim pointed out on IRC that our freeimage packages bundles many
> 3rd-party libraries:
>
> $ ls -1 FreeImage/Source
> CacheFile.h
> DeprecationManager
> FreeImage
> FreeImage.h
> FreeImageIO.h
> FreeImageLib
> FreeImageToolkit
> LibJPEG
> LibJXR
> LibOpenJPEG
> LibPNG
> LibRawLite
> LibTIFF4
> LibWebP
> MapIntrospector.h
> Metadata
> OpenEXR
> Plugin.h
> Quantizers.h
> ToneMapping.h
> Utilities.h
> ZLib
>
> Debian has a patch to make it use "system" copies of the libraries:
>
> https://anonscm.debian.org/cgit/debian-science/packages/freeimage.git/tree/debian/patches/Disable-vendored-dependencies.patch?h=debian/sid
>
> For now, our freeimage package is probably vulnerable to many publicly
> disclosed security bugs.
>
> Who volunteers to try fixing this?
The patch is attached. I've removed the bit from Debian that disables JPEG
transformation functions, as seen below. JPEGTransform.cpp (in
Source/FreeImageToolkit) gave me some trouble when I left that part of
the patch alone.
@@ -473,6 +477,9 @@ FI_ENUM(FREE_IMAGE_DITHER) {
FID_BAYER16x16 = 6 //! Bayer ordered dispersed dot
dithering (order 4 dithering matrix)
};
+/* Debian: The JPEGTransform functions are deliberately disabled in our build
+ of FreeImage, since they require usage of the vendored copy of libjpeg. */
+#if 0
/** Lossless JPEG transformations
Constants used in FreeImage_JPEGTransform
*/
@@ -486,6 +493,7 @@ FI_ENUM(FREE_IMAGE_JPEG_OPERATION) {
FIJPEG_OP_ROTATE_180= 6,//! 180-degree rotation
FIJPEG_OP_ROTATE_270= 7 //! 270-degree clockwise (or 90
ccw)
};
+#endif
/** Tone mapping operators.
Constants used in FreeImage_ToneMapping.
@@ -1076,7 +1084,9 @@ DLL_API const char* DLL_CALLCONV
FreeImage_TagToString(FREE_IMAGE_MDMODEL model,
// --
// JPEG lossless transformation routines
// --
-
+/* Debian: The JPEGTransform functions are deliberately disabled in our build
+ of FreeImage, since they require usage of the vendored copy of libjpeg. */
+#if 0
DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransform(const char *src_file, const
char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect
FI_DEFAULT(TRUE));
DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformU(const wchar_t *src_file,
const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect
FI_DEFAULT(TRUE));
DLL_API BOOL DLL_CALLCONV FreeImage_JPEGCrop(const char *src_file, const char
*dst_file, int left, int top, int right, int bottom);
@@ -1085,6 +1095,7 @@ DLL_API BOOL DLL_CALLCONV
FreeImage_JPEGTransformFromHandle(FreeImageIO* src_io,
DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombined(const char
*src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int*
left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedU(const wchar_t
*src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int*
left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedFromMemory(FIMEMORY*
src_stream, FIMEMORY* dst_stream, FREE_IMAGE_JPEG_OPERATION operation, int*
left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
+#endif
From 4ef0c85c769aa4bc7a528c13eee1c61705e61479 Mon Sep 17 00:00:00 2001
From: Kei Kebreau
Date: Fri, 14 Oct 2016 18:09:45 -0400
Subject: [PATCH] gnu: freeimage: Disable in-tree third-party libraries.
* gnu/packages/image.scm (freeimage)[source]: Add patch.
* gnu/packages/patches/freeimage-disable-vendored-dependencies.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
---
gnu/local.mk | 1 +
gnu/packages/image.scm | 6 +-
.../freeimage-di
Re: [PATCH] gnu: Add jack-keyboard.
Ricardo Wurmus writes:
> * gnu/packages/music.scm (jack-keyboard): New variable.
> ---
> gnu/packages/music.scm | 25 +
> 1 file changed, 25 insertions(+)
>
> diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
> index 7452052..9c8de9e 100644
> --- a/gnu/packages/music.scm
> +++ b/gnu/packages/music.scm
> @@ -1521,6 +1521,31 @@ synths, microtonal capabilities, custom envelopes,
> effects, etc. Yoshimi
> improves on support for JACK features, such as JACK MIDI.")
> (license license:gpl2)))
>
> +(define-public jack-keyboard
> + (package
> +(name "jack-keyboard")
> +(version "2.5")
> +(source
> + (origin
> + (method url-fetch)
> + (uri (string-append
> "mirror://sourceforge/jack-keyboard/jack-keyboard/"
> + version "/jack-keyboard-" version ".tar.gz"))
> + (sha256
> +(base32
> + "0mzmg8aavybcfdlq2yd9d0vscqd6is5p6jzrgfpfm5j3xdcvh2s3"
> +(build-system gnu-build-system)
> +(inputs
> + `(("jack" ,jack-1)
> + ("lash" ,lash)
> + ("gtk+" ,gtk+-2)))
> +(native-inputs
> + `(("pkg-config" ,pkg-config)))
> +(home-page "http://jack-keyboard.sourceforge.net/";)
> +(synopsis "Virtual MIDI keyboard")
> +(description "Jack-keyboard is a virtual MIDI keyboard, a program that
> +allows you to send JACK MIDI events (i.e. play) using your PC keyboard.")
> +(license license:bsd-2)))
> +
> (define-public cursynth
>(package
> (name "cursynth")
Looks and works fine for me!
signature.asc
Description: PGP signature
Re: [PATCH 00/13] Add a bunch of LV2 audio effects!
Ricardo Wurmus writes: > Hi Guix, > > here's a simple patch set to add 13 new LV2 audio plugins. > Have fun! > > ~~ Ricardo > > > Ricardo Wurmus (13): > gnu: Add gx-guvnor-lv2. > gnu: Add gx-vbass-preamp-lv2. > gnu: Add gx-overdriver-lv2. > gnu: Add gx-tone-mender-lv2. > gnu: Add gx-push-pull-lv2. > gnu: Add gx-suppa-tone-bender-lv2. > gnu: Add gx-saturator-lv2. > gnu: Add gx-hyperion-lv2. > gnu: Add gx-voodoo-fuzz-lv2. > gnu: Add gx-super-fuzz-lv2. > gnu: Add gx-vintage-fuzz-master-lv2. > gnu: Add gx-slow-gear-lv2. > gnu: Add gx-switchless-wah-lv2. > > gnu/packages/music.scm | 286 > + > 1 file changed, 286 insertions(+) Patches 01 through 10 are clean according to "guix lint" and reproducible. "git am" complains about 11 through 13 being corrupt for some reason. signature.asc Description: PGP signature
Re: [PATCH 0/1] Dbus update 1.10.12 for core-updates
John Darrington writes: > On Mon, Oct 10, 2016 at 02:10:24PM -0400, Kei Kebreau wrote: > > Excuse my ignorance, but when is a patch considered significant enough > to be updated on core-updates instead of master? Put another way, what > is the purpose of core-updates? > > Core updates is for those things near the root of the dependency tree. > Changing these things causes a large amount of other things to be rebuilt. > Therefore, the core-updates branch is built very much less frequently than > master. > > J' In that case, I think that this patch can go into core-updates, since an updated dbus appears to require an amount of updates similar to that of some other packages updated in core-updates. The security threat from this package seems relatively low to me as well. I'd weigh more experienced opinions more heavily than my own, though. I'm still observing how core-updates works. :-) signature.asc Description: PGP signature
Re: [PATCH 0/1] Dbus update 1.10.12 for core-updates
Leo Famulari writes: > There's a format string vulnerability (with unknown impact) in our dbus: > > http://seclists.org/oss-sec/2016/q4/85 > > Please read that message and the linked bug report. > > My understanding of the upsream analysis of the format string > vulnerability is that only the bus owner can trigger it. So, if the > vulnerability allows arbitrary code execution, it would mean that root > could execute arbitrary code via the system bus... not a huge problem. > But still undesirable. > > What do you think? Should we update this on core-updates? Should we > graft it on master? > > Leo Famulari (1): > gnu: dbus: Update to 1.10.12. > > gnu/packages/glib.scm | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Excuse my ignorance, but when is a patch considered significant enough to be updated on core-updates instead of master? Put another way, what is the purpose of core-updates? signature.asc Description: PGP signature
Re: [PATCH] Add scheme-bytestructures
Amirouche Boubekki writes:
> Warning: scheme-bytestructures works on various implementation of Scheme but
> this patch adds
> it only for guile-2.0.
>
> This is a pure scheme package there is no autotools that's why I use the
> trivial-build-system.
>
> This doesn't run the test suite, yet.
>
> From fb2eb7ffd88ec4fba09411195a54b59d67d9c137 Mon Sep 17 00:00:00 2001
> From: Amirouche
> Date: Sun, 9 Oct 2016 12:31:20 +0200
> Subject: [PATCH] gnu: Add scheme-bytestructures
>
> * gnu/packages/guile.scm (scheme-bytestructures): New variable.
>
> diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
> index 0890f19..383990e 100644
> --- a/gnu/packages/guile.scm
> +++ b/gnu/packages/guile.scm
> @@ -1265,4 +1265,105 @@ is no support for parsing block and inline level
> HTML.")
> (define-public guile2.2-commonmark
>(package-for-guile-2.2 guile-commonmark))
>
> +(define-public scheme-bytestructures
> + (package
> +(name "scheme-bytestructures")
> +(version "20160726.53127f6")
> +(source (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/TaylanUB/scheme-bytestructures";)
> + (commit "53127f608caf64b34fa41c389b2743b546fbe9da")))
> + (file-name (string-append name "-" version "-checkout"))
> + (sha256
> +(base32
> + "0l4nx1vp9fkrgrgwjiycj7nx6wfjfd39rqamv4pmq7issi8mrywq"
> +(build-system trivial-build-system)
> +(arguments
> + `(#:modules ((guix build utils))
> + #:builder
> + (begin
> + (use-modules (guix build utils)
> + (ice-9 match)
> + (ice-9 popen)
> + (ice-9 rdelim))
> +
> + (let* ((out (assoc-ref %outputs "out"))
> + (guile (assoc-ref %build-inputs "guile"))
> + (effective (read-line
> + (open-pipe* OPEN_READ
> + (string-append guile "/bin/guile")
> + "-c" "(display (effective-version))")))
> + (module-dir (string-append out "/share/guile/site/"
> +effective))
> + (source (assoc-ref %build-inputs "source"))
> + (doc (string-append out "/share/doc/scheme-bytestructures"))
> + (scm-files (string-split
> "bytestructures/guile/explicit-endianness.scm
> +bytestructures/guile/numeric-metadata.scm
> +bytestructures/guile/ffi.scm
> +bytestructures/guile/vector.scm
> +bytestructures/guile/union.scm
> +bytestructures/guile/numeric-all.scm
> +bytestructures/guile/utils.scm
> +bytestructures/guile/pointer.scm
> +bytestructures/guile/base.scm
> +bytestructures/guile/numeric.scm
> +bytestructures/guile/struct.scm
> +bytestructures/guile/bitfields.scm
> +bytestructures/r6/bytevectors.scm
> +bytestructures/body/base.syntactic.scm
> +bytestructures/body/explicit-endianness.scm
> +bytestructures/body/vector.scm
> +bytestructures/body/union.scm
> +bytestructures/body/utils.scm
> +bytestructures/body/base.scm
> +bytestructures/body/numeric.scm
> +bytestructures/body/struct.scm
> +bytestructures/body/bitfields.scm
> +bytestructures/guile.scm"
> + #\newline))
> + (guild (string-append (assoc-ref %build-inputs "guile")
> + "/bin/guild")))
> +;; Make installation directories.
> +(mkdir-p (string-append module-dir "/bytestructures/guile"))
> +(mkdir-p (string-append module-dir "/bytestructures/r6"))
> +(mkdir-p (string-append module-dir "/bytestructures/body"))
> +(mkdir-p doc)
> +
> +;; Compile .scm files and install.
> +(chdir source)
> +(setenv "GUILE_AUTO_COMPILE" "0")
> +(for-each (lambda (file)
> +(let* ((dest-file (string-append module-dir "/"
> + file))
> + (go-file (string-append module-dir "/"
> + (substring file 0
> + (string-rindex
> file #\.))
> + ".go")))
> + ;; Install source module.
> + (copy-file file dest-file)
> + ;; Install compiled module.
> + (unless (zero? (system* guild "compile"
> + "-L" source
> + "-o" go-file
> + file))
> +(error (format #f "Failed to compile ~s to ~s!"
> + file go-file)
> + scm-files)
> +
> +;; Also copy over the README.
> +(install-file "README.md" doc)
> +#t
> +(inputs
> + `(("guile" ,guile-2.0)))
Re: [PATCH] gnu: font-un: Update source uri.
All the technical bits (linting, reproducibility, downloading, and installation) check out for me. signature.asc Description: PGP signature
Re: [PATCH] gnu: Add gxtuner.
Ricardo Wurmus writes: > Kei Kebreau writes: > >> This package is reproducible and clears the linting process on my >> end. Sadly I'm not skilled enough with JACK to check the functionality >> of the package. :-/ > > Using JACK on GuixSD effectively requires a little additional effort. I > have this in my system configuration to be able to use JACK’s realtime > mode: > > (users (list (user-account > (name "rekado") > (comment "rekado") > (group "rekado") > (supplementary-groups '(… "realtime")) > (home-directory "/home/rekado" > (groups (cons* (user-group (name "rekado") (id 1000)) > (user-group (name "realtime")) > %base-groups)) > … > (services (cons* (pam-limits-service > (list > (pam-limits-entry "@realtime" 'both 'rtprio 99) > (pam-limits-entry "@realtime" 'both 'memlock > 'unlimited))) >…)) > > This means: add my user account to a new group “realtime” and then > raise the realtime priority for this group. Also drop memory > restrictions for members of this group. > > Then you close all applications that might currently be using the audio > interface directly. Make sure pulseaudio is not running. Then run the > JACK daemon with the ALSA backend: > > jackd -d alsa > > At this point you can start any application that needs JACK. To connect > wires between JACK applications and the audio interface ports I > recommend using “patchage”, a graphical patcher that shows you all audio > ports on all JACK appplications and lets you draw connections between > them. > > Hope this helps! > > ~~ Ricardo This definitely helps; thanks! signature.asc Description: PGP signature
Re: Security updates (was Re: texmaker, Qt and Chromium)
Leo Famulari writes: > On Sat, Oct 08, 2016 at 10:55:45AM +0200, Danny Milosavljevic wrote: >> One of the reasons I'm using distributions rather than just >> ./configure ; make ; make install is that distributors stay on top of >> security problems and disable and/or patch packages as problems arise. >> I think many others also mainly use distributions because of that. > > I'm going off-topic here, but... Please Help :) > > Right now there are only a few of us paying attention to security bug > disclosures and, in my opinion, that's not enough. > > If you are interested in keeping Guix secure, try subscribing to the > oss-sec mailing list. If you use Guix on a foreign distro, you can > subscribe to that distro's security announcement list. If you are the de > facto maintainer of some Guix packages, or if you run your business on > some Guix packages, follow the upstream bug reports. > > And then, patch bugs in our packages. If you aren't sure how to fix the > bugs, it's still helpful to present them on guix-devel and ask for > advice. > > Help Wanted! > > [0] > http://seclists.org/oss-sec/ > > [1] For example: > https://lists.debian.org/debian-security-announce/ Subscribed to the oss-sec list! signature.asc Description: PGP signature
Re: [PATCH] gnu: lynx: Fix GnuTLS support.
Leo Famulari writes: > On Sun, Oct 09, 2016 at 04:16:44PM -0400, Kei Kebreau wrote: >> Alright. Does this commit message look good to you? > >> From c08ba395fe1c1df29d8509350ee287c0832a1970 Mon Sep 17 00:00:00 2001 >> From: Kei Kebreau >> Date: Sun, 9 Oct 2016 16:10:09 -0400 >> Subject: [PATCH] gnu: lynx: Update to 2.8.9dev.9 and fix GnuTLS support. >> >> * gnu/packages/lynx.scm (lynx): Update to 2.8.9dev.9. >> [arguments]: Append the path to the GnuTLS to "--with-gnutls=". > > Sure, looks good to me! > > I didn't test this patch, but I assume that you have :) Indeed I have! Pushed as fedcb99d840265824ebf7c5631c609b86560fc44. Thanks for your help, Leo and Tobias! signature.asc Description: PGP signature
Re: [PATCH] gnu: Add gxtuner.
Ricardo Wurmus writes:
> * gnu/packages/music.scm (gxtuner): New variable.
> ---
> gnu/packages/music.scm | 36
> 1 file changed, 36 insertions(+)
>
> diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
> index f7b1b17..4539339 100644
> --- a/gnu/packages/music.scm
> +++ b/gnu/packages/music.scm
> @@ -1585,6 +1585,42 @@ JACK for audio and ALSA sequencer for MIDI as
> multimedia infrastructures and
> follows a traditional multi-track tape recorder control paradigm.")
> (license license:gpl2+)))
>
> +(define-public gxtuner
> + (package
> +(name "gxtuner")
> +(version "2.3")
> +(source (origin
> + (method url-fetch)
> + (uri (string-append "https://github.com/brummer10/gxtuner/";
> + "archive/v" version ".tar.gz"))
> + (file-name (string-append name "-" version ".tar.gz"))
> + (sha256
> + (base32
> +"1abpxiydn4c9wssz6895hnad9ipkcy3rkgzbnanvwb46nm44x6if"
> +(build-system gnu-build-system)
> +(arguments
> + `(#:make-flags
> + (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
> + (string-append "INCLUDE_L_DIR="
> +(assoc-ref %build-inputs "zita-resampler")
> +"/include/"))
> + #:phases
> + (modify-phases %standard-phases
> + (delete 'configure
> +(inputs
> + `(("gtk+" ,gtk+-2)
> + ("jack" ,jack-1)
> + ("fftwf" ,fftwf)
> + ("cairo" ,cairo)
> + ("zita-resampler" ,zita-resampler)))
> +(native-inputs
> + `(("pkg-config" ,pkg-config)))
> +(home-page "https://github.com/brummer10/gxtuner";)
> +(synopsis "Guitar tuner")
> +(description "GXtuner is a simple guitar tuner for JACK with an
> +analogue-like user interface.")
> +(license license:gpl2+)))
> +
> (define-public pianobar
>(package
> (name "pianobar")
Sweet! I was wondering if there was a free software tuner like this.
This package is reproducible and clears the linting process on my
end. Sadly I'm not skilled enough with JACK to check the functionality
of the package. :-/
signature.asc
Description: PGP signature
Re: [PATCH] gnu: lynx: Fix GnuTLS support.
Leo Famulari writes:
> On Sun, Oct 09, 2016 at 01:55:10PM -0400, Kei Kebreau wrote:
>> Leo Famulari writes:
>>
>> > On Fri, Oct 07, 2016 at 10:42:38AM -0400, Kei Kebreau wrote:
>> >> I get the same problem here. Lynx does mention that GnuTLS support is
>> >> experimental. Your and Tobias' page work using OpenSSL instead. Try the
>> >> new patch attached.
>> >
>> >> From ee3a889e6902686de4d7c949afcb8cd4a810bd0f Mon Sep 17 00:00:00 2001
>> >> From: Kei Kebreau
>> >> Date: Fri, 7 Oct 2016 10:36:11 -0400
>> >> Subject: [PATCH] gnu: lynx: Support HTTPS (SSL) connections
>> >>
>> >> * gnu/packages/lynx.scm (lynx)[inputs]: Add 'openssl' and remove 'gnutls'.
>> >> [arguments]: Add configure flags for OpenSSL support; remove
>> >> configure flags
>> >> for GnuTLS support.
>> >
>> > Thanks, this works for me.
>> >
>> > I think it's fine to use the "dev" releases with GnuTLS too. Debian and
>> > Fedora both use them.
>>
>> I can confirm that lynx 2.8.9dev.9 works properly with GnuTLS. Should we
>> use the current stable release with OpenSSL or the development release
>> with GnuTLS? And if we use the development release, should I submit the
>> patches as a single version bump with the necessary small adjustments?
>
> I would do it all in one: update to 2.8.9dev.9 and correct the configure
> flags so it works correctly. I think that "update" and "make the updated
> version work correctly" belong in the same commit since one change
> doesn't make sense without the other.
Alright. Does this commit message look good to you?
From c08ba395fe1c1df29d8509350ee287c0832a1970 Mon Sep 17 00:00:00 2001
From: Kei Kebreau
Date: Sun, 9 Oct 2016 16:10:09 -0400
Subject: [PATCH] gnu: lynx: Update to 2.8.9dev.9 and fix GnuTLS support.
* gnu/packages/lynx.scm (lynx): Update to 2.8.9dev.9.
[arguments]: Append the path to the GnuTLS to "--with-gnutls=".
---
gnu/packages/lynx.scm | 34 +++-----------
1 file changed, 19 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/lynx.scm b/gnu/packages/lynx.scm
index 3182b3e..6e4ed6c 100644
--- a/gnu/packages/lynx.scm
+++ b/gnu/packages/lynx.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Mark H Weaver
+;;; Copyright © 2016 Kei Kebreau
;;;
;;; This file is part of GNU Guix.
;;;
@@ -33,14 +34,15 @@
(define-public lynx
(package
(name "lynx")
-(version "2.8.8rel.2")
+(version "2.8.9dev.9")
(source (origin
(method url-fetch)
(uri (string-append
"http://invisible-mirror.net/archives/lynx/tarballs";
"/lynx" version ".tar.bz2"))
(sha256
- (base32
"1rxysl08acqll5b87368f04kckl8sggy1qhnq59gsxyny1ffg039"
+ (base32
+"1m72ga89hywm097kazcm8w6sqrfjnl83gh31pkbhk4zhzhfpzxgh"
(build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config)
("perl" ,perl)))
@@ -53,19 +55,21 @@
("gzip" ,gzip)
("bzip2" ,bzip2)))
(arguments
- `(#:configure-flags '("--with-pkg-config"
- "--with-screen=ncurses"
- "--with-zlib"
- "--with-bzlib"
- "--with-gnutls"
- ;; "--with-socks5"; XXX TODO
- "--enable-widec"
- "--enable-ascii-ctypes"
- "--enable-local-docs"
- "--enable-htmlized-cfg"
- "--enable-gzip-help"
- "--enable-nls"
- "--enable-ipv6")
+ `(#:configure-flags
+ (let ((gnutls (assoc-ref %build-inputs "gnutls")))
+ `("--with-pkg-config"
+ "--with-screen=ncurses"
+ "--with-zlib"
+ "--with-bzlib"
+ ,(string-append "--with-gnutls=" gnutls)
+ ;; "--with-socks5"; XXX TODO
+ "--enable-widec"
+ "--enable-ascii-ctypes"
+ "--enable-local-docs"
+ "--enable-htmlized-cfg"
+ "--enable-gzip-help"
+ "--enable-nls"
+ "--enable-ipv6"))
#:tests? #f ; no check target
#:phases (alist-replace
'install
--
2.10.0
signature.asc
Description: PGP signature
Re: [PATCH] gnu: lynx: Fix GnuTLS support.
Leo Famulari writes: > On Fri, Oct 07, 2016 at 10:42:38AM -0400, Kei Kebreau wrote: >> I get the same problem here. Lynx does mention that GnuTLS support is >> experimental. Your and Tobias' page work using OpenSSL instead. Try the >> new patch attached. > >> From ee3a889e6902686de4d7c949afcb8cd4a810bd0f Mon Sep 17 00:00:00 2001 >> From: Kei Kebreau >> Date: Fri, 7 Oct 2016 10:36:11 -0400 >> Subject: [PATCH] gnu: lynx: Support HTTPS (SSL) connections >> >> * gnu/packages/lynx.scm (lynx)[inputs]: Add 'openssl' and remove 'gnutls'. >> [arguments]: Add configure flags for OpenSSL support; remove configure flags >> for GnuTLS support. > > Thanks, this works for me. > > I think it's fine to use the "dev" releases with GnuTLS too. Debian and > Fedora both use them. I can confirm that lynx 2.8.9dev.9 works properly with GnuTLS. Should we use the current stable release with OpenSSL or the development release with GnuTLS? And if we use the development release, should I submit the patches as a single version bump with the necessary small adjustments? signature.asc Description: PGP signature
Re: [PATCH] gnu: lynx: Fix GnuTLS support.
ng0 writes: > Hi, > > Kei I think you need to consider packaging one of the "pre" versions of > lynx. I understand we are fixed on packaging this with gnutls, so if you > read the changelog of the recent pre versions releases, you will > discover that there was work on gnutls support. If you don't want to > package pre version itself, there might be patches directly. I don't > know how this all works together and it wasn't my intention to find out > when I looked into this, but we should really consider to package recent > pre release of lynx. Note that this is not dev, dev is more experimental > than pre. > I only see lynx 2.8.9 development tarballs. I don't have a problem targeting those temporarily if it is acceptable to package it and it works. signature.asc Description: PGP signature
Re: [PATCH] gnu: lynx: Fix GnuTLS support.
Leo Famulari writes:
> On Thu, Oct 06, 2016 at 08:48:31PM -0400, Kei Kebreau wrote:
>> HTTPS connections using lynx work on my machine with this patch. Would
>> someone else like to see about this?
>
> Thanks for working on this!
>
> It still fails for me, but in a different way than before [0]:
>
> -
> $ lynx https://famulari.name
>
> Looking up famulari.name
> Making HTTPS connection to famulari.name
> Retrying connection without TLS.
> Looking up famulari.name
> Making HTTPS connection to famulari.name
> Alert!: Unable to make secure connection to remote host.
>
> lynx: Can't access startfile https://famulari.name/
> -
>
> I assume that I'm missing some environment variable on this Guix /
> Debian system. Any ideas?
>
> If it works for you, I'd say go for it.
>
>> From c18ab7b9c24f07ab86529d7f5f08f4dd21cea549 Mon Sep 17 00:00:00 2001
>> From: Kei Kebreau
>> Date: Thu, 6 Oct 2016 20:38:39 -0400
>> Subject: [PATCH] gnu: lynx: Fix GnuTLS support.
>>
>> * gnu/packages/lynx.scm (lynx)[arguments]: Pass "--with-gnutls" in
>
> I think this commit message is truncated.
>
> [0] Without this patch, lynx says:
> Alert!: This client does not contain support for HTTPS URLs.
I get the same problem here. Lynx does mention that GnuTLS support is
experimental. Your and Tobias' page work using OpenSSL instead. Try the
new patch attached.
From ee3a889e6902686de4d7c949afcb8cd4a810bd0f Mon Sep 17 00:00:00 2001
From: Kei Kebreau
Date: Fri, 7 Oct 2016 10:36:11 -0400
Subject: [PATCH] gnu: lynx: Support HTTPS (SSL) connections
* gnu/packages/lynx.scm (lynx)[inputs]: Add 'openssl' and remove 'gnutls'.
[arguments]: Add configure flags for OpenSSL support; remove configure flags
for GnuTLS support.
---
gnu/packages/lynx.scm | 30 --
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/lynx.scm b/gnu/packages/lynx.scm
index 3182b3e..84e9038 100644
--- a/gnu/packages/lynx.scm
+++ b/gnu/packages/lynx.scm
@@ -46,26 +46,28 @@
("perl" ,perl)))
(inputs `(("ncurses" ,ncurses)
("libidn" ,libidn)
- ("gnutls" ,gnutls)
+ ("openssl" ,openssl)
("libgcrypt" ,libgcrypt)
("unzip" ,unzip)
("zlib" ,zlib)
("gzip" ,gzip)
("bzip2" ,bzip2)))
(arguments
- `(#:configure-flags '("--with-pkg-config"
- "--with-screen=ncurses"
- "--with-zlib"
- "--with-bzlib"
- "--with-gnutls"
- ;; "--with-socks5"; XXX TODO
- "--enable-widec"
- "--enable-ascii-ctypes"
- "--enable-local-docs"
- "--enable-htmlized-cfg"
- "--enable-gzip-help"
- "--enable-nls"
- "--enable-ipv6")
+ `(#:configure-flags
+ (let ((openssl (assoc-ref %build-inputs "openssl")))
+ `("--with-pkg-config"
+ "--with-screen=ncurses"
+ "--with-zlib"
+ "--with-bzlib"
+ ,(string-append "--with-ssl=" openssl)
+ ;; "--with-socks5"; XXX TODO
+ "--enable-widec"
+ "--enable-ascii-ctypes"
+ "--enable-local-docs"
+ "--enable-htmlized-cfg"
+ "--enable-gzip-help"
+ "--enable-nls"
+ "--enable-ipv6"))
#:tests? #f ; no check target
#:phases (alist-replace
'install
--
2.10.0
signature.asc
Description: PGP signature
[PATCH] gnu: lynx: Fix GnuTLS support.
HTTPS connections using lynx work on my machine with this patch. Would
someone else like to see about this?
From c18ab7b9c24f07ab86529d7f5f08f4dd21cea549 Mon Sep 17 00:00:00 2001
From: Kei Kebreau
Date: Thu, 6 Oct 2016 20:38:39 -0400
Subject: [PATCH] gnu: lynx: Fix GnuTLS support.
* gnu/packages/lynx.scm (lynx)[arguments]: Pass "--with-gnutls" in
---
gnu/packages/lynx.scm | 28 +++-
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/lynx.scm b/gnu/packages/lynx.scm
index 3182b3e..71bed77 100644
--- a/gnu/packages/lynx.scm
+++ b/gnu/packages/lynx.scm
@@ -53,19 +53,21 @@
("gzip" ,gzip)
("bzip2" ,bzip2)))
(arguments
- `(#:configure-flags '("--with-pkg-config"
- "--with-screen=ncurses"
- "--with-zlib"
- "--with-bzlib"
- "--with-gnutls"
- ;; "--with-socks5"; XXX TODO
- "--enable-widec"
- "--enable-ascii-ctypes"
- "--enable-local-docs"
- "--enable-htmlized-cfg"
- "--enable-gzip-help"
- "--enable-nls"
- "--enable-ipv6")
+ `(#:configure-flags
+ (let ((gnutls (assoc-ref %build-inputs "gnutls")))
+ `("--with-pkg-config"
+ "--with-screen=ncurses"
+ "--with-zlib"
+ "--with-bzlib"
+ ,(string-append "--with-gnutls=" gnutls)
+ ;; "--with-socks5"; XXX TODO
+ "--enable-widec"
+ "--enable-ascii-ctypes"
+ "--enable-local-docs"
+ "--enable-htmlized-cfg"
+ "--enable-gzip-help"
+ "--enable-nls"
+ "--enable-ipv6"))
#:tests? #f ; no check target
#:phases (alist-replace
'install
--
2.10.0
signature.asc
Description: PGP signature
Re: [PATCH] gnu: Add hyperrogue.
Alex Kost writes:
> Kei Kebreau (2016-10-04 16:01 -0400) wrote:
>
> [...]
>> All issues corrected! If you could check over it a second time to be
>> sure, that would be appreciated. Thanks for your assistance! :-)
>
> I think it's OK now, thanks!
>
> And I've just lost an hour playing this game :-)
>
Bwahahahaha!
>> From bff2f006ca78a54955857afc5559e5662e21c7e1 Mon Sep 17 00:00:00 2001
>> From: Kei Kebreau
>> Date: Tue, 4 Oct 2016 15:58:21 -0400
>> Subject: [PATCH] gnu: Add hyperrogue.
>>
>> * gnu/packages/games.scm (hyperrogue): New variable.
>> ---
>> gnu/packages/games.scm | 86
>> ++
>> 1 file changed, 86 insertions(+)
>>
>> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
>> index cd5cf6f..5d61487 100644
>> --- a/gnu/packages/games.scm
>> +++ b/gnu/packages/games.scm
>> @@ -2896,3 +2896,89 @@ extinguishing action, intense boss battles, a catchy
>> soundtrack and lots of
>> throwing people around in pseudo-randomly generated buildings.")
>> (license (list license:zlib ; for source code
>> license:cc-by-sa3.0 ; for graphics and music assets
>> +
>> +(define-public hyperrogue
>> + (package
>> +(name "hyperrogue")
>> +(version "8.3j")
>> +(source (origin
>> + (method url-fetch)
>> + (uri (string-append
>> +"http://www.roguetemple.com/z/hyper/";
>> +name "-83j.zip"))
>> + (sha256
>> + (base32
>> +"1ag95d84m4j0rqyn9hj7655znixw2j57bpf93nk14nfy02xz1g6p"))
>> + (modules '((guix build utils)))
>> + ;; remove .exe and .dll files
>
> Rather: ;; Remove .exe and .dll files.
>
>> + (snippet
>> + '(for-each delete-file (find-files "." "\\.(exe|dll)$")
>> +(build-system gnu-build-system)
>> +(arguments
>> + '(#:tests? #f ; no check target
>> + #:make-flags '("-Csrc")
>> + #:phases
>> + (modify-phases %standard-phases
>> + (add-after 'set-paths 'set-sdl-paths
>> + (lambda* (#:key inputs #:allow-other-keys)
>> + (setenv "CPATH"
>> + (string-append (assoc-ref inputs "sdl-union")
>> +"/include/SDL"
>> + ;; Fix font and music paths.
>> + (replace 'configure
>> + (lambda* (#:key inputs outputs #:allow-other-keys)
>> + (let ((out (assoc-ref outputs "out"))
>> + (dejavu-dir (string-append
>> +(assoc-ref inputs "font-dejavu")
>> +"/share/fonts/truetype"))
>> + (dejavu-font "DejaVuSans-Bold.ttf")
>> + (music-file "hyperrogue-music.txt"))
>> + (with-directory-excursion "src"
>> + (substitute* "graph.cpp"
>> + ((dejavu-font)
>> +(string-append dejavu-dir "/" dejavu-font))
>> + (((string-append "\\./" music-file))
>> +(string-append out "/share/hyperrogue/" music-file)))
>> + (substitute* music-file
>> + (("\\*/")
>> +(string-append out "/share/hyperrogue/")
>> + #t))
>> + (replace 'install
>> + (lambda* (#:key inputs outputs #:allow-other-keys)
>> + (let* ((out (assoc-ref outputs "out"))
>> +(bin (string-append out "/bin"))
>> +(share-dir (string-append out "/share/hyperrogue")))
>> + (mkdir-p bin)
>> + (copy-file "src/hyper" (string-append bin "/hyperrogue"))
>> + (mkdir-p share-dir)
>> + (copy-file "src/hyperrogue-music.txt"
>> + (string-append share-dir "/hyperrogue-music.txt"))
>> + (for-each (lambda (file)
>> + (copy-file file (string-append share-dir "/" file)))
>> + (find-files "." "\\.ogg$")))
>> +
Re: [PATCH] gnu: Add hyperrogue.
Alex Kost writes:
> Kei Kebreau (2016-10-03 19:15 -0400) wrote:
>
>> If anyone would like to check this for fun, that would be great. The
>> geometry
>> makes this game especially interesting.
>
> Wow, indeed! Psychodelic game :-)
>
> Overall the patch looks good to me, except the music files are not
> installed and configured to be used (see below). Did you check the
> music? It looks like you were trying to fix these music stuff but
> didn't finish it, perhaps you sent a wrong patch, no?
>
>> From e0171e159612c12419de1c6f9a230843ff8d826a Mon Sep 17 00:00:00 2001
>> From: Kei Kebreau
>> Date: Mon, 3 Oct 2016 19:09:35 -0400
>> Subject: [PATCH] gnu: Add hyperrogue.
>>
>> * gnu/packages/games.scm (hyperrogue): New variable.
>> ---
>> gnu/packages/games.scm | 88
>> ++
>> 1 file changed, 88 insertions(+)
>>
>> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
>> index cd5cf6f..e9b11a7 100644
>> --- a/gnu/packages/games.scm
>> +++ b/gnu/packages/games.scm
>> @@ -2896,3 +2896,91 @@ extinguishing action, intense boss battles, a catchy
>> soundtrack and lots of
>> throwing people around in pseudo-randomly generated buildings.")
>> (license (list license:zlib ; for source code
>> license:cc-by-sa3.0 ; for graphics and music assets
>> +
>> +(define-public hyperrogue
>> + (package
>> +(name "hyperrogue")
>> +(version "8.3j")
>> +(source (origin
>> + (method url-fetch)
>> + (uri (string-append
>> +"http://www.roguetemple.com/z/hyper/";
>> +name "-83j.zip"))
>> + (sha256
>> + (base32
>> +"1ag95d84m4j0rqyn9hj7655znixw2j57bpf93nk14nfy02xz1g6p"))
>> + (modules '((guix build utils)))
>> + ;; remove .exe and .dll files
>> + (snippet
>> + '(begin
>> + (for-each delete-file (find-files "."
>> "\\.(exe|dll)$"))
>
> 'begin' is not needed here, just: (snippet '(for-each ...))
>
>> +(build-system gnu-build-system)
>> +(arguments
>> + '(#:tests? #f ; no check target
>> + #:make-flags '("-Csrc")
>> + #:phases
>> + (modify-phases %standard-phases
>> + (add-after 'set-paths 'set-sdl-paths
>> + (lambda* (#:key inputs #:allow-other-keys)
>> + (setenv "CPATH"
>> + (string-append (assoc-ref inputs "sdl-union")
>> +"/include/SDL"
>> + ;; fix font and music paths
>
> By convention such comments (commented lines starting with ;;) are full
> phrases, i.e. they begin with uppercase letters and end with periods:
>
> ;; Fix font and music paths.
>
>> + (replace 'configure
>> + (lambda* (#:key inputs outputs #:allow-other-keys)
>> + (let ((out (assoc-ref outputs "out"))
>> + (dejavu-dir (string-append
>> +(assoc-ref inputs "font-dejavu")
>> +"/share/fonts/truetype"))
>> + (dejavu-font "DejaVuSans-Bold.ttf")
>> + (music-file "hyperrogue-music.txt"))
>> + (chdir "src")
>> + (substitute* "graph.cpp"
>> + ((dejavu-font)
>> + (string-append dejavu-dir "/" dejavu-font))
>> + (((string-append "\\./" music-file))
>> + (string-append out "/share/hyperrogue" music-file)))
> ^
> There should be a trailing "/" here, otherwise the file name will be:
>
> ".../share/hyperroguehyperrogue-music.txt"
>
>> + (substitute* music-file
>> + (("\\*/")
>> + (string-append out "/share/music")))
> ^
> And a trailing "/" here for the same reason. But actually since you
> copy .ogg files into "/share/hyperrogue/" then you should use this
> directory instead of "/share/music/".
>
>> +
[PATCH] gnu: Add hyperrogue.
If anyone would like to check this for fun, that would be great. The geometry
makes this game especially interesting.
From e0171e159612c12419de1c6f9a230843ff8d826a Mon Sep 17 00:00:00 2001
From: Kei Kebreau
Date: Mon, 3 Oct 2016 19:09:35 -0400
Subject: [PATCH] gnu: Add hyperrogue.
* gnu/packages/games.scm (hyperrogue): New variable.
---
gnu/packages/games.scm | 88 ++
1 file changed, 88 insertions(+)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index cd5cf6f..e9b11a7 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2896,3 +2896,91 @@ extinguishing action, intense boss battles, a catchy
soundtrack and lots of
throwing people around in pseudo-randomly generated buildings.")
(license (list license:zlib ; for source code
license:cc-by-sa3.0 ; for graphics and music assets
+
+(define-public hyperrogue
+ (package
+(name "hyperrogue")
+(version "8.3j")
+(source (origin
+ (method url-fetch)
+ (uri (string-append
+"http://www.roguetemple.com/z/hyper/";
+name "-83j.zip"))
+ (sha256
+ (base32
+"1ag95d84m4j0rqyn9hj7655znixw2j57bpf93nk14nfy02xz1g6p"))
+ (modules '((guix build utils)))
+ ;; remove .exe and .dll files
+ (snippet
+ '(begin
+ (for-each delete-file (find-files "." "\\.(exe|dll)$"))
+(build-system gnu-build-system)
+(arguments
+ '(#:tests? #f ; no check target
+ #:make-flags '("-Csrc")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'set-paths 'set-sdl-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (setenv "CPATH"
+ (string-append (assoc-ref inputs "sdl-union")
+"/include/SDL"
+ ;; fix font and music paths
+ (replace 'configure
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (dejavu-dir (string-append
+(assoc-ref inputs "font-dejavu")
+"/share/fonts/truetype"))
+ (dejavu-font "DejaVuSans-Bold.ttf")
+ (music-file "hyperrogue-music.txt"))
+ (chdir "src")
+ (substitute* "graph.cpp"
+ ((dejavu-font)
+ (string-append dejavu-dir "/" dejavu-font))
+ (((string-append "\\./" music-file))
+ (string-append out "/share/hyperrogue" music-file)))
+ (substitute* music-file
+ (("\\*/")
+ (string-append out "/share/music")))
+ (chdir ".."))
+ #t))
+ (replace 'install
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+(bin (string-append out "/bin"))
+(share-dir (string-append out "/share/hyperrogue")))
+ (mkdir-p bin)
+ (copy-file "src/hyper" (string-append bin "/hyperrogue"))
+ (mkdir-p share-dir)
+ (copy-file "src/hyperrogue-music.txt"
+ (string-append share-dir "/hyperrogue-music.txt"))
+ (for-each (lambda (file)
+ (copy-file file (string-append share-dir "/" file)))
+ (find-files "." "\\*.ogg$")))
+ #t)
+(inputs
+ `(("font-dejavu" ,font-dejavu)
+ ("glew" ,glew)
+ ("libpng" ,libpng)
+ ("sdl-union" ,(sdl-union (list sdl
+ sdl-gfx
+ sdl-mixer
+ sdl-ttf)
+(home-page "http://www.roguetemple.com/z/hyper/";)
+(synopsis "Non-euclidean graphical rogue-like game")
+(description
+ "HyperRogue is a game in which the player collects treasures and fights
+monsters -- rogue-like but for the fact that it is played on the hyperbolic
+plane and not in euclidean space.
+
+In HyperRogue, the player can move through different parts of the world, which
+are home to particular creatures and may be subject to own rules of
\"physics\".
+
+While it can use ASCII characters to display the world the classical rogue
+symbols, the game needs graphics to render the non-euclidean world.")
+(license (list license:bsd-3 ; src/glew.c, src/mtrand.*
+ license:cc-by-sa3.0 ; *.ogg
+ license:public-domain ; src/direntx.*
+ license:zlib ; src/savepng.*
+ license:gpl2+ ; remaining files
--
2.10.0
signature.asc
Description: PGP signature
Re: [PATCH] gnu: Add optipng.
Arun Isaac writes:
> * gnu/packages/image.scm (optipng): New variable.
> ---
> gnu/packages/image.scm | 33 +
> 1 file changed, 33 insertions(+)
>
> diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
> index 931cad1..4039c1a 100644
> --- a/gnu/packages/image.scm
> +++ b/gnu/packages/image.scm
> @@ -10,6 +10,7 @@
> ;;; Copyright © 2016 Efraim Flashner
> ;;; Copyright © 2016 Tobias Geerinckx-Rice
> ;;; Copyright © 2016 Eric Bavier
> +;;; Copyright © 2016 Arun Isaac
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -932,3 +933,35 @@ statistical tests.")
> all included libraries only the image loading and decoding library is
> installed as @code{stb_image}.")
>(license license:public-domain
> +
> +(define-public optipng
> + (package
> +(name "optipng")
> +(version "0.7.6")
> +(source
> + (origin
> + (method url-fetch)
> + (uri (string-append
> "http://prdownloads.sourceforge.net/optipng/optipng-";
> + version ".tar.gz"))
> + (sha256
> +(base32
> + "105yk5qykvhiahzag67gm36s2kplxf6qn5hay02md0nkrcgn6w28"
> +(build-system gnu-build-system)
> +(inputs
> + `(("zlib" ,zlib)))
> +(arguments
> + '(#:phases
> + (modify-phases %standard-phases
> + ;; configure script does not accept arguments CONFIG_SHELL and SHELL
> + (replace 'configure
> + (lambda* (#:key outputs #:allow-other-keys)
> + (zero? (system* "sh" "configure"
> + (string-append "--prefix=" (assoc-ref outputs
> "out")
> +(synopsis "Optimizer that recompresses PNG image files to a
> +smaller size")
> +(description "OptiPNG is a PNG optimizer that recompresses image
> +files to a smaller size, without losing any information. This program
> +also converts external formats (BMP, GIF, PNM and TIFF) to optimized
> +PNG, and performs PNG integrity checks and corrections.")
> +(home-page "http://optipng.sourceforge.net/";)
> +(license license:zlib)))
Linting and reproducibility are clean here!
Pushed as 93117227034666db18c8b0c7fd89cca72a3eeca8.
signature.asc
Description: PGP signature
Re: [PATCH] gnu: Add qscintilla.
Leo Famulari writes: > On Sat, Sep 24, 2016 at 01:13:33AM -0400, Kei Kebreau wrote: >> Leo Famulari writes: >> > I was getting failures reminiscent of an ABI break. But, I can't >> > reproduce it now. >> > >> > Kei, maybe you should try applying the patches to a fresh Git checkout? >> > If they work like that, then I think it's okay to push, assuming the >> > qscintilla URL is fixed. >> >> No luck... > > Hm, how about if you apply the first patch, `make`, then apply the > second patch, and `make` again? Or some dance like that. Maybe deleting > one of qt.go or maths.go in between. Something like that worked for me > but I don't remember all the steps. > > Of course that is not acceptable for code pushed to the master branch, > but if you figure out how to reproduce a "successful" case, it will make > this easier to debug. I found a lead on our problem! Applying the qscintilla patch and building it with `guix build` works fine. Applying the qscintilla-qt4 patch (not even the octave one) and building octave with `guix build` gives me the following: In unknown file: ?: 0 [memoize-variable-access! # #] ERROR: In procedure memoize-variable-access!: ERROR: Unbound variable: fftw I doubt that anything is wrong with the fftw package, because I'm only given the error when I define qscintilla-qt4 (public or not). Should I be doing something like what is done with the curl package, i.e. defining the replacement variable? I'm kind of confused by this situation. signature.asc Description: PGP signature
Re: [PATCH] gnu: Add optipng.
Arun Isaac writes: > I just noticed that I forgot to add the copyright header. If someone > reviews the patch and everything else is fine, I'll send an updated > patch with the copyright header. > > Thanks. Everything looks and works fine for me. signature.asc Description: PGP signature
Re: [PATCH] gnu: Add gnome-calculator.
l...@gnu.org (Ludovic Courtès) writes: > Hello, > > Kei Kebreau skribis: > >> rennes writes: >> >>> On Thu, 2016-09-22 at 21:23 -0400, Kei Kebreau wrote: >>>> >>>> This is a good patch! The only change I recommend is moving the >>>> defintion to gnome.scm. >>> >>> I update the patch, >>> * Create the definition in gnome.scm file. >>> * Move 'glib' to native-inputs. >>> * Delete Copyright duplicate for >>> ' Copyright © 2016 Rene Saavedra ' >>> >>> Thank you >> >> Looks good and works well. >> >> Does somebody want to commit this to master? >> I'd do it myself, but I'm unfamiliar with the process of commiting >> someone else's code and I don't want to break anything. > > It’s a good occasion to try—we need more reviewers! :-) > > The process is essentially to pipe the patch (which includes the commit > log and Subject: line) through “git am -s”. > > If that applies fine, just run ‘guix lint the-package’ and ideally ‘guix > build --rounds=2 the-package’ to catch any issues. > > If nothing comes up, just push! > > If minor issues (typos, synopsis, etc.) come up, you might commit them > on behalf of the author, or ask them what they prefer. > > Could you try and report back? :-) > > Thanks Kei & rennes! > > Ludo’. I've already pushed it! I guess my last message only went back to Leo. Thank you and Leo for your help. :-) rennes, everything looked good. Thanks for your contribution! signature.asc Description: PGP signature
Re: [PATCH] gnu: Add qscintilla.
Leo Famulari writes: > On Thu, Sep 22, 2016 at 09:02:20PM +0200, Ricardo Wurmus wrote: >> >> Leo Famulari writes: >> >> > I'm not sure yet about the other problem. I tried to define 'hi', which >> > inherits from 'hello', and I got a similar error. >> >> I don’t understand this. What is the problem here? >> >> I’m successfully inheriting from packages in other modules. For >> example, we have a separate module for bioinformatics variants. The >> module uses the upstream bioinformatics module and adds its own variants >> of existing packages using inheritance. > > I was getting failures reminiscent of an ABI break. But, I can't > reproduce it now. > > Kei, maybe you should try applying the patches to a fresh Git checkout? > If they work like that, then I think it's okay to push, assuming the > qscintilla URL is fixed. No luck... signature.asc Description: PGP signature
Re: [PATCH] gnu: Add gnome-calculator.
rennes writes: > On Thu, 2016-09-22 at 21:23 -0400, Kei Kebreau wrote: >> >> This is a good patch! The only change I recommend is moving the >> defintion to gnome.scm. > > I update the patch, > * Create the definition in gnome.scm file. > * Move 'glib' to native-inputs. > * Delete Copyright duplicate for > ' Copyright © 2016 Rene Saavedra ' > > Thank you Looks good and works well. Does somebody want to commit this to master? I'd do it myself, but I'm unfamiliar with the process of commiting someone else's code and I don't want to break anything. signature.asc Description: PGP signature
Re: [PATCH] gnu: Add gnome-calculator.
ren...@openmailbox.org writes: > This patch is a calculator for the GNOME desktop. > > Built, linted and tested. > > Thanks This is a good patch! The only change I recommend is moving the defintion to gnome.scm. signature.asc Description: PGP signature
Re: [PATCH] gnu: Add qscintilla.
Leo Famulari writes:
> On Mon, Sep 19, 2016 at 10:47:56AM -0400, Kei Kebreau wrote:
>> Using
>>
>> #:use-module (gnu packages qt)
>>
>> and
>>
>> (define qscintilla-qt4
>> (package
>> (inherit qscintilla)
>> ...))
>>
>> gives me an unbound variable error. Any idea what's going wrong here?
>
> Can you send the patch that gives the error?
Sure thing. It's the combination of these two patches.
From f60fc09f3f200276b2789a5e305efd5df17666d2 Mon Sep 17 00:00:00 2001
From: Kei Kebreau
Date: Mon, 19 Sep 2016 10:09:33 -0400
Subject: [PATCH] gnu: Add qscintilla.
* gnu/packages/qt.scm (qscintilla): New variable.
---
gnu/packages/qt.scm | 43 +++
1 file changed, 43 insertions(+)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index a482d75..b6a649f 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2015 Ludovic Courtès
;;; Copyright © 2015, 2016 Efraim Flashner
;;; Copyright © 2016 ng0
+;;; Copyright © 2016 Kei Kebreau
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1112,3 +1113,45 @@ contain over 620 classes.")
"QtKeychain is a Qt library to store passwords and other secret data
securely. It will not store any data unencrypted unless explicitly
requested.")
(license license:bsd-3)))
+
+(define-public qscintilla
+ (package
+(name "qscintilla")
+(version "2.9.3")
+(source (origin
+ (method url-fetch)
+ (uri (string-append
"mirror://sourceforge/QScintilla2/QScintilla-"
+ version "/QScintilla_gpl-" version
".tar.gz"))
+ (sha256
+ (base32
+"0znvdncpj64zcpbkyvj11dm8bdc3nfn5girggj33ammhfcyvkalq"
+(build-system gnu-build-system)
+(arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'change-directory
+ (lambda _ (chdir "Qt4Qt5") #t))
+ (replace 'configure
+ (lambda _ (zero? (system* "qmake" "qscintilla.pro"
+ (add-before 'install 'fix-Makefiles
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out(assoc-ref outputs "out"))
+ (qt (assoc-ref inputs "qt")))
+ (substitute* (find-files "." "Makefile")
+ (((string-append "INSTALL_ROOT)" qt))
+ (string-append "INSTALL_ROOT)" out
+ #t)
+(native-inputs
+ `(("python-pyqt" ,python-pyqt)
+ ("qt" ,qtbase))) ; for qmake
+(home-page "https://www.riverbankcomputing.com/software/qscintilla/intro";)
+(synopsis "Qt5 port of the Scintilla editing component")
+(description
+ "QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor
control.
+As well as features found in standard text editing components, QScintilla
+includes features especially useful when editing and debugging source code.
+These include support for syntax styling, error indicators, code completion and
+call tips.")
+(license (list license:bsd-2 ; Python/configure.py
+ license:expat ; src/ and include/
+ license:gpl3
--
2.10.0
From ae862b8a51d15f165dc9b40dc46c2e209736f3a8 Mon Sep 17 00:00:00 2001
From: Kei Kebreau
Date: Mon, 19 Sep 2016 10:11:20 -0400
Subject: [PATCH] gnu: Add qscintilla-qt4.
* gnu/packages/maths.scm (qscintilla-qt4): New variable.
---
gnu/packages/maths.scm | 11 +++
1 file changed, 11 insertions(+)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 44a24ef..829fc7a 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -77,6 +77,7 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages qt)
#:use-module (gnu packages readline)
#:use-module (gnu packages tbb)
#:use-module (gnu packages shells)
@@ -747,6 +748,16 @@ Work may be performed both at the interactive command-line
as well as via
script files.")
(license license:gpl3+)))
+;; required for Octave until its GUI is updated to Qt 5
+(define qscintilla-qt4
+ (package
+(inherit qscintilla)
+(name "qscintilla-qt4")
+(native-inputs
+ `(("python-pyqt" ,python-pyqt-4)
+ ("qt" ,qt-4))) ; for qmake
+(synopsis "Qt4 port of the Scintilla editing component")))
+
(define-public gmsh
(package
(name "gmsh")
--
2.10.0
signature.asc
Description: PGP signature
Re: [PATCH] gnu: Add qscintilla.
Ricardo Wurmus writes: > Kei Kebreau writes: > >> (how do I inherit a package from another module?) > > Just like inheriting from any other package: you declare that the module > containing the package variable be used, and then inherit from the > package variable. > > ~~ Ricardo Using #:use-module (gnu packages qt) and (define qscintilla-qt4 (package (inherit qscintilla) ...)) gives me an unbound variable error. Any idea what's going wrong here? signature.asc Description: PGP signature
Re: [PATCH] gnu: Add qscintilla.
Efraim Flashner writes: > On Sun, Sep 18, 2016 at 04:56:34PM -0400, Leo Famulari wrote: >> On Sun, Sep 18, 2016 at 04:10:15PM -0400, Kei Kebreau wrote: >> > Andreas Enge writes: >> > > On Tue, Sep 13, 2016 at 04:37:35PM -0400, Kei Kebreau wrote: >> > >> In this case, should I leave qtscintilla-qt4 as a public >> > >> package in qt.scm >> > >> instead of maths.scm as Leo suggested? >> > > >> > > since it is used for only one package and relies on the deprecated qt@4, >> > > I would leave it private, regardless its name. >> > >> > It seems that there are conflicting opinions here. :) >> > If no one minds, I can support this feature out-of-tree until GNU Octave >> > updates its UI to use Qt 5. >> > >> > Opinions? >> >> I don't think we need to keep it out of tree. >> >> I agree with Andreas that we should discourage use of Qt 4, but I don't >> think we should not use it at all, or else I would have suggested >> removing all Qt 4 related software. >> >> I think that if there is a reason to export the package at this time, we >> should do so. Otherwise, I think we should keep it private. If we need >> to export it later, we can. >> >> Efraim, do you have a use for a Qt 4 variant of qscintilla? > > Nope. To get this right: qscintilla will be defined publicly in qt.scm, qscintilla-qt4 will be defined privately in maths.scm (how do I inherit a package from another module?), and Octave will include qscintilla-qt4 and qt-4 as inputs. signature.asc Description: PGP signature
Re: [PATCH] gnu: Add qscintilla.
Andreas Enge writes: > Hello, > > On Tue, Sep 13, 2016 at 04:37:35PM -0400, Kei Kebreau wrote: >> In this case, should I leave qtscintilla-qt4 as a public package in qt.scm >> instead of maths.scm as Leo suggested? > > since it is used for only one package and relies on the deprecated qt@4, > I would leave it private, regardless its name. > > Andreas It seems that there are conflicting opinions here. :) If no one minds, I can support this feature out-of-tree until GNU Octave updates its UI to use Qt 5. Opinions? signature.asc Description: PGP signature
Re: [PATCH] gnu: Add qscintilla.
Kei Kebreau writes:
> Efraim Flashner writes:
>
>> On September 14, 2016 11:37:46 PM GMT+03:00, Kei Kebreau
>> wrote:
>>>Leo Famulari writes:
>>>
>>>> On Wed, Sep 14, 2016 at 02:11:44PM -0400, Kei Kebreau wrote:
>>>>> Leo Famulari writes:
>>>>>
>>>>> > On Tue, Sep 13, 2016 at 08:48:43PM +, Efraim Flashner wrote:
>>>>> >> On September 13, 2016 11:37:35 PM GMT+03:00, Kei Kebreau
>>>>> >> wrote:
>>>>> >> >In this case, should I leave qtscintilla-qt4 as a public package
>>>in
>>>>> >> >qt.scm
>>>>> >> >instead of maths.scm as Leo suggested?
>>>>> >>
>>>>> >> That's where I would leave it. You could also leave a note,
>>>saying
>>>>> >> that it was for octave, and if they switch to qt5 then we can get
>>>rid
>>>>> >> of it. We still have an old vte package I added for a terminal
>>>since
>>>>> >> all the bug reports around it haven't been cleared yet, and
>>>that's
>>>>> >> with the other versions of vte. --
>>>>> >
>>>>> > Sounds like a plan!
>>>>>
>>>>> Alright then! I have all three patches here. Tell me if I did
>>>anything
>>>>> funny. The order of application is "Add qscintilla, Add
>>>qscintilla-qt4,
>>>>> Enable Octave's Qt 4 GUI." :)
>>>>
>>>> The patches "Add qscintilla" and "Add qscintilla-qt4" both add both
>>>> packages.
>>>
>>>Fixed it.
>>
>> If you switch ("qtbase" ,qtbase) to ("qt" ,qtbase) can you remove the
>> whole argument block from qscintilla?
>
> I can! Nice catch.
Forgot to use the qt module in the GNU Octave patch...
From f00730e07e56b3095f921ea1ab3f8b2b1d46a9ab Mon Sep 17 00:00:00 2001
From: Kei Kebreau
Date: Thu, 15 Sep 2016 10:23:59 -0400
Subject: [PATCH] gnu: octave: Enable Octave's Qt 4 GUI.
* gnu/packages/maths.scm (octave)[inputs]: Add qscintilla-qt4 and qt-4.
---
gnu/packages/maths.scm | 3 +++
1 file changed, 3 insertions(+)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 44a24ef..ccb43b1 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -77,6 +77,7 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages qt)
#:use-module (gnu packages readline)
#:use-module (gnu packages tbb)
#:use-module (gnu packages shells)
@@ -717,6 +718,8 @@ can solve two kinds of problems:
("libxft" ,libxft)
("mesa" ,mesa)
("glu" ,glu)
+ ("qscintilla" ,qscintilla-qt4)
+ ("qt" ,qt-4)
("zlib" ,zlib)))
(native-inputs
`(("gfortran" ,gfortran)
--
2.10.0
signature.asc
Description: PGP signature
Re: [PATCH] gnu: Add qscintilla.
Efraim Flashner writes:
> On September 14, 2016 11:37:46 PM GMT+03:00, Kei Kebreau
> wrote:
>>Leo Famulari writes:
>>
>>> On Wed, Sep 14, 2016 at 02:11:44PM -0400, Kei Kebreau wrote:
>>>> Leo Famulari writes:
>>>>
>>>> > On Tue, Sep 13, 2016 at 08:48:43PM +, Efraim Flashner wrote:
>>>> >> On September 13, 2016 11:37:35 PM GMT+03:00, Kei Kebreau
>>>> >> wrote:
>>>> >> >In this case, should I leave qtscintilla-qt4 as a public package
>>in
>>>> >> >qt.scm
>>>> >> >instead of maths.scm as Leo suggested?
>>>> >>
>>>> >> That's where I would leave it. You could also leave a note,
>>saying
>>>> >> that it was for octave, and if they switch to qt5 then we can get
>>rid
>>>> >> of it. We still have an old vte package I added for a terminal
>>since
>>>> >> all the bug reports around it haven't been cleared yet, and
>>that's
>>>> >> with the other versions of vte. --
>>>> >
>>>> > Sounds like a plan!
>>>>
>>>> Alright then! I have all three patches here. Tell me if I did
>>anything
>>>> funny. The order of application is "Add qscintilla, Add
>>qscintilla-qt4,
>>>> Enable Octave's Qt 4 GUI." :)
>>>
>>> The patches "Add qscintilla" and "Add qscintilla-qt4" both add both
>>> packages.
>>
>>Fixed it.
>
> If you switch ("qtbase" ,qtbase) to ("qt" ,qtbase) can you remove the
> whole argument block from qscintilla?
I can! Nice catch.
From 7a263e397cc06a87c15d80ec7a41442d25247f19 Mon Sep 17 00:00:00 2001
From: Kei Kebreau
Date: Thu, 15 Sep 2016 10:15:55 -0400
Subject: [PATCH] gnu: Add qscintilla.
* gnu/packages/qt.scm (qscintilla): New variable.
---
gnu/packages/qt.scm | 43 +++
1 file changed, 43 insertions(+)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index a482d75..b6a649f 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2015 Ludovic Courtès
;;; Copyright © 2015, 2016 Efraim Flashner
;;; Copyright © 2016 ng0
+;;; Copyright © 2016 Kei Kebreau
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1112,3 +1113,45 @@ contain over 620 classes.")
"QtKeychain is a Qt library to store passwords and other secret data
securely. It will not store any data unencrypted unless explicitly
requested.")
(license license:bsd-3)))
+
+(define-public qscintilla
+ (package
+(name "qscintilla")
+(version "2.9.3")
+(source (origin
+ (method url-fetch)
+ (uri (string-append
"mirror://sourceforge/QScintilla2/QScintilla-"
+ version "/QScintilla_gpl-" version
".tar.gz"))
+ (sha256
+ (base32
+"0znvdncpj64zcpbkyvj11dm8bdc3nfn5girggj33ammhfcyvkalq"
+(build-system gnu-build-system)
+(arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'change-directory
+ (lambda _ (chdir "Qt4Qt5") #t))
+ (replace 'configure
+ (lambda _ (zero? (system* "qmake" "qscintilla.pro"
+ (add-before 'install 'fix-Makefiles
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out(assoc-ref outputs "out"))
+ (qt (assoc-ref inputs "qt")))
+ (substitute* (find-files "." "Makefile")
+ (((string-append "INSTALL_ROOT)" qt))
+ (string-append "INSTALL_ROOT)" out
+ #t)
+(native-inputs
+ `(("python-pyqt" ,python-pyqt)
+ ("qt" ,qtbase))) ; for qmake
+(home-page "https://www.riverbankcomputing.com/software/qscintilla/intro";)
+(synopsis "Qt5 port of the Scintilla editing component")
+(description
+ "QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor
control.
+As well as features found in standard text editing components, QScintilla
+includes features especially useful when editing and debugging source code.
+These include support for syntax styling, error indicators, code completion and
+call tips.")
+(license (list license:bsd-2 ; Python/configure.py
+ license:expat ; src/ and include/
+ license:gpl3
--
2.10.0
From c79f95135b3fb569d5677e349fcd9f7d69ee157f Mon Sep 17 00:00:00 2001
From: Ke
Re: [PATCH] gnu: Add qscintilla.
Leo Famulari writes:
> On Wed, Sep 14, 2016 at 02:11:44PM -0400, Kei Kebreau wrote:
>> Leo Famulari writes:
>>
>> > On Tue, Sep 13, 2016 at 08:48:43PM +, Efraim Flashner wrote:
>> >> On September 13, 2016 11:37:35 PM GMT+03:00, Kei Kebreau
>> >> wrote:
>> >> >In this case, should I leave qtscintilla-qt4 as a public package in
>> >> >qt.scm
>> >> >instead of maths.scm as Leo suggested?
>> >>
>> >> That's where I would leave it. You could also leave a note, saying
>> >> that it was for octave, and if they switch to qt5 then we can get rid
>> >> of it. We still have an old vte package I added for a terminal since
>> >> all the bug reports around it haven't been cleared yet, and that's
>> >> with the other versions of vte. --
>> >
>> > Sounds like a plan!
>>
>> Alright then! I have all three patches here. Tell me if I did anything
>> funny. The order of application is "Add qscintilla, Add qscintilla-qt4,
>> Enable Octave's Qt 4 GUI." :)
>
> The patches "Add qscintilla" and "Add qscintilla-qt4" both add both
> packages.
Fixed it.
From cb95955eaea1210af6ef197f4157583f24cf4eac Mon Sep 17 00:00:00 2001
From: Kei Kebreau
Date: Wed, 14 Sep 2016 16:34:41 -0400
Subject: [PATCH] gnu: Add qscintilla.
* gnu/packages/qt.scm (qscintilla): New variable.
---
gnu/packages/qt.scm | 43 +++
1 file changed, 43 insertions(+)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index a482d75..444a10e 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2015 Ludovic Courtès
;;; Copyright © 2015, 2016 Efraim Flashner
;;; Copyright © 2016 ng0
+;;; Copyright © 2016 Kei Kebreau
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1112,3 +1113,45 @@ contain over 620 classes.")
"QtKeychain is a Qt library to store passwords and other secret data
securely. It will not store any data unencrypted unless explicitly
requested.")
(license license:bsd-3)))
+
+(define-public qscintilla
+ (package
+(name "qscintilla")
+(version "2.9.3")
+(source (origin
+ (method url-fetch)
+ (uri (string-append
"mirror://sourceforge/QScintilla2/QScintilla-"
+ version "/QScintilla_gpl-" version
".tar.gz"))
+ (sha256
+ (base32
+"0znvdncpj64zcpbkyvj11dm8bdc3nfn5girggj33ammhfcyvkalq"
+(build-system gnu-build-system)
+(arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'change-directory
+ (lambda _ (chdir "Qt4Qt5") #t))
+ (replace 'configure
+ (lambda _ (zero? (system* "qmake" "qscintilla.pro"
+ (add-before 'install 'fix-Makefiles
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out(assoc-ref outputs "out"))
+ (qtbase (assoc-ref inputs "qtbase")))
+ (substitute* (find-files "." "Makefile")
+ (((string-append "INSTALL_ROOT)" qtbase))
+ (string-append "INSTALL_ROOT)" out
+ #t)
+(native-inputs
+ `(("python-pyqt" ,python-pyqt)
+ ("qtbase" ,qtbase))) ; for qmake
+(home-page "https://www.riverbankcomputing.com/software/qscintilla/intro";)
+(synopsis "Qt5 port of the Scintilla editing component")
+(description
+ "QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor
control.
+As well as features found in standard text editing components, QScintilla
+includes features especially useful when editing and debugging source code.
+These include support for syntax styling, error indicators, code completion and
+call tips.")
+(license (list license:bsd-2 ; Python/configure.py
+ license:expat ; src/ and include/
+ license:gpl3
--
2.10.0
From 7a327145738107e5d4016b6dbb0c33830b4cb715 Mon Sep 17 00:00:00 2001
From: Kei Kebreau
Date: Wed, 14 Sep 2016 16:35:43 -0400
Subject: [PATCH] gnu: Add qscintilla-qt4.
* gnu/packages/qt.scm (qscintilla-qt4): New variable.
---
gnu/packages/qt.scm | 25 +
1 file changed, 25 insertions(+)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 444a10e..de3e656 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1155,3 +1155,28 @@ call tips.")
(license (list license:bsd-2 ; Python/configure.py
license:expat ; src/ and include/
Re: [PATCH] gnu: Add qscintilla.
Leo Famulari writes:
> On Tue, Sep 13, 2016 at 08:48:43PM +, Efraim Flashner wrote:
>> On September 13, 2016 11:37:35 PM GMT+03:00, Kei Kebreau
>> wrote:
>> >In this case, should I leave qtscintilla-qt4 as a public package in
>> >qt.scm
>> >instead of maths.scm as Leo suggested?
>>
>> That's where I would leave it. You could also leave a note, saying
>> that it was for octave, and if they switch to qt5 then we can get rid
>> of it. We still have an old vte package I added for a terminal since
>> all the bug reports around it haven't been cleared yet, and that's
>> with the other versions of vte. --
>
> Sounds like a plan!
Alright then! I have all three patches here. Tell me if I did anything
funny. The order of application is "Add qscintilla, Add qscintilla-qt4,
Enable Octave's Qt 4 GUI." :)
From 9304e67ff085853ebbd5d7f1c976171de498bf5b Mon Sep 17 00:00:00 2001
From: Kei Kebreau
Date: Wed, 14 Sep 2016 13:56:33 -0400
Subject: [PATCH] gnu: Add qscintilla.
* gnu/packages/qt.scm (qscintilla): New variable.
---
gnu/packages/qt.scm | 68 +
1 file changed, 68 insertions(+)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index a482d75..de3e656 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2015 Ludovic Courtès
;;; Copyright © 2015, 2016 Efraim Flashner
;;; Copyright © 2016 ng0
+;;; Copyright © 2016 Kei Kebreau
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1112,3 +1113,70 @@ contain over 620 classes.")
"QtKeychain is a Qt library to store passwords and other secret data
securely. It will not store any data unencrypted unless explicitly
requested.")
(license license:bsd-3)))
+
+(define-public qscintilla
+ (package
+(name "qscintilla")
+(version "2.9.3")
+(source (origin
+ (method url-fetch)
+ (uri (string-append
"mirror://sourceforge/QScintilla2/QScintilla-"
+ version "/QScintilla_gpl-" version
".tar.gz"))
+ (sha256
+ (base32
+"0znvdncpj64zcpbkyvj11dm8bdc3nfn5girggj33ammhfcyvkalq"
+(build-system gnu-build-system)
+(arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'change-directory
+ (lambda _ (chdir "Qt4Qt5") #t))
+ (replace 'configure
+ (lambda _ (zero? (system* "qmake" "qscintilla.pro"
+ (add-before 'install 'fix-Makefiles
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out(assoc-ref outputs "out"))
+ (qtbase (assoc-ref inputs "qtbase")))
+ (substitute* (find-files "." "Makefile")
+ (((string-append "INSTALL_ROOT)" qtbase))
+ (string-append "INSTALL_ROOT)" out
+ #t)
+(native-inputs
+ `(("python-pyqt" ,python-pyqt)
+ ("qtbase" ,qtbase))) ; for qmake
+(home-page "https://www.riverbankcomputing.com/software/qscintilla/intro";)
+(synopsis "Qt5 port of the Scintilla editing component")
+(description
+ "QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor
control.
+As well as features found in standard text editing components, QScintilla
+includes features especially useful when editing and debugging source code.
+These include support for syntax styling, error indicators, code completion and
+call tips.")
+(license (list license:bsd-2 ; Python/configure.py
+ license:expat ; src/ and include/
+ license:gpl3
+
+;; required for Octave until its GUI is updated to Qt 5
+(define-public qscintilla-qt4
+ (package
+(inherit qscintilla)
+(name "qscintilla-qt4")
+(arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'change-directory
+ (lambda _ (chdir "Qt4Qt5") #t))
+ (replace 'configure
+ (lambda _ (zero? (system* "qmake" "qscintilla.pro"
+ (add-before 'install 'fix-Makefiles
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out(assoc-ref outputs "out"))
+ (qt (assoc-ref inputs "qt")))
+ (substitute* (find-files "." "Makefile")
+ (((string-append "INSTALL_ROOT)" qt))
+ (string-append "INSTALL_ROOT)" out
+ #t)
+(native-inputs
+ `(("python-pyqt" ,p
Re: [PATCH] gnu: Add qscintilla.
Efraim Flashner writes:
> On Tue, Sep 13, 2016 at 02:01:33PM -0400, Kei Kebreau wrote:
>> Leo Famulari writes:
>>
>> > On Tue, Sep 13, 2016 at 10:37:56AM -0400, Kei Kebreau wrote:
>> >> Kei Kebreau writes:
>> >> > A component necessary for GNU Octave's GUI.
>> >> > How does it look?
>> >> Not sure how packaging Qt packages goes, but I've discovered that
>> >> GNU Octave's GUI only builds with Qt4 support. I've changed the patch to
>> >> adjust this. Should I leave the old patch as is and add a qt4 package
>> >> that inherits from it?
>> >
>> > Since Qt 4 is no longer supported upstream, we are trying to remove
>> > users of the qt-4 package so that we can eventually remove the qt-4
>> > package itself.
>> >
>> > With that in mind, how about a qscintilla-for-octave package? This
>> > package can inherit from a qscintilla that uses qtbase, and I think it
>> > should be declared privately [using (define) instead of (define-public].
>> >
>> >> + (replace 'configure
>> >> + (lambda _
>> >> + (chdir "Qt4Qt5")
>> >> + (zero? (system* "qmake" "qscintilla.pro"
>> >
>> > I would change directory in a separate 'chdir' phase.
>> >
>> >> + (substitute* (find-files "." "Makefile")
>> >> + (((string-append "INSTALL_ROOT)" qt))
>> >> + (string-append "INSTALL_ROOT)" out)
>> > ^
>> > Inconsistent indentation. Also, this phase should return #t, since the
>> > return value of substitute* is unspecified.
>> >
>> >> +(synopsis "Qt5 port of the Scintilla editing component")
>> >
>> > Make sure to adjust the Qt name as appropriate :)
>>
>> Like below? And how could I then access qscintilla-for-octave from
>> maths.scm if it isn't defined publicly?
>>
>> (define-public qscintilla
>> (package
>> (name "qscintilla")
>> (version "2.9.3")
>> (source (origin
>> (method url-fetch)
>> (uri (string-append
>> "mirror://sourceforge/QScintilla2/QScintilla-"
>> version "/QScintilla_gpl-" version
>> ".tar.gz"))
>> (sha256
>>(base32
>> "0znvdncpj64zcpbkyvj11dm8bdc3nfn5girggj33ammhfcyvkalq"
>> (build-system gnu-build-system)
>> (arguments
>> `(#:phases
>>(modify-phases %standard-phases
>> (add-before 'configure 'change-directory
>>(lambda _ (chdir "Qt4Qt5") #t))
>> (replace 'configure
>>(lambda _ (zero? (system* "qmake" "qscintilla.pro"
>> (add-before 'install 'fix-Makefiles
>>(lambda* (#:key inputs outputs #:allow-other-keys)
>> (let ((out(assoc-ref outputs "out"))
>>(qtbase (assoc-ref inputs "qtbase")))
>>(substitute* (find-files "." "Makefile")
>> (((string-append "INSTALL_ROOT)" qtbase))
>>(string-append "INSTALL_ROOT)" out
>> #t)
>> (native-inputs
>> `(("python-pyqt" ,python-pyqt)
>>("qtbase" ,qtbase))) ; for qmake
>> (home-page
>> "https://www.riverbankcomputing.com/software/qscintilla/intro";)
>> (synopsis "Qt5 port of the Scintilla editing component")
>> (description
>> "QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor
>> control.
>> As well as features found in standard text editing components, QScintilla
>> includes features especially useful when editing and debugging source code.
>> These include support for syntax styling, error indicators, code completion
>> and
>> call tips.")
>> (license (list license:bsd-2 ; Python/configure.py
>>license:expat ; src/ and include/
>>license:gpl3
>>
>> (define qtscintilla-for-octave
>
> This should be qtscintilla-qt4, we might have a use for it outside of
> octave
>
In this case, should I leave qtscintilla-qt4 as a public package in qt.scm
instead of maths.scm as Leo suggested?
signature.asc
Description: PGP signature
Re: [PATCH] gnu: Add qscintilla.
Leo Famulari writes: > On Tue, Sep 13, 2016 at 02:59:31PM -0400, Kei Kebreau wrote: >> Leo Famulari writes: >> >> > On Tue, Sep 13, 2016 at 02:01:33PM -0400, Kei Kebreau wrote: >> >> Like below? And how could I then access qscintilla-for-octave from >> >> maths.scm if it isn't defined publicly? >> > >> > Yes, that looks right. But I would put qscintilla-for-octave in >> > maths.scm to avoid the issue you describe. >> >> So would you say that this is clean enough that I could push both of >> these changes in their respecitive files before modifying the Octave >> definition? > > I would wait to push the Qt 4 variant until you have made sure it works > with Octave. I have Octave successfully running with a GUI on my machine using the Qt 4 version of the QScintilla patch, though I've yet to test with the qscintilla-for-octave package. > > Also, I didn't notice a difference between the arguments for each > package variant. If there is no difference, could the Qt 4 variant > inherit the arguments, too? There is a small difference in the two fix-Makefiles phases. They replace different folder paths (the Qt 5 version changes the qtbase path to the package output path, the Qt 4 version changes the qt-4 path to the package output path). signature.asc Description: PGP signature
Re: [PATCH] gnu: Add qscintilla.
Leo Famulari writes: > On Tue, Sep 13, 2016 at 02:01:33PM -0400, Kei Kebreau wrote: >> Like below? And how could I then access qscintilla-for-octave from >> maths.scm if it isn't defined publicly? > > Yes, that looks right. But I would put qscintilla-for-octave in > maths.scm to avoid the issue you describe. So would you say that this is clean enough that I could push both of these changes in their respecitive files before modifying the Octave definition?
Re: [PATCH] gnu: Add qscintilla.
Leo Famulari writes:
> On Tue, Sep 13, 2016 at 10:37:56AM -0400, Kei Kebreau wrote:
>> Kei Kebreau writes:
>> > A component necessary for GNU Octave's GUI.
>> > How does it look?
>> Not sure how packaging Qt packages goes, but I've discovered that
>> GNU Octave's GUI only builds with Qt4 support. I've changed the patch to
>> adjust this. Should I leave the old patch as is and add a qt4 package
>> that inherits from it?
>
> Since Qt 4 is no longer supported upstream, we are trying to remove
> users of the qt-4 package so that we can eventually remove the qt-4
> package itself.
>
> With that in mind, how about a qscintilla-for-octave package? This
> package can inherit from a qscintilla that uses qtbase, and I think it
> should be declared privately [using (define) instead of (define-public].
>
>> + (replace 'configure
>> + (lambda _
>> + (chdir "Qt4Qt5")
>> + (zero? (system* "qmake" "qscintilla.pro"
>
> I would change directory in a separate 'chdir' phase.
>
>> + (substitute* (find-files "." "Makefile")
>> + (((string-append "INSTALL_ROOT)" qt))
>> + (string-append "INSTALL_ROOT)" out)
> ^
> Inconsistent indentation. Also, this phase should return #t, since the
> return value of substitute* is unspecified.
>
>> +(synopsis "Qt5 port of the Scintilla editing component")
>
> Make sure to adjust the Qt name as appropriate :)
Like below? And how could I then access qscintilla-for-octave from
maths.scm if it isn't defined publicly?
(define-public qscintilla
(package
(name "qscintilla")
(version "2.9.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/QScintilla2/QScintilla-"
version "/QScintilla_gpl-" version ".tar.gz"))
(sha256
(base32
"0znvdncpj64zcpbkyvj11dm8bdc3nfn5girggj33ammhfcyvkalq"
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'configure 'change-directory
(lambda _ (chdir "Qt4Qt5") #t))
(replace 'configure
(lambda _ (zero? (system* "qmake" "qscintilla.pro"
(add-before 'install 'fix-Makefiles
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out(assoc-ref outputs "out"))
(qtbase (assoc-ref inputs "qtbase")))
(substitute* (find-files "." "Makefile")
(((string-append "INSTALL_ROOT)" qtbase))
(string-append "INSTALL_ROOT)" out
#t)
(native-inputs
`(("python-pyqt" ,python-pyqt)
("qtbase" ,qtbase))) ; for qmake
(home-page "https://www.riverbankcomputing.com/software/qscintilla/intro";)
(synopsis "Qt5 port of the Scintilla editing component")
(description
"QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor control.
As well as features found in standard text editing components, QScintilla
includes features especially useful when editing and debugging source code.
These include support for syntax styling, error indicators, code completion and
call tips.")
(license (list license:bsd-2 ; Python/configure.py
license:expat ; src/ and include/
license:gpl3
(define qtscintilla-for-octave
(package
(inherit qtscintilla)
(name "qtscintilla-for-octave")
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'configure 'change-directory
(lambda _ (chdir "Qt4Qt5") #t))
(replace 'configure
(lambda _ (zero? (system* "qmake" "qscintilla.pro"
(add-before 'install 'fix-Makefiles
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out(assoc-ref outputs "out"))
(qt (assoc-ref inputs "qt")))
(substitute* (find-files "." "Makefile")
(((string-append "INSTALL_ROOT)" qt))
(string-append "INSTALL_ROOT)" out
#t)
(native-inputs
`(("python-pyqt" ,python-pyqt)
("qt" ,qt-4))) ; for qmake
(synopsis "Qt4 port of the Scintilla editing component")))
signature.asc
Description: PGP signature
Re: [PATCH] gnu: Add qscintilla.
Kei Kebreau writes:
> A component necessary for GNU Octave's GUI.
> How does it look?
Not sure how packaging Qt packages goes, but I've discovered that
GNU Octave's GUI only builds with Qt4 support. I've changed the patch to
adjust this. Should I leave the old patch as is and add a qt4 package
that inherits from it?
From 51da032547ed3e1c2b7825b35b1f39a5e922b44b Mon Sep 17 00:00:00 2001
From: Kei Kebreau
Date: Tue, 13 Sep 2016 10:34:59 -0400
Subject: [PATCH] gnu: Add qscintilla.
* gnu/packages/qt.scm (qscintilla): New variable.
---
gnu/packages/qt.scm | 42 ++
1 file changed, 42 insertions(+)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index a482d75..159832a 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2015 Ludovic Courtès
;;; Copyright © 2015, 2016 Efraim Flashner
;;; Copyright © 2016 ng0
+;;; Copyright © 2016 Kei Kebreau
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1112,3 +1113,44 @@ contain over 620 classes.")
"QtKeychain is a Qt library to store passwords and other secret data
securely. It will not store any data unencrypted unless explicitly
requested.")
(license license:bsd-3)))
+
+(define-public qscintilla
+ (package
+(name "qscintilla")
+(version "2.9.3")
+(source (origin
+ (method url-fetch)
+ (uri (string-append
"mirror://sourceforge/QScintilla2/QScintilla-"
+ version "/QScintilla_gpl-" version
".tar.gz"))
+ (sha256
+ (base32
+"0znvdncpj64zcpbkyvj11dm8bdc3nfn5girggj33ammhfcyvkalq"
+(build-system gnu-build-system)
+(arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'configure
+ (lambda _
+ (chdir "Qt4Qt5")
+ (zero? (system* "qmake" "qscintilla.pro"
+ (add-before 'install 'fix-Makefiles
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out(assoc-ref outputs "out"))
+ (qt (assoc-ref inputs "qt")))
+ (substitute* (find-files "." "Makefile")
+ (((string-append "INSTALL_ROOT)" qt))
+ (string-append "INSTALL_ROOT)" out)
+(native-inputs
+ `(("python-pyqt" ,python-pyqt)
+ ("qt" ,qt-4))) ; for qmake
+(home-page "https://www.riverbankcomputing.com/software/qscintilla/intro";)
+(synopsis "Qt5 port of the Scintilla editing component")
+(description
+ "QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor
control.
+As well as features found in standard text editing components, QScintilla
+includes features especially useful when editing and debugging source code.
+These include support for syntax styling, error indicators, code completion and
+call tips.")
+(license (list license:bsd-2 ; Python/configure.py
+ license:expat ; src/ and include/
+ license:gpl3
--
2.10.0
signature.asc
Description: PGP signature
Re: [PATCH] gnu: Add schismtracker.
l...@gnu.org (Ludovic Courtès) writes: > Kei Kebreau skribis: > >> From 961dcf1e1e3ce45ea9d3f9c84fbe5562d52a1dd4 Mon Sep 17 00:00:00 2001 >> From: Kei Kebreau >> Date: Sat, 10 Sep 2016 10:27:34 -0400 >> Subject: [PATCH] gnu: Add schismtracker. >> >> * gnu/packages/music.scm (schismtracker): New variable. > > LGTM, thanks! > > Ludo'. Cool! Pushed as 89bcf3f. signature.asc Description: PGP signature
[PATCH] gnu: Add qscintilla.
A component necessary for GNU Octave's GUI.
How does it look?
From c6f182688ab5bd59aeca2e29d67bf527df869963 Mon Sep 17 00:00:00 2001
From: Kei Kebreau
Date: Mon, 12 Sep 2016 13:27:05 -0400
Subject: [PATCH] gnu: Add qscintilla.
* gnu/packages/qt.scm (qscintilla): New variable.
---
gnu/packages/qt.scm | 42 ++
1 file changed, 42 insertions(+)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index a482d75..e87e2e3 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2015 Ludovic Courtès
;;; Copyright © 2015, 2016 Efraim Flashner
;;; Copyright © 2016 ng0
+;;; Copyright © 2016 Kei Kebreau
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1112,3 +1113,44 @@ contain over 620 classes.")
"QtKeychain is a Qt library to store passwords and other secret data
securely. It will not store any data unencrypted unless explicitly
requested.")
(license license:bsd-3)))
+
+(define-public qscintilla
+ (package
+(name "qscintilla")
+(version "2.9.3")
+(source (origin
+ (method url-fetch)
+ (uri (string-append
"mirror://sourceforge/QScintilla2/QScintilla-"
+ version "/QScintilla_gpl-" version
".tar.gz"))
+ (sha256
+ (base32
+"0znvdncpj64zcpbkyvj11dm8bdc3nfn5girggj33ammhfcyvkalq"
+(build-system gnu-build-system)
+(arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'configure
+ (lambda _
+ (chdir "Qt4Qt5")
+ (zero? (system* "qmake" "qscintilla.pro"
+ (add-before 'install 'fix-Makefiles
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out(assoc-ref outputs "out"))
+ (qtbase (assoc-ref inputs "qtbase")))
+ (substitute* (find-files "." "Makefile")
+ (((string-append "INSTALL_ROOT)" qtbase))
+ (string-append "INSTALL_ROOT)" out)
+(native-inputs
+ `(("python-pyqt" ,python-pyqt)
+ ("qtbase" ,qtbase))) ; for qmake
+(home-page "https://www.riverbankcomputing.com/software/qscintilla/intro";)
+(synopsis "Qt5 port of the Scintilla editing component")
+(description
+ "QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor
control.
+As well as features found in standard text editing components, QScintilla
+includes features especially useful when editing and debugging source code.
+These include support for syntax styling, error indicators, code completion and
+call tips.")
+(license (list license:bsd-2 ; Python/configure.py
+ license:expat ; src/ and include/
+ license:gpl3
--
2.10.0
signature.asc
Description: PGP signature
Re: [PATCH] gnu: Add schismtracker.
l...@gnu.org (Ludovic Courtès) writes:
> Marius Bakke skribis:
>
>> Kei Kebreau writes:
>
> [...]
>
>>> +(home-page "http://schismtracker.org";)
>>> +(synopsis "Impulse Tracker clone")
>>
>> I think this should be more generic. The tagline from github works
>> pretty well: "Oldschool sample-based music composition tool".
>
> +1
>
>> The rest LGTM. But! The package records build time in version.c. I
>> managed to make it reproducible by adding a phase like this:
>>
>> (add-before 'build 'make-reproducible
>> (lambda _
>> ;; Remove use of __DATE__ and __TIME__ for reproducibility.
>> (substitute* "schism/version.c"
>> (("Schism Tracker built %s %s.*$")
>> (string-append "Schism Tracker version " ,version "\");")))
>> #t))
>
> I would suggest making it a ‘snippet’ instead, as we usually do in
> such
> cases.
>
> Thanks Kei & Marius!
>
> Ludo’.
I think I got everything... Will this do?
*Forgot to cc the mailing list last time! :P
From 961dcf1e1e3ce45ea9d3f9c84fbe5562d52a1dd4 Mon Sep 17 00:00:00 2001
From: Kei Kebreau
Date: Sat, 10 Sep 2016 10:27:34 -0400
Subject: [PATCH] gnu: Add schismtracker.
* gnu/packages/music.scm (schismtracker): New variable.
---
gnu/packages/music.scm | 46 ++
1 file changed, 46 insertions(+)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 88743aa..f294564 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1638,6 +1638,52 @@ for improved Amiga ProTracker 2/3 compatibility.")
;; 'src/milkyplay' is under Modified BSD, the rest is under GPL3 or later.
(license (list license:bsd-3 license:gpl3+
+(define-public schismtracker
+ (package
+(name "schismtracker")
+(version "20160521")
+(source (origin
+ (method url-fetch)
+ (uri (string-append
+"https://github.com/"; name "/" name "/archive/"
+version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+"0c6r24wm3rldm4j8cskl9xnixj3rwi3lnrhckw5gv43wpy6h4jcz"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; Remove use of __DATE__ and __TIME__ for reproducibility.
+ `(substitute* "schism/version.c"
+ (("Schism Tracker build %s %s.*$")
+ (string-append "Schism Tracker version " ,version
"\");"))
+(build-system gnu-build-system)
+(arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'autoconf
+ (lambda _ (zero? (system* "autoreconf" "-vfi"
+ (add-before 'configure 'link-libm
+ (lambda _ (setenv "LIBS" "-lm") #t)
+(native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("python" ,python)))
+(inputs
+ `(("alsa-lib" ,alsa-lib) ; for asound dependency
+ ("libx11" ,libx11)
+ ("libxext" ,libxext)
+ ("sdl" ,sdl)))
+(home-page "http://schismtracker.org";)
+(synopsis "Oldschool sample-based music composition tool")
+(description
+ "Schism Tracker is a reimplementation of Impulse Tracker, a program used
to
+create high quality music without the requirements of specialized, expensive
+equipment, and with a unique \"finger feel\" that is difficult to replicate in
+part. The player is based on a highly modified version of the ModPlug engine,
+with a number of bugfixes and changes to improve IT playback.")
+(license license:gpl2+)))
+
(define-public moc
(package
(name "moc")
--
2.10.0
signature.asc
Description: PGP signature
[PATCH] gnu: Add schismtracker.
For those who love making tracks, X11 or not!
If someone could look over this (and build it, please!), that would be
nice. :-)
From 91dbcb5c61de4b4b45f85b3bad8cf9e713c564b0 Mon Sep 17 00:00:00 2001
From: Kei Kebreau
Date: Fri, 9 Sep 2016 18:16:12 -0400
Subject: [PATCH] gnu: Add schismtracker.
* gnu/packages/music.scm (schismtracker): New variable.
---
gnu/packages/music.scm | 40
1 file changed, 40 insertions(+)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 88743aa..7c11771 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1638,6 +1638,46 @@ for improved Amiga ProTracker 2/3 compatibility.")
;; 'src/milkyplay' is under Modified BSD, the rest is under GPL3 or later.
(license (list license:bsd-3 license:gpl3+
+(define-public schismtracker
+ (package
+(name "schismtracker")
+(version "20160521")
+(source (origin
+ (method url-fetch)
+ (uri (string-append
+"https://github.com/"; name "/" name "/archive/"
+version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+"0c6r24wm3rldm4j8cskl9xnixj3rwi3lnrhckw5gv43wpy6h4jcz"
+(build-system gnu-build-system)
+(arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'autoconf
+ (lambda _ (zero? (system* "autoreconf" "-vfi"
+ (add-before 'configure 'link-libm
+ (lambda _ (setenv "LIBS" "-lm"))
+(native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)))
+(inputs
+ `(("alsa-lib" ,alsa-lib) ; for asound dependency
+ ("libx11" ,libx11)
+ ("libxext" ,libxext)
+ ("python" ,python-2)
+ ("sdl" ,sdl)))
+(home-page "http://schismtracker.org";)
+(synopsis "Impulse Tracker clone")
+(description
+ "Schism Tracker is a reimplementation of Impulse Tracker, a program used
to
+create high quality music without the requirements of specialized, expensive
+equipment, and with a unique \"finger feel\" that is difficult to replicate in
+part. The player is based on a highly modified version of the ModPlug engine,
+with a number of bugfixes and changes to improve IT playback.")
+(license license:gpl2+)))
+
(define-public moc
(package
(name "moc")
--
2.10.0
signature.asc
Description: PGP signature
Re: [PATCH] gnu: Add p7zip.
Ricardo Wurmus writes: > Efraim Flashner writes: > >> On Thu, Sep 01, 2016 at 03:05:34PM -0400, Kei Kebreau wrote: >>> Ricardo Wurmus writes: >>> >>> > Kei Kebreau writes: >>> > >>> >> Ricardo Wurmus writes: >>> >> >>> >>> Kei Kebreau writes: >>> >>> >>> >>>> Whoops, last patch was a bit messy and stacked on the previous one. >>> >>>> This >>> >>>> patch should be better! >>> >>> >>> >>> I just wanted to push a slightly modified version of this (attached) but >>> >>> I cannot actually build the package. The patch to remove unused code >>> >>> does not apply due to different line endings. >>> >>> >>> >>> Could you please take a look at this again and make sure that the patch >>> >>> to the sources applies? >>> >>> >>> >>> ~~ Ricardo >>> >>> >>> >> I just tried it on my machine, and everything applied and built >>> >> correctly from a clean Guix tree. I don't exactly know how to proceed >>> >> From here. Perhaps a third party can try to build from the patch? >>> > >>> > The problem might be with the inline patch in the email. Don’t know. >>> > >>> > ~~ Ricardo >>> >>> I'll try sending it again, for lack of a better plan. If all else fails >>> I can post it on paste.lisp.org. > >> Hunk #1 FAILED at 139 (different line endings). > [...] >> Hunk #1 FAILED at 47 (different line endings). > > These are the exact same errors I got. Maybe the line endings were > converted automatically when you saved the patch with your editor? > > ~~ Ricardo Maybe gnus is fixing the line endings when I save the patch. Try getting the patch from http://paste.lisp.org/+6YOD. Other than that I'm not sure what to do. None of my editors (Emacs, Zile and Nano) say anything weird about the line endings. signature.asc Description: PGP signature
Re: [PATCH] gnu: Add p7zip.
Ricardo Wurmus writes: > Kei Kebreau writes: > >> Ricardo Wurmus writes: >> >>> Kei Kebreau writes: >>> >>>> Whoops, last patch was a bit messy and stacked on the previous one. This >>>> patch should be better! >>> >>> I just wanted to push a slightly modified version of this (attached) but >>> I cannot actually build the package. The patch to remove unused code >>> does not apply due to different line endings. >>> >>> Could you please take a look at this again and make sure that the patch >>> to the sources applies? >>> >>> ~~ Ricardo >>> >> I just tried it on my machine, and everything applied and built >> correctly from a clean Guix tree. I don't exactly know how to proceed >> From here. Perhaps a third party can try to build from the patch? > > The problem might be with the inline patch in the email. Don’t know. > > ~~ Ricardo I'll try sending it again, for lack of a better plan. If all else fails I can post it on paste.lisp.org. From 1359649b23f1d7f2455797ac71549f00892abe10 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 27 Aug 2016 06:33:26 -0400 Subject: [PATCH] gnu: Add p7zip. * gnu/packages/compression.scm (p7zip): New variable. * gnu/packages/patches/remove-unused-p7zip-code.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/compression.scm | 65 ++ .../patches/p7zip-remove-unused-code.patch | 959 + 3 files changed, 1025 insertions(+) create mode 100644 gnu/packages/patches/p7zip-remove-unused-code.patch diff --git a/gnu/local.mk b/gnu/local.mk index b8c5378..cb82ff4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -694,6 +694,7 @@ dist_patch_DATA = \ %D%/packages/patches/openssl-CVE-2016-2178.patch \ %D%/packages/patches/orpheus-cast-errors-and-includes.patch \ %D%/packages/patches/ots-no-include-missing-file.patch \ + %D%/packages/patches/p7zip-remove-unused-code.patch \ %D%/packages/patches/patchelf-page-size.patch\ %D%/packages/patches/patchelf-rework-for-arm.patch \ %D%/packages/patches/patchutils-xfail-gendiff-tests.patch\ diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index c239d16..4e494c7 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016 Tobias Geerinckx-Rice ;;; Copyright © 2016 David Craven +;;; Copyright © 2016 Kei Kebreau ;;; ;;; This file is part of GNU Guix. ;;; @@ -895,3 +896,67 @@ compared to the fastest mode of zlib, Snappy is an order of magnitude faster for most inputs, but the resulting compressed files are anywhere from 20% to 100% bigger.") (license license:asl2.0))) + +(define-public p7zip + (package +(name "p7zip") +(version "16.02") +(source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/" name "/" name "/" + version "/" name "_" version + "_src_all.tar.bz2")) + (sha256 + (base32 +"07rlwbbgszq8i7m8jh3x6j2w2hc9a72dc7fmqawnqkwlwb00mcjy")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove non-free source files + (for-each delete-file +(append + (find-files "CPP/7zip/Compress" "Rar.*") + (find-files "CPP/7zip/Crypto" "Rar.*") + (find-files "DOC/unRarLicense.txt") + (find-files "Utils/file_Codecs_Rar_so.py"))) + (delete-file-recursively "CPP/7zip/Archive/Rar") + (delete-file-recursively "CPP/7zip/Compress/Rar") + #t)) + (patches (search-patches "p7zip-remove-unused-code.patch" +(build-system gnu-build-system) +(arguments + `(#:make-flags + (list (string-append "DEST_HOME=" (assoc-ref %outputs "out")) "all3") + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key system outputs #:allow-other-keys) + (zero? (system* "cp" + (let ((system ,(or (%current-target-system) +
