[bug#57230] [PATCH core-updates 0/3] Add GtkSourceView 5.

[bug#57230] [PATCH core-updates 0/3] Add GtkSourceView 5.

[Liliana Marie Prikler]

Hi Guix, 

This series adds gtksourceview 5.4.2, which will be required for some
Gtk4-based text editors etc. going forward.  Note, that Gtk itself
currently doesn't build cleanly on core-updates (at least not for me),
so it's somewhat experimental.

Have fun!

Liliana Marie Prikler (3):
  gnu: gtk: Add missing input.
  gnu: gtksourceview: Update to 5.4.2.
  gnu: Make gtksourceview-5 the default gtksourceview.

 gnu/packages/gnome.scm       | 22 ++++++-------
 gnu/packages/gtk.scm         | 64 +++++++++++++++++++++++++++++++-----
 gnu/packages/guile-xyz.scm   |  2 +-
 gnu/packages/mail.scm        |  2 +-
 gnu/packages/messaging.scm   |  2 +-
 gnu/packages/music.scm       |  4 +--
 gnu/packages/syndication.scm |  2 +-
 gnu/packages/xfce.scm        |  2 +-
 8 files changed, 74 insertions(+), 26 deletions(-)

-- 
2.37.1

[bug#57230] [PATCH core-updates 1/3] gnu: gtk: Add missing input.

[Liliana Marie Prikler]

* gnu/packages/gtk.scm (gtk)[inputs]: Add libgudev.
---
 gnu/packages/gtk.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index ab0f3e2467..b3f2439c37 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1238,6 +1238,7 @@ (define-public gtk
            iso-codes
            json-glib
            libcloudproviders            ;for cloud-providers support
+           libgudev                     ;for gstreamer-gl
            libjpeg-turbo
            libpng
            librsvg
-- 
2.37.1

[bug#57230] [PATCH core-updates 2/3] gnu: gtksourceview: Update to 5.4.2.

[Liliana Marie Prikler]

* gnu/packages/gtk.scm (gtksourceview-5): New variable.
(gtksourceview): Inherit from gtksourceview-5.
---
 gnu/packages/gtk.scm | 63 ++++++++++++++++++++++++++++++++++++++------
 1 file changed, 55 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index b3f2439c37..2426faeb2f 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -92,6 +92,7 @@ (define-module (gnu packages gtk)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages m4)
   #:use-module (gnu packages man)
+  #:use-module (gnu packages pcre)
   #:use-module (gnu packages pdf)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages perl-check)
@@ -566,9 +567,61 @@ (define-public gtksourceview-2
     (license license:lgpl2.0+)
     (home-page "https://developer.gnome.org/gtksourceview/")))
 
-(define-public gtksourceview
+(define-public gtksourceview-5
  (package
    (name "gtksourceview")
+   (version "5.4.2")
+   (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://gnome/sources/gtksourceview/"
+                                 (version-major+minor version) "/"
+                                 "gtksourceview-" version ".tar.xz"))
+             (sha256
+              (base32
+               "1rwxnzq2vvck5ni5zsfnmnx2kgasi3a2n29w93g106c4xc3hw55d"))))
+   (build-system meson-build-system)
+   (arguments
+    (list
+     #:phases
+     #~(modify-phases %standard-phases
+         (add-after 'unpack 'patch-build
+           (lambda _
+             (substitute* "meson.build"
+               (("gnome.post_install" all)
+                (string-append "# " all)))))
+         (add-before 'check 'pre-check
+           (lambda* (#:key inputs native-inputs #:allow-other-kgeys)
+             (let ((Xvfb (search-input-file (or native-inputs inputs)
+                                            "/bin/Xvfb")))
+               ;; Tests require a running X server.
+               (system (format #f "~a :1 &" Xvfb))
+               (setenv "DISPLAY" ":1")
+               ;; For the missing /etc/machine-id.
+               (setenv "DBUS_FATAL_WARNINGS" "0")
+               #t))))))
+   (native-inputs
+    (list `(,glib "bin") ; for glib-genmarshal, etc.
+          intltool
+          itstool
+          gobject-introspection
+          pkg-config
+          vala
+          ;; For testing.
+          xorg-server-for-tests
+          shared-mime-info))
+   (propagated-inputs
+    ;; gtksourceview-5.0.pc refers to all these.
+    (list glib gtk libxml2 pcre2))
+   (home-page "https://wiki.gnome.org/Projects/GtkSourceView")
+   (synopsis "GNOME source code widget")
+   (description "GtkSourceView is a text widget that extends the standard
+GTK+ text widget GtkTextView.  It improves GtkTextView by implementing syntax
+highlighting and other features typical of a source code editor.")
+   (license license:lgpl2.1+)))
+
+(define-public gtksourceview
+ (package
+   (inherit gtksourceview-5)
    (version "4.2.0")
    (source (origin
              (method url-fetch)
@@ -604,13 +657,7 @@ (define-public gtksourceview
       ("shared-mime-info" ,shared-mime-info)))
    (propagated-inputs
     ;; gtksourceview-3.0.pc refers to all these.
-    (list glib gtk+ libxml2))
-   (home-page "https://wiki.gnome.org/Projects/GtkSourceView")
-   (synopsis "GNOME source code widget")
-   (description "GtkSourceView is a text widget that extends the standard
-GTK+ text widget GtkTextView.  It improves GtkTextView by implementing syntax
-highlighting and other features typical of a source code editor.")
-   (license license:lgpl2.1+)))
+    (list glib gtk+ libxml2))))
 
 (define-public gtksourceview-3
  (package (inherit gtksourceview)
-- 
2.37.1

[bug#57230] [PATCH core-updates 3/3] gnu: Make gtksourceview-5 the default gtksourceview.

[Liliana Marie Prikler]

* gnu/packages/gtk.scm (gtksourceview-5): Rename to gtksourceview.
(gtksourceview): Rename to gtksourceview-4.
(gtksourceview-3): Adjust accordingly.
* gnu/packages/gnome.scm (tepl, sushi, gedit, gnome-calculator, xpad)
(gitg, gnome-boxes, gnome-latex, setzer, gnome-builder)
(gtranslator): Use gtksourceview-4.
* gnu/packages/guile-xyz.scm (nomad): Likewise.
* gnu/packages/mail.scm (balsa): Likewise.
* gnu/packages/messaging.scm (gajim): Likewise.
* gnu/packages/music.scm (zrythm, quodlibet): Likewise.
* gnu/packages/syndication.scm (giara): Likewise.
* gnu/packages/xfce.scm (mousepad): Likewise.
---
 gnu/packages/gnome.scm       | 22 +++++++++++-----------
 gnu/packages/gtk.scm         |  6 +++---
 gnu/packages/guile-xyz.scm   |  2 +-
 gnu/packages/mail.scm        |  2 +-
 gnu/packages/messaging.scm   |  2 +-
 gnu/packages/music.scm       |  4 ++--
 gnu/packages/syndication.scm |  2 +-
 gnu/packages/xfce.scm        |  2 +-
 8 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 017a230721..1730b2e799 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1057,7 +1057,7 @@ (define-public tepl
      (list amtk
            glib
            gtk+
-           gtksourceview
+           gtksourceview-4
            libxml2
            uchardet))
     (synopsis "Text editor product line")
@@ -1623,7 +1623,7 @@ (define-public sushi
            gjs
            gst-plugins-base
            gstreamer
-           gtksourceview
+           gtksourceview-4
            harfbuzz
            libepoxy
            libmusicbrainz
@@ -7259,7 +7259,7 @@ (define-public gedit
            glib
            gspell
            gtk+
-           gtksourceview
+           gtksourceview-4
            libpeas
            libxml2
            iso-codes
@@ -10083,7 +10083,7 @@ (define-public gnome-calculator
            python))
     (inputs
      (list `(,glib "bin")
-           gtksourceview
+           gtksourceview-4
            libgee
            libhandy
            libsoup-minimal-2
@@ -10115,7 +10115,7 @@ (define-public xpad
      (list autoconf automake
            `(,gtk+ "bin") intltool pkg-config))
     (inputs
-     (list gtksourceview libsm))
+     (list gtksourceview-4 libsm))
     (home-page "https://wiki.gnome.org/Apps/Xpad")
     (synopsis "Virtual sticky note")
     (description
@@ -11277,7 +11277,7 @@ (define-public gitg
            gsettings-desktop-schemas
            gspell
            gtk+
-           gtksourceview
+           gtksourceview-4
            json-glib
            libdazzle
            libgee
@@ -11589,7 +11589,7 @@ (define-public gnome-boxes
            gsettings-desktop-schemas
            gtk+
            gtk-vnc
-           gtksourceview
+           gtksourceview-4
            json-glib
            libhandy
            libosinfo
@@ -11786,7 +11786,7 @@ (define-public gnome-latex
            gsettings-desktop-schemas
            gspell
            gtk+
-           gtksourceview
+           gtksourceview-4
            libgee
            tepl-5
            uchardet))
@@ -11841,7 +11841,7 @@ (define-public setzer
      `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("gspell" ,gspell)
        ("gtk+" ,gtk+)
-       ("gtksourceview" ,gtksourceview)
+       ("gtksourceview" ,gtksourceview-4)
        ("pango" ,pango)
        ("poppler" ,poppler)
        ("python-pdfminer" ,python-pdfminer-six)
@@ -12287,7 +12287,7 @@ (define-public gnome-builder
                   template-glib
                   vte
                   webkitgtk-with-libsoup2))
-    (propagated-inputs (list gtksourceview)) ; needed for settings
+    (propagated-inputs (list gtksourceview-4)) ; needed for settings
     (native-inputs (list desktop-file-utils  ; for desktop-file-validate
                          `(,glib "bin")
                          gettext-minimal
@@ -12492,7 +12492,7 @@ (define-public gtranslator
        ("itstool" ,itstool)
        ("pkg-config" ,pkg-config)))
     (propagated-inputs
-     (list gtksourceview)) ; required for source view
+     (list gtksourceview-4)) ; required for source view
     (arguments
      `(#:build-type "release"
        #:glib-or-gtk? #t
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 2426faeb2f..b57e6b9092 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -567,7 +567,7 @@ (define-public gtksourceview-2
     (license license:lgpl2.0+)
     (home-page "https://developer.gnome.org/gtksourceview/")))
 
-(define-public gtksourceview-5
+(define-public gtksourceview
  (package
    (name "gtksourceview")
    (version "5.4.2")
@@ -619,7 +619,7 @@ (define-public gtksourceview-5
 highlighting and other features typical of a source code editor.")
    (license license:lgpl2.1+)))
 
-(define-public gtksourceview
+(define-public gtksourceview-4
  (package
    (inherit gtksourceview-5)
    (version "4.2.0")
@@ -660,7 +660,7 @@ (define-public gtksourceview
     (list glib gtk+ libxml2))))
 
 (define-public gtksourceview-3
- (package (inherit gtksourceview)
+ (package (inherit gtksourceview-4)
    (name "gtksourceview")
    (version "3.24.10")
    (source (origin
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 8e8a73ad30..4578b797a0 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3460,7 +3460,7 @@ (define-public nomad
        ("gtk+" ,gtk+)
        ("gtk+:bin" ,gtk+ "bin")
        ("webkitgtk" ,webkitgtk)
-       ("gtksourceview" ,gtksourceview)
+       ("gtksourceview" ,gtksourceview-4)
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("vte" ,vte)
        ;; Gstreamer
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 33dcc48e04..b943a233db 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -3766,7 +3766,7 @@ (define-public balsa
            gnutls
            gpgme
            gtk+
-           gtksourceview
+           gtksourceview-4
            gtkspell3
            libassuan ; in gpgme.pc Requires
            libcanberra
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 47798c3586..c74e722c74 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1275,7 +1275,7 @@ (define-public gajim
        ("gstreamer" ,gstreamer)
        ("gst-plugins-base" ,gst-plugins-base)
        ("gtk+" ,gtk+)
-       ("gtksourceview" ,gtksourceview)
+       ("gtksourceview" ,gtksourceview-4)
        ("gupnp-igd" ,gupnp-igd)
        ("libappindicator" ,libappindicator)
        ("libnice" ,libnice)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index dcc1a43d2d..6189dd89ac 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -6195,7 +6195,7 @@ (define-public zrythm
       ("glibc" ,glibc)
       ("graphviz" ,graphviz)
       ("gtk+" ,gtk+)
-      ("gtksourceview" ,gtksourceview)
+      ("gtksourceview" ,gtksourceview-4)
       ("guile" ,guile-2.2)
       ("libaudec" ,libaudec)
       ("libcyaml" ,libcyaml)
@@ -6810,7 +6810,7 @@ (define-public quodlibet
            gst-plugins-ugly
            gstreamer
            gtk+
-           gtksourceview ; undo, redo, multiline text fields
+           gtksourceview-4 ; undo, redo, multiline text fields
            hicolor-icon-theme
            keybinder-3.0 ; keybindings outside of GNOME
            librsvg
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 6eb88afb8f..9c066bb4e4 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -196,7 +196,7 @@ (define-public giara
     (inputs
      `(("glib" ,glib)
        ("gtk+" ,gtk+)
-       ("gtksourceview" ,gtksourceview)
+       ("gtksourceview" ,gtksourceview-4)
        ("libhandy" ,libhandy)
        ("python" ,python)
        ("python-beautifulsoup" ,python-beautifulsoup4)
diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 12c490f622..7b76ec0f85 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1338,7 +1338,7 @@ (define-public mousepad
            `(,glib "bin") ; for glib-compile-schemas.
            pkg-config))
     (inputs
-     (list gtk+ gtksourceview xfconf))
+     (list gtk+ gtksourceview-4 xfconf))
     (home-page "https://git.xfce.org/apps/mousepad/")
     (synopsis "Simple text editor for Xfce")
     (description
-- 
2.37.1

bug#57230: [PATCH core-updates 3/3] gnu: Make gtksourceview-5 the default gtksourceview.

[Liliana Marie Prikler]

Am Montag, dem 15.08.2022 um 21:43 +0200 schrieb Liliana Marie Prikler:
> * gnu/packages/gtk.scm (gtksourceview-5): Rename to gtksourceview.
> (gtksourceview): Rename to gtksourceview-4.
Pushed with a slight fix to not actually break gtksourceview-4.

Cheers