Re: [PR PATCH] [Updated] New packages: libgedit-{amtk,gtksourceview}

[mtboehlke <mtboehlke@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1676 bytes --]

There is an updated pull request by mtboehlke against master on the void-packages repository

https://github.com/mtboehlke/void-packages gedit
https://github.com/void-linux/void-packages/pull/46965

New packages: libgedit-{amtk,gtksourceview}
<!-- Uncomment relevant sections and delete options which are not applicable -->

- New package: libgedit-amtk-5.8.0
- New package: libgedit-gtksourceview-299.0.4

These versions depend on the new packages:
- tepl: update to 6.8.0.
- gedit: update to 46.1.
- gedit-plugins: update to 46.0.
- gnome-latex: update to 3.46.0.

#### Testing the changes
- I tested the changes in this PR: **briefly**

gedit-plugins no longer carries the zeitgeist plugin.

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

Gedit and friends now depend on new packages libgedit-amtk and libgedit-gtksourceview: https://gedit-technology.net/

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/46965.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gedit-46965.patch --]
[-- Type: text/x-diff, Size: 13159 bytes --]

From 379bfbb938ac1b4f25e04f6f5387aec8a8c7e6b7 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Sun, 29 Oct 2023 23:59:53 -0500
Subject: [PATCH 1/6] New package: libgedit-amtk-5.8.0

---
 common/shlibs                  |  1 +
 srcpkgs/libgedit-amtk-devel    |  1 +
 srcpkgs/libgedit-amtk/template | 29 +++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 120000 srcpkgs/libgedit-amtk-devel
 create mode 100644 srcpkgs/libgedit-amtk/template

diff --git a/common/shlibs b/common/shlibs
index 1b25a12956eeb..db72ca4abf329 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3590,6 +3590,7 @@ libqmdnsengine.so.0 qmdnsengine-0.1.0_1
 libyang.so.1 libyang-1.0r5_1
 libhtp.so.2 libhtp-0.5.30_1
 libgedit-44.so gedit-44.0_1
+libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1
 libchewing.so.3 libchewing-0.5.1_1
 libdwarves.so.1 pahole-1.12_1
 libdwarves_emit.so.1 pahole-1.12_1
diff --git a/srcpkgs/libgedit-amtk-devel b/srcpkgs/libgedit-amtk-devel
new file mode 120000
index 0000000000000..dc7642213a0eb
--- /dev/null
+++ b/srcpkgs/libgedit-amtk-devel
@@ -0,0 +1 @@
+libgedit-amtk
\ No newline at end of file
diff --git a/srcpkgs/libgedit-amtk/template b/srcpkgs/libgedit-amtk/template
new file mode 100644
index 0000000000000..2b98068ad8d7b
--- /dev/null
+++ b/srcpkgs/libgedit-amtk/template
@@ -0,0 +1,29 @@
+# Template file for 'libgedit-amtk'
+pkgname=libgedit-amtk
+version=5.8.0
+revision=1
+build_helper="gir"
+build_style=meson
+configure_args="-Dgtk_doc=false"
+hostmakedepends="pkg-config glib-devel gettext"
+makedepends="gtk+3-devel"
+short_desc="Actions, Menus, and Toolbars Kit for GTK applications"
+maintainer="Matt Boehlke <mtboehlke@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://gedit-technology.net"
+changelog="https://raw.githubusercontent.com/gedit-technology/libgedit-amtk/main/NEWS"
+distfiles="https://gedit-technology.net/tarballs/libgedit-amtk/${pkgname}-${version}.tar.xz"
+checksum=64017ae100ef588e01ef54d79c13c4b9767fd37e4365d7e4afd924f751460ecc
+conflicts="amtk"
+
+libgedit-amtk-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} gtk+3-devel libglib-devel"
+	short_desc+=" - development files"
+	conflicts="amtk-devel"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove usr/share/gir-1.0
+	}
+}

From f0fe4e7917a60d876146f819a9c47e69ad2366ca Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Tue, 31 Oct 2023 18:15:54 -0500
Subject: [PATCH 2/6] New package: libgedit-gtksourceview-299.0.4

---
 common/shlibs                           |  1 +
 srcpkgs/libgedit-gtksourceview-devel    |  1 +
 srcpkgs/libgedit-gtksourceview/template | 28 +++++++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/libgedit-gtksourceview-devel
 create mode 100644 srcpkgs/libgedit-gtksourceview/template

diff --git a/common/shlibs b/common/shlibs
index db72ca4abf329..ee330ccc3647b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3591,6 +3591,7 @@ libyang.so.1 libyang-1.0r5_1
 libhtp.so.2 libhtp-0.5.30_1
 libgedit-44.so gedit-44.0_1
 libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1
+libgedit-gtksourceview-300.so.0 libgedit-gtksourceview-299.0.4_1
 libchewing.so.3 libchewing-0.5.1_1
 libdwarves.so.1 pahole-1.12_1
 libdwarves_emit.so.1 pahole-1.12_1
