diff options
| author | Jose Riha | 2021-06-29 11:49:04 +0200 |
|---|---|---|
| committer | Jose Riha | 2021-06-29 11:49:04 +0200 |
| commit | f26bd1bbdadaa2238df8638c3e091d35c68e0ed2 (patch) | |
| tree | c3cb1d8d87495a59a95e3662a364a2e73ef75103 | |
| parent | 6921e8039771e0a897b2197546e36f4da611f0e7 (diff) | |
| download | aur-f26bd1bbdadaa2238df8638c3e091d35c68e0ed2.tar.gz | |
Fix build
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 14 | ||||
| -rw-r--r-- | format-argument.patch | 36 |
3 files changed, 48 insertions, 9 deletions
@@ -1,9 +1,7 @@ -# Generated by mksrcinfo v8 -# Sat Aug 18 21:45:05 UTC 2018 pkgbase = torcs pkgdesc = A 3D racing cars simulator using OpenGL pkgver = 1.3.7 - pkgrel = 3 + pkgrel = 4 url = http://torcs.sourceforge.net arch = x86_64 arch = i686 @@ -23,9 +21,10 @@ pkgbase = torcs source = http://downloads.sourceforge.net/sourceforge/torcs/torcs-1.3.7.tar.bz2 source = gcc7.patch source = gcc6-isnan.patch + source = format-argument.patch md5sums = de314c3e421e8d7d4323d819c5010d23 md5sums = 64216e9dba6cc030c38cde8efea3e59d md5sums = e84edaa1660f55fd980136f70e6471e6 + md5sums = 435f63506e8f18a06f119a64d60dd281 pkgname = torcs - @@ -5,7 +5,7 @@ pkgname=torcs pkgver=1.3.7 -pkgrel=3 +pkgrel=4 pkgdesc="A 3D racing cars simulator using OpenGL" url="http://torcs.sourceforge.net" license=("GPL") @@ -15,15 +15,19 @@ makedepends=('plib' 'mesa') options=('!makeflags') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2 gcc7.patch - gcc6-isnan.patch) + gcc6-isnan.patch + format-argument.patch) md5sums=('de314c3e421e8d7d4323d819c5010d23' '64216e9dba6cc030c38cde8efea3e59d' - 'e84edaa1660f55fd980136f70e6471e6') + 'e84edaa1660f55fd980136f70e6471e6' + '435f63506e8f18a06f119a64d60dd281') prepare() { cd "$srcdir"/$pkgname-${pkgver/_/-} - patch -p1 <"$srcdir"/gcc7.patch - patch -p1 <"$srcdir"/gcc6-isnan.patch + for p in $srcdir/*.patch + do + patch -p1 -i "$p" + done } build() { diff --git a/format-argument.patch b/format-argument.patch new file mode 100644 index 000000000000..78955f9ef58d --- /dev/null +++ b/format-argument.patch @@ -0,0 +1,36 @@ +From: Markus Koschany <apo@debian.org> +Date: Mon, 1 May 2017 15:59:09 +0200 +Subject: format argument + +Forwarded: https://sourceforge.net/p/torcs/mailman/message/35831161/ +--- + src/tools/texmapper/maintexmapper.cpp | 2 +- + src/tools/trackgen/objects.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/tools/texmapper/maintexmapper.cpp b/src/tools/texmapper/maintexmapper.cpp +index c501792..fbfff34 100644 +--- a/src/tools/texmapper/maintexmapper.cpp ++++ b/src/tools/texmapper/maintexmapper.cpp +@@ -103,7 +103,7 @@ void print_mat4(char *title, sgMat4 m) + { + int i, j; + +- printf(title); ++ printf("%s", title); + for (j = 0; j < 4; j ++){ + for (i = 0; i < 4; i ++) { + printf("%.6f ", m[i][j]); +diff --git a/src/tools/trackgen/objects.cpp b/src/tools/trackgen/objects.cpp +index 0c19f1a..2b44e93 100644 +--- a/src/tools/trackgen/objects.cpp ++++ b/src/tools/trackgen/objects.cpp +@@ -304,7 +304,7 @@ ssgSaveLeaf (ssgEntity *ent, FILE *save_fd) + fprintf (save_fd, "numsurf %d\n", num_tris); + + for (i = 0; i < num_tris; i++) { +- fprintf (save_fd, surf); ++ fprintf (save_fd, "%s", surf); + fprintf (save_fd, "mat 0\n"); + fprintf (save_fd, "refs 3\n"); + fprintf (save_fd, "%d %g %g\n", |