From 23110f1bdc18ed1d7e42a21e3f487ef96f5e17dc Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 21 Apr 2021 21:01:55 +0200 Subject: [PATCH 1/5] vala: update to 0.52.3. --- 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 0d53e2be7dfa..bf616fb6fb54 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3088,7 +3088,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..e6dbf63cb031 --- /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. +--- tests/Makefile.am.orig 2021-04-22 09:10:13.417738224 +0200 ++++ tests/Makefile.am 2021-04-22 09:11:34.788734772 +0200 +@@ -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..dc0c17b66584 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.3 +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= 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 26dee66d97e3df8f42d5d022cc75f184280f4e7c Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 21 Apr 2021 21:08:12 +0200 Subject: [PATCH 2/5] valadoc: update to 0.52.3. --- common/shlibs | 2 +- srcpkgs/valadoc/patches | 1 + srcpkgs/valadoc/template | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) create mode 120000 srcpkgs/valadoc/patches diff --git a/common/shlibs b/common/shlibs index bf616fb6fb54..687091faf793 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3089,7 +3089,7 @@ 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.52.so.0 libvala-0.52.0_1 -libvaladoc-0.50.so.0 libvaladoc-0.50.0_1 +libvaladoc-0.52.so.0 libvaladoc-0.52.0_1 libvalaccodegen.so libvala-0.44.0_1 libphodav-2.0.so.0 phodav-2.2_1 libgfshare.so.2 libgfshare-2.0.0_1 diff --git a/srcpkgs/valadoc/patches b/srcpkgs/valadoc/patches new file mode 120000 index 000000000000..11fa71e74306 --- /dev/null +++ b/srcpkgs/valadoc/patches @@ -0,0 +1 @@ +../vala/patches \ No newline at end of file diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template index 4593b7db5f69..1ec960d3dd2f 100644 --- a/srcpkgs/valadoc/template +++ b/srcpkgs/valadoc/template @@ -1,8 +1,8 @@ # Template file for 'valadoc' pkgname=valadoc # Should be kept in sync with 'vala' (shared distfiles) -version=0.50.0 -revision=3 +version=0.52.3 +revision=1 wrksrc="vala-${version}" build_style=gnu-configure configure_args="--with-cgraph=yes" @@ -15,7 +15,7 @@ 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=037ea1a92bf0f1ab04a71b52a01d50aca1945ad1017b6189d9614f84f5c9b2d9 pre_configure() { autoreconf -if From e2215019a6cf5d1e2bcfcc7a5bad879a15d74394 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 21 Apr 2021 20:05:29 +0200 Subject: [PATCH 3/5] vala-language-server: update to 0.48.2. --- srcpkgs/vala-language-server/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template index 870fe215fb92..5743a1f5c9a3 100644 --- a/srcpkgs/vala-language-server/template +++ b/srcpkgs/vala-language-server/template @@ -1,6 +1,6 @@ # Template file for 'vala-language-server' pkgname=vala-language-server -version=0.48.1 +version=0.48.2 revision=1 build_style=meson hostmakedepends="gettext pkg-config vala" @@ -10,4 +10,4 @@ maintainer="Enno Boland " license="LGPL-3.0-only" homepage="https://github.com/benwaffle/vala-language-server" distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz" -checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45 +checksum=c2c04771bf635a77eb82f27629b9af453f937ecf95709fc9161db785b163fbb7 From 5a41b8e9cc418e8edda2988b55fee0f461cba212 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 21 Apr 2021 21:19:57 +0200 Subject: [PATCH 4/5] 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 f04779a80be11c41afe90f2b5d2528ab7943d019 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 21 Apr 2021 21:20:11 +0200 Subject: [PATCH 5/5] valabind: update to 1.8.0. --- srcpkgs/valabind/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template index d2af2f9be152..b94938be33ae 100644 --- a/srcpkgs/valabind/template +++ b/srcpkgs/valabind/template @@ -1,6 +1,6 @@ # Template file for 'valabind' pkgname=valabind -version=1.7.2 +version=1.8.0 revision=1 build_style=meson hostmakedepends="pkg-config vala-devel git" @@ -11,4 +11,4 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://radare.org/r/" distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz" -checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261 +checksum=3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd