From 3746b4ab86e72871bd77ad993ea1d4c83a59088a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:01 +0200 Subject: gnu: cups-pk-helper: Update to 0.2.7. * gnu/packages/cups.scm (cups-pk-helper): Update to 0.2.7. [build-system]: Switch to Meson. [arguments]: Explicitly disable tests. [native-inputs]: Remove unused intltool and add glib:bin. --- gnu/packages/cups.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu/packages/cups.scm') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 005ec15f11..09c5eadf50 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -50,6 +50,7 @@ (define-module (gnu packages cups) #:use-module (gnu packages tls) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (guix download) #:use-module (guix git-download) @@ -465,17 +466,20 @@ (define-public cups (define-public cups-pk-helper (package (name "cups-pk-helper") - (version "0.2.6") + (version "0.2.7") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/" name "/releases/" name "-" version ".tar.xz")) (sha256 (base32 - "0a52jw6rm7lr5nbyksiia0rn7sasyb5cjqcb95z1wxm2yprgi6lm")))) - (build-system gnu-build-system) + "0cg8wbxpkz9bkpasz973cdazi02svqpbw9mafvpgrscg8kdhs1v6")))) + (build-system meson-build-system) + (arguments + ;; XXX The tests require a running D-Bus and CUPS daemon, of course. + (list #:tests? #f)) (native-inputs - (list intltool pkg-config glib polkit cups)) + (list pkg-config `(,glib "bin") polkit cups)) (home-page "https://www.freedesktop.org/wiki/Software/cups-pk-helper/") (synopsis "PolicyKit helper to configure CUPS with fine-grained privileges") (description -- cgit v1.2.3 From a8bd13c3993810428fc2e207791465bd8b297a17 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:00 +0200 Subject: gnu: cups-pk-helper: Make references non-native. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cups.scm (cups-pk-helper)[native-inputs]: Move cups & polkit from here… [inputs]: …to here. Make cups-minimal. Add glib. --- gnu/packages/cups.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/cups.scm') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 09c5eadf50..3ff750cfa8 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -479,7 +479,9 @@ (define-public cups-pk-helper ;; XXX The tests require a running D-Bus and CUPS daemon, of course. (list #:tests? #f)) (native-inputs - (list pkg-config `(,glib "bin") polkit cups)) + (list pkg-config `(,glib "bin"))) + (inputs + (list glib polkit cups-minimal)) (home-page "https://www.freedesktop.org/wiki/Software/cups-pk-helper/") (synopsis "PolicyKit helper to configure CUPS with fine-grained privileges") (description -- cgit v1.2.3 From 0831f91f5537f417df69be7eb54d285e4402a636 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:01 +0200 Subject: gnu: epson-inkjet-printer-escpr: Update to 1.7.21. * gnu/packages/cups.scm (epson-inkjet-printer-escpr): Update to 1.7.21. --- gnu/packages/cups.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages/cups.scm') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 3ff750cfa8..5070ab6693 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -860,7 +860,7 @@ (define-public foo2zjs (define-public epson-inkjet-printer-escpr (package (name "epson-inkjet-printer-escpr") - (version "1.7.18") + (version "1.7.21") ;; XXX: This currently works. But it will break as soon as a newer ;; version is available since the URLs for older versions are not ;; preserved. An alternative source will be added as soon as @@ -868,11 +868,11 @@ (define-public epson-inkjet-printer-escpr (source (origin (method url-fetch) - (uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/13/43/" - "81/cbdd80826424935cef20d16be8ee5851388977a7/" - "epson-inkjet-printer-escpr-1.7.18-1lsb3.2.tar.gz")) + (uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/13/77/" + "93/e85dc2dc266e96fdc242bd95758bd88d1a51963e/" + "epson-inkjet-printer-escpr-1.7.21-1lsb3.2.tar.gz")) (sha256 - (base32 "06pa47rl1gy19bg3fsp4a4y9vdy4ya2maajm14n791ivhf2hcwyh")))) + (base32 "0z1x9p58321plf2swfxgl72wn7ls8bfbyjwd9l9c8jxfr1v2skkz")))) (build-system gnu-build-system) (arguments (list #:modules -- cgit v1.2.3 From e315d9a8024e8964f6bd066b4a2ac8d626754e80 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:01 +0200 Subject: gnu: cups-pk-helper: Add etc/dbus-1 compatibility symlink. * gnu/packages/cups.scm (cups-pk-helper)[arguments]: Add an 'install-compatibility-symlink phase. --- gnu/packages/cups.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'gnu/packages/cups.scm') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 5070ab6693..3de9ddbf22 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -477,9 +477,20 @@ (define-public cups-pk-helper (build-system meson-build-system) (arguments ;; XXX The tests require a running D-Bus and CUPS daemon, of course. - (list #:tests? #f)) + (list #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-compatibility-symlink + ;; XXX Upstream (and, presumably, the world) has moved to + ;; /share/dbus-1 over /etc/dbus-1, but Guix System's + ;; dbus-configuration-directory has yet to catch up. + ;; TODO It should be properly fixed and this phase removed. + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion (assoc-ref outputs "out") + (mkdir-p "etc") + (symlink "../share/dbus-1" "etc/dbus-1"))))))) (native-inputs - (list pkg-config `(,glib "bin"))) + (list intltool pkg-config `(,glib "bin"))) (inputs (list glib polkit cups-minimal)) (home-page "https://www.freedesktop.org/wiki/Software/cups-pk-helper/") -- cgit v1.2.3