* [PR PATCH] gedit: update to 46.1
@ 2024-02-16 14:17 chrysos349
2024-02-16 15:26 ` [PR PATCH] [Updated] " chrysos349
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: chrysos349 @ 2024-02-16 14:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 785 bytes --]
There is a new pull request by chrysos349 against master on the void-packages repository
https://github.com/chrysos349/void-packages gedit
https://github.com/void-linux/void-packages/pull/48768
gedit: update to 46.1
**NOTES**
- `gnome-latex` was updated due to the updated `tepl`
- `tepl` was update due to the updated `gedit`
- `gedit`'s and `gedit-plugins`'s versions must be in sync
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl x
- armv7l x
- armv6l-musl x
A patch file from https://github.com/void-linux/void-packages/pull/48768.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gedit-48768.patch --]
[-- Type: text/x-diff, Size: 12899 bytes --]
From 3f8e086775e304ac4a106e13fa594b7827ccbada Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:17 +0300
Subject: [PATCH 1/6] New package: libgedit-amtk-5.8.0
---
common/shlibs | 1 +
srcpkgs/libgedit-amtk-devel | 1 +
srcpkgs/libgedit-amtk/template | 38 ++++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+)
create mode 120000 srcpkgs/libgedit-amtk-devel
create mode 100644 srcpkgs/libgedit-amtk/template
diff --git a/common/shlibs b/common/shlibs
index 3cf507d8ada879..fe8f71c176bd79 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4275,3 +4275,4 @@ libunicode_ucd.so.0.4 libunicode-0.4.0_1
libunicode_loader.so.0.4 libunicode-0.4.0_1
force-stage.so.0.1 void-force-stage-0.1_1
libliftoff.so.0 libliftoff-0.4.1_1
+libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1
diff --git a/srcpkgs/libgedit-amtk-devel b/srcpkgs/libgedit-amtk-devel
new file mode 120000
index 00000000000000..dc7642213a0eb7
--- /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 00000000000000..5b5ac7fb14bdfd
--- /dev/null
+++ b/srcpkgs/libgedit-amtk/template
@@ -0,0 +1,38 @@
+# Template file for 'libgedit-amtk'
+pkgname=libgedit-amtk
+version=5.8.0
+revision=1
+build_style=meson
+build_helper=gir
+configure_args="$(vopt_bool gir gobject_introspection) $(vopt_bool gtk_doc gtk_doc)"
+hostmakedepends="gettext glib-devel pkg-config $(vopt_if gtk_doc gtk-doc)"
+makedepends="gtk+3-devel"
+short_desc="Actions, Menus and Toolbars Kit for GTK applications"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/gedit-technology/libgedit-amtk"
+distfiles="https://github.com/gedit-technology/libgedit-amtk/archive/${version}.tar.gz"
+checksum=014d90bdc611ef855655c846a37341b8394db794b06344e07066b87c259b4f31
+
+build_options="gir gtk_doc"
+build_options_default="gir"
+
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
+libgedit-amtk-devel_package() {
+ short_desc+=" - development files"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove "usr/lib/*.so"
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/gtk-doc
+ fi
+ }
+}
From b8aa5478ca22783733f6376490a87a6e31868453 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:18 +0300
Subject: [PATCH 2/6] New package: libgedit-gtksourceview-299.0.5
---
common/shlibs | 1 +
srcpkgs/libgedit-gtksourceview-devel | 1 +
srcpkgs/libgedit-gtksourceview/template | 44 +++++++++++++++++++++++++
3 files changed, 46 insertions(+)
create mode 120000 srcpkgs/libgedit-gtksourceview-devel
create mode 100644 srcpkgs/libgedit-gtksourceview/template
diff --git a/common/shlibs b/common/shlibs
index fe8f71c176bd79..404893351bca6c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4276,3 +4276,4 @@ libunicode_loader.so.0.4 libunicode-0.4.0_1
force-stage.so.0.1 void-force-stage-0.1_1
libliftoff.so.0 libliftoff-0.4.1_1
libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1
+libgedit-gtksourceview-300.so.0 libgedit-gtksourceview-299.0.4_1
diff --git a/srcpkgs/libgedit-gtksourceview-devel b/srcpkgs/libgedit-gtksourceview-devel
new file mode 120000
index 00000000000000..508a9c30b27116
--- /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 00000000000000..16ef5a7d4a49d2
--- /dev/null
+++ b/srcpkgs/libgedit-gtksourceview/template
@@ -0,0 +1,44 @@
+# Template file for 'libgedit-gtksourceview'
+pkgname=libgedit-gtksourceview
+version=299.0.5
+revision=1
+build_style=meson
+build_helper=gir
+configure_args="$(vopt_bool gir gobject_introspection) $(vopt_bool gtk_doc gtk_doc)"
+hostmakedepends="gettext glib-devel pkg-config $(vopt_if gtk_doc gtk-doc)"
+makedepends="gtk+3-devel"
+checkdepends="dbus xvfb-run"
+short_desc="Gedit Technology - Source code editing widget"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/gedit-technology/libgedit-gtksourceview"
+distfiles="https://github.com/gedit-technology/libgedit-gtksourceview/archive/${version}.tar.gz"
+checksum=bca38a79fe8360abbd1d5a6d7c339c0a1bafd6695abd0971094dac9262f82d5d
+
+build_options="gir gtk_doc"
+build_options_default="gir"
+
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
+do_check() {
+ dbus-run-session xvfb-run -s '-nolisten local' \
+ meson test -C build
+}
+
+libgedit-gtksourceview-devel_package() {
+ short_desc+=" - development files"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove "usr/lib/*.so"
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/gtk-doc
+ fi
+ }
+}
From 7237b10723d674b90375042c6dce9e3e1926bb4b Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:18 +0300
Subject: [PATCH 3/6] tepl: update to 6.8.0
---
common/shlibs | 2 +-
srcpkgs/tepl/template | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 404893351bca6c..87e4a3bfb2f951 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 c989d7ed728957..933df8461d1006 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,13 +1,14 @@
# 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
- libxml2-devel uchardet-devel gsettings-desktop-schemas-devel"
+makedepends="libglib-devel gtksourceview4-devel gtk+3-devel
+ libxml2-devel uchardet-devel gsettings-desktop-schemas-devel
+ libgedit-gtksourceview-devel libgedit-amtk-devel"
checkdepends="xvfb-run"
short_desc="Text editor product line"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -15,7 +16,7 @@ license="GPL-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 976e14deb7e606bfcba06d64a2d3509a15109c84 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:18 +0300
Subject: [PATCH 4/6] gedit: update to 46.1
---
common/shlibs | 2 +-
srcpkgs/gedit/template | 19 +++++++++----------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 87e4a3bfb2f951..4d430d9e79f779 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
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/gedit/template b/srcpkgs/gedit/template
index 002740e531811d..1934bde7e6d420 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,34 +1,33 @@
# 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"
+hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext vala
+ desktop-file-utils gtk-update-icon-cache"
makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview4-devel
- libpeas-devel python3-gobject-devel amtk-devel tepl-devel"
+ libpeas-devel python3-gobject-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/gedit-45/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"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
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 113b7d77e7f35b73c30dcf4a8c503bdb09585650 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:19 +0300
Subject: [PATCH 5/6] gedit-plugins: update to 46.0
---
srcpkgs/gedit-plugins/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template
index 7d4e0d845171a7..27f3a15ba37840 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"
+ libglib-devel libpeas-devel python3-dbus-devel python3-devel zeitgeist-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 83a38ed9bc0f14e0e8eb0dde702b8a6dfbaa20d0 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:19 +0300
Subject: [PATCH 6/6] gnome-latex: update to 3.46.0
---
srcpkgs/gnome-latex/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-latex/template b/srcpkgs/gnome-latex/template
index 6af20bdc4f0198..df053449c32936 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
@@ -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] 9+ messages in thread
* Re: [PR PATCH] [Updated] gedit: update to 46.1
2024-02-16 14:17 [PR PATCH] gedit: update to 46.1 chrysos349
@ 2024-02-16 15:26 ` chrysos349
2024-02-16 17:23 ` chrysos349
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: chrysos349 @ 2024-02-16 15:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 931 bytes --]
There is an updated pull request by chrysos349 against master on the void-packages repository
https://github.com/chrysos349/void-packages gedit
https://github.com/void-linux/void-packages/pull/48768
gedit: update to 46.1
@Gottox
**NOTES**
- `gnome-latex` was updated due to the updated `tepl`
- `tepl` was update due to the updated `gedit`
- `gedit`'s and `gedit-plugins`'s versions must be in sync
- drop `amtk` from `devhelp`'s `makedepends`
- remove `amtk` and add to `removed-packages` (was replaced with `libgedit-amtk`)
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl x
- armv7l x
- armv6l-musl x
A patch file from https://github.com/void-linux/void-packages/pull/48768.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gedit-48768.patch --]
[-- Type: text/x-diff, Size: 16795 bytes --]
From 70dcb2d538309a6210712f18ffeb9b44fee38926 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:17 +0300
Subject: [PATCH 1/8] New package: libgedit-amtk-5.8.0
---
common/shlibs | 2 +-
srcpkgs/libgedit-amtk-devel | 1 +
srcpkgs/libgedit-amtk/template | 38 ++++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+), 1 deletion(-)
create mode 120000 srcpkgs/libgedit-amtk-devel
create mode 100644 srcpkgs/libgedit-amtk/template
diff --git a/common/shlibs b/common/shlibs
index 3cf507d8ada879..5ce999e443ec61 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1395,7 +1395,7 @@ libgda-5.0.so.4 libgda-5.2.9_4
libgda-report-5.0.so.4 libgda-5.2.9_4
libgda-ui-5.0.so.4 libgda-5.2.9_4
libgda-xslt-5.0.so.4 libgda-5.2.9_4
-libamtk-5.so.0 amtk-5.0.0_1
+libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1
libdevhelp-3.so.6 devhelp-libs-3.30.0_1
libunistring.so.2 libunistring-0.9.4_1
libguile-2.2.so.1 libguile-2.2.7_1
diff --git a/srcpkgs/libgedit-amtk-devel b/srcpkgs/libgedit-amtk-devel
new file mode 120000
index 00000000000000..dc7642213a0eb7
--- /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 00000000000000..5b5ac7fb14bdfd
--- /dev/null
+++ b/srcpkgs/libgedit-amtk/template
@@ -0,0 +1,38 @@
+# Template file for 'libgedit-amtk'
+pkgname=libgedit-amtk
+version=5.8.0
+revision=1
+build_style=meson
+build_helper=gir
+configure_args="$(vopt_bool gir gobject_introspection) $(vopt_bool gtk_doc gtk_doc)"
+hostmakedepends="gettext glib-devel pkg-config $(vopt_if gtk_doc gtk-doc)"
+makedepends="gtk+3-devel"
+short_desc="Actions, Menus and Toolbars Kit for GTK applications"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/gedit-technology/libgedit-amtk"
+distfiles="https://github.com/gedit-technology/libgedit-amtk/archive/${version}.tar.gz"
+checksum=014d90bdc611ef855655c846a37341b8394db794b06344e07066b87c259b4f31
+
+build_options="gir gtk_doc"
+build_options_default="gir"
+
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
+libgedit-amtk-devel_package() {
+ short_desc+=" - development files"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove "usr/lib/*.so"
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/gtk-doc
+ fi
+ }
+}
From bc0c329fa7f38000110123fd81afd5468613591b Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:18 +0300
Subject: [PATCH 2/8] New package: libgedit-gtksourceview-299.0.5
---
common/shlibs | 2 ++
srcpkgs/libgedit-gtksourceview-devel | 1 +
srcpkgs/libgedit-gtksourceview/template | 44 +++++++++++++++++++++++++
3 files changed, 47 insertions(+)
create mode 120000 srcpkgs/libgedit-gtksourceview-devel
create mode 100644 srcpkgs/libgedit-gtksourceview/template
diff --git a/common/shlibs b/common/shlibs
index 5ce999e443ec61..cdd8160103d6d5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4275,3 +4275,5 @@ libunicode_ucd.so.0.4 libunicode-0.4.0_1
libunicode_loader.so.0.4 libunicode-0.4.0_1
force-stage.so.0.1 void-force-stage-0.1_1
libliftoff.so.0 libliftoff-0.4.1_1
+libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1
+libgedit-gtksourceview-300.so.0 libgedit-gtksourceview-299.0.4_1
diff --git a/srcpkgs/libgedit-gtksourceview-devel b/srcpkgs/libgedit-gtksourceview-devel
new file mode 120000
index 00000000000000..508a9c30b27116
--- /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 00000000000000..16ef5a7d4a49d2
--- /dev/null
+++ b/srcpkgs/libgedit-gtksourceview/template
@@ -0,0 +1,44 @@
+# Template file for 'libgedit-gtksourceview'
+pkgname=libgedit-gtksourceview
+version=299.0.5
+revision=1
+build_style=meson
+build_helper=gir
+configure_args="$(vopt_bool gir gobject_introspection) $(vopt_bool gtk_doc gtk_doc)"
+hostmakedepends="gettext glib-devel pkg-config $(vopt_if gtk_doc gtk-doc)"
+makedepends="gtk+3-devel"
+checkdepends="dbus xvfb-run"
+short_desc="Gedit Technology - Source code editing widget"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/gedit-technology/libgedit-gtksourceview"
+distfiles="https://github.com/gedit-technology/libgedit-gtksourceview/archive/${version}.tar.gz"
+checksum=bca38a79fe8360abbd1d5a6d7c339c0a1bafd6695abd0971094dac9262f82d5d
+
+build_options="gir gtk_doc"
+build_options_default="gir"
+
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
+do_check() {
+ dbus-run-session xvfb-run -s '-nolisten local' \
+ meson test -C build
+}
+
+libgedit-gtksourceview-devel_package() {
+ short_desc+=" - development files"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove "usr/lib/*.so"
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/gtk-doc
+ fi
+ }
+}
From 733bbfd2298daf1a2dce93eaa6faafa66b220170 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:18 +0300
Subject: [PATCH 3/8] tepl: update to 6.8.0
---
common/shlibs | 2 +-
srcpkgs/tepl/template | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index cdd8160103d6d5..504539adb78d40 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 c989d7ed728957..933df8461d1006 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,13 +1,14 @@
# 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
- libxml2-devel uchardet-devel gsettings-desktop-schemas-devel"
+makedepends="libglib-devel gtksourceview4-devel gtk+3-devel
+ libxml2-devel uchardet-devel gsettings-desktop-schemas-devel
+ libgedit-gtksourceview-devel libgedit-amtk-devel"
checkdepends="xvfb-run"
short_desc="Text editor product line"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -15,7 +16,7 @@ license="GPL-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 8873d09e56c0c1de31c501e5388d584e6e58642b Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:18 +0300
Subject: [PATCH 4/8] gedit: update to 46.1
---
common/shlibs | 2 +-
srcpkgs/gedit/template | 19 +++++++++----------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 504539adb78d40..dafcefb673eba1 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
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/gedit/template b/srcpkgs/gedit/template
index 002740e531811d..1934bde7e6d420 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,34 +1,33 @@
# 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"
+hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext vala
+ desktop-file-utils gtk-update-icon-cache"
makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview4-devel
- libpeas-devel python3-gobject-devel amtk-devel tepl-devel"
+ libpeas-devel python3-gobject-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/gedit-45/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"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
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 0665a9cda1c168766899bd0f1553ea539b829f1f Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:19 +0300
Subject: [PATCH 5/8] gedit-plugins: update to 46.0
---
srcpkgs/gedit-plugins/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template
index 7d4e0d845171a7..27f3a15ba37840 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"
+ libglib-devel libpeas-devel python3-dbus-devel python3-devel zeitgeist-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 7a728be0a4d72b6dd7efd6595202c78eebe48f2c Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:19 +0300
Subject: [PATCH 6/8] gnome-latex: update to 3.46.0
---
srcpkgs/gnome-latex/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-latex/template b/srcpkgs/gnome-latex/template
index 6af20bdc4f0198..df053449c32936 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
@@ -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"
From ff1fc93d454bdab4af670e2bce950a79b6c26e60 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 18:18:06 +0300
Subject: [PATCH 7/8] devhelp: drop amtk dep
amtk dep was dropped in devhelp-41.alpha
---
srcpkgs/devhelp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template
index 7c641946341a64..debd01d84dede2 100644
--- a/srcpkgs/devhelp/template
+++ b/srcpkgs/devhelp/template
@@ -1,11 +1,11 @@
# Template file for 'devhelp'
pkgname=devhelp
version=43.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config gtk-update-icon-cache"
-makedepends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel amtk-devel"
+makedepends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel"
short_desc="API documentation browser for GTK+ and GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
From ae1fc12bf070ea552efc5b3091793626e56f3330 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 18:24:40 +0300
Subject: [PATCH 8/8] amtk: remove package
amtk was replaced with libgedit-amtk. no other packages relies on it.
---
srcpkgs/amtk-devel | 1 -
srcpkgs/amtk/template | 38 -------------------------------
srcpkgs/removed-packages/template | 4 +++-
3 files changed, 3 insertions(+), 40 deletions(-)
delete mode 120000 srcpkgs/amtk-devel
delete mode 100644 srcpkgs/amtk/template
diff --git a/srcpkgs/amtk-devel b/srcpkgs/amtk-devel
deleted file mode 120000
index 29eae529cf58cb..00000000000000
--- a/srcpkgs/amtk-devel
+++ /dev/null
@@ -1 +0,0 @@
-amtk
\ No newline at end of file
diff --git a/srcpkgs/amtk/template b/srcpkgs/amtk/template
deleted file mode 100644
index 96aa3b11019f52..00000000000000
--- a/srcpkgs/amtk/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'amtk'
-pkgname=amtk
-version=5.6.1
-revision=1
-build_style=meson
-build_helper="gir"
-configure_args="$(vopt_bool gir gobject_introspection) $(vopt_bool gtk_doc)"
-hostmakedepends="pkg-config glib-devel gettext $(vopt_if gtk_doc gtk-doc)"
-makedepends="gtk+3-devel libglib-devel"
-short_desc="Actions, Menus and Toolbars Kit for GTK+ applications"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://gitlab.gnome.org/World/amtk"
-distfiles="${GNOME_SITE}/amtk/${version%.*}/amtk-${version}.tar.xz"
-checksum=d50115b85c872aac296934b5ee726a3fa156c6f5ad96d27e0edd0aa5ad173228
-
-build_options="gir gtk_doc"
-build_options_default="gir"
-
-if ! [ "$CROSS_BUILD" ]; then
- build_options_default+=" gtk_doc"
-fi
-
-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
- if [ "$build_option_gtk_doc" ]; then
- vmove usr/share/gtk-doc
- fi
- if [ "$build_option_gir" ]; then
- vmove usr/share/gir-1.0
- fi
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index e7f36da1c50300..8dbe8dcf545f86 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
# Template file for 'removed-packages'
pkgname=removed-packages
-version=0.1.20240210
+version=0.1.20240216
revision=1
build_style=meta
short_desc="Uninstalls packages removed from repository"
@@ -725,6 +725,8 @@ replaces="
lld-devel<=15.0.7_3
libclang-32bit<=15.0.7_3
libclang-cpp-32bit<=15.0.7_3
+ amtk<=5.6.1
+ amtk-devel<=5.6.1
"
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] gedit: update to 46.1
2024-02-16 14:17 [PR PATCH] gedit: update to 46.1 chrysos349
2024-02-16 15:26 ` [PR PATCH] [Updated] " chrysos349
@ 2024-02-16 17:23 ` chrysos349
2024-02-17 20:26 ` chrysos349
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: chrysos349 @ 2024-02-16 17:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 931 bytes --]
There is an updated pull request by chrysos349 against master on the void-packages repository
https://github.com/chrysos349/void-packages gedit
https://github.com/void-linux/void-packages/pull/48768
gedit: update to 46.1
@Gottox
**NOTES**
- `gnome-latex` was updated due to the updated `tepl`
- `tepl` was update due to the updated `gedit`
- `gedit`'s and `gedit-plugins`'s versions must be in sync
- drop `amtk` from `devhelp`'s `makedepends`
- remove `amtk` and add to `removed-packages` (was replaced with `libgedit-amtk`)
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl x
- armv7l x
- armv6l-musl x
A patch file from https://github.com/void-linux/void-packages/pull/48768.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gedit-48768.patch --]
[-- Type: text/x-diff, Size: 16795 bytes --]
From 98de441a64674c63cc353f3db41504b1748c0744 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:17 +0300
Subject: [PATCH 1/8] New package: libgedit-amtk-5.8.0
---
common/shlibs | 2 +-
srcpkgs/libgedit-amtk-devel | 1 +
srcpkgs/libgedit-amtk/template | 38 ++++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+), 1 deletion(-)
create mode 120000 srcpkgs/libgedit-amtk-devel
create mode 100644 srcpkgs/libgedit-amtk/template
diff --git a/common/shlibs b/common/shlibs
index 3cf507d8ada879..5ce999e443ec61 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1395,7 +1395,7 @@ libgda-5.0.so.4 libgda-5.2.9_4
libgda-report-5.0.so.4 libgda-5.2.9_4
libgda-ui-5.0.so.4 libgda-5.2.9_4
libgda-xslt-5.0.so.4 libgda-5.2.9_4
-libamtk-5.so.0 amtk-5.0.0_1
+libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1
libdevhelp-3.so.6 devhelp-libs-3.30.0_1
libunistring.so.2 libunistring-0.9.4_1
libguile-2.2.so.1 libguile-2.2.7_1
diff --git a/srcpkgs/libgedit-amtk-devel b/srcpkgs/libgedit-amtk-devel
new file mode 120000
index 00000000000000..dc7642213a0eb7
--- /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 00000000000000..5b5ac7fb14bdfd
--- /dev/null
+++ b/srcpkgs/libgedit-amtk/template
@@ -0,0 +1,38 @@
+# Template file for 'libgedit-amtk'
+pkgname=libgedit-amtk
+version=5.8.0
+revision=1
+build_style=meson
+build_helper=gir
+configure_args="$(vopt_bool gir gobject_introspection) $(vopt_bool gtk_doc gtk_doc)"
+hostmakedepends="gettext glib-devel pkg-config $(vopt_if gtk_doc gtk-doc)"
+makedepends="gtk+3-devel"
+short_desc="Actions, Menus and Toolbars Kit for GTK applications"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/gedit-technology/libgedit-amtk"
+distfiles="https://github.com/gedit-technology/libgedit-amtk/archive/${version}.tar.gz"
+checksum=014d90bdc611ef855655c846a37341b8394db794b06344e07066b87c259b4f31
+
+build_options="gir gtk_doc"
+build_options_default="gir"
+
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
+libgedit-amtk-devel_package() {
+ short_desc+=" - development files"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove "usr/lib/*.so"
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/gtk-doc
+ fi
+ }
+}
From 0506945a2e17b83d82055ecdaaf8f7265885dcbd Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:18 +0300
Subject: [PATCH 2/8] New package: libgedit-gtksourceview-299.0.5
---
common/shlibs | 2 ++
srcpkgs/libgedit-gtksourceview-devel | 1 +
srcpkgs/libgedit-gtksourceview/template | 44 +++++++++++++++++++++++++
3 files changed, 47 insertions(+)
create mode 120000 srcpkgs/libgedit-gtksourceview-devel
create mode 100644 srcpkgs/libgedit-gtksourceview/template
diff --git a/common/shlibs b/common/shlibs
index 5ce999e443ec61..cdd8160103d6d5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4275,3 +4275,5 @@ libunicode_ucd.so.0.4 libunicode-0.4.0_1
libunicode_loader.so.0.4 libunicode-0.4.0_1
force-stage.so.0.1 void-force-stage-0.1_1
libliftoff.so.0 libliftoff-0.4.1_1
+libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1
+libgedit-gtksourceview-300.so.0 libgedit-gtksourceview-299.0.4_1
diff --git a/srcpkgs/libgedit-gtksourceview-devel b/srcpkgs/libgedit-gtksourceview-devel
new file mode 120000
index 00000000000000..508a9c30b27116
--- /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 00000000000000..16ef5a7d4a49d2
--- /dev/null
+++ b/srcpkgs/libgedit-gtksourceview/template
@@ -0,0 +1,44 @@
+# Template file for 'libgedit-gtksourceview'
+pkgname=libgedit-gtksourceview
+version=299.0.5
+revision=1
+build_style=meson
+build_helper=gir
+configure_args="$(vopt_bool gir gobject_introspection) $(vopt_bool gtk_doc gtk_doc)"
+hostmakedepends="gettext glib-devel pkg-config $(vopt_if gtk_doc gtk-doc)"
+makedepends="gtk+3-devel"
+checkdepends="dbus xvfb-run"
+short_desc="Gedit Technology - Source code editing widget"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/gedit-technology/libgedit-gtksourceview"
+distfiles="https://github.com/gedit-technology/libgedit-gtksourceview/archive/${version}.tar.gz"
+checksum=bca38a79fe8360abbd1d5a6d7c339c0a1bafd6695abd0971094dac9262f82d5d
+
+build_options="gir gtk_doc"
+build_options_default="gir"
+
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
+do_check() {
+ dbus-run-session xvfb-run -s '-nolisten local' \
+ meson test -C build
+}
+
+libgedit-gtksourceview-devel_package() {
+ short_desc+=" - development files"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove "usr/lib/*.so"
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/gtk-doc
+ fi
+ }
+}
From 52d1c0eabf458d2f05a233346c2f19b76155c8ca Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:18 +0300
Subject: [PATCH 3/8] tepl: update to 6.8.0
---
common/shlibs | 2 +-
srcpkgs/tepl/template | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index cdd8160103d6d5..504539adb78d40 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 c989d7ed728957..933df8461d1006 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,13 +1,14 @@
# 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
- libxml2-devel uchardet-devel gsettings-desktop-schemas-devel"
+makedepends="libglib-devel gtksourceview4-devel gtk+3-devel
+ libxml2-devel uchardet-devel gsettings-desktop-schemas-devel
+ libgedit-gtksourceview-devel libgedit-amtk-devel"
checkdepends="xvfb-run"
short_desc="Text editor product line"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -15,7 +16,7 @@ license="GPL-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 2fe006fa51a950eeec73979d3ce25a60d9573480 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:18 +0300
Subject: [PATCH 4/8] gedit: update to 46.1
---
common/shlibs | 2 +-
srcpkgs/gedit/template | 19 +++++++++----------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 504539adb78d40..dafcefb673eba1 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
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/gedit/template b/srcpkgs/gedit/template
index 002740e531811d..1934bde7e6d420 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,34 +1,33 @@
# 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"
+hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext vala
+ desktop-file-utils gtk-update-icon-cache"
makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview4-devel
- libpeas-devel python3-gobject-devel amtk-devel tepl-devel"
+ libpeas-devel python3-gobject-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/gedit-45/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"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
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 e6cb7fabf8a8b866be6ec2818472284e897d0291 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:19 +0300
Subject: [PATCH 5/8] gedit-plugins: update to 46.0
---
srcpkgs/gedit-plugins/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template
index 7d4e0d845171a7..27f3a15ba37840 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"
+ libglib-devel libpeas-devel python3-dbus-devel python3-devel zeitgeist-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 3707d5863cb09a4e26a7e7b27f67753468224fd4 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:19 +0300
Subject: [PATCH 6/8] gnome-latex: update to 3.46.0
---
srcpkgs/gnome-latex/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-latex/template b/srcpkgs/gnome-latex/template
index 6af20bdc4f0198..df053449c32936 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
@@ -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"
From 7fd9dcc34cfb3cff8a78fcf797afb26101d4c948 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 18:18:06 +0300
Subject: [PATCH 7/8] devhelp: drop amtk dep
amtk dep was dropped in devhelp-41.alpha
---
srcpkgs/devhelp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template
index 7c641946341a64..debd01d84dede2 100644
--- a/srcpkgs/devhelp/template
+++ b/srcpkgs/devhelp/template
@@ -1,11 +1,11 @@
# Template file for 'devhelp'
pkgname=devhelp
version=43.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config gtk-update-icon-cache"
-makedepends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel amtk-devel"
+makedepends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel"
short_desc="API documentation browser for GTK+ and GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
From 13418ad40ee589299542e62857dc1a3c85e9baf4 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 18:24:40 +0300
Subject: [PATCH 8/8] amtk: remove package
amtk was replaced with libgedit-amtk. no other packages relies on it.
---
srcpkgs/amtk-devel | 1 -
srcpkgs/amtk/template | 38 -------------------------------
srcpkgs/removed-packages/template | 4 +++-
3 files changed, 3 insertions(+), 40 deletions(-)
delete mode 120000 srcpkgs/amtk-devel
delete mode 100644 srcpkgs/amtk/template
diff --git a/srcpkgs/amtk-devel b/srcpkgs/amtk-devel
deleted file mode 120000
index 29eae529cf58cb..00000000000000
--- a/srcpkgs/amtk-devel
+++ /dev/null
@@ -1 +0,0 @@
-amtk
\ No newline at end of file
diff --git a/srcpkgs/amtk/template b/srcpkgs/amtk/template
deleted file mode 100644
index 96aa3b11019f52..00000000000000
--- a/srcpkgs/amtk/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'amtk'
-pkgname=amtk
-version=5.6.1
-revision=1
-build_style=meson
-build_helper="gir"
-configure_args="$(vopt_bool gir gobject_introspection) $(vopt_bool gtk_doc)"
-hostmakedepends="pkg-config glib-devel gettext $(vopt_if gtk_doc gtk-doc)"
-makedepends="gtk+3-devel libglib-devel"
-short_desc="Actions, Menus and Toolbars Kit for GTK+ applications"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://gitlab.gnome.org/World/amtk"
-distfiles="${GNOME_SITE}/amtk/${version%.*}/amtk-${version}.tar.xz"
-checksum=d50115b85c872aac296934b5ee726a3fa156c6f5ad96d27e0edd0aa5ad173228
-
-build_options="gir gtk_doc"
-build_options_default="gir"
-
-if ! [ "$CROSS_BUILD" ]; then
- build_options_default+=" gtk_doc"
-fi
-
-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
- if [ "$build_option_gtk_doc" ]; then
- vmove usr/share/gtk-doc
- fi
- if [ "$build_option_gir" ]; then
- vmove usr/share/gir-1.0
- fi
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index e7f36da1c50300..8dbe8dcf545f86 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
# Template file for 'removed-packages'
pkgname=removed-packages
-version=0.1.20240210
+version=0.1.20240216
revision=1
build_style=meta
short_desc="Uninstalls packages removed from repository"
@@ -725,6 +725,8 @@ replaces="
lld-devel<=15.0.7_3
libclang-32bit<=15.0.7_3
libclang-cpp-32bit<=15.0.7_3
+ amtk<=5.6.1
+ amtk-devel<=5.6.1
"
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] gedit: update to 46.1
2024-02-16 14:17 [PR PATCH] gedit: update to 46.1 chrysos349
2024-02-16 15:26 ` [PR PATCH] [Updated] " chrysos349
2024-02-16 17:23 ` chrysos349
@ 2024-02-17 20:26 ` chrysos349
2024-02-18 7:42 ` chrysos349
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: chrysos349 @ 2024-02-17 20:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 931 bytes --]
There is an updated pull request by chrysos349 against master on the void-packages repository
https://github.com/chrysos349/void-packages gedit
https://github.com/void-linux/void-packages/pull/48768
gedit: update to 46.1
@Gottox
**NOTES**
- `gnome-latex` was updated due to the updated `tepl`
- `tepl` was update due to the updated `gedit`
- `gedit`'s and `gedit-plugins`'s versions must be in sync
- drop `amtk` from `devhelp`'s `makedepends`
- remove `amtk` and add to `removed-packages` (was replaced with `libgedit-amtk`)
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl x
- armv7l x
- armv6l-musl x
A patch file from https://github.com/void-linux/void-packages/pull/48768.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gedit-48768.patch --]
[-- Type: text/x-diff, Size: 16763 bytes --]
From c39e9a1757d037589a558e3a9c99e1383609ac8d Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:17 +0300
Subject: [PATCH 1/8] New package: libgedit-amtk-5.8.0
---
common/shlibs | 2 +-
srcpkgs/libgedit-amtk-devel | 1 +
srcpkgs/libgedit-amtk/template | 38 ++++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+), 1 deletion(-)
create mode 120000 srcpkgs/libgedit-amtk-devel
create mode 100644 srcpkgs/libgedit-amtk/template
diff --git a/common/shlibs b/common/shlibs
index 3cf507d8ada87..5ce999e443ec6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1395,7 +1395,7 @@ libgda-5.0.so.4 libgda-5.2.9_4
libgda-report-5.0.so.4 libgda-5.2.9_4
libgda-ui-5.0.so.4 libgda-5.2.9_4
libgda-xslt-5.0.so.4 libgda-5.2.9_4
-libamtk-5.so.0 amtk-5.0.0_1
+libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1
libdevhelp-3.so.6 devhelp-libs-3.30.0_1
libunistring.so.2 libunistring-0.9.4_1
libguile-2.2.so.1 libguile-2.2.7_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..5b5ac7fb14bdf
--- /dev/null
+++ b/srcpkgs/libgedit-amtk/template
@@ -0,0 +1,38 @@
+# Template file for 'libgedit-amtk'
+pkgname=libgedit-amtk
+version=5.8.0
+revision=1
+build_style=meson
+build_helper=gir
+configure_args="$(vopt_bool gir gobject_introspection) $(vopt_bool gtk_doc gtk_doc)"
+hostmakedepends="gettext glib-devel pkg-config $(vopt_if gtk_doc gtk-doc)"
+makedepends="gtk+3-devel"
+short_desc="Actions, Menus and Toolbars Kit for GTK applications"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/gedit-technology/libgedit-amtk"
+distfiles="https://github.com/gedit-technology/libgedit-amtk/archive/${version}.tar.gz"
+checksum=014d90bdc611ef855655c846a37341b8394db794b06344e07066b87c259b4f31
+
+build_options="gir gtk_doc"
+build_options_default="gir"
+
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
+libgedit-amtk-devel_package() {
+ short_desc+=" - development files"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove "usr/lib/*.so"
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/gtk-doc
+ fi
+ }
+}
From 6ee5e528b79429760cfb416ae4bee7b306c7b257 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:18 +0300
Subject: [PATCH 2/8] New package: libgedit-gtksourceview-299.0.5
---
common/shlibs | 2 ++
srcpkgs/libgedit-gtksourceview-devel | 1 +
srcpkgs/libgedit-gtksourceview/template | 44 +++++++++++++++++++++++++
3 files changed, 47 insertions(+)
create mode 120000 srcpkgs/libgedit-gtksourceview-devel
create mode 100644 srcpkgs/libgedit-gtksourceview/template
diff --git a/common/shlibs b/common/shlibs
index 5ce999e443ec6..cdd8160103d6d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4275,3 +4275,5 @@ libunicode_ucd.so.0.4 libunicode-0.4.0_1
libunicode_loader.so.0.4 libunicode-0.4.0_1
force-stage.so.0.1 void-force-stage-0.1_1
libliftoff.so.0 libliftoff-0.4.1_1
+libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1
+libgedit-gtksourceview-300.so.0 libgedit-gtksourceview-299.0.4_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..16ef5a7d4a49d
--- /dev/null
+++ b/srcpkgs/libgedit-gtksourceview/template
@@ -0,0 +1,44 @@
+# Template file for 'libgedit-gtksourceview'
+pkgname=libgedit-gtksourceview
+version=299.0.5
+revision=1
+build_style=meson
+build_helper=gir
+configure_args="$(vopt_bool gir gobject_introspection) $(vopt_bool gtk_doc gtk_doc)"
+hostmakedepends="gettext glib-devel pkg-config $(vopt_if gtk_doc gtk-doc)"
+makedepends="gtk+3-devel"
+checkdepends="dbus xvfb-run"
+short_desc="Gedit Technology - Source code editing widget"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/gedit-technology/libgedit-gtksourceview"
+distfiles="https://github.com/gedit-technology/libgedit-gtksourceview/archive/${version}.tar.gz"
+checksum=bca38a79fe8360abbd1d5a6d7c339c0a1bafd6695abd0971094dac9262f82d5d
+
+build_options="gir gtk_doc"
+build_options_default="gir"
+
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
+do_check() {
+ dbus-run-session xvfb-run -s '-nolisten local' \
+ meson test -C build
+}
+
+libgedit-gtksourceview-devel_package() {
+ short_desc+=" - development files"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove "usr/lib/*.so"
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/gtk-doc
+ fi
+ }
+}
From dee39e8134a94b0f5a8363f2a35d5a27b4f7d2d1 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:18 +0300
Subject: [PATCH 3/8] tepl: update to 6.8.0
---
common/shlibs | 2 +-
srcpkgs/tepl/template | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index cdd8160103d6d..504539adb78d4 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..933df8461d100 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,13 +1,14 @@
# 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
- libxml2-devel uchardet-devel gsettings-desktop-schemas-devel"
+makedepends="libglib-devel gtksourceview4-devel gtk+3-devel
+ libxml2-devel uchardet-devel gsettings-desktop-schemas-devel
+ libgedit-gtksourceview-devel libgedit-amtk-devel"
checkdepends="xvfb-run"
short_desc="Text editor product line"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -15,7 +16,7 @@ license="GPL-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 20bfb0e4b6db34a0dc904f86e1d92d35d97f04a1 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:18 +0300
Subject: [PATCH 4/8] gedit: update to 46.1
---
common/shlibs | 2 +-
srcpkgs/gedit/template | 19 +++++++++----------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 504539adb78d4..dafcefb673eba 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
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/gedit/template b/srcpkgs/gedit/template
index 002740e531811..1934bde7e6d42 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,34 +1,33 @@
# 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"
+hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext vala
+ desktop-file-utils gtk-update-icon-cache"
makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview4-devel
- libpeas-devel python3-gobject-devel amtk-devel tepl-devel"
+ libpeas-devel python3-gobject-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/gedit-45/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"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
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 e393d7b5510f96afefa6b96f9552d7572cb1de26 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:19 +0300
Subject: [PATCH 5/8] gedit-plugins: update to 46.0
---
srcpkgs/gedit-plugins/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template
index 7d4e0d845171a..27f3a15ba3784 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"
+ libglib-devel libpeas-devel python3-dbus-devel python3-devel zeitgeist-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 c326ef76c29f3fc5f28a4f60f84bf0333b71c24a Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:19 +0300
Subject: [PATCH 6/8] gnome-latex: update to 3.46.0
---
srcpkgs/gnome-latex/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-latex/template b/srcpkgs/gnome-latex/template
index 6af20bdc4f019..df053449c3293 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
@@ -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"
From 25a4a11b5274ce198824331ecc15ad12eef950b5 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 18:18:06 +0300
Subject: [PATCH 7/8] devhelp: drop amtk dep
amtk dep was dropped in devhelp-41.alpha
---
srcpkgs/devhelp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template
index 7c641946341a6..debd01d84dede 100644
--- a/srcpkgs/devhelp/template
+++ b/srcpkgs/devhelp/template
@@ -1,11 +1,11 @@
# Template file for 'devhelp'
pkgname=devhelp
version=43.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config gtk-update-icon-cache"
-makedepends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel amtk-devel"
+makedepends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel"
short_desc="API documentation browser for GTK+ and GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
From dcd20a4bf8187d508025cc5ae2e07700c8ef006a Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 18:24:40 +0300
Subject: [PATCH 8/8] amtk: remove package
amtk was replaced with libgedit-amtk. no other packages relies on it.
---
srcpkgs/amtk-devel | 1 -
srcpkgs/amtk/template | 38 -------------------------------
srcpkgs/removed-packages/template | 4 +++-
3 files changed, 3 insertions(+), 40 deletions(-)
delete mode 120000 srcpkgs/amtk-devel
delete mode 100644 srcpkgs/amtk/template
diff --git a/srcpkgs/amtk-devel b/srcpkgs/amtk-devel
deleted file mode 120000
index 29eae529cf58c..0000000000000
--- a/srcpkgs/amtk-devel
+++ /dev/null
@@ -1 +0,0 @@
-amtk
\ No newline at end of file
diff --git a/srcpkgs/amtk/template b/srcpkgs/amtk/template
deleted file mode 100644
index 96aa3b11019f5..0000000000000
--- a/srcpkgs/amtk/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'amtk'
-pkgname=amtk
-version=5.6.1
-revision=1
-build_style=meson
-build_helper="gir"
-configure_args="$(vopt_bool gir gobject_introspection) $(vopt_bool gtk_doc)"
-hostmakedepends="pkg-config glib-devel gettext $(vopt_if gtk_doc gtk-doc)"
-makedepends="gtk+3-devel libglib-devel"
-short_desc="Actions, Menus and Toolbars Kit for GTK+ applications"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://gitlab.gnome.org/World/amtk"
-distfiles="${GNOME_SITE}/amtk/${version%.*}/amtk-${version}.tar.xz"
-checksum=d50115b85c872aac296934b5ee726a3fa156c6f5ad96d27e0edd0aa5ad173228
-
-build_options="gir gtk_doc"
-build_options_default="gir"
-
-if ! [ "$CROSS_BUILD" ]; then
- build_options_default+=" gtk_doc"
-fi
-
-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
- if [ "$build_option_gtk_doc" ]; then
- vmove usr/share/gtk-doc
- fi
- if [ "$build_option_gir" ]; then
- vmove usr/share/gir-1.0
- fi
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index e7f36da1c5030..8dbe8dcf545f8 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
# Template file for 'removed-packages'
pkgname=removed-packages
-version=0.1.20240210
+version=0.1.20240216
revision=1
build_style=meta
short_desc="Uninstalls packages removed from repository"
@@ -725,6 +725,8 @@ replaces="
lld-devel<=15.0.7_3
libclang-32bit<=15.0.7_3
libclang-cpp-32bit<=15.0.7_3
+ amtk<=5.6.1
+ amtk-devel<=5.6.1
"
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: gedit: update to 46.1
2024-02-16 14:17 [PR PATCH] gedit: update to 46.1 chrysos349
` (2 preceding siblings ...)
2024-02-17 20:26 ` chrysos349
@ 2024-02-18 7:42 ` chrysos349
2024-02-18 7:42 ` chrysos349
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: chrysos349 @ 2024-02-18 7:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 251 bytes --]
New comment by chrysos349 on void-packages repository
https://github.com/void-linux/void-packages/pull/48768#issuecomment-1950991944
Comment:
`armv6l-musl` got stuck on `[172/174] Linking target unit-tests/test-util` for 6 hours, lol. not my fault.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: gedit: update to 46.1
2024-02-16 14:17 [PR PATCH] gedit: update to 46.1 chrysos349
` (3 preceding siblings ...)
2024-02-18 7:42 ` chrysos349
@ 2024-02-18 7:42 ` chrysos349
2024-02-18 10:45 ` chrysos349
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: chrysos349 @ 2024-02-18 7:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 259 bytes --]
New comment by chrysos349 on void-packages repository
https://github.com/void-linux/void-packages/pull/48768#issuecomment-1950991944
Comment:
`armv6l-musl` builder got stuck on `[172/174] Linking target unit-tests/test-util` for 6 hours, lol. not my fault.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: gedit: update to 46.1
2024-02-16 14:17 [PR PATCH] gedit: update to 46.1 chrysos349
` (4 preceding siblings ...)
2024-02-18 7:42 ` chrysos349
@ 2024-02-18 10:45 ` chrysos349
2024-02-19 4:56 ` [PR PATCH] [Updated] " chrysos349
2024-02-20 5:41 ` [PR PATCH] [Closed]: " chrysos349
7 siblings, 0 replies; 9+ messages in thread
From: chrysos349 @ 2024-02-18 10:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New comment by chrysos349 on void-packages repository
https://github.com/void-linux/void-packages/pull/48768#issuecomment-1951128768
Comment:
`qemu-8.1.5` (#48789) fixes the issue above.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] gedit: update to 46.1
2024-02-16 14:17 [PR PATCH] gedit: update to 46.1 chrysos349
` (5 preceding siblings ...)
2024-02-18 10:45 ` chrysos349
@ 2024-02-19 4:56 ` chrysos349
2024-02-20 5:41 ` [PR PATCH] [Closed]: " chrysos349
7 siblings, 0 replies; 9+ messages in thread
From: chrysos349 @ 2024-02-19 4:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 931 bytes --]
There is an updated pull request by chrysos349 against master on the void-packages repository
https://github.com/chrysos349/void-packages gedit
https://github.com/void-linux/void-packages/pull/48768
gedit: update to 46.1
@Gottox
**NOTES**
- `gnome-latex` was updated due to the updated `tepl`
- `tepl` was update due to the updated `gedit`
- `gedit`'s and `gedit-plugins`'s versions must be in sync
- drop `amtk` from `devhelp`'s `makedepends`
- remove `amtk` and add to `removed-packages` (was replaced with `libgedit-amtk`)
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl x
- armv7l x
- armv6l-musl x
A patch file from https://github.com/void-linux/void-packages/pull/48768.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gedit-48768.patch --]
[-- Type: text/x-diff, Size: 16763 bytes --]
From bf0f69f8ab497a43bac58d20c64f756eb8caa421 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:17 +0300
Subject: [PATCH 1/8] New package: libgedit-amtk-5.8.0
---
common/shlibs | 2 +-
srcpkgs/libgedit-amtk-devel | 1 +
srcpkgs/libgedit-amtk/template | 38 ++++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+), 1 deletion(-)
create mode 120000 srcpkgs/libgedit-amtk-devel
create mode 100644 srcpkgs/libgedit-amtk/template
diff --git a/common/shlibs b/common/shlibs
index 3cf507d8ada87..5ce999e443ec6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1395,7 +1395,7 @@ libgda-5.0.so.4 libgda-5.2.9_4
libgda-report-5.0.so.4 libgda-5.2.9_4
libgda-ui-5.0.so.4 libgda-5.2.9_4
libgda-xslt-5.0.so.4 libgda-5.2.9_4
-libamtk-5.so.0 amtk-5.0.0_1
+libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1
libdevhelp-3.so.6 devhelp-libs-3.30.0_1
libunistring.so.2 libunistring-0.9.4_1
libguile-2.2.so.1 libguile-2.2.7_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..5b5ac7fb14bdf
--- /dev/null
+++ b/srcpkgs/libgedit-amtk/template
@@ -0,0 +1,38 @@
+# Template file for 'libgedit-amtk'
+pkgname=libgedit-amtk
+version=5.8.0
+revision=1
+build_style=meson
+build_helper=gir
+configure_args="$(vopt_bool gir gobject_introspection) $(vopt_bool gtk_doc gtk_doc)"
+hostmakedepends="gettext glib-devel pkg-config $(vopt_if gtk_doc gtk-doc)"
+makedepends="gtk+3-devel"
+short_desc="Actions, Menus and Toolbars Kit for GTK applications"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/gedit-technology/libgedit-amtk"
+distfiles="https://github.com/gedit-technology/libgedit-amtk/archive/${version}.tar.gz"
+checksum=014d90bdc611ef855655c846a37341b8394db794b06344e07066b87c259b4f31
+
+build_options="gir gtk_doc"
+build_options_default="gir"
+
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
+libgedit-amtk-devel_package() {
+ short_desc+=" - development files"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove "usr/lib/*.so"
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/gtk-doc
+ fi
+ }
+}
From feba17c7755d6e1873c86708a9d672428d486c6b Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:18 +0300
Subject: [PATCH 2/8] New package: libgedit-gtksourceview-299.0.5
---
common/shlibs | 2 ++
srcpkgs/libgedit-gtksourceview-devel | 1 +
srcpkgs/libgedit-gtksourceview/template | 44 +++++++++++++++++++++++++
3 files changed, 47 insertions(+)
create mode 120000 srcpkgs/libgedit-gtksourceview-devel
create mode 100644 srcpkgs/libgedit-gtksourceview/template
diff --git a/common/shlibs b/common/shlibs
index 5ce999e443ec6..cdd8160103d6d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4275,3 +4275,5 @@ libunicode_ucd.so.0.4 libunicode-0.4.0_1
libunicode_loader.so.0.4 libunicode-0.4.0_1
force-stage.so.0.1 void-force-stage-0.1_1
libliftoff.so.0 libliftoff-0.4.1_1
+libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1
+libgedit-gtksourceview-300.so.0 libgedit-gtksourceview-299.0.4_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..16ef5a7d4a49d
--- /dev/null
+++ b/srcpkgs/libgedit-gtksourceview/template
@@ -0,0 +1,44 @@
+# Template file for 'libgedit-gtksourceview'
+pkgname=libgedit-gtksourceview
+version=299.0.5
+revision=1
+build_style=meson
+build_helper=gir
+configure_args="$(vopt_bool gir gobject_introspection) $(vopt_bool gtk_doc gtk_doc)"
+hostmakedepends="gettext glib-devel pkg-config $(vopt_if gtk_doc gtk-doc)"
+makedepends="gtk+3-devel"
+checkdepends="dbus xvfb-run"
+short_desc="Gedit Technology - Source code editing widget"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/gedit-technology/libgedit-gtksourceview"
+distfiles="https://github.com/gedit-technology/libgedit-gtksourceview/archive/${version}.tar.gz"
+checksum=bca38a79fe8360abbd1d5a6d7c339c0a1bafd6695abd0971094dac9262f82d5d
+
+build_options="gir gtk_doc"
+build_options_default="gir"
+
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
+do_check() {
+ dbus-run-session xvfb-run -s '-nolisten local' \
+ meson test -C build
+}
+
+libgedit-gtksourceview-devel_package() {
+ short_desc+=" - development files"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove "usr/lib/*.so"
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/gtk-doc
+ fi
+ }
+}
From bf1a18a698089e6972e55cd9210842ca2e47e75e Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:18 +0300
Subject: [PATCH 3/8] tepl: update to 6.8.0
---
common/shlibs | 2 +-
srcpkgs/tepl/template | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index cdd8160103d6d..504539adb78d4 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..933df8461d100 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,13 +1,14 @@
# 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
- libxml2-devel uchardet-devel gsettings-desktop-schemas-devel"
+makedepends="libglib-devel gtksourceview4-devel gtk+3-devel
+ libxml2-devel uchardet-devel gsettings-desktop-schemas-devel
+ libgedit-gtksourceview-devel libgedit-amtk-devel"
checkdepends="xvfb-run"
short_desc="Text editor product line"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -15,7 +16,7 @@ license="GPL-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 c03c5cce773c595a1d51a20707cd47ef79dd9fe9 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:18 +0300
Subject: [PATCH 4/8] gedit: update to 46.1
---
common/shlibs | 2 +-
srcpkgs/gedit/template | 19 +++++++++----------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 504539adb78d4..dafcefb673eba 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
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/gedit/template b/srcpkgs/gedit/template
index 002740e531811..1934bde7e6d42 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,34 +1,33 @@
# 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"
+hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext vala
+ desktop-file-utils gtk-update-icon-cache"
makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview4-devel
- libpeas-devel python3-gobject-devel amtk-devel tepl-devel"
+ libpeas-devel python3-gobject-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/gedit-45/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"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
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 b43fd927037af44192bfbf014c29480ee2cf1428 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:19 +0300
Subject: [PATCH 5/8] gedit-plugins: update to 46.0
---
srcpkgs/gedit-plugins/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template
index 7d4e0d845171a..27f3a15ba3784 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"
+ libglib-devel libpeas-devel python3-dbus-devel python3-devel zeitgeist-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 5b7d80b215ee046d3effb0f277110230a4d92d84 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 16:42:19 +0300
Subject: [PATCH 6/8] gnome-latex: update to 3.46.0
---
srcpkgs/gnome-latex/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-latex/template b/srcpkgs/gnome-latex/template
index 6af20bdc4f019..df053449c3293 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
@@ -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"
From a21232e1bd4bb3abf0739531e34364e620959533 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 18:18:06 +0300
Subject: [PATCH 7/8] devhelp: drop amtk dep
amtk dep was dropped in devhelp-41.alpha
---
srcpkgs/devhelp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template
index 7c641946341a6..debd01d84dede 100644
--- a/srcpkgs/devhelp/template
+++ b/srcpkgs/devhelp/template
@@ -1,11 +1,11 @@
# Template file for 'devhelp'
pkgname=devhelp
version=43.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config gtk-update-icon-cache"
-makedepends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel amtk-devel"
+makedepends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel"
short_desc="API documentation browser for GTK+ and GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
From 975fedde4c000392d14e71a04856d6c77fb2da07 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 16 Feb 2024 18:24:40 +0300
Subject: [PATCH 8/8] amtk: remove package
amtk was replaced with libgedit-amtk. no other packages relies on it.
---
srcpkgs/amtk-devel | 1 -
srcpkgs/amtk/template | 38 -------------------------------
srcpkgs/removed-packages/template | 4 +++-
3 files changed, 3 insertions(+), 40 deletions(-)
delete mode 120000 srcpkgs/amtk-devel
delete mode 100644 srcpkgs/amtk/template
diff --git a/srcpkgs/amtk-devel b/srcpkgs/amtk-devel
deleted file mode 120000
index 29eae529cf58c..0000000000000
--- a/srcpkgs/amtk-devel
+++ /dev/null
@@ -1 +0,0 @@
-amtk
\ No newline at end of file
diff --git a/srcpkgs/amtk/template b/srcpkgs/amtk/template
deleted file mode 100644
index 96aa3b11019f5..0000000000000
--- a/srcpkgs/amtk/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'amtk'
-pkgname=amtk
-version=5.6.1
-revision=1
-build_style=meson
-build_helper="gir"
-configure_args="$(vopt_bool gir gobject_introspection) $(vopt_bool gtk_doc)"
-hostmakedepends="pkg-config glib-devel gettext $(vopt_if gtk_doc gtk-doc)"
-makedepends="gtk+3-devel libglib-devel"
-short_desc="Actions, Menus and Toolbars Kit for GTK+ applications"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://gitlab.gnome.org/World/amtk"
-distfiles="${GNOME_SITE}/amtk/${version%.*}/amtk-${version}.tar.xz"
-checksum=d50115b85c872aac296934b5ee726a3fa156c6f5ad96d27e0edd0aa5ad173228
-
-build_options="gir gtk_doc"
-build_options_default="gir"
-
-if ! [ "$CROSS_BUILD" ]; then
- build_options_default+=" gtk_doc"
-fi
-
-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
- if [ "$build_option_gtk_doc" ]; then
- vmove usr/share/gtk-doc
- fi
- if [ "$build_option_gir" ]; then
- vmove usr/share/gir-1.0
- fi
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index e7f36da1c5030..8dbe8dcf545f8 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
# Template file for 'removed-packages'
pkgname=removed-packages
-version=0.1.20240210
+version=0.1.20240216
revision=1
build_style=meta
short_desc="Uninstalls packages removed from repository"
@@ -725,6 +725,8 @@ replaces="
lld-devel<=15.0.7_3
libclang-32bit<=15.0.7_3
libclang-cpp-32bit<=15.0.7_3
+ amtk<=5.6.1
+ amtk-devel<=5.6.1
"
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Closed]: gedit: update to 46.1
2024-02-16 14:17 [PR PATCH] gedit: update to 46.1 chrysos349
` (6 preceding siblings ...)
2024-02-19 4:56 ` [PR PATCH] [Updated] " chrysos349
@ 2024-02-20 5:41 ` chrysos349
7 siblings, 0 replies; 9+ messages in thread
From: chrysos349 @ 2024-02-20 5:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 771 bytes --]
There's a closed pull request on the void-packages repository
gedit: update to 46.1
https://github.com/void-linux/void-packages/pull/48768
Description:
@Gottox
**NOTES**
- `gnome-latex` was updated due to the updated `tepl`
- `tepl` was update due to the updated `gedit`
- `gedit`'s and `gedit-plugins`'s versions must be in sync
- drop `amtk` from `devhelp`'s `makedepends`
- remove `amtk` and add to `removed-packages` (was replaced with `libgedit-amtk`)
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl x
- armv7l x
- armv6l-musl x
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-02-20 5:41 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-16 14:17 [PR PATCH] gedit: update to 46.1 chrysos349
2024-02-16 15:26 ` [PR PATCH] [Updated] " chrysos349
2024-02-16 17:23 ` chrysos349
2024-02-17 20:26 ` chrysos349
2024-02-18 7:42 ` chrysos349
2024-02-18 7:42 ` chrysos349
2024-02-18 10:45 ` chrysos349
2024-02-19 4:56 ` [PR PATCH] [Updated] " chrysos349
2024-02-20 5:41 ` [PR PATCH] [Closed]: " chrysos349
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).