Compare commits

...
Sign in to create a new pull request.

6 commits

Author SHA1 Message Date
Fedora Release Engineering
dc5cf579cc Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 09:24:36 +00:00
Fedora Release Engineering
dd61cc0a6f Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 20:52:02 +00:00
Tom spot Callaway
445565f0a7 4.06 2025-11-18 15:30:03 -05:00
Tom spot Callaway
102c70d26b passing -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to fix FTBFS with CMake4 (bz2381643) 2025-07-31 09:50:52 -04:00
Fedora Release Engineering
6a51610411 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 21:02:36 +00:00
Fedora Release Engineering
a380722409 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 16:14:01 +00:00
6 changed files with 194 additions and 93 deletions

3
.gitignore vendored
View file

@ -41,3 +41,6 @@ xpdf-3.02-novms.tar.gz
/xpdf-chinese-simplified-2023-dec-05-NOCMAP.tar.gz
/xpdf-korean-2023-dec-05-NOCMAP.tar.gz
/xpdf-4.05.tar.gz.sig
/xpdf-thai.tar.gz
/xpdf-4.06.tar.gz
/xpdf-4.06.tar.gz.sig

View file

@ -3,11 +3,11 @@ SHA512 (xpdf-cyrillic-2011-aug-15.tar.gz) = ab1197c90f8cd3d8664ebbdc7ecefdfb8ec1
SHA512 (xpdf-greek-2011-aug-15.tar.gz) = 2e0e281e09e1abc2f0e40b6787703538d52cb62edcd4c4156698700a5f908afee290c62ad9a6ff4ea74bc42e0a8fe9a7765a212efbc223512d4bb442448ea52f
SHA512 (xpdf-hebrew-2011-aug-15.tar.gz) = 0ebe652f8633151d13ef2403bd293682b511ab86c1391ce187f1fc0274f33bd9c7e6ec682c8f79ac4fd27c74ab81ad2ae334a75f26001092521cff9a73cd0b8a
SHA512 (xpdf-latin2-2011-aug-15.tar.gz) = 5fe0b60bfac7f0f4a26e3e7216de5043f6b94446f464c984b7c25431ec01a5912952c0dc66bb2c7159c9f63e4805689c6cfc761086aad9e59f1f21d0cddb5d15
SHA512 (xpdf-thai-2011-aug-15.tar.gz) = 5584b590e34da29285c379e3b7a7243c28241ec6fddb3e4a8e2e7bf88b8f7aaae3483061d12c332a1ff042ec5e2b31869a67d60512ac48f7903c5e2fc871aa87
SHA512 (xpdf-turkish-2011-aug-15.tar.gz) = a73e90bce8f2a12154b06ef29333a45d96258c0d653d5cb15afd2e5ad9e79a9b617e5f8ebeb20bde545684d50f3bc1349800c99f70c863bdd502c24c266b4fb1
SHA512 (xpdf-chinese-traditional-2020-dec-22-NOCMAP.tar.gz) = ff25947dbf09b51f9c97aff898b8d33441af230d25c827380f1f5dd4144b5c3d14fc0d1e1ed42e039ff706568a490925f1cafc94ff5f70ae7879827c82dfbc85
SHA512 (xpdf-japanese-2020-dec-22-NOCMAP.tar.gz) = aff90d0c8f26e1dffd2b178c5ee676cfa520086d28dd56af65ef3fcd016c2770361edeb35974f45328cd62d5cd7dff0ac719e38ee2594bef07e062869289a647
SHA512 (xpdf-4.05.tar.gz) = 1ee18a2fcae138e60158cf6289f588832a982e1b13995382a396d1953949cf4e32cb4f9884f2506154512d961853e70ff499a35c525e707c3bf2950fe7f9040b
SHA512 (xpdf-4.05.tar.gz.sig) = 86500cf8d5a7d588784f94dddf5d4533cfff1700b4f193add9c417896fd92d011b52615f341f30e82224740e845b7f870b9277d7f3cb1b250fd0db2bbd3123d1
SHA512 (xpdf-chinese-simplified-2023-dec-05-NOCMAP.tar.gz) = 292a819cca4d6095b6835b30241abbbbb07354adc839c9a49b90f2dd9deb1fc7d8727a9bade3cab88da8e903e00199ecf8672727ae7310cc15e1ad8c282d218b
SHA512 (xpdf-korean-2023-dec-05-NOCMAP.tar.gz) = 3ca81eaee279122a8054fc26f16d85c668d0571a1b249a410346196c2b61081bcdfec61c140a7334a921d80738e908b507ac47a301f3aae37b3050c8e8b77f29
SHA512 (xpdf-thai.tar.gz) = c738ef97c57630feb4d1bae3df36ba02118f73e770caeef4bd3256740b9aadb94ec07b993a01a6abc9ba711d6dc2900f90eb7e1c7bbbf157f07160be1743d3f1
SHA512 (xpdf-4.06.tar.gz) = ace2d2c006411ef40f3510fe34809e6ed5fd4a2367ac11a75e9d4795aa5054e72f12e307165d11a25b12609d33b279b9b99d9c072442e98308a77ad022bc8355
SHA512 (xpdf-4.06.tar.gz.sig) = 2df5d491a2126c9f879896c623193cfb6e7b38da53a1eaac4060b77569d84b2d28a12e3a1285d31bb9a422f774f3d70238d47bfec388db1222fc041627da1ec7

