added patch for poppler-0.16, bug #349941

Package-Manager: portage-2.2.0_alpha10/cvs/Linux x86_64

4 files changed, 39 insertions, 19 deletions

diff --git a/app-text/zathura/ChangeLog b/app-text/zathura/ChangeLog
index f9a6740774d2..211149fceb55 100644
--- a/app-text/zathura/ChangeLog
+++ b/app-text/zathura/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/zathura
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/ChangeLog,v 1.13 2010/12/30 12:10:51 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/ChangeLog,v 1.14 2010/12/30 17:42:10 wired Exp $
+
+  30 Dec 2010; Alex Alexander <wired@gentoo.org> zathura-0.0.8.2.ebuild,
+  +files/zathura-poppler-0.16.patch:
+  added patch for poppler-0.16, bug #349941
 
   30 Dec 2010; Alex Alexander <wired@gentoo.org> zathura-0.0.7.ebuild,
   zathura-0.0.8.ebuild, zathura-0.0.8.1.ebuild, zathura-0.0.8.2.ebuild:
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 75c5b6654a7d..572b9a200202 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,30 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX zathura-poppler-0.16.patch 611 RMD160 ccfc1534fb74a3e0e7c8cc5b3715b7a7c0b01d50 SHA1 262d60cb5b4218c3ecaa354db88650d016a4b202 SHA256 716f2d89a097425f282964ba5c735b9b11a3dd36bbb40ebd5a8620686e75fdd0
 DIST zathura-0.0.7.tar.gz 30462 RMD160 25bf911286c331a69ddb7eba43b720a9d92e2408 SHA1 89a5216f00b9d6b4581046e82de108081aa87bee SHA256 8834659633210f6cdf13b62b3b6dac83e6cace41084a6ec8b7124706e783b8bb
 DIST zathura-0.0.8.1.tar.gz 31833 RMD160 0cfbb3d0378f497ed2bb382937a90335e92d32d6 SHA1 dda094bcb4a105ce2c6af0d2b5674e924259e539 SHA256 33c5e4344dbecbbcfdba0041ffa68b889a22eafe6ee9c45e390c0e0389e8cfad
 DIST zathura-0.0.8.2.tar.gz 33732 RMD160 ff24cdb9b7157b8b614555294c8b6db3fae45743 SHA1 1abf051341588ab1df30aaf57566b9d8d03f28f7 SHA256 c08472d0386875655c58677e2b099cdbd32396a2934b00d0325ab7ab6f610a95
 DIST zathura-0.0.8.tar.gz 32056 RMD160 0a4bde8d872b07db2ad5500c21f0250aabc7e160 SHA1 573f392bd367d7860888d8b67ad31098eb7afd59 SHA256 597527db0de5f09032b56bc11719c31d085e0e8718206eac514893919811cfff
 EBUILD zathura-0.0.7.ebuild 904 RMD160 18619ce4b9f3b908c4af458b52655da03fd4d69e SHA1 a2e0a514f23c59ee9d3f420b8cb98b27a78d28a9 SHA256 b008d98acb84277070b1e7d5f46bd05bcf71f06388c06bc57ffcbe2c06981a56
 EBUILD zathura-0.0.8.1.ebuild 905 RMD160 7bd335b1113846520c3e00be0821d86c14a76710 SHA1 62b13e262b117e58ae7ed066a3cc1b01b11ffd66 SHA256 5309701289998eb060fb3226c3a30dd624d5e65d51c7674c211a8ae8d9a54599
