summaryrefslogtreecommitdiff
path: root/games-board
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-10-11 07:37:54 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-10-11 07:37:54 +0100
commit81db58116c7a9c27f54243a4d8f364c7e94c6f36 (patch)
treeeb568d2a6d5b95a55b7f5a5ec305e1e6f5566e93 /games-board
parent179be85ade6b2b47bf362865b5c375969ab5ddc8 (diff)
gentoo auto-resync : 11:10:2022 - 07:37:54
Diffstat (limited to 'games-board')
-rw-r--r--games-board/Manifest.gzbin10055 -> 10053 bytes
-rw-r--r--games-board/xskat/Manifest3
-rw-r--r--games-board/xskat/files/xskat-4.0-clang16.patch8
-rw-r--r--games-board/xskat/xskat-4.0-r2.ebuild21
4 files changed, 24 insertions, 8 deletions
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index f48db288206a..ba2bb12d94fb 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
Binary files differ
diff --git a/games-board/xskat/Manifest b/games-board/xskat/Manifest
index faeffa8835f1..664fae4853e1 100644
--- a/games-board/xskat/Manifest
+++ b/games-board/xskat/Manifest
@@ -1,4 +1,5 @@
+AUX xskat-4.0-clang16.patch 117 BLAKE2B fc842cddc7ca1d539cc8b9db343e8afaaf13bec58da2bb914b77471b9630ad0b2fd870237c32aff13c6ec31256e145cba1db9978ff40bb103b6869a778131dab SHA512 9ed642d23276b3544a00fcadd14b1575b9da30163796b2b5f0f81fd2c0f60323c0c3b6e57e65304b744024da6d65473863818a7785cb78b8d95027e6f3089c7e
DIST xskat-4.0.tar.gz 179059 BLAKE2B 0494db798eadd17b4b35256560aa82ad8ec239b08f7adcdd86621088676cbc4c7cae0d0a53bb15525d56319ba0549406038cc1e64cdcfefd280d379ffc326a96 SHA512 508d83886063be01aef509fa8050110e599e0120025a94747717fcbae38e2196e8db041296b984fe37895c211519f511cf75dfa6b948c5789e6b37064f3d0c0d
DIST xskat.png 269 BLAKE2B f2e6810dcff815ea2871b2d2dfce1afe0e157ecd93abcf3a95267a1429f97f2d8970ff26c8f993d38390d7055d6086424981192531b20f34d4a94367ce3fd88f SHA512 4898a0a160b28b9fa8bf4c5edfab76b4a09e4726fcb7309fef5d87ddd527e26f6f0a9fb801e9babb3b1988ebcb7e83d4ad9a43221dff265cc4695453b739091f
-EBUILD xskat-4.0-r2.ebuild 850 BLAKE2B 41e4a0136a0b16be74f00abd9c510e6d073f5e65e647062db08860dc585daa583b720850008a5d918460f59a1ebc0e300118b9bfce2b95dc41b889c24c0d9b9d SHA512 56f6839316d849b07d0dccfff7e7915928cf86df1c8af9f61227f7641124f0613f2ab4cc9b8df040847a99220c1aa27fc3d7ab750bc374a103ab158f20f11bdc
+EBUILD xskat-4.0-r2.ebuild 1124 BLAKE2B f07dd8b7ca0843500947bf8792250be61b49e35497932dc0debaeb131a123e6eac5a73f02f6ca4c4c397b63e405f7031c29e8bdd9b29685cb3a564673bf3d834 SHA512 635aa2db8f94f6fadab854c786e4db03f939597ed479748a0b9bd01e202b0c79f008bef4430400e9f2fa948c327ee88dfe6295849b9e0a829440ed0d3fdbc80c
MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-board/xskat/files/xskat-4.0-clang16.patch b/games-board/xskat/files/xskat-4.0-clang16.patch
new file mode 100644
index 000000000000..c9bfe67e7850
--- /dev/null
+++ b/games-board/xskat/files/xskat-4.0-clang16.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/875473
+--- a/null.c
++++ b/null.c
+@@ -181,2 +181,4 @@
+ int minmaxfb(f,fb)
++int f;
++int fb;
+ {
diff --git a/games-board/xskat/xskat-4.0-r2.ebuild b/games-board/xskat/xskat-4.0-r2.ebuild
index da925919f0cc..34b32c4049b9 100644
--- a/games-board/xskat/xskat-4.0-r2.ebuild
+++ b/games-board/xskat/xskat-4.0-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=8
-inherit desktop toolchain-funcs
+inherit desktop flag-o-matic toolchain-funcs
DESCRIPTION="Famous german card game"
HOMEPAGE="http://www.xskat.de/xskat.html"
@@ -15,21 +15,28 @@ LICENSE="freedist"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-DEPEND="x11-libs/libX11"
+COMMON_DEPEND="x11-libs/libX11"
RDEPEND="
- ${DEPEND}
+ ${COMMON_DEPEND}
media-fonts/font-misc-misc"
-BDEPEND="
- virtual/pkgconfig
+DEPEND="
+ ${COMMON_DEPEND}
x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-clang16.patch
+)
src_configure() { :; }
src_compile() {
tc-export CC
+ append-cflags -std=gnu89 # old codebase, will break with c2x
local emakeargs=(
- CFLAGS="${CFLAGS} ${CPPFLAGS}"
+ CFLAGS="${CFLAGS} ${CPPFLAGS} $($(tc-getPKG_CONFIG) --cflags x11 || die)"
+ CPPFLAGS= # force everywhere above, but avoid implicit duplication
LDFLAGS="${LDFLAGS} $($(tc-getPKG_CONFIG) --libs x11 || die)"
)