From: swedebugia@riseup.net
To: guix-devel <guix-devel@gnu.org>
Subject: gnu: cups: Update to 2.1.3 - request for help patching Makefiles
Date: Fri, 19 Feb 2016 23:18:02 +0100 [thread overview]
Message-ID: <d908e7754592a14ccb6ae66c98770833@riseup.net> (raw)
[-- Attachment #1: Type: text/plain, Size: 259 bytes --]
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.
How do I best create a patch for those?
cheers
sdb
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-cups-Update-to-2.1.3-and-add-configure-flags-to-.patch --]
[-- Type: text/x-diff; name=0001-gnu-cups-Update-to-2.1.3-and-add-configure-flags-to-.patch, Size: 2253 bytes --]
From 0149a4531b441b8609d4d63aa56010c82089829c Mon Sep 17 00:00:00 2001
From: swedebugia <swedebugia@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
next reply other threads:[~2016-02-19 22:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-19 22:18 swedebugia [this message]
2016-02-20 5:57 ` gnu: cups: Update to 2.1.3 - request for help patching Makefiles Leo Famulari
2016-02-23 14:11 ` swedebugia
2016-02-23 15:52 ` Ricardo Wurmus
2016-02-23 20:00 ` swedebugia
2016-02-24 18:20 ` [PATCH] gnu: cups: Update to 2.1.3 (was gnu: cups: Update to 2.1.3 - request for help patching Makefiles) swedebugia
2016-03-03 15:44 ` Ricardo Wurmus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d908e7754592a14ccb6ae66c98770833@riseup.net \
--to=swedebugia@riseup.net \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.