From 0818a824bc78b56b78140faab8dec5d1016458ca Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069@gmail.com>
Date: Aug 14 2019 06:53:01 +0000
Subject: Checkout required patches from master.


---

diff --git a/0001-Support-for-new-elfutils-Fedora-30.patch b/0001-Support-for-new-elfutils-Fedora-30.patch
new file mode 100644
index 0000000..6a20279
--- /dev/null
+++ b/0001-Support-for-new-elfutils-Fedora-30.patch
@@ -0,0 +1,50 @@
+From 3d6dbb6d48d10579984fb7fda2e79d3d73e10f70 Mon Sep 17 00:00:00 2001
+From: Andrey Ponomarenko <andrewponomarenko@yandex.ru>
+Date: Wed, 3 Jul 2019 16:51:32 +0300
+Subject: [PATCH] Support for new elfutils (Fedora 30)
+
+---
+ abi-dumper.pl | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+--- a/abi-dumper.pl
++++ b/abi-dumper.pl
+@@ -3,7 +3,7 @@
+ # ABI Dumper 1.1
+ # Dump ABI of an ELF object containing DWARF debug info
+ #
+-# Copyright (C) 2013-2017 Andrey Ponomarenko's ABI Laboratory
++# Copyright (C) 2013-2019 Andrey Ponomarenko's ABI Laboratory
+ #
+ # Written by Andrey Ponomarenko
+ #
+@@ -92,7 +92,7 @@ my %ERROR_CODE = (
+ 
+ my $ShortUsage = "ABI Dumper $TOOL_VERSION
+ Dump ABI of an ELF object containing DWARF debug info
+-Copyright (C) 2017 Andrey Ponomarenko's ABI Laboratory
++Copyright (C) 2019 Andrey Ponomarenko's ABI Laboratory
+ License: GNU LGPL or GNU GPL
+ 
+ Usage: $CmdName [options] [object]
+@@ -4276,6 +4276,11 @@ sub setSource(@)
+     
+     if(defined $File)
+     {
++        if(index($File, "(")!=-1)
++        { # Support for new elfutils (Fedora 30)
++            $File=~s/.+ \((\d+)\)/$1/;
++        }
++        
+         my $Name = undef;
+         
+         if($ID>=0) {
+@@ -6504,7 +6509,7 @@ sub scenario()
+     if($ShowVersion)
+     {
+         printMsg("INFO", "ABI Dumper $TOOL_VERSION");
+-        printMsg("INFO", "Copyright (C) 2017 Andrey Ponomarenko's ABI Laboratory");
++        printMsg("INFO", "Copyright (C) 2019 Andrey Ponomarenko's ABI Laboratory");
+         printMsg("INFO", "License: LGPL or GPL <http://www.gnu.org/licenses/>");
+         printMsg("INFO", "This program is free software: you can redistribute it and/or modify it.\n");
+         printMsg("INFO", "Written by Andrey Ponomarenko.");
diff --git a/abi-dumper-perl-brace.patch b/abi-dumper-perl-brace.patch
new file mode 100644
index 0000000..04d3c73
--- /dev/null
+++ b/abi-dumper-perl-brace.patch
@@ -0,0 +1,14 @@
+Unescaped left brace in regex is deprecated
+https://bugzilla.redhat.com/show_bug.cgi?id=1685441
+
+--- a/abi-dumper.pl
++++ b/abi-dumper.pl
+@@ -3197,7 +3197,7 @@ sub formatName($$)
+     
+     if(defined $LambdaSupport)
+     { # struct {lambda()}
+-        $N=~s/(\w){/$1 {/g;
++        $N=~s/(\w)\{/$1 {/g;
+     }
+     
+     return ($Cache{"formatName"}{$_[1]}{$_[0]} = $N);