Update to 0.56.5
Drop patch, drop old provides.
This commit is contained in:
David King
parent
f57c172232
commit
251e1c20b1
1
.gitignore
vendored
1
.gitignore
vendored
@ -134,3 +134,4 @@
|
||||
/vala-0.56.2.tar.xz
|
||||
/vala-0.56.3.tar.xz
|
||||
/vala-0.56.4.tar.xz
|
||||
/vala-0.56.5.tar.xz
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (vala-0.56.4.tar.xz) = 302e72a42fcb0cffc1c8eec28014f216c3848aaecec100acabc5e952d6f3ad2471b341e92a266f452c3335b8d1dde9cb0b1e6da62b754ffb4749b0aa862f24ba
|
||||
SHA512 (vala-0.56.5.tar.xz) = 58bb5ea45f519414ffe0dad2f23dcf689eac2d8cd310a627d0c3667f38ec4ccd5ec1ca5921f8ec177db3004f24c7c5a138bd4652c7a07a78f0ce046e32ad9b6a
|
||||
|
||||
@ -1,66 +0,0 @@
|
||||
commit a902d7eae96a3f1ab0cb64f268443b23ee8ab45a
|
||||
Author: Rico Tzschichholz <ricotz@ubuntu.com>
|
||||
Date: Sat Mar 18 12:40:55 2023 +0100
|
||||
|
||||
codegen: Add declaration for register call of dynamic DBus interfaces
|
||||
|
||||
The call was added without the required extern declaration
|
||||
|
||||
Found by -Werror=implicit-function-declaration
|
||||
|
||||
Fixes https://gitlab.gnome.org/GNOME/vala/issues/1422
|
||||
|
||||
diff --git a/codegen/valaccodemethodmodule.vala b/codegen/valaccodemethodmodule.vala
|
||||
index 77ff73c3120bcafd..6edafac6a07e7cb4 100644
|
||||
--- a/codegen/valaccodemethodmodule.vala
|
||||
+++ b/codegen/valaccodemethodmodule.vala
|
||||
@@ -291,6 +291,12 @@ public abstract class Vala.CCodeMethodModule : CCodeStructModule {
|
||||
}
|
||||
}
|
||||
|
||||
+ unowned Interface? iface = type_symbol as Interface;
|
||||
+ bool is_dbus_interface = false;
|
||||
+ if (iface != null) {
|
||||
+ is_dbus_interface = GDBusModule.get_dbus_name (type_symbol) != null;
|
||||
+ }
|
||||
+
|
||||
// Add function prototypes for required register-type-calls which are likely external
|
||||
if (type_symbol.source_reference.file != cfile.file) {
|
||||
// TODO Duplicated source with TypeRegisterFunction.init_from_type()
|
||||
@@ -298,22 +304,26 @@ public abstract class Vala.CCodeMethodModule : CCodeStructModule {
|
||||
register_func.add_parameter (new CCodeParameter ("module", "GTypeModule *"));
|
||||
register_func.is_declaration = true;
|
||||
cfile.add_function_declaration (register_func);
|
||||
+
|
||||
+ // TODO Duplicated source with GDBusClientModule.generate_interface_declaration()
|
||||
+ if (is_dbus_interface) {
|
||||
+ var proxy_register_type = new CCodeFunction ("%sproxy_register_dynamic_type".printf (get_ccode_lower_case_prefix (iface)));
|
||||
+ proxy_register_type.add_parameter (new CCodeParameter ("module", "GTypeModule*"));
|
||||
+ proxy_register_type.modifiers |= CCodeModifiers.EXTERN;
|
||||
+ cfile.add_function_declaration (proxy_register_type);
|
||||
+ requires_vala_extern = true;
|
||||
+ }
|
||||
}
|
||||
|
||||
var register_call = new CCodeFunctionCall (new CCodeIdentifier ("%s_register_type".printf (get_ccode_lower_case_name (type_symbol, null))));
|
||||
register_call.add_argument (new CCodeIdentifier (module_init_param_name));
|
||||
ccode.add_expression (register_call);
|
||||
|
||||
- var iface = type_symbol as Interface;
|
||||
- if (iface != null) {
|
||||
- string? dbus_name = GDBusModule.get_dbus_name(type_symbol);
|
||||
-
|
||||
- if (dbus_name != null) {
|
||||
- string proxy_cname = get_ccode_lower_case_prefix (type_symbol) + "proxy";
|
||||
- var register_proxy = new CCodeFunctionCall (new CCodeIdentifier ("%s_register_dynamic_type".printf (proxy_cname)));
|
||||
- register_proxy.add_argument (new CCodeIdentifier (module_init_param_name));
|
||||
- ccode.add_expression (register_proxy);
|
||||
- }
|
||||
+ if (is_dbus_interface) {
|
||||
+ string proxy_cname = get_ccode_lower_case_prefix (type_symbol) + "proxy";
|
||||
+ var register_proxy = new CCodeFunctionCall (new CCodeIdentifier ("%s_register_dynamic_type".printf (proxy_cname)));
|
||||
+ register_proxy.add_argument (new CCodeIdentifier (module_init_param_name));
|
||||
+ ccode.add_expression (register_proxy);
|
||||
}
|
||||
}
|
||||
|
||||
14
vala.spec
14
vala.spec
@ -2,15 +2,14 @@
|
||||
%global priority 90
|
||||
|
||||
Name: vala
|
||||
Version: 0.56.4
|
||||
Release: 2%{?dist}
|
||||
Version: 0.56.5
|
||||
Release: 1%{?dist}
|
||||
Summary: A modern programming language for GNOME
|
||||
|
||||
# Most files are LGPLv2.1+, curses.vapi is 2-clause BSD
|
||||
License: LGPL-2.1-or-later AND BSD-2-Clause
|
||||
URL: https://wiki.gnome.org/Projects/Vala
|
||||
Source0: https://download.gnome.org/sources/%{name}/0.56/%{name}-%{version}.tar.xz
|
||||
Patch0: vala-register_plugin_type-c99.patch
|
||||
|
||||
BuildRequires: bison
|
||||
BuildRequires: flex
|
||||
@ -63,8 +62,6 @@ This package contains the shared libvala library.
|
||||
%package -n libvala-devel
|
||||
Summary: Development files for libvala
|
||||
Requires: libvala%{?_isa} = %{version}-%{release}
|
||||
# Renamed in F30
|
||||
Provides: vala-devel = %{version}-%{release}
|
||||
|
||||
%description -n libvala-devel
|
||||
Vala is a new programming language that aims to bring modern programming
|
||||
@ -78,8 +75,6 @@ necessary for using the %{name} compiler.
|
||||
|
||||
%package doc
|
||||
Summary: Documentation for %{name}
|
||||
License: LGPLv2+
|
||||
|
||||
BuildArch: noarch
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: devhelp
|
||||
@ -145,7 +140,7 @@ export -n VALAFLAGS
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
%doc README.md
|
||||
%doc NEWS README.md
|
||||
%{_bindir}/vala
|
||||
%{_bindir}/vala-%{api_ver}
|
||||
%{_bindir}/valac
|
||||
@ -195,6 +190,9 @@ export -n VALAFLAGS
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Mar 27 2023 David King <amigadave@amigadave.com> - 0.56.5-1
|
||||
- Update to 0.56.5
|
||||
|
||||
* Mon Mar 20 2023 Florian Weimer <fweimer@redhat.com> - 0.56.4-2
|
||||
- Apply upstream patch to fix C99 issue in generated code (#2179136)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user