From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Enge Subject: [PATCH] gnu: teckit: Update to 2.5.4. Date: Sun, 19 Jul 2015 13:47:36 +0200 Message-ID: <20150719114736.GA2246@debian> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="qDbXVdCdHGoSgWSk" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:48365) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZGn4I-0000aS-Ep for guix-devel@gnu.org; Sun, 19 Jul 2015 07:47:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZGn4F-0006Vq-7T for guix-devel@gnu.org; Sun, 19 Jul 2015 07:47:42 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:64868) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZGn4E-0006Vk-UH for guix-devel@gnu.org; Sun, 19 Jul 2015 07:47:39 -0400 Content-Disposition: inline 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: guix-devel@gnu.org --qDbXVdCdHGoSgWSk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline The attached patch updates teckit, which is a prerequisite for switching to texlive 2015. It is probably safer to apply it after the 0.8.3 release (for instance, it also implies a libreoffice rebuild). There was a comment some time ago by Mark that additional phases should be added after 'unpack instead of before 'configure; here, the call to autogen.sh needs to come after 'patch-shebangs. Andreas --qDbXVdCdHGoSgWSk Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-teckit-Update-to-2.5.4.patch" >From b46a9e2788c53674991f6ebc59e6a55bc7c01c29 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 19 Jul 2015 12:39:57 +0200 Subject: [PATCH] gnu: teckit: Update to 2.5.4. * gnu/packages/fontutils.scm (teckit): Update to 2.5.4. Drop patch. Use svn-fetch for download. [arguments]: Add phase to call autogen. [native-inputs]: New field. * gnu/packages/patches/teckit-cstdio.patch: Delete file. * gnu-system.am (dist_patch_DATA): Unregister patch. --- gnu-system.am | 1 - gnu/packages/fontutils.scm | 43 +++++++++++++++++++------------- gnu/packages/patches/teckit-cstdio.patch | 10 -------- 3 files changed, 25 insertions(+), 29 deletions(-) delete mode 100644 gnu/packages/patches/teckit-cstdio.patch diff --git a/gnu-system.am b/gnu-system.am index fb661d4..631074c 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -615,7 +615,6 @@ dist_patch_DATA = \ gnu/packages/patches/tar-d_ino_in_dirent-fix.patch \ gnu/packages/patches/tar-skip-unreliable-tests.patch \ gnu/packages/patches/tcsh-fix-autotest.patch \ - gnu/packages/patches/teckit-cstdio.patch \ gnu/packages/patches/texi2html-document-encoding.patch \ gnu/packages/patches/texi2html-i18n.patch \ gnu/packages/patches/tvtime-gcc41.patch \ diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index c04f24b..d3e4196 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -34,6 +34,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix svn-download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu)) @@ -139,27 +140,33 @@ X11-system or any other graphical user interface.") (define-public teckit (package (name "teckit") - (version "2.5.1") + (version "2.5.4") (source (origin - (method url-fetch) - (uri (list - (string-append - "http://scripts.sil.org/svn-view/teckit/TAGS/TECkit_" - (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) - ".tar.gz") - "http://pkgs.fedoraproject.org/repo/pkgs/teckit/TECkit_2_5_1.tar.gz/4913f71f0f42bfd9cf8f161688b35dea/TECkit_2_5_1.tar.gz" - ;; This used to be the canonical URL but it vanished. - ;; See . - ;; (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")) - (patches (list (search-patch "teckit-cstdio.patch"))))) + ;; Downloaded tarballs vary with each download, so we use an + ;; svn snapshot. The 2.5.4 release seems to be made in r128, + ;; but r132 updates additional files to contain the correct + ;; version number (r129 to r131 do not concern TRUNK). + (method svn-fetch) + (uri (svn-reference + (url "https://scripts.sil.org/svn-public/teckit/TRUNK") + (revision 132))) + (file-name (string-append name "-" version)) + (sha256 + (base32 + "1xqkqgw30pb24snh46srmjs2j4zhz2dfi5pf7znia0k34mrpwivz")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("perl" ,perl))) ; for the tests + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'autogen + (lambda _ + (zero? (system* "./autogen.sh"))))))) (synopsis "Toolkit for encoding conversions") (description "TECkit is a low-level toolkit intended to be used by other applications diff --git a/gnu/packages/patches/teckit-cstdio.patch b/gnu/packages/patches/teckit-cstdio.patch deleted file mode 100644 index d79595e..0000000 --- a/gnu/packages/patches/teckit-cstdio.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- TECkit_2_5_1/source/Compiler.cpp 2008-04-07 16:21:12.000000000 +0200 -+++ TECkit_2_5_1/source/Compiler.cpp 2013-01-26 00:33:18.000000000 +0100 -@@ -29,6 +29,7 @@ - - #include "Compiler.h" - -+#include - #include - #include - #include -- 2.4.3 --qDbXVdCdHGoSgWSk--