Re: [PR PATCH] [Updated] [WIP] gedit: update to 46.1.

Github messages for voidlinux
 help / color / mirror / Atom feed

* Re: [PR PATCH] [Updated] [WIP] gedit: update to 46.1.
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46965@inbox.vuxu.org>
@ 2023-10-30  2:44 ` mtboehlke
  2023-10-30  5:06 ` mtboehlke
                   ` (14 subsequent siblings)
  15 siblings, 0 replies; 16+ messages in thread
From: mtboehlke @ 2023-10-30  2:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1397 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

[WIP] gedit: update to 46.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### 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 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: 13140 bytes --]

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

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

diff --git a/common/shlibs b/common/shlibs
index 9036a675c1ae5..1cc0d1ef09012 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3594,6 +3594,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..41b5a8db5faa6
--- /dev/null
+++ b/srcpkgs/libgedit-amtk/template
@@ -0,0 +1,28 @@
+# 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
+
+libgedit-amtk-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} gtk+3-devel libglib-devel"
+	conflicts="amtk-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 1e48be4bcdf33e802c8727b396a0ab9f25b56c91 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Sun, 29 Oct 2023 21:33:57 -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 1cc0d1ef09012..dca615483c25e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3595,6 +3595,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 fe3e28c642a8ec63c46d70494ae63d8042278a94 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Sun, 29 Oct 2023 21:34:58 -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 dca615483c25e..bdc130a3d8284 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3476,7 +3476,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 01d70817a4144af758f097861b2a6c53b8032747 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Sun, 29 Oct 2023 21:36:04 -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 bdc130a3d8284..7298b188b786f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3593,7 +3593,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 3c9db544a08ff85ed13c7eb10b7e7f2353786bb4 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Sun, 29 Oct 2023 21:41:33 -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 b00b979eb6f3c5c9715000717b358bd63cfc37e5 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Sun, 29 Oct 2023 21:42:08 -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"

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] gedit: update to 46.1.
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46965@inbox.vuxu.org>
  2023-10-30  2:44 ` [PR PATCH] [Updated] [WIP] gedit: update to 46.1 mtboehlke
@ 2023-10-30  5:06 ` mtboehlke
  2023-10-31 23:19 ` mtboehlke
                   ` (13 subsequent siblings)
  15 siblings, 0 replies; 16+ messages in thread
From: mtboehlke @ 2023-10-30  5:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1397 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

[WIP] gedit: update to 46.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### 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 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: 13133 bytes --]

From 4b913b442f3e90c8af5f29c580d547643ea98b0d 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 | 28 ++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/libgedit-amtk-devel
 create mode 100644 srcpkgs/libgedit-amtk/template

diff --git a/common/shlibs b/common/shlibs
index 9036a675c1ae5..1cc0d1ef09012 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3594,6 +3594,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..c786eec8e4ff4
--- /dev/null
+++ b/srcpkgs/libgedit-amtk/template
@@ -0,0 +1,28 @@
+# 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"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove usr/share/gir-1.0
+	}
+}

From dbdf5427456ec84351b39f470e14b2259d16daa9 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 30 Oct 2023 00:00:47 -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 1cc0d1ef09012..dca615483c25e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3595,6 +3595,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 7cf05b94309319a6b29c03f90de4c429cc35d253 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 30 Oct 2023 00:02:01 -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 dca615483c25e..bdc130a3d8284 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3476,7 +3476,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 143c91792ebea0734f97b22ec94c5e72dc053a55 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 30 Oct 2023 00:03:20 -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 bdc130a3d8284..7298b188b786f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3593,7 +3593,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 f25911d9230753375bc2f1e45caa883a332d9d18 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 30 Oct 2023 00:04:17 -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 b796bfc5d425b8c0d75427fa4acdbe1f0dc42392 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 30 Oct 2023 00:05:19 -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"

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] gedit: update to 46.1.
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46965@inbox.vuxu.org>
  2023-10-30  2:44 ` [PR PATCH] [Updated] [WIP] gedit: update to 46.1 mtboehlke
  2023-10-30  5:06 ` mtboehlke
@ 2023-10-31 23:19 ` mtboehlke
  2023-10-31 23:32 ` mtboehlke
                   ` (12 subsequent siblings)
  15 siblings, 0 replies; 16+ messages in thread
From: mtboehlke @ 2023-10-31 23:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1410 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

