* [PR PATCH] gedit{,-plugins}: update to 47.0
@ 2024-04-29 14:42 chrysos349
2024-04-29 14:51 ` [PR PATCH] [Updated] " chrysos349
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: chrysos349 @ 2024-04-29 14:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 677 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/50113
gedit{,-plugins}: update to 47.0
@Gottox
`tepl` was renamed to `libgedit-tepl`.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### 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/50113.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gedit-50113.patch --]
[-- Type: text/x-diff, Size: 15628 bytes --]
From 59ff0dc68c4d942f7fadd0c05bb4227b5596f90c Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:22:34 +0300
Subject: [PATCH 1/6] New package: libgedit-gfls-0.1.0
---
common/shlibs | 1 +
srcpkgs/libgedit-gfls-devel | 1 +
srcpkgs/libgedit-gfls/template | 38 ++++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+)
create mode 120000 srcpkgs/libgedit-gfls-devel
create mode 100644 srcpkgs/libgedit-gfls/template
diff --git a/common/shlibs b/common/shlibs
index 105196bea39154..70027dff33c66f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3600,6 +3600,7 @@ libhtp.so.2 libhtp-0.5.30_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
+libgedit-gfls-1.so.0 libgedit-gfls-0.1.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-gfls-devel b/srcpkgs/libgedit-gfls-devel
new file mode 120000
index 00000000000000..6785d64ceca936
--- /dev/null
+++ b/srcpkgs/libgedit-gfls-devel
@@ -0,0 +1 @@
+libgedit-gfls
\ No newline at end of file
diff --git a/srcpkgs/libgedit-gfls/template b/srcpkgs/libgedit-gfls/template
new file mode 100644
index 00000000000000..2be694908c8d09
--- /dev/null
+++ b/srcpkgs/libgedit-gfls/template
@@ -0,0 +1,38 @@
+# Template file for 'libgedit-gfls'
+pkgname=libgedit-gfls
+version=0.1.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="Module dedicated to file loading and saving"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/gedit-technology/libgedit-gfls"
+distfiles="https://github.com/gedit-technology/libgedit-gfls/archive/${version}.tar.gz"
+checksum=9c658dd507c0daf12b34e735f1e6558561ed18f549c727976116add1272ef5e6
+
+build_options="gir gtk_doc"
+build_options_default="gir"
+
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
+libgedit-gfls-devel_package() {
+ depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - developement files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/*.so
+ 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 7928137eaa4008a195f3fc40a6ea2b73720c6519 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:23:42 +0300
Subject: [PATCH 2/6] libgedit-gtksourceview: update to 299.2.1
---
common/shlibs | 1 +
srcpkgs/libgedit-gtksourceview/template | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 70027dff33c66f..0e4c057d40e824 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3601,6 +3601,7 @@ 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
libgedit-gfls-1.so.0 libgedit-gfls-0.1.0_1
+libgedit-gtksourceview-300.so.1 libgedit-gtksourceview-299.2.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/libgedit-gtksourceview/template b/srcpkgs/libgedit-gtksourceview/template
index 0a8820d86b3a2f..d17785c420353e 100644
--- a/srcpkgs/libgedit-gtksourceview/template
+++ b/srcpkgs/libgedit-gtksourceview/template
@@ -1,6 +1,6 @@
# Template file for 'libgedit-gtksourceview'
pkgname=libgedit-gtksourceview
-version=299.0.5
+version=299.2.1
revision=1
build_helper="gir"
build_style=meson
@@ -14,7 +14,7 @@ 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
+checksum=f94ea579636d73b4a783b9ec43d77bc9a43d4b633b3bf9ba9d7a011cadb5cb92
make_check_pre="xvfb-run"
libgedit-gtksourceview-devel_package() {
From 0b47a9bc2e867ae7089f495540d474b7ae9e1f0a Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:27:04 +0300
Subject: [PATCH 3/6] tepl: rename to libgedit-tepl, update to 6.10.0
---
common/shlibs | 2 +-
srcpkgs/libgedit-tepl-devel | 1 +
srcpkgs/{tepl => libgedit-tepl}/template | 20 +++++++++++---------
srcpkgs/tepl-devel | 1 -
4 files changed, 13 insertions(+), 11 deletions(-)
create mode 120000 srcpkgs/libgedit-tepl-devel
rename srcpkgs/{tepl => libgedit-tepl}/template (60%)
delete mode 120000 srcpkgs/tepl-devel
diff --git a/common/shlibs b/common/shlibs
index 0e4c057d40e824..34c693fbd8f470 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3479,7 +3479,6 @@ 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.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
@@ -3602,6 +3601,7 @@ libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1
libgedit-gtksourceview-300.so.0 libgedit-gtksourceview-299.0.5_1
libgedit-gfls-1.so.0 libgedit-gfls-0.1.0_1
libgedit-gtksourceview-300.so.1 libgedit-gtksourceview-299.2.1_1
+libgedit-tepl-6.so.0 libgedit-tepl-6.10.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-tepl-devel b/srcpkgs/libgedit-tepl-devel
new file mode 120000
index 00000000000000..3f11153a1d9c1a
--- /dev/null
+++ b/srcpkgs/libgedit-tepl-devel
@@ -0,0 +1 @@
+libgedit-tepl
\ No newline at end of file
diff --git a/srcpkgs/tepl/template b/srcpkgs/libgedit-tepl/template
similarity index 60%
rename from srcpkgs/tepl/template
rename to srcpkgs/libgedit-tepl/template
index ba6cda445a64d7..06282dcfeabded 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/libgedit-tepl/template
@@ -1,21 +1,23 @@
-# Template file for 'tepl'
-pkgname=tepl
-version=6.8.0
+# Template file for 'libgedit-tepl'
+pkgname=libgedit-tepl
+version=6.10.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="libgedit-amtk-devel libglib-devel libgedit-gtksourceview-devel gtk+3-devel
- libxml2-devel uchardet-devel gsettings-desktop-schemas-devel"
+ libxml2-devel uchardet-devel gsettings-desktop-schemas-devel
+ libgedit-gfls-devel libhandy1-devel"
checkdepends="xvfb-run"
short_desc="Text editor product line"
maintainer="Enno Boland <gottox@voidlinux.org>"
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=46e6e5f1bfdbc52e5956f06add575e9c7697c673d53d3803dfe768f490b560f0
+homepage="https://github.com/gedit-technology/libgedit-tepl"
+changelog="https://raw.githubusercontent.com/gedit-technology/libgedit-tepl/main/NEWS"
+distfiles="https://github.com/gedit-technology/libgedit-tepl/archive/${version}.tar.gz"
+#distfiles="${GNOME_SITE}/tepl/${version%.*}/tepl-${version}.tar.xz"
+checksum=44e120c9915a93362190f83161dd4dd37f3318d4f68b763dc6079edd5f8a470b
make_check_pre="xvfb-run"
build_options="gir gtk_doc"
@@ -25,7 +27,7 @@ if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" gtk_doc"
fi
-tepl-devel_package() {
+libgedit-tepl-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - developement files"
pkg_install() {
diff --git a/srcpkgs/tepl-devel b/srcpkgs/tepl-devel
deleted file mode 120000
index 9ae68b02eadd2b..00000000000000
--- a/srcpkgs/tepl-devel
+++ /dev/null
@@ -1 +0,0 @@
-tepl
\ No newline at end of file
From 4692c529a37afb0fe3b526b335b55b907e66bc01 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:29:41 +0300
Subject: [PATCH 4/6] gedit: update to 47.0
---
common/shlibs | 2 +-
srcpkgs/gedit/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 34c693fbd8f470..5329d96e3626bc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3596,7 +3596,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-46.so gedit-46.1_1
+libgedit-47.so gedit-47.0_1
libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1
libgedit-gtksourceview-300.so.0 libgedit-gtksourceview-299.0.5_1
libgedit-gfls-1.so.0 libgedit-gfls-0.1.0_1
diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index c14af986fcf758..33743270ed993a 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,7 +1,7 @@
# Template file for 'gedit'
# keep major version in sync with gedit-plugins
pkgname=gedit
-version=46.2
+version=47.0
revision=1
build_helper="gir"
build_style=meson
@@ -10,7 +10,7 @@ configure_args="-Dgtk_doc=false"
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"
+ libpeas-devel python3-gobject-devel libgedit-amtk-devel libgedit-tepl-devel"
depends="desktop-file-utils gsettings-desktop-schemas iso-codes"
short_desc="Text editor for GNOME"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -18,13 +18,13 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Gedit"
changelog="https://gitlab.gnome.org/GNOME/gedit/-/raw/${version}/NEWS"
distfiles="${GNOME_SITE}/gedit/${version%.*}/gedit-${version}.tar.xz"
-checksum=c0866412bad147ebace2d282ffcbb5a0e9a304b20fd55640bee21c81e6d501ef
+checksum=fa4a597e34c76d4ac91431b5ae6e191c96c6b0af1702e0899ab35199edfa1bfa
python_version=3
shlib_provides="libgedit-46.so"
gedit-devel_package() {
depends="${sourcepkg}>=${version}_${revision} gtk+3-devel libglib-devel
- libgedit-gtksourceview-devel libpeas-devel libgedit-amtk-devel tepl-devel"
+ libgedit-gtksourceview-devel libpeas-devel libgedit-amtk-devel libgedit-tepl-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 53b4a4e567c622682c9cbebf86ef03f7eb119d6a Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:29:48 +0300
Subject: [PATCH 5/6] gedit-plugins: update to 47.0
---
srcpkgs/gedit-plugins/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template
index f332e34d3802f8..f147bf2b20bcce 100644
--- a/srcpkgs/gedit-plugins/template
+++ b/srcpkgs/gedit-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'gedit-plugins'
# keep major version in sync with gedit
pkgname=gedit-plugins
-version=46.0
+version=47.0
revision=1
build_style=meson
pycompile_dirs="usr/lib/gedit/plugins"
@@ -16,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=db6b4aa72dac0190a8ae497f770f5a4ba66ae3cf1e03ea8b744e6101df09b251
+checksum=bb493af27561c2d553fe62e9aad5b3cd0c49f3df743dfc4acf6b3319e928f4a6
python_version=3
From ef937b313598a24ca105d9c49896bcca41aa10f4 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:30:16 +0300
Subject: [PATCH 6/6] gnome-latex: rebuild for libgedit-tepl
---
srcpkgs/gnome-latex/patches/fix-tepl.patch | 85 ++++++++++++++++++++++
srcpkgs/gnome-latex/template | 4 +-
2 files changed, 87 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gnome-latex/patches/fix-tepl.patch
diff --git a/srcpkgs/gnome-latex/patches/fix-tepl.patch b/srcpkgs/gnome-latex/patches/fix-tepl.patch
new file mode 100644
index 00000000000000..e82a44d925a983
--- /dev/null
+++ b/srcpkgs/gnome-latex/patches/fix-tepl.patch
@@ -0,0 +1,85 @@
+diff --git a/configure b/configure
+index a58dc5629..e01a8f4ec 100755
+--- a/configure
++++ b/configure
+@@ -14305,7 +14305,7 @@ if test -n "$DEP_CFLAGS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ \""; } >&5
+@@ -14314,7 +14314,7 @@ if test -n "$DEP_CFLAGS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ ") 2>&5
+@@ -14326,7 +14326,7 @@ if test -n "$DEP_CFLAGS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ " 2>/dev/null`
+@@ -14346,7 +14346,7 @@ if test -n "$DEP_LIBS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ \""; } >&5
+@@ -14355,7 +14355,7 @@ if test -n "$DEP_LIBS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ ") 2>&5
+@@ -14367,7 +14367,7 @@ if test -n "$DEP_LIBS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ " 2>/dev/null`
+@@ -14396,7 +14396,7 @@ fi
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ " 2>&1`
+@@ -14406,7 +14406,7 @@ fi
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ " 2>&1`
+@@ -14419,7 +14419,7 @@ fi
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ ) were not met:
diff --git a/srcpkgs/gnome-latex/template b/srcpkgs/gnome-latex/template
index 9784d71e54a246..10675875a753c1 100644
--- a/srcpkgs/gnome-latex/template
+++ b/srcpkgs/gnome-latex/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-latex'
pkgname=gnome-latex
version=3.46.0
-revision=1
+revision=2
build_helper="gir"
build_style=gnu-configure
configure_args="--disable-appstream-util --disable-dconf-migration
@@ -9,7 +9,7 @@ configure_args="--disable-appstream-util --disable-dconf-migration
hostmakedepends="glib-devel gettext itstool pkg-config vala
$(vopt_if gir gobject-introspection) gtk-doc"
makedepends="gsettings-desktop-schemas-devel gspell-devel libgedit-gtksourceview-devel
- gtk+3-devel libgee-devel libglib-devel tepl-devel"
+ gtk+3-devel libgee-devel libglib-devel libgedit-tepl-devel"
short_desc="LaTeX editor for the GNOME desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] gedit{,-plugins}: update to 47.0
2024-04-29 14:42 [PR PATCH] gedit{,-plugins}: update to 47.0 chrysos349
@ 2024-04-29 14:51 ` chrysos349
2024-04-29 15:26 ` chrysos349
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: chrysos349 @ 2024-04-29 14:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 682 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/50113
gedit{,-plugins}: update to 47.0
@Gottox
`tepl` was renamed to `libgedit-tepl`.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### 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/50113.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gedit-50113.patch --]
[-- Type: text/x-diff, Size: 15615 bytes --]
From 59ff0dc68c4d942f7fadd0c05bb4227b5596f90c Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:22:34 +0300
Subject: [PATCH 1/6] New package: libgedit-gfls-0.1.0
---
common/shlibs | 1 +
srcpkgs/libgedit-gfls-devel | 1 +
srcpkgs/libgedit-gfls/template | 38 ++++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+)
create mode 120000 srcpkgs/libgedit-gfls-devel
create mode 100644 srcpkgs/libgedit-gfls/template
diff --git a/common/shlibs b/common/shlibs
index 105196bea39154..70027dff33c66f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3600,6 +3600,7 @@ libhtp.so.2 libhtp-0.5.30_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
+libgedit-gfls-1.so.0 libgedit-gfls-0.1.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-gfls-devel b/srcpkgs/libgedit-gfls-devel
new file mode 120000
index 00000000000000..6785d64ceca936
--- /dev/null
+++ b/srcpkgs/libgedit-gfls-devel
@@ -0,0 +1 @@
+libgedit-gfls
\ No newline at end of file
diff --git a/srcpkgs/libgedit-gfls/template b/srcpkgs/libgedit-gfls/template
new file mode 100644
index 00000000000000..2be694908c8d09
--- /dev/null
+++ b/srcpkgs/libgedit-gfls/template
@@ -0,0 +1,38 @@
+# Template file for 'libgedit-gfls'
+pkgname=libgedit-gfls
+version=0.1.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="Module dedicated to file loading and saving"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/gedit-technology/libgedit-gfls"
+distfiles="https://github.com/gedit-technology/libgedit-gfls/archive/${version}.tar.gz"
+checksum=9c658dd507c0daf12b34e735f1e6558561ed18f549c727976116add1272ef5e6
+
+build_options="gir gtk_doc"
+build_options_default="gir"
+
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
+libgedit-gfls-devel_package() {
+ depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - developement files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/*.so
+ 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 a9a2be27d45d937fcfffac5674ef3ed1ac40c33f Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:23:42 +0300
Subject: [PATCH 2/6] libgedit-gtksourceview: update to 299.2.1
---
common/shlibs | 2 +-
srcpkgs/libgedit-gtksourceview/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 70027dff33c66f..48bfbd16e888f7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3599,7 +3599,7 @@ libyang.so.1 libyang-1.0r5_1
libhtp.so.2 libhtp-0.5.30_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
+libgedit-gtksourceview-300.so.1 libgedit-gtksourceview-299.2.1_1
libgedit-gfls-1.so.0 libgedit-gfls-0.1.0_1
libchewing.so.3 libchewing-0.5.1_1
libdwarves.so.1 pahole-1.12_1
diff --git a/srcpkgs/libgedit-gtksourceview/template b/srcpkgs/libgedit-gtksourceview/template
index 0a8820d86b3a2f..d17785c420353e 100644
--- a/srcpkgs/libgedit-gtksourceview/template
+++ b/srcpkgs/libgedit-gtksourceview/template
@@ -1,6 +1,6 @@
# Template file for 'libgedit-gtksourceview'
pkgname=libgedit-gtksourceview
-version=299.0.5
+version=299.2.1
revision=1
build_helper="gir"
build_style=meson
@@ -14,7 +14,7 @@ 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
+checksum=f94ea579636d73b4a783b9ec43d77bc9a43d4b633b3bf9ba9d7a011cadb5cb92
make_check_pre="xvfb-run"
libgedit-gtksourceview-devel_package() {
From 677c205d911293c4246f929fe30db0e32b4e0942 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:27:04 +0300
Subject: [PATCH 3/6] tepl: rename to libgedit-tepl, update to 6.10.0
---
common/shlibs | 2 +-
srcpkgs/libgedit-tepl-devel | 1 +
srcpkgs/{tepl => libgedit-tepl}/template | 20 +++++++++++---------
srcpkgs/tepl-devel | 1 -
4 files changed, 13 insertions(+), 11 deletions(-)
create mode 120000 srcpkgs/libgedit-tepl-devel
rename srcpkgs/{tepl => libgedit-tepl}/template (60%)
delete mode 120000 srcpkgs/tepl-devel
diff --git a/common/shlibs b/common/shlibs
index 48bfbd16e888f7..b5d7345fd3c7da 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3479,7 +3479,6 @@ 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.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
@@ -3601,6 +3600,7 @@ libgedit-46.so gedit-46.1_1
libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1
libgedit-gtksourceview-300.so.1 libgedit-gtksourceview-299.2.1_1
libgedit-gfls-1.so.0 libgedit-gfls-0.1.0_1
+libgedit-tepl-6.so.0 libgedit-tepl-6.10.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-tepl-devel b/srcpkgs/libgedit-tepl-devel
new file mode 120000
index 00000000000000..3f11153a1d9c1a
--- /dev/null
+++ b/srcpkgs/libgedit-tepl-devel
@@ -0,0 +1 @@
+libgedit-tepl
\ No newline at end of file
diff --git a/srcpkgs/tepl/template b/srcpkgs/libgedit-tepl/template
similarity index 60%
rename from srcpkgs/tepl/template
rename to srcpkgs/libgedit-tepl/template
index ba6cda445a64d7..06282dcfeabded 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/libgedit-tepl/template
@@ -1,21 +1,23 @@
-# Template file for 'tepl'
-pkgname=tepl
-version=6.8.0
+# Template file for 'libgedit-tepl'
+pkgname=libgedit-tepl
+version=6.10.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="libgedit-amtk-devel libglib-devel libgedit-gtksourceview-devel gtk+3-devel
- libxml2-devel uchardet-devel gsettings-desktop-schemas-devel"
+ libxml2-devel uchardet-devel gsettings-desktop-schemas-devel
+ libgedit-gfls-devel libhandy1-devel"
checkdepends="xvfb-run"
short_desc="Text editor product line"
maintainer="Enno Boland <gottox@voidlinux.org>"
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=46e6e5f1bfdbc52e5956f06add575e9c7697c673d53d3803dfe768f490b560f0
+homepage="https://github.com/gedit-technology/libgedit-tepl"
+changelog="https://raw.githubusercontent.com/gedit-technology/libgedit-tepl/main/NEWS"
+distfiles="https://github.com/gedit-technology/libgedit-tepl/archive/${version}.tar.gz"
+#distfiles="${GNOME_SITE}/tepl/${version%.*}/tepl-${version}.tar.xz"
+checksum=44e120c9915a93362190f83161dd4dd37f3318d4f68b763dc6079edd5f8a470b
make_check_pre="xvfb-run"
build_options="gir gtk_doc"
@@ -25,7 +27,7 @@ if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" gtk_doc"
fi
-tepl-devel_package() {
+libgedit-tepl-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - developement files"
pkg_install() {
diff --git a/srcpkgs/tepl-devel b/srcpkgs/tepl-devel
deleted file mode 120000
index 9ae68b02eadd2b..00000000000000
--- a/srcpkgs/tepl-devel
+++ /dev/null
@@ -1 +0,0 @@
-tepl
\ No newline at end of file
From 44d388d746a384d1ee69e097f95360a2e5ac0c97 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:29:41 +0300
Subject: [PATCH 4/6] gedit: update to 47.0
---
common/shlibs | 2 +-
srcpkgs/gedit/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index b5d7345fd3c7da..63beab24fb251a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3596,7 +3596,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-46.so gedit-46.1_1
+libgedit-47.so gedit-47.0_1
libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1
libgedit-gtksourceview-300.so.1 libgedit-gtksourceview-299.2.1_1
libgedit-gfls-1.so.0 libgedit-gfls-0.1.0_1
diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index c14af986fcf758..33743270ed993a 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,7 +1,7 @@
# Template file for 'gedit'
# keep major version in sync with gedit-plugins
pkgname=gedit
-version=46.2
+version=47.0
revision=1
build_helper="gir"
build_style=meson
@@ -10,7 +10,7 @@ configure_args="-Dgtk_doc=false"
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"
+ libpeas-devel python3-gobject-devel libgedit-amtk-devel libgedit-tepl-devel"
depends="desktop-file-utils gsettings-desktop-schemas iso-codes"
short_desc="Text editor for GNOME"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -18,13 +18,13 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Gedit"
changelog="https://gitlab.gnome.org/GNOME/gedit/-/raw/${version}/NEWS"
distfiles="${GNOME_SITE}/gedit/${version%.*}/gedit-${version}.tar.xz"
-checksum=c0866412bad147ebace2d282ffcbb5a0e9a304b20fd55640bee21c81e6d501ef
+checksum=fa4a597e34c76d4ac91431b5ae6e191c96c6b0af1702e0899ab35199edfa1bfa
python_version=3
shlib_provides="libgedit-46.so"
gedit-devel_package() {
depends="${sourcepkg}>=${version}_${revision} gtk+3-devel libglib-devel
- libgedit-gtksourceview-devel libpeas-devel libgedit-amtk-devel tepl-devel"
+ libgedit-gtksourceview-devel libpeas-devel libgedit-amtk-devel libgedit-tepl-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 88d1ff2090bbb5322373f16aa7953aa276248239 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:29:48 +0300
Subject: [PATCH 5/6] gedit-plugins: update to 47.0
---
srcpkgs/gedit-plugins/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template
index f332e34d3802f8..f147bf2b20bcce 100644
--- a/srcpkgs/gedit-plugins/template
+++ b/srcpkgs/gedit-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'gedit-plugins'
# keep major version in sync with gedit
pkgname=gedit-plugins
-version=46.0
+version=47.0
revision=1
build_style=meson
pycompile_dirs="usr/lib/gedit/plugins"
@@ -16,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=db6b4aa72dac0190a8ae497f770f5a4ba66ae3cf1e03ea8b744e6101df09b251
+checksum=bb493af27561c2d553fe62e9aad5b3cd0c49f3df743dfc4acf6b3319e928f4a6
python_version=3
From d522a40eae98081e478c9850c9c394059e70f73f Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:30:16 +0300
Subject: [PATCH 6/6] gnome-latex: rebuild for libgedit-tepl
---
srcpkgs/gnome-latex/patches/fix-tepl.patch | 85 ++++++++++++++++++++++
srcpkgs/gnome-latex/template | 4 +-
2 files changed, 87 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gnome-latex/patches/fix-tepl.patch
diff --git a/srcpkgs/gnome-latex/patches/fix-tepl.patch b/srcpkgs/gnome-latex/patches/fix-tepl.patch
new file mode 100644
index 00000000000000..e82a44d925a983
--- /dev/null
+++ b/srcpkgs/gnome-latex/patches/fix-tepl.patch
@@ -0,0 +1,85 @@
+diff --git a/configure b/configure
+index a58dc5629..e01a8f4ec 100755
+--- a/configure
++++ b/configure
+@@ -14305,7 +14305,7 @@ if test -n "$DEP_CFLAGS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ \""; } >&5
+@@ -14314,7 +14314,7 @@ if test -n "$DEP_CFLAGS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ ") 2>&5
+@@ -14326,7 +14326,7 @@ if test -n "$DEP_CFLAGS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ " 2>/dev/null`
+@@ -14346,7 +14346,7 @@ if test -n "$DEP_LIBS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ \""; } >&5
+@@ -14355,7 +14355,7 @@ if test -n "$DEP_LIBS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ ") 2>&5
+@@ -14367,7 +14367,7 @@ if test -n "$DEP_LIBS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ " 2>/dev/null`
+@@ -14396,7 +14396,7 @@ fi
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ " 2>&1`
+@@ -14406,7 +14406,7 @@ fi
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ " 2>&1`
+@@ -14419,7 +14419,7 @@ fi
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ ) were not met:
diff --git a/srcpkgs/gnome-latex/template b/srcpkgs/gnome-latex/template
index 9784d71e54a246..10675875a753c1 100644
--- a/srcpkgs/gnome-latex/template
+++ b/srcpkgs/gnome-latex/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-latex'
pkgname=gnome-latex
version=3.46.0
-revision=1
+revision=2
build_helper="gir"
build_style=gnu-configure
configure_args="--disable-appstream-util --disable-dconf-migration
@@ -9,7 +9,7 @@ configure_args="--disable-appstream-util --disable-dconf-migration
hostmakedepends="glib-devel gettext itstool pkg-config vala
$(vopt_if gir gobject-introspection) gtk-doc"
makedepends="gsettings-desktop-schemas-devel gspell-devel libgedit-gtksourceview-devel
- gtk+3-devel libgee-devel libglib-devel tepl-devel"
+ gtk+3-devel libgee-devel libglib-devel libgedit-tepl-devel"
short_desc="LaTeX editor for the GNOME desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] gedit{,-plugins}: update to 47.0
2024-04-29 14:42 [PR PATCH] gedit{,-plugins}: update to 47.0 chrysos349
2024-04-29 14:51 ` [PR PATCH] [Updated] " chrysos349
@ 2024-04-29 15:26 ` chrysos349
2024-04-29 17:42 ` chrysos349
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: chrysos349 @ 2024-04-29 15:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 682 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/50113
gedit{,-plugins}: update to 47.0
@Gottox
`tepl` was renamed to `libgedit-tepl`.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### 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/50113.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gedit-50113.patch --]
[-- Type: text/x-diff, Size: 16229 bytes --]
From 59ff0dc68c4d942f7fadd0c05bb4227b5596f90c Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:22:34 +0300
Subject: [PATCH 1/6] New package: libgedit-gfls-0.1.0
---
common/shlibs | 1 +
srcpkgs/libgedit-gfls-devel | 1 +
srcpkgs/libgedit-gfls/template | 38 ++++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+)
create mode 120000 srcpkgs/libgedit-gfls-devel
create mode 100644 srcpkgs/libgedit-gfls/template
diff --git a/common/shlibs b/common/shlibs
index 105196bea39154..70027dff33c66f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3600,6 +3600,7 @@ libhtp.so.2 libhtp-0.5.30_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
+libgedit-gfls-1.so.0 libgedit-gfls-0.1.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-gfls-devel b/srcpkgs/libgedit-gfls-devel
new file mode 120000
index 00000000000000..6785d64ceca936
--- /dev/null
+++ b/srcpkgs/libgedit-gfls-devel
@@ -0,0 +1 @@
+libgedit-gfls
\ No newline at end of file
diff --git a/srcpkgs/libgedit-gfls/template b/srcpkgs/libgedit-gfls/template
new file mode 100644
index 00000000000000..2be694908c8d09
--- /dev/null
+++ b/srcpkgs/libgedit-gfls/template
@@ -0,0 +1,38 @@
+# Template file for 'libgedit-gfls'
+pkgname=libgedit-gfls
+version=0.1.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="Module dedicated to file loading and saving"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/gedit-technology/libgedit-gfls"
+distfiles="https://github.com/gedit-technology/libgedit-gfls/archive/${version}.tar.gz"
+checksum=9c658dd507c0daf12b34e735f1e6558561ed18f549c727976116add1272ef5e6
+
+build_options="gir gtk_doc"
+build_options_default="gir"
+
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
+libgedit-gfls-devel_package() {
+ depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - developement files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/*.so
+ 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 a9a2be27d45d937fcfffac5674ef3ed1ac40c33f Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:23:42 +0300
Subject: [PATCH 2/6] libgedit-gtksourceview: update to 299.2.1
---
common/shlibs | 2 +-
srcpkgs/libgedit-gtksourceview/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 70027dff33c66f..48bfbd16e888f7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3599,7 +3599,7 @@ libyang.so.1 libyang-1.0r5_1
libhtp.so.2 libhtp-0.5.30_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
+libgedit-gtksourceview-300.so.1 libgedit-gtksourceview-299.2.1_1
libgedit-gfls-1.so.0 libgedit-gfls-0.1.0_1
libchewing.so.3 libchewing-0.5.1_1
libdwarves.so.1 pahole-1.12_1
diff --git a/srcpkgs/libgedit-gtksourceview/template b/srcpkgs/libgedit-gtksourceview/template
index 0a8820d86b3a2f..d17785c420353e 100644
--- a/srcpkgs/libgedit-gtksourceview/template
+++ b/srcpkgs/libgedit-gtksourceview/template
@@ -1,6 +1,6 @@
# Template file for 'libgedit-gtksourceview'
pkgname=libgedit-gtksourceview
-version=299.0.5
+version=299.2.1
revision=1
build_helper="gir"
build_style=meson
@@ -14,7 +14,7 @@ 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
+checksum=f94ea579636d73b4a783b9ec43d77bc9a43d4b633b3bf9ba9d7a011cadb5cb92
make_check_pre="xvfb-run"
libgedit-gtksourceview-devel_package() {
From 8e8ab7d5341e9fb55080c8dbaaeffb5952a31fc7 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:27:04 +0300
Subject: [PATCH 3/6] tepl: rename to libgedit-tepl, update to 6.10.0
---
common/shlibs | 2 +-
srcpkgs/libgedit-tepl-devel | 1 +
srcpkgs/{tepl => libgedit-tepl}/template | 32 +++++++++++++++++-------
srcpkgs/tepl | 1 +
srcpkgs/tepl-devel | 2 +-
5 files changed, 27 insertions(+), 11 deletions(-)
create mode 120000 srcpkgs/libgedit-tepl-devel
rename srcpkgs/{tepl => libgedit-tepl}/template (52%)
create mode 120000 srcpkgs/tepl
diff --git a/common/shlibs b/common/shlibs
index 48bfbd16e888f7..b5d7345fd3c7da 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3479,7 +3479,6 @@ 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.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
@@ -3601,6 +3600,7 @@ libgedit-46.so gedit-46.1_1
libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1
libgedit-gtksourceview-300.so.1 libgedit-gtksourceview-299.2.1_1
libgedit-gfls-1.so.0 libgedit-gfls-0.1.0_1
+libgedit-tepl-6.so.0 libgedit-tepl-6.10.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-tepl-devel b/srcpkgs/libgedit-tepl-devel
new file mode 120000
index 00000000000000..3f11153a1d9c1a
--- /dev/null
+++ b/srcpkgs/libgedit-tepl-devel
@@ -0,0 +1 @@
+libgedit-tepl
\ No newline at end of file
diff --git a/srcpkgs/tepl/template b/srcpkgs/libgedit-tepl/template
similarity index 52%
rename from srcpkgs/tepl/template
rename to srcpkgs/libgedit-tepl/template
index ba6cda445a64d7..aec6220302e8da 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/libgedit-tepl/template
@@ -1,21 +1,23 @@
-# Template file for 'tepl'
-pkgname=tepl
-version=6.8.0
+# Template file for 'libgedit-tepl'
+pkgname=libgedit-tepl
+version=6.10.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="libgedit-amtk-devel libglib-devel libgedit-gtksourceview-devel gtk+3-devel
- libxml2-devel uchardet-devel gsettings-desktop-schemas-devel"
+ libxml2-devel uchardet-devel gsettings-desktop-schemas-devel
+ libgedit-gfls-devel libhandy1-devel"
checkdepends="xvfb-run"
short_desc="Text editor product line"
maintainer="Enno Boland <gottox@voidlinux.org>"
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=46e6e5f1bfdbc52e5956f06add575e9c7697c673d53d3803dfe768f490b560f0
+homepage="https://github.com/gedit-technology/libgedit-tepl"
+changelog="https://raw.githubusercontent.com/gedit-technology/libgedit-tepl/main/NEWS"
+distfiles="https://github.com/gedit-technology/libgedit-tepl/archive/${version}.tar.gz"
+#distfiles="${GNOME_SITE}/tepl/${version%.*}/tepl-${version}.tar.xz"
+checksum=44e120c9915a93362190f83161dd4dd37f3318d4f68b763dc6079edd5f8a470b
make_check_pre="xvfb-run"
build_options="gir gtk_doc"
@@ -25,7 +27,7 @@ if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" gtk_doc"
fi
-tepl-devel_package() {
+libgedit-tepl-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - developement files"
pkg_install() {
@@ -40,3 +42,15 @@ tepl-devel_package() {
fi
}
}
+
+tepl_package() {
+ depends="libgedit-tepl>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+tepl-devel_package() {
+ depends="libgedit-tepl-devel>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
diff --git a/srcpkgs/tepl b/srcpkgs/tepl
new file mode 120000
index 00000000000000..3f11153a1d9c1a
--- /dev/null
+++ b/srcpkgs/tepl
@@ -0,0 +1 @@
+libgedit-tepl
\ No newline at end of file
diff --git a/srcpkgs/tepl-devel b/srcpkgs/tepl-devel
index 9ae68b02eadd2b..3f11153a1d9c1a 120000
--- a/srcpkgs/tepl-devel
+++ b/srcpkgs/tepl-devel
@@ -1 +1 @@
-tepl
\ No newline at end of file
+libgedit-tepl
\ No newline at end of file
From 7dffb0885e1c94cdd4216446b9a68e145580d9a7 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:29:41 +0300
Subject: [PATCH 4/6] gedit: update to 47.0
---
common/shlibs | 2 +-
srcpkgs/gedit/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index b5d7345fd3c7da..63beab24fb251a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3596,7 +3596,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-46.so gedit-46.1_1
+libgedit-47.so gedit-47.0_1
libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1
libgedit-gtksourceview-300.so.1 libgedit-gtksourceview-299.2.1_1
libgedit-gfls-1.so.0 libgedit-gfls-0.1.0_1
diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index c14af986fcf758..33743270ed993a 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,7 +1,7 @@
# Template file for 'gedit'
# keep major version in sync with gedit-plugins
pkgname=gedit
-version=46.2
+version=47.0
revision=1
build_helper="gir"
build_style=meson
@@ -10,7 +10,7 @@ configure_args="-Dgtk_doc=false"
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"
+ libpeas-devel python3-gobject-devel libgedit-amtk-devel libgedit-tepl-devel"
depends="desktop-file-utils gsettings-desktop-schemas iso-codes"
short_desc="Text editor for GNOME"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -18,13 +18,13 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Gedit"
changelog="https://gitlab.gnome.org/GNOME/gedit/-/raw/${version}/NEWS"
distfiles="${GNOME_SITE}/gedit/${version%.*}/gedit-${version}.tar.xz"
-checksum=c0866412bad147ebace2d282ffcbb5a0e9a304b20fd55640bee21c81e6d501ef
+checksum=fa4a597e34c76d4ac91431b5ae6e191c96c6b0af1702e0899ab35199edfa1bfa
python_version=3
shlib_provides="libgedit-46.so"
gedit-devel_package() {
depends="${sourcepkg}>=${version}_${revision} gtk+3-devel libglib-devel
- libgedit-gtksourceview-devel libpeas-devel libgedit-amtk-devel tepl-devel"
+ libgedit-gtksourceview-devel libpeas-devel libgedit-amtk-devel libgedit-tepl-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 5d26faefa4637c5d955c48ed97a5aee9a1c6399d Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:29:48 +0300
Subject: [PATCH 5/6] gedit-plugins: update to 47.0
---
srcpkgs/gedit-plugins/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template
index f332e34d3802f8..f147bf2b20bcce 100644
--- a/srcpkgs/gedit-plugins/template
+++ b/srcpkgs/gedit-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'gedit-plugins'
# keep major version in sync with gedit
pkgname=gedit-plugins
-version=46.0
+version=47.0
revision=1
build_style=meson
pycompile_dirs="usr/lib/gedit/plugins"
@@ -16,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=db6b4aa72dac0190a8ae497f770f5a4ba66ae3cf1e03ea8b744e6101df09b251
+checksum=bb493af27561c2d553fe62e9aad5b3cd0c49f3df743dfc4acf6b3319e928f4a6
python_version=3
From 46d0da8a414e4503ad95ce75eba73e08131ebb11 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:30:16 +0300
Subject: [PATCH 6/6] gnome-latex: rebuild for libgedit-tepl
---
srcpkgs/gnome-latex/patches/fix-tepl.patch | 85 ++++++++++++++++++++++
srcpkgs/gnome-latex/template | 4 +-
2 files changed, 87 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gnome-latex/patches/fix-tepl.patch
diff --git a/srcpkgs/gnome-latex/patches/fix-tepl.patch b/srcpkgs/gnome-latex/patches/fix-tepl.patch
new file mode 100644
index 00000000000000..e82a44d925a983
--- /dev/null
+++ b/srcpkgs/gnome-latex/patches/fix-tepl.patch
@@ -0,0 +1,85 @@
+diff --git a/configure b/configure
+index a58dc5629..e01a8f4ec 100755
+--- a/configure
++++ b/configure
+@@ -14305,7 +14305,7 @@ if test -n "$DEP_CFLAGS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ \""; } >&5
+@@ -14314,7 +14314,7 @@ if test -n "$DEP_CFLAGS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ ") 2>&5
+@@ -14326,7 +14326,7 @@ if test -n "$DEP_CFLAGS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ " 2>/dev/null`
+@@ -14346,7 +14346,7 @@ if test -n "$DEP_LIBS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ \""; } >&5
+@@ -14355,7 +14355,7 @@ if test -n "$DEP_LIBS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ ") 2>&5
+@@ -14367,7 +14367,7 @@ if test -n "$DEP_LIBS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ " 2>/dev/null`
+@@ -14396,7 +14396,7 @@ fi
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ " 2>&1`
+@@ -14406,7 +14406,7 @@ fi
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ " 2>&1`
+@@ -14419,7 +14419,7 @@ fi
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ ) were not met:
diff --git a/srcpkgs/gnome-latex/template b/srcpkgs/gnome-latex/template
index 9784d71e54a246..10675875a753c1 100644
--- a/srcpkgs/gnome-latex/template
+++ b/srcpkgs/gnome-latex/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-latex'
pkgname=gnome-latex
version=3.46.0
-revision=1
+revision=2
build_helper="gir"
build_style=gnu-configure
configure_args="--disable-appstream-util --disable-dconf-migration
@@ -9,7 +9,7 @@ configure_args="--disable-appstream-util --disable-dconf-migration
hostmakedepends="glib-devel gettext itstool pkg-config vala
$(vopt_if gir gobject-introspection) gtk-doc"
makedepends="gsettings-desktop-schemas-devel gspell-devel libgedit-gtksourceview-devel
- gtk+3-devel libgee-devel libglib-devel tepl-devel"
+ gtk+3-devel libgee-devel libglib-devel libgedit-tepl-devel"
short_desc="LaTeX editor for the GNOME desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] gedit{,-plugins}: update to 47.0
2024-04-29 14:42 [PR PATCH] gedit{,-plugins}: update to 47.0 chrysos349
2024-04-29 14:51 ` [PR PATCH] [Updated] " chrysos349
2024-04-29 15:26 ` chrysos349
@ 2024-04-29 17:42 ` chrysos349
2024-05-08 19:30 ` chrysos349
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: chrysos349 @ 2024-04-29 17:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 682 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/50113
gedit{,-plugins}: update to 47.0
@Gottox
`tepl` was renamed to `libgedit-tepl`.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### 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/50113.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gedit-50113.patch --]
[-- Type: text/x-diff, Size: 16266 bytes --]
From 59ff0dc68c4d942f7fadd0c05bb4227b5596f90c Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:22:34 +0300
Subject: [PATCH 1/6] New package: libgedit-gfls-0.1.0
---
common/shlibs | 1 +
srcpkgs/libgedit-gfls-devel | 1 +
srcpkgs/libgedit-gfls/template | 38 ++++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+)
create mode 120000 srcpkgs/libgedit-gfls-devel
create mode 100644 srcpkgs/libgedit-gfls/template
diff --git a/common/shlibs b/common/shlibs
index 105196bea39154..70027dff33c66f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3600,6 +3600,7 @@ libhtp.so.2 libhtp-0.5.30_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
+libgedit-gfls-1.so.0 libgedit-gfls-0.1.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-gfls-devel b/srcpkgs/libgedit-gfls-devel
new file mode 120000
index 00000000000000..6785d64ceca936
--- /dev/null
+++ b/srcpkgs/libgedit-gfls-devel
@@ -0,0 +1 @@
+libgedit-gfls
\ No newline at end of file
diff --git a/srcpkgs/libgedit-gfls/template b/srcpkgs/libgedit-gfls/template
new file mode 100644
index 00000000000000..2be694908c8d09
--- /dev/null
+++ b/srcpkgs/libgedit-gfls/template
@@ -0,0 +1,38 @@
+# Template file for 'libgedit-gfls'
+pkgname=libgedit-gfls
+version=0.1.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="Module dedicated to file loading and saving"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/gedit-technology/libgedit-gfls"
+distfiles="https://github.com/gedit-technology/libgedit-gfls/archive/${version}.tar.gz"
+checksum=9c658dd507c0daf12b34e735f1e6558561ed18f549c727976116add1272ef5e6
+
+build_options="gir gtk_doc"
+build_options_default="gir"
+
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
+libgedit-gfls-devel_package() {
+ depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - developement files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/*.so
+ 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 a9a2be27d45d937fcfffac5674ef3ed1ac40c33f Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:23:42 +0300
Subject: [PATCH 2/6] libgedit-gtksourceview: update to 299.2.1
---
common/shlibs | 2 +-
srcpkgs/libgedit-gtksourceview/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 70027dff33c66f..48bfbd16e888f7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3599,7 +3599,7 @@ libyang.so.1 libyang-1.0r5_1
libhtp.so.2 libhtp-0.5.30_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
+libgedit-gtksourceview-300.so.1 libgedit-gtksourceview-299.2.1_1
libgedit-gfls-1.so.0 libgedit-gfls-0.1.0_1
libchewing.so.3 libchewing-0.5.1_1
libdwarves.so.1 pahole-1.12_1
diff --git a/srcpkgs/libgedit-gtksourceview/template b/srcpkgs/libgedit-gtksourceview/template
index 0a8820d86b3a2f..d17785c420353e 100644
--- a/srcpkgs/libgedit-gtksourceview/template
+++ b/srcpkgs/libgedit-gtksourceview/template
@@ -1,6 +1,6 @@
# Template file for 'libgedit-gtksourceview'
pkgname=libgedit-gtksourceview
-version=299.0.5
+version=299.2.1
revision=1
build_helper="gir"
build_style=meson
@@ -14,7 +14,7 @@ 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
+checksum=f94ea579636d73b4a783b9ec43d77bc9a43d4b633b3bf9ba9d7a011cadb5cb92
make_check_pre="xvfb-run"
libgedit-gtksourceview-devel_package() {
From 8e8ab7d5341e9fb55080c8dbaaeffb5952a31fc7 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:27:04 +0300
Subject: [PATCH 3/6] tepl: rename to libgedit-tepl, update to 6.10.0
---
common/shlibs | 2 +-
srcpkgs/libgedit-tepl-devel | 1 +
srcpkgs/{tepl => libgedit-tepl}/template | 32 +++++++++++++++++-------
srcpkgs/tepl | 1 +
srcpkgs/tepl-devel | 2 +-
5 files changed, 27 insertions(+), 11 deletions(-)
create mode 120000 srcpkgs/libgedit-tepl-devel
rename srcpkgs/{tepl => libgedit-tepl}/template (52%)
create mode 120000 srcpkgs/tepl
diff --git a/common/shlibs b/common/shlibs
index 48bfbd16e888f7..b5d7345fd3c7da 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3479,7 +3479,6 @@ 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.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
@@ -3601,6 +3600,7 @@ libgedit-46.so gedit-46.1_1
libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1
libgedit-gtksourceview-300.so.1 libgedit-gtksourceview-299.2.1_1
libgedit-gfls-1.so.0 libgedit-gfls-0.1.0_1
+libgedit-tepl-6.so.0 libgedit-tepl-6.10.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-tepl-devel b/srcpkgs/libgedit-tepl-devel
new file mode 120000
index 00000000000000..3f11153a1d9c1a
--- /dev/null
+++ b/srcpkgs/libgedit-tepl-devel
@@ -0,0 +1 @@
+libgedit-tepl
\ No newline at end of file
diff --git a/srcpkgs/tepl/template b/srcpkgs/libgedit-tepl/template
similarity index 52%
rename from srcpkgs/tepl/template
rename to srcpkgs/libgedit-tepl/template
index ba6cda445a64d7..aec6220302e8da 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/libgedit-tepl/template
@@ -1,21 +1,23 @@
-# Template file for 'tepl'
-pkgname=tepl
-version=6.8.0
+# Template file for 'libgedit-tepl'
+pkgname=libgedit-tepl
+version=6.10.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="libgedit-amtk-devel libglib-devel libgedit-gtksourceview-devel gtk+3-devel
- libxml2-devel uchardet-devel gsettings-desktop-schemas-devel"
+ libxml2-devel uchardet-devel gsettings-desktop-schemas-devel
+ libgedit-gfls-devel libhandy1-devel"
checkdepends="xvfb-run"
short_desc="Text editor product line"
maintainer="Enno Boland <gottox@voidlinux.org>"
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=46e6e5f1bfdbc52e5956f06add575e9c7697c673d53d3803dfe768f490b560f0
+homepage="https://github.com/gedit-technology/libgedit-tepl"
+changelog="https://raw.githubusercontent.com/gedit-technology/libgedit-tepl/main/NEWS"
+distfiles="https://github.com/gedit-technology/libgedit-tepl/archive/${version}.tar.gz"
+#distfiles="${GNOME_SITE}/tepl/${version%.*}/tepl-${version}.tar.xz"
+checksum=44e120c9915a93362190f83161dd4dd37f3318d4f68b763dc6079edd5f8a470b
make_check_pre="xvfb-run"
build_options="gir gtk_doc"
@@ -25,7 +27,7 @@ if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" gtk_doc"
fi
-tepl-devel_package() {
+libgedit-tepl-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - developement files"
pkg_install() {
@@ -40,3 +42,15 @@ tepl-devel_package() {
fi
}
}
+
+tepl_package() {
+ depends="libgedit-tepl>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+tepl-devel_package() {
+ depends="libgedit-tepl-devel>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
diff --git a/srcpkgs/tepl b/srcpkgs/tepl
new file mode 120000
index 00000000000000..3f11153a1d9c1a
--- /dev/null
+++ b/srcpkgs/tepl
@@ -0,0 +1 @@
+libgedit-tepl
\ No newline at end of file
diff --git a/srcpkgs/tepl-devel b/srcpkgs/tepl-devel
index 9ae68b02eadd2b..3f11153a1d9c1a 120000
--- a/srcpkgs/tepl-devel
+++ b/srcpkgs/tepl-devel
@@ -1 +1 @@
-tepl
\ No newline at end of file
+libgedit-tepl
\ No newline at end of file
From b70d5ae5ffc1cdca238b1246ab49a4bcb60b5f0b Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:29:41 +0300
Subject: [PATCH 4/6] gedit: update to 47.0
---
common/shlibs | 2 +-
srcpkgs/gedit/template | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index b5d7345fd3c7da..63beab24fb251a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3596,7 +3596,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-46.so gedit-46.1_1
+libgedit-47.so gedit-47.0_1
libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1
libgedit-gtksourceview-300.so.1 libgedit-gtksourceview-299.2.1_1
libgedit-gfls-1.so.0 libgedit-gfls-0.1.0_1
diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index c14af986fcf758..ca3cdbb92e43b8 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,7 +1,7 @@
# Template file for 'gedit'
# keep major version in sync with gedit-plugins
pkgname=gedit
-version=46.2
+version=47.0
revision=1
build_helper="gir"
build_style=meson
@@ -10,7 +10,7 @@ configure_args="-Dgtk_doc=false"
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"
+ libpeas-devel python3-gobject-devel libgedit-amtk-devel libgedit-tepl-devel"
depends="desktop-file-utils gsettings-desktop-schemas iso-codes"
short_desc="Text editor for GNOME"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -18,13 +18,13 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Gedit"
changelog="https://gitlab.gnome.org/GNOME/gedit/-/raw/${version}/NEWS"
distfiles="${GNOME_SITE}/gedit/${version%.*}/gedit-${version}.tar.xz"
-checksum=c0866412bad147ebace2d282ffcbb5a0e9a304b20fd55640bee21c81e6d501ef
+checksum=fa4a597e34c76d4ac91431b5ae6e191c96c6b0af1702e0899ab35199edfa1bfa
python_version=3
-shlib_provides="libgedit-46.so"
+shlib_provides="libgedit-47.so"
gedit-devel_package() {
depends="${sourcepkg}>=${version}_${revision} gtk+3-devel libglib-devel
- libgedit-gtksourceview-devel libpeas-devel libgedit-amtk-devel tepl-devel"
+ libgedit-gtksourceview-devel libpeas-devel libgedit-amtk-devel libgedit-tepl-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 27314577a0b35c99a426b3b7cd414b8255c3dc34 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:29:48 +0300
Subject: [PATCH 5/6] gedit-plugins: update to 47.0
---
srcpkgs/gedit-plugins/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template
index f332e34d3802f8..f147bf2b20bcce 100644
--- a/srcpkgs/gedit-plugins/template
+++ b/srcpkgs/gedit-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'gedit-plugins'
# keep major version in sync with gedit
pkgname=gedit-plugins
-version=46.0
+version=47.0
revision=1
build_style=meson
pycompile_dirs="usr/lib/gedit/plugins"
@@ -16,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=db6b4aa72dac0190a8ae497f770f5a4ba66ae3cf1e03ea8b744e6101df09b251
+checksum=bb493af27561c2d553fe62e9aad5b3cd0c49f3df743dfc4acf6b3319e928f4a6
python_version=3
From 5d93fb8c3bcdd7f665f37bba360526b9ee42f318 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:30:16 +0300
Subject: [PATCH 6/6] gnome-latex: rebuild for libgedit-tepl
---
srcpkgs/gnome-latex/patches/fix-tepl.patch | 85 ++++++++++++++++++++++
srcpkgs/gnome-latex/template | 4 +-
2 files changed, 87 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gnome-latex/patches/fix-tepl.patch
diff --git a/srcpkgs/gnome-latex/patches/fix-tepl.patch b/srcpkgs/gnome-latex/patches/fix-tepl.patch
new file mode 100644
index 00000000000000..e82a44d925a983
--- /dev/null
+++ b/srcpkgs/gnome-latex/patches/fix-tepl.patch
@@ -0,0 +1,85 @@
+diff --git a/configure b/configure
+index a58dc5629..e01a8f4ec 100755
+--- a/configure
++++ b/configure
+@@ -14305,7 +14305,7 @@ if test -n "$DEP_CFLAGS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ \""; } >&5
+@@ -14314,7 +14314,7 @@ if test -n "$DEP_CFLAGS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ ") 2>&5
+@@ -14326,7 +14326,7 @@ if test -n "$DEP_CFLAGS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ " 2>/dev/null`
+@@ -14346,7 +14346,7 @@ if test -n "$DEP_LIBS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ \""; } >&5
+@@ -14355,7 +14355,7 @@ if test -n "$DEP_LIBS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ ") 2>&5
+@@ -14367,7 +14367,7 @@ if test -n "$DEP_LIBS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ " 2>/dev/null`
+@@ -14396,7 +14396,7 @@ fi
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ " 2>&1`
+@@ -14406,7 +14406,7 @@ fi
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ " 2>&1`
+@@ -14419,7 +14419,7 @@ fi
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ ) were not met:
diff --git a/srcpkgs/gnome-latex/template b/srcpkgs/gnome-latex/template
index 9784d71e54a246..10675875a753c1 100644
--- a/srcpkgs/gnome-latex/template
+++ b/srcpkgs/gnome-latex/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-latex'
pkgname=gnome-latex
version=3.46.0
-revision=1
+revision=2
build_helper="gir"
build_style=gnu-configure
configure_args="--disable-appstream-util --disable-dconf-migration
@@ -9,7 +9,7 @@ configure_args="--disable-appstream-util --disable-dconf-migration
hostmakedepends="glib-devel gettext itstool pkg-config vala
$(vopt_if gir gobject-introspection) gtk-doc"
makedepends="gsettings-desktop-schemas-devel gspell-devel libgedit-gtksourceview-devel
- gtk+3-devel libgee-devel libglib-devel tepl-devel"
+ gtk+3-devel libgee-devel libglib-devel libgedit-tepl-devel"
short_desc="LaTeX editor for the GNOME desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] gedit{,-plugins}: update to 47.0
2024-04-29 14:42 [PR PATCH] gedit{,-plugins}: update to 47.0 chrysos349
` (2 preceding siblings ...)
2024-04-29 17:42 ` chrysos349
@ 2024-05-08 19:30 ` chrysos349
2024-05-09 6:15 ` chrysos349
2024-05-11 7:00 ` mtboehlke
5 siblings, 0 replies; 7+ messages in thread
From: chrysos349 @ 2024-05-08 19:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 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/50113
gedit{,-plugins}: update to 47.0
@Gottox
@mtboehlke
`tepl` was renamed to `libgedit-tepl`.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### 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/50113.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gedit-50113.patch --]
[-- Type: text/x-diff, Size: 16266 bytes --]
From a78fb2f7d25eda0f85b529f800721b68468d54ec Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:22:34 +0300
Subject: [PATCH 1/6] New package: libgedit-gfls-0.1.0
---
common/shlibs | 1 +
srcpkgs/libgedit-gfls-devel | 1 +
srcpkgs/libgedit-gfls/template | 38 ++++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+)
create mode 120000 srcpkgs/libgedit-gfls-devel
create mode 100644 srcpkgs/libgedit-gfls/template
diff --git a/common/shlibs b/common/shlibs
index 97d9664b9da84e..ed68647a7417fe 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3607,6 +3607,7 @@ libhtp.so.2 libhtp-0.5.30_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
+libgedit-gfls-1.so.0 libgedit-gfls-0.1.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-gfls-devel b/srcpkgs/libgedit-gfls-devel
new file mode 120000
index 00000000000000..6785d64ceca936
--- /dev/null
+++ b/srcpkgs/libgedit-gfls-devel
@@ -0,0 +1 @@
+libgedit-gfls
\ No newline at end of file
diff --git a/srcpkgs/libgedit-gfls/template b/srcpkgs/libgedit-gfls/template
new file mode 100644
index 00000000000000..2be694908c8d09
--- /dev/null
+++ b/srcpkgs/libgedit-gfls/template
@@ -0,0 +1,38 @@
+# Template file for 'libgedit-gfls'
+pkgname=libgedit-gfls
+version=0.1.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="Module dedicated to file loading and saving"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/gedit-technology/libgedit-gfls"
+distfiles="https://github.com/gedit-technology/libgedit-gfls/archive/${version}.tar.gz"
+checksum=9c658dd507c0daf12b34e735f1e6558561ed18f549c727976116add1272ef5e6
+
+build_options="gir gtk_doc"
+build_options_default="gir"
+
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
+libgedit-gfls-devel_package() {
+ depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - developement files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/*.so
+ 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 99b8215947826e63d2cf18a5b27109a6a69e634c Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:23:42 +0300
Subject: [PATCH 2/6] libgedit-gtksourceview: update to 299.2.1
---
common/shlibs | 2 +-
srcpkgs/libgedit-gtksourceview/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index ed68647a7417fe..3a710ffbbbf75a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3606,7 +3606,7 @@ libyang.so.1 libyang-1.0r5_1
libhtp.so.2 libhtp-0.5.30_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
+libgedit-gtksourceview-300.so.1 libgedit-gtksourceview-299.2.1_1
libgedit-gfls-1.so.0 libgedit-gfls-0.1.0_1
libchewing.so.3 libchewing-0.5.1_1
libdwarves.so.1 pahole-1.12_1
diff --git a/srcpkgs/libgedit-gtksourceview/template b/srcpkgs/libgedit-gtksourceview/template
index 0a8820d86b3a2f..d17785c420353e 100644
--- a/srcpkgs/libgedit-gtksourceview/template
+++ b/srcpkgs/libgedit-gtksourceview/template
@@ -1,6 +1,6 @@
# Template file for 'libgedit-gtksourceview'
pkgname=libgedit-gtksourceview
-version=299.0.5
+version=299.2.1
revision=1
build_helper="gir"
build_style=meson
@@ -14,7 +14,7 @@ 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
+checksum=f94ea579636d73b4a783b9ec43d77bc9a43d4b633b3bf9ba9d7a011cadb5cb92
make_check_pre="xvfb-run"
libgedit-gtksourceview-devel_package() {
From bc58126eb8205071597e51892f8405361d4e454a Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:27:04 +0300
Subject: [PATCH 3/6] tepl: rename to libgedit-tepl, update to 6.10.0
---
common/shlibs | 2 +-
srcpkgs/libgedit-tepl-devel | 1 +
srcpkgs/{tepl => libgedit-tepl}/template | 32 +++++++++++++++++-------
srcpkgs/tepl | 1 +
srcpkgs/tepl-devel | 2 +-
5 files changed, 27 insertions(+), 11 deletions(-)
create mode 120000 srcpkgs/libgedit-tepl-devel
rename srcpkgs/{tepl => libgedit-tepl}/template (52%)
create mode 120000 srcpkgs/tepl
diff --git a/common/shlibs b/common/shlibs
index 3a710ffbbbf75a..4f2717dedfddbd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3486,7 +3486,6 @@ 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.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
@@ -3608,6 +3607,7 @@ libgedit-46.so gedit-46.1_1
libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1
libgedit-gtksourceview-300.so.1 libgedit-gtksourceview-299.2.1_1
libgedit-gfls-1.so.0 libgedit-gfls-0.1.0_1
+libgedit-tepl-6.so.0 libgedit-tepl-6.10.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-tepl-devel b/srcpkgs/libgedit-tepl-devel
new file mode 120000
index 00000000000000..3f11153a1d9c1a
--- /dev/null
+++ b/srcpkgs/libgedit-tepl-devel
@@ -0,0 +1 @@
+libgedit-tepl
\ No newline at end of file
diff --git a/srcpkgs/tepl/template b/srcpkgs/libgedit-tepl/template
similarity index 52%
rename from srcpkgs/tepl/template
rename to srcpkgs/libgedit-tepl/template
index ba6cda445a64d7..aec6220302e8da 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/libgedit-tepl/template
@@ -1,21 +1,23 @@
-# Template file for 'tepl'
-pkgname=tepl
-version=6.8.0
+# Template file for 'libgedit-tepl'
+pkgname=libgedit-tepl
+version=6.10.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="libgedit-amtk-devel libglib-devel libgedit-gtksourceview-devel gtk+3-devel
- libxml2-devel uchardet-devel gsettings-desktop-schemas-devel"
+ libxml2-devel uchardet-devel gsettings-desktop-schemas-devel
+ libgedit-gfls-devel libhandy1-devel"
checkdepends="xvfb-run"
short_desc="Text editor product line"
maintainer="Enno Boland <gottox@voidlinux.org>"
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=46e6e5f1bfdbc52e5956f06add575e9c7697c673d53d3803dfe768f490b560f0
+homepage="https://github.com/gedit-technology/libgedit-tepl"
+changelog="https://raw.githubusercontent.com/gedit-technology/libgedit-tepl/main/NEWS"
+distfiles="https://github.com/gedit-technology/libgedit-tepl/archive/${version}.tar.gz"
+#distfiles="${GNOME_SITE}/tepl/${version%.*}/tepl-${version}.tar.xz"
+checksum=44e120c9915a93362190f83161dd4dd37f3318d4f68b763dc6079edd5f8a470b
make_check_pre="xvfb-run"
build_options="gir gtk_doc"
@@ -25,7 +27,7 @@ if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" gtk_doc"
fi
-tepl-devel_package() {
+libgedit-tepl-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - developement files"
pkg_install() {
@@ -40,3 +42,15 @@ tepl-devel_package() {
fi
}
}
+
+tepl_package() {
+ depends="libgedit-tepl>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+tepl-devel_package() {
+ depends="libgedit-tepl-devel>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
diff --git a/srcpkgs/tepl b/srcpkgs/tepl
new file mode 120000
index 00000000000000..3f11153a1d9c1a
--- /dev/null
+++ b/srcpkgs/tepl
@@ -0,0 +1 @@
+libgedit-tepl
\ No newline at end of file
diff --git a/srcpkgs/tepl-devel b/srcpkgs/tepl-devel
index 9ae68b02eadd2b..3f11153a1d9c1a 120000
--- a/srcpkgs/tepl-devel
+++ b/srcpkgs/tepl-devel
@@ -1 +1 @@
-tepl
\ No newline at end of file
+libgedit-tepl
\ No newline at end of file
From e5570cf4d772a21ae1bf3341868a864441430bd4 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:29:41 +0300
Subject: [PATCH 4/6] gedit: update to 47.0
---
common/shlibs | 2 +-
srcpkgs/gedit/template | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 4f2717dedfddbd..43dedd874e695f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3603,7 +3603,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-46.so gedit-46.1_1
+libgedit-47.so gedit-47.0_1
libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1
libgedit-gtksourceview-300.so.1 libgedit-gtksourceview-299.2.1_1
libgedit-gfls-1.so.0 libgedit-gfls-0.1.0_1
diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index c14af986fcf758..ca3cdbb92e43b8 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,7 +1,7 @@
# Template file for 'gedit'
# keep major version in sync with gedit-plugins
pkgname=gedit
-version=46.2
+version=47.0
revision=1
build_helper="gir"
build_style=meson
@@ -10,7 +10,7 @@ configure_args="-Dgtk_doc=false"
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"
+ libpeas-devel python3-gobject-devel libgedit-amtk-devel libgedit-tepl-devel"
depends="desktop-file-utils gsettings-desktop-schemas iso-codes"
short_desc="Text editor for GNOME"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -18,13 +18,13 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Gedit"
changelog="https://gitlab.gnome.org/GNOME/gedit/-/raw/${version}/NEWS"
distfiles="${GNOME_SITE}/gedit/${version%.*}/gedit-${version}.tar.xz"
-checksum=c0866412bad147ebace2d282ffcbb5a0e9a304b20fd55640bee21c81e6d501ef
+checksum=fa4a597e34c76d4ac91431b5ae6e191c96c6b0af1702e0899ab35199edfa1bfa
python_version=3
-shlib_provides="libgedit-46.so"
+shlib_provides="libgedit-47.so"
gedit-devel_package() {
depends="${sourcepkg}>=${version}_${revision} gtk+3-devel libglib-devel
- libgedit-gtksourceview-devel libpeas-devel libgedit-amtk-devel tepl-devel"
+ libgedit-gtksourceview-devel libpeas-devel libgedit-amtk-devel libgedit-tepl-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 9919639ed702940075540e66481630bee26cbdae Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:29:48 +0300
Subject: [PATCH 5/6] gedit-plugins: update to 47.1
---
srcpkgs/gedit-plugins/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template
index f332e34d3802f8..905503a5b92728 100644
--- a/srcpkgs/gedit-plugins/template
+++ b/srcpkgs/gedit-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'gedit-plugins'
# keep major version in sync with gedit
pkgname=gedit-plugins
-version=46.0
+version=47.1
revision=1
build_style=meson
pycompile_dirs="usr/lib/gedit/plugins"
@@ -16,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=db6b4aa72dac0190a8ae497f770f5a4ba66ae3cf1e03ea8b744e6101df09b251
+checksum=af9d63e5822ac08c68e3b898bb58e7debc1bfeaaca1077f5a8e795d25a164c8b
python_version=3
From c813965d7c26ab517a915289f678ec301ac0fdb8 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:30:16 +0300
Subject: [PATCH 6/6] gnome-latex: rebuild for libgedit-tepl
---
srcpkgs/gnome-latex/patches/fix-tepl.patch | 85 ++++++++++++++++++++++
srcpkgs/gnome-latex/template | 4 +-
2 files changed, 87 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gnome-latex/patches/fix-tepl.patch
diff --git a/srcpkgs/gnome-latex/patches/fix-tepl.patch b/srcpkgs/gnome-latex/patches/fix-tepl.patch
new file mode 100644
index 00000000000000..e82a44d925a983
--- /dev/null
+++ b/srcpkgs/gnome-latex/patches/fix-tepl.patch
@@ -0,0 +1,85 @@
+diff --git a/configure b/configure
+index a58dc5629..e01a8f4ec 100755
+--- a/configure
++++ b/configure
+@@ -14305,7 +14305,7 @@ if test -n "$DEP_CFLAGS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ \""; } >&5
+@@ -14314,7 +14314,7 @@ if test -n "$DEP_CFLAGS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ ") 2>&5
+@@ -14326,7 +14326,7 @@ if test -n "$DEP_CFLAGS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ " 2>/dev/null`
+@@ -14346,7 +14346,7 @@ if test -n "$DEP_LIBS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ \""; } >&5
+@@ -14355,7 +14355,7 @@ if test -n "$DEP_LIBS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ ") 2>&5
+@@ -14367,7 +14367,7 @@ if test -n "$DEP_LIBS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ " 2>/dev/null`
+@@ -14396,7 +14396,7 @@ fi
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ " 2>&1`
+@@ -14406,7 +14406,7 @@ fi
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ " 2>&1`
+@@ -14419,7 +14419,7 @@ fi
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ ) were not met:
diff --git a/srcpkgs/gnome-latex/template b/srcpkgs/gnome-latex/template
index 9784d71e54a246..10675875a753c1 100644
--- a/srcpkgs/gnome-latex/template
+++ b/srcpkgs/gnome-latex/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-latex'
pkgname=gnome-latex
version=3.46.0
-revision=1
+revision=2
build_helper="gir"
build_style=gnu-configure
configure_args="--disable-appstream-util --disable-dconf-migration
@@ -9,7 +9,7 @@ configure_args="--disable-appstream-util --disable-dconf-migration
hostmakedepends="glib-devel gettext itstool pkg-config vala
$(vopt_if gir gobject-introspection) gtk-doc"
makedepends="gsettings-desktop-schemas-devel gspell-devel libgedit-gtksourceview-devel
- gtk+3-devel libgee-devel libglib-devel tepl-devel"
+ gtk+3-devel libgee-devel libglib-devel libgedit-tepl-devel"
short_desc="LaTeX editor for the GNOME desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] gedit{,-plugins}: update to 47.0
2024-04-29 14:42 [PR PATCH] gedit{,-plugins}: update to 47.0 chrysos349
` (3 preceding siblings ...)
2024-05-08 19:30 ` chrysos349
@ 2024-05-09 6:15 ` chrysos349
2024-05-11 7:00 ` mtboehlke
5 siblings, 0 replies; 7+ messages in thread
From: chrysos349 @ 2024-05-09 6:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 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/50113
gedit{,-plugins}: update to 47.0
@Gottox
@mtboehlke
`tepl` was renamed to `libgedit-tepl`.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### 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/50113.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gedit-50113.patch --]
[-- Type: text/x-diff, Size: 16266 bytes --]
From 8c48eea1279513d8fbda2777b24f064fde398dca Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:22:34 +0300
Subject: [PATCH 1/6] New package: libgedit-gfls-0.1.0
---
common/shlibs | 1 +
srcpkgs/libgedit-gfls-devel | 1 +
srcpkgs/libgedit-gfls/template | 38 ++++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+)
create mode 120000 srcpkgs/libgedit-gfls-devel
create mode 100644 srcpkgs/libgedit-gfls/template
diff --git a/common/shlibs b/common/shlibs
index 97d9664b9da84e..ed68647a7417fe 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3607,6 +3607,7 @@ libhtp.so.2 libhtp-0.5.30_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
+libgedit-gfls-1.so.0 libgedit-gfls-0.1.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-gfls-devel b/srcpkgs/libgedit-gfls-devel
new file mode 120000
index 00000000000000..6785d64ceca936
--- /dev/null
+++ b/srcpkgs/libgedit-gfls-devel
@@ -0,0 +1 @@
+libgedit-gfls
\ No newline at end of file
diff --git a/srcpkgs/libgedit-gfls/template b/srcpkgs/libgedit-gfls/template
new file mode 100644
index 00000000000000..2be694908c8d09
--- /dev/null
+++ b/srcpkgs/libgedit-gfls/template
@@ -0,0 +1,38 @@
+# Template file for 'libgedit-gfls'
+pkgname=libgedit-gfls
+version=0.1.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="Module dedicated to file loading and saving"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/gedit-technology/libgedit-gfls"
+distfiles="https://github.com/gedit-technology/libgedit-gfls/archive/${version}.tar.gz"
+checksum=9c658dd507c0daf12b34e735f1e6558561ed18f549c727976116add1272ef5e6
+
+build_options="gir gtk_doc"
+build_options_default="gir"
+
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
+libgedit-gfls-devel_package() {
+ depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - developement files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/*.so
+ 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 cf8dcfd00050e555b5d6b0fee11e9b574f4b0f9e Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:23:42 +0300
Subject: [PATCH 2/6] libgedit-gtksourceview: update to 299.2.1
---
common/shlibs | 2 +-
srcpkgs/libgedit-gtksourceview/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index ed68647a7417fe..3a710ffbbbf75a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3606,7 +3606,7 @@ libyang.so.1 libyang-1.0r5_1
libhtp.so.2 libhtp-0.5.30_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
+libgedit-gtksourceview-300.so.1 libgedit-gtksourceview-299.2.1_1
libgedit-gfls-1.so.0 libgedit-gfls-0.1.0_1
libchewing.so.3 libchewing-0.5.1_1
libdwarves.so.1 pahole-1.12_1
diff --git a/srcpkgs/libgedit-gtksourceview/template b/srcpkgs/libgedit-gtksourceview/template
index 0a8820d86b3a2f..d17785c420353e 100644
--- a/srcpkgs/libgedit-gtksourceview/template
+++ b/srcpkgs/libgedit-gtksourceview/template
@@ -1,6 +1,6 @@
# Template file for 'libgedit-gtksourceview'
pkgname=libgedit-gtksourceview
-version=299.0.5
+version=299.2.1
revision=1
build_helper="gir"
build_style=meson
@@ -14,7 +14,7 @@ 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
+checksum=f94ea579636d73b4a783b9ec43d77bc9a43d4b633b3bf9ba9d7a011cadb5cb92
make_check_pre="xvfb-run"
libgedit-gtksourceview-devel_package() {
From 32fb116efec91577e520eea7cfc8a1947e1e4163 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:27:04 +0300
Subject: [PATCH 3/6] tepl: rename to libgedit-tepl, update to 6.10.0
---
common/shlibs | 2 +-
srcpkgs/libgedit-tepl-devel | 1 +
srcpkgs/{tepl => libgedit-tepl}/template | 32 +++++++++++++++++-------
srcpkgs/tepl | 1 +
srcpkgs/tepl-devel | 2 +-
5 files changed, 27 insertions(+), 11 deletions(-)
create mode 120000 srcpkgs/libgedit-tepl-devel
rename srcpkgs/{tepl => libgedit-tepl}/template (52%)
create mode 120000 srcpkgs/tepl
diff --git a/common/shlibs b/common/shlibs
index 3a710ffbbbf75a..4f2717dedfddbd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3486,7 +3486,6 @@ 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.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
@@ -3608,6 +3607,7 @@ libgedit-46.so gedit-46.1_1
libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1
libgedit-gtksourceview-300.so.1 libgedit-gtksourceview-299.2.1_1
libgedit-gfls-1.so.0 libgedit-gfls-0.1.0_1
+libgedit-tepl-6.so.0 libgedit-tepl-6.10.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-tepl-devel b/srcpkgs/libgedit-tepl-devel
new file mode 120000
index 00000000000000..3f11153a1d9c1a
--- /dev/null
+++ b/srcpkgs/libgedit-tepl-devel
@@ -0,0 +1 @@
+libgedit-tepl
\ No newline at end of file
diff --git a/srcpkgs/tepl/template b/srcpkgs/libgedit-tepl/template
similarity index 52%
rename from srcpkgs/tepl/template
rename to srcpkgs/libgedit-tepl/template
index ba6cda445a64d7..aec6220302e8da 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/libgedit-tepl/template
@@ -1,21 +1,23 @@
-# Template file for 'tepl'
-pkgname=tepl
-version=6.8.0
+# Template file for 'libgedit-tepl'
+pkgname=libgedit-tepl
+version=6.10.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="libgedit-amtk-devel libglib-devel libgedit-gtksourceview-devel gtk+3-devel
- libxml2-devel uchardet-devel gsettings-desktop-schemas-devel"
+ libxml2-devel uchardet-devel gsettings-desktop-schemas-devel
+ libgedit-gfls-devel libhandy1-devel"
checkdepends="xvfb-run"
short_desc="Text editor product line"
maintainer="Enno Boland <gottox@voidlinux.org>"
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=46e6e5f1bfdbc52e5956f06add575e9c7697c673d53d3803dfe768f490b560f0
+homepage="https://github.com/gedit-technology/libgedit-tepl"
+changelog="https://raw.githubusercontent.com/gedit-technology/libgedit-tepl/main/NEWS"
+distfiles="https://github.com/gedit-technology/libgedit-tepl/archive/${version}.tar.gz"
+#distfiles="${GNOME_SITE}/tepl/${version%.*}/tepl-${version}.tar.xz"
+checksum=44e120c9915a93362190f83161dd4dd37f3318d4f68b763dc6079edd5f8a470b
make_check_pre="xvfb-run"
build_options="gir gtk_doc"
@@ -25,7 +27,7 @@ if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" gtk_doc"
fi
-tepl-devel_package() {
+libgedit-tepl-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - developement files"
pkg_install() {
@@ -40,3 +42,15 @@ tepl-devel_package() {
fi
}
}
+
+tepl_package() {
+ depends="libgedit-tepl>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+tepl-devel_package() {
+ depends="libgedit-tepl-devel>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
diff --git a/srcpkgs/tepl b/srcpkgs/tepl
new file mode 120000
index 00000000000000..3f11153a1d9c1a
--- /dev/null
+++ b/srcpkgs/tepl
@@ -0,0 +1 @@
+libgedit-tepl
\ No newline at end of file
diff --git a/srcpkgs/tepl-devel b/srcpkgs/tepl-devel
index 9ae68b02eadd2b..3f11153a1d9c1a 120000
--- a/srcpkgs/tepl-devel
+++ b/srcpkgs/tepl-devel
@@ -1 +1 @@
-tepl
\ No newline at end of file
+libgedit-tepl
\ No newline at end of file
From 5f762ed9944272bf43e978dd6c2bf2187ad6f478 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:29:41 +0300
Subject: [PATCH 4/6] gedit: update to 47.0
---
common/shlibs | 2 +-
srcpkgs/gedit/template | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 4f2717dedfddbd..43dedd874e695f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3603,7 +3603,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-46.so gedit-46.1_1
+libgedit-47.so gedit-47.0_1
libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1
libgedit-gtksourceview-300.so.1 libgedit-gtksourceview-299.2.1_1
libgedit-gfls-1.so.0 libgedit-gfls-0.1.0_1
diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index c14af986fcf758..ca3cdbb92e43b8 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,7 +1,7 @@
# Template file for 'gedit'
# keep major version in sync with gedit-plugins
pkgname=gedit
-version=46.2
+version=47.0
revision=1
build_helper="gir"
build_style=meson
@@ -10,7 +10,7 @@ configure_args="-Dgtk_doc=false"
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"
+ libpeas-devel python3-gobject-devel libgedit-amtk-devel libgedit-tepl-devel"
depends="desktop-file-utils gsettings-desktop-schemas iso-codes"
short_desc="Text editor for GNOME"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -18,13 +18,13 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Gedit"
changelog="https://gitlab.gnome.org/GNOME/gedit/-/raw/${version}/NEWS"
distfiles="${GNOME_SITE}/gedit/${version%.*}/gedit-${version}.tar.xz"
-checksum=c0866412bad147ebace2d282ffcbb5a0e9a304b20fd55640bee21c81e6d501ef
+checksum=fa4a597e34c76d4ac91431b5ae6e191c96c6b0af1702e0899ab35199edfa1bfa
python_version=3
-shlib_provides="libgedit-46.so"
+shlib_provides="libgedit-47.so"
gedit-devel_package() {
depends="${sourcepkg}>=${version}_${revision} gtk+3-devel libglib-devel
- libgedit-gtksourceview-devel libpeas-devel libgedit-amtk-devel tepl-devel"
+ libgedit-gtksourceview-devel libpeas-devel libgedit-amtk-devel libgedit-tepl-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From f34e2d41faf890a63ada0d2eb0e766d9b78aee2f Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:29:48 +0300
Subject: [PATCH 5/6] gedit-plugins: update to 47.1
---
srcpkgs/gedit-plugins/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template
index f332e34d3802f8..905503a5b92728 100644
--- a/srcpkgs/gedit-plugins/template
+++ b/srcpkgs/gedit-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'gedit-plugins'
# keep major version in sync with gedit
pkgname=gedit-plugins
-version=46.0
+version=47.1
revision=1
build_style=meson
pycompile_dirs="usr/lib/gedit/plugins"
@@ -16,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=db6b4aa72dac0190a8ae497f770f5a4ba66ae3cf1e03ea8b744e6101df09b251
+checksum=af9d63e5822ac08c68e3b898bb58e7debc1bfeaaca1077f5a8e795d25a164c8b
python_version=3
From bf48868a0d4d61039d0be8fa7a2a436379abd0ba Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 29 Apr 2024 17:30:16 +0300
Subject: [PATCH 6/6] gnome-latex: rebuild for libgedit-tepl
---
srcpkgs/gnome-latex/patches/fix-tepl.patch | 85 ++++++++++++++++++++++
srcpkgs/gnome-latex/template | 4 +-
2 files changed, 87 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gnome-latex/patches/fix-tepl.patch
diff --git a/srcpkgs/gnome-latex/patches/fix-tepl.patch b/srcpkgs/gnome-latex/patches/fix-tepl.patch
new file mode 100644
index 00000000000000..e82a44d925a983
--- /dev/null
+++ b/srcpkgs/gnome-latex/patches/fix-tepl.patch
@@ -0,0 +1,85 @@
+diff --git a/configure b/configure
+index a58dc5629..e01a8f4ec 100755
+--- a/configure
++++ b/configure
+@@ -14305,7 +14305,7 @@ if test -n "$DEP_CFLAGS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ \""; } >&5
+@@ -14314,7 +14314,7 @@ if test -n "$DEP_CFLAGS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ ") 2>&5
+@@ -14326,7 +14326,7 @@ if test -n "$DEP_CFLAGS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ " 2>/dev/null`
+@@ -14346,7 +14346,7 @@ if test -n "$DEP_LIBS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ \""; } >&5
+@@ -14355,7 +14355,7 @@ if test -n "$DEP_LIBS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ ") 2>&5
+@@ -14367,7 +14367,7 @@ if test -n "$DEP_LIBS"; then
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ " 2>/dev/null`
+@@ -14396,7 +14396,7 @@ fi
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ " 2>&1`
+@@ -14406,7 +14406,7 @@ fi
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ " 2>&1`
+@@ -14419,7 +14419,7 @@ fi
+ gtk+-3.0 >= 3.22
+ gspell-1 >= 1.8
+ libgedit-amtk-5
+- tepl-6 >= 6.8
++ libgedit-tepl-6 >= 6.8
+ gee-0.8 >= 0.10
+ gsettings-desktop-schemas
+ ) were not met:
diff --git a/srcpkgs/gnome-latex/template b/srcpkgs/gnome-latex/template
index 9784d71e54a246..10675875a753c1 100644
--- a/srcpkgs/gnome-latex/template
+++ b/srcpkgs/gnome-latex/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-latex'
pkgname=gnome-latex
version=3.46.0
-revision=1
+revision=2
build_helper="gir"
build_style=gnu-configure
configure_args="--disable-appstream-util --disable-dconf-migration
@@ -9,7 +9,7 @@ configure_args="--disable-appstream-util --disable-dconf-migration
hostmakedepends="glib-devel gettext itstool pkg-config vala
$(vopt_if gir gobject-introspection) gtk-doc"
makedepends="gsettings-desktop-schemas-devel gspell-devel libgedit-gtksourceview-devel
- gtk+3-devel libgee-devel libglib-devel tepl-devel"
+ gtk+3-devel libgee-devel libglib-devel libgedit-tepl-devel"
short_desc="LaTeX editor for the GNOME desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: gedit{,-plugins}: update to 47.0
2024-04-29 14:42 [PR PATCH] gedit{,-plugins}: update to 47.0 chrysos349
` (4 preceding siblings ...)
2024-05-09 6:15 ` chrysos349
@ 2024-05-11 7:00 ` mtboehlke
5 siblings, 0 replies; 7+ messages in thread
From: mtboehlke @ 2024-05-11 7:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
New comment by mtboehlke on void-packages repository
https://github.com/void-linux/void-packages/pull/50113#issuecomment-2105603114
Comment:
Looks good to me! I build with these changes locally and briefly tested gedit and gnome-latex with no issues.
Do you know if gnome-latex is getting a release soon that would make the patching unnecessary?
I saw that gtk3 is listed as an optional dependency for libgedit-gfls on its repo, but I couldn't get it to build without it. Maybe it could become just a check dependency if something like [that PR](https://github.com/gedit-technology/libgedit-gfls/pull/1/) is merged?
I think the transitional dummy package is the right way to handle the tepl change, and probably what I should have done with amtk.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-05-11 7:00 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-29 14:42 [PR PATCH] gedit{,-plugins}: update to 47.0 chrysos349
2024-04-29 14:51 ` [PR PATCH] [Updated] " chrysos349
2024-04-29 15:26 ` chrysos349
2024-04-29 17:42 ` chrysos349
2024-05-08 19:30 ` chrysos349
2024-05-09 6:15 ` chrysos349
2024-05-11 7:00 ` mtboehlke
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).