From 656eeb3c464db4188c85690dbb5281033ed89c64 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Wed, 21 Apr 2021 09:13:51 +0200 Subject: [PATCH] temp/dino: fix compilation with new vala (MR 2122) --- ...54df9254609f2fe4de83c9047d408412de28.patch | 40 +++++++++++++++++++ temp/dino/APKBUILD | 6 ++- 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 temp/dino/9acb54df9254609f2fe4de83c9047d408412de28.patch diff --git a/temp/dino/9acb54df9254609f2fe4de83c9047d408412de28.patch b/temp/dino/9acb54df9254609f2fe4de83c9047d408412de28.patch new file mode 100644 index 000000000..ca43e4897 --- /dev/null +++ b/temp/dino/9acb54df9254609f2fe4de83c9047d408412de28.patch @@ -0,0 +1,40 @@ +From 9acb54df9254609f2fe4de83c9047d408412de28 Mon Sep 17 00:00:00 2001 +From: Marvin W +Date: Sat, 6 Mar 2021 08:31:53 -0600 +Subject: [PATCH] QLite: Adjust Real for latest vala version + +--- + qlite/src/column.vala | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/qlite/src/column.vala b/qlite/src/column.vala +index 60125ddf..45385f38 100644 +--- a/qlite/src/column.vala ++++ b/qlite/src/column.vala +@@ -96,12 +96,14 @@ public abstract class Column { + } + } + +- public class Real : Column { +- public Real(string name) { ++ public class NullableReal : Column { ++ public NullableReal(string name) { + base(name, FLOAT); + } + +- public override double get(Row row, string? table_name = DEFALT_TABLE_NAME) { ++ public override bool not_null { get { return false; } set {} } ++ ++ public override double? get(Row row, string? table_name = DEFALT_TABLE_NAME) { + return row.get_real(name, table_name == DEFALT_TABLE_NAME ? table.name : table_name); + } + +@@ -109,7 +111,7 @@ public abstract class Column { + return !row.has_real(name, table_name == DEFALT_TABLE_NAME ? table.name : table_name); + } + +- internal override void bind(Statement stmt, int index, double value) { ++ internal override void bind(Statement stmt, int index, double? value) { + stmt.bind_double(index, value); + } + } diff --git a/temp/dino/APKBUILD b/temp/dino/APKBUILD index a268d78c1..1660e1f0d 100644 --- a/temp/dino/APKBUILD +++ b/temp/dino/APKBUILD @@ -1,7 +1,7 @@ # Forked from Alpine Linux pkgname=dino pkgver=9999_git20210115 -pkgrel=0 +pkgrel=1 # feature/handy branch _commit="eb146f811904405a17251fbb66920eaf0506a6a3" pkgdesc="Modern Jabber/XMPP client" @@ -27,6 +27,7 @@ subpackages="$pkgname-lang" source=" https://github.com/dino/dino/archive/$_commit.tar.gz bump-signal-version.patch + 9acb54df9254609f2fe4de83c9047d408412de28.patch " builddir="$srcdir/$pkgname-$_commit" build() { @@ -50,4 +51,5 @@ package() { make DESTDIR="$pkgdir" install } sha512sums="a05c15199aae159ef03e05c4c2b97f81744f92cfaed718e2ea99043da76e68a557528e89abacf30519ae9a50e559fc0ed9f6794c5b0104b233a348695de82eea eb146f811904405a17251fbb66920eaf0506a6a3.tar.gz -838ccba8d97db8bc43de26afd259e4bdaf3afea786bf40a7ed9ae63f4fb7c2190e8bf6de7b41880602113df87831d01467547f8bfd1f88b50d35287822cb5f4c bump-signal-version.patch" +838ccba8d97db8bc43de26afd259e4bdaf3afea786bf40a7ed9ae63f4fb7c2190e8bf6de7b41880602113df87831d01467547f8bfd1f88b50d35287822cb5f4c bump-signal-version.patch +01d771c039e9c15882ef11970fbc181efe12202f1f1fd9ff3bd6e805f1e85a662d7662da7fbbfb05d6aa569b9f4fed907cf7357d83d02fb1bafa2bb179811f63 9acb54df9254609f2fe4de83c9047d408412de28.patch"