gentoo auto-resync : 01:10:2023 - 11:42:49

5 files changed, 284 insertions, 0 deletions

diff --git a/x11-libs/fox/Manifest b/x11-libs/fox/Manifest
index 1cb0243decb4..0c3f8adf7e88 100644
--- a/x11-libs/fox/Manifest
+++ b/x11-libs/fox/Manifest
@@ -1,6 +1,11 @@
 AUX fox-1.7.67-no-truetype.patch 1424 BLAKE2B 5e43098934e319c64e16e990618c93418c423dc670c9352cf263fce98e317870772d9f7c1ec986ef29daa24f65bf2daf1d5cc443431487891369c2d91a7862b6 SHA512 903e75c6c51fa58036206ba044a7f1d9247999c0a8d722c79cb728f555a42acb1c217be575861b7773444315b628da4d465624b5dc6e40a4f5a6493ec0bc09d5
+AUX fox-1.7.67-pthread_rwlock_prefer_writer_np-musl.patch 890 BLAKE2B 656deaecb94f1c2a550f37aa1007d97af6834374c41cab3b13fafcd87554b95acec0655963896830ead7979b474390dbaefd217b2c72c68c8c14a784d9eaf146 SHA512 3ccdf6ede09bccbf0941892a655c98f3e0de684d7ca721106c53ee5262cd25f2da8efb088bfda0f7cd25607e6b2006f7c9211d20b95a369b1fc58db4cd8fc20d
+AUX fox-1.7.84-pthread_rwlock_prefer_writer_np-musl.patch 937 BLAKE2B 2fa49b121834f040d613d54ceb3f3faddbe4cf48019db13872ef9e89d9479e5d21246d8fb70caae3386b6c8cda2da70274f34b68edf85722e24e61169553a6b3 SHA512 21e851be235682f6e5106990e998ea130452d0717ec86e7316bb3373ff01c968d31ed1e7f1d914c2c3f3131a8ed85a2b701c14d768e27be2792fc4e0eb582b04
 DIST fox-1.6.57.tar.gz 4284018 BLAKE2B 3efbc6188225f9444fbd347359e8b4041a08fe654acb99c48e4966e501a2f72a44863f2e9b60ae810a259951f89cfc27b9a8b6341e029627066712e0dbf20e40 SHA512 e7b91054a9ea674818803415284cb61572935d22466e446cb37ef68344e2684e8acd567f7c8a6912f939dcbcc37455119ad6a01ac30513f460d0b3937b7e6087
 DIST fox-1.7.67.tar.gz 5689421 BLAKE2B 60f2d8e887a41f1e234cd31c1bd2702bcedae0f1b47cb7b9832c317e34a9b517cb603033d28e5ed66c4b97c85deaf3caa8dd40a508eaf715d63772e6ef0020b0 SHA512 a45db7ea9453e2afe0ff61ed6608925e94f9202dc1fbee5e2b88a5a1c16310019cb4611090f8234ad6ebc46a6519a36085683c4553d47bc9c21b8ef0c13ab540
+DIST fox-1.7.84.tar.gz 5879987 BLAKE2B 803a698eb5d976a04dd30b03a3c65f840d09e173292b8448dc02905b37ea352d0fe71b4a35f806f7ee2a8b6e6436b0c1dc9185ac3a17ecda3fb63a1b583e7348 SHA512 5590f16272a0630cb49e74e0f591e65886dd81ba1b0121d403fa3689ca8b23a727c75b645b417eb87e67fd0ece465b493146c8bb51d117a6559bb19b1b2b4297
 EBUILD fox-1.6.57-r3.ebuild 2536 BLAKE2B fe4a61fec8343fbacc765af0adffb17af0da5fd2eaf3eb4f3c235aeb2a1ae26e84a795c13201795057c0152a48ca66f3783bf0318097f5d8683781de52775ba1 SHA512 a2dba39f91a091bd3b77adc7db1084e55ce034ffbe6a8d51299f1f6e626981fa0e5f17cd9cc000fc0cef983ac72f7b8dc6dae12a09552cfb227fabc9209fdcab
 EBUILD fox-1.7.67-r1.ebuild 2753 BLAKE2B fb6f645a53d5174fc8a402887df9038e83d86db267c1aa8085fbf18084a8ed20eee2afd0963d961f2257a765dc454904f3e273d9363d269893f6b4afb38f8969 SHA512 3ca960cf2c50834a19a20d3a6304a0d5ccb78eb279804b6c1f062040f59493931d12a15ccc25a2db80eac1e6a02fbf6b7660f923733e1976804a92b2021f1676
