From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id qDblHUEYmWGmzQAAgWs5BA (envelope-from ) for ; Sat, 20 Nov 2021 16:46:09 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 0FKWGUEYmWG6dAAA1q6Kng (envelope-from ) for ; Sat, 20 Nov 2021 15:46:09 +0000 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 E2B97A7D6 for ; Sat, 20 Nov 2021 16:46:08 +0100 (CET) Received: from localhost ([::1]:47970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moSZ6-0007iU-4T for larch@yhetil.org; Sat, 20 Nov 2021 10:46:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43296) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moSZ0-0007iH-KL for guix-patches@gnu.org; Sat, 20 Nov 2021 10:46:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60227) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moSZ0-0003Ps-CN for guix-patches@gnu.org; Sat, 20 Nov 2021 10:46:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moSZ0-0001Xx-9u for guix-patches@gnu.org; Sat, 20 Nov 2021 10:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52000] [PATCH 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, 20 Nov 2021 15:46:02 +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.16374231115865 (code B ref 52000); Sat, 20 Nov 2021 15:46:02 +0000 Received: (at 52000) by debbugs.gnu.org; 20 Nov 2021 15:45:11 +0000 Received: from localhost ([127.0.0.1]:43540 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moSYA-0001WX-NE for submit@debbugs.gnu.org; Sat, 20 Nov 2021 10:45:11 -0500 Received: from mail-oln040092255050.outbound.protection.outlook.com ([40.92.255.50]:14913 helo=APC01-HK2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moSY7-0001Vm-PD for 52000@debbugs.gnu.org; Sat, 20 Nov 2021 10:45:09 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R7+sSCmI+72H9uLlBqgn4iJ0zvqHBY5f2+5jSmM5fWaqijWuXd1D2djCEwTOVdMkHr0L5HrLYiy4m8zMYhRJmNt3B5QXaJsXbSCqem6Ms2nUQElRylSXBGElekny0/QAg+knlK5r0t0d9HypQJy+RxDbfnBw63wC1o8365eMqgfxT9E+YBN6qIgzv+XupHl0rNXiaBkWyTdhmDAVM0pRWstWiTagEYQK6NtVg2nopzam120BOAugvfQg8vsMDmMlKZ76DepuViON3xU90CTL31CSlfgjkHO26FyK4670p26iKrm3Bzx8R57/F2wCzXJxA62RGcUEoN1XqNxIue/9fw== 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=XHTA36O8fiYpUJmraEw/ux51sf3u/n2FudL6Z0byCNw=; b=BTeGjqO9D+PGcpL4uSa5K7Ys1yVWk66dZfn4hmc/0Vv4KHFRopXXEIDhMx+O3G/y2ePcmwbTw5/H7fC1cgFxAwWmA0osAad+zvFbQr6lIprH9ckcp06wuDhLw9q3ISNWNnfr3yEPBIUMAhy87/0Xbe+8GJKjUygbluXmuZ7+ez0eMKwV5aOzKzIH9ncN6vLIxCpAJeRNi/zqovfzzEGaNAlbJN3ppAtuSaovYbALqmgB4kZUh6f1Dtx/I6q0eDd1BqZjQiY8j5NSStKTNRRRehYzzRTdYOVQ4kxoh3R/ytJCrgm8ZHx75s0o39V0Kybj+sGwpLWuKR+28lhihV6yng== 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=XHTA36O8fiYpUJmraEw/ux51sf3u/n2FudL6Z0byCNw=; b=TnE0Qk5gzEbt3U34NAPxlLNdtqWdIKupsGwXiC6zPH+44HgwSNLXp9l4dvCNyEMbOacB+cS/Et8UJONSCibBXlisrKu3K5h7nf9yu9mV68lyB3vY/YFsesMv3cQZLjlVZ+/NTUubbvkbWsKvGWNzrSZwLPZN4vMJJbPDMLI2V6a3KwIo1yPQKBZL2V8IyKmHwOxDeHgYSMlycXVRb/P/Qu25JSfC5JvrFUwUSVzpxBMpyHx8vNkdEnl06Ccso7X5eSTps0rz8EyteFC8hQE+HayJYivDtOvsI9xX9XX+JzDA9GdPaROVzc1UYmghvf+XzG4EnfZMN553xZO618qTFw== Received: from PU1PR01MB2155.apcprd01.prod.exchangelabs.com (2603:1096:803:1c::21) by PSAPR01MB3781.apcprd01.prod.exchangelabs.com (2603:1096:301:20::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.22; Sat, 20 Nov 2021 15:44:54 +0000 Received: from PU1PR01MB2155.apcprd01.prod.exchangelabs.com ([fe80::258d:e124:fd3a:40ee]) by PU1PR01MB2155.apcprd01.prod.exchangelabs.com ([fe80::258d:e124:fd3a:40ee%7]) with mapi id 15.20.4713.024; Sat, 20 Nov 2021 15:44:54 +0000 Date: Sat, 20 Nov 2021 15:44:52 +0000 From: Foo Chuan Wei Message-ID: Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-TMN: [OCAKBL9uLbDeDGFzOm4WiEwHyVGTAtHd] X-ClientProxiedBy: HK0PR01CA0053.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::17) To PU1PR01MB2155.apcprd01.prod.exchangelabs.com (2603:1096:803:1c::21) X-Microsoft-Original-Message-ID: <20211120154452.cy2acwhlfhgb6uj7@main> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from main (61.6.253.166) by HK0PR01CA0053.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.19 via Frontend Transport; Sat, 20 Nov 2021 15:44:54 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 985c6511-24cc-41ff-dd90-08d9ac3cb28a X-MS-TrafficTypeDiagnostic: PSAPR01MB3781: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AYxnR9z857byxt7M0aL9Xsqc5sou1TCJyrNHbZHVP5Rg3v/c/KwOBgWM+tklyEfhX4VxMkjgkRS6bP8kXy0RM3H/U8n1ZjSPB1y1MVRojsfSothkS9cIQtHcLbQ8hAM3dELu8wEu/Ib6luCMJS5WCJ+Y8on8q7sJqKVkjDxwcaoTSdc63cfW4lmJduZPb8ktA9UQk2wORRf/Fj0wdfeOqe8Jc/uvQIQ8dXEpFfER+W5froAf8rEOgNwBMrIr3H30ALgohFrl5J4m6Nr4xtvhx6iykRV7Lqn8qDWWSAQ8f9SpkcHiw6pY3VW2K69jhxuIgCnrLef/mYqgUC9GWh1mgNP4SKOD8Lu1VXGNIA8jHqipR2sNrnPYT3uMWiFtpbFI57Mn2L7MPL7N84N++xxi/UpW/lgVGvu/pchhgqpHuEFa/XtAdB+t+K1Asj9tfHO0Q1DXapuTBVRqYqqRB0mM3uuuwiMwEzWdJ0SBnMBvT4i2TQbpp07ErE2pD8MGDB/AWKr6pL7odH8Q66W1yurCwJwa8ZTRQhTx4TFIfNtLxYhJg5D1tmHWq9jN7c5URlb2JOxlK7PLuLt+UCyUtXE8lWmvvvtSC4PNnquw26irK0P033TcdbvxKXGzEstyZmrW X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sNEgJIMNUWJbMq4Uz7AFSkuR1ORUmuDwC1zFkr90K4l9emW8hi3bHffjG7xlSymDRHqNHFACGP3GRis/M6o7UE4AIMdd5yKqzQ6rtlTpsFhMvvhlfIIQ8Vk2rSmqfIWdtTyugcAZ7UhZpSTjVUWS/EGtcKczq++1ql02d1C9Da0kzsKi3GPjATvMotK3Et/2Bsybbss/QAMemcuvP43MGhlrj4Q82FEMQScsCjT7nqu0db0xC28py2g9MmKkGrFfspm4+eSTvIbBhS1daPlUyhQL+LQJ/8NKfQiX+VBkOdPq96KiPkuGqJdNpx2W6PRd4DmqA2qr27OyQl8il1NH6w/lDwjhyPk8Y63VRP6W0N3cy/rH+xcmSGMj5X2LVviKel8ygAVgPEEByFFmRT0BN+VHNKnJ+wZmPPojHepylM+iYFvlst1leOY34cdAsxVotKc7nvUD8KXnZa1q4FFM7fqLLHGz1OxerVtANrnxpvBwah0Ybwjd3Vf3zA+M9/a0DwDzIRkFdGCvR3xPXGhxOpJq7vWKBpx7FmUCxX4j7C+dv75a1hdeP4qJYem75VQ4LLvC+WnBMOYgIoqqAY0YRk/r88F677Aa/K4FVtvne20CV8sqeRRS5IPm6h2k7ZtjRuV/LUkOsUNa7iisSKAkjht+UUeRLtUmaQwJzu6ME/JWBaNdjfvKpwTsAmWbm5Z2 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-5c337.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 985c6511-24cc-41ff-dd90-08d9ac3cb28a X-MS-Exchange-CrossTenant-AuthSource: PU1PR01MB2155.apcprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2021 15:44:54.5115 (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: PSAPR01MB3781 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=1637423169; 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=XHTA36O8fiYpUJmraEw/ux51sf3u/n2FudL6Z0byCNw=; b=MYepntYoGP0AO7sSLgOZTtJc+sMpQGkLvhRxOwssIM71rg98HCTP6S4aK6kmzH+qfiqivU u4JQuuJNe6adR+e7T3WuXEqCPAHJkJocvONaxkg+t2XW/lIlnXXR5RAjIsb7Ypehl7Zi2i LCQqmftadsGgNyISx+vdU+IzgSSb2MsT4lXsTphgRrNXbAf4j1JNQG2BRxGjwtr/Ipu5zP lIG1zcUWuDTy8fB4sePyRPDlbfgIfBUjjFyT52RbW/AE+NuQeL2JVG3V6SYfkyDY/uHT5u +u42j6Te2aN6/uaQjp72hP/WyJPfzoSlw7uI3jF9pDLwzzAH44OTWdsV72Zalg== ARC-Seal: i=2; s=key1; d=yhetil.org; t=1637423169; a=rsa-sha256; cv=fail; b=E23O5IPlE9DbdCT7zz+lBGdfbfNZoJiWTk2JqBEFg0S/qX2XyG9DEbs7wwNVGuiVLQ/Ocs Qg2KUTO3BhOKiYRYyp7dN5FKfsc/IKbDOaxyrnOMWN288kNMkzbTVDgz4bgQ0Y/8Kf7nJ/ ZtypPOEQafaMgNqySnD45YQ2Yo8kUpiFYSn3sE9IdH5OddV05h+Zi2eXi9THxv+ENkVYbL VTXqjt7zX9+7E4X+1Y/1NLq+uoLocdmkDnneFHCMF1Ekawo/yaFypTyPLhVGNdOKkyZYhf oHICuKUxXVX97/YUKYY3lG5FykH66VJANVSwKzFvZDm/vpBBg3Gz6n0ICAr3ew== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=hotmail.com header.s=selector1 header.b=TnE0Qk5g; 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: -0.77 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=hotmail.com header.s=selector1 header.b=TnE0Qk5g; 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: E2B97A7D6 X-Spam-Score: -0.77 X-Migadu-Scanner: scn0.migadu.com X-TUID: 643GyXUdlUF2 * gnu/packages/databases.scm (sqlitebrowser): New variable. --- gnu/packages/databases.scm | 91 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 5edc4e2cce..ca801489be 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -54,6 +54,7 @@ ;;; Copyright © 2021 Alexandre Hannud Abdo ;;; Copyright © 2021 Simon Tournier ;;; Copyright © 2021 jgart +;;; Copyright © 2021 Foo Chuan Wei ;;; ;;; This file is part of GNU Guix. ;;; @@ -130,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) @@ -4098,6 +4100,95 @@ PostreSQL, SQLite, ODBC and MySQL.") connecting to MS SQL and Sybase servers over TCP/IP.") (license license:lgpl2.0+))) +(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" + (("auto json_parse_result = json::parse\\(cellData, nullptr, false\\);") + "auto json_parse_result = json::parse(cellData.toStdString(), nullptr, false);")) + (substitute* '("src/RemoteDock.cpp" + "src/RemotePushDialog.cpp") + (("json obj = json::parse\\(reply, nullptr, false\\);") + "json obj = json::parse(reply.toStdString(), nullptr, false);")) + (substitute* "src/RemoteNetwork.cpp" + (("json obj = json::parse\\(reply->readAll\\(\\), nullptr, false\\);") + "json obj = json::parse((reply->readAll()).toStdString(), nullptr, false);"))))))) + (native-inputs + `(("json-modern-cxx" ,json-modern-cxx) + ("qcustomplot" ,qcustomplot) + ("qhexedit" ,qhexedit) + ("qscintilla" ,qscintilla) + ("qtbase" ,qtbase-5) + ("qttools" ,qttools) + ("sqlite" ,sqlite))) + (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