From deca3a5ed295a9b837c0ca5a0a03a384926f63f6 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 6 Nov 2018 11:01:04 -0200 Subject: [PATCH] ipe: rebuild against libpoppler.so.82 [ci skip] --- srcpkgs/ipe/patches/poppler-069.patch | 26 ++++++++++++++++++++++++++ srcpkgs/ipe/template | 9 +++++++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/ipe/patches/poppler-069.patch diff --git a/srcpkgs/ipe/patches/poppler-069.patch b/srcpkgs/ipe/patches/poppler-069.patch new file mode 100644 index 00000000000..88ee966136d --- /dev/null +++ b/srcpkgs/ipe/patches/poppler-069.patch @@ -0,0 +1,26 @@ +From 273130194cff3fafcd29ca96ceab20be3fcceb0a Mon Sep 17 00:00:00 2001 +From: Otfried Cheong +Date: Mon, 24 Sep 2018 14:29:34 +0200 +Subject: [PATCH] Remove Object::memCheck (bug #29) + +--- + pdftoipe/pdftoipe.cpp | 4 ---- + pdftoipe/readme.txt | 4 ++++ + pdftoipe/xmloutputdev.h | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/pdftoipe/pdftoipe.cpp b/pdftoipe/pdftoipe.cpp +index 1f02755..a95ad6e 100644 +--- ipe-tools/pdftoipe/pdftoipe.cpp ++++ ipe-tools/pdftoipe/pdftoipe.cpp +@@ -156,10 +156,6 @@ int main(int argc, char *argv[]) + delete doc; + delete globalParams; + +- // check for memory leaks +- Object::memCheck(stderr); +- gMemReport(stderr); +- + return exitCode; + } + diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template index 3e8196b4183..2f2bbf0e004 100644 --- a/srcpkgs/ipe/template +++ b/srcpkgs/ipe/template @@ -1,12 +1,12 @@ # Template file for 'ipe' pkgname=ipe version=7.2.7 -revision=12 +revision=13 _tools_commit=e5b23399a83d69fd5bb5d4645ef7325b4b57435b hostmakedepends="pkg-config qt5-qmake qt5-tools qt5-host-tools wget" makedepends="qt5-devel lua52-devel libjpeg-turbo-devel cairo-devel poppler-devel" short_desc="Drawing editor for creating figures in PDF or EPS formats" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="GPL-3, GPL-2" homepage="http://ipe.otfried.org/" distfiles="http://dl.bintray.com/otfried/generic/ipe/${version%.*}/${pkgname}-${version}-src.tar.gz @@ -15,11 +15,16 @@ checksum="d66d3f2619e3e6ff617f42c2e3695c3db6e2a64adcc3d7613214e5fd14c49f22 60a96ad4674fc8f3c2d8bd8ab789734dbb47cabed09a178f595b0e478a526442" XBPS_FETCH_CMD=wget # nothing else speaks with that terrible crappy host +CXXFLAGS="-fpermissive" + post_extract() { mv $XBPS_BUILDDIR/ipe-tools* ipe-tools sed -i 's/xlocale.h/locale.h/g' src/ipelib/ipeplatform.cpp sed -i '/cstdio/i#include ' src/include/ipebase.h + find . -type f | xargs sed -e 's|gTrue|true|g' -e 's|gFalse|false|g' -e 's|GBool|bool|g' -i + + } do_build() {