+EBUILD fox-1.7.67-r2.ebuild 3416 BLAKE2B 7663b60e42d5a40271e956fa6312c21fd681473b28260019a10b8e0d5025f7e75582f6429c1b2ff193e08b45bc1ed53c3e19a4ffafc81eb12867186f00fce097 SHA512 c8c46596efcf73bd68c3bfd2a3a49decb40ab6b8a80e1104f4d868bbaa7d22675aa103d5cbccae3c8d4ffcb7855fccdb342354a0de62d76ed2f240ca9632bbd0
+EBUILD fox-1.7.84.ebuild 2779 BLAKE2B fea55725e106d261615d4392843085aa3e19d117e431c643263e15649c3010caf9260a9157951d8a0d13903eed34926c949050a9e5cc64d494bc656d86204f6c SHA512 baf833f6603ffa19637d35fd86b31ab705067fa49d2541b3835a20f230568cb38c4fe1ab1b3bcc9c0072ff065630b927175e6bd8b3fd0bf0977dc9151e427b03
 MISC metadata.xml 353 BLAKE2B e9db8b14c07f63f450153af626408d7007471113ba54acad5aa97aac5258d02fe6702db354cce45ceca20444756f5ceb0c46dbacb6fae28fb06320f24221cbbb SHA512 26adab0c5f6876716fa0c87398e9d4009d162d4d202d0455d987837617316aecf8096b10c2a99a5529f7b9d5a324f9aa386d11d0f22c574114acebd15e30fdaa
