[gentoo-commits] repo/gentoo:master commit in: x11-libs/fox/files/, x11-libs/fox/
commit: b1fae4949dd95e2204fd19ee72ca7af8c1816959
Author: Sam James gentoo org>
AuthorDate: Sun Oct 1 08:09:51 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Oct 1 08:37:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1fae494
x11-libs/fox: add 1.7.84
Bug: https://bugs.gentoo.org/864412
Closes: https://bugs.gentoo.org/832299
Signed-off-by: Sam James gentoo.org>
x11-libs/fox/Manifest | 1 +
...7.84-pthread_rwlock_prefer_writer_np-musl.patch | 20
x11-libs/fox/fox-1.7.84.ebuild | 117 +
3 files changed, 138 insertions(+)
diff --git a/x11-libs/fox/Manifest b/x11-libs/fox/Manifest
index ce1493d8b837..bfb8c275d25d 100644
--- a/x11-libs/fox/Manifest
+++ b/x11-libs/fox/Manifest
@@ -1,2 +1,3 @@
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
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 ..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
+Date: Sat, 17 Jun 2023 15:32:10 +
+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
+--- 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: jer...@fox-toolkit.net!!
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 ..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 ||
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fox/files/, x11-libs/fox/
commit: ed97a7c22e8bba9908edfd7b7a557ae7750571ec
Author: Jason A. Donenfeld gentoo org>
AuthorDate: Mon Dec 16 21:37:03 2019 +
Commit: Jason A. Donenfeld gentoo org>
CommitDate: Mon Dec 16 21:39:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed97a7c2
x11-libs/fox: fix USE=-truetype and use EAPI=7
We're not going to revbump it, because the code changes only affect code
that's compiled with USE=-truetype, which wouldn't compile at all
before.
While we're at it, bump to EAPI=7.
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Jason A. Donenfeld gentoo.org>
x11-libs/fox/files/fox-1.7.67-no-truetype.patch | 46 +
x11-libs/fox/fox-1.7.67.ebuild | 10 --
2 files changed, 53 insertions(+), 3 deletions(-)
diff --git a/x11-libs/fox/files/fox-1.7.67-no-truetype.patch
b/x11-libs/fox/files/fox-1.7.67-no-truetype.patch
new file mode 100644
index 000..6f91d9746a1
--- /dev/null
+++ b/x11-libs/fox/files/fox-1.7.67-no-truetype.patch
@@ -0,0 +1,46 @@
+diff -ru fox-1.7.67/lib/FXFont.cpp
/var/tmp/portage/x11-libs/fox-1.7.67/work/fox-1.7.67/lib/FXFont.cpp
+--- fox-1.7.67/lib/FXFont.cpp 2019-05-08 05:21:21.0 +0200
/var/tmp/portage/x11-libs/fox-1.7.67/work/fox-1.7.67/lib/FXFont.cpp
2019-12-16 22:19:32.510138232 +0100
+@@ -829,26 +829,26 @@
+
+ // Weight
+ if(wantweight){
+-dweight=Math::iabs(weight-wantweight);
++dweight=Math::iabs((FXint)(weight-wantweight));
+ }
+ else{
+-dweight=Math::iabs(weight-FXFont::Normal);
++dweight=Math::iabs((FXint)(weight-FXFont::Normal));
+ }
+
+ // Slant
+ if(wantslant){
+-dslant=Math::iabs(slant-wantslant);
++dslant=Math::iabs((FXint)(slant-wantslant));
+ }
+ else{
+-dslant=Math::iabs(slant-FXFont::Straight);
++dslant=Math::iabs((FXint)(slant-FXFont::Straight));
+ }
+
+ // Set width
+ if(wantsetwidth){
+-dsetwidth=Math::iabs(setwidth-wantsetwidth);
++dsetwidth=Math::iabs((FXint)(setwidth-wantsetwidth));
+ }
+ else{
+-dsetwidth=Math::iabs(setwidth-FXFont::NonExpanded);
++dsetwidth=Math::iabs((FXint)(setwidth-FXFont::NonExpanded));
+ }
+
+ // Pitch
+@@ -900,7 +900,7 @@
+ // should be multiplied by (100/90).
+ else{
+ size=(yres*points)/res;
+-dsize=Math::iabs(size-wantsize);
++dsize=Math::iabs((FXint)(size-wantsize));
+ }
+
+ FXTRACE((160,"%4d: dweight=%-3d dsize=%3d dslant=%d dsetwidth=%d
dscalable=%d dpolymorph=%d xres=%-3d yres=%-3d
xlfd=\"%s\"\n",f,dweight,dsize,dslant,dsetwidth,dscalable,dpolymorph,xres,yres,fontnames[f]));
+
diff --git a/x11-libs/fox/fox-1.7.67.ebuild b/x11-libs/fox/fox-1.7.67.ebuild
index 0be6c0ddb46..0f09d1a6053 100644
--- a/x11-libs/fox/fox-1.7.67.ebuild
+++ b/x11-libs/fox/fox-1.7.67.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit autotools versionator
+inherit autotools
LICENSE="LGPL-2.1"
SLOT="1.7"
@@ -31,7 +31,11 @@ DESCRIPTION="C++ Toolkit for developing Graphical User
Interfaces easily and eff
HOMEPAGE="http://www.fox-toolkit.org/";
SRC_URI="ftp://ftp.fox-toolkit.org/pub/${P}.tar.gz";
+PATCHES=( "${FILESDIR}"/"${PN}"-1.7.67-no-truetype.patch )
+
src_prepare() {
+ default
+
sed -i '/#define REXDEBUG 1/d' lib/FXRex.cpp || die "Unable to remove
spurious debug line."
local d
for d in windows adie calculator pathfinder shutterbug; do
@@ -92,7 +96,7 @@ src_install() {
# slot fox-config
if [[ -f ${D}/usr/bin/fox-config ]] ; then
- mv "${D}/usr/bin/fox-config"
"${D}/usr/bin/fox-$(get_version_component_range 1-2 ${PV})-config" \
+ mv "${D}/usr/bin/fox-config" "${D}/usr/bin/fox-${SLOT}-config" \
|| die "failed to install fox-config"
fi
}
