diff options
author | Marien Zwart <marienz@gentoo.org> | 2012-02-29 23:54:21 +0000 |
---|---|---|
committer | Marien Zwart <marienz@gentoo.org> | 2012-02-29 23:54:21 +0000 |
commit | c5f7c1d1586dc5102abc9e20b20f3b0db086069f (patch) | |
tree | e1ce7d7672949c220c665508fed262498946522a /app-text | |
parent | Use new standardized tarballs. (diff) | |
download | historical-c5f7c1d1586dc5102abc9e20b20f3b0db086069f.tar.gz historical-c5f7c1d1586dc5102abc9e20b20f3b0db086069f.tar.bz2 historical-c5f7c1d1586dc5102abc9e20b20f3b0db086069f.zip |
Add a patch to work with poppler >= 0.18, based on a patch by Rafał Mużyło in bug #390607.
Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64
Diffstat (limited to 'app-text')
-rw-r--r-- | app-text/pdfshuffler/ChangeLog | 12 | ||||
-rw-r--r-- | app-text/pdfshuffler/Manifest | 16 | ||||
-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 |
5 files changed, 119 insertions, 12 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/Manifest b/app-text/pdfshuffler/Manifest index b0c85495beed..2c36af2e1758 100644 --- a/app-text/pdfshuffler/Manifest +++ b/app-text/pdfshuffler/Manifest @@ -1,14 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 +AUX pdfshuffler-poppler-0.18.patch 1824 RMD160 85f48d4dccfb971a4934e68dfd6b175a6d47bab9 SHA1 0a477c65b729c413985a07c3adfdee5aaa46ce60 SHA256 8aea6ca6ed6e53d1942712afceffbba7e24479bc4bc728120e681c287c398f4e DIST pdfshuffler-0.5.1.tar.gz 39538 RMD160 52f5a92e23fa2b7d628005c98d5118b7167ba26b SHA1 cd5db1a087c9d8a304bfc21d380a1d6c4fc61b4b SHA256 7dfd1b7f23044848b69bccf0b9cf01e39c454c0c284a4345b3f1e54e69e2ce0c -EBUILD pdfshuffler-0.5.1.ebuild 1053 RMD160 2ac976e65576a6eb3f5fe5f8e15e54a1accc466f SHA1 9fba1d91012a9e0e59bfdd6670ef40f11bb0eb1f SHA256 c936f7b5a0348b9d60109949c28e54f47f2bb7c644ad822a58fb5b5cdea00141 -MISC ChangeLog 1351 RMD160 1580afa845c9f9f3768130898e77e41ae95b8896 SHA1 c2c9e05042c7697ee870ea22ba56b92c2b30d8a8 SHA256 4c535c210a5644a5cffef00fadddcc11bf18a2506a289c03d414d262c4032c49 +EBUILD pdfshuffler-0.5.1-r1.ebuild 1160 RMD160 4d501ad95ef3b04871f8f93355fd63b5f50597e3 SHA1 4e418ced9a2191f730ccafac263d7176500d55c9 SHA256 ac1eafcfbe4a9f740328880294447ce38a3ab500d9ec992d1ea18611ee54efd9 +EBUILD pdfshuffler-0.5.1.ebuild 1064 RMD160 26f66939c96d0472e5674e2bdb69b13cedcc7016 SHA1 27c82795d80862f2012c28756b0b5968543be72f SHA256 c0a1fcc77ce6d9da7e4abc3119c11f859d25407e7b19a2a798d9c7acf06064fa +MISC ChangeLog 1638 RMD160 caf381640654c7829a84fbd16dbf76a282e6271e SHA1 1aea31595c3554279fa0605abf673593182ff2f4 SHA256 813e4ffc60fb1aa26e824823233f17163ea197a4ea6b3eeeb30f8c021a4f80a7 MISC metadata.xml 214 RMD160 ea476e10a778f79d9273adbbc2403db67d025e10 SHA1 7f156558998e184ab8ea7417fd4739048f012a09 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk7OOjgACgkQCaWpQKGI+9RXZgCfeQsGqKrnAGcHn9Vf222PNhsR -o9YAnjm0H6BgacLUvGt6QdwZt55ErBje -=l/nv +iF4EAREIAAYFAk9OuroACgkQpnr2roL0g0ksDQD9EyNk9fWryug45TYciFtcykIU +/bqEZV6N7Z5qFmWywzABAI3vffMwmyr2wJbzKb5RalEka4U6TRbPHy6AAsDUFHZh +=11O6 -----END PGP SIGNATURE----- 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" |