diff options
author | 2012-02-29 23:54:21 +0000 | |
---|---|---|
committer | 2012-02-29 23:54:21 +0000 | |
commit | 0dc230d9b8bceaaa016115b4f0d08fcd37995100 (patch) | |
tree | e5c483e9b2206117ec7c13ee73ad5dfa05a18194 /app-text/pdfshuffler | |
parent | Use new standardized tarballs. (diff) | |
download | gentoo-2-0dc230d9b8bceaaa016115b4f0d08fcd37995100.tar.gz gentoo-2-0dc230d9b8bceaaa016115b4f0d08fcd37995100.tar.bz2 gentoo-2-0dc230d9b8bceaaa016115b4f0d08fcd37995100.zip |
Add a patch to work with poppler >= 0.18, based on a patch by Rafał Mużyło in bug #390607.
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
Diffstat (limited to 'app-text/pdfshuffler')
-rw-r--r-- | app-text/pdfshuffler/ChangeLog | 12 | ||||
-rw-r--r-- | app-text/pdfshuffler/files/pdfshuffler-poppler-0.18.patch | 45 | ||||
-rw-r--r-- | app-text/pdfshuffler/pdfshuffler-0.5.1-r1.ebuild | 52 | ||||
-rw-r--r-- | app-text/pdfshuffler/pdfshuffler-0.5.1.ebuild | 6 |
4 files changed, 110 insertions, 5 deletions
diff --git a/app-text/pdfshuffler/ChangeLog b/app-text/pdfshuffler/ChangeLog index 5cfc7921a5ef..986a842dc587 100644 --- a/app-text/pdfshuffler/ChangeLog +++ b/app-text/pdfshuffler/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-text/pdfshuffler -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/pdfshuffler/ChangeLog,v 1.9 2011/11/24 12:36:03 pacho Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/pdfshuffler/ChangeLog,v 1.10 2012/02/29 23:54:21 marienz Exp $ + +*pdfshuffler-0.5.1-r1 (29 Feb 2012) + + 29 Feb 2012; Marien Zwart <marienz@gentoo.org> + +files/pdfshuffler-poppler-0.18.patch, +pdfshuffler-0.5.1-r1.ebuild, + pdfshuffler-0.5.1.ebuild: + Add a patch to work with poppler >= 0.18, based on a patch by Rafał Mużyło in + bug #390607. 24 Nov 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml: Drop maintainer due retirement, bug #220219 diff --git a/app-text/pdfshuffler/files/pdfshuffler-poppler-0.18.patch b/app-text/pdfshuffler/files/pdfshuffler-poppler-0.18.patch new file mode 100644 index 000000000000..98bc637241fc --- /dev/null +++ b/app-text/pdfshuffler/files/pdfshuffler-poppler-0.18.patch @@ -0,0 +1,45 @@ +Stop using render_to_pixbuf, removed from Poppler 0.18. + +Instead draw to a gdk Pixmap, then get a Pixbuf from that. + +A more complete fix (dropping Pixmap/Pixbuf usage) is in upstream svn, +but that is too large a change for us to take. + +Based on a patch from Rafał Mużyło in gentoo bug #390607. +--- pdfshuffler ++++ pdfshuffler +@@ -982,9 +982,15 @@ + pix_w, pix_h = page.get_size() + pix_w = int(pix_w * self.scale) + pix_h = int(pix_h * self.scale) +- thumbnail = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, False, +- 8, pix_w , pix_h) +- page.render_to_pixbuf(0,0,pix_w,pix_h,self.scale,0,thumbnail) ++ pixmap = gtk.gdk.Pixmap(None, pix_w, pix_h, 24) ++ cr = pixmap.cairo_create() ++ # The pixmap data is not initialized, so paint it white first: ++ cr.set_source_rgb(1, 1, 1) ++ cr.paint() ++ cr.scale(self.scale, self.scale) ++ page.render(cr) ++ thumbnail = gtk.gdk.pixbuf_get_from_drawable( ++ None, pixmap, gtk.gdk.colormap_get_system(), 0, 0, 0, 0, pix_w, pix_h) + rotation = (-rotation) % 360 + rotation = ((rotation + 45) / 90) * 90 + thumbnail = thumbnail.rotate_simple(rotation) +@@ -1003,11 +1009,13 @@ + pix_w = thumbnail.get_width() + pix_h = thumbnail.get_height() + except: ++ import traceback ++ traceback.print_exc() + pix_w = self.default_width + pix_h = pix_w + thumbnail = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, False, + 8, pix_w, pix_h) +- pixbuf.fill(0xffffffff) ++ thumbnail.fill(0xffffffff) + + #add border + thickness = 3 + diff --git a/app-text/pdfshuffler/pdfshuffler-0.5.1-r1.ebuild b/app-text/pdfshuffler/pdfshuffler-0.5.1-r1.ebuild new file mode 100644 index 000000000000..534e620340fe --- /dev/null +++ b/app-text/pdfshuffler/pdfshuffler-0.5.1-r1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/pdfshuffler/pdfshuffler-0.5.1-r1.ebuild,v 1.1 2012/02/29 23:54:20 marienz Exp $ + +EAPI="3" +PYTHON_DEPEND="2" + +inherit distutils eutils fdo-mime gnome2-utils + +DESCRIPTION="PDF-Shuffler is GUI app that can merge or split pdfs and rotate, crop and rearrange their pages." +HOMEPAGE="http://sourceforge.net/projects/pdfshuffler/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="dev-python/pyPdf + dev-python/python-poppler" +RDEPEND="${DEPEND}" + +DOCS="ChangeLog README TODO AUTHORS" + +pkg_setup() { + python_set_active_version 2 + python_pkg_setup +} + +src_prepare() { + distutils_src_prepare + + epatch "${FILESDIR}/pdfshuffler-poppler-0.18.patch" +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + distutils_pkg_postinst + fdo-mime_desktop_database_update + fdo-mime_mime_database_update + gnome2_icon_cache_update +} + +pkg_postrm() { + distutils_pkg_postrm + fdo-mime_desktop_database_update + fdo-mime_mime_database_update + gnome2_icon_cache_update +} diff --git a/app-text/pdfshuffler/pdfshuffler-0.5.1.ebuild b/app-text/pdfshuffler/pdfshuffler-0.5.1.ebuild index 7f254f611e05..9431aa069b03 100644 --- a/app-text/pdfshuffler/pdfshuffler-0.5.1.ebuild +++ b/app-text/pdfshuffler/pdfshuffler-0.5.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/pdfshuffler/pdfshuffler-0.5.1.ebuild,v 1.3 2011/02/10 23:05:18 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/pdfshuffler/pdfshuffler-0.5.1.ebuild,v 1.4 2012/02/29 23:54:20 marienz Exp $ EAPI="3" PYTHON_DEPEND="2" @@ -17,7 +17,7 @@ KEYWORDS="amd64 x86" IUSE="" DEPEND="dev-python/pyPdf - dev-python/python-poppler" + <=dev-python/python-poppler-0.12.1-r2" RDEPEND="${DEPEND}" DOCS="ChangeLog README TODO AUTHORS" |