diff --git a/x11-libs/fox/files/fox-1.7.67-pthread_rwlock_prefer_writer_np-musl.patch b/x11-libs/fox/files/fox-1.7.67-pthread_rwlock_prefer_writer_np-musl.patch
new file mode 100644
index 000000000000..21d37687f44e
--- /dev/null
+++ b/x11-libs/fox/files/fox-1.7.67-pthread_rwlock_prefer_writer_np-musl.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/898866
+From: Brahmajit Das <brahmajit.xyz@gmail.com>
+Date: Sat, 17 Jun 2023 15:32:10 +0000
+Subject: [PATCH 1/1] Fix building against musl C library
+
+PTHREAD_RWLOCK_PREFER_WRITER_NP isn't available in musl libc/non-glibc
+systems. Checking for only __linux__ being defined isn't enough,
+additional check of __GLIBC__ being defined is needed.
+
+Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
+--- a/lib/FXReadWriteLock.cpp
++++ b/lib/FXReadWriteLock.cpp
+@@ -80,7 +80,7 @@ FXReadWriteLock::FXReadWriteLock(){
+   FXASSERT(sizeof(data)>=sizeof(pthread_rwlock_t));
+   pthread_rwlockattr_t rwlockatt;
+   pthread_rwlockattr_init(&rwlockatt);
+-#if defined(__linux__)
++#if defined(__linux__) && defined(__GLIBC__)
+   pthread_rwlockattr_setkind_np(&rwlockatt,PTHREAD_RWLOCK_PREFER_WRITER_NP);
+ #endif
+   pthread_rwlock_init((pthread_rwlock_t*)data,&rwlockatt);
+-- 
+2.41.0
+
diff --git a/x11-libs/fox/files/fox-1.7.84-pthread_rwlock_prefer_writer_np-musl.patch b/x11-libs/fox/files/fox-1.7.84-pthread_rwlock_prefer_writer_np-musl.patch
new file mode 100644
index 000000000000..233107e68e1d
--- /dev/null
+++ b/x11-libs/fox/files/fox-1.7.84-pthread_rwlock_prefer_writer_np-musl.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/898866
+From: Brahmajit Das <brahmajit.xyz@gmail.com>
+Date: Sat, 17 Jun 2023 15:32:10 +0000
+Subject: [PATCH 1/1] Fix building against musl C library
+
+PTHREAD_RWLOCK_PREFER_WRITER_NP isn't available in musl libc/non-glibc
+systems. Additional check of __GLIBC__ being defined is needed.
+
+Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
+--- a/lib/FXReadWriteLock.cpp
++++ b/lib/FXReadWriteLock.cpp
+@@ -62,7 +62,7 @@ FXReadWriteLock::FXReadWriteLock(){
+   InitializeCriticalSection(((RWLOCK*)data)->mutex);
+   InitializeCriticalSection(((RWLOCK*)data)->access);
+   ((RWLOCK*)data)->readers=0;
+-#elif (_XOPEN_SOURCE >= 500) || (_POSIX_C_SOURCE >= 200809L)
++#elif (_XOPEN_SOURCE >= 500) || (_POSIX_C_SOURCE >= 200809L) && defined(__GLIBC__)
+   // If this fails on your machine, determine what value
+   // of sizeof(pthread_rwlock_t) is supposed to be on your
+   // machine and mail it to: jeroen@fox-toolkit.net!!
diff --git a/x11-libs/fox/fox-1.7.67-r2.ebuild b/x11-libs/fox/fox-1.7.67-r2.ebuild
new file mode 100644
index 000000000000..14540fa95257
--- /dev/null
+++ b/x11-libs/fox/fox-1.7.67-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="C++ Toolkit for developing Graphical User Interfaces easily and effectively"
+HOMEPAGE="http://www.fox-toolkit.org/"
+SRC_URI="ftp://ftp.fox-toolkit.org/pub/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="1.7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib debug doc profile tools"
+
+RDEPEND="
+	x11-libs/fox-wrapper
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	bzip2? ( app-arch/bzip2 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	opengl? ( virtual/glu virtual/opengl )
+	png? ( media-libs/libpng:= )
+	tiff? ( media-libs/tiff:= )
+	truetype? (
+		media-libs/freetype:2
+		x11-libs/libXft
+	)
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXt"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/"${PN}"-1.7.67-no-truetype.patch
+	"${FILESDIR}"/"${PN}"-1.7.67-pthread_rwlock_prefer_writer_np-musl.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i '/#define REXDEBUG 1/d' lib/FXRex.cpp || die "Unable to remove spurious debug line."
+	sed -i -e "s:windows::" Makefile.am || die
+	sed -i -e 's/register //g' lib/*.cpp || die "Unable remove register keywords from sources under lib folder"
+	sed -i -e 's/register //g' shutterbug/*.cpp || die "Unable remove register keywords from sources under shutterbug folder"
+	sed -i -e 's/register //g' calculator/*.cpp || die "Unable remove register keywords from sources under calculator folder"
+	sed -i -e 's/register //g' glviewer/*.cpp || die "Unable remove register keywords from sources under glviewer folder"
+	sed -i -e 's/register //g' chart/*.cpp || die "Unable remove register keywords from sources under chart folder"
+	if ! use tools; then
+		local d
+		for d in adie calculator pathfinder shutterbug; do
+			sed -i -e "s:${d}::" Makefile.am || die
+		done
+	fi
+
+	# Respect system CXXFLAGS
+	sed -i -e 's:CXXFLAGS=""::' configure.ac || die "Unable to force cxxflags."
+
+	# don't strip binaries
+	sed -i -e '/LDFLAGS="-s ${LDFLAGS}"/d' configure.ac || die "Unable to prevent stripping."
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--enable-$(usex debug debug release) \
+		$(use_enable bzip2 bz2lib) \
+		$(use_enable jpeg) \
+		$(use_with opengl) \
+		$(use_enable png) \
+		$(use_enable tiff) \
+		$(use_with truetype xft) \
+		$(use_enable zlib) \
+		$(use_with profile profiling)
+}
+
+src_compile() {
+	emake
+	use doc && emake -C doc docs
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		artdir="${EPREFIX}"/usr/share/doc/${PF}/html/art \
+		screenshotsdir="${EPREFIX}"/usr/share/doc/${PF}/html/screenshots
+
+	local CP="${ED}"/usr/bin/ControlPanel
+	if [[ -f ${CP} ]]; then
+		mv "${CP}" "${ED}"/usr/bin/fox-ControlPanel-${SLOT} || \
+			die "Failed to install ControlPanel"
+	fi
+
+	dodoc ADDITIONS AUTHORS LICENSE_ADDENDUM README TRACING
+
+	if use doc; then
+		# install class reference docs if USE=doc
+		docinto html
+		dodoc -r doc/ref
+	else
+		# remove documentation if USE=-doc
+		rm -rf "${ED}"/usr/share/doc/${PF}/html || die
+	fi
+
+	# slot fox-config
+	if [[ -f ${ED}/usr/bin/fox-config ]] ; then
+		mv "${ED}"/usr/bin/fox-config "${ED}"/usr/bin/fox-${SLOT}-config \
+		|| die "failed to install fox-config"
+	fi
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/x11-libs/fox/fox-1.7.84.ebuild b/x11-libs/fox/fox-1.7.84.ebuild
new file mode 100644
index 000000000000..e83ac01f1fc0
--- /dev/null
+++ b/x11-libs/fox/fox-1.7.84.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="C++ Toolkit for developing Graphical User Interfaces easily and effectively"
+HOMEPAGE="http://www.fox-toolkit.org/"
+SRC_URI="ftp://www.fox-toolkit.org/pub/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="1.7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib debug doc profile tools"
+
+RDEPEND="
+	x11-libs/fox-wrapper
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	bzip2? ( app-arch/bzip2 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	opengl? ( virtual/glu virtual/opengl )
+	png? ( media-libs/libpng:= )
+	tiff? ( media-libs/tiff:= )
+	truetype? (
+		media-libs/freetype:2
+		x11-libs/libXft
+	)
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXt
+"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.84-pthread_rwlock_prefer_writer_np-musl.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e "s:windows::" Makefile.am || die
+
+	if ! use tools; then
+		local d
+		for d in adie calculator pathfinder shutterbug; do
+			sed -i -e "s:${d}::" Makefile.am || die
+		done
+	fi
+
+	# Respect system CXXFLAGS
+	sed -i -e 's:CXXFLAGS=""::' configure.ac || die "Unable to force cxxflags."
+
+	# don't strip binaries
+	sed -i -e '/LDFLAGS="-s ${LDFLAGS}"/d' configure.ac || die "Unable to prevent stripping."
+
+	eautoreconf
+}
+
+src_configure() {
+	use debug || append-cppflags -DNDEBUG
+
+	# Not using --enable-release because of the options it sets like no SSP
+	econf \
+		$(use_enable debug) \
+		$(use_enable bzip2 bz2lib) \
+		$(use_enable jpeg) \
+		$(use_with opengl) \
+		$(use_enable png) \
+		$(use_enable tiff) \
+		$(use_with truetype xft) \
+		$(use_enable zlib) \
+		$(use_with profile profiling)
+}
+
+src_compile() {
+	emake
+	use doc && emake -C doc docs
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		artdir="${EPREFIX}"/usr/share/doc/${PF}/html/art \
+		screenshotsdir="${EPREFIX}"/usr/share/doc/${PF}/html/screenshots
+
+	local CP="${ED}"/usr/bin/ControlPanel
+	if [[ -f ${CP} ]]; then
+		mv "${CP}" "${ED}"/usr/bin/fox-ControlPanel-${SLOT} || \
+			die "Failed to install ControlPanel"
+	fi
+
+	dodoc ADDITIONS AUTHORS LICENSE_ADDENDUM README TRACING
+
+	if use doc; then
+		# install class reference docs if USE=doc
+		docinto html
+		dodoc -r doc/ref
+	else
+		# remove documentation if USE=-doc
+		rm -rf "${ED}"/usr/share/doc/${PF}/html || die
+	fi
+
+	# slot fox-config
+	if [[ -f ${ED}/usr/bin/fox-config ]] ; then
+		mv "${ED}"/usr/bin/fox-config "${ED}"/usr/bin/fox-${SLOT}-config \
+		|| die "failed to install fox-config"
+	fi
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}