GNU bug report logs - #34644
[PATCH] gnu: Add xsane.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 34644 in the body.
You can then email your comments to 34644 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Tobias Geerinckx-Rice <me <at> tobias.gr>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: Add xsane.
Date: Mon, 25 Feb 2019 02:25:02 +0100

* gnu/packages/scanner.scm (xsane): New public variable.
---
 gnu/packages/scanner.scm | 70 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 69 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm
index 920f2ede80..70106a7796 100644
--- a/gnu/packages/scanner.scm
+++ b/gnu/packages/scanner.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2014 John Darrington <jmd <at> gnu.org>
 ;;; Copyright © 2015 Andy Wingo <wingo <at> igalia.com>
 ;;; Copyright © 2016 Andy Patterson <ajpatter <at> uwaterloo.ca>
-;;; Copyright © 2017 Tobias Geerinckx-Rice <me <at> tobias.gr>
+;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2018 Efraim Flashner <efraim <at> flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -21,10 +21,14 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages scanner)
+  #:use-module (gnu packages ghostscript)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages image)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages pkg-config)
   #:use-module (guix build-system gnu)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module ((guix licenses)
                 #:prefix licence:)
   #:use-module (guix packages)
@@ -132,3 +136,67 @@ package contains the library, but no drivers.")
 proving access to any raster image scanner hardware (flatbed scanner,
 hand-held scanner, video- and still-cameras, frame-grabbers, etc.).  The
 package contains the library and drivers.")))
