From 523d4ac996b9183c2dde897f3ac54e1d8914220f Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 16 Aug 2019 08:54:07 +1000 Subject: [PATCH] Rebase against dc23cca322a93915465a1ea3ca6f360106cd2018 --- patches/patchinstall.sh | 2 +- ...1-widl-Add-initial-implementation-of-SLTG-typelib-gene.patch | 2 +- ...0-widl-Add-support-for-VT_USERDEFINED-to-SLTG-typelib-.patch | 2 +- ...2-widl-Add-support-for-recursive-type-references-to-SL.patch | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index bfbc4fa6..7e0fbe29 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "4c6aa8b2fa1678c39aa5a89d9b26cfc4002e744e" + echo "dc23cca322a93915465a1ea3ca6f360106cd2018" } # Show version information diff --git a/patches/widl-SLTG_Typelib_Support/0001-widl-Add-initial-implementation-of-SLTG-typelib-gene.patch b/patches/widl-SLTG_Typelib_Support/0001-widl-Add-initial-implementation-of-SLTG-typelib-gene.patch index 0c189f5d..fe72ff11 100644 --- a/patches/widl-SLTG_Typelib_Support/0001-widl-Add-initial-implementation-of-SLTG-typelib-gene.patch +++ b/patches/widl-SLTG_Typelib_Support/0001-widl-Add-initial-implementation-of-SLTG-typelib-gene.patch @@ -423,7 +423,7 @@ index 00000000..c4ddaed9 + if (is_attr(type_entry->type->attrs, ATTR_PUBLIC)) + add_typedef_typeinfo(typelib, type_entry->type); + else -+ add_type_typeinfo(typelib, type_alias_get_aliasee(type_entry->type)); ++ add_type_typeinfo(typelib, type_alias_get_aliasee_type(type_entry->type)); + } + break; + } diff --git a/patches/widl-SLTG_Typelib_Support/0010-widl-Add-support-for-VT_USERDEFINED-to-SLTG-typelib-.patch b/patches/widl-SLTG_Typelib_Support/0010-widl-Add-support-for-VT_USERDEFINED-to-SLTG-typelib-.patch index e435cd58..96f3fc24 100644 --- a/patches/widl-SLTG_Typelib_Support/0010-widl-Add-support-for-VT_USERDEFINED-to-SLTG-typelib-.patch +++ b/patches/widl-SLTG_Typelib_Support/0010-widl-Add-support-for-VT_USERDEFINED-to-SLTG-typelib-.patch @@ -244,7 +244,7 @@ index 7421899ed56..bffd94569a8 100644 + short href; + + while (type->typelib_idx < 0 && type_is_alias(type)) -+ type = type_alias_get_aliasee(type); ++ type = type_alias_get_aliasee_type(type); + + chat("write_var_desc: VT_USERDEFINED, type %p, name %s, real type %d, href %d\n", + type, type->name, type_get_type(type), type->typelib_idx); diff --git a/patches/widl-SLTG_Typelib_Support/0012-widl-Add-support-for-recursive-type-references-to-SL.patch b/patches/widl-SLTG_Typelib_Support/0012-widl-Add-support-for-recursive-type-references-to-SL.patch index 1e60de0d..10f76487 100644 --- a/patches/widl-SLTG_Typelib_Support/0012-widl-Add-support-for-recursive-type-references-to-SL.patch +++ b/patches/widl-SLTG_Typelib_Support/0012-widl-Add-support-for-recursive-type-references-to-SL.patch @@ -148,7 +148,7 @@ index 7a6967c7f39..2ba5a3c25b0 100644 - if (is_attr(type_entry->type->attrs, ATTR_PUBLIC)) - add_typedef_typeinfo(typelib, type_entry->type); - else -- add_type_typeinfo(typelib, type_alias_get_aliasee(type_entry->type)); +- add_type_typeinfo(typelib, type_alias_get_aliasee_type(type_entry->type)); + /* in old style typelibs all types are public */ + add_type_typeinfo(typelib, type_entry->type); }