Date: Friday, January 15, 2021 @ 01:27:09 Author: anthraxx Revision: 820933
upgpkg: valabind 1.7.2-1 Modified: valabind/trunk/PKGBUILD Deleted: valabind/trunk/vala-0.48.diff valabind/trunk/vala-0.50.diff ----------------+ PKGBUILD | 24 +++---------------- vala-0.48.diff | 69 ------------------------------------------------------- vala-0.50.diff | 22 ----------------- 3 files changed, 5 insertions(+), 110 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-01-15 01:19:36 UTC (rev 820932) +++ PKGBUILD 2021-01-15 01:27:09 UTC (rev 820933) @@ -1,31 +1,17 @@ # Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> pkgname=valabind -pkgver=1.7.1 -pkgrel=4 +pkgver=1.7.2 +pkgrel=1 pkgdesc='Tool to parse vala or vapi files to transform them into swig interface files, C++, NodeJS-ffi or GIR' url='https://github.com/radare/valabind' arch=('x86_64') license=('GPL3') depends=('sh' 'glibc' 'glib2' 'vala' 'swig' 'libvala-0.50.so') -source=(${pkgname}-${pkgver}.tar.gz::https://github.com/radare/${pkgname}/archive/${pkgver}.tar.gz - vala-0.48.diff vala-0.50.diff) -sha256sums=('b463b18419de656e218855a2f30a71051f03a9c4540254b4ceaea475fb79102e' - '0528ba09bb4a5f20944a129d5b91eabeefa2d35a2fcd40378847f976f2ad418e' - '39ffb66da22043ccbcce09e84a3ba30cf178d23324f1ae352546cd3bc23b8342') -sha512sums=('b82c733777e0caf449cd27f0ed3597a108462072c5663945ec03f4c1da90d389313c0f3ca0f6db2d52c7f80d09b1751992f733454358cd428c2571b7e53850a4' - 'f9de1b1050f7933a3850fab88ba1a15fc83da6e21dfe1d75edc781a151eee1246a2d7602c201c71bd8adb4029517992737e660a4a35e4a6f9e80bf7bbe23bb30' - '4dbae75787b63531c5f15d88131fc624cb4d274c1bf7e94416ad0773aed9b3007f53918389dcb13c82bfd3b5bdefc6bf9001a78071a62112957044fbd6736c70') +source=(${pkgname}-${pkgver}.tar.gz::https://github.com/radare/${pkgname}/archive/${pkgver}.tar.gz) +sha256sums=('643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261') +sha512sums=('52b944eaf5cbe07ef1b6601141544d3549d9e6aa0470d67a5e1dd967d591ff033f0426b4159a762896647863de70d510abd6e0146c5ee8e8891d12047868d9f3') -prepare() { - cd ${pkgname}-${pkgver} - - # git diff 1.7.1..9d4fb181e243 - patch -Np1 -i ../vala-0.48.diff - - patch -Np1 -i ../vala-0.50.diff -} - build() { cd ${pkgname}-${pkgver} make Deleted: vala-0.48.diff =================================================================== --- vala-0.48.diff 2021-01-15 01:19:36 UTC (rev 820932) +++ vala-0.48.diff 2021-01-15 01:27:09 UTC (rev 820933) @@ -1,69 +0,0 @@ -diff --git a/girwriter.vala b/girwriter.vala -index 51af0b7..33c016b 100644 ---- a/girwriter.vala -+++ b/girwriter.vala -@@ -1,25 +1,29 @@ --/* Copyright 2011-2015 -- pancake */ -+/* Copyright 2011-2019 -- pancake */ - - using Vala; - - public class GirWriter : ValabindWriter { - public GLib.List<string> includefiles = new GLib.List<string> (); - public GLib.List<Method> methods; - string classname = ""; - string classcname; - string externs = ""; - string statics = ""; - string extends = ""; - string enums = ""; - string nspace; - - public GirWriter () { - } - - public override string get_filename (string base_name) { - return base_name+".gir"; - } - -+ public override void write(string file) { -+ context.accept (this); -+ } -+ - string get_alias (string name) { - string oname = name; - switch (name) { -diff --git a/gowriter.vala b/gowriter.vala -index 56d9fbe..0fb09a6 100644 ---- a/gowriter.vala -+++ b/gowriter.vala -@@ -214,7 +214,11 @@ public class GoNamer { - } - - private string mangle_datatype(DataType d) { -+#if VALA_0_48 -+ string ret = d.type_symbol.name; // i think should unify with get_type_declaration? -+#else - string ret = d.data_type.name; // i think should unify with get_type_declaration? -+#endif - if (d.get_type_arguments().size > 0) { - foreach(var dd in d.get_type_arguments()) { - ret += "_"; -diff --git a/nodeffiwriter.vala b/nodeffiwriter.vala -index 84fede0..eba6329 100644 ---- a/nodeffiwriter.vala -+++ b/nodeffiwriter.vala -@@ -85,8 +85,13 @@ public class NodeFFIWriter : ValabindWriter { - - string _type = type.to_string (); - string local_ns_pfx = ns_pfx; -+#if VALA_0_48 -+ if (type.type_symbol != null && type.type_symbol.parent_symbol is Namespace) { -+ Namespace local_ns = (Namespace)type.type_symbol.parent_symbol; -+#else - if (type.data_type != null && type.data_type.parent_symbol is Namespace) { - Namespace local_ns = (Namespace)type.data_type.parent_symbol; -+#endif - if (use_namespace(local_ns)) - local_ns_pfx = local_ns.get_full_name()+"."; - } Deleted: vala-0.50.diff =================================================================== --- vala-0.50.diff 2021-01-15 01:19:36 UTC (rev 820932) +++ vala-0.50.diff 2021-01-15 01:27:09 UTC (rev 820933) @@ -1,22 +0,0 @@ -diff --git i/valabindwriter.vala w/valabindwriter.vala -index 165cdf5..d3911b3 100644 ---- i/valabindwriter.vala -+++ w/valabindwriter.vala -@@ -27,13 +27,17 @@ public class ValabindWriter : CodeVisitor { - this.vapidir = vapidir; - this.glibmode = glibmode; - context.vapi_directories = { vapidir }; -+#if VALA_0_50 -+ context.set_target_profile (Profile.GOBJECT); -+#else - add_package (context, "glib-2.0"); - add_package (context, "gobject-2.0"); - /* vala 0.17 only support gobject profile */ - if (glibmode) - context.add_define ("GOBJECT"); - // required to avoid ugly runtime errors - context.profile = Profile.GOBJECT; -+#endif - } - - public void parse () {