commit: 4fcc1789d325c5e6119a90482a9de7e833fc6339
Author: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 19 17:29:23 2025 +0000
Commit: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org>
CommitDate: Wed Nov 19 17:29:23 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fcc1789
x11-libs/fox: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mm1ke <AT> gentoo.org>
x11-libs/fox/files/fox-1.7.67-no-truetype.patch | 44 ----------------------
...7.67-pthread_rwlock_prefer_writer_np-musl.patch | 24 ------------
2 files changed, 68 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
deleted file mode 100644
index f57a945b8d61..000000000000
--- a/x11-libs/fox/files/fox-1.7.67-no-truetype.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/lib/FXFont.cpp
-+++ b/lib/FXFont.cpp
-@@ -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/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
deleted file mode 100644
index 21d37687f44e..000000000000
--- a/x11-libs/fox/files/fox-1.7.67-pthread_rwlock_prefer_writer_np-musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/898866
-From: Brahmajit Das <[email protected]>
-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 <[email protected]>
---- 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
-
