From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: [PATCH 2/2] gnu: Move image viewers to (gnu packages image-viewers). Date: Fri, 2 Dec 2016 12:51:33 +0300 Message-ID: <20161202095133.5796-3-alezost@gmail.com> References: <20161202095133.5796-1-alezost@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:47482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCkVe-0004Yi-Rx for guix-devel@gnu.org; Fri, 02 Dec 2016 04:52:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cCkVZ-00018V-FS for guix-devel@gnu.org; Fri, 02 Dec 2016 04:52:02 -0500 Received: from mail-lf0-x244.google.com ([2a00:1450:4010:c07::244]:34704) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cCkVZ-00018J-1H for guix-devel@gnu.org; Fri, 02 Dec 2016 04:51:57 -0500 Received: by mail-lf0-x244.google.com with SMTP id o141so21606141lff.1 for ; Fri, 02 Dec 2016 01:51:56 -0800 (PST) Received: from localhost.localdomain ([217.107.192.156]) by smtp.gmail.com with ESMTPSA id u74sm679133lfi.9.2016.12.02.01.51.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Dec 2016 01:51:54 -0800 (PST) In-Reply-To: <20161202095133.5796-1-alezost@gmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * gnu/packages/feh.scm (feh): Remove file. Move package to... * gnu/packages/geeqie.scm (geeqie): Likewise... * gnu/packages/sxiv.scm (sxiv): Likewise... * gnu/packages/image-viewers.scm: ... here. * gnu/local.mk (GNU_SYSTEM_MODULES): Remove files. --- gnu/local.mk | 3 - gnu/packages/feh.scm | 67 --------------------- gnu/packages/geeqie.scm | 75 ------------------------ gnu/packages/image-viewers.scm | 130 ++++++++++++++++++++++++++++++++++++++++- gnu/packages/sxiv.scm | 62 -------------------- 5 files changed, 129 insertions(+), 208 deletions(-) delete mode 100644 gnu/packages/feh.scm delete mode 100644 gnu/packages/geeqie.scm delete mode 100644 gnu/packages/sxiv.scm diff --git a/gnu/local.mk b/gnu/local.mk index c6461aa..7d30391 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -123,7 +123,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/entr.scm \ %D%/packages/erlang.scm \ %D%/packages/fcitx.scm \ - %D%/packages/feh.scm \ %D%/packages/figlet.scm \ %D%/packages/file.scm \ %D%/packages/finance.scm \ @@ -147,7 +146,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/gd.scm \ %D%/packages/gdb.scm \ %D%/packages/geo.scm \ - %D%/packages/geeqie.scm \ %D%/packages/gettext.scm \ %D%/packages/gforth.scm \ %D%/packages/ghostscript.scm \ @@ -349,7 +347,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/statistics.scm \ %D%/packages/suckless.scm \ %D%/packages/swig.scm \ - %D%/packages/sxiv.scm \ %D%/packages/synergy.scm \ %D%/packages/syndication.scm \ %D%/packages/task-management.scm \ diff --git a/gnu/packages/feh.scm b/gnu/packages/feh.scm deleted file mode 100644 index 6b998aa..0000000 --- a/gnu/packages/feh.scm +++ /dev/null @@ -1,67 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014 Ian Denhardt -;;; Copyright © 2016 Efraim Flashner -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages feh) - #:use-module (gnu packages) - #:use-module (gnu packages image) - #:use-module (gnu packages curl) - #:use-module (gnu packages xorg) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system gnu) - #:use-module ((guix licenses) #:prefix license:)) - -(define-public feh - (package - (name "feh") - (version "2.14.1") - (home-page "https://feh.finalrewind.org/") - (source (origin - (method url-fetch) - (uri (string-append home-page - name "-" version ".tar.bz2")) - (sha256 - (base32 - "1hlzgr0masgbm1vdn085vz81s9kpnah8kjkb1w1xfsxr1b99x8f0")))) - (build-system gnu-build-system) - (arguments - '(#:phases (alist-delete 'configure %standard-phases) - #:tests? #f - #:make-flags - (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out"))))) - (inputs `(("imlib2" ,imlib2) - ("curl" ,curl) - ("libpng" ,libpng) - ("libxt" ,libxt) - ("libx11" ,libx11) - ("libxinerama" ,libxinerama))) - (synopsis "Fast and light imlib2-based image viewer") - (description - "feh is an X11 image viewer aimed mostly at console users. -Unlike most other viewers, it does not have a fancy GUI, but simply -displays images. It can also be used to set the desktop wallpaper. -It is controlled via commandline arguments and configurable key/mouse -actions.") - - ;; The license is really the Expat license, with additional wording in the - ;; 2nd paragraph: "acknowledgment shall be given in the documentation and - ;; software packages that this Software was used." - (license (license:x11-style - "file://COPYING" - "See 'COPYING' in the distribution.")))) diff --git a/gnu/packages/geeqie.scm b/gnu/packages/geeqie.scm deleted file mode 100644 index bc922d5..0000000 --- a/gnu/packages/geeqie.scm +++ /dev/null @@ -1,75 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Ludovic Courtès -;;; Copyright © 2016 Efraim Flashner -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages geeqie) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module ((guix licenses) #:prefix l:) - #:use-module (guix build-system gnu) - #:use-module (gnu packages autotools) - #:use-module (gnu packages compression) - #:use-module (gnu packages ghostscript) - #:use-module (gnu packages glib) - #:use-module (gnu packages gtk) - #:use-module (gnu packages image) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages xml)) - -(define-public geeqie - (package - (name "geeqie") - (version "1.3") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/BestImageViewer/geeqie/" - "releases/download/v" version "/geeqie-" - version ".tar.xz")) - (sha256 - (base32 - "0gzc82sy66pbsmq7lnmq4y37zqad1zfwfls3ik3dmfm8s5nmcvsb")))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'autogen - (lambda _ - (setenv "NOCONFIGURE" "true") - (zero? (system* "sh" "autogen.sh"))))))) - (inputs - `(;; ("libchamplain" ,libchamplain) - ("lcms" ,lcms) - ("exiv2" ,exiv2) - ("libpng" ,libpng) - ("gtk+" ,gtk+-2))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("glib" ,glib "bin") ; glib-gettextize - ("intltool" ,intltool) - ("pkg-config" ,pkg-config))) - (home-page "http://www.geeqie.org/") - (synopsis "Lightweight GTK+ based image viewer") - (description - "Geeqie is a lightweight GTK+ based image viewer for Unix like operating -systems. It features: EXIF, IPTC and XMP metadata browsing and editing -interoperability; easy integration with other software; geeqie works on files -and directories, there is no need to import images; fast preview for many raw -image formats; tools for image comparison, sorting and managing photo -collection. Geeqie was initially based on GQview.") - (license l:gpl2+))) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index eb25c11..11cead6 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -1,5 +1,11 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Ludovic Courtès +;;; Copyright © 2014 Ian Denhardt +;;; Copyright © 2015, 2016 Alex Kost ;;; Copyright © 2016 Efraim Flashner ;;; +;;; This file is part of GNU Guix. +;;; ;;; GNU Guix is free software; you can redistribute it and/or modify it ;;; under the terms of the GNU General Public License as published by ;;; the Free Software Foundation; either version 3 of the License, or (at @@ -20,11 +26,133 @@ #:use-module (guix build-system gnu) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages curl) + #:use-module (gnu packages ghostscript) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages image) - #:use-module (gnu packages pkg-config)) + #:use-module (gnu packages photo) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages xorg)) + +(define-public feh + (package + (name "feh") + (version "2.14.1") + (home-page "https://feh.finalrewind.org/") + (source (origin + (method url-fetch) + (uri (string-append home-page + name "-" version ".tar.bz2")) + (sha256 + (base32 + "1hlzgr0masgbm1vdn085vz81s9kpnah8kjkb1w1xfsxr1b99x8f0")))) + (build-system gnu-build-system) + (arguments + '(#:phases (alist-delete 'configure %standard-phases) + #:tests? #f + #:make-flags + (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out"))))) + (inputs `(("imlib2" ,imlib2) + ("curl" ,curl) + ("libpng" ,libpng) + ("libxt" ,libxt) + ("libx11" ,libx11) + ("libxinerama" ,libxinerama))) + (synopsis "Fast and light imlib2-based image viewer") + (description + "feh is an X11 image viewer aimed mostly at console users. +Unlike most other viewers, it does not have a fancy GUI, but simply +displays images. It can also be used to set the desktop wallpaper. +It is controlled via commandline arguments and configurable key/mouse +actions.") + + ;; The license is really the Expat license, with additional wording in the + ;; 2nd paragraph: "acknowledgment shall be given in the documentation and + ;; software packages that this Software was used." + (license (license:x11-style + "file://COPYING" + "See 'COPYING' in the distribution.")))) + +(define-public geeqie + (package + (name "geeqie") + (version "1.3") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/BestImageViewer/geeqie/" + "releases/download/v" version "/geeqie-" + version ".tar.xz")) + (sha256 + (base32 + "0gzc82sy66pbsmq7lnmq4y37zqad1zfwfls3ik3dmfm8s5nmcvsb")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'autogen + (lambda _ + (setenv "NOCONFIGURE" "true") + (zero? (system* "sh" "autogen.sh"))))))) + (inputs + `(;; ("libchamplain" ,libchamplain) + ("lcms" ,lcms) + ("exiv2" ,exiv2) + ("libpng" ,libpng) + ("gtk+" ,gtk+-2))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("glib" ,glib "bin") ; glib-gettextize + ("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (home-page "http://www.geeqie.org/") + (synopsis "Lightweight GTK+ based image viewer") + (description + "Geeqie is a lightweight GTK+ based image viewer for Unix like operating +systems. It features: EXIF, IPTC and XMP metadata browsing and editing +interoperability; easy integration with other software; geeqie works on files +and directories, there is no need to import images; fast preview for many raw +image formats; tools for image comparison, sorting and managing photo +collection. Geeqie was initially based on GQview.") + (license license:gpl2+))) + +(define-public sxiv + (package + (name "sxiv") + (version "1.3.2") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/muennich/sxiv/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0lxnd33gaw4drhdwbkk94wzrjyhh64d57jq2ps7ffmqgizg6hlwz")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ; no check target + #:make-flags (list (string-append "PREFIX=" %output) + "CC=gcc") + #:phases (alist-delete + 'configure ; no configure phase + %standard-phases))) + (inputs + `(("libx11" ,libx11) + ("imlib2" ,imlib2) + ("giflib" ,giflib) + ("libexif" ,libexif))) + (home-page "https://github.com/muennich/sxiv") + (synopsis "Simple X Image Viewer") + (description + "sxiv is an alternative to feh and qiv. Its primary goal is to +provide the most basic features required for fast image viewing. It has +vi key bindings and works nicely with tiling window managers. Its code +base should be kept small and clean to make it easy for you to dig into +it and customize it for your needs.") + (license license:gpl2+))) (define-public viewnior (package diff --git a/gnu/packages/sxiv.scm b/gnu/packages/sxiv.scm deleted file mode 100644 index 8a81d48..0000000 --- a/gnu/packages/sxiv.scm +++ /dev/null @@ -1,62 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016 Alex Kost -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages sxiv) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system gnu) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (gnu packages xorg) - #:use-module (gnu packages image) - #:use-module (gnu packages photo)) - -(define-public sxiv - (package - (name "sxiv") - (version "1.3.2") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/muennich/sxiv/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0lxnd33gaw4drhdwbkk94wzrjyhh64d57jq2ps7ffmqgizg6hlwz")))) - (build-system gnu-build-system) - (arguments - '(#:tests? #f ; no check target - #:make-flags (list (string-append "PREFIX=" %output) - "CC=gcc") - #:phases (alist-delete - 'configure ; no configure phase - %standard-phases))) - (inputs - `(("libx11" ,libx11) - ("imlib2" ,imlib2) - ("giflib" ,giflib) - ("libexif" ,libexif))) - (home-page "https://github.com/muennich/sxiv") - (synopsis "Simple X Image Viewer") - (description - "sxiv is an alternative to feh and qiv. Its primary goal is to -provide the most basic features required for fast image viewing. It has -vi key bindings and works nicely with tiling window managers. Its code -base should be kept small and clean to make it easy for you to dig into -it and customize it for your needs.") - (license license:gpl2+))) -- 2.10.2