Rebase against 3a8d71041c159d76a76856867caa1de8ca297151.

patches/widl-SLTG_Typelib_Support/0001-widl-Add-initial-implementation-of-SLTG-typelib-gene.patch

@@ -1,4 +1,4 @@
-From 28bf40df3b2fa5b91fc59ed287658cafea46c0d6 Mon Sep 17 00:00:00 2001
+From e5892f2ea96dbfea56330c6e3ca6829b059dc8d3 Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Wed, 23 Dec 2015 19:37:37 +0800
 Subject: [PATCH] widl: Add initial implementation of SLTG typelib generator.
@@ -36,26 +36,26 @@ index 7df7d290825..5d9f45a7c38 100644
 +extern int create_sltg_typelib(typelib_t *typelib);
  #endif
 diff --git a/tools/widl/widl.c b/tools/widl/widl.c
-index e37160e3869..fd701aa1126 100644
+index 9d3ea0c36bf..473e649fbe1 100644
 --- a/tools/widl/widl.c
 +++ b/tools/widl/widl.c
-@@ -154,6 +154,7 @@ enum {
+@@ -153,6 +153,7 @@ enum {
      DLLDATA_ONLY_OPTION,
      LOCAL_STUBS_OPTION,
      NOSTDINC_OPTION,
 +    OLD_TYPELIB_OPTION,
+     PACKING_OPTION,
      PREFIX_ALL_OPTION,
      PREFIX_CLIENT_OPTION,
-     PREFIX_SERVER_OPTION,
-@@ -180,6 +181,7 @@ static const struct long_option long_options[] = {
+@@ -179,6 +180,7 @@ static const struct long_option long_options[] = {
      { "nostdinc", 0, NOSTDINC_OPTION },
      { "ns_prefix", 0, RT_NS_PREFIX },
      { "oldnames", 0, OLDNAMES_OPTION },
 +    { "oldtlb", 0, OLD_TYPELIB_OPTION },
      { "output", 0, 'o' },
+     { "packing", 1, PACKING_OPTION },
      { "prefix-all", 1, PREFIX_ALL_OPTION },
-     { "prefix-client", 1, PREFIX_CLIENT_OPTION },
-@@ -626,6 +628,10 @@ static void option_callback( int optc, char *optarg )
+@@ -619,6 +621,10 @@ static void option_callback( int optc, char *optarg )
        do_everything = 0;
        do_typelib = 1;
        break;

staging/upstream-commit

@@ -1 +1 @@
-b1bd72343e49f68e42b4493055b1f5de9796d335
+3a8d71041c159d76a76856867caa1de8ca297151