diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-05-28 19:12:29 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 23:39:35 +0200 |
commit | 646a5c1cbfd95873950a87b5f75d52073a967023 (patch) | |
tree | b8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/l/poppler/poppler.splashpath.h.revert.diff | |
parent | d31c50870d0bee042ce660e445c9294a59a3a65b (diff) | |
download | current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz |
Mon May 28 19:12:29 UTC 201820180528191229
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.
Diffstat (limited to 'source/l/poppler/poppler.splashpath.h.revert.diff')
-rw-r--r-- | source/l/poppler/poppler.splashpath.h.revert.diff | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/source/l/poppler/poppler.splashpath.h.revert.diff b/source/l/poppler/poppler.splashpath.h.revert.diff new file mode 100644 index 00000000..64086067 --- /dev/null +++ b/source/l/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 |