03/06: gnu: Make gtksourceview-5 the default gtksourceview.

[guix-commits]

lilyp pushed a commit to branch core-updates
in repository guix.

commit 21175594a212476da3187d37aea15243cb601097
Author: Liliana Marie Prikler <liliana.prikler@gmail.com>
AuthorDate: Mon Aug 15 21:43:37 2022 +0200

    gnu: Make gtksourceview-5 the default gtksourceview.
    
    * gnu/packages/gtk.scm (gtksourceview-5): Rename to gtksourceview.
    (gtksourceview): Rename to gtksourceview-4.  Adjust accordingly.
    (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         |  8 ++++----
 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, 22 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 8e41aceff8..87ee593a6a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1055,7 +1055,7 @@ between different kinds of computer systems.")
      (list amtk
            glib
            gtk+
-           gtksourceview
+           gtksourceview-4
            libxml2
            uchardet))
     (synopsis "Text editor product line")
@@ -1624,7 +1624,7 @@ sharing to the masses.")
            gjs
            gst-plugins-base
            gstreamer
-           gtksourceview
+           gtksourceview-4
            harfbuzz
            libepoxy
            libmusicbrainz
@@ -7312,7 +7312,7 @@ javascript engine and the GObject introspection 
framework.")
            glib
            gspell
            gtk+
-           gtksourceview
+           gtksourceview-4
            libpeas
            libxml2
            iso-codes
@@ -10139,7 +10139,7 @@ handling the startup notification side.")
            python))
     (inputs
      (list `(,glib "bin")
-           gtksourceview
+           gtksourceview-4
            libgee
            libhandy
            libsoup-minimal-2
@@ -10171,7 +10171,7 @@ is suitable as a default application in a Desktop 
environment.")
      (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
@@ -11323,7 +11323,7 @@ higher level porcelain stuff.")
            gsettings-desktop-schemas
            gspell
            gtk+
-           gtksourceview
+           gtksourceview-4
            json-glib
            libdazzle
            libgee
@@ -11635,7 +11635,7 @@ integrate seamlessly with the GNOME desktop.")
            gsettings-desktop-schemas
            gtk+
            gtk-vnc
-           gtksourceview
+           gtksourceview-4
            json-glib
            libhandy
            libosinfo
@@ -11832,7 +11832,7 @@ card sheets that you’ll find at most office supply 
stores.")
            gsettings-desktop-schemas
            gspell
            gtk+
-           gtksourceview
+           gtksourceview-4
            libgee
            tepl-5
            uchardet))
@@ -11887,7 +11887,7 @@ and toolbars.")
      `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("gspell" ,gspell)
        ("gtk+" ,gtk+)
-       ("gtksourceview" ,gtksourceview)
+       ("gtksourceview" ,gtksourceview-4)
        ("pango" ,pango)
        ("poppler" ,poppler)
        ("python-pdfminer" ,python-pdfminer-six)
@@ -12333,7 +12333,7 @@ libraries.  Applications do not need to be 
recompiled--or even restarted.")
                   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
@@ -12538,7 +12538,7 @@ your data.")
        ("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 0dcc725dcf..06a24a641c 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -566,7 +566,7 @@ printing and other features typical of a source code 
editor.")
     (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")
@@ -618,9 +618,9 @@ 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
+(define-public gtksourceview-4
  (package
-   (inherit gtksourceview-5)
+   (inherit gtksourceview)
    (version "4.2.0")
    (source (origin
              (method url-fetch)
@@ -659,7 +659,7 @@ highlighting and other features typical of a source code 
editor.")
     (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 8ba38c87d8..4a37a4bde5 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3523,7 +3523,7 @@ perform geometrical transforms on JPEG images.")
        ("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 646902b4db..e51321d884 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -3767,7 +3767,7 @@ tools and applications:
            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 841e22e5b9..e4adfcb053 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1276,7 +1276,7 @@ of xmpppy.")
        ("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 5b6440455e..14d8fd1088 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -6194,7 +6194,7 @@ and as an LV2 plugin.")
       ("glibc" ,glibc)
       ("graphviz" ,graphviz)
       ("gtk+" ,gtk+)
-      ("gtksourceview" ,gtksourceview)
+      ("gtksourceview" ,gtksourceview-4)
       ("guile" ,guile-2.2)
       ("libaudec" ,libaudec)
       ("libcyaml" ,libcyaml)
@@ -6809,7 +6809,7 @@ streaming audio server.")
            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 @@ cards.")
     (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 bcf255864f..a4350bda27 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1338,7 +1338,7 @@ of data to either CD/DVD/BD.")
            `(,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