From 40f4d542ed5dc062c6b71786cb58c83ce0742735 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sat, 19 Nov 2022 03:28:13 +0900 Subject: [PATCH] ddrescue: Bump to 1.26 --- packages/ddrescue/build.sh | 5 ++--- .../{fix-configure.patch => configure.patch} | 18 +++++++----------- 2 files changed, 9 insertions(+), 14 deletions(-) rename packages/ddrescue/{fix-configure.patch => configure.patch} (51%) diff --git a/packages/ddrescue/build.sh b/packages/ddrescue/build.sh index 915d7078f9..1100cb7bce 100644 --- a/packages/ddrescue/build.sh +++ b/packages/ddrescue/build.sh @@ -2,8 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/ddrescue/ TERMUX_PKG_DESCRIPTION="GNU data recovery tool" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.25 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_VERSION=1.26 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/ddrescue/ddrescue-${TERMUX_PKG_VERSION}.tar.lz -TERMUX_PKG_SHA256=ce538ebd26a09f45da67d3ad3f7431932428231ceec7a2d255f716fa231a1063 +TERMUX_PKG_SHA256=e513cd3a90d9810dfdd91197d40aa40f6df01597bfb5ecfdfb205de1127c551f TERMUX_PKG_DEPENDS="libc++" diff --git a/packages/ddrescue/fix-configure.patch b/packages/ddrescue/configure.patch similarity index 51% rename from packages/ddrescue/fix-configure.patch rename to packages/ddrescue/configure.patch index 3f5af42db0..ec396d2f0d 100644 --- a/packages/ddrescue/fix-configure.patch +++ b/packages/ddrescue/configure.patch @@ -1,7 +1,6 @@ -diff -u -r ../ddrescue-1.23/configure ./configure ---- ../ddrescue-1.23/configure 2018-02-13 12:54:43.000000000 +0000 -+++ ./configure 2018-02-18 21:07:51.862861331 +0000 -@@ -15,23 +15,15 @@ +--- a/configure ++++ b/configure +@@ -15,19 +15,18 @@ LC_ALL=C export LC_ALL srcdir= @@ -17,14 +16,11 @@ diff -u -r ../ddrescue-1.23/configure ./configure CPPFLAGS= -CXXFLAGS='-Wall -W -O2' -LDFLAGS= -- --# checking whether we are using GNU C++. --/bin/sh -c "${CXX} --version" > /dev/null 2>&1 || -- { -- CXX=c++ -- CXXFLAGS=-O2 -- } +CXXFLAGS?='-Wall -W -O2' ++LDFLAGS?= + + # checking whether we are using GNU C++. +-/bin/sh -c "${CXX} --version" > /dev/null 2>&1 || { CXX=c++ ; CXXFLAGS=-O2 ; } # Loop over all args args=