Remove gcc 9 patch as it's upstreamed

See: https://github.com/clearlinux/make-fmv-patch/pull/12

3 files changed, 4 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 62bc32c89c62..43037c25d079 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = make-fmv-patch-git
 	pkgdesc = Make FMV patch generator
-	pkgver = r15.a73d316
+	pkgver = r21.831ace4
 	pkgrel = 1
 	url = https://github.com/clearlinux/make-fmv-patch
 	arch = any
@@ -12,9 +12,7 @@ pkgbase = make-fmv-patch-git
 	provides = make-fmv-patch
 	conflicts = make-fmv-patch
 	source = git+https://github.com/clearlinux/make-fmv-patch.git
-	source = make-fmv-patch-log-format.patch
 	sha256sums = SKIP
-	sha256sums = 396f194ba9a8a9f3680adfab742120506ee13263de89cb86e1570755e1551a25
 
 pkgname = make-fmv-patch-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 9f6cfbb1ad20..43aebf942423 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Martin Kröning <m dot kroening at hotmail dot de>
 pkgname=make-fmv-patch-git
-pkgver=r15.a73d316
+pkgver=r21.831ace4
 pkgrel=1
 pkgdesc='Make FMV patch generator'
 arch=('any')
@@ -10,21 +10,14 @@ depends=('perl' 'ctags' 'gcc>=6.0.0')
 makedepends=('git')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
-source=("git+https://github.com/clearlinux/${pkgname%-git}.git"
-        "${pkgname%-git}-log-format.patch")
-sha256sums=('SKIP'
-            '396f194ba9a8a9f3680adfab742120506ee13263de89cb86e1570755e1551a25')
+source=("git+https://github.com/clearlinux/${pkgname%-git}.git")
+sha256sums=('SKIP')
 
 pkgver() {
         cd "$srcdir/${pkgname%-git}"
         printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-        cd "$srcdir/${pkgname%-git}"
-        patch -p1 -i "$srcdir/${pkgname%-git}-log-format.patch"
-}
-
 check() {
         cd "$srcdir/${pkgname%-git}/tests"
         make distclean all
diff --git a/make-fmv-patch-log-format.patch b/make-fmv-patch-log-format.patch
deleted file mode 100644
index c9dc3f8963a3..000000000000
--- a/make-fmv-patch-log-format.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/make-fmv-patch.pl b/make-fmv-patch.pl
-index 69f7c3a..582b0c2 100644
---- a/make-fmv-patch.pl
-+++ b/make-fmv-patch.pl
-@@ -97,7 +97,7 @@ sub find_file {
- 
- open(BUILD_LOG, '<', "$log_file") or die $!;
- while (<BUILD_LOG>) {
--    if($_ =~ /(\S+):([0-9]*):([0-9]*): note: (basic block|loop) (vectorized)/) {
-+    if($_ =~ /(\S+):([0-9]*):([0-9]*): (optimized|note): (basic block|loop) (vectorized)/) {
- 	$fmv->{s_name} = (split('/',$1))[-1];
- 	$fmv->{f_name} = $1;
- 	push @{$f{$1}->{v_line}},$2;