-EBUILD zathura-0.0.8.2.ebuild 907 RMD160 21f4bad05c2f0fd9484024f907de83bb0686d048 SHA1 cfdecc323ad260fc5831ed41f18780a378b6a858 SHA256 65a680e2ec8925dd64ba5cb4cb9114b983b7058eb2ddb4d286c35a65a6b36704
+EBUILD zathura-0.0.8.2.ebuild 991 RMD160 47ca73d8fff13e6555a5115daf70e014437b8720 SHA1 4c4e9d8f2a85ddc765281fd99b0ef869e2cb095d SHA256 6b0aaa44a3484d062993d1f5ffafe8e3a57180783a364cf9a93f3ee7143bf243
 EBUILD zathura-0.0.8.ebuild 904 RMD160 10f5f113982743f8dd80a083aa1a1eafa57a0f59 SHA1 8e980742c1027dc3247f8e30f7ee9cb5056668c2 SHA256 b6e754ffb8cea7cf173d2ff9b636ddb2cde22c2b3382dc0963311fa24e102b30
-MISC ChangeLog 1866 RMD160 34b40af6ce8d3bb3d47831f529293076b6aae0f3 SHA1 ecbfd08cd27d88debac493cb60d78b015460089c SHA256 f24a8721ff8107354fd1f217ec147b1aa46b2f7191e01d6281b6fe4194fd833d
+MISC ChangeLog 2021 RMD160 bb0cef2130574a182438226cc6b51c14babd31b6 SHA1 b989af313d479d7b34d5374f1d23eea92c7dd75c SHA256 40aa50a255e5b6148b149f9e188614f2a556b8f189d423496860bb9f7a9e7b1a
 MISC metadata.xml 254 RMD160 ae9e57b327472fd0a6d800f5d163aaaddfec183a SHA1 cf0de64d0e1868e076aa6df7dba336f213ef68b1 SHA256 b0ede25b827152366223255430b88df994d433b9e127268423c3217bd325111d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNHHc7AAoJEDZF8K7rm0r6nxQP/RL9uQrZRYFvAoFSqih8aZAs
-I+budGftOjaCvpLOxpWOOfLsViqfgH8DKA/4NPABfmeIcNI1bMSUNFFo/n8TtPPz
-PtGsEEqnHLEwn8ntqPJTW+qVQkipmCRJE7X96MQlQkMinBnELUGKlkytFvkJ4vAK
-ipEUGyCxL+nFpfhavaTMunn0cLZv7uJre1QZYzgBzRvhbJm4+2IKWnOa/UYSkGqh
-ppU7WXWbfMh2WWrHIEDFIDZ3WMn+14GfoCMMZz88Pa/j1lC13Rn1vtjOtht3boRO
-8/lJ+2M0wksZmV16p6SHftQFTrLhbXzhooGGdAFk1fg1cuDO8beBTBmmDvzGotut
-bT581EI7ocv6YNvTtEMhj+0gae9QoSbNcYImfj8ZoKBHtj4udolk8GqxAxw4Ngip
-b5FI6l6FSnlvG0cgAs0vjdRzcfFUNwfAZ514SqP9piwXp6EJD5Qhj/OCUIr/YV8y
-rR9nHo+Ia1FKu3lzqTdng8oLOK2lwcppyf4YcWC93fWXPa65Qhw446OOmLxnpBbw
-0gMS/8P2TkJJYJyTw1nJNV/B4K6ymgkghUgpvAEhFB2UBANHeTaamYaQAHmbQAFt
-TmOCqtKIv6pjRkRu4dJ336vAkIYD3RRTbyKGztVhUuymjywQZrL1cqr9+nMAQXbo
-OkQZeqksbInBK4GBB19L
-=cCxt
+iQIcBAEBCAAGBQJNHMTpAAoJEDZF8K7rm0r64F4P/RNavvaF/i8wBBFOVdSXDhYF
+4+dtMV4oHy4Pc8C4HTsU6qu3jfkRj5hMM1Aq0hVuG3B6wpA0InZXvEZLK73wP2kD
+kdDE1apV3961dvntOicDY1aJ1M93hYfcfPEeBZx0vtMwZ4tODtDRqeFLIGub38vP
+UKwqjoMeCajO/rGJhJw9cTZIHZK4KC412cg6RdwJ6fWA90Dw6Zy4c0MUqOzN2ik0
+eQBzEUzqamkc62hhfDlJ/mO7M+7XuFOM1wLl22mKzZgcc4FKJ5nKKUvnfYiBPqSR
+rsQS2lCfjNcZzSH8IyjAuzGnzS/D+xev/SiJ04uPKbjRu4iYwKhEqCiKi1Ko4IHT
+9amwv9+FiEbhjBcURbAjFuS+XgCdgysGZaK4APdJ08ZX3ELkl/8499I1TNO+iYuf
+w5CuBEVu1Ongz884NW1mr35GGWaIA0jaeQ02ebrENNNXH0qrP/t5051+EQLQqu3D
+FA+flD9AdYTDpk3godlEWL6LsQvAJXre0/G5UmmqpWyMG3ZlInZwUcWsIaMhhpR3
+ViYiVZQETpi/7q9mL4SUvjgzAKn2TtlfMkynYTlib0AMQy+oICfetAQ1Uk8swvlt
+X3R/XOOAQ3rV6bT08tjsI8AXGue0FKW7b7EenB7cXZaN6uMRa7Tp5TApb5koxZMJ
+0871njjrf0g1n5DEE3wj
+=++wF
 -----END PGP SIGNATURE-----
