summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-10-03 19:58:15 +0000
committerEric Hameleers <alien@slackware.com>2019-10-04 08:59:50 +0200
commit4599171894453ce9b77106663288c843113f87e0 (patch)
tree9bdfa72b9a43c8f621bf2be73d8d6b3d827ba33c /source
parent27dce94811b1253ee685b40a4a5a70bce92b5cbd (diff)
downloadcurrent-4599171894453ce9b77106663288c843113f87e0.tar.gz
Thu Oct 3 19:58:15 UTC 201920191003195815
a/hwdata-0.328-noarch-1.txz: Upgraded. ap/powertop-2.11-x86_64-1.txz: Upgraded. d/cmake-3.15.4-x86_64-1.txz: Upgraded. d/mercurial-5.1.2-x86_64-1.txz: Upgraded. l/mozilla-nss-3.46.1-x86_64-1.txz: Upgraded. l/python-pillow-6.2.0-x86_64-1.txz: Upgraded. n/whois-5.5.2-x86_64-1.txz: Upgraded. xap/xpdf-4.02-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
-rwxr-xr-xsource/ap/powertop/powertop.SlackBuild10
-rwxr-xr-xsource/l/mozilla-nss/mozilla-nss.SlackBuild2
-rw-r--r--source/l/python-pillow/slack-desc2
-rw-r--r--source/xap/xpdf/lang/xpdf-chinese-simplified.diff6
-rw-r--r--source/xap/xpdf/lang/xpdf-chinese-traditional.diff6
-rw-r--r--source/xap/xpdf/lang/xpdf-japanese.diff6
-rw-r--r--source/xap/xpdf/lang/xpdf-korean.diff9
-rwxr-xr-xsource/xap/xpdf/xpdf.SlackBuild6
-rw-r--r--source/xap/xpdf/xpdf.url1
9 files changed, 26 insertions, 22 deletions
diff --git a/source/ap/powertop/powertop.SlackBuild b/source/ap/powertop/powertop.SlackBuild
index ceab1272..79857b07 100755
--- a/source/ap/powertop/powertop.SlackBuild
+++ b/source/ap/powertop/powertop.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2010, 2012, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2010, 2012, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -28,7 +28,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=powertop
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev | tr -d 'v')}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
@@ -73,7 +73,7 @@ fi
cd $TMP
rm -rf ${PKGNAM}-${VERSION}
tar xvf $CWD/${PKGNAM}-v$VERSION.tar.?z || tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1
-cd ${PKGNAM}-v$VERSION || ${PKGNAM}-v$VERSION || exit 1
+cd ${PKGNAM}-$VERSION || exit 1
# Make sure ownerships and permissions are sane:
chown -R root:root .
@@ -83,6 +83,10 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
+if [ ! -r configure ]; then
+ NOCONFIGURE=1 ./autogen.sh
+fi
+
LDFLAGS=" -lresolv -lz " \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/source/l/mozilla-nss/mozilla-nss.SlackBuild b/source/l/mozilla-nss/mozilla-nss.SlackBuild
index ff806f80..f577d93f 100755
--- a/source/l/mozilla-nss/mozilla-nss.SlackBuild
+++ b/source/l/mozilla-nss/mozilla-nss.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=mozilla-nss
SRCNAM=nss
-VERSION=${VERSION:-3.46}
+VERSION=${VERSION:-3.46.1}
NSPR=${NSPR:-4.22}
BUILD=${BUILD:-1}
diff --git a/source/l/python-pillow/slack-desc b/source/l/python-pillow/slack-desc
index f8fffcd8..31a4ab11 100644
--- a/source/l/python-pillow/slack-desc
+++ b/source/l/python-pillow/slack-desc
@@ -15,5 +15,5 @@ python-pillow: image processing capabilities.
python-pillow:
python-pillow: PIL is used by the scanning component of HPLIP.
python-pillow:
-python-pillow: PIL homepage: https://python-pillow.github.io/
+python-pillow: Homepage: https://python-pillow.github.io/
python-pillow:
diff --git a/source/xap/xpdf/lang/xpdf-chinese-simplified.diff b/source/xap/xpdf/lang/xpdf-chinese-simplified.diff
index bec5e25b..adcb5cd3 100644
--- a/source/xap/xpdf/lang/xpdf-chinese-simplified.diff
+++ b/source/xap/xpdf/lang/xpdf-chinese-simplified.diff
@@ -1,5 +1,5 @@
---- ./add-to-xpdfrc.orig 2011-09-02 17:24:44.000000000 -0500
-+++ ./add-to-xpdfrc 2013-03-28 15:45:42.020412765 -0500
+--- ./add-to-xpdfrc.orig 2019-10-03 13:51:29.655084567 -0500
++++ ./add-to-xpdfrc 2019-10-03 13:53:02.916076850 -0500
@@ -1,9 +1,9 @@
#----- begin Chinese Simplified support package (2011-sep-02)
-cidToUnicode Adobe-GB1 /usr/local/share/xpdf/chinese-simplified/Adobe-GB1.cidToUnicode
@@ -8,7 +8,7 @@
-unicodeMap GBK /usr/local/share/xpdf/chinese-simplified/GBK.unicodeMap
-cMapDir Adobe-GB1 /usr/local/share/xpdf/chinese-simplified/CMap
-toUnicodeDir /usr/local/share/xpdf/chinese-simplified/CMap
--#fontFileCC Adobe-GB1 /usr/..../gkai00mp.ttf
+-#fontFileCC Adobe-GB1 /usr/..../NotoSansCJKsc-Regular.otf
+cidToUnicode Adobe-GB1 /usr/share/xpdf/chinese-simplified/Adobe-GB1.cidToUnicode
+unicodeMap ISO-2022-CN /usr/share/xpdf/chinese-simplified/ISO-2022-CN.unicodeMap
+unicodeMap EUC-CN /usr/share/xpdf/chinese-simplified/EUC-CN.unicodeMap
diff --git a/source/xap/xpdf/lang/xpdf-chinese-traditional.diff b/source/xap/xpdf/lang/xpdf-chinese-traditional.diff
index 24857f46..ead03e98 100644
--- a/source/xap/xpdf/lang/xpdf-chinese-traditional.diff
+++ b/source/xap/xpdf/lang/xpdf-chinese-traditional.diff
@@ -1,5 +1,5 @@
---- ./add-to-xpdfrc.orig 2011-09-02 17:24:44.000000000 -0500
-+++ ./add-to-xpdfrc 2013-03-28 15:46:03.285412085 -0500
+--- ./add-to-xpdfrc.orig 2019-10-03 13:51:29.775084557 -0500
++++ ./add-to-xpdfrc 2019-10-03 13:59:15.404046027 -0500
@@ -1,8 +1,8 @@
#----- begin Chinese Traditional support package (2011-sep-02)
-cidToUnicode Adobe-CNS1 /usr/local/share/xpdf/chinese-traditional/Adobe-CNS1.cidToUnicode
@@ -7,7 +7,7 @@
-unicodeMap Big5ascii /usr/local/share/xpdf/chinese-traditional/Big5ascii.unicodeMap
-cMapDir Adobe-CNS1 /usr/local/share/xpdf/chinese-traditional/CMap
-toUnicodeDir /usr/local/share/xpdf/chinese-traditional/CMap
--#fontFileCC Adobe-CNS1 /usr/..../bkai00mp.ttf
+-#fontFileCC Adobe-CNS1 /usr/..../NotoSansCJKtc-Regular.otf"
+cidToUnicode Adobe-CNS1 /usr/share/xpdf/chinese-traditional/Adobe-CNS1.cidToUnicode
+unicodeMap Big5 /usr/share/xpdf/chinese-traditional/Big5.unicodeMap
+unicodeMap Big5ascii /usr/share/xpdf/chinese-traditional/Big5ascii.unicodeMap
diff --git a/source/xap/xpdf/lang/xpdf-japanese.diff b/source/xap/xpdf/lang/xpdf-japanese.diff
index ff0c6e98..5a5f7ae7 100644
--- a/source/xap/xpdf/lang/xpdf-japanese.diff
+++ b/source/xap/xpdf/lang/xpdf-japanese.diff
@@ -1,5 +1,5 @@
---- ./add-to-xpdfrc.orig 2013-03-29 14:49:00.000000000 +0900
-+++ ./add-to-xpdfrc 2013-03-29 15:00:17.000000000 +0900
+--- ./add-to-xpdfrc.orig 2019-10-03 13:51:30.098084530 -0500
++++ ./add-to-xpdfrc 2019-10-03 13:55:28.494064804 -0500
@@ -1,9 +1,45 @@
#----- begin Japanese support package (2011-sep-02)
-cidToUnicode Adobe-Japan1 /usr/local/share/xpdf/japanese/Adobe-Japan1.cidToUnicode
@@ -8,7 +8,7 @@
-unicodeMap Shift-JIS /usr/local/share/xpdf/japanese/Shift-JIS.unicodeMap
-cMapDir Adobe-Japan1 /usr/local/share/xpdf/japanese/CMap
-toUnicodeDir /usr/local/share/xpdf/japanese/CMap
--#fontFileCC Adobe-Japan1 /usr/..../kochi-mincho.ttf
+-#fontFileCC Adobe-Japan1 /usr/..../NotoSansCJKjp-Regular.otf
+cidToUnicode Adobe-Japan1 /usr/share/xpdf/japanese/Adobe-Japan1.cidToUnicode
+unicodeMap ISO-2022-JP /usr/share/xpdf/japanese/ISO-2022-JP.unicodeMap
+unicodeMap EUC-JP /usr/share/xpdf/japanese/EUC-JP.unicodeMap
diff --git a/source/xap/xpdf/lang/xpdf-korean.diff b/source/xap/xpdf/lang/xpdf-korean.diff
index 531ad629..63ffde77 100644
--- a/source/xap/xpdf/lang/xpdf-korean.diff
+++ b/source/xap/xpdf/lang/xpdf-korean.diff
@@ -1,6 +1,6 @@
---- ./add-to-xpdfrc.orig 2011-09-02 17:24:45.000000000 -0500
-+++ ./add-to-xpdfrc 2013-03-28 15:43:21.119417269 -0500
-@@ -1,8 +1,8 @@
+--- ./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 @@
#----- begin Korean support package (2011-sep-02)
-cidToUnicode Adobe-Korea1 /usr/local/share/xpdf/korean/Adobe-Korea1.cidToUnicode
-unicodeMap ISO-2022-KR /usr/local/share/xpdf/korean/ISO-2022-KR.unicodeMap
@@ -10,6 +10,5 @@
+unicodeMap ISO-2022-KR /usr/share/xpdf/korean/ISO-2022-KR.unicodeMap
+cMapDir Adobe-Korea1 /usr/share/xpdf/korean/CMap
+toUnicodeDir /usr/share/xpdf/korean/CMap
- #fontFileCC Adobe-Korea1 /usr/..../batang.ttf"
- #fontFileCC Unidocs-Korea1 /usr/..../batang.ttf"
+ #fontFileCC Adobe-Korea1 /usr/..../NotoSansCJKkr-Regular.otf
#----- end Korean support package
diff --git a/source/xap/xpdf/xpdf.SlackBuild b/source/xap/xpdf/xpdf.SlackBuild
index 51f4ceb9..d0d119d0 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.00
+VERSION=4.02
PATCHLEVEL=
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -88,7 +88,7 @@ cd build
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DMAN_INSTALL_DIR=/usr/man \
+ -DCMAKE_INSTALL_MANDIR=/usr/man \
-DCMAKE_BUILD_TYPE=Release \
-DXPDFWIDGET_PRINTING=1 \
-DSYSTEM_XPDFRC="/etc/xpdfrc" \
diff --git a/source/xap/xpdf/xpdf.url b/source/xap/xpdf/xpdf.url
new file mode 100644
index 00000000..5600d90f
--- /dev/null
+++ b/source/xap/xpdf/xpdf.url
@@ -0,0 +1 @@
+https://www.xpdfreader.com