From 646a5c1cbfd95873950a87b5f75d52073a967023 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 28 May 2018 19:12:29 +0000 Subject: Mon May 28 19:12:29 UTC 2018 a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded. --- source/xap/xpdf/patches/xpdfrc.diff | 11 ++----- source/xap/xpdf/slack-desc | 6 ++-- source/xap/xpdf/xpdf.SlackBuild | 62 +++++++++++++++++++++---------------- 3 files changed, 41 insertions(+), 38 deletions(-) (limited to 'source/xap/xpdf') diff --git a/source/xap/xpdf/patches/xpdfrc.diff b/source/xap/xpdf/patches/xpdfrc.diff index c136f997..4760a4f4 100644 --- a/source/xap/xpdf/patches/xpdfrc.diff +++ b/source/xap/xpdf/patches/xpdfrc.diff @@ -1,5 +1,6 @@ ---- ./doc/sample-xpdfrc.orig 2013-03-28 15:29:16.957444255 -0500 -+++ ./doc/sample-xpdfrc 2013-03-28 15:32:11.413438678 -0500 +diff -Nur xpdf-4.00.orig/doc/sample-xpdfrc xpdf-4.00/doc/sample-xpdfrc +--- xpdf-4.00.orig/doc/sample-xpdfrc 2017-08-08 18:22:50.000000000 -0500 ++++ xpdf-4.00/doc/sample-xpdfrc 2017-09-25 23:39:20.010485577 -0500 @@ -29,20 +29,20 @@ # installed in a "standard" location, xpdf will find them # automatically.) @@ -35,9 +36,3 @@ # If you need to display PDF files that refer to non-embedded fonts, # you should add one or more fontDir options to point to the -@@ -89,4 +89,4 @@ - # clicked. - - #launchCommand viewer-script --#urlCommand "netscape -remote 'openURL(%s)'" -+#urlCommand "firefox -remote 'openURL(%s)'" diff --git a/source/xap/xpdf/slack-desc b/source/xap/xpdf/slack-desc index 58072776..6866654f 100644 --- a/source/xap/xpdf/slack-desc +++ b/source/xap/xpdf/slack-desc @@ -1,8 +1,8 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| diff --git a/source/xap/xpdf/xpdf.SlackBuild b/source/xap/xpdf/xpdf.SlackBuild index aa3af960..d00c30a0 100755 --- a/source/xap/xpdf/xpdf.SlackBuild +++ b/source/xap/xpdf/xpdf.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,10 +20,12 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) -VERSION=3.04 +PKGNAM=xpdf +VERSION=4.00 PATCHLEVEL= -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -37,6 +39,14 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-${VERSION}${PATCHLEVEL}-$ARCH-$BUILD.txz" + exit 0 +fi + if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" @@ -51,7 +61,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-xpdf @@ -72,30 +81,29 @@ find . \ zcat $CWD/patches/xpdfrc.diff.gz | patch -p1 --verbose || exit 1 -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --sysconfdir=/etc \ - --with-freetype2-includes=/usr/include/freetype2 \ - --build=$ARCH-slackware-linux || exit 1 - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 +mkdir build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DMAN_INSTALL_DIR=/usr/man \ + -DCMAKE_BUILD_TYPE=Release \ + -DXPDFWIDGET_PRINTING=1 \ + .. || exit 1 + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 +cd .. chmod 0755 $PKG/usr/bin/* gzip -9 $PKG/usr/man/man?/* # We'll use the versions of these from the poppler derived work (if they exist here): -( cd $PKG/usr/bin - rm -f pdfinfo pdftops pdftoppm pdftohtml pdftotext pdfimages pdffonts - cd $PKG/usr/man/man1 - for file in pdfinfo pdftops pdftoppm pdftohtml pdftotext pdfimages pdffonts ; do - rm -f ${file}.1.gz - done -) +for file in pdfinfo pdftops pdftoppm pdftohtml pdftotext pdfimages pdffonts ; do + rm -f $PKG/usr/bin/${file} + rm -f $PKG/usr/man/man1/${file}.1.gz +done # Don't clobber /etc/xpdfrc mkdir -p $PKG/etc @@ -110,7 +118,7 @@ cat xpdf/xpdfIcon.xpm > $PKG/usr/share/pixmaps/xpdfIcon.xpm # Add additional language support: for language in xpdf-arabic xpdf-chinese-simplified xpdf-chinese-traditional xpdf-cyrillic xpdf-greek xpdf-hebrew xpdf-japanese xpdf-korean xpdf-latin2 xpdf-thai xpdf-turkish ; do rm -rf ${language} - tar xf $CWD/lang/${language}*.tar.gz + tar xf $CWD/lang/${language}*.tar.?z ( cd ${language} echo "Patching for ${language}:" zcat $CWD/lang/${language}.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 @@ -127,7 +135,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \ mkdir -p $PKG/usr/doc/xpdf-$VERSION cp -a \ - ANNOUNCE CHANGES COPYING INSTALL README \ + ANNOUNCE CHANGES COPYING* INSTALL README \ $PKG/usr/doc/xpdf-$VERSION chmod 0644 $PKG/usr/doc/xpdf-$VERSION/* @@ -135,7 +143,7 @@ chmod 0644 $PKG/usr/doc/xpdf-$VERSION/* # is useful, but don't let it get totally out of control: if [ -r CHANGES ]; then DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) - cat CHANGES | head -n 1000 > $DOCSDIR/CHANGES + cat CHANGES | tail -n 1000 > $DOCSDIR/CHANGES touch -r CHANGES $DOCSDIR/CHANGES fi -- cgit v1.2.3