summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-01-31 08:55:04 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-02-05 07:02:20 +0700
commit3a8ce1401be579284b266d3ae424e7b373bccc0a (patch)
treea12d167301f555436b64bfc0d82328be6542c3b0
parent0a9d87ea6125859379defddc91d104632dcb7687 (diff)
downloadslackbuilds-3a8ce1401be579284b266d3ae424e7b373bccc0a.tar.gz
python/pypoppler: Patched to fix building with latest poppler.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--python/pypoppler/patches/python-poppler-0.12.1-poppler-0.39.0-changes.patch20
-rw-r--r--python/pypoppler/pypoppler.SlackBuild15
2 files changed, 27 insertions, 8 deletions
diff --git a/python/pypoppler/patches/python-poppler-0.12.1-poppler-0.39.0-changes.patch b/python/pypoppler/patches/python-poppler-0.12.1-poppler-0.39.0-changes.patch
new file mode 100644
index 0000000000..53ae1dd70f
--- /dev/null
+++ b/python/pypoppler/patches/python-poppler-0.12.1-poppler-0.39.0-changes.patch
@@ -0,0 +1,20 @@
+--- poppler.defs 2009-09-27 16:07:59.000000000 +0700
++++ poppler.defs 2015-12-22 16:36:14.000000000 +0600
+@@ -579,16 +579,4 @@
+ )
+
+-(define-enum Orientation
+- (in-module "Poppler")
+- (c-name "PopplerOrientation")
+- (gtype-id "POPPLER_TYPE_ORIENTATION")
+- (values
+- '("portrait" "POPPLER_ORIENTATION_PORTRAIT")
+- '("landscape" "POPPLER_ORIENTATION_LANDSCAPE")
+- '("upsidedown" "POPPLER_ORIENTATION_UPSIDEDOWN")
+- '("seascape" "POPPLER_ORIENTATION_SEASCAPE")
+- )
+-)
+-
+ (define-enum PageTransitionType
+ (in-module "Poppler")
+
diff --git a/python/pypoppler/pypoppler.SlackBuild b/python/pypoppler/pypoppler.SlackBuild
index 4197b76fb4..25bb4768ed 100644
--- a/python/pypoppler/pypoppler.SlackBuild
+++ b/python/pypoppler/pypoppler.SlackBuild
@@ -42,16 +42,17 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Fix building with poppler 0.15+ and some upstream fixes.
patch -p0 < $CWD/patches/pypoppler-0.12.1-75_74.diff
patch -p0 < $CWD/patches/pypoppler-0.12.1-79_78.diff
patch -p0 < $CWD/patches/poppler0.15.0-changes.patch
patch -p1 < $CWD/patches/pypoppler-0.12.1-poppler-0.18.0-minimal-fix-revisited.patch
+patch -p0 < $CWD/patches/python-poppler-0.12.1-poppler-0.39.0-changes.patch
autoreconf -ivf
@@ -64,13 +65,11 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install DESTDIR=$PKG
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- AUTHORS ChangeLog COPYING INSTALL NEWS \
- $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog COPYING INSTALL NEWS $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install