* [PR PATCH] vala: update to 0.56.0
@ 2022-04-02 21:03 paper42
2022-04-03 15:40 ` [PR PATCH] [Merged]: " paper42
0 siblings, 1 reply; 2+ messages in thread
From: paper42 @ 2022-04-02 21:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1246 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages vala-0.56
https://github.com/void-linux/void-packages/pull/36482
vala: update to 0.56.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
@oreo639
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36482.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vala-0.56-36482.patch --]
[-- Type: text/x-diff, Size: 25895 bytes --]
From 99a1a2df203b24c50605e5706288dccb81d95131 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:51:10 -0700
Subject: [PATCH 01/16] vala: update to 0.56.0
---
common/shlibs | 2 +-
srcpkgs/vala/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 7079375524fc..eb09042881f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3127,7 +3127,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.54.so.0 libvala-0.54.0_1
+libvala-0.56.so.0 libvala-0.56.0_1
libvaladoc-0.54.so.0 libvaladoc-0.54.0_1
libvalaccodegen.so libvala-0.44.0_1
libphodav-2.0.so.0 phodav-2.2_1
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 9b5335cdde1b..51b0dd9c836e 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,7 +1,7 @@
# Template file for 'vala'
pkgname=vala
# Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.54.7
+version=0.56.0
revision=1
build_style=gnu-configure
configure_args="--disable-valadoc"
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Vala"
changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7
+checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040
shlib_provides="libvalaccodegen.so"
make_check=extended
From 8230873e79f54e01b96efbf549f6df5e1a622e3f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:51:35 -0700
Subject: [PATCH 02/16] valadoc: update to 0.56.0
---
common/shlibs | 2 +-
srcpkgs/valadoc/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index eb09042881f3..bbf5c717d7e7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3128,7 +3128,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.56.so.0 libvala-0.56.0_1
-libvaladoc-0.54.so.0 libvaladoc-0.54.0_1
+libvaladoc-0.56.so.0 libvaladoc-0.56.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/template b/srcpkgs/valadoc/template
index debe8f29768c..416fee531d3a 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,7 +1,7 @@
# Template file for 'valadoc'
pkgname=valadoc
# Should be kept in sync with 'vala' (shared distfiles)
-version=0.54.7
+version=0.56.0
revision=1
wrksrc="vala-${version}"
build_style=gnu-configure
@@ -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/master/NEWS"
distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7
+checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040
pre_configure() {
autoreconf -if
From 1ff0c00daffc5a52c95d581f8d5e5d0c98f7be7f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 23:01:30 +0200
Subject: [PATCH 03/16] io.elementary.code: revbump for vala 0.56.0
---
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 c47d667b8a96..80be5d38c501 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=6.1.0
-revision=1
+revision=2
wrksrc="code-${version}"
build_style=meson
hostmakedepends="pkg-config vala gettext polkit glib-devel"
From a3c06ef24e0f14bf7a33db47892e159b6d2bad04 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 23:01:30 +0200
Subject: [PATCH 04/16] valabind: revbump for vala 0.56.0
---
srcpkgs/valabind/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index c7b8bf305d27..a9a7765a9bd6 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,7 +1,7 @@
# Template file for 'valabind'
pkgname=valabind
version=1.8.0
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config vala-devel git"
makedepends="vala-devel glib-devel"
From 4de75634991cbddaf49df7d9c4d95c71057fecf6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 23:01:31 +0200
Subject: [PATCH 05/16] vala-language-server: revbump for vala 0.56.0
---
srcpkgs/vala-language-server/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 1693c8fc0b7f..037fa94852da 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,7 +1,7 @@
# Template file for 'vala-language-server'
pkgname=vala-language-server
version=0.48.4
-revision=1
+revision=2
build_style=meson
hostmakedepends="gettext pkg-config vala"
makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
From c38f25183a80fa509a3df3c7fece721559b3aeef Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 18:19:54 +0200
Subject: [PATCH 06/16] five-or-more: update to 3.32.3.
---
srcpkgs/five-or-more/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/five-or-more/template b/srcpkgs/five-or-more/template
index bb137c32d42c..8f871a5ddb8f 100644
--- a/srcpkgs/five-or-more/template
+++ b/srcpkgs/five-or-more/template
@@ -1,6 +1,6 @@
# Template file for 'five-or-more'
pkgname=five-or-more
-version=3.32.2
+version=3.32.3
revision=1
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config vala"
@@ -9,5 +9,6 @@ short_desc="GNOME align five or more objects game"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Five%20or%20more"
+changelog="https://gitlab.gnome.org/GNOME/five-or-more/-/raw/gnome-3-32/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=311a2693dd04226d32b6d7a02e4c739341bf5bd3492e3285c3910db73e47eea6
+checksum=2d10d72eefdeb324b447d632af0c32496e25fc15a3c01db7d2f00c9b51d09ef4
From 0d9d2bb07e52fd3b42c2421e13d136b33cf7372b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 18:41:45 +0200
Subject: [PATCH 07/16] folks: update to 0.15.5.
---
srcpkgs/folks/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index 90fdec6fff48..fbc56862bde7 100644
--- a/srcpkgs/folks/template
+++ b/srcpkgs/folks/template
@@ -1,11 +1,11 @@
# Template file for 'folks'
pkgname=folks
-version=0.15.4
+version=0.15.5
revision=1
build_style=meson
-build_helper="gir qemu"
+build_helper="gir"
configure_args="-Db_lto=false"
-hostmakedepends="pkg-config intltool glib-devel python3 python3-dbusmock
+hostmakedepends="pkg-config gettext glib-devel python3-dbusmock
evolution-data-server-devel $(vopt_if gir vala)"
makedepends="readline-devel telepathy-glib-devel zeitgeist-devel
libgee08-devel evolution-data-server-devel $(vopt_if gir vala-devel)"
@@ -14,8 +14,9 @@ short_desc="GObject Library to aggregate people into metacontacts"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Folks"
+changelog="https://gitlab.gnome.org/GNOME/folks/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e71099afc9e88fad4e757ae134bc3fd63e12b901ad62b0ed5536afb79124af5f
+checksum=0fff8a896330cd82aee4598324f7e541c884d0337536212723b4beb38c759086
build_options="gir"
build_options_default="gir"
From 69cf6990584303ddd3042bc6474f94639e82feca Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 18:50:33 +0200
Subject: [PATCH 08/16] go-for-it: fix for vala 0.56
---
srcpkgs/go-for-it/patches/vala-0.56.patch | 30 +++++++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 srcpkgs/go-for-it/patches/vala-0.56.patch
diff --git a/srcpkgs/go-for-it/patches/vala-0.56.patch b/srcpkgs/go-for-it/patches/vala-0.56.patch
new file mode 100644
index 000000000000..76929f6cfa5f
--- /dev/null
+++ b/srcpkgs/go-for-it/patches/vala-0.56.patch
@@ -0,0 +1,30 @@
+From 4be5ff4ff5ef7db9ab320945cd78a2b2e853695c Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sat, 2 Apr 2022 18:53:20 +0200
+Subject: [PATCH] Fix build with vala 0.56
+
+~/Go-For-It-1.9.6/src/Services/TaskTimer.vala:35.42-35.50: error: value is less accessible than constant `GOFI.TaskTimer.UPDATE_INTERVAL'
+ 35 | public const int64 UPDATE_INTERVAL = 60 * US_C;
+ | ^~~~~~~~~
+
+Closes #172
+---
+ src/Services/TaskTimer.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Services/TaskTimer.vala b/src/Services/TaskTimer.vala
+index 8f14f25..2231dc9 100644
+--- a/src/Services/TaskTimer.vala
++++ b/src/Services/TaskTimer.vala
+@@ -32,7 +32,7 @@ public class GOFI.TaskTimer {
+
+ private const int64 US_C = 1000000; // μs<->s conversion
+
+- public const int64 UPDATE_INTERVAL = 60 * US_C;
++ private const int64 UPDATE_INTERVAL = 60 * US_C;
+
+ /**
+ * A proxy attribute, that does not store any data itself, but provides
+--
+2.35.1
+
From fbe486aeb41b62ac210ab69e68daf033566ae3ab Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:01:07 +0200
Subject: [PATCH 09/16] gradio: remove package
---
srcpkgs/gradio/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/gradio/template
diff --git a/srcpkgs/gradio/template b/srcpkgs/gradio/template
deleted file mode 100644
index a1c4db39151e..000000000000
--- a/srcpkgs/gradio/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'gradio'
-pkgname=gradio
-version=7.2
-revision=1
-wrksrc="Gradio-${version}"
-build_style=meson
-hostmakedepends="automake intltool itstool yelp-tools glib-devel
- pkg-config gettext gettext-devel vala"
-makedepends="gtk+3-devel gettext-devel vala-devel
- gst-plugins-base1-devel json-glib-devel libsoup-devel
- appstream-glib-devel"
-depends="desktop-file-utils gst-plugins-bad1 gst-plugins-good1
- gst-plugins-ugly1"
-short_desc="GTK3 app for finding and listening to internet radio stations"
-maintainer="Logen Kain <logen@sudotask.com>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/haecker-felix/gradio"
-distfiles="https://github.com/haecker-felix/${pkgname}/archive/v${version}.tar.gz"
-checksum=5a85d7d4afb1424e46c935114b268e4a65de2629d60f48eccd75d67ff4b113d2
From f9beeab941be99627bdd9e14a7e0dc2fb3ef0f08 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:19:08 +0200
Subject: [PATCH 10/16] io.elementary.photos: fix for vala 0.56
---
.../patches/vala-0.56.patch | 51 +++++++++++++++++++
1 file changed, 51 insertions(+)
create mode 100644 srcpkgs/io.elementary.photos/patches/vala-0.56.patch
diff --git a/srcpkgs/io.elementary.photos/patches/vala-0.56.patch b/srcpkgs/io.elementary.photos/patches/vala-0.56.patch
new file mode 100644
index 000000000000..08d7d6feaaa8
--- /dev/null
+++ b/srcpkgs/io.elementary.photos/patches/vala-0.56.patch
@@ -0,0 +1,51 @@
+From 6594f1323726fb0d38519a7bdafe16f9170353cb Mon Sep 17 00:00:00 2001
+From: Bobby Rong <rjl931189261@126.com>
+Date: Mon, 14 Mar 2022 19:50:16 +0800
+Subject: [PATCH] Fix build with vala 0.56 (#711)
+
+---
+ src/main.vala | 2 +-
+ vapi/config.vapi | 14 +++++++-------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/main.vala b/src/main.vala
+index 875d35ec7..57c88cf9c 100644
+--- a/src/main.vala
++++ b/src/main.vala
+@@ -273,7 +273,7 @@ namespace CommandlineOptions {
+ bool show_version = false;
+ bool debug_enabled = false;
+
+- public const OptionEntry[] APP_OPTIONS = {
++ const OptionEntry[] APP_OPTIONS = {
+ { "datadir", 'd', 0, OptionArg.FILENAME, out data_dir, N_("Path to Photos' private data"), N_("DIRECTORY")},
+ { "no-runtime-monitoring", 0, 0, OptionArg.NONE, out no_runtime_monitoring, N_("Do not monitor library directory at runtime for changes"), null},
+ { "no-startup-progress", 0, 0, OptionArg.NONE, out no_startup_progress, N_("Don't display startup progress meter"), null},
+diff --git a/vapi/config.vapi b/vapi/config.vapi
+index 15c8d8b12..36f0acb78 100644
+--- a/vapi/config.vapi
++++ b/vapi/config.vapi
+@@ -5,16 +5,16 @@
+ */
+
+ [CCode (cheader_filename="config.h")]
+-extern const string _PREFIX;
++public const string _PREFIX;
+ [CCode (cheader_filename="config.h")]
+-extern const string _VERSION;
++public const string _VERSION;
+ [CCode (cheader_filename="config.h")]
+-extern const string GETTEXT_PACKAGE;
++public const string GETTEXT_PACKAGE;
+ [CCode (cheader_filename="config.h")]
+-extern const string LOCALEDIR;
++public const string LOCALEDIR;
+ [CCode (cheader_filename="config.h")]
+-extern const string _LIB;
++public const string _LIB;
+ [CCode (cheader_filename="config.h")]
+-extern const string _LIBEXECDIR;
++public const string _LIBEXECDIR;
+ [CCode (cheader_filename="config.h")]
+-extern const string PROJECT_NAME;
++public const string PROJECT_NAME;
From 6d422a6d6230158ac5aa11cd9a506649918de4b3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:24:17 +0200
Subject: [PATCH 11/16] libgnome-games-support: update to 1.8.2.
---
srcpkgs/libgnome-games-support/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libgnome-games-support/template b/srcpkgs/libgnome-games-support/template
index 60a1aba20271..92db8d92bc3d 100644
--- a/srcpkgs/libgnome-games-support/template
+++ b/srcpkgs/libgnome-games-support/template
@@ -1,16 +1,17 @@
# Template file for 'libgnome-games-support'
pkgname=libgnome-games-support
-version=1.8.0
+version=1.8.2
revision=1
build_style=meson
-hostmakedepends="intltool pkg-config gobject-introspection vala"
+hostmakedepends="gettext pkg-config gobject-introspection vala"
makedepends="gtk+3-devel libgee08-devel"
short_desc="GNOME games shared code"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="https://git.gnome.org/browse/libgnome-games-support/"
+homepage="https://gitlab.gnome.org/GNOME/libgnome-games-support/"
+changelog="https://gitlab.gnome.org/GNOME/libgnome-games-support/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=abdde538a14fd6078fe6b7e6e93f38a33491d9bec711a116d8b47530184cb3dd
+checksum=28434604a7b038731ac0231731388ff104f565bb2330cc24e78cda04cfd3ef7d
libgnome-games-support-devel_package() {
short_desc+=" - development files"
From 845ab18167e650ecf712c4a93f4715d623b4b016 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 21:43:48 -0700
Subject: [PATCH 12/16] shotwell: fix build with vala 0.56.0
---
.../patches/shotwell-0.54.1-vapi_fixes.patch | 67 +++++++++++++++++++
1 file changed, 67 insertions(+)
create mode 100644 srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch
diff --git a/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch b/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch
new file mode 100644
index 000000000000..f39f988f9645
--- /dev/null
+++ b/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch
@@ -0,0 +1,67 @@
+From 59ae0ce648982669f24a33db501f3f229508cb6e Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Tue, 30 Nov 2021 15:09:17 +0100
+Subject: [PATCH] Fix accessibility issues with initializer of constants
+
+---
+ src/International.vala | 2 --
+ src/Resources.vala | 7 -------
+ vapi/version.vapi | 17 ++++++++++++++---
+ 3 files changed, 14 insertions(+), 12 deletions(-)
+
+diff --git a/src/International.vala b/src/International.vala
+index 555a91f8..73f07639 100644
+--- a/src/International.vala
++++ b/src/International.vala
+@@ -4,8 +4,6 @@
+ * See the COPYING file in this distribution.
+ */
+
+-extern const string _LANG_SUPPORT_DIR;
+-
+ public const string TRANSLATABLE = "translatable";
+
+ namespace InternationalSupport {
+diff --git a/src/Resources.vala b/src/Resources.vala
+index 6d2b8851..86f0eb65 100644
+--- a/src/Resources.vala
++++ b/src/Resources.vala
+@@ -4,13 +4,6 @@
+ * See the COPYING file in this distribution.
+ */
+
+-// defined by ./configure or Makefile and included by gcc -D
+-extern const string _PREFIX;
+-extern const string _VERSION;
+-extern const string GETTEXT_PACKAGE;
+-extern const string _LIB;
+-extern const string _LIBEXECDIR;
+-
+ namespace Resources {
+ public const string APP_TITLE = "Shotwell";
+ public const string APP_LIBRARY_ROLE = _("Photo Manager");
+diff --git a/vapi/version.vapi b/vapi/version.vapi
+index 06974c84..e191f2f7 100644
+--- a/vapi/version.vapi
++++ b/vapi/version.vapi
+@@ -1,3 +1,14 @@
+-[CCode (cheader_filename="version.h")]
+-extern const string? _GIT_VERSION;
+-
++[CCode (cheader_filename = "version.h")]
++public const string? _GIT_VERSION;
++[CCode (cheader_filename = "config.h")]
++public const string _PREFIX;
++[CCode (cheader_filename = "config.h")]
++public const string _VERSION;
++[CCode (cheader_filename = "config.h")]
++public const string GETTEXT_PACKAGE;
++[CCode (cheader_filename = "config.h")]
++public const string _LIB;
++[CCode (cheader_filename = "config.h")]
++public const string _LIBEXECDIR;
++[CCode (cheader_filename = "config.h")]
++public const string _LANG_SUPPORT_DIR;
+--
+GitLab
+
From 2a044e5093c90c292446347e0e70b0a9a8576ba7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:28:08 +0200
Subject: [PATCH 13/16] planner: fix for vala 0.56
---
srcpkgs/planner/patches/vala-0.56.patch | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/planner/patches/vala-0.56.patch
diff --git a/srcpkgs/planner/patches/vala-0.56.patch b/srcpkgs/planner/patches/vala-0.56.patch
new file mode 100644
index 000000000000..bff39d43cc1b
--- /dev/null
+++ b/srcpkgs/planner/patches/vala-0.56.patch
@@ -0,0 +1,25 @@
+From 87be3e27ccc8f9a1ef7fbeec9600459eb4569200 Mon Sep 17 00:00:00 2001
+From: Bobby Rong <rjl931189261@126.com>
+Date: Mon, 14 Mar 2022 23:36:21 +0800
+Subject: [PATCH] Fix build with vala 0.56
+
+Otherwise build fails with
+
+../src/Application.vala:45.50-55.5: error: value is less accessible than constant `Planner.PLANNER_OPTIONS'
+---
+ src/Application.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Application.vala b/src/Application.vala
+index 8c1c9ddb..ebd8f726 100644
+--- a/src/Application.vala
++++ b/src/Application.vala
+@@ -42,7 +42,7 @@ public class Planner : Gtk.Application {
+ private static bool clear_database = false;
+ private static string lang = "";
+
+- public const OptionEntry[] PLANNER_OPTIONS = {
++ private const OptionEntry[] PLANNER_OPTIONS = {
+ { "version", 'v', 0, OptionArg.NONE, ref version,
+ "Display version number", null },
+ { "reset", 'r', 0, OptionArg.NONE, ref clear_database,
From ae7b159e04d20f4851b61aced2f6e0db512c20b2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:35:16 +0200
Subject: [PATCH 14/16] tootle: fix for vala 0.56
---
srcpkgs/tootle/patches/vala-0.56.patch | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 srcpkgs/tootle/patches/vala-0.56.patch
diff --git a/srcpkgs/tootle/patches/vala-0.56.patch b/srcpkgs/tootle/patches/vala-0.56.patch
new file mode 100644
index 000000000000..38adf0ff0930
--- /dev/null
+++ b/srcpkgs/tootle/patches/vala-0.56.patch
@@ -0,0 +1,23 @@
+From 11d94c05d4c4a2350801294f155230e899048ab5 Mon Sep 17 00:00:00 2001
+From: Bobby Rong <rjl931189261@126.com>
+Date: Sat, 19 Mar 2022 16:59:31 +0800
+Subject: [PATCH] Application: make app_entries private
+
+Fixes compilation with latest valac.
+---
+ src/Application.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Application.vala b/src/Application.vala
+index 57d0fd7..b48cb53 100644
+--- a/src/Application.vala
++++ b/src/Application.vala
+@@ -43,7 +43,7 @@ namespace Tootle {
+ { null }
+ };
+
+- public const GLib.ActionEntry[] app_entries = {
++ private const GLib.ActionEntry[] app_entries = {
+ { "about", about_activated },
+ { "compose", compose_activated },
+ { "back", back_activated },
From 65766bd73d8e93b555644b5ad460d26a9f8edacd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:44:54 +0200
Subject: [PATCH 15/16] simple-scan: fix for vala 0.56
---
srcpkgs/simple-scan/patches/vala-0.56.patch | 25 +++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/simple-scan/patches/vala-0.56.patch
diff --git a/srcpkgs/simple-scan/patches/vala-0.56.patch b/srcpkgs/simple-scan/patches/vala-0.56.patch
new file mode 100644
index 000000000000..0820cee20e40
--- /dev/null
+++ b/srcpkgs/simple-scan/patches/vala-0.56.patch
@@ -0,0 +1,25 @@
+From c50802b213c325cfa957d66955f6de96908710d9 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sat, 6 Nov 2021 19:46:07 +0100
+Subject: [PATCH] Fix accessibility conflict of constant and its value
+
+---
+ src/simple-scan.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/simple-scan.vala b/src/simple-scan.vala
+index c15a5418..71f32de9 100644
+--- a/src/simple-scan.vala
++++ b/src/simple-scan.vala
+@@ -14,7 +14,7 @@ public class SimpleScan : Gtk.Application
+ static bool show_version;
+ static bool debug_enabled;
+ static string? fix_pdf_filename = null;
+- public const OptionEntry[] options =
++ const OptionEntry[] options =
+ {
+ { "version", 'v', 0, OptionArg.NONE, ref show_version,
+ /* Help string for command line --version flag */
+--
+GitLab
+
From 907f9555a8002dbaca4824988430a6ec524ae850 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 22:59:04 +0200
Subject: [PATCH 16/16] geary: fix for vala 0.56
---
srcpkgs/geary/patches/vala-0.56a.patch | 25 ++++++++++++++++
srcpkgs/geary/patches/vala-0.56b.patch | 40 ++++++++++++++++++++++++++
2 files changed, 65 insertions(+)
create mode 100644 srcpkgs/geary/patches/vala-0.56a.patch
create mode 100644 srcpkgs/geary/patches/vala-0.56b.patch
diff --git a/srcpkgs/geary/patches/vala-0.56a.patch b/srcpkgs/geary/patches/vala-0.56a.patch
new file mode 100644
index 000000000000..df2c3902db14
--- /dev/null
+++ b/srcpkgs/geary/patches/vala-0.56a.patch
@@ -0,0 +1,25 @@
+From 0f75e7a84a39492d0748cec2ba6028e08cae3644 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sun, 30 Jan 2022 19:54:11 +0100
+Subject: [PATCH] Util.Cache.Lru: Workaround missing generic type argument
+
+---
+ src/client/util/util-cache.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/client/util/util-cache.vala b/src/client/util/util-cache.vala
+index f054e32e5..ecc275e84 100644
+--- a/src/client/util/util-cache.vala
++++ b/src/client/util/util-cache.vala
+@@ -12,7 +12,7 @@ public class Util.Cache.Lru<T> : Geary.BaseObject {
+ private class CacheEntry<T> {
+
+
+- public static int lru_compare(CacheEntry<T> a, CacheEntry<T> b) {
++ public static int lru_compare(CacheEntry a, CacheEntry b) {
+ if (a.key == b.key) {
+ return 0;
+ }
+--
+GitLab
+
diff --git a/srcpkgs/geary/patches/vala-0.56b.patch b/srcpkgs/geary/patches/vala-0.56b.patch
new file mode 100644
index 000000000000..2d071a133751
--- /dev/null
+++ b/srcpkgs/geary/patches/vala-0.56b.patch
@@ -0,0 +1,40 @@
+From 9bd4c82952a0a2c3308c5cc86c0b85650c1fb484 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Tue, 30 Nov 2021 15:31:31 +0100
+Subject: [PATCH] Fix accessibility issues with initializer of constants
+
+---
+ src/client/application/application-client.vala | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/client/application/application-client.vala b/src/client/application/application-client.vala
+index 6ce19ce2a..e6ba85331 100644
+--- a/src/client/application/application-client.vala
++++ b/src/client/application/application-client.vala
+@@ -8,16 +8,16 @@
+
+ // Defined by CMake build script.
+ extern const string GETTEXT_PACKAGE;
+-extern const string _APP_ID;
+-extern const string _BUILD_ROOT_DIR;
+-extern const string _GSETTINGS_DIR;
+-extern const string _INSTALL_PREFIX;
+-extern const string _NAME_SUFFIX;
++public extern const string _APP_ID;
++public extern const string _BUILD_ROOT_DIR;
++public extern const string _GSETTINGS_DIR;
++public extern const string _INSTALL_PREFIX;
++public extern const string _NAME_SUFFIX;
+ extern const string _PLUGINS_DIR;
+ extern const string _PROFILE;
+ extern const string _REVNO;
+-extern const string _SOURCE_ROOT_DIR;
+-extern const string _VERSION;
++public extern const string _SOURCE_ROOT_DIR;
++public extern const string _VERSION;
+ extern const string _WEB_EXTENSIONS_DIR;
+
+
+--
+GitLab
+
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: vala: update to 0.56.0
2022-04-02 21:03 [PR PATCH] vala: update to 0.56.0 paper42
@ 2022-04-03 15:40 ` paper42
0 siblings, 0 replies; 2+ messages in thread
From: paper42 @ 2022-04-03 15:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1093 bytes --]
There's a merged pull request on the void-packages repository
vala: update to 0.56.0
https://github.com/void-linux/void-packages/pull/36482
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
@oreo639
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-04-03 15:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-02 21:03 [PR PATCH] vala: update to 0.56.0 paper42
2022-04-03 15:40 ` [PR PATCH] [Merged]: " paper42
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).