diff --git a/srcpkgs/hddtemp/patches/glibc-2.26.patch b/srcpkgs/hddtemp/patches/glibc-2.26.patch deleted file mode 100644 index e182cf1f6f..0000000000 --- a/srcpkgs/hddtemp/patches/glibc-2.26.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/backtrace.c.orig 2017-08-05 16:57:00.000000000 +0000 -+++ src/backtrace.c 2017-08-05 16:57:21.552276793 +0000 -@@ -42,7 +42,7 @@ - #define MAX_BTSIZE 64 - - void backtrace_handler(int n, siginfo_t *ist, void *extra) { -- static struct ucontext *puc; -+ static ucontext_t *puc; - static void *btinfo[MAX_BTSIZE]; - static char **messages = NULL; - static size_t btsize = 0; -@@ -58,7 +58,7 @@ - - #define SIC_CASE(c) case c: strerr = #c - -- puc = (struct ucontext *)extra; -+ puc = (ucontext_t *)extra; - switch(n) { - case SIGSEGV: - switch(ist->si_code) { diff --git a/srcpkgs/hddtemp/template b/srcpkgs/hddtemp/template index f42cd88261..a7bc0f149d 100644 --- a/srcpkgs/hddtemp/template +++ b/srcpkgs/hddtemp/template @@ -1,23 +1,23 @@ # Template file for 'hddtemp' pkgname=hddtemp version=0.3.beta15 -revision=2 -wrksrc="${pkgname}-${version/.beta/-beta}" +revision=3 +wrksrc="hddtemp-${version/.b/-b}" build_style=gnu-configure configure_args="--with-db-path=/usr/share/hddtemp/hddtemp.db" short_desc="Hard drive temperature monitoring utility" maintainer="Georg S. " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://savannah.nongnu.org/projects/hddtemp/" distfiles=" - ${NONGNU_SITE}/${pkgname}/${pkgname}-${version/.beta/-beta}.tar.bz2 - ${DEBIAN_SITE}/main/h/hddtemp/${pkgname}_${version/.beta/-beta}-52.diff.gz" + ${NONGNU_SITE}/hddtemp/hddtemp-${version/.b/-b}.tar.bz2 + ${DEBIAN_SITE}/main/h/hddtemp/hddtemp_${version/.b/-b}-53.diff.gz" checksum=" 618541584054093d53be8a2d9e81c97174f30f00af91cb8700a97e442d79ef5b - 2466eabe4011042d4011831d40e4e207c810454a0320d77ba99e0b87cdfd8bb6" + 6f1ddaa9fbc90ea5c00b949e0981b78c5014e109de88804ae2512209091eae56" pre_configure() { - patch -p1 -i ../hddtemp_${version/.beta/-beta}-52.diff + patch -p1 -i ../hddtemp_${version/.b/-b}-53.diff sed -i 's|/etc/hddtemp.db|/usr/share/hddtemp/hddtemp.db|' doc/hddtemp.8 } post_install() {