This is needed on systems with 64K page size. It also upgrades sqlite
to the latest version and computes the source URL automatically.
Mark
From 8243f4e481eaf5604dd5c0ad8e069885af40dbdd Mon Sep 17 00:00:00 2001
From: Mark H Weaver m...@netris.org
Date: Wed, 2 Apr 2014 12:02:41 -0400
Subject: [PATCH 1/3] gnu: sqlite: Compute source URL from version number.
* gnu/packages/sqlite.scm (sqlite): Compute the numeric-version from the
traditional version string, and use it to compute the source URL.
---
gnu/packages/sqlite.scm | 21 +
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm
index f688e13..0c8b9d2 100644
--- a/gnu/packages/sqlite.scm
+++ b/gnu/packages/sqlite.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Cyril Roelandt tipec...@gmail.com
+;;; Copyright © 2014 Mark H Weaver m...@netris.org
;;;
;;; This file is part of GNU Guix.
;;;
@@ -21,7 +22,10 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
- #:use-module (gnu packages))
+ #:use-module (gnu packages)
+ #:use-module (gnu packages)
+ #:use-module (srfi srfi-26)
+ #:use-module (ice-9 match))
(define-public sqlite
(package
@@ -32,9 +36,18 @@
;; TODO: Download from sqlite.org once this bug :
;; http://lists.gnu.org/archive/html/bug-guile/2013-01/msg00027.html
;; has been fixed.
-(uri (string-append
- mirror://sourceforge/sqlite.mirror/SQLite%20
- version /sqlite-autoconf-3080200.tar.gz))
+(uri (let ((numeric-version
+(match (string-split version #\.)
+ ((first-digit other-digits ...)
+ (string-append first-digit
+ (string-pad-right
+ (string-concatenate
+(map (cut string-pad 2 #\0)
+ other-digits))
+ 6 #\0))
+ (string-append
+mirror://sourceforge/sqlite.mirror/SQLite%20 version
+/sqlite-autoconf- numeric-version .tar.gz)))
(sha256
(base32
14pg9zlwbwsj5w7f3qr25d3nniyv82gmczwlvpj0i0ic1431v1d0
--
1.8.4
From 864f748752072eadabb97a390f465f8e052ca7f3 Mon Sep 17 00:00:00 2001
From: Mark H Weaver m...@netris.org
Date: Wed, 2 Apr 2014 12:12:13 -0400
Subject: [PATCH 2/3] gnu: sqlite: Upgrade to 3.8.4.2.
* gnu/packages/sqlite.scm (sqlite): Upgrade to 3.8.4.2.
---
gnu/packages/sqlite.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm
index 0c8b9d2..8e976ce 100644
--- a/gnu/packages/sqlite.scm
+++ b/gnu/packages/sqlite.scm
@@ -30,7 +30,7 @@
(define-public sqlite
(package
(name sqlite)
- (version 3.8.2)
+ (version 3.8.4.2)
(source (origin
(method url-fetch)
;; TODO: Download from sqlite.org once this bug :
@@ -50,7 +50,7 @@
/sqlite-autoconf- numeric-version .tar.gz)))
(sha256
(base32
- 14pg9zlwbwsj5w7f3qr25d3nniyv82gmczwlvpj0i0ic1431v1d0
+ 19gicv5vdi5c0p8shr1bmihldj409aqz3r4wr7d3pwb6xf1xv4p4
(build-system gnu-build-system)
(home-page http://www.sqlite.org/;)
(synopsis The SQLite database management system)
--
1.8.4
From 47b6fcd3d8fbba018f7ddecf86e793de5161489e Mon Sep 17 00:00:00 2001
From: Mark H Weaver m...@netris.org
Date: Wed, 2 Apr 2014 12:14:46 -0400
Subject: [PATCH 3/3] gnu: sqlite: Fix sqlite on systems with page size larger
than 32K.
Based on a patch by Dan Kennedy danielk1...@gmail.com.
* gnu/packages/patches/sqlite-large-page-size-fix.patch: New file.
* gnu/packages/sqlite.scm (sqlite): Add it.
* gnu-system.am (dist_patch_DATA): Add it.
---
gnu-system.am | 1 +
.../patches/sqlite-large-page-size-fix.patch | 180 +
gnu/packages/sqlite.scm| 4 +-
3 files changed, 184 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/sqlite-large-page-size-fix.patch
diff --git a/gnu-system.am b/gnu-system.am
index 533dbf9..933cdb1 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -324,6 +324,7 @@ dist_patch_DATA = \
gnu/packages/patches/slim-config.patch \
gnu/packages/patches/slim-sigusr1.patch \
gnu/packages/patches/source-highlight-regexrange-test.patch \
+ gnu/packages/patches/sqlite-large-page-size-fix.patch \
gnu/packages/patches/tcsh-fix-autotest.patch \
gnu/packages/patches/teckit-cstdio.patch \
gnu/packages/patches/valgrind-glibc.patch \
diff --git
