From ee0bb5421257cd2fa93eb3bec723bd6e6bdf0f87 Mon Sep 17 00:00:00 2001
From: Theodore Tsirpanis <teo@tsirpanis.gr>
Date: Thu, 17 Oct 2024 20:18:56 +0300
Subject: [PATCH] Bump to 1.21 (#11)

* Bump to 1.21

* Update patch to disable building all tests.

* Delete patches/makefile.staticlink.patch
---
 .github/workflows/msys2-htslib-build.yml |  2 +-
 patches/makefile.staticlink.patch        | 56 ------------------------
 scripts/build-htslib.sh                  |  1 -
 3 files changed, 1 insertion(+), 58 deletions(-)
 delete mode 100644 patches/makefile.staticlink.patch

diff --git a/.github/workflows/msys2-htslib-build.yml b/.github/workflows/msys2-htslib-build.yml
index c620f1e..a85c818 100644
--- a/.github/workflows/msys2-htslib-build.yml
+++ b/.github/workflows/msys2-htslib-build.yml
@@ -12,7 +12,7 @@ on:
       - 'scripts/**'
   workflow_dispatch:
 env:
-  PACKAGE_VERSION: "1.20"
+  PACKAGE_VERSION: "1.21"
   LIBHTS_SOVERSION: 3
   RELEASE_VERSION: 0 # equivalent to conda build number
 jobs:
diff --git a/patches/makefile.staticlink.patch b/patches/makefile.staticlink.patch
deleted file mode 100644
index 52afc47..0000000
--- a/patches/makefile.staticlink.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-632c632
-< 	$(CC) $(LDFLAGS) -o $@ test/test_bgzf.o libhts.a -lz $(LIBS) -lpthread
----
-> 	$(CC) $(LDFLAGS) -o $@ test/test_bgzf.o libhts.a  $(LIBS) -lpthread
-635c635
-< 	$(CC) $(LDFLAGS) -o $@ test/test_expr.o libhts.a -lz $(LIBS) -lpthread
----
-> 	$(CC) $(LDFLAGS) -o $@ test/test_expr.o libhts.a  $(LIBS) -lpthread
-638c638
-< 	$(CC) $(LDFLAGS) -o $@ test/test_faidx.o libhts.a -lz $(LIBS) -lpthread
----
-> 	$(CC) $(LDFLAGS) -o $@ test/test_faidx.o libhts.a $(LIBS) -lpthread
-641c641
-< 	$(CC) $(LDFLAGS) -o $@ test/test_kfunc.o libhts.a -lz $(LIBS) -lpthread
----
-> 	$(CC) $(LDFLAGS) -o $@ test/test_kfunc.o libhts.a  $(LIBS) -lpthread
-644c644
-< 	$(CC) $(LDFLAGS) -o $@ test/test_kstring.o libhts.a -lz $(LIBS) -lpthread
----
-> 	$(CC) $(LDFLAGS) -o $@ test/test_kstring.o libhts.a  $(LIBS) -lpthread
-677c677
-< 	$(CC) $(LDFLAGS) -o $@ test/test-bcf-sr.o libhts.a -lz $(LIBS) -lpthread
----
-> 	$(CC) $(LDFLAGS) -o $@ test/test-bcf-sr.o libhts.a  $(LIBS) -lpthread
-680c680
-< 	$(CC) $(LDFLAGS) -o $@ test/test-bcf-translate.o libhts.a -lz $(LIBS) -lpthread
----
-> 	$(CC) $(LDFLAGS) -o $@ test/test-bcf-translate.o libhts.a  $(LIBS) -lpthread
-768c768
-< 	$(CC) $(LDFLAGS) -o $@ test/thrash_threads1.o libhts.a -lz $(LIBS) -lpthread
----
-> 	$(CC) $(LDFLAGS) -o $@ test/thrash_threads1.o libhts.a  $(LIBS) -lpthread
-771c771
-< 	$(CC) $(LDFLAGS) -o $@ test/thrash_threads2.o libhts.a -lz $(LIBS) -lpthread
----
-> 	$(CC) $(LDFLAGS) -o $@ test/thrash_threads2.o libhts.a  $(LIBS) -lpthread
-774c774
-< 	$(CC) $(LDFLAGS) -o $@ test/thrash_threads3.o libhts.a -lz $(LIBS) -lpthread
----
-> 	$(CC) $(LDFLAGS) -o $@ test/thrash_threads3.o libhts.a  $(LIBS) -lpthread
-777c777
-< 	$(CC) $(LDFLAGS) -o $@ test/thrash_threads4.o libhts.a -lz $(LIBS) -lpthread
----
-> 	$(CC) $(LDFLAGS) -o $@ test/thrash_threads4.o libhts.a  $(LIBS) -lpthread
-780c780
-< 	$(CC) $(LDFLAGS) -o $@ test/thrash_threads5.o libhts.a -lz $(LIBS) -lpthread
----
-> 	$(CC) $(LDFLAGS) -o $@ test/thrash_threads5.o libhts.a  $(LIBS) -lpthread
-783c783
-< 	$(CC) $(LDFLAGS) -o $@ test/thrash_threads6.o libhts.a -lz $(LIBS) -lpthread
----
-> 	$(CC) $(LDFLAGS) -o $@ test/thrash_threads6.o libhts.a  $(LIBS) -lpthread
-786c786
-< 	$(CC) $(LDFLAGS) -o $@ test/thrash_threads7.o libhts.a -lz $(LIBS) -lpthread
----
-> 	$(CC) $(LDFLAGS) -o $@ test/thrash_threads7.o libhts.a  $(LIBS) -lpthread
diff --git a/scripts/build-htslib.sh b/scripts/build-htslib.sh
index 985c39d..120acef 100644
--- a/scripts/build-htslib.sh
+++ b/scripts/build-htslib.sh
@@ -7,7 +7,6 @@ LIBHTS_SOVERSION=${LIBHTS_SOVERSION-3}
 ./configure --disable-libcurl
 
 # apply patches
-patch Makefile "${PATCH_DIR}/makefile.staticlink.patch"
 patch config.mk "${PATCH_DIR}/config.mk.staticlink.patch"
 patch htslib/hts_defs.h "${PATCH_DIR}/htslib/hts_defs.h.staticlink.patch"