From 49fca2d5244f44bbe4291fa1889f2baaeae944ed Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 11 Sep 2017 11:29:54 +0200 Subject: [PATCH] Update to 0.38.1 --- .gitignore | 1 + ...se-a-more-unique-internal-define-for.patch | 68 ------------------- sources | 2 +- vala.spec | 12 ++-- 4 files changed, 8 insertions(+), 75 deletions(-) delete mode 100644 0001-codegen-Try-to-use-a-more-unique-internal-define-for.patch diff --git a/.gitignore b/.gitignore index 859bfb7..5c74bf0 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /vala-0.37.90.tar.xz /vala-0.37.91.tar.xz /vala-0.38.0.tar.xz +/vala-0.38.1.tar.xz diff --git a/0001-codegen-Try-to-use-a-more-unique-internal-define-for.patch b/0001-codegen-Try-to-use-a-more-unique-internal-define-for.patch deleted file mode 100644 index 840b62f..0000000 --- a/0001-codegen-Try-to-use-a-more-unique-internal-define-for.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 8bd7fbc9e39ca6396ee323bef420dadeeac54a7d Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Fri, 8 Sep 2017 14:31:41 +0200 -Subject: [PATCH] codegen: Try to use a more unique internal define for - properties - -https://bugzilla.gnome.org/show_bug.cgi?id=787436 ---- - codegen/valagobjectmodule.vala | 8 ++++---- - codegen/valagtypemodule.vala | 2 +- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/codegen/valagobjectmodule.vala b/codegen/valagobjectmodule.vala -index 33bb87805..8b3e7a269 100644 ---- a/codegen/valagobjectmodule.vala -+++ b/codegen/valagobjectmodule.vala -@@ -144,7 +144,7 @@ public class Vala.GObjectModule : GTypeModule { - - var cinst = new CCodeFunctionCall (new CCodeIdentifier ("g_object_class_install_property")); - cinst.add_argument (ccall); -- cinst.add_argument (new CCodeConstant (get_ccode_upper_case_name (prop))); -+ cinst.add_argument (new CCodeConstant ("%s_PROPERTY".printf (get_ccode_upper_case_name (prop)))); - cinst.add_argument (get_param_spec (prop)); - - ccode.add_expression (cinst); -@@ -228,7 +228,7 @@ public class Vala.GObjectModule : GTypeModule { - cfunc = new CCodeIdentifier (get_ccode_real_name (prop.get_accessor)); - } - -- ccode.add_case (new CCodeIdentifier (get_ccode_upper_case_name (prop))); -+ ccode.add_case (new CCodeIdentifier ("%s_PROPERTY".printf (get_ccode_upper_case_name (prop)))); - if (prop.property_type.is_real_struct_type ()) { - var st = prop.property_type.data_type as Struct; - -@@ -335,7 +335,7 @@ public class Vala.GObjectModule : GTypeModule { - cfunc = new CCodeIdentifier (get_ccode_real_name (prop.set_accessor)); - } - -- ccode.add_case (new CCodeIdentifier (get_ccode_upper_case_name (prop))); -+ ccode.add_case (new CCodeIdentifier ("%s_PROPERTY".printf (get_ccode_upper_case_name (prop)))); - ccall = new CCodeFunctionCall (cfunc); - ccall.add_argument (cself); - if (prop.property_type is ArrayType && ((ArrayType)prop.property_type).element_type.data_type == string_type.data_type) { -@@ -684,7 +684,7 @@ public class Vala.GObjectModule : GTypeModule { - base.visit_property (prop); - - if (is_gobject_property (prop) && prop.parent_symbol is Class) { -- prop_enum.add_value (new CCodeEnumValue (get_ccode_upper_case_name (prop))); -+ prop_enum.add_value (new CCodeEnumValue ("%s_PROPERTY".printf (get_ccode_upper_case_name (prop)))); - - if (prop.initializer != null && prop.set_accessor != null && !prop.set_accessor.automatic_body) { - // generate a custom initializer if it couldn't be done at class_init time -diff --git a/codegen/valagtypemodule.vala b/codegen/valagtypemodule.vala -index 6d0f0d2eb..e75036041 100644 ---- a/codegen/valagtypemodule.vala -+++ b/codegen/valagtypemodule.vala -@@ -1732,7 +1732,7 @@ public class Vala.GTypeModule : GErrorModule { - public override CCodeExpression get_param_spec_cexpression (Property prop) { - var cl = (TypeSymbol) prop.parent_symbol; - var prop_array = new CCodeIdentifier ("%s_properties".printf (get_ccode_lower_case_name (cl))); -- var prop_enum_value = new CCodeIdentifier (get_ccode_upper_case_name (prop)); -+ var prop_enum_value = new CCodeIdentifier ("%s_PROPERTY".printf (get_ccode_upper_case_name (prop))); - - return new CCodeElementAccess (prop_array, prop_enum_value); - } --- -2.14.1 - diff --git a/sources b/sources index 4c42106..92d32a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vala-0.38.0.tar.xz) = 7dbce81474710c730fec2c465e38800b893af6e9882ebada22758acca5b3f71d9b10281e49aee2f99937cdc235a743ef190f0b1dfb9e229b7e16d06b7bd53eda +SHA512 (vala-0.38.1.tar.xz) = 00ed915c0ca0a095626e4189fd6331e59e53c95619f76bff51413f822e73eedac8fb0937f0fb8bc32821154d68c9d7207e120be3c71596e2e0daa855b20f1f8a diff --git a/vala.spec b/vala.spec index 51a0131..c3cd0d7 100644 --- a/vala.spec +++ b/vala.spec @@ -2,8 +2,8 @@ %global priority 90 Name: vala -Version: 0.38.0 -Release: 2%{?dist} +Version: 0.38.1 +Release: 1%{?dist} Summary: A modern programming language for GNOME # Most files are LGPLv2.1+, curses.vapi is 2-clause BSD @@ -11,9 +11,6 @@ License: LGPLv2+ and BSD URL: https://wiki.gnome.org/Projects/Vala Source0: https://download.gnome.org/sources/vala/0.38/vala-%{version}.tar.xz -# Backported from upstream -Patch0: 0001-codegen-Try-to-use-a-more-unique-internal-define-for.patch - BuildRequires: flex BuildRequires: bison BuildRequires: glib2-devel @@ -21,7 +18,7 @@ BuildRequires: gobject-introspection-devel BuildRequires: graphviz-devel BuildRequires: libxslt # only if Vala source files are patched -BuildRequires: vala +#BuildRequires: vala # for tests BuildRequires: dbus-x11 @@ -220,6 +217,9 @@ done %changelog +* Mon Sep 11 2017 Kalev Lember - 0.38.1-1 +- Update to 0.38.1 + * Fri Sep 08 2017 Kalev Lember - 0.38.0-2 - Backport a patch to fix baobab (bgo#787419)