[WIP] gedit: update to 46.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### 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 a7ba42b20f4485a80a432d37b2e70445e08ae236 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 9036a675c1ae5..1cc0d1ef09012 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3594,6 +3594,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 db7f8b4a8831d8c7a1ee2a7870e26f5322c3b537 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 1cc0d1ef09012..dca615483c25e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3595,6 +3595,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 7af3aa99c8ce4be14aa5c4e6c683b270cf5b46be 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 dca615483c25e..bdc130a3d8284 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3476,7 +3476,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 b533169c963a5d01f4dd121e5ccdaa0e3ccf940e 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 bdc130a3d8284..7298b188b786f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3593,7 +3593,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 71f12f6436813eea9b9e8c0b9856df9b4d61c6f8 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 24c12601ef47b2160dc259cfffe9d3627a450c96 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"

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [WIP] gedit: update to 46.1.
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46965@inbox.vuxu.org>
                   ` (2 preceding siblings ...)
  2023-10-31 23:19 ` mtboehlke
@ 2023-10-31 23:32 ` mtboehlke
  2023-11-02 20:14 ` classabbyamp
                   ` (11 subsequent siblings)
  15 siblings, 0 replies; 16+ messages in thread
From: mtboehlke @ 2023-10-31 23:32 UTC (permalink / raw)
  To: ml

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

New comment by mtboehlke on void-packages repository

https://github.com/void-linux/void-packages/pull/46965#issuecomment-1788174835

Comment:
Once this and genius (#46972) are updated, I don't believe any packages will depend on amtk, which has been archived upstream in favor of libgedit-amtk.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: gedit: update to 46.1.
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46965@inbox.vuxu.org>
                   ` (3 preceding siblings ...)
  2023-10-31 23:32 ` mtboehlke
@ 2023-11-02 20:14 ` classabbyamp
  2023-11-02 20:15 ` classabbyamp
                   ` (10 subsequent siblings)
  15 siblings, 0 replies; 16+ messages in thread
From: classabbyamp @ 2023-11-02 20:14 UTC (permalink / raw)
  To: ml

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/46965#issuecomment-1791476209

Comment:
there's still tepl (and transitively gnome-latex)

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: gedit: update to 46.1.
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46965@inbox.vuxu.org>
                   ` (4 preceding siblings ...)
  2023-11-02 20:14 ` classabbyamp
@ 2023-11-02 20:15 ` classabbyamp
  2023-11-03  0:28 ` mtboehlke
                   ` (9 subsequent siblings)
  15 siblings, 0 replies; 16+ messages in thread
From: classabbyamp @ 2023-11-02 20:15 UTC (permalink / raw)
  To: ml

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/46965#issuecomment-1791476209

Comment:
there's still tepl (and transitively gnome-latex) for amtk

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: gedit: update to 46.1.
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46965@inbox.vuxu.org>
                   ` (5 preceding siblings ...)
  2023-11-02 20:15 ` classabbyamp
@ 2023-11-03  0:28 ` mtboehlke
  2023-12-03  0:56 ` [PR PATCH] [Updated] New packages: libgedit-{amtk,gtksourceview} mtboehlke
                   ` (8 subsequent siblings)
  15 siblings, 0 replies; 16+ messages in thread
From: mtboehlke @ 2023-11-03  0:28 UTC (permalink / raw)
  To: ml

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

New comment by mtboehlke on void-packages repository

https://github.com/void-linux/void-packages/pull/46965#issuecomment-1791740154

Comment:
> there's still tepl (and transitively gnome-latex) for amtk

Gedit and gnome-latex both use tepl, and all three now use at least one of libgedit-amtk and libgedit-gtksourceview instead of amtk and gtksourceivew.  I'm bumping all these in this PR, like it was done in  #40711


^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] New packages: libgedit-{amtk,gtksourceview}
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46965@inbox.vuxu.org>
                   ` (6 preceding siblings ...)
  2023-11-03  0:28 ` mtboehlke
@ 2023-12-03  0:56 ` mtboehlke
  2023-12-23 23:20 ` mtboehlke
                   ` (7 subsequent siblings)
  15 siblings, 0 replies; 16+ messages in thread
From: mtboehlke @ 2023-12-03  0:56 UTC (permalink / raw)
  To: ml

[-- 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"

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] New packages: libgedit-{amtk,gtksourceview}
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46965@inbox.vuxu.org>
                   ` (7 preceding siblings ...)
  2023-12-03  0:56 ` [PR PATCH] [Updated] New packages: libgedit-{amtk,gtksourceview} mtboehlke
@ 2023-12-23 23:20 ` mtboehlke
  2024-02-13 19:34 ` [PR REVIEW] gedit: update to 46.1 and add new dependencies cinerea0
                   ` (6 subsequent siblings)
  15 siblings, 0 replies; 16+ messages in thread
From: mtboehlke @ 2023-12-23 23:20 UTC (permalink / raw)
  To: ml

[-- 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: 13204 bytes --]

From a872dc88efd9bc5db25a057ab921fb1366de46c0 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 972c52c8f3b81..c4cf8244e2979 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3593,6 +3593,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 e7f6cb55e925b4b540e946b5dff3b76b2c9522dd 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.5

