diff options
author | 2021-10-25 17:36:57 +0000 | |
---|---|---|
committer | 2021-10-25 17:36:57 +0000 | |
commit | 7d46ed6d7ccc721105996d0f842f8898f6200b09 (patch) | |
tree | 65768d7951a4023474571ff6e98ed0fe0941b128 | |
parent | 2021-10-25 17:22:12 UTC (diff) | |
parent | mail-filter/libspf2-1.2.11: version bump (diff) | |
download | gentoo-7d46ed6d7ccc721105996d0f842f8898f6200b09.tar.gz gentoo-7d46ed6d7ccc721105996d0f842f8898f6200b09.tar.bz2 gentoo-7d46ed6d7ccc721105996d0f842f8898f6200b09.zip |
Merge updates from master
-rw-r--r-- | app-doc/devmanual/devmanual-0_pre20210118.ebuild | 2 | ||||
-rw-r--r-- | app-doc/devmanual/devmanual-9999.ebuild | 2 | ||||
-rw-r--r-- | app-misc/terminal-colors/terminal-colors-2.3.ebuild | 7 | ||||
-rw-r--r-- | app-text/sigil/Manifest | 1 | ||||
-rw-r--r-- | app-text/sigil/sigil-1.8.0.ebuild | 72 | ||||
-rw-r--r-- | dev-libs/librelp/librelp-1.10.0.ebuild | 4 | ||||
-rw-r--r-- | dev-python/dask/metadata.xml | 1 | ||||
-rw-r--r-- | dev-python/environs/Manifest | 1 | ||||
-rw-r--r-- | dev-python/environs/environs-9.3.4.ebuild | 32 | ||||
-rw-r--r-- | mail-filter/libspf2/Manifest | 1 | ||||
-rw-r--r-- | mail-filter/libspf2/files/libspf2-1.2.11-memset-include-string-h.patch | 12 | ||||
-rw-r--r-- | mail-filter/libspf2/libspf2-1.2.11.ebuild | 48 | ||||
-rw-r--r-- | mail-filter/libspf2/metadata.xml | 16 | ||||
-rw-r--r-- | net-misc/exabgp/exabgp-4.2.11-r2.ebuild | 3 | ||||
-rw-r--r-- | net-misc/freerdp/files/freerdp-2-openssl-3.0.patch | 61 | ||||
-rw-r--r-- | net-misc/freerdp/files/freerdp-2.4.0-TestUnicodeConversion-big-endian.patch | 28 | ||||
-rw-r--r-- | sci-libs/nlopt/nlopt-2.6.2-r1.ebuild | 4 |
17 files changed, 279 insertions, 16 deletions
diff --git a/app-doc/devmanual/devmanual-0_pre20210118.ebuild b/app-doc/devmanual/devmanual-0_pre20210118.ebuild index 1170493b93eb..c0d0cc2866b8 100644 --- a/app-doc/devmanual/devmanual-0_pre20210118.ebuild +++ b/app-doc/devmanual/devmanual-0_pre20210118.ebuild @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=(python3_{7,8,9}) +PYTHON_COMPAT=( python3_{8..10} ) inherit python-any-r1 readme.gentoo-r1 DESCRIPTION="The Gentoo Development Guide" diff --git a/app-doc/devmanual/devmanual-9999.ebuild b/app-doc/devmanual/devmanual-9999.ebuild index d5af3bf8fd76..9f8b6b8defcd 100644 --- a/app-doc/devmanual/devmanual-9999.ebuild +++ b/app-doc/devmanual/devmanual-9999.ebuild @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=(python3_{7,8,9}) +PYTHON_COMPAT=( python3_{8..10} ) inherit python-any-r1 readme.gentoo-r1 DESCRIPTION="The Gentoo Development Guide" diff --git a/app-misc/terminal-colors/terminal-colors-2.3.ebuild b/app-misc/terminal-colors/terminal-colors-2.3.ebuild index fa04f258aadc..22aef0794b4e 100644 --- a/app-misc/terminal-colors/terminal-colors-2.3.ebuild +++ b/app-misc/terminal-colors/terminal-colors-2.3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="ncurses" inherit python-r1 @@ -10,6 +10,7 @@ inherit python-r1 DESCRIPTION="A tool to display color charts for 8, 16, 88, and 256 color terminals" HOMEPAGE="http://zhar.net/projects/shell/terminal-colors" SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.gz" +S="${WORKDIR}" LICENSE="GPL-3+" SLOT="0" @@ -18,8 +19,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS}" -S=${WORKDIR} - src_install() { python_foreach_impl python_newscript ${P} ${PN} } diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest index 83f5ccac4a7f..268c2d87d338 100644 --- a/app-text/sigil/Manifest +++ b/app-text/sigil/Manifest @@ -1 +1,2 @@ DIST sigil-1.7.0.tar.gz 21315598 BLAKE2B 29f7c682925d1e1bbff082e96b747ce32df82d78406ccd984b4f8de1f01944c35aa86587ce47a18687d5fe281b8cb656085b52d3a1e72ed17862501121d9d134 SHA512 9918bb0bfbe3d068c95bb31cd84a37a0fac6dd6be9e94cb382e8c0140cdb375f47384f33c62fdff7f27aed379037a4a64e8d4a1065ae297bb389e2be78597c16 +DIST sigil-1.8.0.tar.gz 21217901 BLAKE2B 78615652859d1f61bab18b1b248d342dc6892943a2310659859ab577981c4452fbaeb567758097427453c8dfe95e42b499616a423b5c11b42238f763ac0653c8 SHA512 1a911aac996d3519f501820f8da9c810db9793063e481a6169288d402ef7e6b797308cf7ca5517162d0eb4d80f38f968627bca676b724ea5be5109c427473c95 diff --git a/app-text/sigil/sigil-1.8.0.ebuild b/app-text/sigil/sigil-1.8.0.ebuild new file mode 100644 index 000000000000..11d9e2e1dd89 --- /dev/null +++ b/app-text/sigil/sigil-1.8.0.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE="tk" + +inherit xdg cmake python-single-r1 + +DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format" +HOMEPAGE="https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil" +SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P^}" + +LICENSE="GPL-3+ Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+plugins system-mathjax" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ${PYTHON_DEPS} + app-text/hunspell:= + dev-libs/libpcre:3=[pcre16] + $(python_gen_cond_dep ' + dev-python/css-parser[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}]') + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwebengine:5[widgets] + dev-qt/qtwidgets:5 + sys-libs/zlib[minizip] + plugins? ( $(python_gen_cond_dep ' + dev-python/chardet[${PYTHON_USEDEP}] + dev-python/cssselect[${PYTHON_USEDEP}] + dev-python/dulwich[${PYTHON_USEDEP}] + dev-python/html5lib[${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/regex[${PYTHON_USEDEP}]') ) + system-mathjax? ( dev-libs/mathjax ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + dev-qt/linguist-tools:5 +" + +DOCS=( ChangeLog.txt README.md ) + +src_configure() { + local mycmakeargs=( + -DINSTALL_BUNDLED_DICTS=0 + -DUSE_SYSTEM_LIBS=1 + -DSYSTEM_LIBS_REQUIRED=1 + -DPYTHON_EXECUTABLE="${PYTHON}" + -DPYTHON_LIBRARY="$(python_get_library_path)" + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + ) + use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + python_fix_shebang "${ED}"/usr/share/sigil/ + python_optimize "${ED}"/usr/share/sigil/ +} diff --git a/dev-libs/librelp/librelp-1.10.0.ebuild b/dev-libs/librelp/librelp-1.10.0.ebuild index 3d59dfe5c0ac..81695b986249 100644 --- a/dev-libs/librelp/librelp-1.10.0.ebuild +++ b/dev-libs/librelp/librelp-1.10.0.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -PYTHON_COMPAT=( python3_{7,8,9} ) +EAPI=7 +PYTHON_COMPAT=( python3_{8..10} ) inherit autotools python-any-r1 DESCRIPTION="An easy to use library for the RELP protocol" diff --git a/dev-python/dask/metadata.xml b/dev-python/dask/metadata.xml index d7797aa0cccb..f32992b65152 100644 --- a/dev-python/dask/metadata.xml +++ b/dev-python/dask/metadata.xml @@ -17,5 +17,6 @@ <stabilize-allarches/> <upstream> <remote-id type="pypi">dask</remote-id> + <remote-id type="github">dask/dask</remote-id> </upstream> </pkgmetadata> diff --git a/dev-python/environs/Manifest b/dev-python/environs/Manifest index c3c1a65d3505..e5e1134fe2cd 100644 --- a/dev-python/environs/Manifest +++ b/dev-python/environs/Manifest @@ -1 +1,2 @@ DIST environs-9.3.2.tar.gz 22350 BLAKE2B f6b124e7918f305e55c3aecaa6349f1606f7d9e7e38fd03c02b796f647e140234fbb526d5e091dcf6510aeb0bb158af5d59df7368abc1e6046bd5eb68c5051c3 SHA512 68c411839995df5fc164d151dd85f0fe78c6a592c59b2f0eec2c7ddd7778c1863901b981224c1fc7a0e3cd26be235ea5107affeec4dac0d58ffd93b5363e857c +DIST environs-9.3.4.gh.tar.gz 22914 BLAKE2B b47df2f7641ad47b48a0d4aaaaa0ce4fb2c805cefe6d997e5c6aa2ccfb2908196d879e251d496dda5ca9d112e1d2e60dd543f1ff62b7ad82ae5d546847aceef6 SHA512 b06110071ca423c6c6bdab8cb104dbc372cce77dcb057204b0b8c404827daeebfe72325d6d978bb4920c1b106af790b206b5d8a33f99bcbe31da4f82d4512006 diff --git a/dev-python/environs/environs-9.3.4.ebuild b/dev-python/environs/environs-9.3.4.ebuild new file mode 100644 index 000000000000..0f6b134c4b42 --- /dev/null +++ b/dev-python/environs/environs-9.3.4.ebuild @@ -0,0 +1,32 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit distutils-r1 + +DESCRIPTION="Python library for simplified environment variable parsing" +HOMEPAGE="https://github.com/sloria/environs" +SRC_URI="https://github.com/sloria/environs/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + dev-python/python-dotenv[${PYTHON_USEDEP}] + dev-python/marshmallow[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/django-cache-url[${PYTHON_USEDEP}] + dev-python/dj-database-url[${PYTHON_USEDEP}] + dev-python/dj-email-url[${PYTHON_USEDEP}] + dev-python/toml[${PYTHON_USEDEP}] + ) +" + +DOCS=( CHANGELOG.md CONTRIBUTING.md README.md ) + +distutils_enable_tests pytest diff --git a/mail-filter/libspf2/Manifest b/mail-filter/libspf2/Manifest index c08387498457..723253e0d979 100644 --- a/mail-filter/libspf2/Manifest +++ b/mail-filter/libspf2/Manifest @@ -1 +1,2 @@ DIST libspf2-1.2.10.tar.gz 508842 BLAKE2B d15a44f64c5e3da20aa349e61a6cc02a15f83ed3acff93fe4c23970e30533d6424b1db35d7d60ff488c9a239d343f8544426fbf8fcb66271237155e0b57df1b5 SHA512 162ce382628c6fcadac3e11f5a12442db622bb23f7ec503e16f5ba7fc88afdd777bce6b093c12a58210355985fd11b74b140f08fab347334d82d953dd183b130 +DIST libspf2-1.2.11.tar.gz 565497 BLAKE2B 4000e15204c962ef438cc8bcf6411f4f965e1451e356923e2764d5a1209cbc9153a38e1d83d25c8b4b26646bfb306ec49b71d273fdbabe200b78ac2694c05a4f SHA512 ad7bea800ad6ec8d00a7f8f381b59d9ba074fb6c5932d8babcb05ab5ca59defb78445dd7bd89767e5c272b6c6638c8000c8c525c560d1803c35712f0ff86fa9b diff --git a/mail-filter/libspf2/files/libspf2-1.2.11-memset-include-string-h.patch b/mail-filter/libspf2/files/libspf2-1.2.11-memset-include-string-h.patch new file mode 100644 index 000000000000..5b5a77298305 --- /dev/null +++ b/mail-filter/libspf2/files/libspf2-1.2.11-memset-include-string-h.patch @@ -0,0 +1,12 @@ +grobian@gentoo.org: include string.h so memset is declared + +--- a/src/libspf2/spf_utils.c ++++ b/src/libspf2/spf_utils.c +@@ -19,6 +19,7 @@ + #ifdef STDC_HEADERS + # include <stdlib.h> /* malloc / free */ + # include <ctype.h> /* isupper / tolower */ ++# include <string.h> /* memset */ + #endif + + #ifdef HAVE_MEMORY_H diff --git a/mail-filter/libspf2/libspf2-1.2.11.ebuild b/mail-filter/libspf2/libspf2-1.2.11.ebuild new file mode 100644 index 000000000000..a7e6b40b96ce --- /dev/null +++ b/mail-filter/libspf2/libspf2-1.2.11.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +GHASH=4915c308d57ff3abac9fb241f09c4bed2ab54815 # 1.2.11 +DESCRIPTION="implementation of Sender Policy Framework (SPF)" +HOMEPAGE="https://www.libspf2.org" +SRC_URI="https://github.com/shevek/${PN}/archive/${GHASH}.tar.gz -> ${P}.tar.gz" + +LICENSE="|| ( LGPL-2.1 BSD-2 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +RDEPEND="!dev-perl/Mail-SPF-Query" + +PATCHES=( + "${FILESDIR}"/${PN}-1.2.11-memset-include-string-h.patch +) + +S=${WORKDIR}/${PN}-${GHASH} + +src_prepare() { + default + + sed -i -e '/bin_PROGRAMS/s/spfquery_static//' src/spfquery/Makefile.am \ + -e '/bin_PROGRAMS/s/spftest_static//' src/spftest/Makefile.am \ + -e '/bin_PROGRAMS/s/spfd_static//' src/spfd/Makefile.am \ + -e '/bin_PROGRAMS/s/spf_example_static//' src/spf_example/Makefile.am \ + || die + + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die + + eautoreconf +} + +src_configure() { + econf --disable-static +} + +src_install() { + emake DESTDIR="${D}" install + dodoc README TODO INSTALL + + find "${ED}" -name '*.la' -delete || die +} diff --git a/mail-filter/libspf2/metadata.xml b/mail-filter/libspf2/metadata.xml index e2f3f0f910ef..24df63b2e21c 100644 --- a/mail-filter/libspf2/metadata.xml +++ b/mail-filter/libspf2/metadata.xml @@ -1,11 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>grobian@gentoo.org</email> + </maintainer> <longdescription> - libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocol pair. - libspf2 is a library which allows email systems such as Sendmail, Postfix, Exim, Zmailer and MS Exchange to - check SPF records and make sure that the email is authorized by the domain name that it is coming from. This prevents email forgery, - commonly used by spammers, scammers and email viruses/worms. + libspf2 implements the Sender Policy Framework, a part of the + SPF/SRS protocol pair. + libspf2 is a library which allows email systems such as + Sendmail, Postfix, Exim, Zmailer and MS Exchange to + check SPF records and make sure that the email is authorized by + the domain name that it is coming from. This prevents email + forgery, commonly used by spammers, scammers and email + viruses/worms. </longdescription> </pkgmetadata> diff --git a/net-misc/exabgp/exabgp-4.2.11-r2.ebuild b/net-misc/exabgp/exabgp-4.2.11-r2.ebuild index be3a94116ae7..0c9b22c44818 100644 --- a/net-misc/exabgp/exabgp-4.2.11-r2.ebuild +++ b/net-misc/exabgp/exabgp-4.2.11-r2.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) + +PYTHON_COMPAT=( python3_{8..10} ) DISTUTILS_USE_SETUPTOOLS=rdepend inherit tmpfiles systemd distutils-r1 diff --git a/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch b/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch new file mode 100644 index 000000000000..e4662751e5ce --- /dev/null +++ b/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch @@ -0,0 +1,61 @@ +From 26bf2816c3e0daeaf524c47cf0fcda8ae13b65ad Mon Sep 17 00:00:00 2001 +From: Ondrej Holy <oholy@redhat.com> +Date: Wed, 12 May 2021 12:48:15 +0200 +Subject: [PATCH] Fix FIPS mode support and build with OpenSSL 3.0 + +FreeRDP fails to build with OpenSSL 3.0 because of usage of the `FIPS_mode` +and `FIPS_mode_set` functions, which were removed there. Just a note that +the FIPS mode is not supported by OpenSSL 1.1.* although the mentioned +functions are still there (see https://wiki.openssl.org/index.php/FIPS_modules). +Let's make FreeRDP build with OpenSSL 3.0 and fix the FIPS mode support. + +See: https://bugzilla.redhat.com/show_bug.cgi?id=1952937 +--- + winpr/libwinpr/utils/ssl.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c +index 3a859039034..03b23af43ac 100644 +--- a/winpr/libwinpr/utils/ssl.c ++++ b/winpr/libwinpr/utils/ssl.c +@@ -244,9 +244,17 @@ static BOOL winpr_enable_fips(DWORD flags) + #else + WLog_DBG(TAG, "Ensuring openssl fips mode is ENabled"); + ++#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) ++ if (!EVP_default_properties_is_fips_enabled(NULL)) ++#else + if (FIPS_mode() != 1) ++#endif + { ++#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) ++ if (EVP_set_default_properties(NULL, "fips=yes")) ++#else + if (FIPS_mode_set(1)) ++#endif + WLog_INFO(TAG, "Openssl fips mode ENabled!"); + else + { +From e59acc13c8f9b522a15fd586e643f04af1a79d9a Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Sun, 1 Aug 2021 12:14:43 -0400 +Subject: [PATCH] winpr: avoid calling FIPS_mode() with OpenSSL 3.0 + +Fixes: 26bf2816c3e0daeaf524c47cf0fcda8ae13b65ad +--- + winpr/libwinpr/utils/ssl.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c +index 03b23af43ac..74ef156e7b0 100644 +--- a/winpr/libwinpr/utils/ssl.c ++++ b/winpr/libwinpr/utils/ssl.c +@@ -364,6 +364,8 @@ BOOL winpr_FIPSMode(void) + { + #if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER) + return FALSE; ++#elif defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) ++ return (EVP_default_properties_is_fips_enabled(NULL) == 1); + #else + return (FIPS_mode() == 1); + #endif diff --git a/net-misc/freerdp/files/freerdp-2.4.0-TestUnicodeConversion-big-endian.patch b/net-misc/freerdp/files/freerdp-2.4.0-TestUnicodeConversion-big-endian.patch new file mode 100644 index 000000000000..b8977aecd564 --- /dev/null +++ b/net-misc/freerdp/files/freerdp-2.4.0-TestUnicodeConversion-big-endian.patch @@ -0,0 +1,28 @@ +From 7f53e1c6c8503e9d3966c96bd403573f44879b0c Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Sat, 7 Aug 2021 21:49:12 -0400 +Subject: [PATCH] Fix TestUnicodeConversion on big endian machines + +Wide character literals are stored in native byte order. +Use an array of bytes as a reference instead. + +Fixes: https://github.com/FreeRDP/FreeRDP/issues/6968 +--- + winpr/libwinpr/crt/test/TestUnicodeConversion.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/winpr/libwinpr/crt/test/TestUnicodeConversion.c b/winpr/libwinpr/crt/test/TestUnicodeConversion.c +index 3bc9c245181..cc2a2597dd8 100644 +--- a/winpr/libwinpr/crt/test/TestUnicodeConversion.c ++++ b/winpr/libwinpr/crt/test/TestUnicodeConversion.c +@@ -403,8 +403,8 @@ static BOOL test_ConvertToUnicode_wrapper(void) + /* Test static string buffers of differing sizes */ + { + char name[] = "someteststring"; +- const WCHAR cmp[] = { L's', L'o', L'm', L'e', L't', L'e', L's', L't', +- L's', L't', L'r', L'i', L'n', L'g', 0 }; ++ const BYTE cmp[] = { 's', 0, 'o', 0, 'm', 0, 'e', 0, 't', 0, 'e', 0, 's', 0, 't', 0, ++ 's', 0, 't', 0, 'r', 0, 'i', 0, 'n', 0, 'g', 0, 0, 0 }; + WCHAR xname[128] = { 0 }; + LPWSTR aname = NULL; + LPWSTR wname = &xname[0]; diff --git a/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild b/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild index 7590eee2b116..01368b67d508 100644 --- a/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild +++ b/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit python-r1 cmake fortran-2 |