summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--python/pypoppler/patches/pypoppler-0.12.1-76_75.diff66
-rw-r--r--python/pypoppler/pypoppler.SlackBuild6
-rw-r--r--python/pypoppler/pypoppler.info2
3 files changed, 4 insertions, 70 deletions
diff --git a/python/pypoppler/patches/pypoppler-0.12.1-76_75.diff b/python/pypoppler/patches/pypoppler-0.12.1-76_75.diff
deleted file mode 100644
index 94f4543e87..0000000000
--- a/python/pypoppler/patches/pypoppler-0.12.1-76_75.diff
+++ /dev/null
@@ -1,66 +0,0 @@
---- poppler.override
-+++ poppler.override
-@@ -600,3 +600,62 @@
- return PycairoSurface_FromSurface(surface, NULL, NULL);
- #endif
- }
-+%%
-+override poppler_page_render_to_pixbuf kwargs
-+static PyObject *
-+_wrap_poppler_page_render_to_pixbuf(PyGObject *self,
-+ PyObject *args,
-+ PyObject *kwargs)
-+{
-+ static char *kwlist[] = { "src_x", "src_y", "src_width",
-+ "src_height", "scale", "rotation", NULL };
-+ int src_x, src_y, src_width, src_height, rotation;
-+ double scale;
-+ GdkPixbuf *pixbuf = NULL;
-+
-+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-+ "iiiidi:Poppler.Page.render_to_pixbuf",
-+ kwlist, &src_x, &src_y, &src_width,
-+ &src_height, &scale, &rotation))
-+ return NULL;
-+
-+ pyg_begin_allow_threads;
-+
-+ poppler_page_render_to_pixbuf(POPPLER_PAGE(self->obj), src_x, src_y,
-+ src_width, src_height, scale,
-+ rotation, pixbuf);
-+
-+ pyg_end_allow_threads;
-+
-+ return pygobject_new((GObject *)pixbuf);
-+}
-+%%
-+override poppler_page_render_to_pixbuf_for_printing kwargs
-+static PyObject *
-+_wrap_poppler_page_render_to_pixbuf_for_printing(PyGObject *self,
-+ PyObject *args,
-+ PyObject *kwargs)
-+{
-+ static char *kwlist[] = { "src_x", "src_y", "src_width",
-+ "src_height", "scale", "rotation", NULL };
-+ int src_x, src_y, src_width, src_height, rotation;
-+ double scale;
-+ GdkPixbuf *pixbuf = NULL;
-+
-+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-+ "iiiidi:Poppler.Page.render_to_pixbuf_for_printing",
-+ kwlist, &src_x, &src_y, &src_width,
-+ &src_height, &scale, &rotation))
-+ return NULL;
-+
-+ pyg_begin_allow_threads;
-+
-+ poppler_page_render_to_pixbuf_for_printing(POPPLER_PAGE(self->obj),
-+ src_x, src_y, src_width,
-+ src_height, scale,
-+ rotation, pixbuf);
-+
-+ pyg_end_allow_threads;
-+
-+ return pygobject_new((GObject *)pixbuf);
-+}
-
diff --git a/python/pypoppler/pypoppler.SlackBuild b/python/pypoppler/pypoppler.SlackBuild
index 1d723c8e1e..5dd92b5553 100644
--- a/python/pypoppler/pypoppler.SlackBuild
+++ b/python/pypoppler/pypoppler.SlackBuild
@@ -6,7 +6,7 @@
PRGNAM=pypoppler
VERSION=0.12.1
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -30,7 +30,6 @@ elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
else
SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
fi
set -e
@@ -50,10 +49,11 @@ find . \
# 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-76_75.diff
patch -p0 < $CWD/patches/pypoppler-0.12.1-79_78.diff
patch -p0 < $CWD/patches/poppler0.15.0-changes.patch
+autoreconf -ivf
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/python/pypoppler/pypoppler.info b/python/pypoppler/pypoppler.info
index 56f9468c84..c38ebc8cf0 100644
--- a/python/pypoppler/pypoppler.info
+++ b/python/pypoppler/pypoppler.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Larry Hajali"
EMAIL="larryhaja[at]gmail[dot]com"
-APPROVED="dsomero"
+APPROVED="rworkman"