From 796404e0d6708c441ffc41b3cdd75e8d31bb880d Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sun, 1 Apr 2018 04:35:23 -0300 Subject: [PATCH] deutex: update to 5.1.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: #13129 [via git-merge-pr] Signed-off-by: Jürgen Buchmüller --- srcpkgs/deutex/patches/32ebc7c-freedoom.patch | 18 ------ srcpkgs/deutex/patches/f4f4176-segfault.patch | 59 ------------------- .../deutex/patches/fix-cross-compile.patch | 11 ---- srcpkgs/deutex/patches/fix-musl.patch | 11 ---- srcpkgs/deutex/template | 32 +++------- 5 files changed, 9 insertions(+), 122 deletions(-) delete mode 100644 srcpkgs/deutex/patches/32ebc7c-freedoom.patch delete mode 100644 srcpkgs/deutex/patches/f4f4176-segfault.patch delete mode 100644 srcpkgs/deutex/patches/fix-cross-compile.patch delete mode 100644 srcpkgs/deutex/patches/fix-musl.patch diff --git a/srcpkgs/deutex/patches/32ebc7c-freedoom.patch b/srcpkgs/deutex/patches/32ebc7c-freedoom.patch deleted file mode 100644 index 4a39c42df72..00000000000 --- a/srcpkgs/deutex/patches/32ebc7c-freedoom.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit 32ebc7c39452d7595f0275f5290d07c7961c4f0e -Author: Mike Swanson -Date: Sat Jan 11 19:18:38 2014 -0800 - - Recognise the Freedoom IWAD names - ---- src/deutex.c -+++ src/deutex.c -@@ -1087,6 +1087,9 @@ int main (int argc, char *argv_non_const[]) - "doom2", /* Doom II */ - "plutonia", /* Final Doom */ - "tnt", /* Final Doom */ -+ "freedoom1", /* Freedoom: Phase 1 */ -+ "freedoom2", /* Freedoom: Phase 2 */ -+ "freedm" /* FreeDM */ - "heretic", /* Heretic */ - "hexen", /* Hexen */ - "strife1", /* Strife */ diff --git a/srcpkgs/deutex/patches/f4f4176-segfault.patch b/srcpkgs/deutex/patches/f4f4176-segfault.patch deleted file mode 100644 index 692c7a9eaca..00000000000 --- a/srcpkgs/deutex/patches/f4f4176-segfault.patch +++ /dev/null @@ -1,59 +0,0 @@ -commit f4f4176747a1288201a54070fc121ef588fc887b -Author: André Majorel -Date: Wed Mar 15 13:58:44 2006 +0100 - - Check for not-logging before writing to the log file - - Fixes a segfault when the $CWD is on a read-only filesystem. - ---- src/log.c -+++ src/log.c -@@ -40,10 +40,10 @@ int lopen (void) - { - if (logfp == &nolog) - return 1; -- if (logfp == NULL) -+ if (logfp == NULL || logfp == &nolog) - { - logfp = fopen (logfile, "w"); -- if (logfp == NULL) -+ if (logfp == NULL || logfp == &nolog) - { - /* Can't use Warning(), we would loop. */ - fflush (stdout); -@@ -65,7 +65,7 @@ int lopen (void) - */ - void lputc (char c) - { -- if (logfp == NULL) -+ if (logfp == NULL || logfp == &nolog) - return; - fputc (c, logfp); - fflush (logfp); /* We don't want a segfault to truncate the log */ -@@ -77,7 +77,7 @@ void lputc (char c) - */ - void lputs (const char *str) - { -- if (logfp == NULL) -+ if (logfp == NULL || logfp == &nolog) - return; - fputs (str, logfp); - fflush (logfp); /* We don't want a segfault to truncate the log */ -@@ -91,7 +91,7 @@ void lprintf (const char *fmt, ...) - { - va_list list; - -- if (logfp == NULL) -+ if (logfp == NULL || logfp == &nolog) - return; - va_start (list, fmt); - vlprintf (fmt, list); -@@ -104,7 +104,7 @@ void lprintf (const char *fmt, ...) - */ - void vlprintf (const char *fmt, va_list list) - { -- if (logfp == NULL) -+ if (logfp == NULL || logfp == &nolog) - return; - vfprintf (logfp, fmt, list); - fflush (logfp); /* We don't want a segfault to truncate the log */ diff --git a/srcpkgs/deutex/patches/fix-cross-compile.patch b/srcpkgs/deutex/patches/fix-cross-compile.patch deleted file mode 100644 index 41a58c883d9..00000000000 --- a/srcpkgs/deutex/patches/fix-cross-compile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig -+++ configure -@@ -272,7 +272,7 @@ - # does the C compiler actually work ? - # - printf "checking whether the C compiler works..." --( -+echo || ( - cd "$tmpdir" - echo 'main (int argc, char *argv[]) { return 0; }' >$cbasename - if diff --git a/srcpkgs/deutex/patches/fix-musl.patch b/srcpkgs/deutex/patches/fix-musl.patch deleted file mode 100644 index 9dd2fce9b70..00000000000 --- a/srcpkgs/deutex/patches/fix-musl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/log.c.orig -+++ src/log.c -@@ -28,7 +28,7 @@ - - - static FILE *logfp = NULL; --static FILE nolog; -+static int nolog; - - - /* diff --git a/srcpkgs/deutex/template b/srcpkgs/deutex/template index bd3eb6e770d..627ddf402f9 100644 --- a/srcpkgs/deutex/template +++ b/srcpkgs/deutex/template @@ -1,31 +1,17 @@ # Template file for 'deutex' pkgname=deutex -version=4.4.902 +version=5.1.1 revision=1 -build_style=gnu-makefile +build_style=gnu-configure +hostmakedepends="automake libtool pkg-config asciidoc" +makedepends="libpng-devel" short_desc="WAD composer for DOOM and others" -maintainer="beefcurtains " -license="GPL-2" +maintainer="maxice8 " +license="GPL-2.0-only, LGPL-2.0-or-later" homepage="http://www.teaser.fr/~amajorel/deutex/" distfiles="https://github.com/chungy/${pkgname}/archive/v${version}.tar.gz" -checksum=969d2b901261c41e5125ffb2ecb8ecbe0b804956f0cf2220e96994f6be0f9f67 +checksum=2b629fd0330dc81d7bd96c8f840b5a00c9ec365d7bbed083194c0309fbc2de1c -do_configure() { - ./configure --cc "${CC}" --cflags "${CFLAGS}" \ - --ldflags "${LDFLAGS}" --prefix /usr \ - --inttypes yes -} - -do_install() { - vbin deusf - vbin deutex - vlicense LICENCE - ln -s deutex.6 deusf.6 - vman deutex.6 - vman deusf.6 - vdoc README - rm -f docsrc/{README,deutex.6} - for doc in $(echo docsrc/*); do - vdoc $doc - done +pre_configure() { + autoreconf -fi }