On Fri, Feb 19, 2016 at 11:18:02PM +0100, swedebu...@riseup.net wrote: > Hi > > This patch almost work. > > I really tried hard understanding what made cups fail after modifying the > configure flags and found lines in two makefiles under /notifier:65 and > /scheduler:159 to be patched.
I'm not sure what the specific problem is. If you share the error messages we may be able to give specific advice. > > How do I best create a patch for those? This is my approach. There may be a better approach but this does work. $ tar xf $(./pre-inst-env guix build --source foo) && cd foo $ git init && git add --all && git commit -m "Initial import of upstream sources" $ # make changes $ git add --update && git commit && git format-patch HEAD^ Then, I move the patch into the Guix source tree, add it to the package definition and gnu-system.am, and see if it works as expected. > > cheers > sdb > From 0149a4531b441b8609d4d63aa56010c82089829c Mon Sep 17 00:00:00 2001 > From: swedebugia <swedebu...@riseup.net> > Date: Fri, 19 Feb 2016 23:11:16 +0100 > Subject: [PATCH] gnu: cups: Update to 2.1.3 and add configure flags to enable > gnutls and writing logs and state to /var > > --- > gnu/packages/cups.scm | 19 +++++++++++++++---- > 1 file changed, 15 insertions(+), 4 deletions(-) > > diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm > index ff3d152..0b5742b 100644 > --- a/gnu/packages/cups.scm > +++ b/gnu/packages/cups.scm > @@ -111,21 +111,29 @@ filters for the PDF-centric printing workflow > introduced by OpenPrinting.") > (define-public cups-minimal > (package > (name "cups-minimal") > - (version "2.1.0") > + (version "2.1.3") > (source (origin > (method url-fetch) > (uri (string-append "http://www.cups.org/software/"; > version "/cups-" version > "-source.tar.bz2")) > (sha256 > (base32 > - "1jfjqsw9l7jbn5kb9i96k0wj12kjdbgx0rd8157dif22hi0kh0ms")))) > + "1lyl3z01xhg9xb9c8m42398c6h9kw8qr6jwiv8bjdsjab11hv9rn"))) > + ;; TODO: Create patch to the Makefiles in /notifier and > /scheduler > + ;; to remove calls to mkdir outside the chroot. > + ) > (build-system gnu-build-system) > (arguments > `(#:configure-flags > '("--disable-launchd" > "--disable-systemd" > "--disable-avahi" > - "--disable-dnssd") > + "--disable-dnssd" > + "--enable-gnutls" > + "--localstatedir=/var" > + "--with-logdir=/var/log/cups" > + "--with-rundir=/var/run/cups" > + "--with-cachedir=/var") > ;; Seven tests fail, mostly because of files that are provided by the > ;; cups-filters package. > #:tests? #f > @@ -174,7 +182,10 @@ device-specific programs to convert and print many types > of files.") > #:tests? #f > #:configure-flags > '("--disable-launchd" > - "--disable-systemd") > + "--disable-systemd" > + ;; TODO: when cups-minimal builds succesfully: add flags accordingly > + ;; below. > + "--localstatedir=/var") > #:phases > (alist-cons-before > 'configure > -- > 2.6.3 >
