1.2.7

3 files changed, 18 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a367830d5753..6ab44aae1851 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = wiggletools
 	pkgdesc = Compute genome-wide statistics with composable iterators
-	pkgver = 1.2.5
+	pkgver = 1.2.7
 	pkgrel = 1
 	url = https://github.com/Ensembl/WiggleTools
 	arch = i686
@@ -10,10 +10,10 @@ pkgbase = wiggletools
 	depends = htslib
 	depends = libbigwig
 	depends = python2
-	source = wiggletools-1.2.5.tar.gz::https://github.com/Ensembl/WiggleTools/archive/v1.2.5.tar.gz
+	source = wiggletools-1.2.7.tar.gz::https://github.com/Ensembl/WiggleTools/archive/v1.2.7.tar.gz
 	source = wiggletools-flags.patch
-	sha256sums = 8405bef388d77cab58c695e60478f62d291057e8f1210d7574850df0b84df348
-	sha256sums = b945a520e71f9a9f4f62f7e737847990d9cde05d8f0ea5af75dfdd6155d3493e
+	sha256sums = 62eb04eed3f1be3b2adbcc7627cae44093680aa73a48f99d8621cfd85a92750c
+	sha256sums = ea25efb9f4308f2d9b65cfd153baa107afce482fdbce746cfdb3e2b5f20312ef
 
 pkgname = wiggletools
 
diff --git a/PKGBUILD b/PKGBUILD
index 6a997abf632a..965472d1be81 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Christian Krause ("wookietreiber") <christian dot krause at mailbox dot org>
 
 pkgname=wiggletools
-pkgver=1.2.5
+pkgver=1.2.7
 pkgrel=1
 pkgdesc="Compute genome-wide statistics with composable iterators"
 arch=('i686' 'x86_64')
@@ -11,8 +11,8 @@ license=('Apache')
 depends=('gsl' 'htslib' 'libbigwig' 'python2')
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/Ensembl/WiggleTools/archive/v${pkgver}.tar.gz"
         "wiggletools-flags.patch")
-sha256sums=('8405bef388d77cab58c695e60478f62d291057e8f1210d7574850df0b84df348'
-            'b945a520e71f9a9f4f62f7e737847990d9cde05d8f0ea5af75dfdd6155d3493e')
+sha256sums=('62eb04eed3f1be3b2adbcc7627cae44093680aa73a48f99d8621cfd85a92750c'
+            'ea25efb9f4308f2d9b65cfd153baa107afce482fdbce746cfdb3e2b5f20312ef')
 
 prepare() {
   cd "${srcdir}/WiggleTools-${pkgver}"
diff --git a/wiggletools-flags.patch b/wiggletools-flags.patch
index e17029fb9b6f..d56c62204410 100644
--- a/wiggletools-flags.patch
+++ b/wiggletools-flags.patch
@@ -1,24 +1,18 @@
---- a/src/Makefile	2020-08-13 10:25:02.781495451 -0400
-+++ b/src/Makefile	2020-08-13 10:29:03.068773044 -0400
-@@ -1,9 +1,10 @@
+--- a/src/Makefile	2021-01-04 20:25:57.361048840 -0500
++++ b/src/Makefile	2021-01-04 20:27:57.596453700 -0500
+@@ -1,4 +1,5 @@
 -CFLAGS=-g -Wall -O3 -std=gnu99
 +CFLAGS+=-g -Wall -O3 -std=gnu99
 +LDFLAGS+=
  LIBDIR=../lib
  BINDIR=../bin
- INC=-I../../libBigWig -I../../htslib
- LIB_PATHS=-L${LIBDIR} -L../../libBigWig -L../../htslib
--LIBS= -lwiggletools -l:libBigWig.a -lcurl -l:libhts.a -lgsl  -lgslcblas -lz -lpthread -lm -llzma -lbz2
-+LIBS= -lwiggletools -lBigWig -lcurl -lhts -lgsl  -lgslcblas -lz -lpthread -lm -llzma -lbz2
- OPTS=-D_PBGZF_USE
+ LIBS= -lwiggletools -lBigWig -lcurl -lhts -lgsl  -lgslcblas -lz -lpthread -lm -llzma -lbz2
+@@ -18,7 +19,7 @@
+ 	mkdir -p ${LIBDIR}
+ 	ar rcs ${LIBDIR}/libwiggletools.a *.o
  
- default: lib bin
-@@ -12,7 +13,7 @@
- 
- ${BINDIR}/wiggletools: ${LIBDIR}/libwiggletools.a wiggletools.o
- 	mkdir -p ${BINDIR}
--	${CC} ${CFLAGS} ${LIB_PATHS} wiggletools.c ${LIBS} -o ${BINDIR}/wiggletools 
-+	${CC} ${CFLAGS} ${LDFLAGS} ${LIB_PATHS} wiggletools.c ${LIBS} -o ${BINDIR}/wiggletools 
- 
- lib: ${LIBDIR}/libwiggletools.a 
+-%.o: %.c; ${CC} ${CFLAGS} ${INC} ${OPTS} -c $< -o $@
++%.o: %.c; ${CC} ${CFLAGS} ${LDFLAGS} ${INC} ${OPTS} -c $< -o $@
  
+ clean:
+ 	rm -Rf *.o *.a wiggletools