+
+(define-public xsane
+  (package
+    (name "xsane")
+    (version "0.999")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.com/sane-project/frontend/xsane.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "08zvxj7i1s88ckrsqldmsrikc3g62a6p3s3i5b5x4krcfpi3vs50"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:make-flags
+       (list (string-append "xsanedocdir=" (assoc-ref %outputs "out")
+                            "/share/doc/" ,name "-" ,version))
+       #:tests? #f                      ; no test suite
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-invalid-dereference
+           ;; Fix the following compilation error with libpng:
+           ;;   xsane-save.c: In function ‘xsane_save_png’:
+           ;;   xsane-save.c:4913:21: error: dereferencing pointer to
+           ;;   incomplete type ‘png_struct {aka struct png_struct_def}’
+           ;;       if (setjmp(png_ptr->jmpbuf))
+           ;;                         ^
+           (lambda _
+             (substitute* "src/xsane-save.c"
+               (("png_ptr->jmpbuf") "png_jmpbuf(png_ptr)"))
+             #t))
+         (add-after 'unpack 'use-sane-help-browser
+           (lambda _
+             (substitute* "src/xsane.h"
+               (("netscape") "xdg-open"))
+             #t))
+         (add-after 'install 'delete-empty-/sbin
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (rmdir (string-append out "/sbin"))
+               #t))))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("gtk+" ,gtk+-2)
+       ("lcms" ,lcms)
+       ("libjpeg" ,libjpeg)
+       ("libtiff" ,libtiff)
+       ("sane-backends" ,sane-backends)))
+    (home-page "https://gitlab.com/sane-project/frontend/xsane")
+    (synopsis "Featureful graphical interface for document and image scanners")
+    (description
+     "XSane is a graphical interface for controlling a scanner and acquiring
+images from it.  You can photocopy multi-page documents and save, fax, print,
+or e-mail your scanned images.  It is highly configurable and exposes all
+device settings, letting you fine-tune the final result.  It can also be used
+as a GIMP plugin to aquire images directly from a scanner.
+
+XSane is a front-end for SANE, which means that almost any existing scanner is
+supported: flatbed and hand-held scanners, video and still cameras, and frame
+grabbers.")
+    (license licence:gpl2+))) ; lib/snprintf.c is under the ‘Artistic’ licence
-- 
2.20.1

Message #8 received at 34644 <at> debbugs.gnu.org (full text, mbox):

From: Diego Nicola Barbato <dnbarbato <at> posteo.de>
To: Tobias Geerinckx-Rice <me <at> tobias.gr>
Cc: 34644 <at> debbugs.gnu.org
Subject: Re: [bug#34644] [PATCH] gnu: Add xsane.
Date: Mon, 25 Feb 2019 22:05:34 +0100

Hello Tobias,

Tobias Geerinckx-Rice <me <at> tobias.gr> writes:


[...]


> +    (license licence:gpl2+))) ; lib/snprintf.c is under the ‘Artistic’ licence
The FSF lists the ‘Artistic’ license as a nonfree software license [0].
I am no expert, but this might be a problem.

Sorry for the noise,

Diego

[0]: https://www.gnu.org/licenses/license-list.html#ArtisticLicense

Message #11 received at 34644 <at> debbugs.gnu.org (full text, mbox):

From: Tobias Geerinckx-Rice <somebody <at> not-sent-or-endorsed-by.tobias.gr>
To: Diego Nicola Barbato <dnbarbato <at> posteo.de>
Cc: 34644 <at> debbugs.gnu.org
Subject: Re: [bug#34644] [PATCH] gnu: Add xsane.
Date: Mon, 25 Feb 2019 23:57:12 +0100

Diego (Nicola?),

Diego Nicola Barbato wrote:
>> +    (license licence:gpl2+))) ; lib/snprintf.c is under the 
>> ‘Artistic’ licence
> The FSF lists the ‘Artistic’ license as a nonfree software 
> license [0].
> I am no expert, but this might be a problem.

Nor I.  It's an interesting situation: snprintf.c seems to have 
been re-(dual-)licenced under both Artistic and GPL2+OpenSSL 
exception.

However, the version shipped with xsane is older (perhaps xsane 
itself is, even).

I guess we can just do what Trisquel does and replace it with a 
newer version.  There's also some talk of a ’system snprintf’ that 
may or may not do the job without having to provide our own 
replacement.

Something to investigate.

> [0]: 
> https://www.gnu.org/licenses/license-list.html#ArtisticLicense

Thanks,

T G-R

[1]: 
https://devel.trisquel.info/trisquel/package-helpers/merge_requests/12

Message #14 received at 34644 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: Tobias Geerinckx-Rice <me <at> tobias.gr>
Cc: 34644 <at> debbugs.gnu.org
Subject: Re: [bug#34644] [PATCH] gnu: Add xsane.
Date: Tue, 26 Feb 2019 15:20:55 +0100

[Message part 1 (text/plain, inline)]

LGTM!

[Message part 2 (application/pgp-signature, inline)]

Message #17 received at 34644 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: Tobias Geerinckx-Rice <somebody <at> not-sent-or-endorsed-by.tobias.gr>
Cc: 34644 <at> debbugs.gnu.org, Diego Nicola Barbato <dnbarbato <at> posteo.de>
Subject: Re: [bug#34644] [PATCH] gnu: Add xsane.
Date: Tue, 26 Feb 2019 15:32:06 +0100

[Message part 1 (text/plain, inline)]

Hi,

On Mon, 25 Feb 2019 23:57:12 +0100
Tobias Geerinckx-Rice <somebody <at> not-sent-or-endorsed-by.tobias.gr> wrote:

> Nor I.  It's an interesting situation: snprintf.c seems to have 
> been re-(dual-)licenced under both Artistic and GPL2+OpenSSL 
> exception.
> 
> However, the version shipped with xsane is older (perhaps xsane 
> itself is, even).
> 
> I guess we can just do what Trisquel does and replace it with a 
> newer version.

Sure.

> There's also some talk of a ’system snprintf’ that 
> may or may not do the job without having to provide our own 
> replacement.

If we did that we should mention it upstream--maybe their implementation
has special features that they require that a system implementation
would not have.

[Message part 2 (application/pgp-signature, inline)]

Message #22 received at 34644-close <at> debbugs.gnu.org (full text, mbox):

From: Tobias Geerinckx-Rice <me <at> tobias.gr>
To: 34644-close <at> debbugs.gnu.org
Subject: Re: [bug#34644] [PATCH] gnu: Add xsane.
Date: Fri, 22 Nov 2019 22:20:49 +0100

[Message part 1 (text/plain, inline)]

Finally pushed as a608666d74f156819cecfabaf72290726d7964e6.

Kind regards,

T G-R

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.