diff --git a/srcpkgs/libgedit-gtksourceview-devel b/srcpkgs/libgedit-gtksourceview-devel
new file mode 120000
index 0000000000000..508a9c30b2711
--- /dev/null
+++ b/srcpkgs/libgedit-gtksourceview-devel
@@ -0,0 +1 @@
+libgedit-gtksourceview
\ No newline at end of file
diff --git a/srcpkgs/libgedit-gtksourceview/template b/srcpkgs/libgedit-gtksourceview/template
new file mode 100644
index 0000000000000..dce8616ff5221
--- /dev/null
+++ b/srcpkgs/libgedit-gtksourceview/template
@@ -0,0 +1,28 @@
+# Template file for 'libgedit-gtksourceview'
+pkgname=libgedit-gtksourceview
+version=299.0.4
+revision=1
+build_helper="gir"
+build_style=meson
+configure_args="-Dgtk_doc=false"
+hostmakedepends="pkg-config glib-devel gettext"
+makedepends="gtk+3-devel libxml2-devel"
+short_desc="Source code editing widget"
+maintainer="Matt Boehlke <mtboehlke@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://gedit-technology.net"
+changelog="https://raw.githubusercontent.com/gedit-technology/libgedit-gtksourceview/main/NEWS"
+distfiles="https://gedit-technology.net/tarballs/libgedit-gtksourceview/${pkgname}-${version}.tar.xz"
+checksum=7453a1cce2f6d58871644d2203ecdbbb043050886170ebea376c1cf6e27f86d8
+make_check=no # Needs X
+
+libgedit-gtksourceview-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libglib-devel gtk+3-devel libxml2-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove usr/share/gir-1.0
+	}
+}

From 8a6d812067f9e1684ce17f0043d04fb67344a3b0 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Tue, 31 Oct 2023 18:16:49 -0500
Subject: [PATCH 3/6] tepl: update to 6.8.0.

---
 common/shlibs         |  2 +-
 srcpkgs/tepl/template | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ee330ccc3647b..abd29a6a8a6dd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3473,7 +3473,7 @@ libwx_gtk3u_richtext-3.2.so.0 wxWidgets-gtk3-3.2.2.1_1
 libwx_gtk3u_stc-3.2.so.0 wxWidgets-gtk3-3.2.2.1_1
 libwx_gtk3u_webview-3.2.so.0 wxWidgets-gtk3-3.2.2.1_1
 libwx_gtk3u_xrc-3.2.so.0 wxWidgets-gtk3-3.2.2.1_1
-libtepl-6.so.2 tepl-6.4.0_1
+libtepl-6.so.4 tepl-6.8.0_1
 libnomacsCore.so.3 nomacs-3.10.2_4
 libaudit.so.1 libaudit-2.8.4_1
 libauparse.so.0 libauparse-2.8.4_1
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index c989d7ed72895..ba6cda445a64d 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,21 +1,21 @@
 # Template file for 'tepl'
 pkgname=tepl
-version=6.4.0
-revision=3
+version=6.8.0
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gobject_introspection) $(vopt_bool gtk_doc gtk_doc)"
 hostmakedepends="glib-devel pkg-config gettext $(vopt_if gtk_doc gtk-doc)"
-makedepends="amtk-devel libglib-devel gtksourceview4-devel gtk+3-devel
+makedepends="libgedit-amtk-devel libglib-devel libgedit-gtksourceview-devel gtk+3-devel
  libxml2-devel uchardet-devel gsettings-desktop-schemas-devel"
 checkdepends="xvfb-run"
 short_desc="Text editor product line"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3.0-or-later"
+license="LGPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Tepl"
 changelog="https://gitlab.gnome.org/swilmet/tepl/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/tepl/${version%.*}/tepl-${version}.tar.xz"
-checksum=5e56b20669d0cf05fa1d64b58c8c342c59158122dc518100d093d59df9b87321
+checksum=46e6e5f1bfdbc52e5956f06add575e9c7697c673d53d3803dfe768f490b560f0
 make_check_pre="xvfb-run"
 
 build_options="gir gtk_doc"

From ed2918018dbebd31bf957f041b90e2489297728a Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Tue, 31 Oct 2023 18:17:23 -0500
Subject: [PATCH 4/6] gedit: update to 46.1.

---
 common/shlibs          |  2 +-
 srcpkgs/gedit/template | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index abd29a6a8a6dd..471f5906f2b55 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3589,7 +3589,7 @@ libqhttpengine.so.1 qhttpengine-1.0.1_1
 libqmdnsengine.so.0 qmdnsengine-0.1.0_1
 libyang.so.1 libyang-1.0r5_1
 libhtp.so.2 libhtp-0.5.30_1
-libgedit-44.so gedit-44.0_1
+libgedit-46.so gedit-46.1_1
 libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1
 libgedit-gtksourceview-300.so.0 libgedit-gtksourceview-299.0.4_1
 libchewing.so.3 libchewing-0.5.1_1
diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index 002740e531811..ddd6b82d56208 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,34 +1,34 @@
 # Template file for 'gedit'
 # keep major version in sync with gedit-plugins
 pkgname=gedit
