From patchwork Sat Nov 2 01:40:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kei Kebreau X-Patchwork-Id: 15923 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 7F3C2176B8; Sat, 2 Nov 2019 01:44:23 +0000 (GMT) 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,RCVD_IN_MSPIKE_H2, 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 3450C176B3 for ; Sat, 2 Nov 2019 01:44:23 +0000 (GMT) Received: from localhost ([::1]:44496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iQiSk-0007S6-FZ for patchwork@mira.cbaines.net; Fri, 01 Nov 2019 21:44:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58658) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iQiST-0007ES-99 for guix-patches@gnu.org; Fri, 01 Nov 2019 21:44:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iQiSR-0000Mm-Pe for guix-patches@gnu.org; Fri, 01 Nov 2019 21:44:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48988) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iQiSR-0000Lw-Kh for guix-patches@gnu.org; Fri, 01 Nov 2019 21:44:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iQiSR-00084Z-Gk for guix-patches@gnu.org; Fri, 01 Nov 2019 21:44:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#38029] [PATCH 07/80] gnu: gedit: Update to 3.32.2. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Nov 2019 01:44:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38029 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 38029@debbugs.gnu.org Cc: Kei Kebreau Received: via spool by 38029-submit@debbugs.gnu.org id=B38029.157265899930912 (code B ref 38029); Sat, 02 Nov 2019 01:44:03 +0000 Received: (at 38029) by debbugs.gnu.org; 2 Nov 2019 01:43:19 +0000 Received: from localhost ([127.0.0.1]:57798 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iQiRj-00082K-3X for submit@debbugs.gnu.org; Fri, 01 Nov 2019 21:43:19 -0400 Received: from mout02.posteo.de ([185.67.36.66]:47893) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iQiRg-00081T-2U for 38029@debbugs.gnu.org; Fri, 01 Nov 2019 21:43:16 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 6EEA82400E5 for <38029@debbugs.gnu.org>; Sat, 2 Nov 2019 02:43:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1572658990; bh=tl471Fja8fHdMSQ1+0FhNq3IEjvtP9S7m5UgnHD2COY=; h=From:To:Cc:Subject:Date:From; b=qfVxTUYcJv32ME5KYQ474ntoV1kq9BedWzAJIpxpcOlC5o5VAS/TEmy7NZHfW0wyB ol5+QJ2Mzd24rpT1a1FmQhDugMubCIx81n+Bx7fSeB7r72DqDp3YPgN/jxbCxALdI9 5Gn9Xy0WuzLmtKgCIPkDbbMKluPAyszaxrmVHJAA23Bomdaf7ciJ0+aEGskALBB7lq s3i4NlQZQ3PlvSyQ+L0o325NeABU5/p6Lbkum3LjuHYLXg7qhmmXX9FKdVfesoHRWf v5SIxYmTL1sGe+rkNoTGNVV8WZwLxx66s3DTBmpsRpSQxr2Du6V7knU88uBMQbgSM2 Vxs6iZaSj+Wpg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 474hf55ptNz9rxK; Sat, 2 Nov 2019 02:43:09 +0100 (CET) From: Kei Kebreau Date: Fri, 1 Nov 2019 21:40:56 -0400 Message-Id: <20191102014058.3061-7-kkebreau@posteo.net> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191102014058.3061-1-kkebreau@posteo.net> References: <20191102014058.3061-1-kkebreau@posteo.net> 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnome.scm (gedit): Update to 3.32.2. [build-system]: Use meson-build-system. [arguments]: Set glib-or-gtk? flag; add 'patch-libgd-fetch' phase; pass configure flag to add $out/lib/gedit to RUNPATH. [native-inputs]: Add desktop-file-utils, libgd, glib:bin and gtk+:bin. [inputs]: Replace gtksourceview-3 with gtksourceview. --- gnu/packages/gnome.scm | 67 +++++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 21 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5d8add8c55..c1cba7687a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4922,7 +4922,7 @@ javascript engine and the GObject introspection framework.") (define-public gedit (package (name "gedit") - (version "3.30.2") + (version "3.32.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4930,38 +4930,63 @@ javascript engine and the GObject introspection framework.") name "-" version ".tar.xz")) (sha256 (base32 - "0qwig35hzvjaqic9x92jcpmycnvcybsbnbiw6rppryx0arwb3wza")))) - (build-system glib-or-gtk-build-system) + "1q2rk7fym542c7k3bn2wlnzgy384gxacbifsjny0spbg95gfybvl")))) + (build-system meson-build-system) (arguments - `(#:phases + `(#:glib-or-gtk? #t + #:configure-flags + ;; Otherwise, the RUNPATH will lack the final path component. + (list (string-append "-Dc_link_args=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib/gedit")) + #:phases (modify-phases %standard-phases - (add-after - 'install 'wrap-gedit - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (gtksourceview (assoc-ref inputs "gtksourceview")) - (gi-typelib-path (getenv "GI_TYPELIB_PATH")) - (python-path (getenv "PYTHONPATH"))) - (wrap-program (string-append out "/bin/gedit") - ;; For plugins. - `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) - `("PYTHONPATH" ":" prefix (,python-path)) - ;; For language-specs. - `("XDG_DATA_DIRS" ":" prefix (,(string-append gtksourceview - "/share"))))) - #t))))) + (add-after 'unpack 'patch-libgd-fetch + (lambda* (#:key inputs #:allow-other-keys) + (let ((libgd (assoc-ref inputs "libgd"))) + ;; Calling git is unnecessary because libgd is fetched as a + ;; native input to this package. + (substitute* "meson.build" + ((".*git.*") "")) + (copy-recursively libgd "subprojects/libgd") + #t))) + (add-after 'install 'wrap-gedit + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gtksourceview (assoc-ref inputs "gtksourceview")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH")) + (python-path (getenv "PYTHONPATH"))) + (wrap-program (string-append out "/bin/gedit") + ;; For plugins. + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) + `("PYTHONPATH" ":" prefix (,python-path)) + ;; For language-specs. + `("XDG_DATA_DIRS" ":" prefix (,(string-append gtksourceview + "/share"))))) + #t))))) (propagated-inputs `(("dconf" ,dconf))) (native-inputs - `(("intltool" ,intltool) + `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database + ("intltool" ,intltool) ("itstool" ,itstool) + ("glib:bin" ,glib "bin") ; for glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) + ("gtk+" ,gtk+ "bin") ; for gtk-update-icon-cache + ("libgd" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/GNOME/libgd") + (commit "c7c7ff4e05d3fe82854219091cf116cce6b19de0"))) + (file-name (git-file-name "libgd" version)) + (sha256 + (base32 "16yld0ap7qj1n96h4f2sqkjmibg7xx5xwkqxdfzam2nmyfdlrrrs")))) ("pkg-config" ,pkg-config))) (inputs `(("glib" ,glib) ("gspell" ,gspell) ("gtk+" ,gtk+) - ("gtksourceview" ,gtksourceview-3) + ("gtksourceview" ,gtksourceview) ("libpeas" ,libpeas) ("libxml2" ,libxml2) ("iso-codes" ,iso-codes)