geany: update to 2.0.

srcpkgs/geany-plugins/template

@@ -1,25 +1,32 @@
 # Template file for 'geany-plugins'
 pkgname=geany-plugins
-version=1.38.0
-revision=3
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--enable-all-plugins --disable-devhelp
- --disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm"
+configure_args="--enable-all-plugins
+ --disable-geniuspaste --disable-updatechecker --disable-debugger"
 hostmakedepends="automake gettext-devel intltool libtool pkg-config vala
  glib-devel"
 makedepends="geany-devel lua51-devel ctpl-devel zlib-devel
- gpgme-devel enchant2-devel libgit2-devel libsoup-devel
- gtkspell-devel webkit2gtk-devel vte3-devel"
+ gpgme-devel enchant2-devel libgit2-devel
+ gtkspell-devel libwebkit2gtk41-devel vte3-devel"
 short_desc="Geany IDE plugins"
 maintainer="Orphaned <[email protected]>"
 license="GPL-2.0-or-later"
 homepage="http://plugins.geany.org"
 changelog="https://raw.githubusercontent.com/geany/geany-plugins/master/NEWS"
-distfiles="https://github.com/geany/${pkgname}/archive/${version}.tar.gz"
-checksum=86d2fe05290136d020b0d22f849a1aaa74b83cb49b767ae2dc19aaedcdf3d469
+distfiles="https://download.geany.org/geany-plugins/geany-plugins-${version}.tar.gz"
+checksum=cd7d27f00aef4afe2040d7e5246a863234c340c8520ef698be9a15005ed8f57e
+
+post_patch() {
+	# Use libwebkit2gtk41, cannot be used with updatechecker or geniuspaste
+	# See: https://github.com/geany/geany-plugins/issues/1302#issuecomment-1925011272
+	vsed -e 's/webkit2gtk-4.0/webkit2gtk-4.1/' -i build/markdown.m4
+	vsed -e 's/webkit2gtk-4.0/webkit2gtk-4.1/' -i build/webhelper.m4
+}
 
 pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
+	autoreconf -fi
 }
 
 pre_build() {
@@ -32,7 +39,7 @@ geany-plugins-extra_package() {
 	short_desc+=" - extra plugins"
 	pkg_install() {
 		for p in geanygendoc geanylua geanypg geniuspaste \
-			git-changebar pretty-printer spellcheck updatechecker; do
+			git-changebar pretty-printer spellcheck; do
 			if [ -x ${DESTDIR}/usr/lib/geany/${p}.so ]; then
 				vmove usr/lib/geany/${p}.so
 			fi

srcpkgs/geany/template

@@ -1,21 +1,28 @@
 # Template file for 'geany'
 pkgname=geany
-version=1.38
+version=2.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-vte --enable-gtk3"
-hostmakedepends="pkg-config libtool intltool"
+hostmakedepends="pkg-config libtool gettext"
 makedepends="gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"
+checkdepends="xvfb-run python3"
 short_desc="Fast and lightweight IDE"
 maintainer="Benjamín Albiñana <[email protected]>"
 license="GPL-2.0-or-later"
 homepage="https://www.geany.org"
 changelog="https://raw.githubusercontent.com/geany/geany/master/NEWS"
-distfiles="https://download.${pkgname}.org/${pkgname}-${version}.tar.bz2"
-checksum=abff176e4d48bea35ee53037c49c82f90b6d4c23e69aed6e4a5ca8ccd3aad546
+distfiles="https://download.geany.org/geany-${version}.tar.bz2"
+checksum=565b4cd2f0311c1e3a167ec71c4a32dba642e0fe554ae5bb6b8177b7a74ccc92
+make_check_pre="xvfb-run"
 python_version=3
 
+pre_check() {
+	# Otherwise gtk will treat / as ~
+	export HOME="$PWD"
+}
+
 geany-devel_package() {
 	depends="libglib-devel gtk+3-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - Development files"