diff options
Diffstat (limited to 'deps/poppler')
-rwxr-xr-x | deps/poppler/poppler.SlackBuild | 7 | ||||
-rw-r--r-- | deps/poppler/poppler.splashpath.h.revert.diff | 42 |
2 files changed, 47 insertions, 2 deletions
diff --git a/deps/poppler/poppler.SlackBuild b/deps/poppler/poppler.SlackBuild index b94e80a..b416bba 100755 --- a/deps/poppler/poppler.SlackBuild +++ b/deps/poppler/poppler.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010, 2012, 2017 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2012, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # Modified 2016, 2017 by Eric Hameleers <alien@slackware.com> PKGNAM=poppler -VERSION=${VERSION:-0.62.0} +VERSION=${VERSION:-0.63.0} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -75,6 +75,9 @@ cd ${PKGNAM}-$VERSION || exit 1 # things that depend on it: cat $CWD/poppler.remove.qt4.frontend.diff | patch -p1 -R --verbose || exit 1 +# Revert a change to SplashPath.h (in 0.63.0) that breaks compiling the qt4 frontend: +cat $CWD/poppler.splashpath.h.revert.diff | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/deps/poppler/poppler.splashpath.h.revert.diff b/deps/poppler/poppler.splashpath.h.revert.diff new file mode 100644 index 0000000..6408606 --- /dev/null +++ b/deps/poppler/poppler.splashpath.h.revert.diff @@ -0,0 +1,42 @@ +--- ./splash/SplashPath.h.orig 2018-03-18 13:23:49.000000000 -0500 ++++ ./splash/SplashPath.h 2017-12-03 13:25:06.000000000 -0600 +@@ -4,20 +4,6 @@ + // + //======================================================================== + +-//======================================================================== +-// +-// Modified under the Poppler project - http://poppler.freedesktop.org +-// +-// All changes made under the Poppler project to this file are licensed +-// under GPL version 2 or later +-// +-// Copyright (C) 2018 Albert Astals Cid <aacid@kde.org> +-// +-// To see a description of the changes please see the Changelog file that +-// came with your tarball or type make ChangeLog if you are building from git +-// +-//======================================================================== +- + #ifndef SPLASHPATH_H + #define SPLASHPATH_H + +@@ -76,9 +62,6 @@ + + ~SplashPath(); + +- SplashPath(const SplashPath&) = delete; +- SplashPath& operator=(const SplashPath&) = delete; +- + // Append <path> to <this>. + void append(SplashPath *path); + +@@ -133,6 +116,8 @@ + + friend class SplashXPath; + friend class Splash; ++ // this is a temporary hack, until we read FreeType paths directly ++ friend class ArthurOutputDev; + }; + + #endif |