diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2019-12-31 00:42:53 -0800 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2019-12-31 00:42:53 -0800 |
| commit | 53f19ec6574edc1a7e1e59b164c22f6198377ceb (patch) | |
| tree | c21777091eccd5ef87c9db1624401d9b3783fd0b | |
| parent | Add -fstack-protector-all (diff) | |
| download | 7kaa-53f19ec6574edc1a7e1e59b164c22f6198377ceb.tar.xz | |
Updated to 2.15.3
| -rw-r--r-- | PKGBUILD | 18 | ||||
| -rw-r--r-- | buffer_overflow.patch | 18 |
2 files changed, 5 insertions, 31 deletions
@@ -8,8 +8,8 @@ # AUR version uses .ico pkgname=7kaa -pkgver=2.15.2 -pkgrel=2.3 +pkgver=2.15.3 +pkgrel=2 pkgdesc='Seven Kingdoms: Ancient Adversaries is a real-time strategy (RTS) computer game developed by Trevor Chan' url='https://7kfans.com/' arch=('i686' 'x86_64') @@ -21,19 +21,11 @@ provides=('7kaa-data') source=("https://github.com/the3dfxdude/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.xz" "${pkgname}.sh" "${pkgname}.desktop" - "${pkgname}.png" - "buffer_overflow.patch") -md5sums=('abd3648aec3b8337a16f22de43ce9b19' + "${pkgname}.png") +md5sums=('57a65e4352df60449429c698f34c8b76' '78e098c8e8b2467f02da886f8bc431a0' '880d2760bdb02f8f73552e13f3a1a5a9' - 'a44784360325c94b605de06f7154d121' - '624e73ece72789f3aeff3b6497cabb77') - -prepare() { - cd ${pkgname}-${pkgver} - # Fix https://github.com/the3dfxdude/7kaa/issues/172 - patch -Np1 -i "${srcdir}"/buffer_overflow.patch -} + 'a44784360325c94b605de06f7154d121') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/buffer_overflow.patch b/buffer_overflow.patch deleted file mode 100644 index 4cb21f2..0000000 --- a/buffer_overflow.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 7kaa-2.15.2/src/LocaleRes.cpp -+++ 7kaa-2.15.2/src/LocaleRes.cpp -@@ -107,10 +107,12 @@ - strcpy(lang, "??"); - strcpy(codeset, "ISO-8859-1"); - } -- strcat(codeset, "//TRANSLIT"); - -- cd = iconv_open(codeset, ""); -+ String tocode(codeset); -+ tocode += "//TRANSLIT"; -+ cd = iconv_open(tocode, ""); - cd_latin = iconv_open("ISO-8859-1", ""); -+ - in_buf = mem_add(INIT_BUF_SIZE+1); - in_buf_size = INIT_BUF_SIZE; - out_buf = mem_add(INIT_BUF_SIZE+1); - |