From 53fb22354e3d1786b2dd464fed5772637ae8df19 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <zfigura@codeweavers.com>
Date: Tue, 12 Apr 2022 17:23:45 -0500
Subject: [PATCH] widl-SLTG_Typelib_Support: Correctly rebase against
 4bc52e3324a505e6f12652a526cdbd09c24e7afc.

---
 ...l-implementation-of-SLTG-typelib-gene.patch | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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 1abc3b1d..8031fa11 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
@@ -1,4 +1,4 @@
-From 61c9dd1107e9a6d058d9fc4e35d9f6694c0ecd9c Mon Sep 17 00:00:00 2001
+From aa0011513d9570ef49ac7227e4ab4f0b0782020a 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.
@@ -12,7 +12,7 @@ Subject: [PATCH] widl: Add initial implementation of SLTG typelib generator.
  create mode 100644 tools/widl/write_sltg.c
 
 diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in
-index 7eb74b813a4..858991f2e74 100644
+index 32d27060c22..6679f20fd22 100644
 --- a/tools/widl/Makefile.in
 +++ b/tools/widl/Makefile.in
 @@ -15,7 +15,8 @@ C_SRCS = \
@@ -36,10 +36,10 @@ 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 5c11f6285ea..2199087ebdf 100644
+index 7b2276b0a41..0d5e4fea456 100644
 --- a/tools/widl/widl.c
 +++ b/tools/widl/widl.c
-@@ -169,6 +169,7 @@ enum {
+@@ -159,6 +159,7 @@ enum {
      DLLDATA_ONLY_OPTION,
      LOCAL_STUBS_OPTION,
      NOSTDINC_OPTION,
@@ -47,15 +47,15 @@ index 5c11f6285ea..2199087ebdf 100644
      PREFIX_ALL_OPTION,
      PREFIX_CLIENT_OPTION,
      PREFIX_SERVER_OPTION,
-@@ -195,6 +196,7 @@ static const struct long_option long_options[] = {
+@@ -185,6 +186,7 @@ static const struct long_option long_options[] = {
      { "nostdinc", 0, NOSTDINC_OPTION },
      { "ns_prefix", 0, RT_NS_PREFIX },
      { "oldnames", 0, OLDNAMES_OPTION },
-+    { "oldtlb", 0, NULL, OLD_TYPELIB_OPTION },
++    { "oldtlb", 0, OLD_TYPELIB_OPTION },
      { "output", 0, 'o' },
      { "prefix-all", 1, PREFIX_ALL_OPTION },
      { "prefix-client", 1, PREFIX_CLIENT_OPTION },
-@@ -714,6 +716,10 @@ static void option_callback( int optc, char *optarg )
+@@ -645,6 +647,10 @@ static void option_callback( int optc, char *optarg )
        do_everything = 0;
        do_typelib = 1;
        break;
@@ -68,7 +68,7 @@ index 5c11f6285ea..2199087ebdf 100644
        break;
 diff --git a/tools/widl/write_sltg.c b/tools/widl/write_sltg.c
 new file mode 100644
-index 00000000000..80e3b5f06a3
+index 00000000000..34ad6a97cfc
 --- /dev/null
 +++ b/tools/widl/write_sltg.c
 @@ -0,0 +1,561 @@
@@ -634,5 +634,5 @@ index 00000000000..80e3b5f06a3
 +    return 1;
 +}
 -- 
-2.33.0
+2.34.1