01/01: gnu: sqlite: Build with column metadata.

[guix-commits]

efraim pushed a commit to branch core-updates
in repository guix.

commit fad5b1a6d8d9c36bea5785ae4fbc1beb37e644d7
Author: Efraim Flashner <address@hidden>
Date:   Thu Nov 28 15:12:49 2019 +0200

    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/fontutils.scm |  2 +-
 gnu/packages/messaging.scm |  2 +-
 gnu/packages/music.scm     |  2 +-
 gnu/packages/qt.scm        |  4 ++--
 gnu/packages/sqlite.scm    | 15 ++-------------
 gnu/packages/telephony.scm | 22 +---------------------
 6 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index aba6f07..7a88ad9 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -762,7 +762,7 @@ maintain the Noto Fonts project.")
       ("desktop-file-utils" ,desktop-file-utils)))
    (inputs
     `(("json-glib" ,json-glib)
-      ("sqlite-with-column-metadata" ,sqlite-with-column-metadata)
+      ("sqlite" ,sqlite)
       ("fonconfig" ,fontconfig)
       ("freetype" ,freetype)
       ("gtk+" ,gtk+)))
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 3f223c2..5f791ca 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -753,7 +753,7 @@ on Axolotl and PEP.")
          ("libgcrypt" ,libgcrypt)
          ("libsoup" ,libsoup)
          ("qrencode" ,qrencode)
-         ("sqlite" ,sqlite-with-column-metadata)
+         ("sqlite" ,sqlite)
          ("gpgme" ,gpgme)
          ("gtk+" ,gtk+)
          ("glib-networking" ,glib-networking)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 241ede5..3f69e88 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -297,7 +297,7 @@ score, keyboard, guitar, drum and controller views.")
          ("pulseaudio" ,pulseaudio)
          ("qtbase" ,qtbase)
          ("qtx11extras" ,qtx11extras)
-         ("sqlite" ,sqlite-with-column-metadata)
+         ("sqlite" ,sqlite)
          ("sparsehash" ,sparsehash)
          ("taglib" ,taglib)))
       (home-page "https://clementine-player.org";)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 241e73d..e012ffa 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -189,7 +189,7 @@ system, and the core design of Django is reused in 
Grantlee.")
        ("postgresql" ,postgresql)
        ("pulseaudio" ,pulseaudio)
        ("pcre2" ,pcre2)
-       ("sqlite" ,sqlite-with-column-metadata)
+       ("sqlite" ,sqlite)
        ("udev" ,eudev)
        ("unixodbc" ,unixodbc)
        ("wayland" ,wayland)
@@ -385,7 +385,7 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
        ("pcre2" ,pcre2)
        ("postgresql" ,postgresql)
        ("pulseaudio" ,pulseaudio)
-       ("sqlite" ,sqlite-with-column-metadata)
+       ("sqlite" ,sqlite)
        ("unixodbc" ,unixodbc)
        ("xcb-util" ,xcb-util)
        ("xcb-util-image" ,xcb-util-image)
diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm
index 6d6df17..1a06419 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")))))))
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index abb68f6..21f00f5 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -60,7 +60,6 @@
   #:use-module (gnu packages qt)
   #:use-module (gnu packages serialization)
   #:use-module (gnu packages speech)
-  #:use-module (gnu packages sqlite)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages upnp)
   #:use-module (gnu packages video)
@@ -858,19 +857,7 @@ This package provides a library common to all Jami 
clients.")
        ("clutter-gtk" ,clutter-gtk)
        ("gettext" ,gnu-gettext)
        ("libcanberra" ,libcanberra)
-       ("webkitgtk" ,webkitgtk)
-       ;; TODO: We must wrap ring-client-gnome to force using the
-       ;; `sqlite-with-column-metadata' package instead of `sqlite' or else it
-       ;; fails with:
-       ;;
-       ;;   
/gnu/store/...-qtbase-5.11.2/lib/qt5/plugins/sqldrivers/libqsqlite.so:
-       ;;   undefined symbol: sqlite3_column_table_name16
-       ;;
-       ;; qtbase is built against sqlite-with-column-metadata but somehow
-       ;; jami-client-gnome ends up with both `sqlite' and
-       ;; `sqlite-with-column-metadata' as inputs and it seems that
-       ;; libqsqlite.so gets confused.
-       ("sqlite" ,sqlite-with-column-metadata)))
+       ("webkitgtk" ,webkitgtk)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("glib:bin" ,glib "bin")
@@ -886,13 +873,6 @@ This package provides a library common to all Jami 
clients.")
          (add-after 'unpack 'change-directory
            (lambda _
              (chdir "client-gnome")
-             #t))
-         (add-after 'install 'wrap
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (path (string-append (assoc-ref inputs "sqlite") "/lib")))
-               (wrap-program (string-append out "/bin/gnome-ring")
-                 `("LD_LIBRARY_PATH" ":" prefix (,path))))
              #t)))))
     (synopsis "Distributed multimedia communications platform")
     (description "Jami (formerly GNU Ring) is a secure and distributed voice,