Bump to upstream release v2.4.15

3 files changed, 15 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 748264fa4645..dda12ef549b0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = viennarna
 	pkgdesc = RNA Secondary Structure Prediction and Comparison
-	pkgver = 2.4.14
-	pkgrel = 2
+	pkgver = 2.4.15
+	pkgrel = 1
 	url = http://www.tbi.univie.ac.at/RNA
 	arch = x86_64
 	arch = i686
@@ -16,31 +16,29 @@ pkgbase = viennarna
 	makedepends = gsl
 	options = staticlibs
 	options = !strip
-	source = http://www.tbi.univie.ac.at/RNA/packages/source/ViennaRNA-2.4.14.tar.gz
-	source = 0001-Fix-compilation-issues-with-GCC-10.patch
-	sha256sums = ba9cfc8a48e457fc891628f3229a3924de31714460dc4a4dec081868f802cc28
-	sha256sums = 4fb955d969b9a4c9fba7b3e7be7727c008454d1a2ea7ef5263ffc2544c0fe352
+	source = http://www.tbi.univie.ac.at/RNA/packages/source/ViennaRNA-2.4.15.tar.gz
+	sha256sums = 9ae7614586941ff3471596eade743bd2ec416b2d5c185f35ef93b9845c761d10
 
 pkgname = viennarna
 	depends = perl
 	depends = mpfr
 	depends = gsl
 	optdepends = gri: create 2D plots of secondary structure landscape with RNA2Dfold
-	provides = Kinfold=1.3
+	provides = Kinfold=1.4
 	provides = RNAforester=2.0
 	provides = kinwalker=2.0
-	provides = viennarna2=2.4.14
-	provides = libRNA=2.4.14
+	provides = viennarna2=2.4.15
+	provides = libRNA=2.4.15
 
 pkgname = python-rna
 	depends = python
-	depends = viennarna=2.4.14
+	depends = viennarna=2.4.15
 
 pkgname = python2-rna
 	depends = python2
-	depends = viennarna=2.4.14
+	depends = viennarna=2.4.15
 
 pkgname = perl-rna
 	depends = perl
-	depends = viennarna=2.4.14
+	depends = viennarna=2.4.15
 
diff --git a/0001-Fix-compilation-issues-with-GCC-10.patch b/0001-Fix-compilation-issues-with-GCC-10.patch
deleted file mode 100644
index 97f1f8776bf2..000000000000
--- a/0001-Fix-compilation-issues-with-GCC-10.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From d1ec784dfae5b46fd70bd1fc49ec3c96e92edf6d Mon Sep 17 00:00:00 2001
-From: Ronny Lorenz <ronny@tbi.univie.ac.at>
-Date: Wed, 3 Jun 2020 10:13:13 +0200
-Subject: [PATCH] Fix compilation issues with GCC 10
-
----
- globals.c | 5 +++++
- globals.h | 6 +++---
- 2 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/globals.c b/globals.c
-index c1a8859..e5c1a4a 100644
---- a/globals.c
-+++ b/globals.c
-@@ -25,6 +25,11 @@
- #include "globals.h"
- #include "cmdline.h"
- 
-+
-+GlobVars GSV;
-+GlobArrays GAV;
-+GlobToggles GTV;
-+
- /* forward declarations privat functions */
- static void ini_globs(void);
- static void ini_gtoggles (void);
-diff --git a/globals.h b/globals.h
-index 622c7db..eafd13c 100644
---- a/globals.h
-+++ b/globals.h
-@@ -88,9 +88,9 @@ void clean_up_globals(void);
- void log_prog_params(FILE *FP);
- void log_start_stop(FILE *FP);
- 
--GlobVars GSV;
--GlobArrays GAV;
--GlobToggles GTV;
-+extern GlobVars GSV;
-+extern GlobArrays GAV;
-+extern GlobToggles GTV;
- 
- #endif
- 
--- 
-2.26.2
-
diff --git a/PKGBUILD b/PKGBUILD
index dcb0d461792b..582094e0ba98 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgbase=viennarna
 pkgname=('viennarna' 'python-rna' 'python2-rna' 'perl-rna')
-pkgver=2.4.14
-pkgrel=2
+pkgver=2.4.15
+pkgrel=1
 pkgdesc="RNA Secondary Structure Prediction and Comparison"
 arch=('x86_64' 'i686')
 license=('Custom')
@@ -16,16 +16,13 @@ makedepends=( 'perl'
               'check'
               'mpfr'
               'gsl')
-source=(http://www.tbi.univie.ac.at/RNA/packages/source/ViennaRNA-${pkgver}.tar.gz
-        '0001-Fix-compilation-issues-with-GCC-10.patch')
+source=(http://www.tbi.univie.ac.at/RNA/packages/source/ViennaRNA-${pkgver}.tar.gz)
 
 options=('staticlibs' '!strip')
-sha256sums=('ba9cfc8a48e457fc891628f3229a3924de31714460dc4a4dec081868f802cc28'
-            '4fb955d969b9a4c9fba7b3e7be7727c008454d1a2ea7ef5263ffc2544c0fe352')
+sha256sums=('9ae7614586941ff3471596eade743bd2ec416b2d5c185f35ef93b9845c761d10')
 
 prepare() {
   cd "${srcdir}/ViennaRNA-${pkgver}"
-  patch -d src/Kinfold -p1 -i "${srcdir}/0001-Fix-compilation-issues-with-GCC-10.patch"
   ./configure \
       --with-cluster \
       --with-kinwalker \
@@ -49,7 +46,7 @@ package_viennarna() {
            'mpfr'
            'gsl')
   optdepends=('gri: create 2D plots of secondary structure landscape with RNA2Dfold')
-  provides=('Kinfold=1.3'
+  provides=('Kinfold=1.4'
             'RNAforester=2.0'
             'kinwalker=2.0'
             "viennarna2=${pkgver}"