From 2b7d10d2db9f5e2dc2afb0d8711ce67e0a63229b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Feb 2017 14:06:19 +0100 Subject: [PATCH] gnu: maim: Update to 4.4.47. * gnu/packages/xdisorg.scm (maim): Update to 4.4.47. [arguments]: Remove obsolete 'patch-source' phase. [inputs]: Remove LIBX11 and IMLIB2. Add GLM, LIBJPEG-TURBO, LIBPNG, LIBXCOMPOSITE, MESA and ZLIB. --- gnu/packages/xdisorg.scm | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index d94455f834..8aa4c38db4 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -469,7 +469,7 @@ (define-public slop (define-public maim (package (name "maim") - (version "3.4.47") + (version "4.4.47") (source (origin (method url-fetch) (uri (string-append @@ -478,27 +478,20 @@ (define-public maim (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0kfp7k55bxc5h6h0wv8bwmsc5ny66h9ra2z4dzs4yzszq16544pv")))) + "0bfq2p158b26s913afbh6vvs4mhxs897q9zwb0hhifyx8i85863i")))) (build-system cmake-build-system) (arguments - '(#:tests? #f ; no "check" target - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda* (#:key inputs #:allow-other-keys) - (let ((slop (string-append (assoc-ref inputs "slop") - "/bin/slop"))) - ;; "slop" command is hardcoded in the source; replace it - ;; with the full file name. - (substitute* "src/main.cpp" - (("^( +slopcommand.*)\"slop\"" all front) - (string-append front "\"" slop "\""))))))))) + '(#:tests? #f)) ; no "check" target (inputs - `(("libx11" ,libx11) - ("libxrandr" ,libxrandr) + `(("glm" ,glm) + ("libjpeg" ,libjpeg-turbo) + ("libpng" ,libpng) + ("libxcomposite" ,libxcomposite) ("libxfixes" ,libxfixes) - ("imlib2" ,imlib2) - ("slop" ,slop))) + ("libxrandr" ,libxrandr) + ("mesa" ,mesa) + ("slop" ,slop) + ("zlib" ,zlib))) (home-page "https://github.com/naelstrof/maim") (synopsis "Screenshot utility for X Window System") (description