* gnu/package/gnome.scm (simple-scan): Update to 3.34.1 [build-system]: Switch to meson-build-system. [source]: Fetch from GNOME mirrors. [inputs]: Add libwebp. [native-inputs]: Remove colord. [arguments]: Remove #:configure-flags. Remove 'clean phase. [home-page]: Update to current home-page. --- gnu/packages/gnome.scm | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eae62a1d06..1956a672a3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4302,48 +4302,35 @@ USB transfers with your high-level application or system daemon.") (define-public simple-scan (package (name "simple-scan") - (version "3.24.1") + (version "3.34.1") (source (origin (method url-fetch) - (uri (string-append "https://launchpad.net/simple-scan/" + (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" - version "/+download/simple-scan-" - version ".tar.xz")) + name "-" version ".tar.xz")) (sha256 (base32 - "1czg21cdbd2fgqylxfnzfhhzy69gycf816d5bbaq6hb62hmq7bjy")))) - (build-system glib-or-gtk-build-system) + "0glzskxdc7p9z7nwcakqc7qzij4l79adlvvb2cj5fmis731zw9yq")))) + (build-system meson-build-system) (inputs `(("gtk" ,gtk+) ("zlib" ,zlib) ("cairo" ,cairo) + ;; Building with colord support fails with + ;; error: Package `colord' not found in specified Vala API directories or GObject-Introspection GIR directories + ;; ("colord-gtk" ,colord-gtk) ("gdk-pixbuf" ,gdk-pixbuf) ("gusb" ,gusb) - ("libsane" ,sane-backends))) + ("libsane" ,sane-backends) + ("libwebp" ,libwebp))) (native-inputs `(("gettext" ,gettext-minimal) ("itstool" ,itstool) - ("colord" ,colord) ("glib" ,glib "bin") ; glib-compile-schemas, etc. ("pkg-config" ,pkg-config) ("vala" ,vala) ("xmllint" ,libxml2))) - (arguments - '(#:configure-flags '("--disable-packagekit") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'clean - (lambda _ - ;; Remove a left-over reference to PackageKit. - - ;; https://bugs.launchpad.net/simple-scan/+bug/1462769 - - ;; There are some generated C files erroneously - ;; included in the source distribution, and this - ;; one breaks the build by referring to a - ;; non-existent header (packagekit.h) - (delete-file "src/ui.c")))))) - (home-page "https://launchpad.net/simple-scan") + (home-page "https://gitlab.gnome.org/GNOME/simple-scan") (synopsis "Document and image scanner") (description "Simple Scan is an easy-to-use application, designed to let users connect their scanner and quickly have the image/document in an -- 2.23.0