View file

@ -1,55 +0,0 @@
diff -up xpdf-4.05/xpdf/GlobalParams.cc.urw-font-fix xpdf-4.05/xpdf/GlobalParams.cc
--- xpdf-4.05/xpdf/GlobalParams.cc.urw-font-fix 2024-02-07 21:32:41.000000000 +0100
+++ xpdf-4.05/xpdf/GlobalParams.cc 2024-02-27 19:34:08.750036721 +0100
@@ -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.t1", "cour.ttf", "Courier", "Courier", NULL, 0},
+ {"Courier-Bold", "NimbusMonoPS-Bold.t1", "courbd.ttf", "Courier", "Courier Bold", NULL, 0},
+ {"Courier-BoldOblique", "NimbusMonoPS-BoldItalic.t1", "courbi.ttf", "Courier", "Courier Bold Oblique", "Courier-Bold", 0.212557},
+ {"Courier-Oblique", "NimbusMonoPS-Italic.t1", "couri.ttf", "Courier", "Courier Oblique", "Courier", 0.212557},
+ {"Helvetica", "NimbusSans-Regular.t1", "arial.ttf", "Helvetica", "Helvetica", NULL, 0},
+ {"Helvetica-Bold", "NimbusSans-Bold.t1", "arialbd.ttf", "Helvetica", "Helvetica-Bold", NULL, 0},
+ {"Helvetica-BoldOblique", "NimbusSans-BoldItalic.t1", "arialbi.ttf", "Helvetica", "Helvetica Bold Oblique", "Helvetica-Bold", 0.212557},
+ {"Helvetica-Oblique", "NimbusSans-Italic.t1", "ariali.ttf", "Helvetica", "Helvetica Oblique", "Helvetica", 0.212557},
+ {"Symbol", "StandardSymbolsPS.t1", NULL, "Symbol", "Symbol", NULL, 0},
+ {"Times-Bold", "NimbusRoman-Bold.t1", "timesbd.ttf", "Times", "Times-Bold", NULL, 0},
+ {"Times-BoldItalic", "NimbusRoman-BoldItalic.t1", "timesbi.ttf", "Times", "Times-BoldItalic", NULL, 0},
+ {"Times-Italic", "NimbusRoman-Italic.t1", "timesi.ttf", "Times", "Times-Italic", NULL, 0},
+ {"Times-Roman", "NimbusRoman-Regular.t1", "times.ttf", "Times", "Times-Roman", NULL, 0},
+ {"ZapfDingbats", "D050000L.t1", NULL, "ZapfDingbats", "Zapf Dingbats", NULL, 0},
{NULL}
};
@@ -107,6 +107,7 @@ static const char *displayFontDirs[] = {
"c:/windows/fonts",
"c:/winnt/fonts",
#else // _WIN32
+ "/usr/share/fonts/urw-base35",
"/usr/share/ghostscript/fonts",
"/usr/local/share/ghostscript/fonts",
"/usr/share/fonts/default/Type1",
@@ -2602,7 +2603,7 @@ UnicodeRemapping *GlobalParams::getUnico
}
GString *GlobalParams::findFontFile(GString *fontName) {
- static const char *exts[] = { ".pfa", ".pfb", ".ttf", ".ttc", ".otf" };
+ static const char *exts[] = { ".pfa", ".pfb", ".t1", ".ttf", ".ttc", ".otf" };
GString *path, *dir;
#ifdef _WIN32
GString *fontNameU;

View file

@ -1,6 +1,6 @@
diff -up xpdf-4.02/xpdf/pdfimages.cc.permissions xpdf-4.02/xpdf/pdfimages.cc
--- xpdf-4.02/xpdf/pdfimages.cc.permissions 2019-09-25 15:54:33.000000000 -0400
+++ xpdf-4.02/xpdf/pdfimages.cc 2019-10-16 15:06:54.798431961 -0400
diff -up xpdf-4.06/xpdf/pdfimages.cc.permissions xpdf-4.06/xpdf/pdfimages.cc
--- xpdf-4.06/xpdf/pdfimages.cc.permissions 2025-11-13 17:08:30.000000000 -0500
+++ xpdf-4.06/xpdf/pdfimages.cc 2025-11-18 15:27:00.093784988 -0500
@@ -4,6 +4,8 @@
//
// Copyright 1998-2003 Glyph & Cog, LLC
@ -10,12 +10,12 @@ diff -up xpdf-4.02/xpdf/pdfimages.cc.permissions xpdf-4.02/xpdf/pdfimages.cc
//========================================================================
#include <aconf.h>
@@ -127,12 +129,14 @@ int main(int argc, char *argv[]) {
@@ -153,12 +155,14 @@ int main(int argc, char *argv[]) {
}
// check for copy permission
+#ifdef ENFORCE_PERMISSIONS
if (!doc->okToCopy()) {
if (!listOnly && !doc->okToCopy()) {
error(errNotAllowed, -1,
"Copying of images from this document is not allowed.");
exitCode = 3;
@ -25,10 +25,10 @@ diff -up xpdf-4.02/xpdf/pdfimages.cc.permissions xpdf-4.02/xpdf/pdfimages.cc
// get page range
if (firstPage < 1)
diff -up xpdf-4.02/xpdf/pdftohtml.cc.permissions xpdf-4.02/xpdf/pdftohtml.cc
--- xpdf-4.02/xpdf/pdftohtml.cc.permissions 2019-09-25 15:54:33.000000000 -0400
+++ xpdf-4.02/xpdf/pdftohtml.cc 2019-10-16 15:06:54.799431943 -0400
@@ -138,6 +138,7 @@ int main(int argc, char *argv[]) {
diff -up xpdf-4.06/xpdf/pdftohtml.cc.permissions xpdf-4.06/xpdf/pdftohtml.cc
--- xpdf-4.06/xpdf/pdftohtml.cc.permissions 2025-11-13 17:08:30.000000000 -0500
+++ xpdf-4.06/xpdf/pdftohtml.cc 2025-11-18 15:25:43.149122766 -0500
@@ -183,6 +183,7 @@ int main(int argc, char *argv[]) {
goto err1;
}
@ -36,7 +36,7 @@ diff -up xpdf-4.02/xpdf/pdftohtml.cc.permissions xpdf-4.02/xpdf/pdftohtml.cc
// check for copy permission
if (!doc->okToCopy()) {
error(errNotAllowed, -1,
@@ -145,6 +146,7 @@ int main(int argc, char *argv[]) {
@@ -190,6 +191,7 @@ int main(int argc, char *argv[]) {
exitCode = 3;
goto err1;
}
@ -44,9 +44,9 @@ diff -up xpdf-4.02/xpdf/pdftohtml.cc.permissions xpdf-4.02/xpdf/pdftohtml.cc
// get page range
if (firstPage < 1) {
diff -up xpdf-4.02/xpdf/pdftops.cc.permissions xpdf-4.02/xpdf/pdftops.cc
--- xpdf-4.02/xpdf/pdftops.cc.permissions 2019-09-25 15:54:33.000000000 -0400
+++ xpdf-4.02/xpdf/pdftops.cc 2019-10-16 15:06:54.799431943 -0400
diff -up xpdf-4.06/xpdf/pdftops.cc.permissions xpdf-4.06/xpdf/pdftops.cc
--- xpdf-4.06/xpdf/pdftops.cc.permissions 2025-11-13 17:08:30.000000000 -0500
+++ xpdf-4.06/xpdf/pdftops.cc 2025-11-18 15:25:43.149260566 -0500
@@ -4,6 +4,8 @@
//
// Copyright 1996-2003 Glyph & Cog, LLC
@ -56,7 +56,7 @@ diff -up xpdf-4.02/xpdf/pdftops.cc.permissions xpdf-4.02/xpdf/pdftops.cc
//========================================================================
#include <aconf.h>
@@ -318,12 +320,14 @@ int main(int argc, char *argv[]) {
@@ -337,12 +339,14 @@ int main(int argc, char *argv[]) {
goto err1;
}
@ -71,9 +71,9 @@ diff -up xpdf-4.02/xpdf/pdftops.cc.permissions xpdf-4.02/xpdf/pdftops.cc
// construct PostScript file name
if (argc == 3) {
diff -up xpdf-4.02/xpdf/pdftotext.cc.permissions xpdf-4.02/xpdf/pdftotext.cc
--- xpdf-4.02/xpdf/pdftotext.cc.permissions 2019-09-25 15:54:33.000000000 -0400
+++ xpdf-4.02/xpdf/pdftotext.cc 2019-10-16 15:06:54.799431943 -0400
diff -up xpdf-4.06/xpdf/pdftotext.cc.permissions xpdf-4.06/xpdf/pdftotext.cc
--- xpdf-4.06/xpdf/pdftotext.cc.permissions 2025-11-13 17:08:30.000000000 -0500
+++ xpdf-4.06/xpdf/pdftotext.cc 2025-11-18 15:25:43.149380451 -0500
@@ -4,6 +4,8 @@
//
// Copyright 1997-2013 Glyph & Cog, LLC
@ -83,7 +83,7 @@ diff -up xpdf-4.02/xpdf/pdftotext.cc.permissions xpdf-4.02/xpdf/pdftotext.cc
//========================================================================
#include <aconf.h>
@@ -209,6 +211,7 @@ int main(int argc, char *argv[]) {
@@ -248,6 +250,7 @@ int main(int argc, char *argv[]) {
goto err2;
}
@ -91,7 +91,7 @@ diff -up xpdf-4.02/xpdf/pdftotext.cc.permissions xpdf-4.02/xpdf/pdftotext.cc
// check for copy permission
if (!doc->okToCopy()) {
error(errNotAllowed, -1,
@@ -216,6 +219,7 @@ int main(int argc, char *argv[]) {
@@ -255,6 +258,7 @@ int main(int argc, char *argv[]) {
exitCode = 3;
goto err2;
}
@ -99,10 +99,10 @@ diff -up xpdf-4.02/xpdf/pdftotext.cc.permissions xpdf-4.02/xpdf/pdftotext.cc
// construct text file name
if (argc == 3) {
diff -up xpdf-4.02/xpdf-qt/QtPDFCore.cc.permissions xpdf-4.02/xpdf-qt/QtPDFCore.cc
--- xpdf-4.02/xpdf-qt/QtPDFCore.cc.permissions 2019-10-16 15:06:54.799431943 -0400
+++ xpdf-4.02/xpdf-qt/QtPDFCore.cc 2019-10-16 15:07:52.110361895 -0400
@@ -446,9 +446,11 @@ QString QtPDFCore::getSelectedTextQStrin
diff -up xpdf-4.06/xpdf-qt/QtPDFCore.cc.permissions xpdf-4.06/xpdf-qt/QtPDFCore.cc
--- xpdf-4.06/xpdf-qt/QtPDFCore.cc.permissions 2025-11-13 17:08:30.000000000 -0500
+++ xpdf-4.06/xpdf-qt/QtPDFCore.cc 2025-11-18 15:25:43.149536859 -0500
@@ -494,9 +494,11 @@ QString QtPDFCore::getSelectedTextQStrin
QString qs;
int i;
@ -114,10 +114,10 @@ diff -up xpdf-4.02/xpdf-qt/QtPDFCore.cc.permissions xpdf-4.02/xpdf-qt/QtPDFCore.
if (!(s = getSelectedText())) {
return "";
}
diff -up xpdf-4.02/xpdf-qt/XpdfWidget.cc.permissions xpdf-4.02/xpdf-qt/XpdfWidget.cc
--- xpdf-4.02/xpdf-qt/XpdfWidget.cc.permissions 2019-09-25 15:54:33.000000000 -0400
+++ xpdf-4.02/xpdf-qt/XpdfWidget.cc 2019-10-16 15:06:54.800431924 -0400
@@ -1440,7 +1440,11 @@ bool XpdfWidget::okToExtractText() const
diff -up xpdf-4.06/xpdf-qt/XpdfWidget.cc.permissions xpdf-4.06/xpdf-qt/XpdfWidget.cc
--- xpdf-4.06/xpdf-qt/XpdfWidget.cc.permissions 2025-11-13 17:08:30.000000000 -0500
+++ xpdf-4.06/xpdf-qt/XpdfWidget.cc 2025-11-18 15:25:43.149737940 -0500
@@ -1526,7 +1526,11 @@ bool XpdfWidget::okToExtractText() const
if (!core->getDoc()) {
return false;
}

View file

@ -0,0 +1,133 @@
diff -up xpdf-4.06/xpdf/GlobalParams.cc.urw-font-fix xpdf-4.06/xpdf/GlobalParams.cc
--- xpdf-4.06/xpdf/GlobalParams.cc.urw-font-fix 2025-11-13 17:08:30.000000000 -0500
+++ xpdf-4.06/xpdf/GlobalParams.cc 2025-11-18 15:23:11.114577091 -0500
@@ -84,98 +84,98 @@ static struct {
double obliqueFactor; // oblique sheer factor
} displayFontTab[] = {
{"Courier", // name
- "n022003l.pfb", // t1FileName
+ "NimbusMonoPS-Regular.t1", // t1FileName
"cour.ttf", // ttFileName
"Courier", "Courier", // macFileName, macFontName
"NimbusMonoPS-Regular", // fcFontName
NULL, 0 // obliqueFont, obliqueFactor
},
{"Courier-Bold", // name
- "n022004l.pfb", // t1FileName
+ "NimbusMonoPS-Bold.t1", // t1FileName
"courbd.ttf", // ttFileName
"Courier", "Courier Bold", // macFileName, macFontName
"NimbusMonoPS-Bold", // fcFontName
NULL, 0 // obliqueFont, obliqueFactor
},
{"Courier-BoldOblique", // name
- "n022024l.pfb", // t1FileName
+ "NimbusMonoPS-BoldItalic.t1", // t1FileName
"courbi.ttf", // ttFileName
"Courier", "Courier Bold Oblique", // macFileName, macFontName
"NimbusMonoPS-BoldItalic", // fcFontName
"Courier-Bold", 0.212557 // obliqueFont, obliqueFactor
},
{"Courier-Oblique", // name
- "n022023l.pfb", // t1FileName
+ "NimbusMonoPS-Italic.t1", // t1FileName
"couri.ttf", // ttFileName
"Courier", "Courier Oblique", // macFileName, macFontName
"NimbusMonoPS-Italic", // fcFontName
"Courier", 0.212557 // obliqueFont, obliqueFactor
},
{"Helvetica", // name
- "n019003l.pfb", // t1FileName
+ "NimbusSans-Regular.t1", // t1FileName
"arial.ttf", // ttFileName
"Helvetica", "Helvetica", // macFileName, macFontName
"NimbusSans-Regular", // fcFontName
NULL, 0 // obliqueFont, obliqueFactor
},
{"Helvetica-Bold", // name
- "n019004l.pfb", // t1FileName
+ "NimbusSans-Bold.t1", // t1FileName
"arialbd.ttf", // ttFileName
"Helvetica", "Helvetica Bold", // macFileName, macFontName
"NimbusSans-Bold", // fcFontName
NULL, 0 // obliqueFont, obliqueFactor
},
{"Helvetica-BoldOblique", // name
- "n019024l.pfb", // t1FileName
+ "NimbusSans-BoldItalic.t1", // t1FileName
"arialbi.ttf", // ttFileName
"Helvetica", "Helvetica Bold Oblique", // macFileName, macFontName
"NimbusSans-BoldItalic", // fcFontName
"Helvetica-Bold", 0.212557 // obliqueFont, obliqueFactor
},
{"Helvetica-Oblique", // name
- "n019023l.pfb", // t1FileName
+ "NimbusSans-Italic.t1", // t1FileName
"ariali.ttf", // ttFileName
"Helvetica", "Helvetica Oblique", // macFileName, macFontName
"NimbusSans-Italic", // fcFontName
"Helvetica", 0.212557 // obliqueFont, obliqueFactor
},
{"Symbol", // name
- "s050000l.pfb", // t1FileName
+ "StandardSymbolsPS.t1", // t1FileName
NULL, // ttFileName
"Symbol", "Symbol", // macFileName, macFontName
"Standard Symbols PS", // fcFontName
NULL, 0 // obliqueFont, obliqueFactor
},
{"Times-Bold", // name
- "n021004l.pfb", // t1FileName
+ "NimbusRoman-Bold.t1", // t1FileName
"timesbd.ttf", // ttFileName
"Times", "Times Bold", // macFileName, macFontName
"NimbusRoman-Bold", // fcFontName
NULL, 0 // obliqueFont, obliqueFactor
},
{"Times-BoldItalic", // name
- "n021024l.pfb", // t1FileName
+ "NimbusRoman-BoldItalic.t1", // t1FileName
"timesbi.ttf", // ttFileName
"Times", "Times Bold Italic", // macFileName, macFontName
"NimbusRoman-BoldItalic", // fcFontName
NULL, 0 // obliqueFont, obliqueFactor
},
{"Times-Italic", // name
- "n021023l.pfb", // t1FileName
+ "NimbusRoman-Italic.t1", // t1FileName
"timesi.ttf", // ttFileName
"Times", "Times Italic", // macFileName, macFontName
"NimbusRoman-Italic", // fcFontName
NULL, 0 // obliqueFont, obliqueFactor
},
{"Times-Roman", // name
- "n021003l.pfb", // t1FileName
+ "NimbusRoman-Regular.t1", // t1FileName
"times.ttf", // ttFileName
"Times", "Times Roman", // macFileName, macFontName
"NimbusRoman-Regular", // fcFontName
NULL, 0 // obliqueFont, obliqueFactor
},
{"ZapfDingbats", // name
- "d050000l.pfb", // t1FileName
+ "D050000L.t1", // t1FileName
NULL, // ttFileName
"ZapfDingbats", "Zapf Dingbats", // macFileName, macFontName
"D050000L", // fcFontName
@@ -192,6 +192,7 @@ static const char *displayFontDirs[] = {
"c:/windows/fonts",
"c:/winnt/fonts",
#else // _WIN32
+ "/usr/share/fonts/urw-base35",
"/usr/share/ghostscript/fonts",
"/usr/local/share/ghostscript/fonts",
"/usr/share/fonts/default/Type1",
@@ -2788,7 +2789,7 @@ UnicodeRemapping *GlobalParams::getUnico
}
GString *GlobalParams::findFontFile(GString *fontName) {
- static const char *exts[] = { ".pfa", ".pfb", ".ttf", ".ttc", ".otf" };
+ static const char *exts[] = { ".pfa", ".pfb", ".t1", ".ttf", ".ttc", ".otf" };
GString *path, *dir;
#ifdef _WIN32
GString *fontNameU;

View file

@ -2,8 +2,8 @@
Summary: A PDF file viewer for the X Window System
Name: xpdf
Version: 4.05
Release: 5%{?dist}
Version: 4.06
Release: 3%{?dist}
License: (GPL-2.0-only OR GPL-3.0-only) AND BSD-3-Clause
Epoch: 1
Url: https://www.xpdfreader.com/
@ -39,7 +39,8 @@ Source5: xpdf-japanese-2020-dec-22-NOCMAP.tar.gz
Source6: xpdf-korean-2023-dec-05-NOCMAP.tar.gz
# cyrillic and thai don't have CMap files to worry about.
Source7: ftp://ftp.foolabs.com/pub/xpdf/xpdf-cyrillic-2011-aug-15.tar.gz
Source8: ftp://ftp.foolabs.com/pub/xpdf/xpdf-thai-2011-aug-15.tar.gz
# thai: 2025-08-13
Source8: https://dl.xpdfreader.com/xpdf-thai.tar.gz
Source10: xpdf.desktop
Source11: xpdf.png
Source12: ftp://ftp.foolabs.com/pub/xpdf/xpdf-arabic-2011-aug-15.tar.gz
@ -55,7 +56,7 @@ Patch11: xpdf-4.01-crash.patch
Patch12: xpdf-4.01-64bit.patch
Patch15: xpdf-3.04-nocmap.patch
Patch25: xpdf-4.00-versionedlib.patch
Patch26: xpdf-4.05-urw-base35-fonts.patch
Patch26: xpdf-4.06-urw-base35-fonts.patch
Patch28: xpdf-4.04-GlobalParams-null-fix.patch
# https://forum.xpdfreader.com/viewtopic.php?t=42521
Patch29: xpdf-4.04-shared-xpdf-lib.patch
@ -65,10 +66,11 @@ Patch29: xpdf-4.04-shared-xpdf-lib.patch
# https://gitlab.freedesktop.org/poppler/poppler/commit/cdb7ad95f7c8fbf63ade040d8a07ec96467042fc
# https://gitlab.freedesktop.org/poppler/poppler/commit/bf4aae25a244b1033a2479b9a8f633224f7d5de5
Patch101: xpdf-4.02-CVE-2019-12360.patch
Patch102: xpdf-4.05-CVE-2024-4141.patch
# merged in 4.06
# Patch102: xpdf-4.05-CVE-2024-4141.patch
# Debian patches
Patch200: xpdf-4.02-permissions.patch
Patch200: xpdf-4.06-permissions.patch
# Proper stream encoding on 64bit platforms
Patch203: fix-444648.dpatch
@ -150,7 +152,7 @@ Libraries from xpdf.
# security patches
%patch -P101 -p1 -b .CVE-2019-12360
%patch -P102 -p1 -b .CVE-2024-4141
# %%patch -P102 -p1 -b .CVE-2024-4141
# debian patches
%patch -P200 -p1 -b .permissions
@ -176,7 +178,7 @@ done
export CFLAGS="%{optflags} -fPIC"
export CXXFLAGS="%{optflags} -Wno-deprecated -fPIC"
%cmake -DMULTITHREADED=ON -DOPI_SUPPORT=ON -DXPDFWIDGET_PRINTING=1 -DSYSTEM_XPDFRC="%{_sysconfdir}/xpdfrc"
%cmake -DMULTITHREADED=ON -DOPI_SUPPORT=ON -DXPDFWIDGET_PRINTING=1 -DSYSTEM_XPDFRC="%{_sysconfdir}/xpdfrc" -DCMAKE_POLICY_VERSION_MINIMUM=3.5
%cmake_build
%if 0%{?fedora}
@ -341,6 +343,24 @@ sed -i -e 's:/usr/local/share/:%{_datadir}/:g' $RPM_BUILD_ROOT%{_sysconfdir}/xpd
%{_libdir}/lib*.so.*
%changelog
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.06-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.06-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Tue Nov 18 2025 Tom Callaway <spot@fedoraproject.org> - 1:4.06-1
- update to 4.06
* Thu Jul 31 2025 Tom Callaway <spot@fedoraproject.org> - 1:4.05-8
- passing -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to fix FTBFS with CMake4 (bz2381643)
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.05-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.05-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.05-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild