deutex: update to 5.1.1.

Closes: #13129 [via git-merge-pr]
Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
This commit is contained in:
maxice8 2018-04-01 04:35:23 -03:00 committed by Jürgen Buchmüller
parent fc2714e11f
commit 796404e0d6
No known key found for this signature in database
GPG key ID: 6764EC32352D0647
5 changed files with 9 additions and 122 deletions

View file

@ -1,18 +0,0 @@
commit 32ebc7c39452d7595f0275f5290d07c7961c4f0e
Author: Mike Swanson <mikeonthecomputer@gmail.com>
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 */

View file

@ -1,59 +0,0 @@
commit f4f4176747a1288201a54070fc121ef588fc887b
Author: André Majorel <amajorel@teaser.fr>
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 */

View file

@ -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

View file

@ -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;
/*

View file

@ -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 <beefcurtains@users.noreply.github.com>"
license="GPL-2"
maintainer="maxice8 <thinkabit.ukim@gmail>"
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
}