diff options
| -rw-r--r-- | app-shells/ksh/Manifest | 2 | ||||
| -rw-r--r-- | app-shells/ksh/ksh-1.0.9.ebuild (renamed from app-shells/ksh/ksh-1.0.3.ebuild) | 20 | ||||
| -rw-r--r-- | app-shells/ksh/ksh-9999.ebuild | 7 | ||||
| -rw-r--r-- | eclass/cmake.eclass | 1 | ||||
| -rw-r--r-- | net-im/dino/dino-0.4.3-r1.ebuild | 1 | ||||
| -rw-r--r-- | net-im/dino/files/dino-0.4.3-vala-gpgme.patch | 32 | ||||
| -rw-r--r-- | sys-libs/gdbm/Manifest | 2 | ||||
| -rw-r--r-- | sys-libs/gdbm/gdbm-1.24.ebuild | 60 |
8 files changed, 102 insertions, 23 deletions
diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index be1686c1b570..7f5bd74db1b1 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -1,3 +1,3 @@ -DIST ksh-v1.0.3.tar.gz 2110771 BLAKE2B 4316c78f7889fb2e4630a83dd0f1c5c4c4b418a822e8f7d3d9415a83bbef6e993cbd21b4842c7f56cd8647305c4bdddc04562b8788f2ee6e14698a9cb090f386 SHA512 9d6e664bc6c8d102ba09e692d057b9546b07ba3ecb060449df6648e7c99f8dfd670401e6fcf34f6f3de13338a3c31c09596344931ccfdf4cd4e49eabdf005c23 DIST ksh-v1.0.4.tar.gz 2127036 BLAKE2B c3bd7f8d8c86e8bf4f7482c99890f025365334b7ab826261b03f9a2f6bf72b4112ba0cec09c7d5388cbba4541a4e99a24e3b95a98e386b941a39f549c5c21525 SHA512 ca6ff4625a48a991d07a34c8d28656c131124e6cccbb495d8fbc2922db9f94a83c1df2be17a7fa7aa39ce5b9243573b0b806eef87d11c5a2936e7af564d2f5e6 DIST ksh-v1.0.8.tar.gz 2114262 BLAKE2B cf900c4dbdc750a6c4ff6906ab32b24722da3dbb84363517e4d7345c0bc591c346aa82fb58de5fd9662f20dd855deb6f1720002b7d91118ef8497e9f45412148 SHA512 4284ab98f6055877c0715a8b224eb5a75dc7fa022f38c9ee30d50786e997f70b507ee452fc8bbdfa67649a26e0fdfc8051f7e54ff9f6a0f96e44498757080548 +DIST ksh-v1.0.9.tar.gz 2084378 BLAKE2B 9cb827003f00261df74e19c6b9dad5f25fba401bc9dabeb300b90b7f3e9e9c37d096e5e24dec7c2ac60b195008d69c9fc682b32b376f7c03cbf9c56779431958 SHA512 747a9b624ee898c84cf37958add17eee6ee8fcb6112701430f0d12d2913b3af22554a98a9836dee6bbbe62adbdb3cbc1d3fb7f2c654f2ce799805d9b1f407683 diff --git a/app-shells/ksh/ksh-1.0.3.ebuild b/app-shells/ksh/ksh-1.0.9.ebuild index dd729029724d..96d8ebd86abd 100644 --- a/app-shells/ksh/ksh-1.0.3.ebuild +++ b/app-shells/ksh/ksh-1.0.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/ksh93/ksh" else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" MY_PV=$(ver_rs 3 - 4 .) SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz" S="${WORKDIR}/${PN}-${MY_PV}" @@ -21,13 +21,6 @@ HOMEPAGE="http://www.kornshell.com/" LICENSE="EPL-1.0" SLOT="0" -src_prepare() { - default - - # disable register for debugging - sed -i 1i"#define register" src/lib/libast/include/ast.h || die -} - src_compile() { local extraflags=( "-Wno-unknown-pragmas" @@ -40,18 +33,17 @@ src_compile() { "-Wno-unused-but-set-variable" "-Wno-cpp" "-Wno-maybe-uninitialized" - "-Wno-lto-type-mismatch" - "-Wno-error=int-conversion" - "-Wno-int-conversion" "-P" ) append-cflags $(test-flags-CC ${extraflags[@]}) + append-cflags -fno-strict-aliasing filter-flags '-fdiagnostics-color=always' # https://github.com/ksh93/ksh/issues/379 - export CCFLAGS="${CFLAGS} -fno-strict-aliasing" + filter-lto + export CCFLAGS="${CFLAGS}" tc-export AR CC LD NM - sh bin/package make SHELL="${BROOT}"/bin/sh || die + sh bin/package make AR="${AR}" CC="${CC}" NM="${NM}" SHELL="${BROOT}"/bin/sh || die } src_test() { diff --git a/app-shells/ksh/ksh-9999.ebuild b/app-shells/ksh/ksh-9999.ebuild index c97a769209a6..96d8ebd86abd 100644 --- a/app-shells/ksh/ksh-9999.ebuild +++ b/app-shells/ksh/ksh-9999.ebuild @@ -21,13 +21,6 @@ HOMEPAGE="http://www.kornshell.com/" LICENSE="EPL-1.0" SLOT="0" -src_prepare() { - default - - # disable register for debugging - sed -i 1i"#define register" src/lib/libast/include/ast.h || die -} - src_compile() { local extraflags=( "-Wno-unknown-pragmas" diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index 908e2356ead2..de43bd017768 100644 --- a/eclass/cmake.eclass +++ b/eclass/cmake.eclass @@ -541,7 +541,6 @@ cmake_src_configure() { set(CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "") set(BUILD_SHARED_LIBS ON CACHE BOOL "") set(Python3_FIND_UNVERSIONED_NAMES FIRST CACHE STRING "") - set(FETCHCONTENT_FULLY_DISCONNECTED ON CACHE BOOL "") set(CMAKE_DISABLE_PRECOMPILE_HEADERS ON CACHE BOOL "") _EOF_ diff --git a/net-im/dino/dino-0.4.3-r1.ebuild b/net-im/dino/dino-0.4.3-r1.ebuild index 0badcf1fd992..4f9c5a607668 100644 --- a/net-im/dino/dino-0.4.3-r1.ebuild +++ b/net-im/dino/dino-0.4.3-r1.ebuild @@ -63,6 +63,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${P}-c99.patch + "${FILESDIR}"/${P}-vala-gpgme.patch ) src_configure() { diff --git a/net-im/dino/files/dino-0.4.3-vala-gpgme.patch b/net-im/dino/files/dino-0.4.3-vala-gpgme.patch new file mode 100644 index 000000000000..fa609a97d88d --- /dev/null +++ b/net-im/dino/files/dino-0.4.3-vala-gpgme.patch @@ -0,0 +1,32 @@ +https://bugs.gentoo.org/930539 +https://github.com/dino/dino/issues/1576 +https://github.com/dino/dino/commit/a90edd05389d2f8011eccda3acd5f24f3948b8b5 + +From a90edd05389d2f8011eccda3acd5f24f3948b8b5 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz <ricotz@ubuntu.com> +Date: Sun, 28 Apr 2024 21:30:12 +0200 +Subject: [PATCH] Annotating with array_null_terminated doesn't imply a missing + array_length + +Taken from https://github.com/GNOME/vala-extra-vapis/commit/6b8a3e4faaabc462f90ffcb0cf0f91991ee58077 +--- + plugins/gpgme-vala/vapi/gpgme_public.vapi | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/plugins/gpgme-vala/vapi/gpgme_public.vapi b/plugins/gpgme-vala/vapi/gpgme_public.vapi +index bcf125696..4f9010c98 100644 +--- a/plugins/gpgme-vala/vapi/gpgme_public.vapi ++++ b/plugins/gpgme-vala/vapi/gpgme_public.vapi +@@ -22,9 +22,9 @@ public class Key { + public string issuer_name; + public string chain_id; + public Validity owner_trust; +- [CCode(array_null_terminated = true)] ++ [CCode (array_length = false, array_null_terminated = true)] + public SubKey[] subkeys; +- [CCode(array_null_terminated = true)] ++ [CCode (array_length = false, array_null_terminated = true)] + public UserID[] uids; + public KeylistMode keylist_mode; + // public string fpr; // requires gpgme >= 1.7.0 + diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest index 63bb68e78015..565e603df070 100644 --- a/sys-libs/gdbm/Manifest +++ b/sys-libs/gdbm/Manifest @@ -1,2 +1,4 @@ DIST gdbm-1.23.tar.gz 1115854 BLAKE2B a47746577cf2f3c9b62faea496c4d6a50a8f1b0a5af448cb2215e90057c99b5b630ba3f5357c85dfb7fd98ba4e90969e30a779120c29106ed1e8736721f9bec1 SHA512 918080cb0225b221c11eb7339634a95e00c526072395f7a3d46ccf42ef020dea7c4c5bec34aff2c4f16033e1fff6583252b7e978f68b8d7f8736b0e025838e10 DIST gdbm-1.23.tar.gz.sig 181 BLAKE2B 34785e6fe8e02100084d61e989749ee388794b8af82fc59a417140807bf169c45c15935f8cf91d0ba116dfdee295e05b2b014f1539f1f128a57acfe59010d34d SHA512 6653751c04584f10aa3325bd1cb5b9f7970a786dd2a99602ea620c11a86a9ba5c342aa52627bd06c03da822e9e1600dc034d9a8f42856a287fd67f6b9f161c71 +DIST gdbm-1.24.tar.gz 1195931 BLAKE2B 79f49adbb455c2e1b91f3450037b71165fa8de82650d6402e0e22ee1f4d278fdb0bd78100659bf416e2409b432e1f8d32ecbae523980413f7148b80ee06c9f4b SHA512 401ff8c707079f21da1ac1d6f4714a87f224b6f41943078487dc891be49f51fd1ac7a32fd599aae0fad185f2c6ba7432616d328fd6aaab068eb54db9562ff7fa +DIST gdbm-1.24.tar.gz.sig 95 BLAKE2B 3a66c2a256d9601db57df20feb5d72d1e94d23b7a92e3099f121549c8aa2c57b05a3021d88f97291819378462a68664af958de4c9de65887d2cca6642d172bc3 SHA512 a54595e0fd23724f5e30c2ff1b9656dbb6da3b448f4ab6a2579a523c11bae53e47d3843327a1e4499b312ab947ac73b5a9aa6e78fe5e932c55a1be0cdab4e63d diff --git a/sys-libs/gdbm/gdbm-1.24.ebuild b/sys-libs/gdbm/gdbm-1.24.ebuild new file mode 100644 index 000000000000..5c738509d6d9 --- /dev/null +++ b/sys-libs/gdbm/gdbm-1.24.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gdbm.asc +inherit libtool multilib-minimal verify-sig + +DESCRIPTION="Standard GNU database libraries" +HOMEPAGE="https://www.gnu.org/software/gdbm/" +SRC_URI=" + mirror://gnu/gdbm/${P}.tar.gz + verify-sig? ( mirror://gnu/gdbm/${P}.tar.gz.sig ) +" + +LICENSE="GPL-3" +SLOT="0/6" # libgdbm.so version +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="+berkdb nls +readline static-libs test" +RESTRICT="!test? ( test )" + +DEPEND="readline? ( sys-libs/readline:=[${MULTILIB_USEDEP}] )" +RDEPEND="${DEPEND}" +BDEPEND=" + test? ( dev-util/dejagnu ) + verify-sig? ( sec-keys/openpgp-keys-gdbm ) +" + +src_prepare() { + default + + # gdbm ships with very old libtool files, regen to avoid + # errors when cross-compiling. + elibtoolize +} + +multilib_src_configure() { + # gdbm doesn't appear to use either of these libraries + export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no + + local myeconfargs=( + --includedir="${EPREFIX}"/usr/include/gdbm + $(use_enable berkdb libgdbm-compat) + $(use_enable nls) + $(use_enable static-libs static) + $(use_with readline) + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + einstalldocs + + if ! use static-libs ; then + find "${ED}" -name '*.la' -delete || die + fi + + mv "${ED}"/usr/include/gdbm/gdbm.h "${ED}"/usr/include/ || die +} |