From 7b744169f910185aacfd39dbd71d58b58a2e1d2f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Feb 2023 01:59:31 +0000 Subject: gentoo auto-resync : 15:02:2023 - 01:59:31 --- app-emulation/aranym/Manifest | 3 +- app-emulation/aranym/aranym-1.1.0.ebuild | 3 +- .../files/aranym-1.1.0-clang-16-register.patch | 219 +++++++++++++++++++++ 3 files changed, 223 insertions(+), 2 deletions(-) create mode 100644 app-emulation/aranym/files/aranym-1.1.0-clang-16-register.patch (limited to 'app-emulation/aranym') diff --git a/app-emulation/aranym/Manifest b/app-emulation/aranym/Manifest index c5c597a5a4bc..bf361fdab580 100644 --- a/app-emulation/aranym/Manifest +++ b/app-emulation/aranym/Manifest @@ -1,6 +1,7 @@ AUX aranym-1.1.0-ar.patch 583 BLAKE2B 81d9bf1ba80e5811efafea16dc004df7de82ffbb95989313c829e489c414e18b910809728ebc5d44837189dbe5ee6bbef23027e4848aff21431b66f189f93b17 SHA512 40b7b263fc8a04991c34cd5613e7f9d6d56723cbf425a033503cbb5a50f12d8ffe01a98bd60b583a36239cd7a21be06d7bbe789ca0b1c81fd77778918831e28a +AUX aranym-1.1.0-clang-16-register.patch 6069 BLAKE2B 562ca1e9742738ee1f0058981538d3954f2fb19283ac6aca5eadaa5f611745d11a682741ffcb79ee6106747e284c82b8f0d1bacee38061a6262478f44dc71745 SHA512 9e49b0f1c3c67a0761ec64599df3c2ffe74e2f0f0c96a8aa1960486a4462aabe0a6c05cf6228301e2bef38296b0a8b5b4ea26103f0a0ec339f731b5ba5df8095 AUX aranym-1.1.0-conditional-installs.patch 3396 BLAKE2B b1013bb4897e83c960e2870317f6c7e468edc0a5c96362d140d7ab9533a88bbe45339f6cba17b103d3cb9ac5ab1efb0ed3752d1975c2442921119242bd87a73d SHA512 88a7c63f8311b04402bbd0f5e7f6f5358d2aabb9024d8303f7f11234e48e09464c9dd56e09df1ffc6aa11ef908e8672ffa3f77a1cfb1e77668c1c7de835fca30 AUX aranym-1.1.0-libcwrap.patch 830 BLAKE2B 6eed885e5f06d3e9405501ade35c52afe8e01ecebde21ca6a9a0020d4402e39a97939c0ed64cf96a47f95779885eb1132bda90d3ba325b1d6a1f36527df072f9 SHA512 7050d4e24457f5ee12adb1a9aaddb2f5cb16c06105a74f78d8eefbf431629a043acb53160be5e66cfd82b64e8324fdf3cd7f4374cf8a64a66aa669ff701c2019 DIST aranym_1.1.0.orig.tar.gz 3785612 BLAKE2B 52b5fa34c78c67cb94cbe0d94795368cb7007f37571282d67387a0237500143f8078117132c9df392c5fd48b32cdb8c1cf727fe4d22a3d24eac0595215bddf4e SHA512 723b1a7c80532734e1dea288dbffd66746d9c7d1302ccb0259248a26aac5dedc7f66a134929de7064686af6c676d10918d90e2cf58cb010fd445979945177b51 -EBUILD aranym-1.1.0.ebuild 2611 BLAKE2B ff065d7e9bf7010d94ab197ca3b9b06b9501979a9cfe97e282b3e9dc39b4a7bbd61f3dcf53ef21fd01a03faa1be44be7dc59b44c25c678068a2e2867c9295a5e SHA512 e8a1dbabc3b211778a1dc1a581a747f166ced7a7d75be50c13f7d3d62c5d194634f373c82053e4ac83cd5e299288d0e410789c3e6b3bb6ee466a13f619ca2710 +EBUILD aranym-1.1.0.ebuild 2662 BLAKE2B c47e73430d70b16868ffe6b96c10c6a9fd645ffd29c252eaee51162acc16f1088f00c8019929637a10d5df9b0b5b1d50a4645f6ec8d02108ed627a329a4a9d63 SHA512 c1155fd16bdcabdc75f933bfa673fa2c76f4b8adbe3501016b15c43f756f5b4dc50707bfa190b0fd8a2164487539c66c23d04b98bc38f7bda075af4ff10680e6 MISC metadata.xml 862 BLAKE2B 3661f056df9749365d616c3a8c0c99458c08347e199bef3c21c657fe634862fb43edb6966d4acc2eec7196e310087fcb26b64c3f4177d8dc9ef8d6d62166abcb SHA512 0c85331417427933b6ee396f623054fbe3dbf6e51e0621159a6a7524104985f73d97f87473a1fb5388032bca37351d27199558e6f0726c199d7568962cd4f8d8 diff --git a/app-emulation/aranym/aranym-1.1.0.ebuild b/app-emulation/aranym/aranym-1.1.0.ebuild index 291f5a97220e..5c33cc4b867c 100644 --- a/app-emulation/aranym/aranym-1.1.0.ebuild +++ b/app-emulation/aranym/aranym-1.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -40,6 +40,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.1.0-conditional-installs.patch "${FILESDIR}"/${PN}-1.1.0-libcwrap.patch "${FILESDIR}"/${PN}-1.1.0-ar.patch + "${FILESDIR}"/${PN}-1.1.0-clang-16-register.patch ) ECONF_SOURCE="${S}" diff --git a/app-emulation/aranym/files/aranym-1.1.0-clang-16-register.patch b/app-emulation/aranym/files/aranym-1.1.0-clang-16-register.patch new file mode 100644 index 000000000000..2adc5fb3c1fe --- /dev/null +++ b/app-emulation/aranym/files/aranym-1.1.0-clang-16-register.patch @@ -0,0 +1,219 @@ +https://bugs.gentoo.org/894446 +https://github.com/aranym/aranym/commit/e19e21151d5e394dd45d4db08e68245e86e32ab7 +https://github.com/aranym/aranym/commit/64414e43deebc665772481d802b6c1c88d752ac3 + +From e19e21151d5e394dd45d4db08e68245e86e32ab7 Mon Sep 17 00:00:00 2001 +From: Thorsten Otto +Date: Tue, 2 Aug 2022 18:12:19 +0200 +Subject: [PATCH] Remove obsolete register keywords + +--- a/src/blitter.cpp ++++ b/src/blitter.cpp +@@ -114,8 +114,8 @@ void BLITTER::SM_UW(memptr addr, UW value) { + #define HOP_OPS(_fn_name,_op,_do_source_shift,_get_source_data,_shifted_hopd_data, _do_halftone_inc) \ + static void _fn_name ( BLITTER& b ) \ + { \ +- register unsigned int skew = (unsigned int) b.skewreg & 15; \ +- register unsigned int source_buffer=0; \ ++ unsigned int skew = b.skewreg & 15; \ ++ unsigned int source_buffer=0; \ + if (b.hop & 1) { \ + if (b.line_num & 0x20) \ + b.halftone_curroffset = b.skewreg & 15; \ +@@ -127,7 +127,7 @@ static void _fn_name ( BLITTER& b ) \ + b.halftone_direction = -1; \ + } \ + do \ +- { register UW x,dst_data,opd_data; \ ++ { UW x,dst_data,opd_data; \ + if (b.FXSR) \ + { _do_source_shift; \ + _get_source_data; \ +--- a/src/md5.cpp ++++ b/src/md5.cpp +@@ -168,7 +168,7 @@ MD5::MD5Final(md5byte digest[16]) + void + MD5::MD5Transform(UWORD32 buf[4], UWORD32 const in[16]) + { +- register UWORD32 a, b, c, d; ++ UWORD32 a, b, c, d; + + a = buf[0]; + b = buf[1]; + +From 64414e43deebc665772481d802b6c1c88d752ac3 Mon Sep 17 00:00:00 2001 +From: Thorsten Otto +Date: Tue, 9 Aug 2022 09:17:31 +0200 +Subject: [PATCH] Remove more obsolete register keywords + +--- a/src/disasm/disasm-builtin.cpp ++++ b/src/disasm/disasm-builtin.cpp +@@ -277,7 +277,7 @@ static const char *const bitfieldtable[] = + + static void ps(m68k_disasm_info *info, const char *str) + { +- register char c; ++ char c; + + while ((c = *str++) != '\0') + { +@@ -486,7 +486,7 @@ static void oadi(m68k_disasm_info *info, int regnum) + + static int os(m68k_disasm_info *info, int opcode) + { +- register int size; ++ int size; + + size = insize(opcode); + sputc('.'); +@@ -501,7 +501,7 @@ static int os(m68k_disasm_info *info, int opcode) + + static int os2(m68k_disasm_info *info, int opcode) + { +- register int size; ++ int size; + + size = (opcode >> 9) & 3; + sputc('.'); +@@ -968,10 +968,10 @@ static void doextended(m68k_disasm_info *info, int opcode2, int srcr) + + static void doea(m68k_disasm_info *info, int opcode, int size) + { +- register int srcr; +- register int opcode2; ++ int srcr; ++ int opcode2; + uae_s32 offset; +- register uae_s32 adr; ++ uae_s32 adr; + + srcr = srcreg(opcode); + switch (srcmod(opcode)) +@@ -1071,7 +1071,7 @@ static void doea(m68k_disasm_info *info, int opcode, int size) + + static void reglist(m68k_disasm_info *info, int regmask) + { +- register int regnum; ++ int regnum; + int liststart; + int lastreg; + int status; +@@ -1113,8 +1113,8 @@ static void reglist(m68k_disasm_info *info, int regmask) + + static int revbits(int mask, int n) + { +- register int i; +- register int newmask; ++ int i; ++ int newmask; + + for (newmask = 0, i = n; i > 0; i--) + { +@@ -1390,7 +1390,7 @@ static void group0(m68k_disasm_info *info, int opcode) + + static void group11(m68k_disasm_info *info, int opcode) + { +- register int size; ++ int size; + + if ((opcode & 0x0100) != 0 && insize(opcode) != 3) + { +@@ -1441,7 +1441,7 @@ static void group11(m68k_disasm_info *info, int opcode) + + static void group1(m68k_disasm_info *info, int opcode) + { +- register int size = 0; ++ int size = 0; + + ps(info, "move"); + if (dstmod(opcode) == 1) +@@ -1475,7 +1475,7 @@ static void group1(m68k_disasm_info *info, int opcode) + + static void group14(m68k_disasm_info *info, int opcode) + { +- register short size; ++ short size; + unsigned int opcode2; + unsigned int bf; + +@@ -2069,7 +2069,7 @@ static enum fpu_size print_fpsize(m68k_disasm_info *info, int mask) + static void print_freglist(m68k_disasm_info *info, int regmask, int mode, bool cntl) + { + const char *const * regs; +- register int regnum; ++ int regnum; + int liststart; + int lastreg; + int status; +@@ -3011,8 +3011,8 @@ static void pspreg(m68k_disasm_info *info, int mask) + + static void group4(m68k_disasm_info *info, int opcode) + { +- register int mask; +- register int size; ++ int mask; ++ int size; + + if (opcode & 0x0100) + { +@@ -3540,7 +3540,7 @@ static void group4(m68k_disasm_info *info, int opcode) + + static void group5(m68k_disasm_info *info, int opcode) + { +- register uae_s32 adr; ++ uae_s32 adr; + + if (insize(opcode) == 3) + { +@@ -3603,9 +3603,9 @@ static void group5(m68k_disasm_info *info, int opcode) + + static void group6(m68k_disasm_info *info, int opcode) + { +- register uae_s32 adr; +- register int cond; +- register signed char dist; ++ uae_s32 adr; ++ int cond; ++ signed char dist; + + /* 0110 cccc dddddddd */ + switch (cond = (opcode >> 8) & 0x000f) +@@ -3686,7 +3686,7 @@ static void group7(m68k_disasm_info *info, int opcode) + + static void g812(m68k_disasm_info *info, int opcode, const char *andor, const char *muldiv, const char *as) + { +- register int size; ++ int size; + + info->num_oper = 2; + if (dstmod(opcode) == 3) +@@ -3772,7 +3772,7 @@ static void group8(m68k_disasm_info *info, int opcode) + + static void group12(m68k_disasm_info *info, int opcode) + { +- register int d5; ++ int d5; + + if ((d5 = (opcode >> 3) & 0x003f) == 0x0028) + { +@@ -3813,7 +3813,7 @@ static void group12(m68k_disasm_info *info, int opcode) + + static void g913(m68k_disasm_info *info, int opcode, const char *addsub) + { +- register int size; ++ int size; + + ps(info, addsub); + if ((opcode & 0x0100) != 0 && insize(opcode) != 3 && ((opcode >> 4) & 3) == 0) +@@ -4125,8 +4125,8 @@ static void (*const grphdlrs[])(m68k_disasm_info *, int) = { + + int m68k_disasm_builtin(m68k_disasm_info *info) + { +- register int opcode; +- register void (*hdlr)(m68k_disasm_info *info, int opcode); ++ int opcode; ++ void (*hdlr)(m68k_disasm_info *info, int opcode); + unsigned int insn_size; + struct priv_data *priv; + + -- cgit v1.2.3