diff options
author | Jason A. Donenfeld <zx2c4@gentoo.org> | 2019-12-16 22:37:03 +0100 |
---|---|---|
committer | Jason A. Donenfeld <zx2c4@gentoo.org> | 2019-12-16 22:39:00 +0100 |
commit | ed97a7c22e8bba9908edfd7b7a557ae7750571ec (patch) | |
tree | 0b071bcb52a6a447d87da160622289d34de33a32 /x11-libs/fox/files | |
parent | dev-util/dwarves: revbump to -r1 to use newer elfutils (diff) | |
download | gentoo-ed97a7c22e8bba9908edfd7b7a557ae7750571ec.tar.gz gentoo-ed97a7c22e8bba9908edfd7b7a557ae7750571ec.tar.bz2 gentoo-ed97a7c22e8bba9908edfd7b7a557ae7750571ec.zip |
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 <zx2c4@gentoo.org>
Diffstat (limited to 'x11-libs/fox/files')
-rw-r--r-- | x11-libs/fox/files/fox-1.7.67-no-truetype.patch | 46 |
1 files changed, 46 insertions, 0 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 000000000000..6f91d9746a1e --- /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.000000000 +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])); + |