From patchwork Tue Jul 30 07:59:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Goaziou X-Patchwork-Id: 14790 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 0ECD617206; Tue, 30 Jul 2019 09:00:21 +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,URIBL_BLOCKED autolearn=unavailable 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 987F117125 for ; Tue, 30 Jul 2019 09:00:15 +0100 (BST) Received: from localhost ([::1]:58660 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsN3P-0003O9-5f for patchwork@mira.cbaines.net; Tue, 30 Jul 2019 04:00:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46673) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsN3F-0003Nf-6K for guix-patches@gnu.org; Tue, 30 Jul 2019 04:00:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hsN3D-0002Us-6x for guix-patches@gnu.org; Tue, 30 Jul 2019 04:00:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40671) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hsN3D-0002UH-16 for guix-patches@gnu.org; Tue, 30 Jul 2019 04:00:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hsN3C-00047S-Ps for guix-patches@gnu.org; Tue, 30 Jul 2019 04:00: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: Tue, 30 Jul 2019 08:00: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.156447356515755 (code B ref 36043); Tue, 30 Jul 2019 08:00:02 +0000 Received: (at 36043) by debbugs.gnu.org; 30 Jul 2019 07:59:25 +0000 Received: from localhost ([127.0.0.1]:49492 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hsN2Q-00045u-BU for submit@debbugs.gnu.org; Tue, 30 Jul 2019 03:59:24 -0400 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:46029) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hsN2L-00045i-R2 for 36043@debbugs.gnu.org; Tue, 30 Jul 2019 03:59:13 -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 relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 64A10C000F; Tue, 30 Jul 2019 07:59:07 +0000 (UTC) From: Nicolas Goaziou References: <87muj1vvds.fsf@nicolasgoaziou.fr> <877e9zu4p2.fsf@nicolasgoaziou.fr> <87ef3yqw9o.fsf@nicolasgoaziou.fr> <87blywrm5s.fsf@nicolasgoaziou.fr> <87fto5rfjy.fsf@nicolasgoaziou.fr> Date: Tue, 30 Jul 2019 09:59:05 +0200 In-Reply-To: (Arun Isaac's message of "Tue, 23 Jul 2019 16:37:25 +0530") Message-ID: <87ftmoosvq.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: > Just a friendly ping. Can we finish this package one way or the other -- > with or without a bundled scintilla? Perhaps you can just leave a TODO > comment for someone to pick up on later. I'm just worried it's taking > too long for this relatively simple package. Here are the current patches, with all the discussed suggestions integrated (IIRC), and Scintilla updated to its latest release. Regards, From 25a507a7ed5383ae26f11b568143dc89227aec37 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 1 Jun 2019 23:37:24 +0200 Subject: [PATCH 2/2] gnu: Add geany. * gnu/packages/text-editors.scm (geany): New variable. --- gnu/packages/text-editors.scm | 69 +++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 1d9cd09f43..7d5f6797dc 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2019 Andreas Enge +;;; Copyright © 2019 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,6 +36,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) #:use-module (gnu packages assembly) + #:use-module (gnu packages autotools) #:use-module (gnu packages boost) #:use-module (gnu packages documentation) #:use-module (gnu packages fontutils) @@ -50,6 +52,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages regex) #:use-module (gnu packages ruby) @@ -499,3 +502,69 @@ open than with many editors: Scintilla lets you use proportional fonts, bold and italics, multiple foreground and background colours, and multiple fonts.") (license license:hpnd))) + +(define-public geany + (package + (name "geany") + (version "1.35") + (source (origin + (method url-fetch) + (uri (string-append "https://download.geany.org/" + "geany-" version ".tar.bz2")) + (sha256 + (base32 + "179xfnvhcxsv54v2mlrhykqv2j7klniln5sffvqqpjmdvwyivvim")) + (modules '((guix build utils))) + (snippet '(begin + (delete-file-recursively "scintilla") + #t)))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("doxygen" ,doxygen) + ("glib" ,glib "bin") + ("intltool" ,intltool) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("python-docutils" ,python-docutils))) ;for rst2html + (inputs + `(("gtk+" ,gtk+) + ("scintilla" ,scintilla))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'use-scintilla-shared-library + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "configure.ac" + (("scintilla/Makefile") "") + (("scintilla/include/Makefile") "")) + (substitute* "Makefile.am" + (("scintilla ") "")) + (substitute* "src/Makefile.am" + (("\\$\\(top_builddir\\)/scintilla/libscintilla.la") "") + (("geany_LDFLAGS =" all) (string-append all " -lscintilla"))) + (substitute* "doc/Makefile.am" + (("\\$\\(INSTALL_DATA\\) \\$\\(top_srcdir\\)/scintilla/License.txt \\$\\(DOCDIR\\)/ScintillaLicense.txt") "")) + (for-each delete-file (list "autogen.sh" "configure" "Makefile.in")) + #t))))) + (home-page "https://www.geany.org") + (synopsis "Fast and lightweight IDE") + (description "Geany is a small and fast Integrated Development +Environment (IDE) that only has a few dependencies on other packages and is as +independent as possible from special desktop environments like KDE or GNOME. + +The basic features of Geany are: +@itemize +@item syntax highlighting +@item code completion +@item auto completion of often constructed constructs like if, for and while +@item auto completion of XML and HTML tags +@item call tips +@item folding +@item many supported filetypes like C, Java, PHP, HTML, Python, Perl, Pascal +@item symbol lists +@item embedded terminal emulation +@item extensibility through plugins +@end itemize") + (license license:gpl2+))) -- 2.22.0