diff options
author | 2023-09-21 19:03:34 +0000 | |
---|---|---|
committer | 2023-09-21 19:03:34 +0000 | |
commit | cc0c583aebe67de294a2fcd8ee538e7381391036 (patch) | |
tree | 1b51607950bf8f740fbe6403d8a5032c5bf88197 | |
parent | 2023-09-21 18:48:40 UTC (diff) | |
parent | dev-util/librnp: keyword 0.17.0-r2 for ~loong (diff) | |
download | gentoo-cc0c583aebe67de294a2fcd8ee538e7381391036.tar.gz gentoo-cc0c583aebe67de294a2fcd8ee538e7381391036.tar.bz2 gentoo-cc0c583aebe67de294a2fcd8ee538e7381391036.zip |
Merge updates from master
-rw-r--r-- | app-admin/salt/Manifest | 2 | ||||
-rw-r--r-- | app-admin/salt/salt-3005.3.ebuild (renamed from app-admin/salt/salt-3005.2.ebuild) | 0 | ||||
-rw-r--r-- | app-emulation/softgun/files/softgun-0.22-fix-declarations-with-type-mismatches.patch | 148 | ||||
-rw-r--r-- | app-emulation/softgun/files/softgun-0.22-fix-implicit-int.patch | 33 | ||||
-rw-r--r-- | app-emulation/softgun/softgun-0.22-r1.ebuild | 38 | ||||
-rw-r--r-- | dev-libs/sexpp/sexpp-0.8.6.ebuild | 2 | ||||
-rw-r--r-- | dev-python/jsonpath-ng/jsonpath-ng-1.6.0.ebuild | 2 | ||||
-rw-r--r-- | dev-python/portalocker/portalocker-2.8.2.ebuild | 2 | ||||
-rw-r--r-- | dev-python/sphinxcontrib-plantuml/sphinxcontrib-plantuml-0.26.ebuild | 2 | ||||
-rw-r--r-- | dev-ruby/rouge/rouge-3.30.0-r1.ebuild | 2 | ||||
-rw-r--r-- | dev-ruby/rouge/rouge-4.1.3.ebuild | 2 | ||||
-rw-r--r-- | dev-ruby/yard/yard-0.9.34.ebuild | 2 | ||||
-rw-r--r-- | dev-util/librnp/librnp-0.17.0-r2.ebuild | 2 | ||||
-rw-r--r-- | profiles/arch/loong/package.use.mask | 4 | ||||
-rw-r--r-- | sys-power/autosuspend/autosuspend-5.0.0.ebuild | 2 |
15 files changed, 233 insertions, 10 deletions
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest index 0a8a5f057bcc..d2e75dee58e0 100644 --- a/app-admin/salt/Manifest +++ b/app-admin/salt/Manifest @@ -1,4 +1,4 @@ DIST salt-3005.1.tar.gz 17914349 BLAKE2B 697c2068bf119e4a19f92a86ce880fec9375c10ba549cdcdd2182cfeaacce31c7bc4c4c91e1a609906b4c5373bb5e3120e0db47ede5b45ee20942d7b2d201e64 SHA512 391f995f0129f3d7104a0eea4fd83b18aa6ecae0fd7a2c77c1154e24b0bcd52cef4b63db12597c85737bb33ddf605e0c23370cef3bf47f9ea85af5b77d74dc50 -DIST salt-3005.2.tar.gz 17935313 BLAKE2B 550853b8245351b251438ac87d775e8b39d71ddc1eee0375f4bb29c04e2aacf5905ef9ac5373d9e7ff47a1cc8d6b9ce1a2a4c3d75b5647d4047bc06a5e526664 SHA512 07e7afc732a97006557d4556d60aa1854934893d0566bf8c295d4b1c01515988a1bf2798ce228f6b37e657de8fdfff51153ad2ea8d54baa6a5c377e30794f317 +DIST salt-3005.3.tar.gz 17932868 BLAKE2B 18b1b3fe0708c2b425a410766df1545c093b43e69527b1213e1b043668b914016dc95b5c96c0619b1234b57fa404fdbe4fc245ac11d4f0b121edf4b0deacb3ee SHA512 4a40b21f0ee8ac31d3ca3d4d43706c3a484b9e19bd5797764475772af42fe682476b19f9097f003c838683529f15a757aab769eb0a15578cbc2fc449d8216604 DIST salt-3006.2.tar.gz 20411634 BLAKE2B dff474017918ef3ee0031856a2739282077205d8c2589809a91e5f1c3741cb26d2bd2458734ea4d3533118c881851dfd853f4ba4f1c631e7db28e95bc1b6f7f8 SHA512 2626cb5beb1b30fc63f554f5804f0d9b7e36b7c569c5f9049e5f5ac5a413e9d99a98b3d91089683338e3d3890ec973dff80782b4e41acb291872e45084fd2546 DIST salt-3006.3.tar.gz 20461738 BLAKE2B dfa4698dbc611c9c4954b4631d11b685e1efc978915918ce6d8f1890bb4a230d234b6a191166ffff9243058d44530bfc14b43386c8bc295c035c6609d6bf3fa0 SHA512 9cced766db2144de445ed53b52c1551c986ba43774c40512fd07973862d6d3a361e25f55fcfeeb0e03ba44eec1051909834e5d0a352ead5ec6f418b15c909628 diff --git a/app-admin/salt/salt-3005.2.ebuild b/app-admin/salt/salt-3005.3.ebuild index 2d5c18e2ca63..2d5c18e2ca63 100644 --- a/app-admin/salt/salt-3005.2.ebuild +++ b/app-admin/salt/salt-3005.3.ebuild diff --git a/app-emulation/softgun/files/softgun-0.22-fix-declarations-with-type-mismatches.patch b/app-emulation/softgun/files/softgun-0.22-fix-declarations-with-type-mismatches.patch new file mode 100644 index 000000000000..25bf382eee56 --- /dev/null +++ b/app-emulation/softgun/files/softgun-0.22-fix-declarations-with-type-mismatches.patch @@ -0,0 +1,148 @@ +Subject: [PATCH] fix declarations with type mismatches + +Type mismatches between declarations prevent the compile from using LTO + +Bug: https://bugs.gentoo.org/854534 +Upstream: https://sourceforge.net/p/softgun/patches/5/ + +# Pascal Jäger <pascal.jaeger@leimstift.de> (2023-09-21) + +--- a/m16c/idecode_m16c.c ++++ b/m16c/idecode_m16c.c +@@ -9,7 +9,7 @@ + #include "sglib.h" + + M16C_InstructionProc **iProcTab; +-M16C_Instruction **iTab; ++M16C_Instruction **iTabM16C; + + static M16C_Instruction instrlist[] = { + {0xfef0,0x76f0,"abs.size_dst",2 ,m16c_abs_size_dst}, +@@ -308,7 +308,7 @@ M16C_IDecoderNew() + int i,j; + int onecount1,onecount2; + iProcTab=(M16C_InstructionProc**)sg_calloc(0x10000*sizeof(M16C_InstructionProc*)); +- iTab=sg_calloc(0x10000*sizeof(M16C_Instruction*)); ++ iTabM16C=sg_calloc(0x10000*sizeof(M16C_Instruction*)); + fprintf(stderr,"Allocated M16C Instruction decoder table\n"); + for(j=0;instrlist[j].proc;j++) { + M16C_Instruction *instr = &instrlist[j]; +@@ -327,8 +327,8 @@ M16C_IDecoderNew() + } + #endif + if((i & instr->mask) == instr->icode) { +- if(iTab[i]) { +- M16C_Instruction *instr2 = iTab[i]; ++ if(iTabM16C[i]) { ++ M16C_Instruction *instr2 = iTabM16C[i]; + specmask1 = instr->mask; + specmask2 = instr2->mask; + onecount1 = SGLib_OnecountU32(instr->mask); +@@ -336,18 +336,18 @@ M16C_IDecoderNew() + fprintf(stderr,"Collission %s, %s\n",instr->name,instr2->name); + #if 0 + if(instr->len > instr2->len) { +- iTab[i] = instr; ++ iTabM16C[i] = instr; + iProcTab[i] = instr->proc; + } else if(instr2->len > instr->len) { +- iTab[i] = instr2; ++ iTabM16C[i] = instr2; + iProcTab[i] = instr2->proc; + } else + #endif + if(onecount1 > onecount2) { +- iTab[i] = instr; ++ iTabM16C[i] = instr; + iProcTab[i] = instr->proc; + } else if(onecount2 > onecount1) { +- iTab[i] = instr2; ++ iTabM16C[i] = instr2; + iProcTab[i] = instr2->proc; + } else { + fprintf(stderr,"Can not decide %s, %s\n",instr->name,instr2->name); +@@ -360,10 +360,10 @@ M16C_IDecoderNew() + specmask2 |= 0xff00; + } + if((specmask2 & specmask1) == specmask1) { +- iTab[i] = instr2; ++ iTabM16C[i] = instr2; + iProcTab[i] = instr2->proc; + } else if((specmask2 & specmask1) == specmask2) { +- iTab[i] = instr; ++ iTabM16C[i] = instr; + iProcTab[i] = instr->proc; + } else { + fprintf(stdout,"%04x: no instruction is more specific %s %s %04x %04x %d %d\n",i,instr->name,instr2->name,instr->icode,instr2->icode,instr->len,instr2->len); +@@ -371,13 +371,13 @@ M16C_IDecoderNew() + } + #endif + } else { +- iTab[i] = instr; ++ iTabM16C[i] = instr; + iProcTab[i] = instr->proc; + } + } + } +- if(iTab[i] == NULL) { +- iTab[i] = &undefined_instr; ++ if(iTabM16C[i] == NULL) { ++ iTabM16C[i] = &undefined_instr; + iProcTab[i] = (&undefined_instr)->proc; + } + } +--- a/m16c/idecode_m16c.h ++++ b/m16c/idecode_m16c.h +@@ -11,14 +11,14 @@ typedef struct M16C_Instruction { + } M16C_Instruction; + + extern M16C_InstructionProc **iProcTab; +-extern M16C_Instruction **iTab; ++extern M16C_Instruction **iTabM16C; + + void M16C_IDecoderNew(void); + + static inline M16C_Instruction * + M16C_InstructionFind(uint16_t icode) + { +- return iTab[icode]; ++ return iTabM16C[icode]; + } + static inline M16C_InstructionProc * + M16C_InstructionProcFind(uint16_t icode) +--- a/m16c/instructions_m16c.h ++++ b/m16c/instructions_m16c.h +@@ -160,7 +160,7 @@ void m16c_smovb_size(void); + void m16c_smovf_size(void); + void m16c_sstr_size(void); + void m16c_stc_srcdst(void); +-void m16c_stc_pcdst(void); ++void m16c_stc_pcdst(uint16_t icode); + void m16c_stctx_abs16abs20(void); + void m16c_ste_size_srcabs20(void); + void m16c_ste_size_srcdsp20(void); +--- a/ppc/mmu_ppc.c ++++ b/ppc/mmu_ppc.c +@@ -587,7 +587,7 @@ PPCMMU_Read8(uint32_t va) { + } + + void +-PPCMMU_Write64(uint32_t value,uint32_t va) { ++PPCMMU_Write64(uint64_t value,uint32_t va) { + uint32_t pa=translate_data(va); + Bus_Write64(value,pa); + } +--- a/printer/decompress.c ++++ b/printer/decompress.c +@@ -55,7 +55,7 @@ enum + eeCachedColor = 0x60 + }; + +-inline uint32_t get3pixel (uint8_t* src) ++static inline uint32_t get3pixel (uint8_t* src) + { + return (src[0] << 16) | (src[1] << 8) | (src[2]); + } +-- +2.41.0 + diff --git a/app-emulation/softgun/files/softgun-0.22-fix-implicit-int.patch b/app-emulation/softgun/files/softgun-0.22-fix-implicit-int.patch new file mode 100644 index 000000000000..b65ddaf660f3 --- /dev/null +++ b/app-emulation/softgun/files/softgun-0.22-fix-implicit-int.patch @@ -0,0 +1,33 @@ +Subject: [PATCH] fix implicit int declarations in function params + +Clang16 does not allow implicit integer declarations by default. + +Bug: https://bugs.gentoo.org/882583 +Upstream: https://sourceforge.net/p/softgun/patches/5/ + +# Pascal Jäger <pascal.jaeger@leimstift.de> (2023-09-21) +--- a/arm/arm9cpu.h ++++ b/arm/arm9cpu.h +@@ -356,7 +356,7 @@ ARM_PostRestartIdecoder() { + } + + static inline void +-ARM_SigDebugMode(value) { ++ARM_SigDebugMode(uint32_t value) { + if(value) { + gcpu.signals_raw |= ARM_SIG_DEBUGMODE; + } else { +--- a/m32c/idecode_m32c.h ++++ b/m32c/idecode_m32c.h +@@ -84,7 +84,7 @@ M32C_InstructionProcFind(uint16_t icode) + #endif + + static inline int +-M32C_InstructionLen(icode) { ++M32C_InstructionLen(uint32_t icode) { + M32C_Instruction *instr = M32C_InstructionFind(icode); + return instr->len; + } +-- +2.41.0 + diff --git a/app-emulation/softgun/softgun-0.22-r1.ebuild b/app-emulation/softgun/softgun-0.22-r1.ebuild new file mode 100644 index 000000000000..653521bd5aa3 --- /dev/null +++ b/app-emulation/softgun/softgun-0.22-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="ARM software emulator" +HOMEPAGE="https://softgun.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +DEPEND="media-libs/alsa-lib" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-0.22-make.patch + "${FILESDIR}"/${PN}-0.22-fix-implicit-int.patch + "${FILESDIR}"/${PN}-0.22-fix-declarations-with-type-mismatches.patch +) + +src_configure() { + append-cflags -fcommon + default +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + dodir /usr/bin + emake install prefix="${D}/usr" + dodoc README configs/*.sg +} diff --git a/dev-libs/sexpp/sexpp-0.8.6.ebuild b/dev-libs/sexpp/sexpp-0.8.6.ebuild index 6f40d4e48833..8c6eff4e3f61 100644 --- a/dev-libs/sexpp/sexpp-0.8.6.ebuild +++ b/dev-libs/sexpp/sexpp-0.8.6.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/rnpgp/sexpp/archive/refs/tags/v${PV}.tar.gz -> ${P}. LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 x86" +KEYWORDS="amd64 ~arm64 ~loong ~ppc64 x86" IUSE="cli test" BDEPEND="virtual/pkgconfig diff --git a/dev-python/jsonpath-ng/jsonpath-ng-1.6.0.ebuild b/dev-python/jsonpath-ng/jsonpath-ng-1.6.0.ebuild index f5685da526e8..e714b65aaea6 100644 --- a/dev-python/jsonpath-ng/jsonpath-ng-1.6.0.ebuild +++ b/dev-python/jsonpath-ng/jsonpath-ng-1.6.0.ebuild @@ -17,7 +17,7 @@ HOMEPAGE=" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" RDEPEND=" dev-python/ply[${PYTHON_USEDEP}] diff --git a/dev-python/portalocker/portalocker-2.8.2.ebuild b/dev-python/portalocker/portalocker-2.8.2.ebuild index 333c026f2774..f60b24c8aba5 100644 --- a/dev-python/portalocker/portalocker-2.8.2.ebuild +++ b/dev-python/portalocker/portalocker-2.8.2.ebuild @@ -21,7 +21,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" BDEPEND=" test? ( diff --git a/dev-python/sphinxcontrib-plantuml/sphinxcontrib-plantuml-0.26.ebuild b/dev-python/sphinxcontrib-plantuml/sphinxcontrib-plantuml-0.26.ebuild index d4636449c967..dc76419a2a3f 100644 --- a/dev-python/sphinxcontrib-plantuml/sphinxcontrib-plantuml-0.26.ebuild +++ b/dev-python/sphinxcontrib-plantuml/sphinxcontrib-plantuml-0.26.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" S="${WORKDIR}/${P#sphinxcontrib-}" diff --git a/dev-ruby/rouge/rouge-3.30.0-r1.ebuild b/dev-ruby/rouge/rouge-3.30.0-r1.ebuild index f61c144d536e..b212c00ae618 100644 --- a/dev-ruby/rouge/rouge-3.30.0-r1.ebuild +++ b/dev-ruby/rouge/rouge-3.30.0-r1.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="2" -KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos" +KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos" IUSE="" ruby_add_bdepend "doc? ( dev-ruby/redcarpet ) diff --git a/dev-ruby/rouge/rouge-4.1.3.ebuild b/dev-ruby/rouge/rouge-4.1.3.ebuild index 3cd8168ca865..bbe0e3381dad 100644 --- a/dev-ruby/rouge/rouge-4.1.3.ebuild +++ b/dev-ruby/rouge/rouge-4.1.3.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/rouge-ruby/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="MIT" SLOT="$(ver_cut 1)" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="" ruby_add_bdepend "doc? ( dev-ruby/redcarpet ) diff --git a/dev-ruby/yard/yard-0.9.34.ebuild b/dev-ruby/yard/yard-0.9.34.ebuild index 3ae7ab83fdd6..9f8bc5b43777 100644 --- a/dev-ruby/yard/yard-0.9.34.ebuild +++ b/dev-ruby/yard/yard-0.9.34.ebuild @@ -25,7 +25,7 @@ SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="" ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/kramdown ) )" diff --git a/dev-util/librnp/librnp-0.17.0-r2.ebuild b/dev-util/librnp/librnp-0.17.0-r2.ebuild index 4594d7885f07..b04311dc0379 100644 --- a/dev-util/librnp/librnp-0.17.0-r2.ebuild +++ b/dev-util/librnp/librnp-0.17.0-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/rnpgp/rnp/archive/refs/tags/v${PV}.tar.gz -> ${P}.ta LICENSE="Apache-2.0 BSD BSD-2" SLOT="0/0.16.1" -KEYWORDS="amd64 ~arm64 ~ppc64 x86" +KEYWORDS="amd64 ~arm64 ~loong ~ppc64 x86" IUSE="+botan man test" RDEPEND="app-arch/bzip2 diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask index 64c7bb1fdebc..b92f78941879 100644 --- a/profiles/arch/loong/package.use.mask +++ b/profiles/arch/loong/package.use.mask @@ -1,6 +1,10 @@ # Copyright 2022-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# WANG Xuerui <xen0n@gentoo.org> (2023-09-21) +# dev-ruby/asciidoctor is not keyworded yet. +dev-util/librnp man + # Michał Górny <mgorny@gentoo.org> (2023-09-19) # dev-cpp/cpp-httplib is keyworded here. sys-devel/llvm -debuginfod diff --git a/sys-power/autosuspend/autosuspend-5.0.0.ebuild b/sys-power/autosuspend/autosuspend-5.0.0.ebuild index eb6e1694c159..09d5184d4a3b 100644 --- a/sys-power/autosuspend/autosuspend-5.0.0.ebuild +++ b/sys-power/autosuspend/autosuspend-5.0.0.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="dbus mpd test" RESTRICT="!test? ( test )" |