summaryrefslogtreecommitdiff
path: root/libraries/podofo
diff options
context:
space:
mode:
authorLarry Hajali <larryhaja@gmail.com>2017-01-28 15:56:53 -0800
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-02-04 06:59:44 +0700
commit88e5c3126b2c3d5357b6343ac56d19b339c25a9b (patch)
tree583cf87a646f9685cc206f8d8ae6fb7b3d2ca077 /libraries/podofo
parentced02387b46708d56d0caf54cd70478a79faab42 (diff)
downloadslackbuilds-88e5c3126b2c3d5357b6343ac56d19b339c25a9b.tar.gz
libraries/podofo: fix building against cppunit on x86
Signed-off-by: Larry Hajali <larryhaja[at]gmail[dot]com>
Diffstat (limited to 'libraries/podofo')
-rw-r--r--libraries/podofo/podofo-0.9.4_build.patch12
-rw-r--r--libraries/podofo/podofo.SlackBuild14
2 files changed, 19 insertions, 7 deletions
diff --git a/libraries/podofo/podofo-0.9.4_build.patch b/libraries/podofo/podofo-0.9.4_build.patch
new file mode 100644
index 0000000000..3c4b72a751
--- /dev/null
+++ b/libraries/podofo/podofo-0.9.4_build.patch
@@ -0,0 +1,12 @@
+diff -rupN podofo-0.9.4/test/unit/EncryptTest.h podofo-0.9.4-new/test/unit/EncryptTest.h
+--- podofo-0.9.4/test/unit/EncryptTest.h 2012-12-12 23:55:46.000000000 +0100
++++ podofo-0.9.4-new/test/unit/EncryptTest.h 2016-09-18 10:41:30.476635230 +0200
+@@ -83,7 +83,7 @@ class EncryptTest : public CppUnit::Test
+
+ private:
+ char* m_pEncBuffer;
+- long m_lLen;
++ PoDoFo::pdf_long m_lLen;
+ int m_protection;
+
+ };
diff --git a/libraries/podofo/podofo.SlackBuild b/libraries/podofo/podofo.SlackBuild
index fbc03df177..00c65076c7 100644
--- a/libraries/podofo/podofo.SlackBuild
+++ b/libraries/podofo/podofo.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for podofo
-# Copyright 2009-2016 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2009-2017 Larry Hajali <larryhaja[at]gmail[dot]com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
PRGNAM=podofo
VERSION=${VERSION:-0.9.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
CWD=$(pwd)
@@ -34,14 +34,14 @@ OUTPUT=${OUTPUT:-/tmp}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
fi
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX="FALSE"
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -71,8 +71,8 @@ find -L . \
# Fix mandir directory.
sed -i 's|share/man|man|' CMakeLists.txt
-# Don't compile unit tests on x86 with cppunit.
-sed -i 's|PODOFO_HAVE_CPPUNIT.*|PODOFO_HAVE_CPPUNIT OFF)|' CMakeLists.txt
+# Fix building podofo on x86 with cppunit.
+patch -p1 < $CWD/podofo-0.9.4_build.patch
mkdir build
cd build