-version=44.2
-revision=2
+version=46.1
+revision=1
 build_helper="gir"
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"
 configure_args="-Dgtk_doc=false"
-hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext vala"
-makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview4-devel
- libpeas-devel python3-gobject-devel amtk-devel tepl-devel"
+hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext
+ gtk-update-icon-cache desktop-file-utils"
+makedepends="gsettings-desktop-schemas-devel gspell-devel libgedit-gtksourceview-devel
+ libpeas-devel python3-gobject-devel libgedit-amtk-devel tepl-devel"
 depends="desktop-file-utils gsettings-desktop-schemas iso-codes"
 short_desc="Text editor for GNOME"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Gedit"
-changelog="https://gitlab.gnome.org/GNOME/gedit/-/raw/gedit-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gedit/-/raw/46.1/NEWS"
 distfiles="${GNOME_SITE}/gedit/${version%.*}/gedit-${version}.tar.xz"
-checksum=3bbb1b3775d4c277daf54aaab44b0eb83a4eb1f09f0391800041c9e56893ec11
+checksum=a1a6e37f041765dff7227a1f5578b6f49faaf016b1e17e869caf5bfb94c6aa4e
 python_version=3
-shlib_provides="libgedit-44.so"
+shlib_provides="libgedit-46.so"
 
 gedit-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} gtk+3-devel libglib-devel
-	 gtksourceview4-devel libpeas-devel amtk-devel tepl-devel"
+	 libgedit-gtksourceview-devel libpeas-devel libgedit-amtk-devel tepl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove usr/share/gedit/gir-1.0
-		vmove usr/share/vala
 	}
 }

From 12f19da81ad6850577ab3e4262b532ea257a8075 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Tue, 31 Oct 2023 18:17:54 -0500
Subject: [PATCH 5/6] gedit-plugins: update to 46.0.

---
 srcpkgs/gedit-plugins/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template
index 7d4e0d845171a..f332e34d3802f 100644
--- a/srcpkgs/gedit-plugins/template
+++ b/srcpkgs/gedit-plugins/template
@@ -1,15 +1,14 @@
 # Template file for 'gedit-plugins'
 # keep major version in sync with gedit
 pkgname=gedit-plugins
-version=44.1
-revision=2
+version=46.0
+revision=1
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"
 hostmakedepends="gettext glib-devel itstool pkg-config vala appstream-glib
  python3-gobject gucharmap-devel vte3-devel"
-makedepends="gedit-devel gtksourceview4-devel gtk+3-devel libgit2-glib-devel
- libglib-devel libpeas-devel python3-dbus-devel python3-devel zeitgeist-devel
- amtk-devel"
+makedepends="gedit-devel libgedit-gtksourceview-devel gtk+3-devel libgit2-glib-devel
+ libglib-devel libpeas-devel python3-dbus-devel python3-devel"
 depends="python3-gobject gucharmap vte3"
 short_desc="Set of plugins for Gedit"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,5 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gedit-plugins"
 changelog="https://gitlab.gnome.org/GNOME/gedit-plugins/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gedit-plugins/${version%.*}/gedit-plugins-${version}.tar.xz"
-checksum=1e56036e79d4425b5bfdf09dfd7d2892cfa01d025f7f33cdc48e1c569f2bba61
+checksum=db6b4aa72dac0190a8ae497f770f5a4ba66ae3cf1e03ea8b744e6101df09b251
 python_version=3

From c575637abb3046faf99b746b6a798b883822c34b Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Tue, 31 Oct 2023 18:18:33 -0500
Subject: [PATCH 6/6] gnome-latex: update to 3.46.0.

---
 srcpkgs/gnome-latex/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-latex/template b/srcpkgs/gnome-latex/template
index 6af20bdc4f019..745695af28413 100644
--- a/srcpkgs/gnome-latex/template
+++ b/srcpkgs/gnome-latex/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-latex'
 pkgname=gnome-latex
-version=3.44.0
+version=3.46.0
 revision=1
 build_helper="gir"
 build_style=gnu-configure
@@ -8,7 +8,7 @@ configure_args="--disable-appstream-util --disable-dconf-migration
  $(vopt_enable gir introspection)"
 hostmakedepends="glib-devel intltool itstool pkg-config vala yelp
  $(vopt_if gir gobject-introspection) gtk-doc"
-makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview4-devel
+makedepends="gsettings-desktop-schemas-devel gspell-devel libgedit-gtksourceview-devel
  gtk+3-devel libgee-devel libglib-devel tepl-devel"
 short_desc="LaTeX editor for the GNOME desktop"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,7 +16,7 @@ license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/GNOME-LaTeX"
 changelog="https://gitlab.gnome.org/swilmet/gnome-latex/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/gnome-latex/${version%.*}/gnome-latex-${version}.tar.xz"
-checksum=88bd5340bd28c7ed01c7966a3a00732bbd902773df5ac659be6ad11806a9e744
+checksum=d67555639b2a15a8aebd54f335354e44fe3433143ae3cb3cca7a8e26f8112ada
 
 build_options="gir"
 build_options_default="gir"