---
 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 c4cf8244e2979..1fb296c9d3478 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3594,6 +3594,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.5_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..bcc97fa407c37
--- /dev/null
+++ b/srcpkgs/libgedit-gtksourceview/template
@@ -0,0 +1,28 @@
+# Template file for 'libgedit-gtksourceview'
+pkgname=libgedit-gtksourceview
+version=299.0.5
+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.github.io"
+changelog="https://raw.githubusercontent.com/gedit-technology/libgedit-gtksourceview/main/NEWS"
+distfiles="https://github.com/gedit-technology/libgedit-gtksourceview/releases/download/${version}/libgedit-gtksourceview-${version}.tar.xz"
+checksum=4bdac3c6dd885a2af8064a7265618ff8505b2324ab02fb00b0ce55e02978d3d6
+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 cd5420159bc199246f41e5b3f462690c0cc6a596 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Sat, 23 Dec 2023 17:12:56 -0600
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 1fb296c9d3478..2f94ef1a9b4e8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3475,7 +3475,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 ebe8f09fff1df8e1a5adbb4d906bc0acd77dae2f Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Sat, 23 Dec 2023 17:15:34 -0600
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 2f94ef1a9b4e8..3b67070876de0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3592,7 +3592,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.5_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 f7238db53b9b16d8f400d1d4fd7224398f99cf56 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Sat, 23 Dec 2023 17:17:04 -0600
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 d4c9bd3463e539965955ffa999bb167ecccc8d37 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Sat, 23 Dec 2023 17:19:08 -0600
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"

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] gedit: update to 46.1 and add new dependencies
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46965@inbox.vuxu.org>
                   ` (8 preceding siblings ...)
  2023-12-23 23:20 ` mtboehlke
@ 2024-02-13 19:34 ` cinerea0
  2024-02-13 19:34 ` cinerea0
                   ` (5 subsequent siblings)
  15 siblings, 0 replies; 16+ messages in thread
From: cinerea0 @ 2024-02-13 19:34 UTC (permalink / raw)
  To: ml

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

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/46965#discussion_r1488479982

Comment:
```suggestion
make_check_pre="xvfb-run"
```

I tested this and the checks pass when building for x86_64-glibc, let's see if it passes in CI.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] gedit: update to 46.1 and add new dependencies
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46965@inbox.vuxu.org>
                   ` (9 preceding siblings ...)
  2024-02-13 19:34 ` [PR REVIEW] gedit: update to 46.1 and add new dependencies cinerea0
@ 2024-02-13 19:34 ` cinerea0
  2024-02-13 19:34 ` cinerea0
                   ` (4 subsequent siblings)
  15 siblings, 0 replies; 16+ messages in thread
From: cinerea0 @ 2024-02-13 19:34 UTC (permalink / raw)
  To: ml

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

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/46965#discussion_r1488477853

Comment:
```suggestion
makedepends="gtk+3-devel libxml2-devel"
checkdepends="xvfb-run"
```

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] gedit: update to 46.1 and add new dependencies
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46965@inbox.vuxu.org>
                   ` (10 preceding siblings ...)
  2024-02-13 19:34 ` cinerea0
@ 2024-02-13 19:34 ` cinerea0
  2024-02-17 16:29 ` [PR PATCH] [Updated] " mtboehlke
                   ` (3 subsequent siblings)
  15 siblings, 0 replies; 16+ messages in thread
From: cinerea0 @ 2024-02-13 19:34 UTC (permalink / raw)
  To: ml

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

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/46965#discussion_r1488476079

Comment:
```suggestion
changelog="https://gitlab.gnome.org/GNOME/gedit/-/raw/${version}/NEWS"
```

If this is consistent upstream (i.e., they always create a branch with the version) you can use a variable, `xbps-src` will turn that into a real link at build time.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] gedit: update to 46.1 and add new dependencies
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46965@inbox.vuxu.org>
                   ` (11 preceding siblings ...)
  2024-02-13 19:34 ` cinerea0
@ 2024-02-17 16:29 ` mtboehlke
  2024-02-17 16:39 ` [PR REVIEW] " mtboehlke
                   ` (2 subsequent siblings)
  15 siblings, 0 replies; 16+ messages in thread
From: mtboehlke @ 2024-02-17 16:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1675 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

gedit: update to 46.1 and add new dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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: **YES**

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: 13237 bytes --]

From ec52d1f745066a3d5ce9cbd324ae5351598b6196 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 3cf507d8ada87..bc41c7dbe1990 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3585,6 +3585,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 8272bca897ea503ddc8caddb6f80619b8a9b44bb Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Thu, 15 Feb 2024 22:32:36 -0600
Subject: [PATCH 2/6] New package: libgedit-gtksourceview-299.0.5

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

