From e252d7554f6481dd3755720ababd28bd541ad1b9 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 21 Apr 2021 21:01:55 +0200 Subject: [PATCH 1/3] vala: update to 0.52.2. --- common/shlibs | 2 +- .../vala/patches/disable-unstable-tests.patch | 21 +++++++++++++++++++ srcpkgs/vala/template | 17 +++++++++------ 3 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch diff --git a/common/shlibs b/common/shlibs index f768a637aed5..7a0c44e9a713 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3119,7 +3119,7 @@ libmirage.so.11 libmirage-3.1.0_1 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1 libsysprof-4.so sysprof-3.37.90_1 libsysprof-ui-4.so sysprof-3.37.90_1 -libvala-0.50.so.0 libvala-0.50.0_1 +libvala-0.52.so.0 libvala-0.52.0_1 libvaladoc-0.50.so.0 libvaladoc-0.50.0_1 libvalaccodegen.so libvala-0.44.0_1 libphodav-2.0.so.0 phodav-2.2_1 diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch new file mode 100644 index 000000000000..16d2da6150e4 --- /dev/null +++ b/srcpkgs/vala/patches/disable-unstable-tests.patch @@ -0,0 +1,21 @@ +This patch disables unstable tests: + +* dbus/filedescriptor.test: Fails on github-ci, but passes on other linux systems. +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -703,7 +703,6 @@ TESTS = \ + dbus/dynamic-method.test \ + dbus/enum-string-marshalling.vala \ + dbus/signals.test \ +- dbus/filedescriptor.test \ + dbus/filedescriptor-async.test \ + dbus/filedescriptor-errors.test \ + dbus/dicts.test \ +@@ -1236,7 +1235,6 @@ endif + if ENABLE_TEST_ASAN + XFAIL_TESTS = \ + objects/property-array.vala \ +- dbus/filedescriptor-errors.test \ + $(NULL) + endif + diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template index 4250b7f044a1..57e68b81c41f 100644 --- a/srcpkgs/vala/template +++ b/srcpkgs/vala/template @@ -1,11 +1,11 @@ # Template file for 'vala' pkgname=vala # Should be kept in sync with 'valadoc' (shared distfiles) -version=0.50.0 -revision=2 +version=0.52.2 +revision=1 build_style=gnu-configure configure_args="--disable-valadoc" -hostmakedepends="flex libxslt pkg-config" +hostmakedepends="flex libxslt pkg-config automake libtool" makedepends="libfl-devel libglib-devel" checkdepends="dbus libgirepository-devel" short_desc="Compiler for the GObject type system" @@ -14,16 +14,21 @@ license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/Vala" changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS" distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz" -checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071 +checksum=3a3c460803ba661e513be3d0984b583e05473f602c75fa98e91755503714a97b shlib_provides="libvalaccodegen.so" +make_check=extended + +pre_configure() { + autoreconf -if +} post_install() { # remove the /usr/bin prefix from the vapigen variable # so the package that use it fall into our wrapper. # keep the binary versioned, we don't know the potential # fallout from using the unversioned one - vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \ - -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc + vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \ + -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc } libvala_package() { From a841e7019d788e2227eb49b2b93aac6f1dc08697 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 21 Apr 2021 21:19:57 +0200 Subject: [PATCH 2/3] io.elementary.code: rebuild with vala-0.52.2 --- srcpkgs/io.elementary.code/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template index 8d43ad4130d2..66de4b50be05 100644 --- a/srcpkgs/io.elementary.code/template +++ b/srcpkgs/io.elementary.code/template @@ -1,7 +1,7 @@ # Template file for 'io.elementary.code' pkgname=io.elementary.code version=3.4.1 -revision=3 +revision=4 wrksrc="code-${version}" build_style=meson hostmakedepends="pkg-config vala intltool glib-devel" From 774b1f48d1c247a2592f43f96296a02dad191572 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 19 Jul 2021 16:48:03 +0200 Subject: [PATCH 3/3] New package: tootle-1.0 --- srcpkgs/tootle/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/tootle/template diff --git a/srcpkgs/tootle/template b/srcpkgs/tootle/template new file mode 100644 index 000000000000..20eb85e27a6e --- /dev/null +++ b/srcpkgs/tootle/template @@ -0,0 +1,13 @@ +# Template file for 'tootle' +pkgname=tootle +version=1.0 +revision=1 +build_style=meson +hostmakedepends="vala pkg-config gettext glib-devel" +makedepends="vala libhandy1-devel libsoup-devel libgee08-devel json-glib-devel" +short_desc="Native GTK Mastodon client" +maintainer="Michal Vasilek " +license="GPL-3.0-or-later" +homepage="https://github.com/bleakgrey/tootle/" +distfiles="https://github.com/bleakgrey/tootle/archive/$version.tar.gz" +checksum=e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496