From: ndowens <ndowens@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] valabind: update to 1.7.2.
Date: Tue, 01 Dec 2020 21:53:41 +0100 [thread overview]
Message-ID: <20201201205341.njXaovqhUBhw4pHHPd3k_eDZfXYHe7grPrLAx4F6ZcM@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26874@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 413 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages valabind
https://github.com/void-linux/void-packages/pull/26874
valabind: update to 1.7.2.
0.48 vala patch was implemented in this version.
Re-write 0.50 vala patch so it applies cleanly
A patch file from https://github.com/void-linux/void-packages/pull/26874.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-valabind-26874.patch --]
[-- Type: text/x-diff, Size: 5041 bytes --]
From 4f09c3a0ad05ee928201fc5166192e63a96c2351 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 1 Dec 2020 14:34:23 -0600
Subject: [PATCH] valabind: update to 1.7.2.
---
.../valabind/patches/0002-vala-0.50-fix.patch | 25 +++++++++++
srcpkgs/valabind/patches/vala-048.patch | 44 -------------------
srcpkgs/valabind/patches/vala-050.patch | 25 -----------
srcpkgs/valabind/template | 6 +--
4 files changed, 28 insertions(+), 72 deletions(-)
create mode 100644 srcpkgs/valabind/patches/0002-vala-0.50-fix.patch
delete mode 100644 srcpkgs/valabind/patches/vala-048.patch
delete mode 100644 srcpkgs/valabind/patches/vala-050.patch
diff --git a/srcpkgs/valabind/patches/0002-vala-0.50-fix.patch b/srcpkgs/valabind/patches/0002-vala-0.50-fix.patch
new file mode 100644
index 00000000000..fa99e397319
--- /dev/null
+++ b/srcpkgs/valabind/patches/0002-vala-0.50-fix.patch
@@ -0,0 +1,25 @@
+From 70e8b9f2bc718eeb5642a6680fd0525baaadc6c1 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Tue, 1 Dec 2020 14:40:31 -0600
+Subject: vala-0.50 fix
+
+---
+ valabindwriter.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git valabindwriter.vala valabindwriter.vala
+index 5b71abd..d9e36fd 100644
+--- valabindwriter.vala
++++ valabindwriter.vala
+@@ -36,7 +36,7 @@ public class ValabindWriter : CodeVisitor {
+ #if VALA_0_50
+ // required to avoid ugly runtime errors
+ #else
+- context.profile = Profile.GOBJECT;
++ context.set_target_profile(Profile.GOBJECT);
+ #endif
+ }
+
+--
+2.29.2
+
diff --git a/srcpkgs/valabind/patches/vala-048.patch b/srcpkgs/valabind/patches/vala-048.patch
deleted file mode 100644
index ffe2e087007..00000000000
--- a/srcpkgs/valabind/patches/vala-048.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 9d4fb181e24346a8c5d570290fa9892ce10c8c3b Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Thu, 6 Feb 2020 09:45:17 +0100
-Subject: [PATCH] Fix build with Vala 0.48
-
----
- gowriter.vala | 4 ++++
- nodeffiwriter.vala | 5 +++++
- 2 files changed, 9 insertions(+)
-
-diff --git a/gowriter.vala b/gowriter.vala
-index 56d9fbe..0fb09a6 100644
---- gowriter.vala
-+++ 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
---- nodeffiwriter.vala
-+++ 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()+".";
- }
diff --git a/srcpkgs/valabind/patches/vala-050.patch b/srcpkgs/valabind/patches/vala-050.patch
deleted file mode 100644
index bd7c6a74345..00000000000
--- a/srcpkgs/valabind/patches/vala-050.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f942315402e3fc38def14a974dd5b210e5d2c38d Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed, 16 Sep 2020 20:39:29 +0200
-Subject: [PATCH] fix with vala-0.50
-
----
- valabindwriter.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git valabindwriter.vala valabindwriter.vala
-index 165cdf5..c793c9f 100644
---- valabindwriter.vala
-+++ valabindwriter.vala
-@@ -33,7 +33,7 @@ public class ValabindWriter : CodeVisitor {
- if (glibmode)
- context.add_define ("GOBJECT");
- // required to avoid ugly runtime errors
-- context.profile = Profile.GOBJECT;
-+ context.set_target_profile(Profile.GOBJECT);
- }
-
- public void parse () {
---
-2.28.0
-
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index 2bf0df336e3..d2af2f9be15 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,7 +1,7 @@
# Template file for 'valabind'
pkgname=valabind
-version=1.7.1
-revision=6
+version=1.7.2
+revision=1
build_style=meson
hostmakedepends="pkg-config vala-devel git"
makedepends="vala-devel glib-devel"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://radare.org/r/"
distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
-checksum=b463b18419de656e218855a2f30a71051f03a9c4540254b4ceaea475fb79102e
+checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
next prev parent reply other threads:[~2020-12-01 20:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-01 20:45 [PR PATCH] " ndowens
2020-12-01 20:50 ` [PR PATCH] [Updated] " ndowens
2020-12-01 20:53 ` ndowens [this message]
2020-12-20 3:52 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201201205341.njXaovqhUBhw4pHHPd3k_eDZfXYHe7grPrLAx4F6ZcM@z \
--to=ndowens@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).