haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

xpdf, bump version, fix font detection (#6855)

Browse Source
This commit is contained in:
Schrijvers Luc
2022-04-27 08:15:35 +02:00
committed by GitHub
parent 58156a06eb
commit 61230224a7
2 changed files with 66 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
app-text/xpdf/patches/xpdf-4.04.patchset Normal file
View File

@@ -0,0 +1,59 @@
From ffc3438d00b81e80deaa93e5741938ba733afa43 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Tue, 26 Apr 2022 13:15:35 +0000
Subject: xpdf, fix ghostscript fonts detection
diff --git a/xpdf/GlobalParams.cc b/xpdf/GlobalParams.cc
index 5fd4393..8a2e8c8 100644
--- a/xpdf/GlobalParams.cc
+++ b/xpdf/GlobalParams.cc
@@ -84,20 +84,20 @@ static struct {
const char *obliqueFont; // name of font to oblique
double obliqueFactor; // oblique sheer factor
} displayFontTab[] = {
- {"Courier", "n022003l.pfb", "cour.ttf", "Courier", "Courier", NULL, 0},
- {"Courier-Bold", "n022004l.pfb", "courbd.ttf", "Courier", "Courier Bold", NULL, 0},
- {"Courier-BoldOblique", "n022024l.pfb", "courbi.ttf", "Courier", "Courier Bold Oblique", "Courier-Bold", 0.212557},
- {"Courier-Oblique", "n022023l.pfb", "couri.ttf", "Courier", "Courier Oblique", "Courier", 0.212557},
- {"Helvetica", "n019003l.pfb", "arial.ttf", "Helvetica", "Helvetica", NULL, 0},
- {"Helvetica-Bold", "n019004l.pfb", "arialbd.ttf", "Helvetica", "Helvetica Bold", NULL, 0},
- {"Helvetica-BoldOblique", "n019024l.pfb", "arialbi.ttf", "Helvetica", "Helvetica Bold Oblique", "Helvetica-Bold", 0.212557},
- {"Helvetica-Oblique", "n019023l.pfb", "ariali.ttf", "Helvetica", "Helvetica Oblique", "Helvetica", 0.212557},
- {"Symbol", "s050000l.pfb", NULL, "Symbol", "Symbol", NULL, 0},
- {"Times-Bold", "n021004l.pfb", "timesbd.ttf", "Times", "Times Bold", NULL, 0},
- {"Times-BoldItalic", "n021024l.pfb", "timesbi.ttf", "Times", "Times Bold Italic", NULL, 0},
- {"Times-Italic", "n021023l.pfb", "timesi.ttf", "Times", "Times Italic", NULL, 0},
- {"Times-Roman", "n021003l.pfb", "times.ttf", "Times", "Times Roman", NULL, 0},
- {"ZapfDingbats", "d050000l.pfb", NULL, "ZapfDingbats", "Zapf Dingbats", NULL, 0},
+ {"Courier", "NimbusMonoPS-Regular.otf", "cour.ttf", "Courier", "Courier", NULL, 0},
+ {"Courier-Bold", "NimbusMonoPS-Bold.otf", "courbd.ttf", "Courier", "Courier Bold", NULL, 0},
+ {"Courier-BoldOblique", "NimbusMonoPS-BoldItalic.otf", "courbi.ttf", "Courier", "Courier Bold Oblique", "Courier-Bold", 0.212557},
+ {"Courier-Oblique", "NimbusMonoPS-Italic.otf", "couri.ttf", "Courier", "Courier Oblique", "Courier", 0.212557},
+ {"Helvetica", "NimbusSans-Regular.otf", "arial.ttf", "Helvetica", "Helvetica", NULL, 0},
+ {"Helvetica-Bold", "NimbusSans-Bold.otf", "arialbd.ttf", "Helvetica", "Helvetica Bold", NULL, 0},
+ {"Helvetica-BoldOblique", "NimbusSans-BoldOblique.otf", "arialbi.ttf", "Helvetica", "Helvetica Bold Oblique", "Helvetica-Bold", 0.212557},
+ {"Helvetica-Oblique", "NimbusSans-Oblique.otf", "ariali.ttf", "Helvetica", "Helvetica Oblique", "Helvetica", 0.212557},
+ {"Symbol", "StandardSymbolsPS.otf", NULL, "Symbol", "Symbol", NULL, 0},
+ {"Times-Bold", "NimbusRoman-Bold.otf", "timesbd.ttf", "Times", "Times Bold", NULL, 0},
+ {"Times-BoldItalic", "NimbusRoman-BoldItalic.otf", "timesbi.ttf", "Times", "Times Bold Italic", NULL, 0},
+ {"Times-Italic", "NimbusRoman-Italic.otf", "timesi.ttf", "Times", "Times Italic", NULL, 0},
+ {"Times-Roman", "NimbusRoman-Regular.otf", "times.ttf", "Times", "Times Roman", NULL, 0},
+ {"ZapfDingbats", "Z003-MediumItalic.otf", NULL, "ZapfDingbats", "Zapf Dingbats", NULL, 0},
{NULL}
};
@@ -116,6 +116,10 @@ static const char *displayFontDirs[] = {
"/usr/share/fonts/type1/gsfonts",
#if defined(__sun) && defined(__SVR4)
"/usr/sfw/share/ghostscript/fonts",
+#elif defined(__HAIKU__)
+ "/boot/system/data/fonts/otfonts",
+ "/boot/system/data/fonts/psfonts",
+ "/boot/system/data/fonts/ttfonts",
#endif
NULL
};
--
2.35.1

8
app-text/xpdf/xpdf-4.03.recipe → app-text/xpdf/xpdf-4.04.recipe
View File

@@ -7,8 +7,9 @@ COPYRIGHT="1996-2021 Glyph & Cog, LLC."
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="http://dl.xpdfreader.com/xpdf-$portVersion.tar.gz"
CHECKSUM_SHA256="0fe4274374c330feaadcebb7bd7700cb91203e153b26aa95952f02bf130be846"
CHECKSUM_SHA256="63ce23fcbf76048f524c40be479ac3840d7a2cbadb6d1e0646ea77926656bade"
SOURCE_DIR="xpdf-$portVersion"
PATCHES="xpdf-$portVersion.patchset"
ADDITIONAL_FILES="xpdfreader.rdef.in"
ARCHITECTURES="all !x86_gcc2"
@@ -30,8 +31,11 @@ PROVIDES="
"
REQUIRES="
haiku$secondaryArchSuffix
urw_base35_fonts
lib:libfontconfig$secondaryArchSuffix
lib:libfreetype$secondaryArchSuffix
lib:libjpeg$secondaryArchSuffix
lib:libpaper$secondaryArchSuffix
lib:libpng16$secondaryArchSuffix
lib:libQt5Core$secondaryArchSuffix
lib:libQt5Gui$secondaryArchSuffix
@@ -42,8 +46,10 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libfontconfig$secondaryArchSuffix
devel:libfreetype$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
devel:libpaper$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libQt5Core$secondaryArchSuffix
devel:libQt5Gui$secondaryArchSuffix