summaryrefslogtreecommitdiff
path: root/games-board/ace
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-07-17 20:32:17 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-07-17 20:32:17 +0100
commit83b5cde41ddb8fd20de4536dd68eb08da42d013e (patch)
tree6a993cfe0eb5a8024c508e9f6a6de02538f7c52e /games-board/ace
parent9c26151d84a72781f240cc7ca3e2f0ab4ba60f74 (diff)
gentoo auto-resync : 17:07:2022 - 20:32:17
Diffstat (limited to 'games-board/ace')
-rw-r--r--games-board/ace/Manifest3
-rw-r--r--games-board/ace/ace-1.4-r2.ebuild10
-rw-r--r--games-board/ace/files/ace-1.4-isgraph-include.patch7
3 files changed, 17 insertions, 3 deletions
diff --git a/games-board/ace/Manifest b/games-board/ace/Manifest
index cf8ca28d8650..628148ab7d87 100644
--- a/games-board/ace/Manifest
+++ b/games-board/ace/Manifest
@@ -2,9 +2,10 @@ AUX ace-1.4-CC.patch 662 BLAKE2B abc2e95dc31d2dc4d887dc54d62ca6dec6c6b7d0f1b857b
AUX ace-1.4-clang.patch 340 BLAKE2B 2387de1b53557adcd4d70004fe41038d36b8c37945fdd60d73ef9b2756e95f6c30851bac425ae2c6aebc3edbca9b863fb17da36ec85906fd35611a90a35abf03 SHA512 df2f335d7d4e6e0e349c8724678a2cf8592e9435cc184bbdd906cb9b099b01c7b4e9ab8e2f4af257b4dde695649def75a2612df62fd2101411561c17cbca2d0f
AUX ace-1.4-gcc10.patch 441 BLAKE2B e146ad1a434f96e2baa4cdcdef283cfb5fdeee76f1280681b458d475d2765b00c7a7790998bc58df3bc9c618dd1f268712b27a5ec2fa3ad66261bd417e3f67a6 SHA512 b4800e284aa5c0cfc39d7f0b1f330a508622907951ee7f45d959230b0b6ea1322da77cf2b2f4c06b923ab0249c9a030f1c2f1f30b59e3518aacbf7726ba86e6c
AUX ace-1.4-gold.patch 3339 BLAKE2B 904aa238a703730ac9d188025d6ecaddd79e3683d43ec231b11e28c33094d45ccc6346f322418bde5d7aa22e56056680666cf835adf748bccef5bbad24f43c84 SHA512 907a2c6378bf9bc6aeba0c0945ef4e1a60a2403c491d6a54faaf6c90561375787afb3fba15faf05d28e04eb9478ece1357b9f0e91c2f9b4cef33909f59b70d37
+AUX ace-1.4-isgraph-include.patch 146 BLAKE2B 5b05bf6823d8114fe101494ace04621eb9b27fbe9a640f03cdd689dba3fa7ed014000b1bd57a799b2dd5caba05c54576f6ea534bae34927a6e94575d81b0f835 SHA512 56ff54f3e8576b5444220e2a85be871ed067d902193b7c3ab5b3f6d3c755e017e9d77a21d2c9752f907c22077e66f920edb2cb763664c7b641e50421e32d515a
AUX ace-1.4-libpng15.patch 853 BLAKE2B ffbcda5c4d25fd404291f0b2d3e98e53f50108b6b6ef7ea135949087402e656b21a21da82cf3def5f12fc75e7a412becd46f4363aa604a184ddb0c20562ab84c SHA512 f746ad95efac927d55dff5122d759de4c8a3947a85b960642e6967e6ef8362e45d05fe5504b159b97bebeb92e2d86f4fea4f00e50fa7c59a8861d9aca8f62013
AUX ace-1.4-malloc.patch 280 BLAKE2B 792af19b77bfa002c2ff4ce76a3d44eeeb8d7f08b0490230668e8385ff9d1b36d7c4c643e50b0cc8e1981386b7c4a68ff87e3c9afd0c1e05e39d0c60bb045f3a SHA512 565ffcb334eae020ced4630807bb4b1fd4cf46385fbb47271ab7d80eff93006330771139fce305ce331863aca4971c15dd928251ed0862ce37225e4f123bb0ff
AUX ace-1.4-no-xpm.patch 571 BLAKE2B 009d9c7efc8b26e25905f4562c019b7cab1bd0b9df853b256042dbeb869b8be0252fba6275331772dc080f43066fe8b3fffc797a7962c9bf5e665605ef2a2f9a SHA512 1316313302dbc2a2456f4ba3afcba1e35a0f12c3907b04ae55c5e246254886693633b3bd04defd718ad9e2ac04d7d02c80eec89089f7624615e74d18229764b5
DIST ace-1.4.tar.gz 530490 BLAKE2B 62d32bcada9a945d0a409757ca24c8c5c032e905528d56a51b95f82844c6c8057d39763016fa05015877f23313d842effeaaa362507bb049816d7cf6bdf01a1a SHA512 cd382db95dc17d75a76809c7f1e096e14f5863c1166aa5db7f93204ce949a9ed21979212946b9d3a09667f4a93b30f4cc44a220940f9b5dd8996f28ecb4a6dcc
-EBUILD ace-1.4-r2.ebuild 1072 BLAKE2B 86893c8a48bfa3228b86ebd23d029cbea2ca4b6f11df7a60358d98a827102f64594ab63b79ad8f1fc725e0c7a316b4167d679ff1bb77903dfd634bf41ea371e4 SHA512 b4521cc6605c6f33653973d2d0404a9a4df02bb590a71681b2fdca6eeea17af6954a0f824f5f3456dd97894a6a23616944271302469c3e7c3846a59f16ca0434
+EBUILD ace-1.4-r2.ebuild 1353 BLAKE2B 6cad78d8239f1a419d6832b48078d6d6ad35b00e0ee3e0a29e231af86f2de2977a9ada0ecc81da9004d04805e9fd7ce16887c337890de1b936c591304b5825ae SHA512 3b25953950f36c4124e6de7e2c1344facebb4bc77544c2e532429e6590419aa91d0c345ee772d26ce9925faa5f30608d118e48025a3d1ca9a46b718a7c65672d
MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-board/ace/ace-1.4-r2.ebuild b/games-board/ace/ace-1.4-r2.ebuild
index 25187a76f919..7ebefd947a81 100644
--- a/games-board/ace/ace-1.4-r2.ebuild
+++ b/games-board/ace/ace-1.4-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools desktop
+inherit autotools desktop flag-o-matic
DESCRIPTION="DJ Delorie's Ace of Penguins solitaire games"
HOMEPAGE="http://www.delorie.com/store/ace/"
@@ -27,6 +27,7 @@ PATCHES=(
"${FILESDIR}/${P}-clang.patch"
"${FILESDIR}/${P}-gcc10.patch"
"${FILESDIR}/${P}-malloc.patch"
+ "${FILESDIR}/${P}-isgraph-include.patch"
)
src_prepare() {
@@ -37,6 +38,11 @@ src_prepare() {
}
src_configure() {
+ # Actually fixed upstream but a fair number of commits in CVS(!)
+ # since last release, bug #858608. Can drop after 1.4.
+ # https://www.delorie.com/bin/cvsweb.cgi/ace/lib/cards.h.diff?r1=1.16&r2=1.17&cvsroot=ace
+ filter-lto
+
econf \
--disable-static \
--program-prefix=ace-
diff --git a/games-board/ace/files/ace-1.4-isgraph-include.patch b/games-board/ace/files/ace-1.4-isgraph-include.patch
new file mode 100644
index 000000000000..7020ae06570d
--- /dev/null
+++ b/games-board/ace/files/ace-1.4-isgraph-include.patch
@@ -0,0 +1,7 @@
+--- a/lib/make-imglib.c
++++ b/lib/make-imglib.c
+@@ -1,3 +1,4 @@
++#include <ctype.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>