From 57857e47fe04bdce2da48f9388156745785cb430 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Wed, 11 Sep 2024 02:25:17 +0200 Subject: [PATCH] replace(main/dog->doge): Replace with maintained fork dog is no longer maintained and depends on openssl-1.1. It was recently removed from homebrew: https://github.com/ogham/dog/issues/136 --- packages/dog/build.sh | 22 --------------------- packages/doge/build.sh | 15 ++++++++++++++ packages/{dog => doge}/src-resolve.rs.patch | 0 3 files changed, 15 insertions(+), 22 deletions(-) delete mode 100644 packages/dog/build.sh create mode 100644 packages/doge/build.sh rename packages/{dog => doge}/src-resolve.rs.patch (100%) diff --git a/packages/dog/build.sh b/packages/dog/build.sh deleted file mode 100644 index 3afc4c27b13175..00000000000000 --- a/packages/dog/build.sh +++ /dev/null @@ -1,22 +0,0 @@ -TERMUX_PKG_HOMEPAGE=https://dns.lookup.dog/ -TERMUX_PKG_DESCRIPTION="A command-line DNS client" -TERMUX_PKG_LICENSE="EUPL-1.2" -TERMUX_PKG_LICENSE_FILE="LICENCE" -TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=0.1.0 -TERMUX_PKG_REVISION=2 -TERMUX_PKG_SRCURL=https://github.com/ogham/dog/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=82387d38727bac7fcdb080970e84b36de80bfe7923ce83f993a77d9ac7847858 -TERMUX_PKG_DEPENDS="openssl-1.1, resolv-conf" -TERMUX_PKG_BUILD_IN_SRC=true - -termux_step_pre_configure() { - export OPENSSL_INCLUDE_DIR=$TERMUX_PREFIX/include/openssl-1.1 - export OPENSSL_LIB_DIR=$TERMUX_PREFIX/lib/openssl-1.1 - CFLAGS="-I$TERMUX_PREFIX/include/openssl-1.1 $CFLAGS" - CPPFLAGS="-I$TERMUX_PREFIX/include/openssl-1.1 $CPPFLAGS" - CXXFLAGS="-I$TERMUX_PREFIX/include/openssl-1.1 $CXXFLAGS" - LDFLAGS="-L$TERMUX_PREFIX/lib/openssl-1.1 -Wl,-rpath=$TERMUX_PREFIX/lib/openssl-1.1 $LDFLAGS" - - RUSTFLAGS+=" -C link-arg=-Wl,-rpath=$TERMUX_PREFIX/lib/openssl-1.1" -} diff --git a/packages/doge/build.sh b/packages/doge/build.sh new file mode 100644 index 00000000000000..d6860bdaa3c889 --- /dev/null +++ b/packages/doge/build.sh @@ -0,0 +1,15 @@ +TERMUX_PKG_HOMEPAGE=https://github.com/Dj-Codeman/doge +TERMUX_PKG_DESCRIPTION="A command-line DNS client" +TERMUX_PKG_LICENSE="EUPL-1.2" +TERMUX_PKG_LICENSE_FILE="LICENCE" +TERMUX_PKG_MAINTAINER="@termux" +TERMUX_PKG_VERSION=0.2.7 +TERMUX_PKG_SRCURL=https://github.com/Dj-Codeman/doge/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz +TERMUX_PKG_SHA256=7049e2ccd6907f4f4222b8ea84160d65b57aadbbee9498da353a00c576bc647e +TERMUX_PKG_REPLACES="dog" +TERMUX_PKG_DEPENDS="openssl, resolv-conf" +TERMUX_PKG_BUILD_IN_SRC=true + +termux_step_pre_configure() { + rm $TERMUX_PKG_SRCDIR/makefile +} diff --git a/packages/dog/src-resolve.rs.patch b/packages/doge/src-resolve.rs.patch similarity index 100% rename from packages/dog/src-resolve.rs.patch rename to packages/doge/src-resolve.rs.patch