all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Efraim Flashner <efraim@flashner.co.il>
To: 33136@debbugs.gnu.org
Subject: [bug#33136] [PATCH 2/7] gnu: qt: Use system sqlite.
Date: Wed, 24 Oct 2018 14:41:29 +0300	[thread overview]
Message-ID: <20181024114134.3116-2-efraim@flashner.co.il> (raw)
In-Reply-To: <20181024112618.2417-1-efraim@flashner.co.il>

* gnu/packages/databases.scm (sqlite-with-column-metadata): New
variable.
* gnu/packages/qt.scm (qt, qtbase)[source]: Remove bundled sqlite.
[inputs]: Add sqlite-with-column-metadata.
[arguments]: Add configure-flag to use system sqlite.
---
 gnu/packages/databases.scm | 12 ++++++++++++
 gnu/packages/qt.scm        | 15 ++++++---------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 6ebbc281f..87fb170e5 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1211,6 +1211,18 @@ is in the public domain.")
        ((#:configure-flags flags)
         `(cons "--enable-fts5" ,flags))))))
 
+;; 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")))))))
+
 (define-public tdb
   (package
     (name "tdb")
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 05713e8ef..dffa8b5cf 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -135,7 +135,7 @@ system, and the core design of Django is reused in Grantlee.")
                   (lambda (dir)
                     (delete-file-recursively (string-append "qtbase/src/3rdparty/" dir)))
                   (list "double-conversion" "freetype" "harfbuzz-ng"
-                        "libpng" "libjpeg" "pcre2" "xcb"
+                        "libpng" "libjpeg" "pcre2" "sqlite" "xcb"
                         "xkbcommon" "zlib"))
                 (for-each
                   (lambda (dir)
@@ -206,7 +206,7 @@ system, and the core design of Django is reused in Grantlee.")
        ("postgresql" ,postgresql)
        ("pulseaudio" ,pulseaudio)
        ("pcre2" ,pcre2)
-       ;("sqlite" ,sqlite)
+       ("sqlite" ,sqlite-with-column-metadata)
        ("udev" ,eudev)
        ("unixodbc" ,unixodbc)
        ("wayland" ,wayland)
@@ -273,7 +273,7 @@ system, and the core design of Django is reused in Grantlee.")
                        "-no-compile-examples"
                        ;; Most "-system-..." are automatic, but some use
                        ;; the bundled copy by default.
-                       ;"-system-sqlite"
+                       "-system-sqlite"
                        "-system-harfbuzz"
                        "-system-pcre"
                        ;; explicitly link with openssl instead of dlopening it
@@ -503,7 +503,7 @@ system, and the core design of Django is reused in Grantlee.")
                   (lambda (dir)
                     (delete-file-recursively (string-append "src/3rdparty/" dir)))
                   (list "double-conversion" "freetype" "harfbuzz-ng"
-                        "libpng" "libjpeg" "pcre2" "xcb"
+                        "libpng" "libjpeg" "pcre2" "sqlite" "xcb"
                         "xkbcommon" "zlib"))
                 #t))))
     (build-system gnu-build-system)
@@ -545,7 +545,7 @@ system, and the core design of Django is reused in Grantlee.")
        ("pcre2" ,pcre2)
        ("postgresql" ,postgresql)
        ("pulseaudio" ,pulseaudio)
-       ;("sqlite" ,sqlite)
+       ("sqlite" ,sqlite-with-column-metadata)
        ("unixodbc" ,unixodbc)
        ("xcb-util" ,xcb-util)
        ("xcb-util-image" ,xcb-util-image)
@@ -616,10 +616,7 @@ system, and the core design of Django is reused in Grantlee.")
                  "-no-compile-examples"
                  ;; Most "-system-..." are automatic, but some use
                  ;; the bundled copy by default.
-                 ;; System sqlite fails on 5.10+
-                 ;;.obj/qsql_sqlite.o: In function `QSQLiteResultPrivate::initColumns(bool)':
-                 ;;qsql_sqlite.cpp:(.text+0x190c): undefined reference to `sqlite3_column_table_name16'
-                 ;"-system-sqlite"
+                 "-system-sqlite"
                  "-system-harfbuzz"
                  "-system-pcre"
                  ;; explicitly link with openssl instead of dlopening it
-- 
2.19.1

  parent reply	other threads:[~2018-10-24 11:42 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-24 11:26 [bug#33136] [PATCH 0/7] Qt updates Efraim Flashner
2018-10-24 11:41 ` [bug#33136] [PATCH 1/7] gnu: qt: Update to 5.11.2 Efraim Flashner
2018-10-26  9:50   ` Danny Milosavljevic
2018-10-24 11:41 ` Efraim Flashner [this message]
2018-10-26  9:45   ` [bug#33136] [PATCH 2/7] gnu: qt: Use system sqlite Danny Milosavljevic
2018-10-27 20:19     ` Efraim Flashner
2018-10-28 17:17       ` Danny Milosavljevic
2018-10-24 11:41 ` [bug#33136] [PATCH 3/7] gnu: qt: Add vulkan support Efraim Flashner
2018-10-26  9:47   ` Danny Milosavljevic
2018-10-27 20:21     ` Efraim Flashner
2018-10-24 11:41 ` [bug#33136] [PATCH 4/7] gnu: qt: Use invoke Efraim Flashner
2018-10-26  9:48   ` Danny Milosavljevic
2018-10-24 11:41 ` [bug#33136] [PATCH 5/7] gnu: qt@4: Update license list Efraim Flashner
2018-10-26  9:49   ` Danny Milosavljevic
2018-10-28  8:13     ` Efraim Flashner
2018-10-24 11:41 ` [bug#33136] [PATCH 6/7] gnu: qt@4: Update build config Efraim Flashner
2018-10-26  9:50   ` Danny Milosavljevic
2018-10-24 11:41 ` [bug#33136] [PATCH 7/7] gnu: qt@4: Use invoke Efraim Flashner
2018-10-26  9:50   ` Danny Milosavljevic
2018-10-28  8:14 ` bug#33136: Qt updates Efraim Flashner
2018-10-28  9:38   ` [bug#33136] " Clément Lassieur

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181024114134.3116-2-efraim@flashner.co.il \
    --to=efraim@flashner.co.il \
    --cc=33136@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.