summaryrefslogtreecommitdiffstats
path: root/source/xap/xpdf
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-01-29 20:26:57 +0000
committer Eric Hameleers <alien@slackware.com>2021-01-30 08:59:50 +0100
commit8040f7f06757d6830029f75eab44474464883f59 (patch)
treed61a38f177382c6f8fcb42f70ee3e2f52ee7f90d /source/xap/xpdf
parent480d98e278bacecb97d391aeb5c7263cd9abf0ea (diff)
downloadcurrent-8040f7f06757d6830029f75eab44474464883f59.tar.gz
current-8040f7f06757d6830029f75eab44474464883f59.tar.xz
Fri Jan 29 20:26:57 UTC 202120210129202657
a/e2fsprogs-1.45.7-x86_64-1.txz: Upgraded. n/libgcrypt-1.9.1-x86_64-1.txz: Upgraded. This update fixes a serious security issue present only in libgcrypt-1.9.0. Everyone should be sure to update this package as soon as possible. For more information, see: https://lists.gnupg.org/pipermail/gnupg-announce/2021q1/000456.html (* Security fix *) x/libwacom-1.8-x86_64-1.txz: Upgraded. x/mesa-20.3.4-x86_64-1.txz: Upgraded. xap/xpdf-4.03-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/xap/xpdf')
-rw-r--r--source/xap/xpdf/lang/xpdf-korean.diff11
-rw-r--r--source/xap/xpdf/patches/xpdf-4.02.crash.fix.diff11
-rwxr-xr-xsource/xap/xpdf/xpdf.SlackBuild5
3 files changed, 10 insertions, 17 deletions
diff --git a/source/xap/xpdf/lang/xpdf-korean.diff b/source/xap/xpdf/lang/xpdf-korean.diff
index 63ffde77d..aecf0a7e6 100644
--- a/source/xap/xpdf/lang/xpdf-korean.diff
+++ b/source/xap/xpdf/lang/xpdf-korean.diff
@@ -1,14 +1,19 @@
---- ./add-to-xpdfrc.orig 2019-10-03 13:51:30.196084522 -0500
-+++ ./add-to-xpdfrc 2019-10-03 13:57:24.517055203 -0500
-@@ -1,7 +1,7 @@
+--- ./add-to-xpdfrc.orig 2021-01-29 12:36:23.966962831 -0600
++++ ./add-to-xpdfrc 2021-01-29 12:38:24.237956178 -0600
+@@ -1,10 +1,10 @@
#----- begin Korean support package (2011-sep-02)
-cidToUnicode Adobe-Korea1 /usr/local/share/xpdf/korean/Adobe-Korea1.cidToUnicode
+-cidToUnicode Adobe-KR /usr/local/share/xpdf/korean/Adobe-KR.cidToUnicode
-unicodeMap ISO-2022-KR /usr/local/share/xpdf/korean/ISO-2022-KR.unicodeMap
-cMapDir Adobe-Korea1 /usr/local/share/xpdf/korean/CMap
+-cMapDir Adobe-KR /usr/local/share/xpdf/korean/CMap
-toUnicodeDir /usr/local/share/xpdf/korean/CMap
+cidToUnicode Adobe-Korea1 /usr/share/xpdf/korean/Adobe-Korea1.cidToUnicode
++cidToUnicode Adobe-KR /usr/share/xpdf/korean/Adobe-KR.cidToUnicode
+unicodeMap ISO-2022-KR /usr/share/xpdf/korean/ISO-2022-KR.unicodeMap
+cMapDir Adobe-Korea1 /usr/share/xpdf/korean/CMap
++cMapDir Adobe-KR /usr/share/xpdf/korean/CMap
+toUnicodeDir /usr/share/xpdf/korean/CMap
#fontFileCC Adobe-Korea1 /usr/..../NotoSansCJKkr-Regular.otf
+ #fontFileCC Adobe-KR /usr/..../NotoSansCJKkr-Regular.otf
#----- end Korean support package
diff --git a/source/xap/xpdf/patches/xpdf-4.02.crash.fix.diff b/source/xap/xpdf/patches/xpdf-4.02.crash.fix.diff
deleted file mode 100644
index 3a65985a3..000000000
--- a/source/xap/xpdf/patches/xpdf-4.02.crash.fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./xpdf/GlobalParams.cc.orig 2019-09-25 14:54:33.000000000 -0500
-+++ ./xpdf/GlobalParams.cc 2019-10-08 13:33:36.526738508 -0500
-@@ -568,7 +568,7 @@
- FcFontSetDestroy(fontSet);
- }
-
-- FcFini();
-+ // FcFini(); Commented out to fix crash
- }
- #endif // HAVE_FONTCONFIG
-
diff --git a/source/xap/xpdf/xpdf.SlackBuild b/source/xap/xpdf/xpdf.SlackBuild
index c86cd6a26..7ad4bf2fb 100755
--- a/source/xap/xpdf/xpdf.SlackBuild
+++ b/source/xap/xpdf/xpdf.SlackBuild
@@ -23,9 +23,9 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=xpdf
-VERSION=4.02
+VERSION=4.03
PATCHLEVEL=
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -80,7 +80,6 @@ find . \
-exec chmod 644 {} \+
zcat $CWD/patches/xpdfrc.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/xpdf-4.02.crash.fix.diff.gz | patch -p1 --verbose || exit 1
mkdir build
cd build