ipe: update to 7.2.8.

This commit is contained in:
Leah Neukirchen 2019-01-11 16:08:56 +01:00
parent f8dd376d85
commit 734460fe27
5 changed files with 6 additions and 86 deletions

View file

@ -1,26 +0,0 @@
From 273130194cff3fafcd29ca96ceab20be3fcceb0a Mon Sep 17 00:00:00 2001
From: Otfried Cheong <otfried@ipe.airpost.net>
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;
}

View file

@ -1,28 +0,0 @@
Poppler-0.72 replaced getCString with c_str
diff --git a/ipe-tools/pdftoipe/pdftoipe.cpp b/ipe-tools/pdftoipe/pdftoipe.cpp
index b1b8562..f62cced 100644
--- ipe-tools/pdftoipe/pdftoipe.cpp
+++ ipe-tools/pdftoipe/pdftoipe.cpp
@@ -108,9 +108,9 @@ int main(int argc, char *argv[])
if (argc == 3) {
xmlFileName = new GooString(argv[2]);
} else {
- char *p = fileName->getCString() + fileName->getLength() - 4;
+ char *p = fileName->c_str() + fileName->getLength() - 4;
if (!strcmp(p, ".pdf") || !strcmp(p, ".PDF")) {
- xmlFileName = new GooString(fileName->getCString(),
+ xmlFileName = new GooString(fileName->c_str(),
fileName->getLength() - 4);
} else {
xmlFileName = fileName->copy();
@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
// write XML file
XmlOutputDev *xmlOut =
- new XmlOutputDev(xmlFileName->getCString(), doc->getXRef(),
+ new XmlOutputDev(xmlFileName->c_str(), doc->getXRef(),
doc->getCatalog(), firstPage, lastPage);
// tell output device about text handling

View file

@ -1,27 +0,0 @@
diff --git a/ipe-tools/pdftoipe/parseargs.h b/ipe-tools/pdftoipe/parseargs.h
index 8530bd1..bf87418 100644
--- ipe-tools/pdftoipe/parseargs.h
+++ ipe-tools/pdftoipe/parseargs.h
@@ -27,8 +27,6 @@
extern "C" {
#endif
-#include "goo/gtypes.h"
-
/*
* Argument kinds.
*/
diff --git a/ipe-tools/pdftoipe/xmloutputdev.cpp b/ipe-tools/pdftoipe/xmloutputdev.cpp
index 3c38f2e..7186437 100644
--- ipe-tools/pdftoipe/xmloutputdev.cpp
+++ ipe-tools/pdftoipe/xmloutputdev.cpp
@@ -330,7 +330,7 @@ void XmlOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
finishText();
ImageStream *imgStr;
- Guchar *p;
+ unsigned char *p;
GfxRGB rgb;
int x, y;
int c;

View file

@ -1,8 +1,8 @@
# Template file for 'ipe'
pkgname=ipe
version=7.2.7
revision=15
_tools_commit=e5b23399a83d69fd5bb5d4645ef7325b4b57435b
version=7.2.8
revision=1
_tools_commit=f016c85fd3a7ef11241685c8e0d81ab455c7e119
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"
@ -11,8 +11,8 @@ license="GPL-3, GPL-2"
homepage="http://ipe.otfried.org/"
distfiles="http://dl.bintray.com/otfried/generic/ipe/${version%.*}/${pkgname}-${version}-src.tar.gz
https://github.com/otfried/ipe-tools/archive/${_tools_commit}.tar.gz"
checksum="d66d3f2619e3e6ff617f42c2e3695c3db6e2a64adcc3d7613214e5fd14c49f22
60a96ad4674fc8f3c2d8bd8ab789734dbb47cabed09a178f595b0e478a526442"
checksum="fe0927db42c97133d8368f59114fa1e904692be5330c14244bbbb997fb1b33d7
75b2763f8aa0ed6ecdd80584f12be31483a289ff53d65f48ed3f0e7e1c71f57a"
XBPS_FETCH_CMD=wget # nothing else speaks with that terrible crappy host
CXXFLAGS="-fpermissive"

1
srcpkgs/ipe/update Normal file
View file

@ -0,0 +1 @@
ignore='*.*.*.*'