Add patch from upstream to fix bug #387125. Thanks to Vladimir for the report and Fab for the link to the upstream patch. Possible endian issues still have to be sorted out.

Package-Manager: portage-2.1.10.41/cvs/Linux i686

4 files changed, 113 insertions, 5 deletions

diff --git a/app-text/epdfview/ChangeLog b/app-text/epdfview/ChangeLog
index ccadf1683671..d99837b8b012 100644
--- a/app-text/epdfview/ChangeLog
+++ b/app-text/epdfview/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/epdfview
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/ChangeLog,v 1.45 2012/01/28 12:57:29 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/ChangeLog,v 1.46 2012/01/28 13:32:56 billie Exp $
+
+*epdfview-0.1.8-r1 (28 Jan 2012)
+
+  28 Jan 2012; Daniel Pielmeier <billie@gentoo.org> +epdfview-0.1.8-r1.ebuild,
+  +files/epdfview-0.1.8-swap-blue-red-channels.patch:
+  Add patch from upstream to fix bug #387125. Thanks to Vladimir for the report
+  and Fab for the link to the upstream patch. Possible endian issues still have
+  to be sorted out.
 
   28 Jan 2012; Daniel Pielmeier <billie@gentoo.org>
   -files/epdfview-0.1.7-mouse-scrolling.patch,
diff --git a/app-text/epdfview/Manifest b/app-text/epdfview/Manifest
index a07867ae3594..a398be309dea 100644
--- a/app-text/epdfview/Manifest
+++ b/app-text/epdfview/Manifest
@@ -3,16 +3,18 @@ Hash: SHA256
 
 AUX epdfview-0.1.6-gcc-4.3.patch 461 RMD160 762e02e1ec8362ec3d02ea9f66a6cd2754996b80 SHA1 31a379f94acd69ee475a718b011aaf559a5a4b55 SHA256 811b7f3226507594407e93c4509a6e4cf57a3d0d9f7caaf2f111d781e1892ae2
 AUX epdfview-0.1.6-print-segfault.patch 4188 RMD160 1688d3fc61e6f980be79c52cbf80c399d7f583f7 SHA1 04dbf1ebb27279446980a22f276553fc71f18772 SHA256 cd23bc65d175a6757eab6d5eb854ddd8c39d69bc959ba6fc7dbc27a3415b7472
+AUX epdfview-0.1.8-swap-blue-red-channels.patch 1080 RMD160 774c27c620f751c58cd30261e5c74ce60056091e SHA1 8ae50eddb4c44efb1c8e7317a8e6f394f564aeec SHA256 5e507f076728e96065640b8f3e65f9f4c46389dee7795540c493d70052a4698f
 DIST epdfview-0.1.6.tar.bz2 406037 RMD160 69484cd68c1d344dfc38d321abd1e07fd22521e3 SHA1 1bb3a1d85b1d5b13c24a38c144910ddc329e0f0e SHA256 61d041afc953e0570ddae934179e92edf800f69f043d78058073806504e4137f
 DIST epdfview-0.1.8.tar.bz2 466270 RMD160 f9444fe278863fdbb545543957a8777e1129ffed SHA1 72da8958f58cf7ec55b55541f2e67895b402df3f SHA256 948648ae7c9d7b3b408d738bd4f48d87375b1196cae1129d6b846a8de0f2f8f0
 EBUILD epdfview-0.1.6-r1.ebuild 1108 RMD160 a813a18445b1c17cf475e6144208bc7236a62272 SHA1 ad179989765f3ed7f61cd0c9f1a61d39e3a54697 SHA256 590131dcd86376f829fc2769a1d5068d03788408c9272885177a7a150bbbc2fe
+EBUILD epdfview-0.1.8-r1.ebuild 1426 RMD160 cc675fe45ac52164b72edd0e3713ca4d2fa01ab0 SHA1 93757e5528bb9d9251420ba566d4116e41bb142a SHA256 e6bc08173ae51d2f8fe6300152cd31d7b3db2ec9c12e1f5ed08fd62fe22c5d8d
 EBUILD epdfview-0.1.8.ebuild 1361 RMD160 bd08d373508f88f83baad9f5caa6a68964a32471 SHA1 bd961b0fe0ce9c0a51689ada7fd7e46d969bd9f3 SHA256 b9ea8605bfcfcddc05956a1fb23732c5c9197f2bf5115d2d472d1519292408cf
