diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
| commit | d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch) | |
| tree | 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /games-arcade/briquolo | |
| parent | e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff) | |
gentoo resync : 15.06.2021
Diffstat (limited to 'games-arcade/briquolo')
4 files changed, 49 insertions, 2 deletions
diff --git a/games-arcade/briquolo/Manifest b/games-arcade/briquolo/Manifest index 8b4209617c6d..a926806d46a5 100644 --- a/games-arcade/briquolo/Manifest +++ b/games-arcade/briquolo/Manifest @@ -1,6 +1,8 @@ +AUX briquolo-0.5.7-clang-widening.patch 881 BLAKE2B b551a268308c876f78b34584ebfd5bda97f420b972a8104a8cd733d785fd16280504767faecac7c9e5065643fe9deb93df77f91402cd60a20c301de7caeb6cf4 SHA512 ed43d416072a3025d81ad9775de1cfdda15fd436714302a7b2b30581794c55ef51cc9b0789b458228c9255714ff5fc53a9bbf528ac746a52510b681838e2ce18 +AUX briquolo-0.5.7-gcc11-fix-const.patch 394 BLAKE2B eec540576c3a465473fa13cef0177305a2622cf071dfb4a2092adfb75069c95b788f1f44381f551a23a34e96c00493b7ab3f20270051cd557dc2f0b76fc37159 SHA512 8614ca07f6c768f500e0c1ac039fcd6982e13913a0c0ffbb97913e44a8265f75bf25e43ad658821ad48a801f2c72921b99c93f7f7489e167056c20f65cab6b8c AUX briquolo-0.5.7-gcc43.patch 1967 BLAKE2B 0d7347e002022d12b95f3791beabc5b62e8f89bfccb0581b5907fcba024c6666962b50b50ef8a2bc3f4fcd8adb9b148ba7c70a0ee509f245444e9d4949f86bb8 SHA512 deb255f7201e3714b9a230a6b228d2789b9eba3a85fb930b92277a57c07bc8ac6a38f7028e3cfab8a298ad4833fe61c1dbcade3f0ac06381668dca337e1b8ca5 AUX briquolo-0.5.7-libpng14.patch 1062 BLAKE2B 18049d54ed528cdbdfc712b85706b224609f05b129fa737aa4340fa25ee6b03f6b8e4eb764593781a93ab08dbf8229aee495fe809170fea0de1721477b1d6379 SHA512 0086a0cc8862c5c1c2000f8776bfcec1812a626eecdb15df4785bbd476e88fd55100d3f47877948c2af7500aba8f60f6c61fb19667e3823670a64f17eaa9c1b8 AUX briquolo-0.5.7-respect-AR.patch 193 BLAKE2B c8594ba787c551a5f7a03ead31a79f55827dd879f245761f0556e5da61b88e5d6bd58861d7ff62d084bdc17da3be1ebe8c99eb1750cd19175ade6101d1d993a2 SHA512 027b30d972abf32644a45ea04cee69d73fa55a4292ba47a3de6b87a817e3e9bea00b28072864365f451948ea9aa1993de400523956be43a730bf74391e96ded0 DIST briquolo-0.5.7.tar.bz2 2588084 BLAKE2B 4ec87a161df72f9cc0df592a5b18cdf7a42e9f66675b6eeec20f57f6be599942940eb341dc4927405a1402f1356f52bdd1bea2a6b72c5f36abf229c1ef42e5be SHA512 4ef78193c80ac3554b72149b8da9b5cfd5b8fd68932e5b52666d74642e94a7a3a596dbb6d2865cba526929dd6d9be89743847d5e77b6fbc687c32394bc3be3d2 -EBUILD briquolo-0.5.7.ebuild 1206 BLAKE2B 9c8e4268007e49e425a2c37ddc7335c585c064e01534a47e18d1a86fbbef180bab4bfaa766fb355c45c9f9e0f14b4a40d089808d6cf38d07976ab33f92548690 SHA512 e1d911fe8c3541334d81a77c47b15be3c6e63d97d2b09b95a9e179c7bfdece32edf3c04016e2011d9f75e355f0bde4f9893895036b8ad6f2bc3151edf12e72c8 +EBUILD briquolo-0.5.7.ebuild 1289 BLAKE2B 0d08f863d7f85900675919340b46356d487a8f1d53a248e2bc974d044ea9a62789b7aaa0c791cbc6f1deb4e7f7911a0c6885d82472917000e755f9fa9f3a2a2d SHA512 2f4c195555d28ba007ac2703d94196adc458f38e0bcb7cdefccc81e870ae1cfa84617c856192dea6a2719f8f02a52157f1bda79b92560baa260ef4435442d380 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 diff --git a/games-arcade/briquolo/briquolo-0.5.7.ebuild b/games-arcade/briquolo/briquolo-0.5.7.ebuild index d58d4462cad1..fff6d3ea6456 100644 --- a/games-arcade/briquolo/briquolo-0.5.7.ebuild +++ b/games-arcade/briquolo/briquolo-0.5.7.ebuild @@ -30,6 +30,8 @@ PATCHES=( "${FILESDIR}"/${P}-gcc43.patch "${FILESDIR}"/${P}-libpng14.patch "${FILESDIR}"/${P}-respect-AR.patch + "${FILESDIR}"/${P}-gcc11-fix-const.patch + "${FILESDIR}"/${P}-clang-widening.patch ) src_prepare() { @@ -40,7 +42,7 @@ src_prepare() { -e '/^SUBDIRS/s/desktop//' \ Makefile.{in,am} || die sed -i \ - -e "/CXXFLAGS/s:-O3:${CXXFLAGS}:" \ + -e "/CXXFLAGS/s|-O3|${CXXFLAGS}|" \ -e 's:=.*share/locale:=/usr/share/locale:' \ configure{,.ac} || die sed -i \ diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch b/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch new file mode 100644 index 000000000000..5afaaefd5848 --- /dev/null +++ b/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/739094 +https://svnweb.freebsd.org/ports/head/games/briquolo/files/patch-src-MOGL-MOGL_PoliceTTF.h?revision=460698&view=co + +Fix types passed to SDL_Rect structure (SDL 1.2) + +--- a/src/MOGL/MOGL_PoliceTTF.h ++++ b/src/MOGL/MOGL_PoliceTTF.h +@@ -42,10 +42,10 @@ + { + GLuint TextureName; + Uint16 carac; +- unsigned int x1; +- unsigned int y1; +- unsigned int x2; +- unsigned int y2; ++ Sint16 x1; ++ Sint16 y1; ++ int x2; ++ int y2; + }; + + struct MOGL_Struct_TextureCarac +@@ -141,7 +141,7 @@ + MOGL_Struct_Carac * _Caracteres; + MOGL_Struct_Carac * (_Correspondance[256-32]); + +- unsigned int _LastTextureX, _LastTextureY; ++ Sint16 _LastTextureX, _LastTextureY; + unsigned int maxHeightCarac; + MOGL_Map_Carac _MapCarac; + MOGL_Vector_TextureName _VectorTextureName; diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch b/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch new file mode 100644 index 000000000000..d5d68819675a --- /dev/null +++ b/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/790746 +--- a/src/MOGL/MOGL_Fenetre.h ++++ b/src/MOGL/MOGL_Fenetre.h +@@ -52,7 +52,7 @@ class MOGL_Fenetre + private: + struct CompareResolution + { +- bool operator() (const MOGL_Resolution & x, const MOGL_Resolution & y) ++ bool operator() (const MOGL_Resolution & x, const MOGL_Resolution & y) const + { + return x.w < y.w; + } |