[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
38/265: gnu: gtksourceview-2: Update package definition.
From: |
guix-commits |
Subject: |
38/265: gnu: gtksourceview-2: Update package definition. |
Date: |
Wed, 19 Aug 2020 13:08:35 -0400 (EDT) |
dannym pushed a commit to branch wip-desktop
in repository guix.
commit c2bfdc925445158e576a753b8e8b764a6e2bd510
Author: Raghav Gururajan <raghavgururajan@disroot.org>
AuthorDate: Mon Jul 6 01:47:18 2020 -0400
gnu: gtksourceview-2: Update package definition.
* gnu/packages/gtk.scm (gtksourceview-2): Inherit from gtksourceview.
[inherit]: New field.
[build-system]: Change from gnu to glib-or-gtk.
[outputs]: New output 'doc'.
[arguments]<#:configure-flags>[--with-html-dir]: New flag.
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
gnu/packages/gtk.scm | 103 ++++++++++++++++++++++-----------------------------
1 file changed, 45 insertions(+), 58 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 2e4583d..a756af1 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -425,64 +425,6 @@ graph-like environments, e.g. modular synths or finite
state machine
diagrams.")
(license license:gpl3+)))
-(define-public gtksourceview-2
- (package
- (name "gtksourceview")
- (version "2.10.5") ; This is the last version which builds against gtk+2
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/" name "/"
- (version-major+minor version) "/"
- name "-" version ".tar.bz2"))
- (sha256
- (base32
- "07hrabhpl6n8ajz10s0d960jdwndxs87szxyn428mpxi8cvpg1f5"))
- (patches
- (search-patches
- "gtksourceview-2-add-default-directory.patch"))))
- (build-system gnu-build-system)
- (native-inputs
- `(("intltool" ,intltool)
- ("glib" ,glib "bin") ; for glib-genmarshal, etc.
- ("pkg-config" ,pkg-config)
- ;; For testing.
- ("xorg-server" ,xorg-server-for-tests)
- ("shared-mime-info" ,shared-mime-info)))
- (propagated-inputs
- ;; As per the pkg-config file.
- `(("gtk" ,gtk+-2)
- ("libxml2" ,libxml2)))
- (arguments
- `(#:phases
- ;; Unfortunately, some of the tests in "make check" are highly dependent
- ;; on the environment therefore, some black magic is required.
- (modify-phases %standard-phases
- (add-before 'check 'start-xserver
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((xorg-server (assoc-ref inputs "xorg-server"))
- (mime (assoc-ref inputs "shared-mime-info")))
-
- ;; There must be a running X server and make check doesn't
start one.
- ;; Therefore we must do it.
- (system (format #f "~a/bin/Xvfb :1 &" xorg-server))
- (setenv "DISPLAY" ":1")
-
- ;; The .lang files must be found in
$XDG_DATA_HOME/gtksourceview-2.0
- (system "ln -s gtksourceview gtksourceview-2.0")
- (setenv "XDG_DATA_HOME" (getcwd))
-
- ;; Finally, the mimetypes must be available.
- (setenv "XDG_DATA_DIRS" (string-append mime "/share/")))
- #t)))))
- (synopsis "Widget that extends the standard GTK+ 2.x 'GtkTextView' widget")
- (description
- "GtkSourceView is a portable C library that extends the standard GTK+
-framework for multiline text editing with support for configurable syntax
-highlighting, unlimited undo/redo, search and replace, a completion framework,
-printing and other features typical of a source code editor.")
- (license license:lgpl2.0+)
- (home-page "https://developer.gnome.org/gtksourceview/")))
-
(define-public gtksourceview
(package
(name "gtksourceview")
@@ -576,6 +518,51 @@ of a source code editor.")
(home-page "https://wiki.gnome.org/Projects/GtkSourceView")
(license license:lgpl2.1+)))
+(define-public gtksourceview-2
+ (package
+ (inherit gtksourceview)
+ (name "gtksourceview")
+ (version "2.10.5") ; This is the last version which builds against gtk+2
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://gnome/sources/" name "/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.bz2"))
+ (sha256
+ (base32 "07hrabhpl6n8ajz10s0d960jdwndxs87szxyn428mpxi8cvpg1f5"))
+ (patches
+ (search-patches
+ "gtksourceview-2-add-default-directory.patch"))))
+ (build-system glib-or-gtk-build-system)
+ (outputs '("out" "doc"))
+ (arguments
+ `(#:configure-flags
+ (list
+ (string-append "--with-html-dir="
+ (assoc-ref %outputs "doc")
+ "/share/gtk-doc/html"))
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'check 'pre-check
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let* ((xorg-server (assoc-ref inputs "xorg-server"))
+ (mime (assoc-ref inputs "shared-mime-info")))
+ ;; There must be a running X server and make check doesn't
start one.
+ ;; Therefore we must do it.
+ (system (format #f "~a/bin/Xvfb :1 &" xorg-server))
+ (setenv "DISPLAY" ":1")
+ ;; The .lang files must be found in
$XDG_DATA_HOME/gtksourceview-2.0
+ (system "ln -s gtksourceview gtksourceview-2.0")
+ (setenv "XDG_DATA_HOME" (getcwd))
+ ;; Finally, the mimetypes must be available.
+ (setenv "XDG_DATA_DIRS" (string-append mime "/share/")))
+ #t)))))
+ (propagated-inputs
+ `(("gtk+-2" ,gtk+-2)
+ ,@(package-propagated-inputs gtksourceview)))))
+
(define-public gtksourceview-3
(package
(inherit gtksourceview)
- 72/265: gnu: gtksourceviewmm: Update package definition., (continued)
- 72/265: gnu: gtksourceviewmm: Update package definition., guix-commits, 2020/08/19
- 75/265: gnu: babl: Update package definition., guix-commits, 2020/08/19
- 80/265: gnu: gexiv2: Update package definition., guix-commits, 2020/08/19
- 81/265: gnu: gmime: Update package definition., guix-commits, 2020/08/19
- 76/265: gnu: evolution-data-server: Update package definition., guix-commits, 2020/08/19
- 77/265: gnu: folks: Update package definition., guix-commits, 2020/08/19
- 78/265: gnu: gegl: Update package definition., guix-commits, 2020/08/19
- 83/265: gnu: gnome-online-accounts: Update package definition., guix-commits, 2020/08/19
- 55/265: gnu: vala: Update package definition., guix-commits, 2020/08/19
- 31/265: gnu: Add rust-imgref., guix-commits, 2020/08/19
- 38/265: gnu: gtksourceview-2: Update package definition.,
guix-commits <=
- 44/265: gnu: ibus: Update package definition., guix-commits, 2020/08/19
- 52/265: gnu: openjpeg: Update package definition., guix-commits, 2020/08/19
- 58/265: gnu: webkitgtk: Update package definition., guix-commits, 2020/08/19
- 60/265: gnu: yelp-tools: Update package definition., guix-commits, 2020/08/19
- 61/265: gnu: yelp: Update package definition., guix-commits, 2020/08/19
- 62/265: gnu: zenity: Update package definition., guix-commits, 2020/08/19
- 64/265: gnu: cairo: Update package definition., guix-commits, 2020/08/19
- 65/265: gnu: libsigc++: Update package definition., guix-commits, 2020/08/19
- 66/265: gnu: cairomm: Update package definition., guix-commits, 2020/08/19
- 67/265: gnu: glibmm: Update package definition., guix-commits, 2020/08/19