xpdf, bump to 4.06 (#13254)

This commit is contained in:
Schrijvers Luc
2025-11-25 12:15:16 +01:00
committed by GitHub
parent f7edd3c21f
commit 92e2d23af8
3 changed files with 28 additions and 63 deletions

View File

@@ -1,59 +0,0 @@
From 085a25f646fc0dc8b46a01bed997b76869732bce Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <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 4c1ff91..5d75cea 100644
--- a/xpdf/GlobalParams.cc
+++ b/xpdf/GlobalParams.cc
@@ -82,20 +82,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}
};
@@ -114,6 +114,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
#endif // _WIN32
NULL
--
2.43.2

View File

@@ -0,0 +1,24 @@
From 085a25f646fc0dc8b46a01bed997b76869732bce Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <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 92f77d7..f4e3f0c 100644
--- a/xpdf/GlobalParams.cc
+++ b/xpdf/GlobalParams.cc
@@ -191,6 +191,10 @@ static const char *displayFontDirs[] = {
#ifdef _WIN32
"c:/windows/fonts",
"c:/winnt/fonts",
+#elif defined(__HAIKU__)
+ "/boot/system/data/fonts/otfonts",
+ "/boot/system/data/fonts/psfonts",
+ "/boot/system/data/fonts/ttfonts",
#else // _WIN32
"/usr/share/ghostscript/fonts",
"/usr/local/share/ghostscript/fonts",
--
2.43.2

View File

@@ -3,11 +3,11 @@ DESCRIPTION="Xpdf is a free PDF viewer and toolkit, including a text extractor,
converter, HTML converter, and more. Most of the tools are available as \
open source."
HOMEPAGE="https://www.xpdfreader.com/"
COPYRIGHT="1996-2024 Glyph & Cog, LLC."
COPYRIGHT="1996-2025 Glyph & Cog, LLC."
LICENSE="GNU GPL v2"
REVISION="3"
REVISION="1"
SOURCE_URI="http://dl.xpdfreader.com/xpdf-$portVersion.tar.gz"
CHECKSUM_SHA256="92707ed5acb6584fbd73f34091fda91365654ded1f31ba72f0970022cf2a5cea"
CHECKSUM_SHA256="1c38f527c46caee0f712386d42a885b96a31ed9ce11904e872559859894d137e"
SOURCE_DIR="xpdf-$portVersion"
PATCHES="xpdf-$portVersion.patchset"
ADDITIONAL_FILES="xpdfreader.rdef.in"
@@ -25,7 +25,7 @@ fi
PROVIDES="
xpdf$secondaryArchSuffix = $portVersion
app:XpdfViewer$commandSuffix = $portVersion
app:XpdfViewer = $portVersion
cmd:pdftopng$commandSuffix = $portVersion
cmd:xpdf$commandSuffix = $portVersion
"