diff --git a/app-text/zathura/files/zathura-poppler-0.16.patch b/app-text/zathura/files/zathura-poppler-0.16.patch
new file mode 100644
index 000000000000..79c22bb28851
--- /dev/null
+++ b/app-text/zathura/files/zathura-poppler-0.16.patch
@@ -0,0 +1,13 @@
+patch that fixes poppler-0.16 compatibility
+
+http://pkgs.fedoraproject.org/gitweb/?p=zathura.git;a=blob;f=zathura-0.0.8.1-poppler-0.15-fix.patch;h=1e586b3cca2be43c7f70c7c2532ea4b2371892e8;hb=master
+--- zathura-0.0.8.1/zathura.c.poppler15
++++ zathura-0.0.8.1/zathura.c
+@@ -4300,7 +4300,7 @@ cb_view_button_release(GtkWidget* widget
+ 
+   /* get selected text */
+   g_static_mutex_lock(&(Zathura.Lock.pdflib_lock));
+-  char* selected_text = poppler_page_get_text(
++  char* selected_text = poppler_page_get_selected_text(
+       Zathura.PDF.pages[Zathura.PDF.page_number]->page,SELECTION_STYLE,
+       &rectangle);
diff --git a/app-text/zathura/zathura-0.0.8.2.ebuild b/app-text/zathura/zathura-0.0.8.2.ebuild
index d791c51ab0d6..b71a09a5dc52 100644
--- a/app-text/zathura/zathura-0.0.8.2.ebuild
+++ b/app-text/zathura/zathura-0.0.8.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/zathura-0.0.8.2.ebuild,v 1.2 2010/12/30 12:10:51 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/zathura-0.0.8.2.ebuild,v 1.3 2010/12/30 17:42:10 wired Exp $
 
 EAPI=2
-inherit savedconfig toolchain-funcs
+inherit savedconfig toolchain-funcs eutils
 
 DESCRIPTION="A highly customizable and functional PDF viewer based on poppler and GTK+"
 HOMEPAGE="http://zathura.pwmt.org/"
@@ -17,13 +17,15 @@ IUSE=""
 RDEPEND=">=x11-libs/cairo-1.8.8
 	>=dev-libs/glib-2.22.4:2
 	>=x11-libs/gtk+-2.18.6:2
-	<app-text/poppler-0.16[cairo]
 	>=app-text/poppler-0.12.3[cairo]"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
 	restore_config config.def.h
+
+	# bug #349941
+	has_version ">=app-text/poppler-0.15.0" && epatch "${FILESDIR}"/"${PN}"-poppler-0.16.patch
 }
 
 src_compile() {