From patchwork Sat Jun 15 07:21:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 14327 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 AF874170DC; Sat, 15 Jun 2019 08:22:17 +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,T_DKIM_INVALID, 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 CD947170B9 for ; Sat, 15 Jun 2019 08:22:12 +0100 (BST) Received: from localhost ([::1]:59064 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hc30r-0000ly-Hm for patchwork@mira.cbaines.net; Sat, 15 Jun 2019 03:22:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40977) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hc30o-0000ls-0Y for guix-patches@gnu.org; Sat, 15 Jun 2019 03:22:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hc30k-0005I5-QX for guix-patches@gnu.org; Sat, 15 Jun 2019 03:22:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52947) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hc30k-0005Ht-JQ for guix-patches@gnu.org; Sat, 15 Jun 2019 03:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hc30k-0002W7-ET for guix-patches@gnu.org; Sat, 15 Jun 2019 03:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36043] [PATCH] Add Geany Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Jun 2019 07:22: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: Nicolas Goaziou Received: via spool by 36043-submit@debbugs.gnu.org id=B36043.15605833169662 (code B ref 36043); Sat, 15 Jun 2019 07:22:02 +0000 Received: (at 36043) by debbugs.gnu.org; 15 Jun 2019 07:21:56 +0000 Received: from localhost ([127.0.0.1]:38258 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hc30T-0002VY-OU for submit@debbugs.gnu.org; Sat, 15 Jun 2019 03:21:55 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:51660) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hc30M-0002VK-R0 for 36043@debbugs.gnu.org; Sat, 15 Jun 2019 03:21:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Type:MIME-Version:Message-ID:Date: References:In-Reply-To:Subject:Cc:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=o012v+WR+BSq4QvqGiAcstda+TSV/ykNSoUzeEYivak=; b=VAzOghssmFMVHr8HtWTeI67pj xuy23G7yvI6VTvw5fkpitBJYSEj1VvtbTrC0jzUkiqitLXMBkMIK/notTc4WXAJQC/tBDIybT6cPv 7evVHSKSs+Scc7O59GqAgdpmMAb965vDhPCWpQH5xde17TzoxwEqpQqylLc4//yFdDHsQ=; Received: from [49.206.9.88] (helo=steel) by systemreboot.net with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1hc30I-0007qR-T8; Sat, 15 Jun 2019 12:51:34 +0530 From: Arun Isaac In-Reply-To: <87ef3yqw9o.fsf@nicolasgoaziou.fr> References: <87muj1vvds.fsf@nicolasgoaziou.fr> <877e9zu4p2.fsf@nicolasgoaziou.fr> <87ef3yqw9o.fsf@nicolasgoaziou.fr> Date: Sat, 15 Jun 2019 12:51:33 +0530 Message-ID: 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 > I actually packaged scintilla Nice! > but I failed unbundling it from Geany. I attach the three patches I > put up so far. The scintilla package is not producing a shared library (libscintilla.so). That is why you were not able to link it to geany. It took a bit of substitute* surgery of the makefiles, but I managed to get this working. Please see my attached patches. Ideally, we should get scintilla and geany upstreams to support unbundling. Could you raise these issues upstream? > Subject: [PATCH 1/3] gnu: Add scintilla license. > > * guix/licenses.scm (scintilla): New variable. The scintilla license is the ISC license. See https://directory.fsf.org/wiki/License:ISC > + (replace 'build > + (lambda _ (invoke "make" "GTK3=1" "CC=gcc" "-Cgtk"))) This can be done by specifying #:make-flags. No need to replace the build phase. > + (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)))))) The headers should be installed in /include, not in /include/scintilla. The libraries should be installed in /lib, not in /lib/scintilla. The changes specified in the comments above are also included in the attached patches. Please feel free to refine my patches as required. Thanks! From 738e1b31ad695e54e1ab5fca199679003c2a9129 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 | 68 +++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 16f867184d..c143c06e3b 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -35,6 +35,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 gcc) @@ -46,6 +47,7 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages regex) #:use-module (gnu packages ruby) @@ -452,3 +454,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:isc))) + +(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 (list license:gpl2+)))) -- 2.22.0