From fad5b1a6d8d9c36bea5785ae4fbc1beb37e644d7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 28 Nov 2019 15:12:49 +0200 Subject: gnu: sqlite: Build with column metadata. * gnu/packages/sqlite.scm (sqlite)[arguments]: Add configure flag to enable column metadata. (sqlite-with-column-metadata): Remove variable. * gnu/packages/fontutils.scm (fontmanager)[inputs]: Replace sqlite-with-column-metadata with sqlite. * gnu/packages/messaging (dino)[inputs]: Ditto. * gnu/packages/music.scm (clementine)[inputs]: Ditto. * gnu/packages/qt.scm (qtbase)[inputs]: Ditto. * gnu/packages/telephony.scm (jami)[inputs]: Remove sqlite-with-column-metadata. [arguments]: Remove custom 'wrap phase. --- gnu/packages/sqlite.scm | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'gnu/packages/sqlite.scm') diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index 6d6df17f900..1a064197b85 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -74,7 +74,8 @@ (list (string-append "CFLAGS=-O2 -DSQLITE_SECURE_DELETE " "-DSQLITE_ENABLE_FTS3 " "-DSQLITE_ENABLE_UNLOCK_NOTIFY " - "-DSQLITE_ENABLE_DBSTAT_VTAB")))) + "-DSQLITE_ENABLE_DBSTAT_VTAB " + "-DSQLITE_ENABLE_COLUMN_METADATA")))) (home-page "https://www.sqlite.org/") (synopsis "The SQLite database management system") (description @@ -83,15 +84,3 @@ zero-configuration, transactional SQL database engine. SQLite is the most widely deployed SQL database engine in the world. The source code for SQLite is in the public domain.") (license license:public-domain))) - -;; This is used by Qt. -(define-public sqlite-with-column-metadata - (package/inherit sqlite - (name "sqlite-with-column-metadata") - (arguments - (substitute-keyword-arguments (package-arguments sqlite) - ((#:configure-flags flags) - `(list (string-append "CFLAGS=-O2 -DSQLITE_SECURE_DELETE " - "-DSQLITE_ENABLE_UNLOCK_NOTIFY " - "-DSQLITE_ENABLE_DBSTAT_VTAB " - "-DSQLITE_ENABLE_COLUMN_METADATA"))))))) -- cgit v1.3 From adfcb15ff1e662489cad390614fb7119065e7d39 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 30 Nov 2019 04:19:36 +0100 Subject: gnu: sqlite: Update to 3.30.1. * gnu/packages/sqlite.scm (sqlite): Update to 3.30.1. --- gnu/packages/sqlite.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/sqlite.scm') diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index 1a064197b85..d7eb1325841 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -46,7 +46,7 @@ (define-public sqlite (package (name "sqlite") - (version "3.28.0") + (version "3.30.1") (source (origin (method url-fetch) (uri (let ((numeric-version @@ -62,7 +62,7 @@ numeric-version ".tar.gz"))) (sha256 (base32 - "1hxpi45crbqp6lacl7z611lna02k956m9bsy2bjzrbb2y23546yn")))) + "0q4f57a5995wz9c7dfiqy9zwl0kn0b900nxwinqa3llv13dm0nlc")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (arguments -- cgit v1.3 From 3a3c9bae7999352e396bd30941913092b470b1f3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 5 Dec 2019 01:10:49 +0100 Subject: gnu: sqlite: Move static library to separate output. * gnu/packages/sqlite.scm (sqlite)[outputs]: New field. [arguments]: Add #:phases. --- gnu/packages/sqlite.scm | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'gnu/packages/sqlite.scm') diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index d7eb1325841..195146aca21 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 David Craven -;;; Copyright © 2016, 2017, 2018 Marius Bakke +;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Jelle Licht ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -65,6 +65,7 @@ "0q4f57a5995wz9c7dfiqy9zwl0kn0b900nxwinqa3llv13dm0nlc")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) + (outputs '("out" "static")) (arguments `(#:configure-flags ;; Add -DSQLITE_SECURE_DELETE, -DSQLITE_ENABLE_FTS3, @@ -75,7 +76,24 @@ "-DSQLITE_ENABLE_FTS3 " "-DSQLITE_ENABLE_UNLOCK_NOTIFY " "-DSQLITE_ENABLE_DBSTAT_VTAB " - "-DSQLITE_ENABLE_COLUMN_METADATA")))) + ;; Column metadata is required by GNU Jami and Qt, et.al. + "-DSQLITE_ENABLE_COLUMN_METADATA")) + #:phases (modify-phases %standard-phases + (add-after 'install 'move-static-library + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (static (assoc-ref outputs "static")) + (source (string-append out "/lib/libsqlite3.a"))) + (mkdir-p (string-append static "/lib")) + (link source (string-append static "/lib/libsqlite3.a")) + (delete-file source) + + ;; Remove reference to the static library from the .la file + ;; so that Libtool looks for it in the usual places. + (substitute* (string-append out "/lib/libsqlite3.la") + (("^old_library=.*") + "old_library=''\n")) + #t)))))) (home-page "https://www.sqlite.org/") (synopsis "The SQLite database management system") (description -- cgit v1.3 From 2bb84b8efe9195549cfd2c30a7b861d33041232d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Jan 2020 20:44:49 +0100 Subject: gnu: Add deprecation notice for 'sqlite-with-column-metadata'. * gnu/packages/sqlite.scm (sqlite-with-column-metadata): New public variable. --- gnu/packages/sqlite.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages/sqlite.scm') diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index 195146aca21..445c1606cf6 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 David Craven -;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Jelle Licht ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -102,3 +102,8 @@ zero-configuration, transactional SQL database engine. SQLite is the most widely deployed SQL database engine in the world. The source code for SQLite is in the public domain.") (license license:public-domain))) + +;; Column metadata support was added to the regular 'sqlite' package with +;; commit fad5b1a6d8d9c36bea5785ae4fbc1beb37e644d7. +(define-public sqlite-with-column-metadata + (deprecated-package "sqlite-with-column-metadata" sqlite)) -- cgit v1.3 From 0d775f987c36309299202e43cfa9d04f64f6a52d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jan 2020 17:17:53 +0100 Subject: gnu: sqlite: Update to 3.31.0. * gnu/packages/sqlite.scm (sqlite): Update to 3.31.0. --- gnu/packages/sqlite.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/sqlite.scm') diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index 445c1606cf6..80807d5d127 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -46,7 +46,7 @@ (define-public sqlite (package (name "sqlite") - (version "3.30.1") + (version "3.31.0") (source (origin (method url-fetch) (uri (let ((numeric-version @@ -58,11 +58,11 @@ (map (cut string-pad <> 2 #\0) other-digits)) 6 #\0)))))) - (string-append "https://sqlite.org/2019/sqlite-autoconf-" + (string-append "https://sqlite.org/2020/sqlite-autoconf-" numeric-version ".tar.gz"))) (sha256 (base32 - "0q4f57a5995wz9c7dfiqy9zwl0kn0b900nxwinqa3llv13dm0nlc")))) + "1w7i954349sjd5a6rvy118prra43k07y9hy8rpajs6vmjmnnx7bw")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (outputs '("out" "static")) -- cgit v1.3 From f97db3de739f3a40aeb918c695dc3994d727bc2e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 31 Jan 2020 14:10:41 +0100 Subject: gnu: SQLite: Update to 3.31.1. * gnu/packages/sqlite.scm (sqlite): Update to 3.31.1. --- gnu/packages/sqlite.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/sqlite.scm') diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index 80807d5d127..8468131ddf9 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -46,7 +46,7 @@ (define-public sqlite (package (name "sqlite") - (version "3.31.0") + (version "3.31.1") (source (origin (method url-fetch) (uri (let ((numeric-version @@ -62,7 +62,7 @@ numeric-version ".tar.gz"))) (sha256 (base32 - "1w7i954349sjd5a6rvy118prra43k07y9hy8rpajs6vmjmnnx7bw")))) + "1bj936svd8i5g25xd1bj52hj4zca01fgl3sqkj86z9q5pkz4wa32")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (outputs '("out" "static")) -- cgit v1.3