From patchwork Tue May 24 19:34:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Roel Janssen X-Patchwork-Id: 12500 Received: (qmail 51941 invoked by uid 89); 24 May 2016 19:35:13 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.1 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.3 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy= X-Spam-Status: No, score=-3.3 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: lists.gnu.org Received: from lists.gnu.org (HELO lists.gnu.org) (208.118.235.17) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Tue, 24 May 2016 19:35:02 +0000 Received: from localhost ([::1]:55063 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5I6W-0007J2-3i for patchwork@sourceware.org; Tue, 24 May 2016 15:35:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56375) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5I6L-0007EA-2H for guix-devel@gnu.org; Tue, 24 May 2016 15:34:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b5I6F-0003kx-LV for guix-devel@gnu.org; Tue, 24 May 2016 15:34:47 -0400 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:36464) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5I69-0003iz-7m; Tue, 24 May 2016 15:34:37 -0400 Received: from 5469160b.cm-12-2a.dynamic.ziggo.nl ([84.105.22.11]:54574 helo=roel-tp) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1b5I66-0004lY-Uo; Tue, 24 May 2016 15:34:35 -0400 References: <87posdzltg.fsf@gnu.org> <878tz0mpdd.fsf@gnu.org> <874m9owh78.fsf@gnu.org> <87shx7ainc.fsf@gnu.org> User-agent: mu4e 0.9.17; emacs 25.1.50.5 From: Roel Janssen To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [PATCH] gnu: Add texmaker. In-reply-to: <87shx7ainc.fsf@gnu.org> Date: Tue, 24 May 2016 21:34:32 +0200 Message-ID: <87y46z6yif.fsf@gnu.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Guix-devel Errors-To: guix-devel-bounces+patchwork=sourceware.org@gnu.org Sender: "Guix-devel" Ludovic Courtès writes: > Roel Janssen skribis: > >> From fc657a31b4a52628c09a0b634c49b71cce2230bc Mon Sep 17 00:00:00 2001 >> From: Roel Janssen >> Date: Tue, 24 May 2016 00:14:59 +0200 >> Subject: [PATCH 1/2] gnu: Rename texlive to tex. >> >> * gnu/local.mk (GNU_SYSTEM_MODULES): Rename texlive.scm to tex.scm. >> * gnu/packages/texlive.scm: Rename file to tex.scm. >> * gnu/packages/tex.scm: Renamed from texlive.scm. >> * gnu/packages/algebra.scm: Rename texlive to tex. > > Here I’d just put “Adjust accordingly.” > >> * gnu/packages/docbook.scm: Rename texlive to tex. >> * gnu/packages/engineering.scm: Rename texlive to tex. > > … and here “Likewise.” is enough. > > Apart from that LGTM! I've changed the commit message. Hopefully it's how you envisioned it should be. I modified the first line to be more clear about what is to be renamed (the module, not the package). This version of the patch also renames Efraim Flashner's recent addition of texlive in photo.scm. >> From f54915ab4ab70133adced8fd71649918e38ba659 Mon Sep 17 00:00:00 2001 >> From: Roel Janssen >> Date: Tue, 24 May 2016 00:16:05 +0200 >> Subject: [PATCH 2/2] gnu: Add texmaker. >> >> * gnu/packages/tex.scm (texmaker): New variable. > > OK. > > I think it would help now if you could access the repo directly. :-) > > What’s your Savannah account? Please make sure to upload your current > OpenPGP public key there. Thanks! My Savannah username is roelj. I've created a new PGP key and updated my account's public key accordingly. May I sign and push these patches? Kind regards, Roel Janssen From 1a7e23191fe4371f6d65b04b839f5fbb464e054a Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Tue, 24 May 2016 21:23:31 +0200 Subject: [PATCH 2/2] gnu: Add texmaker. * gnu/packages/tex.scm (texmaker): New variable. --- gnu/packages/tex.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index eab85f1..c1ab8b3 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2015 Mark H Weaver +;;; Copyright © 2016 Roel Janssen ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,6 +41,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages qt) #:use-module (gnu packages ruby) #:use-module (gnu packages tcsh) #:use-module (gnu packages base) @@ -387,3 +389,40 @@ to manage bibliographic references. Automatic execution of dvips to produce PostScript documents is also included, as well as usage of pdfLaTeX to produce PDF documents.") (license license:gpl2+))) + +(define-public texmaker + (package + (name "texmaker") + (version "4.5") + (source (origin + (method url-fetch) + (uri (string-append "http://www.xm1math.net/texmaker/texmaker-" + version ".tar.bz2")) + (sha256 + (base32 + "056njk6j8wma23mlp7xa3rgfaxx0q8ynwx8wkmj7iy0b85p9ds9c")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Qt has its own configuration utility. + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (zero? (system* "qmake" + (string-append "PREFIX=" out) + (string-append "DESKTOPDIR=" out + "/share/applications") + (string-append "ICONDIR=" out "/share/pixmaps") + "texmaker.pro")))))))) + (inputs + `(("poppler-qt5" ,poppler-qt5) + ("qt" ,qt) + ("zlib" ,zlib))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "http://www.xm1math.net/texmaker/") + (synopsis "LaTeX editor") + (description "Texmaker is a program that integrates many tools needed to +develop documents with LaTeX, in a single application.") + (license license:gpl2+))) -- 2.8.3