From a86177d61cdc1acaa47132615c67eec3e43b9dca Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Tue, 12 Feb 2013 13:19:26 +0100 Subject: gnu: Rename module 'freetype' to the more general 'fontutils'. * gnu/packages/freetype.scm: Rename file to... * gnu/packages/fontutils.scm: ...this. * Makefile.am (MODULES): Rename module. * gnu/packages/{ghostscript,grub,pdf,texlive}.scm: Rename dependency. --- Makefile.am | 2 +- gnu/packages/fontutils.scm | 147 +++++++++++++++++++++++++++++++++++++++++++ gnu/packages/freetype.scm | 147 ------------------------------------------- gnu/packages/ghostscript.scm | 2 +- gnu/packages/grub.scm | 2 +- gnu/packages/pdf.scm | 2 +- gnu/packages/texlive.scm | 2 +- 7 files changed, 152 insertions(+), 152 deletions(-) create mode 100644 gnu/packages/fontutils.scm delete mode 100644 gnu/packages/freetype.scm diff --git a/Makefile.am b/Makefile.am index b90f7e02c0..df106b899d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,7 +68,7 @@ MODULES = \ gnu/packages/emacs.scm \ gnu/packages/file.scm \ gnu/packages/flex.scm \ - gnu/packages/freetype.scm \ + gnu/packages/fontutils.scm \ gnu/packages/gawk.scm \ gnu/packages/gdb.scm \ gnu/packages/gdbm.scm \ diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm new file mode 100644 index 0000000000..551d4ac167 --- /dev/null +++ b/gnu/packages/fontutils.scm @@ -0,0 +1,147 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Andreas Enge +;;; +;;; 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 fontutils) + #:use-module (gnu packages) + #:use-module (gnu packages compression) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages xml) + #:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:)) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu)) + +(define-public freetype + (package + (name "freetype") + (version "2.4.11") + (source (origin + (method url-fetch) + (uri (string-append + "http://download.savannah.gnu.org/releases/freetype/freetype-" + version ".tar.gz")) + (sha256 (base32 + "0gpcz6swir64kp0dk3rwgqqkmf48b90dqgczdmznjjryhrahx9r9")))) + (build-system gnu-build-system) + (synopsis "Freetype, a library to render fonts") + (description + "Freetype is a library that can be used by applications to access the +contents of font files. It provides a uniform interface to access font files. +It supports both bitmap and scalable formats, including TrueType, OpenType, +Type1, CID, CFF, Windows FON/FNT, X11 PCF, and others. It supports high-speed +anti-aliased glyph bitmap generation with 256 gray levels.") + (license license:freetype) ; some files have other licenses + (home-page "http://www.freetype.org/"))) + +(define-public fontconfig + (package + (name "fontconfig") + (version "2.10.91") + (source (origin + (method url-fetch) + (uri (string-append + "http://www.freedesktop.org/software/fontconfig/release/fontconfig-" + version ".tar.bz2")) + (sha256 (base32 + "1vk37q3zj8bjppj3l0pkby1psialpwl263jqf6pbih2hx5a7jwm4")))) + (build-system gnu-build-system) + (inputs `(("expat" ,expat) + ("freetype" ,freetype) + ("pkg-config" ,pkg-config))) + (synopsis "Fontconfig, a library for configuring and customising font access.") + (description + "Fontconfig can discover new fonts when installed automatically; +perform font name substitution, so that appropriate alternative fonts can +be selected if fonts are missing; +identify the set of fonts required to completely cover a set of languages; +have GUI configuration tools built as it uses an XML-based configuration file; +efficiently and quickly find needed fonts among the set of installed fonts; +be used in concert with the X Render Extension and FreeType to implement +high quality, anti-aliased and subpixel rendered text on a display.") + ; The exact license is more X11-style than BSD-style. + (license (license:bsd-style "file://COPYING" + "See COPYING in the distribution.")) + (home-page "http://www.freedesktop.org/wiki/Software/fontconfig"))) + +(define-public t1lib + (package + (name "t1lib") + (version "5.1.2") + (source (origin + (method url-fetch) + (uri "ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-5.1.2.tar.gz") + (sha256 (base32 + "0nbvjpnmcznib1nlgg8xckrmsw3haa154byds2h90y2g0nsjh4w2")))) + (build-system gnu-build-system) + (arguments + ;; Making the documentation requires latex, but t1lib is also an input + ;; for building texlive. + `(#:tests? #f ; no test target + #:make-flags + '("without_doc"))) + (synopsis "T1lib, a library for generating bitmaps from type 1 fonts.") + (description + "T1lib is a library for generating/rasterising bitmaps from Type 1 fonts. +It is based on the code of the X11 rasteriser of the X11 project. + +The bitmaps created by t1lib are returned in a data structure with type +GLYPH. This special GLYPH-type is also used in the X11 window system to +describe character bitmaps. It contains the bitmap data as well as some +metric information. But t1lib is in itself entirely independent of the +X11-system or any other graphical user interface. ") + (license license:gpl2) + (home-page "http://www.t1lib.org/"))) + +(define-public teckit + (package + (name "teckit") + (version "2.5.1") + (source (origin + (method url-fetch) + (uri (string-append + "http://scripts.sil.org/svn-view/teckit/TAGS/TECkit_" + (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) + ".tar.gz")) + (sha256 (base32 + "0fjiwvic8mdxpkyccfp7zh26y9xnvkp0skqbyfkrjiacd191k82r")))) + (build-system gnu-build-system) + (inputs `(("patch/teckit" ,(search-patch "teckit-cstdio.patch")) + ("zlib" ,zlib))) + (arguments + `(#:patches (list (assoc-ref %build-inputs "patch/teckit")))) + (synopsis "TECkit, a toolkit for encoding conversions") + (description + "TECkit is a low-level toolkit intended to be used by other applications +that need to perform encoding conversions (e.g., when importing legacy data +into a Unicode-based application). The primary component of the TECkit +package is therefore a library that performs conversions; this is the +\"TECkit engine\". The engine relies on mapping tables in a specific binary +format (for which documentation is available); there is a compiler that +creates such tables from a human-readable mapping description (a simple +text file). + +To facilitate the development and testing of mapping tables for TECkit, +several applications are also included in the current package; these +include simple tools for applying conversions to plain-text and Standard +Format files, as well as both command-line and simple GUI versions of the +TECkit compiler. However, it is not intended that these tools will be the +primary means by which end users perform conversions, and they have not +been designed, tested, and debugged to the extent that general-purpose +applications should be.") + (license license:lgpl2.1+) + (home-page "http://scripts.sil.org/cms/scripts/page.php?cat_id=teckit"))) diff --git a/gnu/packages/freetype.scm b/gnu/packages/freetype.scm deleted file mode 100644 index 881e655508..0000000000 --- a/gnu/packages/freetype.scm +++ /dev/null @@ -1,147 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Andreas Enge -;;; -;;; 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 freetype) - #:use-module (gnu packages) - #:use-module (gnu packages compression) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages xml) - #:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:)) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system gnu)) - -(define-public freetype - (package - (name "freetype") - (version "2.4.11") - (source (origin - (method url-fetch) - (uri (string-append - "http://download.savannah.gnu.org/releases/freetype/freetype-" - version ".tar.gz")) - (sha256 (base32 - "0gpcz6swir64kp0dk3rwgqqkmf48b90dqgczdmznjjryhrahx9r9")))) - (build-system gnu-build-system) - (synopsis "Freetype, a library to render fonts") - (description - "Freetype is a library that can be used by applications to access the -contents of font files. It provides a uniform interface to access font files. -It supports both bitmap and scalable formats, including TrueType, OpenType, -Type1, CID, CFF, Windows FON/FNT, X11 PCF, and others. It supports high-speed -anti-aliased glyph bitmap generation with 256 gray levels.") - (license license:freetype) ; some files have other licenses - (home-page "http://www.freetype.org/"))) - -(define-public fontconfig - (package - (name "fontconfig") - (version "2.10.91") - (source (origin - (method url-fetch) - (uri (string-append - "http://www.freedesktop.org/software/fontconfig/release/fontconfig-" - version ".tar.bz2")) - (sha256 (base32 - "1vk37q3zj8bjppj3l0pkby1psialpwl263jqf6pbih2hx5a7jwm4")))) - (build-system gnu-build-system) - (inputs `(("expat" ,expat) - ("freetype" ,freetype) - ("pkg-config" ,pkg-config))) - (synopsis "Fontconfig, a library for configuring and customising font access.") - (description - "Fontconfig can discover new fonts when installed automatically; -perform font name substitution, so that appropriate alternative fonts can -be selected if fonts are missing; -identify the set of fonts required to completely cover a set of languages; -have GUI configuration tools built as it uses an XML-based configuration file; -efficiently and quickly find needed fonts among the set of installed fonts; -be used in concert with the X Render Extension and FreeType to implement -high quality, anti-aliased and subpixel rendered text on a display.") - ; The exact license is more X11-style than BSD-style. - (license (license:bsd-style "file://COPYING" - "See COPYING in the distribution.")) - (home-page "http://www.freedesktop.org/wiki/Software/fontconfig"))) - -(define-public t1lib - (package - (name "t1lib") - (version "5.1.2") - (source (origin - (method url-fetch) - (uri "ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-5.1.2.tar.gz") - (sha256 (base32 - "0nbvjpnmcznib1nlgg8xckrmsw3haa154byds2h90y2g0nsjh4w2")))) - (build-system gnu-build-system) - (arguments - ;; Making the documentation requires latex, but t1lib is also an input - ;; for building texlive. - `(#:tests? #f ; no test target - #:make-flags - '("without_doc"))) - (synopsis "T1lib, a library for generating bitmaps from type 1 fonts.") - (description - "T1lib is a library for generating/rasterising bitmaps from Type 1 fonts. -It is based on the code of the X11 rasteriser of the X11 project. - -The bitmaps created by t1lib are returned in a data structure with type -GLYPH. This special GLYPH-type is also used in the X11 window system to -describe character bitmaps. It contains the bitmap data as well as some -metric information. But t1lib is in itself entirely independent of the -X11-system or any other graphical user interface. ") - (license license:gpl2) - (home-page "http://www.t1lib.org/"))) - -(define-public teckit - (package - (name "teckit") - (version "2.5.1") - (source (origin - (method url-fetch) - (uri (string-append - "http://scripts.sil.org/svn-view/teckit/TAGS/TECkit_" - (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) - ".tar.gz")) - (sha256 (base32 - "0fjiwvic8mdxpkyccfp7zh26y9xnvkp0skqbyfkrjiacd191k82r")))) - (build-system gnu-build-system) - (inputs `(("patch/teckit" ,(search-patch "teckit-cstdio.patch")) - ("zlib" ,zlib))) - (arguments - `(#:patches (list (assoc-ref %build-inputs "patch/teckit")))) - (synopsis "TECkit, a toolkit for encoding conversions") - (description - "TECkit is a low-level toolkit intended to be used by other applications -that need to perform encoding conversions (e.g., when importing legacy data -into a Unicode-based application). The primary component of the TECkit -package is therefore a library that performs conversions; this is the -\"TECkit engine\". The engine relies on mapping tables in a specific binary -format (for which documentation is available); there is a compiler that -creates such tables from a human-readable mapping description (a simple -text file). - -To facilitate the development and testing of mapping tables for TECkit, -several applications are also included in the current package; these -include simple tools for applying conversions to plain-text and Standard -Format files, as well as both command-line and simple GUI versions of the -TECkit compiler. However, it is not intended that these tools will be the -primary means by which end users perform conversions, and they have not -been designed, tested, and debugged to the extent that general-purpose -applications should be.") - (license license:lgpl2.1+) - (home-page "http://scripts.sil.org/cms/scripts/page.php?cat_id=teckit"))) diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 472ada47b1..835ed475cc 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -19,7 +19,7 @@ (define-module (gnu packages ghostscript) #:use-module (gnu packages) #:use-module (gnu packages compression) - #:use-module (gnu packages freetype) + #:use-module (gnu packages fontutils) #:use-module (gnu packages libjpeg) #:use-module (gnu packages libpng) #:use-module (gnu packages libtiff) diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm index de07c2cbf8..ee52a6110a 100644 --- a/gnu/packages/grub.scm +++ b/gnu/packages/grub.scm @@ -25,7 +25,7 @@ (define-module (gnu packages grub) #:use-module (gnu packages flex) #:use-module (gnu packages bison) #:use-module ((gnu packages gettext) #:renamer (symbol-prefix-proc 'gnu:)) - #:use-module (gnu packages freetype) + #:use-module (gnu packages fontutils) #:use-module (gnu packages linux) #:use-module (gnu packages qemu) #:use-module (gnu packages ncurses) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index a354eac61d..5a9d513336 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -23,7 +23,7 @@ (define-module (gnu packages pdf) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages compression) - #:use-module (gnu packages freetype) + #:use-module (gnu packages fontutils) #:use-module (gnu packages libjpeg) #:use-module (gnu packages libtiff) #:use-module (gnu packages pkg-config)) diff --git a/gnu/packages/texlive.scm b/gnu/packages/texlive.scm index 82193a006e..8ea78de873 100644 --- a/gnu/packages/texlive.scm +++ b/gnu/packages/texlive.scm @@ -24,7 +24,7 @@ (define-module (gnu packages texlive) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages compression) - #:use-module (gnu packages freetype) + #:use-module (gnu packages fontutils) #:use-module (gnu packages ghostscript) #:use-module (gnu packages icu4c) #:use-module (gnu packages libpng) -- cgit v1.2.3