From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#36043] [PATCH] Add Geany Resent-Message-ID: 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> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Arun Isaac Cc: 36043@debbugs.gnu.org --=-=-= Content-Type: text/plain 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, -- Nicolas Goaziou --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-gnu-Add-scintilla.patch >From 979f7629c18a42f2be450cb25b06665694033b2d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 13 Jun 2019 00:13:27 +0200 Subject: [PATCH 1/2] gnu: Add scintilla. * gnu/packages/text-editors.scm (scintilla): New variable. --- gnu/packages/text-editors.scm | 62 +++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index b35486ba59..1d9cd09f43 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -437,3 +437,65 @@ types of content. It has robust support for mathematical formulas and plots. and Octave. TeXmacs is completely extensible via Guile.") (license license:gpl3+) (home-page "https://www.texmacs.org/tmweb/home/welcome.en.html"))) + +(define-public scintilla + (package + (name "scintilla") + (version "4.2.0") + (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 + "02ymi86fpcypg6423vfr54lbkxbks046q02v3m3dypawcf3bqy42")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags (list "GTK3=1" "CC=gcc" "-Cgtk") + #:tests? #f ;require un-packaged Pyside + #:phases + (modify-phases %standard-phases + (delete 'configure) ;no configure script + (add-after 'unpack 'build-shared-library + (lambda _ + (substitute* "gtk/makefile" + (("scintilla\\.a") "libscintilla.so") + (("\\$\\(AR\\) \\$\\(ARFLAGS\\) \\$@ \\$\\^") + "$(CC) -shared $^ -o $@") + (("\\$\\(RANLIB\\) \\$@") "")) + #t)) + (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 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib")) + (include (string-append out "/include"))) + (install-file "bin/libscintilla.so" 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:hpnd))) -- 2.22.0 --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename=0002-gnu-Add-geany.patch Content-Transfer-Encoding: quoted-printable >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 =C2=A9 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2019 Efraim Flashner ;;; Copyright =C2=A9 2019 Andreas Enge +;;; Copyright =C2=A9 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 pr= oportional 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 =3D" all) (string-append all " -lscintilla= "))) + (substitute* "doc/Makefile.am" + (("\\$\\(INSTALL_DATA\\) \\$\\(top_srcdir\\)/scintilla/Lice= nse.txt \\$\\(DOCDIR\\)/ScintillaLicense.txt") "")) + (for-each delete-file (list "autogen.sh" "configure" "Makefil= e.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 i= s as +independent as possible from special desktop environments like KDE or GNOM= E. + +The basic features of Geany are: +@itemize +@item syntax highlighting +@item code completion +@item auto completion of often constructed constructs like if, for and whi= le +@item auto completion of XML and HTML tags +@item call tips +@item folding +@item many supported filetypes like C, Java, PHP, HTML, Python, Perl, Pasc= al +@item symbol lists +@item embedded terminal emulation +@item extensibility through plugins +@end itemize") + (license license:gpl2+))) --=20 2.22.0 --=-=-=--