From patchwork Wed Jun 12 22:22:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Goaziou X-Patchwork-Id: 14295 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 1DDB2170C0; Wed, 12 Jun 2019 23:52:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E7B85170BE for ; Wed, 12 Jun 2019 23:52:17 +0100 (BST) Received: from localhost ([::1]:35744 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbC6L-0006v0-9q for patchwork@mira.cbaines.net; Wed, 12 Jun 2019 18:52:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49955) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbBkF-0007vJ-Gt for guix-patches@gnu.org; Wed, 12 Jun 2019 18:29:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hbBe2-0006Gi-JV for guix-patches@gnu.org; Wed, 12 Jun 2019 18:23:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48940) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hbBe2-0006GX-Ct for guix-patches@gnu.org; Wed, 12 Jun 2019 18:23:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hbBe2-0003nG-5l for guix-patches@gnu.org; Wed, 12 Jun 2019 18:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36043] [PATCH] Add Geany Resent-From: Nicolas Goaziou Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 12 Jun 2019 22:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36043 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Arun Isaac Received: via spool by 36043-submit@debbugs.gnu.org id=B36043.156037816714551 (code B ref 36043); Wed, 12 Jun 2019 22:23:02 +0000 Received: (at 36043) by debbugs.gnu.org; 12 Jun 2019 22:22:47 +0000 Received: from localhost ([127.0.0.1]:34251 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hbBde-0003mT-RH for submit@debbugs.gnu.org; Wed, 12 Jun 2019 18:22:47 -0400 Received: from relay1-d.mail.gandi.net ([217.70.183.193]:38925) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hbBda-0003mG-Q2 for 36043@debbugs.gnu.org; Wed, 12 Jun 2019 18:22:38 -0400 X-Originating-IP: 185.131.40.67 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id E74F6240006; Wed, 12 Jun 2019 22:22:28 +0000 (UTC) From: Nicolas Goaziou References: <87muj1vvds.fsf@nicolasgoaziou.fr> <877e9zu4p2.fsf@nicolasgoaziou.fr> Date: Thu, 13 Jun 2019 00:22:27 +0200 In-Reply-To: (Arun Isaac's message of "Thu, 06 Jun 2019 20:15:15 +0530") Message-ID: <87ef3yqw9o.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 36043@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hello, Arun Isaac writes: > Do post your scintilla patch to this bug report and add a link to it in > the TODO comment. Perhaps it will be useful to someone working on it in > the future. I actually packaged scintilla, but I failed unbundling it from Geany. I attach the three patches I put up so far. Since there is nothing more left in this bug report, I don't think it is worthwhile to link to it. > You are missing an import of (gnu packages python-xyz) for > python-docutils. Other than that your patch LGTM! :-) Oh! Fixed. Thank you. WDYT? From 04d9e080967cab864cd76565e9697bda73eff781 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 13 Jun 2019 00:13:27 +0200 Subject: [PATCH 3/3] gnu: Add scintilla. * gnu/packages/text-editors.scm (scintilla): New variable. --- gnu/packages/text-editors.scm | 55 +++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 383257f36d..a7efce5830 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -392,6 +392,61 @@ various text editors which allow this file format to be read and used by those editors.") (license license:bsd-2))) +(define-public scintilla + (package + (name "scintilla") + (version "4.1.5") + (source (origin + (method url-fetch) + (uri (let ((v (apply string-append (string-split version #\.)))) + (string-append + "https://www.scintilla.org/scintilla" v ".tgz"))) + (sha256 + (base32 + "1c24hfrl0wzb8674bjjql5105nlp6h31gj7axjaf7akkf8yisyab")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;require un-packaged Pyside + #:phases + (modify-phases %standard-phases + (delete 'configure) ;no configure script + (add-before 'build 'expand-C++-include-path + (lambda* (#:key inputs #:allow-other-keys) + ;; Make /include/c++/ext/string_conversions.h find + ;; . + (let* ((path "CPLUS_INCLUDE_PATH") + (gcc (assoc-ref inputs "gcc")) + (c++ (string-append gcc "/include/c++"))) + (setenv path (string-append c++ ":" (getenv path)))) + #t)) + (replace 'build + (lambda _ (invoke "make" "GTK3=1" "CC=gcc" "-Cgtk"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib/scintilla")) + (include (string-append out "/include/scintilla"))) + (install-file "bin/scintilla.a" lib) + (for-each (lambda (f) (install-file f include)) + (find-files "include/" ".")) + #t)))))) + (native-inputs + `(("gcc" ,gcc-7) ;require GCC 7.1+ + ("pkg-config" ,pkg-config))) + (inputs + `(("gtk+" ,gtk+))) + (home-page "https://www.scintilla.org/") + (synopsis "Code editor for GTK+") + (description "Scintilla is a source code editing component for +GTK+. It has the usual features found in text editing components, as +well as some that are especially useful for editing and debugging +source code; these include support for syntax styling, error +indicators, code completion and call tips. Styling choices are more +open than with many editors: Scintilla lets you use proportional +fonts, bold and italics, multiple foreground and background colours, +and multiple fonts.") + (license license:scintilla))) + (define-public geany (package (name "geany") -- 2.22.0