From patchwork Sun Nov 21 10:39:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Foo Chuan Wei X-Patchwork-Id: 34716 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 887B727BBE3; Sun, 21 Nov 2021 10:40:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F2CB627BBE1 for ; Sun, 21 Nov 2021 10:40:33 +0000 (GMT) Received: from localhost ([::1]:47010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mokGv-0001x5-6P for patchwork@mira.cbaines.net; Sun, 21 Nov 2021 05:40:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:32810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mokGj-0001wc-CB for guix-patches@gnu.org; Sun, 21 Nov 2021 05:40:21 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60988) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mokGQ-0000CW-0c for guix-patches@gnu.org; Sun, 21 Nov 2021 05:40:20 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mokGP-0002ye-U3 for guix-patches@gnu.org; Sun, 21 Nov 2021 05:40:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52000] [PATCH v2 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: Sun, 21 Nov 2021 10:40: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.163749116311392 (code B ref 52000); Sun, 21 Nov 2021 10:40:01 +0000 Received: (at 52000) by debbugs.gnu.org; 21 Nov 2021 10:39:23 +0000 Received: from localhost ([127.0.0.1]:44301 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mokFn-0002xf-4c for submit@debbugs.gnu.org; Sun, 21 Nov 2021 05:39:23 -0500 Received: from mail-sgaapc01olkn2041.outbound.protection.outlook.com ([40.92.53.41]:24640 helo=APC01-SG2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mokFk-0002xP-Mn for 52000@debbugs.gnu.org; Sun, 21 Nov 2021 05:39:21 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P15hsGTsm19D1y6bgSXFHPyzHSmYB8e2BTu9JP69awPLbAEWaVRYPuwNyq4mFKJUWHoBGrzPm94R4GFf1nGUAxS/s4SLNBuUSscPZNzuVhjpV0NAKVMBDBYKQgu5SLEP2JhmIcCMZbtCtJl+Ph40z+QBcYGLj4+Mo1Kf7PVxRINllHajdhioZSvHN6rYSGFNOef/iG/9HJvg/6pHD2xOJIDqv9PVQMEohPFSZFcgOrihsYzxNbg1+g2sU5EJ1QNhsfqlK92PI6cLh1tdpR90JQgLjh2Fo2Olp3Uzz+F/B3JY+yP4EOLvE2uxNJbTm3O0Lc3pMgmMkYRkgnO42yk2Kw== 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=cKMri5hpwT1Nj5c8Pigcm74WooSxyTLsdBrJuYr+0/4=; b=dg/ArI1W39jEPJIPwPtPrdFynggi0EPH6Tc8G9iAhlEXTfPHfQypFmex5yY7zUXNm2A0KQetMNB72UfIYv5QcIioyKq2cq0LQ7tgkCEMyLFNYvHfNamvcIwfa3yOTQIKxjKyYmOWHd4O/K0GJqYWf3l8bnWPlXOWvx/3MOz3esMm5EEbGPsVF+dSd0gs7Tv+tfYqu48FT7VhrJGpPXzCHTzbe9MP7QnPmv8d2hJl156cPQcHUH62RUx6kVBguDxExoBrcI7AxZUIKH5zZBYTOht8/ByFFIwbwUkJGh6yWqJ28UDtvqQWraN1u23aVnPO2S3Zvrr696Wi5hN2HQYyyA== 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=cKMri5hpwT1Nj5c8Pigcm74WooSxyTLsdBrJuYr+0/4=; b=jD3pwUVQAnA1XxQC1r/3hlF1rBnIK5PtWl42ykiVJSZ54z0iy4rTfRdB5St6fRrAuI8whtdq7ASGxZuzCuANYRI7wejvuoyuJIZnpohllo+tNdpg+hIZqQsIPtAYE2/33bcsLHsnHEADWOHbWtkfbGaI2QVy6vWmdT8TYJFyzV0kG1b7nBAK+u0zEKPuUfHQQ99yUfYtfV9OamdoJi8+6hUL4w0zddQuCptqVIfQJdXxvm4E453A30YF3gLGR1QZu5OUfXRqYwyZbk5ifmA2dymtJT+ZHX/Jqt0eMUzzDEBWkuYL9EeTp5zNK3nftUeJ7pndJ82AK4KAUXxUX+IUAg== Received: from PU1PR01MB2155.apcprd01.prod.exchangelabs.com (2603:1096:803:1c::21) by PS2PR01MB2422.apcprd01.prod.exchangelabs.com (2603:1096:300:36::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.21; Sun, 21 Nov 2021 10:39:11 +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; Sun, 21 Nov 2021 10:39:12 +0000 Date: Sun, 21 Nov 2021 10:39:08 +0000 From: Foo Chuan Wei Message-ID: Content-Disposition: inline X-TMN: [CpOqV1bU9C3o/oXmYOigDJUq9rKkRFmFfQkaz3Q/ZN0=] X-ClientProxiedBy: HK0PR03CA0097.apcprd03.prod.outlook.com (2603:1096:203:b0::13) To PU1PR01MB2155.apcprd01.prod.exchangelabs.com (2603:1096:803:1c::21) X-Microsoft-Original-Message-ID: <20211121103908.6u2izk5ud336tbmc@main> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from main (118.103.255.110) by HK0PR03CA0097.apcprd03.prod.outlook.com (2603:1096:203:b0::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.21 via Frontend Transport; Sun, 21 Nov 2021 10:39:10 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6512025b-1717-43a0-b0ed-08d9acdb27dc X-MS-TrafficTypeDiagnostic: PS2PR01MB2422: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2SLs/gvDmkUdo19JQLddIxQrP77AkEIrjKdg+cPww+K155uoP+q6L/dd5XQFQ2YoPQb5N/Orb3y1X+4gtNFQxG/9qp58YnPLpeNoXuz4gWE63yB3RlrBL9qnONL+cz1UuC1XEcllMOnOjgrq2P6lZHG+Bqqp6FmoHWrkLIxOaamSLEk6sxGxw+T7BmKemzhzwewgktTQYbYuvbGVraaqlFJiDiwf9rseXgcNmN++hCmndA0XGKfbgOZtOeF4mqY3BIsp+iG55SAVMBgs0ANOAvhcgOYYAqMaDm9RvOCjB21pzWVNrkYWxmgiH9gGhqpKezpXJgYZCAne/9cu0IFW3wkWreh/7m9T9EsB4iWmpsWM3NFbAnvxBp1tIDdnPb/1jeWMaIh4AorHNdyb+I1JqxgP9XIoGCvEATnbfqKH/map4dEj1EB/XWo0Qoyi8H5QuNH6Wo8bGTZOU2AWfuYFTkAQGckX6sakHHy+lOu3xbUTyddfqovr1e8NoftGYBfe/XiCjGXLPkNLO0etV8UHwArKJ9VWTzhTGwfKxnOszzrZf09V82Kw0AJxD7JMkhBgBn44lXzWeZ0sH/hXhwzYyKGBJ5L85gHVPSemaVfOSDXukgDp/k1R77KYL7bM3CwX X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: g7b5XqVrxEw+jtQ0hw7GJ76UzguMIo9VyrFt3dYJmkqTMPjuN6EhqnodOkvW1R6qfYIqA5mwoNbBeKPnYo2axI7YckH5PzED/OYdGnN3ePWJykXd6uClGsgVpY8nSzyTc45lOqvBxWBxhLczvuAaXxk+EUhS/Ymmc/yDC9V1nSXp9cA8LXNJQa0PTlGTz5IlTqQxjHsR0/dJaDnsL0wvgR/UzpWZTBIHN3j9F+NOjaS+7Tqg2cEDyVWLqjJPoEtggNB1P1nh/HnXarpc8ZrmDA+qdk2Gq3RXPr/w7ZkcBiWDUpmIHr0a9skq3Wm1TjkHcaUg/fvwzIjulwbIj/wILtZE2lLMUGsgBPGbYvJXNcw18x4bstrKVZ4xwCnxgNhq2R/JMbVzZstlOjpru9slLN/hd1RMjHqkaXsJdTclPPEp5a5R6Rc0mi9xHL5oaL6IlOGRBYKabK9MgaRHpYtILfR+aXfc/hgKxUGjprUBDiWTRaS3o6R1sdgo+q7judM1uGLzGVsqyjXIsEGxk4Hdcz+njnWZ4TmrwXTKifCkGUdMEiDreDs/Hzonp1vOyzU/G9QzFeUANpqA0TX3QWs/apr8AZto5WQRNTeb8CpIvNMfgymv5Bl0IXUZtN/Aq5q//lv+FioXLFezN36y0BwnrT/i05lswic5FvenzmzRhx8Uunv0iDYuXpP7q3+DCvDA8iraq7RMGc8NEOmcNLiM0w== X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-5c337.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 6512025b-1717-43a0-b0ed-08d9acdb27dc X-MS-Exchange-CrossTenant-AuthSource: PU1PR01MB2155.apcprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Nov 2021 10:39:11.9353 (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: PS2PR01MB2422 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/databases.scm (sqlitebrowser): New variable. --- Changes relative to PATCH v1: * Move libraries from native-inputs to inputs. * Reduce the length of some long string arguments given to substitute*. gnu/packages/databases.scm | 92 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 5edc4e2cce..ab7b31392e 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,96 @@ 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" + (("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 + `(("json-modern-cxx" ,json-modern-cxx) + ("qcustomplot" ,qcustomplot) + ("qhexedit" ,qhexedit) + ("qscintilla" ,qscintilla) + ("qtbase" ,qtbase-5) + ("sqlite" ,sqlite))) + (native-inputs + `(("qttools" ,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")