From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: Re: [PATCH 1/3] gnu: Add imlib2. Date: Thu, 25 Sep 2014 21:36:46 +0400 Message-ID: <87h9zvd2kx.fsf@gmail.com> References: <87wq8scc81.fsf@gmail.com> <8761gbluy0.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:50646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XXCyS-0003gn-Gb for guix-devel@gnu.org; Thu, 25 Sep 2014 13:37:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XXCyN-0000mO-0n for guix-devel@gnu.org; Thu, 25 Sep 2014 13:37:00 -0400 In-Reply-To: <8761gbluy0.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Thu, 25 Sep 2014 14:56:55 +0200") 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-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Ludovic =?utf-8?Q?Court=C3=A8s?= Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Many thanks to Andreas for detailed comments about licenses. Ludovic Court=C3=A8s (2014-09-25 16:56 +0400) wrote: > Alex Kost skribis: > >> +(define-public imlib2 > > [...] > >> + (home-page "http://sourceforge.net/projects/enlightenment/") >> + (synopsis >> + "Library for loading, saving, rendering and manipulating image fil= es") > > s/Library for// Done. Is there any convention about that? I'm asking because there are several "types" of synopses: - Several synopses begin with "Library for" (libuv, fontconfig, lightning, ...) - Few ones begin with "Library to" (cloog, petsc, ...) - Some packages have the following synopsis structure: , a library ... Some of them begin with a capital letter (libjpeg, libgpg-error, freetype, ...), and some with a small one (fpill, libogg, libpaper, ...) - Many synopses end with "library" (libsamplerate, clucene, libgcrypt, ...) Also (as I'm writing about synopses): is there a convention to begin a synopsis with a capital letter? There are synopses beginning with a small letter (not counting synopses beginning with a package name): gnome-vfs, cdparanoia, signing-party, ... Also there are 2 packages with synopses beginning with an article: =E2=80=9Cpkg-config=E2=80=9D and =E2=80=9Cid3lib=E2=80=9D, but it's a lower= -case article (perhaps "guix lint" should be adjusted for this case). > Actually this should probably go to (gnu packages image), which is home > for all its friends. OK, initially I wanted to put it there, but then I found that =E2=80=9Cgifl= ib=E2=80=9D is in a separate file, so I thought that maybe "image.scm" contains some special image libraries. If =E2=80=9Cgiflib=E2=80=9D also should be put in "image.scm", please don't= move it there before I push these imlib2/giblib commits :-) Thanks. The modified patch is attached. Good enough? --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-gnu-Add-imlib2.patch >From 11c8f170a0f3c8f5f4ed4730681224de46745d62 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Thu, 25 Sep 2014 12:27:25 +0400 Subject: [PATCH 1/3] gnu: Add imlib2. * gnu/packages/image.scm (imlib2): New variable. --- gnu/packages/image.scm | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 981d3a8..a9c3a5d 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -23,6 +23,8 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages xml) #:use-module (gnu packages ghostscript) ;lcms + #:use-module (gnu packages xorg) + #:use-module (gnu packages giflib) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) @@ -213,3 +215,53 @@ an indexing tool useful for the JPIP protocol, JPWL-tools for error-resilience, a Java-viewer for j2k-images, ...") (home-page "http://jbig2dec.sourceforge.net/") (license license:bsd-2))) + +(define-public imlib2 + (package + (name "imlib2") + (version "1.4.6") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/enlightenment/imlib2-" + version ".tar.gz")) + (sha256 + (base32 + "0kjggg4gfn6chi8v1xddd5qwk1fbnl7rvd93qiclv5v11s615k0p")))) + (build-system gnu-build-system) + (arguments + '(;; Will be fixed in the next release: + ;; . + #:phases (alist-cons-before + 'configure 'patch-config + (lambda _ + (substitute* "imlib2-config.in" + (("@my_libs@") ""))) + %standard-phases))) + (native-inputs + `(("pkgconfig" ,pkg-config))) + (inputs + `(("libx11" ,libx11) + ("libxext" ,libxext) + ("freetype" ,freetype) + ("libjpeg" ,libjpeg) + ("libpng" ,libpng) + ("libtiff" ,libtiff) + ("giflib" ,giflib) + ("bzip2" ,bzip2))) + (home-page "http://sourceforge.net/projects/enlightenment/") + (synopsis + "Loading, saving, rendering and manipulating image files") + (description + "Imlib2 is a library that does image file loading and saving as well as +rendering, manipulation, arbitrary polygon support, etc. + +It does ALL of these operations FAST. Imlib2 also tries to be highly +intelligent about doing them, so writing naive programs can be done easily, +without sacrificing speed. + +This is a complete rewrite over the Imlib 1.x series. The architecture is +more modular, simple, and flexible.") + ;; This license adds several sentences to the original X11 license. + (license (license:x11-style "file://COPYING" + "See 'COPYING' in the distribution.")))) -- 2.1.0 --=-=-=--