From 63e73b2db8306aac62953e94aad6293caff9c528 Mon Sep 17 00:00:00 2001 From: Kez Cleal <42997789+kcleal@users.noreply.github.com> Date: Mon, 8 Jul 2024 15:14:39 +0100 Subject: [PATCH 01/11] Update build.sh --- x11-packages/gw/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-packages/gw/build.sh b/x11-packages/gw/build.sh index 78d2fecf12f3b3f..ff8a288e894b94a 100644 --- a/x11-packages/gw/build.sh +++ b/x11-packages/gw/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/kcleal/gw TERMUX_PKG_DESCRIPTION="A browser for genomic sequencing data (.bam/.cram format)" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="clealk@cardiff.ac.uk" -TERMUX_PKG_VERSION=0.9.3 +TERMUX_PKG_VERSION=0.10.0 TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/kcleal/gw/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=43445ef6d96bd8a09a9a45cd18e21481d7fefe7e9ab26aec4abd8d1f4bff3fcd +TERMUX_PKG_SHA256=81d9a560152af6d1c45d90336c74ad051edb5ea29bab5b8791c323b1ed3ac608 TERMUX_PKG_DEPENDS="glfw, htslib, libc++, libjpeg-turbo, opengl" TERMUX_PKG_BUILD_DEPENDS="fontconfig, freetype, libicu, libuuid, mesa-dev" TERMUX_PKG_AUTO_UPDATE=true From 1a7887daf83a5f7bee86da8633ee1754437ce12e Mon Sep 17 00:00:00 2001 From: Kez Cleal <42997789+kcleal@users.noreply.github.com> Date: Mon, 8 Jul 2024 16:02:33 +0100 Subject: [PATCH 02/11] Update build.sh --- x11-packages/gw/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-packages/gw/build.sh b/x11-packages/gw/build.sh index ff8a288e894b94a..ca572fa0f3ca6d3 100644 --- a/x11-packages/gw/build.sh +++ b/x11-packages/gw/build.sh @@ -6,8 +6,8 @@ TERMUX_PKG_VERSION=0.10.0 TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/kcleal/gw/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=81d9a560152af6d1c45d90336c74ad051edb5ea29bab5b8791c323b1ed3ac608 -TERMUX_PKG_DEPENDS="glfw, htslib, libc++, libjpeg-turbo, opengl" -TERMUX_PKG_BUILD_DEPENDS="fontconfig, freetype, libicu, libuuid, mesa-dev" +TERMUX_PKG_DEPENDS="glfw, htslib, libc++, libjpeg-turbo, opengl, libcurl" +TERMUX_PKG_BUILD_DEPENDS="fontconfig, freetype, libicu, libuuid, mesa-dev, libcurl" TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true From 4ec1f5c327115a106a74a17662f9316a6f852840 Mon Sep 17 00:00:00 2001 From: Kez Cleal <42997789+kcleal@users.noreply.github.com> Date: Tue, 9 Jul 2024 08:58:57 +0100 Subject: [PATCH 03/11] Update build.sh --- x11-packages/gw/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-packages/gw/build.sh b/x11-packages/gw/build.sh index ca572fa0f3ca6d3..0483087ac57a5b3 100644 --- a/x11-packages/gw/build.sh +++ b/x11-packages/gw/build.sh @@ -55,7 +55,7 @@ termux_step_make() { unzip -o "${TERMUX_PKG_CACHEDIR}/skia-${TERMUX_ARCH}.zip" cd ../../ - make -j "$TERMUX_PKG_MAKE_PROCESSES" + LDFLAGS+="${LDFLAGS} -L${TERMUX_PREFIX}/lib" make -j "$TERMUX_PKG_MAKE_PROCESSES" } termux_step_make_install() { From 6de564e8ef1ab99aac687677931d620e6d0acb81 Mon Sep 17 00:00:00 2001 From: Kez Cleal <42997789+kcleal@users.noreply.github.com> Date: Tue, 9 Jul 2024 10:05:27 +0100 Subject: [PATCH 04/11] Update build.sh --- x11-packages/gw/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-packages/gw/build.sh b/x11-packages/gw/build.sh index 0483087ac57a5b3..1c35c031b99418a 100644 --- a/x11-packages/gw/build.sh +++ b/x11-packages/gw/build.sh @@ -55,7 +55,7 @@ termux_step_make() { unzip -o "${TERMUX_PKG_CACHEDIR}/skia-${TERMUX_ARCH}.zip" cd ../../ - LDFLAGS+="${LDFLAGS} -L${TERMUX_PREFIX}/lib" make -j "$TERMUX_PKG_MAKE_PROCESSES" + LDFLAGS="${LDFLAGS} -L${TERMUX_PREFIX}/lib" make -j "$TERMUX_PKG_MAKE_PROCESSES" } termux_step_make_install() { From fc80c4cfe76f02c05d3cc21fb42d8f58f4016c02 Mon Sep 17 00:00:00 2001 From: Kez Cleal <42997789+kcleal@users.noreply.github.com> Date: Tue, 9 Jul 2024 10:48:47 +0100 Subject: [PATCH 05/11] Update build.sh --- x11-packages/gw/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/x11-packages/gw/build.sh b/x11-packages/gw/build.sh index 1c35c031b99418a..727c5624e23efe0 100644 --- a/x11-packages/gw/build.sh +++ b/x11-packages/gw/build.sh @@ -21,6 +21,7 @@ termux_step_pre_configure() { -e '/\/usr\/local\/include/d' \ -e '/\/usr\/local\/lib/d' \ ./Makefile + sed -i 's/LDFLAGS=/LDFLAGS+=/g' Makefile if [ "$TERMUX_ARCH" = "aarch64" ]; then sed -i 's/Release-x64/Release-arm64/g' ./Makefile From 57b5b6115a062acd05e09ce147b8dbb0f95d3873 Mon Sep 17 00:00:00 2001 From: Kez Cleal <42997789+kcleal@users.noreply.github.com> Date: Tue, 9 Jul 2024 11:52:34 +0100 Subject: [PATCH 06/11] Update build.sh --- x11-packages/gw/build.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/x11-packages/gw/build.sh b/x11-packages/gw/build.sh index 727c5624e23efe0..ce86ad6d841d941 100644 --- a/x11-packages/gw/build.sh +++ b/x11-packages/gw/build.sh @@ -20,8 +20,7 @@ termux_step_pre_configure() { sed -i \ -e '/\/usr\/local\/include/d' \ -e '/\/usr\/local\/lib/d' \ - ./Makefile - sed -i 's/LDFLAGS=/LDFLAGS+=/g' Makefile + ./Makefile && sed -i 's/LDFLAGS=/LDFLAGS+=/g' Makefile if [ "$TERMUX_ARCH" = "aarch64" ]; then sed -i 's/Release-x64/Release-arm64/g' ./Makefile From 25423957e6a67868cad446323b753cbeb6a31c28 Mon Sep 17 00:00:00 2001 From: Kez Cleal <42997789+kcleal@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:11:34 +0100 Subject: [PATCH 07/11] Update build.sh --- x11-packages/gw/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-packages/gw/build.sh b/x11-packages/gw/build.sh index ce86ad6d841d941..2d4eb905f4bc2b3 100644 --- a/x11-packages/gw/build.sh +++ b/x11-packages/gw/build.sh @@ -55,7 +55,7 @@ termux_step_make() { unzip -o "${TERMUX_PKG_CACHEDIR}/skia-${TERMUX_ARCH}.zip" cd ../../ - LDFLAGS="${LDFLAGS} -L${TERMUX_PREFIX}/lib" make -j "$TERMUX_PKG_MAKE_PROCESSES" + make -j "$TERMUX_PKG_MAKE_PROCESSES" } termux_step_make_install() { From dcd78b15250f39e344de066cfa119691504ad557 Mon Sep 17 00:00:00 2001 From: Kez Cleal <42997789+kcleal@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:14:20 +0100 Subject: [PATCH 08/11] Update build.sh --- x11-packages/gw/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-packages/gw/build.sh b/x11-packages/gw/build.sh index 2d4eb905f4bc2b3..ce86ad6d841d941 100644 --- a/x11-packages/gw/build.sh +++ b/x11-packages/gw/build.sh @@ -55,7 +55,7 @@ termux_step_make() { unzip -o "${TERMUX_PKG_CACHEDIR}/skia-${TERMUX_ARCH}.zip" cd ../../ - make -j "$TERMUX_PKG_MAKE_PROCESSES" + LDFLAGS="${LDFLAGS} -L${TERMUX_PREFIX}/lib" make -j "$TERMUX_PKG_MAKE_PROCESSES" } termux_step_make_install() { From a6b9a5dc68198ac56e23b63aa9ac33dadeb02aa4 Mon Sep 17 00:00:00 2001 From: Kez Cleal <42997789+kcleal@users.noreply.github.com> Date: Fri, 12 Jul 2024 14:20:35 +0100 Subject: [PATCH 09/11] Update build.sh to v 0.10.1 --- x11-packages/gw/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/x11-packages/gw/build.sh b/x11-packages/gw/build.sh index ce86ad6d841d941..864fc41e701f83b 100644 --- a/x11-packages/gw/build.sh +++ b/x11-packages/gw/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/kcleal/gw TERMUX_PKG_DESCRIPTION="A browser for genomic sequencing data (.bam/.cram format)" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="clealk@cardiff.ac.uk" -TERMUX_PKG_VERSION=0.10.0 +TERMUX_PKG_VERSION=0.10.1 TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/kcleal/gw/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=81d9a560152af6d1c45d90336c74ad051edb5ea29bab5b8791c323b1ed3ac608 +TERMUX_PKG_SHA256=a864010d9ba329feb9211d554ea9c410f5bcc1e1462369bef56a8f5b8914f3d2 TERMUX_PKG_DEPENDS="glfw, htslib, libc++, libjpeg-turbo, opengl, libcurl" TERMUX_PKG_BUILD_DEPENDS="fontconfig, freetype, libicu, libuuid, mesa-dev, libcurl" TERMUX_PKG_AUTO_UPDATE=true @@ -20,7 +20,7 @@ termux_step_pre_configure() { sed -i \ -e '/\/usr\/local\/include/d' \ -e '/\/usr\/local\/lib/d' \ - ./Makefile && sed -i 's/LDFLAGS=/LDFLAGS+=/g' Makefile + ./Makefile if [ "$TERMUX_ARCH" = "aarch64" ]; then sed -i 's/Release-x64/Release-arm64/g' ./Makefile From 8a1758f68f4b0ef2cdc5e1b03849ec01376ad497 Mon Sep 17 00:00:00 2001 From: Kez Cleal <42997789+kcleal@users.noreply.github.com> Date: Sat, 13 Jul 2024 08:03:08 +0100 Subject: [PATCH 10/11] Update x11-packages/gw/build.sh Co-authored-by: tqfx --- x11-packages/gw/build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/x11-packages/gw/build.sh b/x11-packages/gw/build.sh index 864fc41e701f83b..bbdaaa44c2e7586 100644 --- a/x11-packages/gw/build.sh +++ b/x11-packages/gw/build.sh @@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="A browser for genomic sequencing data (.bam/.cram format TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="clealk@cardiff.ac.uk" TERMUX_PKG_VERSION=0.10.1 -TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/kcleal/gw/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=a864010d9ba329feb9211d554ea9c410f5bcc1e1462369bef56a8f5b8914f3d2 TERMUX_PKG_DEPENDS="glfw, htslib, libc++, libjpeg-turbo, opengl, libcurl" From 72c3dac5cf88a78c1126d47624e47eb05279eb7d Mon Sep 17 00:00:00 2001 From: TomIO <43716232+TomJo2000@users.noreply.github.com> Date: Mon, 15 Jul 2024 08:02:53 +0200 Subject: [PATCH 11/11] Undo LDFLAGS override. Co-authored-by: tqfx --- x11-packages/gw/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-packages/gw/build.sh b/x11-packages/gw/build.sh index bbdaaa44c2e7586..8b6ae352021f640 100644 --- a/x11-packages/gw/build.sh +++ b/x11-packages/gw/build.sh @@ -54,7 +54,7 @@ termux_step_make() { unzip -o "${TERMUX_PKG_CACHEDIR}/skia-${TERMUX_ARCH}.zip" cd ../../ - LDFLAGS="${LDFLAGS} -L${TERMUX_PREFIX}/lib" make -j "$TERMUX_PKG_MAKE_PROCESSES" + make -j "$TERMUX_PKG_MAKE_PROCESSES" } termux_step_make_install() {