diff --git a/common/shlibs b/common/shlibs
index bc41c7dbe1990..41cc9e09ec9d0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3586,6 +3586,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.5_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..0a8820d86b3a2
--- /dev/null
+++ b/srcpkgs/libgedit-gtksourceview/template
@@ -0,0 +1,29 @@
+# Template file for 'libgedit-gtksourceview'
+pkgname=libgedit-gtksourceview
+version=299.0.5
+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"
+checkdepends="xvfb-run"
+short_desc="Source code editing widget"
+maintainer="Matt Boehlke <mtboehlke@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://gedit-technology.github.io"
+changelog="https://raw.githubusercontent.com/gedit-technology/libgedit-gtksourceview/main/NEWS"
+distfiles="https://github.com/gedit-technology/libgedit-gtksourceview/releases/download/${version}/libgedit-gtksourceview-${version}.tar.xz"
+checksum=4bdac3c6dd885a2af8064a7265618ff8505b2324ab02fb00b0ce55e02978d3d6
+make_check_pre="xvfb-run"
+
+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 e97c30f9e4a5c67000d33a4456ad42a9d03bdb2c Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Sat, 17 Feb 2024 10:20:37 -0600
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 41cc9e09ec9d0..d659d71f028fe 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3467,7 +3467,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 8680faa65c9973a53372ce975b7f48dde69592fa Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Sat, 17 Feb 2024 10:26:18 -0600
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 d659d71f028fe..34596bac98f4b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3584,7 +3584,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.5_1
 libchewing.so.3 libchewing-0.5.1_1
diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index 002740e531811..10bb95f01a691 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/${version}/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 634399730e761eefe01077795f3da9af92474d7a Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Sat, 17 Feb 2024 10:26:53 -0600
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 f2390aa25310588b5ee15bb50d8cbece88f6e360 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Sat, 17 Feb 2024 10:27:50 -0600
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"

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] gedit: update to 46.1 and add new dependencies
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46965@inbox.vuxu.org>
                   ` (12 preceding siblings ...)
  2024-02-17 16:29 ` [PR PATCH] [Updated] " mtboehlke
@ 2024-02-17 16:39 ` mtboehlke
  2024-02-20  2:26 ` [PR PATCH] [Merged]: " cinerea0
  2024-02-20  7:50 ` sgn
  15 siblings, 0 replies; 16+ messages in thread
From: mtboehlke @ 2024-02-17 16:39 UTC (permalink / raw)
  To: ml

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

New review comment by mtboehlke on void-packages repository

https://github.com/void-linux/void-packages/pull/46965#discussion_r1493366759

Comment:
@cinerea0 Thanks for the suggestions!  We'll see what happens in the CI.  On my local machine (i686), I had one test  time out .

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Merged]: gedit: update to 46.1 and add new dependencies
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46965@inbox.vuxu.org>
                   ` (13 preceding siblings ...)
  2024-02-17 16:39 ` [PR REVIEW] " mtboehlke
@ 2024-02-20  2:26 ` cinerea0
  2024-02-20  7:50 ` sgn
  15 siblings, 0 replies; 16+ messages in thread
From: cinerea0 @ 2024-02-20  2:26 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

gedit: update to 46.1 and add new dependencies
https://github.com/void-linux/void-packages/pull/46965

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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: **YES**

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
-->


^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: gedit: update to 46.1 and add new dependencies
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46965@inbox.vuxu.org>
                   ` (14 preceding siblings ...)
  2024-02-20  2:26 ` [PR PATCH] [Merged]: " cinerea0
@ 2024-02-20  7:50 ` sgn
  15 siblings, 0 replies; 16+ messages in thread
From: sgn @ 2024-02-20  7:50 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/46965#issuecomment-1953649291

Comment:
The conflict is bad! #48848 

^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2024-02-20  7:50 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46965@inbox.vuxu.org>
2023-10-30  2:44 ` [PR PATCH] [Updated] [WIP] gedit: update to 46.1 mtboehlke
2023-10-30  5:06 ` mtboehlke
2023-10-31 23:19 ` mtboehlke
2023-10-31 23:32 ` mtboehlke
2023-11-02 20:14 ` classabbyamp
2023-11-02 20:15 ` classabbyamp
2023-11-03  0:28 ` mtboehlke
2023-12-03  0:56 ` [PR PATCH] [Updated] New packages: libgedit-{amtk,gtksourceview} mtboehlke
2023-12-23 23:20 ` mtboehlke
2024-02-13 19:34 ` [PR REVIEW] gedit: update to 46.1 and add new dependencies cinerea0
2024-02-13 19:34 ` cinerea0
2024-02-13 19:34 ` cinerea0
2024-02-17 16:29 ` [PR PATCH] [Updated] " mtboehlke
2024-02-17 16:39 ` [PR REVIEW] " mtboehlke
2024-02-20  2:26 ` [PR PATCH] [Merged]: " cinerea0
2024-02-20  7:50 ` sgn

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).