-MISC ChangeLog 6545 RMD160 723290d993a1f8180c74858f792e6004cd4e72ff SHA1 86258a51635ab85fe310a1e552d8a5eaa1cdf164 SHA256 2ae59c2c9df2b1dd79d389fbd184ded3d1ce926caf7437ca543d15243f7fb729
+MISC ChangeLog 6893 RMD160 e8caebc722b191f2bcc2200bb2269f3642f33ec0 SHA1 2c55cff2c8cb4c07b30d7ec584c3dca49e53bbd4 SHA256 d7347b5fe1a65d186fc1619fdc11816a4bd22be747c632bd8e102f5ed696f4e0
 MISC metadata.xml 265 RMD160 d7e4cf4b35ae81674f74bf9e2741412c567f28f4 SHA1 99de2c8a540aaa29d8dd9215421fdaebfcb869f3 SHA256 aa9b894f58fc3b2b4abeed853a80e39630d17eb7731f37dba676f9b163c86bbe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk8j8MIACgkQlcuUeyFa0U1wTwCgysd1oQk6YIaYOXxzx63//kQC
-ljcAmgN7osfx0fOwKEByw6UZ1UySHf11
-=ZzG3
+iEYEAREIAAYFAk8j+Q4ACgkQlcuUeyFa0U0frwCdE/u4ymX2YjDGNmtTRMzCVXdG
+rmIAnjxR7xgeg8EX3ammdbRJRlf1nAKi
+=VSEu
 -----END PGP SIGNATURE-----
diff --git a/app-text/epdfview/epdfview-0.1.8-r1.ebuild b/app-text/epdfview/epdfview-0.1.8-r1.ebuild
new file mode 100644
index 000000000000..d3a5a1d1d145
--- /dev/null
+++ b/app-text/epdfview/epdfview-0.1.8-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/epdfview-0.1.8-r1.ebuild,v 1.1 2012/01/28 13:32:56 billie Exp $
+
+EAPI=4
+inherit eutils fdo-mime
+
+DESCRIPTION="Lightweight PDF viewer using Poppler and GTK+ libraries."
+HOMEPAGE="http://trac.emma-soft.com/epdfview/"
+SRC_URI="http://trac.emma-soft.com/epdfview/chrome/site/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="cups nls test"
+
+RDEPEND=">=app-text/poppler-0.12.3-r3[cairo]
+	>=x11-libs/pango-1.28.4
+	>=x11-libs/gtk+-2.6:2
+	cups? ( >=net-print/cups-1.1 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( dev-util/cppunit )
+	userland_GNU? ( >=sys-apps/findutils-4.4 )"
+
+RESTRICT="test"
+
+src_prepare() {
+	sed -i \
+		-e 's:Icon=icon_epdfview-48:Icon=epdfview:' \
+		data/epdfview.desktop || die
+	epatch "${FILESDIR}/${P}-swap-blue-red-channels.patch"
+}
+
+src_configure() {
+	econf $(use_with cups) \
+		$(use_enable nls)
+}
+
+src_install() {
+	default
+
+	local res
+	for res in 24 32 48; do
+		insinto /usr/share/icons/hicolor/${res}x${res}/apps
+		newins data/icon_epdfview-${res}.png epdfview.png || die
+	done
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/app-text/epdfview/files/epdfview-0.1.8-swap-blue-red-channels.patch b/app-text/epdfview/files/epdfview-0.1.8-swap-blue-red-channels.patch
new file mode 100644
index 000000000000..c57a5eff923a
--- /dev/null
+++ b/app-text/epdfview/files/epdfview-0.1.8-swap-blue-red-channels.patch
@@ -0,0 +1,39 @@
+Index: /trunk/src/PDFDocument.cxx

+===================================================================

+--- /trunk/src/PDFDocument.cxx	(revision 361)

++++ /trunk/src/PDFDocument.cxx	(revision 367)

+@@ -21,4 +21,5 @@

+ #include <poppler.h>

+ #include <unistd.h>

++#include <algorithm>

+ #include "epdfview.h"

+ 

+@@ -33,4 +34,22 @@

+ static PageMode convertPageMode (gint pageMode);

+ static gchar *getAbsoluteFileName (const gchar *fileName);

++

++namespace

++{

++    void

++    convert_bgra_to_rgba (guint8 *data, int width, int height)

++    {

++        using std::swap;

++

++        for (int y = 0; y < height; y++)

++        {

++            for (int x = 0; x < width; x++)

++            {

++                swap(data[0], data[2]);

++                data += 4;

++            }

++        }

++    }

++}

+ 

+ ///

+@@ -651,4 +670,5 @@

+         cairo_destroy(context);

+         cairo_surface_destroy (surface);

++        convert_bgra_to_rgba(renderedPage->getData (), width, height);

+ #else // !HAVE_POPPLER_0_17_0

+         // Create the pixbuf from the data and render to it.