From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id gDT6I/JM4mGBPwAAgWs5BA (envelope-from ) for ; Sat, 15 Jan 2022 05:26:26 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id UMm2IPJM4mGaMwEAauVa8A (envelope-from ) for ; Sat, 15 Jan 2022 05:26:26 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4F67710BA5 for ; Sat, 15 Jan 2022 05:26:25 +0100 (CET) Received: from localhost ([::1]:45226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n8ae0-0005EB-GL for larch@yhetil.org; Fri, 14 Jan 2022 23:26:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n8adn-0005D2-AS for guix-patches@gnu.org; Fri, 14 Jan 2022 23:26:11 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45828) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n8add-0002Xf-Ot for guix-patches@gnu.org; Fri, 14 Jan 2022 23:26:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n8add-0005GG-Kq for guix-patches@gnu.org; Fri, 14 Jan 2022 23:26:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52000] [PATCH v3 2/2] gnu: Add sqlitebrowser. References: In-Reply-To: Resent-From: Foo Chuan Wei Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Jan 2022 04:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52000 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52000@debbugs.gnu.org Received: via spool by 52000-submit@debbugs.gnu.org id=B52000.164222071620164 (code B ref 52000); Sat, 15 Jan 2022 04:26:01 +0000 Received: (at 52000) by debbugs.gnu.org; 15 Jan 2022 04:25:16 +0000 Received: from localhost ([127.0.0.1]:38731 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8acu-0005F8-9B for submit@debbugs.gnu.org; Fri, 14 Jan 2022 23:25:16 -0500 Received: from mail-oln040092255095.outbound.protection.outlook.com ([40.92.255.95]:34511 helo=APC01-HK2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8aco-0005Ei-Bd for 52000@debbugs.gnu.org; Fri, 14 Jan 2022 23:25:15 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hJEWiKEHdH/Bnw3jleDWM2Q7LZN4kBGuyppWOtNbhCtXsAz1A0YcRn1cpLubjVYOJZmFjj3Flsgkv6NJVTiaPA7QFIeLVqscftLpZIHE9TO7ACePf5KMi/u9oCopJJgJsy6HII/QIlmpJrgyTlCMPSkIT/nq/rNlw2CR3ABopp19RY8lWYzTWItlKv21J1oSOsAPzv7YTLhRHBALDrsTygBLDhkXeJBKFOyNsrABPqzLLM5GOvfbSOvphbgeyXm/I0RnBpMXUbIexnXEPxLKibnC0jp7tC1KdakyzXGJ88KcBs1Puy2JP6v5hJSaLmiqfNtAnnqHu8KqDh7+TQeh4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=KxOXrQ6oUtTsjlKPmy4PQXnXz61FWZzCGAFbPt7Z3Nk=; b=lCw5MBBbQMcGjdMkJ9OhHte/EeDew2UfusH0+h+CZIETslRBw/Mbnx7hZxyHoobazCR3BAGFGvAXu3MNRnM3l1bcTWs2QzAVSm/uwxd4NZJr4jFshLYxPHkGvfu4aUYbpU03j6y9YTQBk+d8DEY7tLGYUGcB6snErYdGfxfGA8u2uvZI0Jvy8Zviq/h/iHjGwt0AwWjpOTgkpV+AmLdJne8PCUTa6FTF/fYqeBdbMkobnVlFpq83UZZ+v2wkcBrh62INxLnZQxHqBf09cRft1tKOQM9hN6YqIUgi3oEAWWYg6RR+UZ+rAwJnSP9OAqT5idoPv6yACC4wBew7ueh2FA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KxOXrQ6oUtTsjlKPmy4PQXnXz61FWZzCGAFbPt7Z3Nk=; b=gjStcFEdW9f/egMBytiun7P5nwDRgBlhU8JzVaj9elamCtgIR/NVHnGX8nJx4ZNlr8UGpP0G3NJA0vKVyRWwaFVe6p4NQpml9aTLYHwrnGqQJQ28Qryz3wn4vhrCGyYEzJRXWMcCbz6Ome91BSdUdoM2QxSsfkjaSkAsQOinuI14Kypf/V0uZ8Gn5Zp15zJdTfV36DeP5xAOUHy/k4jLYiAZ4ekyE61wzOZMwXzlGG6i76siAzgWJi9t1zDUgiNdqBR8uK4yhhzKHsfREoewayomoiUrO0wTqrf0cb1hOQAyWvxW42VMfHGrjupkHpuuu8/ewm/LbBT53hYkwXhP+A== Received: from PU1PR01MB2155.apcprd01.prod.exchangelabs.com (2603:1096:803:1c::21) by SG2PR01MB1904.apcprd01.prod.exchangelabs.com (2603:1096:3:23::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.11; Sat, 15 Jan 2022 04:25:02 +0000 Received: from PU1PR01MB2155.apcprd01.prod.exchangelabs.com ([fe80::1c92:e0d7:1ad5:a0f5]) by PU1PR01MB2155.apcprd01.prod.exchangelabs.com ([fe80::1c92:e0d7:1ad5:a0f5%6]) with mapi id 15.20.4888.012; Sat, 15 Jan 2022 04:25:02 +0000 Date: Sat, 15 Jan 2022 04:24:59 +0000 From: Foo Chuan Wei Message-ID: Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-TMN: [ab0mSyN8zRDQzZ1Ayp0gMJyd8nsn3RQ8] X-ClientProxiedBy: SG2PR06CA0239.apcprd06.prod.outlook.com (2603:1096:4:ac::23) To PU1PR01MB2155.apcprd01.prod.exchangelabs.com (2603:1096:803:1c::21) X-Microsoft-Original-Message-ID: <20220115042459.ewuly6bjaam22gas@main> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7705292a-c240-4d61-6a10-08d9d7deff72 X-MS-TrafficTypeDiagnostic: SG2PR01MB1904:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0s12zk3MWdb59833X/8BTmlv/ensVC8EuxZzUgO+JmUV4gzgSTHwgnmluSbGWiASFywDgeHe/eEu09TKfsNV3jWRgupcV5eRqvC3Md4lmLnTt4GlbLvNosiXVMq4Dt33B55YsIEkJb8PZaRcfa/xanP6afwfH4RsKWNIgwuqYNnfiGMaP1H3VQ0BNfEaPOzg7+p+gGS/xKfMIPfi2uuhEolON0gabj4SHNSi6RyShanchUXNlQcu2utEgdLH2C/BQTitezz6onenjeIBJV5q8YcTBOU3OBGLOQEGvIvNAHHc+asuVo+kveqf5JCuiRO+92vW2gKDsqQp7kkv5jN+97mMd1eCv9cze7rXqgG1BcsZigybC1vPB3mlNtWdoBp1p5pr+MirF2tHlbO5EIHmnADqw/A4fdsrcR9Zb6P3hgymys2A335DbA6Wjqko0vPquq1uv76osrIIgsg5pugF8TNDITRCfrZRdJP8dRDSBSNTSr7mgcbHJgK7a61jppVHPE2uaKu+utegydcoKOhhjgSIpYYASwYpLPQ2GVrgRiUeKZdgtSoCqvV++HRAlUgAaGaci7YUPMsIxpqWZj7h8V1HKxEANvrZQMtZW8qNLqgDv7SbEbdOI+SZjVpeq3zlbZ78rmFpNr6m4Yq0SSAF2XoCpXk1oMF+cMmUy4ObJqM= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BWk3b3R3nxyBlx77RvPsZfEyexa6+bkB5rp2w0TfFFR3M1ZlyTzVFX9YbjO3BqDVSYUiFZXztDSAm66xFmeEVsvFSn3Wj7UoxuafLbvxAD+uITvjNA543KOo4z+12/Xt/8N0TSu5Kyr7Z/1CQ4K80Elwb4Z5EnhBX9KU5DJR8YvpIL9aJ1UGgHPSVX+Vv3xohdUxWXocT7K+eoo2s43xNqktq+bfpFaiJ5eg9lSAXh260oJGCqEdu3y7GUbd0pWEHyMBHSPJBGYGrY29f9eB+0iXIefDY+4PY53xJtMLhbKvexkV7itw27xD9o5qYoSfcIf7MOgihIOL/Mjyv3MZHfv0aYiTDjumG9Qx2eKbqtAbilV4EWVa9ff93/oHPmUg2s5SFvjvxDGzSU2QYLZ5mlaqpHW1FPr5gccbbFTlHPjb1WCN4rOiMrXUJbkxWtI4ElUQcvwLKgVw2v+yVRtJqSyav0/U78vheVpA+UfE0kbnskky1eGqm7IGxMMngImTqEAjmjSl/jovSJo/nxXW5yeMggtNUvt0fOuWYt4CwFSzASRuSZ+t/MmPGDGd5TA6oYt25Gf0cptZkkpV/fYc02/L7ewALFgjmNbiLICVNgwGWv4mrJp0kLN4AKjx1C56tVUjhMSBDEazwmz2yqFWg9E1w1NzwJ0wYFoUhOT3McH2YoPjsl6IHSKIi0EQCoWZzg+k5z0Gq8YU/CGewl072xkRMzsJb6SWzu0H0AooWA+Hou7ipy5CVndLCTDJTVhjQSvzzfEJQdMiC7f1Y/4RXfAGgQrluW+CahE3ldWURr/QrI+0gDQyLBDI6spnnnCWExJ2B+TOUYu07x4IAcCvyLObW1mhMG/pX8AewQiAGc97q929W+/DTdotO7mP8klHXSvouwf3KV0SGZQ0UoDxdZCXydBYUFPQtgKw8cBEQw92mng9vgYYl4yPXmRwgTNP TatYYKtJKv203UhtCRyElQ== X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-d8e84.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 7705292a-c240-4d61-6a10-08d9d7deff72 X-MS-Exchange-CrossTenant-AuthSource: PU1PR01MB2155.apcprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jan 2022 04:25:02.2097 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR01MB1904 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1642220785; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=KxOXrQ6oUtTsjlKPmy4PQXnXz61FWZzCGAFbPt7Z3Nk=; b=A3+9Se3PagDqYjLsJF8hJVcm3GTr+apO8RPfsifffloNXEZPJ/z7mb9O4JkWfBUVyr/M4X miDTZci1R5o/XFDhoSsuJAI8SyE+SCBOPLAYP9FWccAqj9uTX7D+7JIab7ck9rrQI5pg/Q JWMr9n9sgLPOsLBZVJAzWYSF4YVOIFbDh5YsX+oKMzuTxM/GuvNOJnd1jshR67nOMsNn5a z3Zj6KcQuRW3aMiwfuJOhBA/RKfRpS9hdzmjLxAoMCO1H19QfS5EZPwNFmuQVek1jAjEZE Pi3JZ8BPMLgkmHoTj/vGzKwmVCiGaLYZp7j7B/LqdutaSXHQti/UNOMqysyGlQ== ARC-Seal: i=2; s=key1; d=yhetil.org; t=1642220785; a=rsa-sha256; cv=fail; b=ih9Yhp2MBNbEHhs/Y0ATjeMZlZzjXnaUoSpUYjgieKgElWQj+4zGUHFGYZsKLMbcCSbyfZ H6Lhnr8UCmH3NMrDwIJsbg9eE91wD603Ol9f2Ez1XhZ6zhjPWbrNKzN7myqWPVy3Wbcncr Yxy17n5q6NvmFYd1pjdxhCs48dKTOi/dqemFtn5D5SL6sbxRQn2nGtF1W+zNY0eth0/7/c Wlsra6Mvq9dHnWVNtShzFPg9l/1ddT3SaHR8I1oGq+s61J5ZMhLMbDflRgrOABOOjmSmJ6 aF2YJOmI2yjSR4qeSSWSbTsoII1UnjtdpMwvNDuR8PQ/9PBPwqPXhngR+9LZkQ== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=hotmail.com header.s=selector1 header.b=gjStcFEd; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=fail reason="SPF not aligned (relaxed)" header.from=hotmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.32 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=hotmail.com header.s=selector1 header.b=gjStcFEd; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=fail reason="SPF not aligned (relaxed)" header.from=hotmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 4F67710BA5 X-Spam-Score: -2.32 X-Migadu-Scanner: scn0.migadu.com X-TUID: 9JJq0ZGUtvdN * gnu/packages/databases.scm (sqlitebrowser): New variable. --- Changes relative to PATCH v2: * Replace old-style inputs with new-style inputs. * Update copyright year. gnu/packages/databases.scm | 92 +++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 4d7b090d03..b089af5e8b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -54,7 +54,7 @@ ;;; Copyright © 2021 Alexandre Hannud Abdo ;;; Copyright © 2021 Simon Tournier ;;; Copyright © 2021 jgart -;;; Copyright © 2021 Foo Chuan Wei +;;; Copyright © 2021, 2022 Foo Chuan Wei ;;; ;;; This file is part of GNU Guix. ;;; @@ -131,6 +131,7 @@ #:use-module (gnu packages python-science) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages qt) #:use-module (gnu packages rdf) #:use-module (gnu packages readline) #:use-module (gnu packages regex) @@ -4156,6 +4157,95 @@ with no external dependencies. The targets are small apps that would be blown away by a SQL-DB or an external database server.") (license license:expat))) +(define-public sqlitebrowser + (package + (name "sqlitebrowser") + (version "3.12.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sqlitebrowser/sqlitebrowser") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ljqzcx388mmni8lv9jz5r58alhsjrrqi4nzjnbfki94rn4ray6z")) + ;; Remove bundled libraries. + (modules '((guix build utils))) + (snippet '(delete-file-recursively "libs")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags '("-DENABLE_TESTING=ON" + ;; Force the use of non-bundled libraries. + "-DFORCE_INTERNAL_QSCINTILLA=OFF" + "-DFORCE_INTERNAL_QHEXEDIT=OFF" + "-DFORCE_INTERNAL_QCUSTOMPLOT=OFF") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-build + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("^ find_package\\(QScintilla 2.8.10 QUIET\\)" all) + (string-append + all "\n" + " set(QSCINTILLA_FOUND TRUE)\n" + " set(QSCINTILLA_INCLUDE_DIR " + (assoc-ref inputs "qscintilla") "/include)")) + (("^ find_package\\(QHexEdit\\)" all) + (string-append + all "\n" + " set(QHexEdit_FOUND TRUE)\n" + " set(QHexEdit_INCLUDE_DIR " + (assoc-ref inputs "qhexedit") "/include)")) + (("^set\\(JSON_DIR libs/json\\)") + (string-append "set(JSON_DIR " + (assoc-ref inputs "json-modern-cxx") "/include)")) + (("^add_subdirectory\\(\\$\\{JSON_DIR\\}\\)") ; No need to build. + "")) + + (substitute* '("src/EditDialog.cpp" + "src/ExportDataDialog.cpp" + "src/RemoteCommitsModel.h" + "src/RemoteDock.cpp" + "src/RemoteLocalFilesModel.h" + "src/RemoteModel.h" + "src/RemoteNetwork.cpp" + "src/RemotePushDialog.cpp" + "src/sqlitedb.cpp" + "src/sqlitetablemodel.cpp") + (("^#include ") + "#include ")) + + ;; Fix compilation error: + ;; "no matching function for call to ‘input_adapter(const QByteArray&)’" + (substitute* "src/EditDialog.cpp" + (("json::parse\\(cellData, nullptr, false\\)") + "json::parse(cellData.toStdString(), nullptr, false)")) + (substitute* '("src/RemoteDock.cpp" + "src/RemotePushDialog.cpp") + (("json::parse\\(reply, nullptr, false\\)") + "json::parse(reply.toStdString(), nullptr, false)")) + (substitute* "src/RemoteNetwork.cpp" + (("json::parse\\(reply->readAll\\(\\), nullptr, false\\)") + "json::parse((reply->readAll()).toStdString(), nullptr, false)"))))))) + (inputs + (list json-modern-cxx + qcustomplot + qhexedit + qscintilla + qtbase-5 + sqlite)) + (native-inputs (list qttools)) + (home-page "https://sqlitebrowser.org") + (synopsis "GUI editor for SQLite databases") + (description + "DB Browser for SQLite (DB4S) is a visual tool to create, design, and edit +database files compatible with SQLite. DB4S is for users and developers who +want to create, search, and edit databases using a familiar spreadsheet-like +interface, without needing to learn complicated SQL commands.") + ;; Dual licensing. + (license (list license:gpl3+ license:mpl2.0)))) + (define-public sequeler (package (name "sequeler") -- 2.25.1