mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-08 00:05:33 +03:00
x11-libs/fox: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mm1ke@gentoo.org>
This commit is contained in:
parent
45b0bbe24d
commit
4fcc1789d3
@ -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]));
|
||||
@ -1,24 +0,0 @@
|
||||
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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user