diff options
| author | Larry Hajali <larryhaja[at]gmail[dot]com> | 2011-07-28 00:25:26 -0500 |
|---|---|---|
| committer | Niels Horn <niels.horn@slackbuilds.org> | 2011-08-11 20:28:36 -0300 |
| commit | 9c7d60c1796d966dfa17a0021e725ba5b4460390 (patch) | |
| tree | 1b5ed996bb98af29b1715feab7d8d8ee16e80a8f | |
| parent | 977a5c53391d7193842448a3afa017120f8ef1f4 (diff) | |
python/pypoppler: Reverted pypoppler-0.12.1-76_75.diff
Removed patch "pypoppler-0.12.1-76_75.diff" due to issues
displaying PDF files in pdfshuffler.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
| -rw-r--r-- | python/pypoppler/patches/pypoppler-0.12.1-76_75.diff | 66 | ||||
| -rw-r--r-- | python/pypoppler/pypoppler.SlackBuild | 6 | ||||
| -rw-r--r-- | python/pypoppler/pypoppler.info | 2 |
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 94f4543e87ec5..0000000000000 --- 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 1d723c8e1e60a..5dd92b55539b7 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 56f9468c84adf..c38ebc8cf0495 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" |