diff options
17 files changed, 45 insertions, 815 deletions
diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog index a678a6abbf66..7f0eb7564f18 100644 --- a/app-text/evince/ChangeLog +++ b/app-text/evince/ChangeLog @@ -1,6 +1,24 @@ # ChangeLog for app-text/evince # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.286 2015/03/22 19:47:18 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.287 2015/06/09 15:00:29 eva Exp $ + +*evince-3.16.1 (09 Jun 2015) + + 09 Jun 2015; Gilles Dartiguelongue <eva@gentoo.org> -evince-3.12.2.ebuild, + -evince-3.12.2-r1.ebuild, -evince-3.14.1-r1.ebuild, +evince-3.16.1.ebuild, + -files/evince-3.12.2-memory-leak.patch, + -files/evince-3.12.2-print-center.patch, + -files/evince-3.12.2-scroll-search-1.patch, + -files/evince-3.12.2-scroll-search-2.patch, + -files/evince-3.14.0-non-bash-support.patch, + -files/evince-3.14.1-critical-warning.patch, + -files/evince-3.14.1-disable-toggle-find.patch, + -files/evince-3.14.1-gnome-desktop.patch, + -files/evince-3.14.1-incorrect-resolution.patch, + -files/evince-3.14.1-scroll-search.patch, + -files/evince-3.14.1-show-correct.patch, + -files/evince-3.14.1-thumbnail-size.patch: + Version bump for Gnome 3.16. Clean up old revisions. *evince-3.14.2-r1 (22 Mar 2015) diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest index e9bda2104d03..932fef9a2ef6 100644 --- a/app-text/evince/Manifest +++ b/app-text/evince/Manifest @@ -1,44 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX evince-3.12.2-memory-leak.patch 2806 SHA256 460ddeb1381b9a0619a0921c2e7dd6e652d0227d1379f34fa5d6ed88045c13d4 SHA512 4e354d30ef49edcde9c2f2e8315dcf3f51a5a08bd3515ceb08416b0b2d2e5631a4c71d6c35aea4ac0bfd0823424719bc4991cf1c6a2a7b92b2a964dc6c988626 WHIRLPOOL 55b69bbaa1f5a1df5eca961e070e2167b79d4a710b1cfa53ac66c85aa339bd0743a7470dde29790218c9b8afcbe7acb582accd9517ed24e402657e4be2a03449 -AUX evince-3.12.2-print-center.patch 4859 SHA256 eb14027664f9f84ab0366968e5d7917d58c634913c0559ef5d44f2e18f104daf SHA512 c9efd75b334007972c918ec5cf5d5bcc14c0fe1f084a9ea8a40e01ebff0dcd3f93c9e32e0845d55fecdf520aba87e94f8741790fb07312f998f80198de58e1ff WHIRLPOOL c8198cf6d3da399c7f7a0afb0d291445586021dce707a1d1f7c8b0d093de1bbf511579476a27a72bdef3fd1c8468b6c121dec60191adf6c421571974687ff5ca -AUX evince-3.12.2-scroll-search-1.patch 1069 SHA256 e7a31aa5b69467ef0ab3aa9f1f063114acd1a00a0c81dead5d9cdf162306b1ba SHA512 bd43b783faaf2effc8148b48493a0d69f745dd4967a1595688f9e610e0a4a4e84be76e22e97b1bc8d56112ed7b49128f9722e12362efb80b1dab9cea49ae5bf4 WHIRLPOOL e67b8ff98d555b076d2c0be41a51ebb0c6c73a8065e70e88300952792493291b6f6bbe230eafc9a23fbda890dbba66cf2adef28e905d81761e003278c530d0ea -AUX evince-3.12.2-scroll-search-2.patch 1442 SHA256 9533f36ac95c9d5e82b58d4fb3134c9897784fb842c949a8afe176f689f36b2e SHA512 f17dea2d71abd5840e3f7fe6eeef8b35037525ec466812b3665d2aa149109e605ae4faf0d7b0d91202325afe0b8847049d7afea190ca824c1673664a3548d83a WHIRLPOOL 086c91e9399850ef2f6743f5f8504c277d1218ede5d12206e8a3ea9ac95b18617563c06484c27b981d3e68c247752640c50888754fe8d4fdf956d524b3326dfd -AUX evince-3.14.0-non-bash-support.patch 968 SHA256 9d46e50877f3ed42eafd5a6312cd750138a0c96d30a7b32bb635b83ddf5bcdcd SHA512 33647ae91b2cf6b676663424efb0ebea42c29a8b2619b16a72c817a7d7589117b1ae08f8fd3c690149f240d5130e726bd48ed7230fe7371ff6c92a7ad97957cc WHIRLPOOL 3cb09bf215d1ff6fb22946bdfe1f5b9e5e081816276f61c4c2d1be227c50ba7c121ac5697cdfb56ebfd102d70c05a14a1e125ef094247ae3a2967ba52ddd976c -AUX evince-3.14.1-critical-warning.patch 1304 SHA256 94b6e16a001dd1f5c6697e7cc61cd1c36028a814fee6caec81151883cf799797 SHA512 7b82df7dc4c773d392da576e9dc80199e60cb8e6ba185c7f05245ccd7b6c3cdd5c540a71a9c741aee69d54ef93b01fd1535c2abdfd951a5cadf91602b3a4495a WHIRLPOOL fd452f2e822c32fbac1756af690bff67728a777ddcf967d71c2b964a6fb46be10e51451231683802a4ef15486a5537b1022b9be3075d6107b9b7aca45323e72c -AUX evince-3.14.1-disable-toggle-find.patch 921 SHA256 21688513c7ec0ec94b514882578cf18141144deddd58cfbc06ac252d0cad3e62 SHA512 d3e3a2936ec589a3bf7b7d610e6e7ec1bc6da972e2879e0c84acbe83ec4cb713350dba2bf2cd421694c488711ea7c428c52df9a5d916b0de63cd75411eba2a49 WHIRLPOOL 44466b0969bf3d0f687bba40001bcf139ec580b0a3096d505bef4e20b127efc2ae397e486479fe1fb6a631afc60937b12c7bfd1898c6c315b5623beba8cdadea -AUX evince-3.14.1-gnome-desktop.patch 836 SHA256 dfca10ca6d2bbea88475af4cfb1fe0b47113b9fd92b46f6cca54a09fb05eca6d SHA512 a6b73888b91ca6941ecee6f7203c3ec952198a69fce236982443832dd3dd982970862a9a8b198b92cd3dfe9d8ad3aebed889d0b9939db6cc0ae3bcc08ff53b64 WHIRLPOOL e3fe18911ce642f631c77f77c935a21ce3cf734fa4dfda918f502fb0913ef369ba4fa6f3f7f8b832a659bb556831857ac0aac4b85ab593ec217033c6dd2c6528 -AUX evince-3.14.1-incorrect-resolution.patch 1191 SHA256 01c2e18d1528940de29687cd6461944fbaba40cb5d4370fc7791465e3c1ddfa2 SHA512 7f04455c7fd26e292a94ebcc69ca21655254a087a733a9b08c76141612faf9d9d864034ec7a5c46a5dcff26fabc30724a39ec11d059ddfedd80f1bb645ed7943 WHIRLPOOL 155fc30ab1106d41589ca326322c20b84e4618ad90d2524f340c62663cee71db7891457bff2875384fd872f17cc31480b4007df926cf09ecf7ac1e1a75e5513c -AUX evince-3.14.1-scroll-search.patch 989 SHA256 d2d0160d0f7c4f4bcd5c70f70aaddfe1d638ccce8ed38906e12dcf6262ba85a1 SHA512 60607b4d1f27db0c8c38cc45e5f0639a5a6f90980f4c3111b4cd787b750bc30efe7ce6f2334e87cfbc9053e1928984b432557c22a2bca7f1f01702556bb82aec WHIRLPOOL 0e0478722b1033da380bfdee13e925091c077ac89e5bc6d9b7d76d87226f258a4576ea1baec04443cad595ff94dfc6e9cf9c51e2f30c833d81d4e5efdbc8fbf1 -AUX evince-3.14.1-show-correct.patch 1366 SHA256 1795cc664238b941dd6e72b9acee79a7e8723932a50d70c07b46abf74719e227 SHA512 fcd122b3d825bbb543e6c5683d20898e7861e57d0dd65d230dcf50fd4e15bf74a92a72afeeabf07fa80cb12b4c706aa173d51bdfc82a833997d3e3cf7372249f WHIRLPOOL dc96a06df575ecba2db81403e053a2e0eeed9ee7c4d4960a4e8a11c11ff19656d82cc9bbe531992c91d234f2848935413a7fdbca62c7e8478b8fa828d32c0638 -AUX evince-3.14.1-thumbnail-size.patch 874 SHA256 4cae52f37f43296d09653683647d67cd7cca958c3b6a03f960d9562b5c2a9fca SHA512 96bfa92e2d55ca6ca346440c84c5a472531e135b7ac46351cb07c0f542daaeba7d66faa6209671c5f7ceb3a06956c24a1160d6375b3b4628a6ffb46fe0caf664 WHIRLPOOL c9e4e820f19ae8e567851c1e62b209eda8bd45a735374c23a2adbf99d752763c29b47167619653846ca9a40e3d5d06ec0ee7aa1b9b57f83730d95ec0a61698c6 -DIST evince-3.12.2.tar.xz 2913988 SHA256 30c243bbfde56338c25a39003b4848143be42157177e2163a368f14139909f7d SHA512 e3f14ba75f504fd65a5ef00f732796424302514064f503c4e20371cc862e2a75e12909656dca78e0d9689abdb9c198a4fd098bd81ae203aa897750673be465ad WHIRLPOOL f310e4940ec6ae652ee35ddaae98ee446681552e1e1d641b785ca54a679da236dc3c3ce9679d347a723474f0943265869963774d50965f408094d384fe72b73b -DIST evince-3.14.1.tar.xz 3082612 SHA256 13ec728d6957aa18ba21a3a66504dd52b8607596337f30f0908b62b5fcc14507 SHA512 a54b0ab1099fd69ae30b640ecd1edd17c638f0f70ea9f459c49489e40a349a658f76a19d6181aa65e34d97575d687500c216bca370f867fe3348e46e5a77b315 WHIRLPOOL 2eac059cf703c31fcbc1779612d1b2b651fc4c8a3513d095ed9ad403b9ac403912ddd56664e97400ce988709d8082ad59c127b2636be251b65a39edd44f6af70 DIST evince-3.14.2.tar.xz 3089840 SHA256 4c591d0b879092a5f6c9140b75f15bdea3665a332e9b384957c453fd67bf0070 SHA512 f6a2b4037a055997316f2820b2ec6d171f51b0005b16070a2f990d5738ad39a14cc6e4662ad785da528d5e8d8ac48bba3a628c0b728578b00f09859d08b79aa6 WHIRLPOOL 02dc43bf594480a02a3e76e95e0391cc13ca57c0974e304181d3e9a25361298fbdfc9ae43ff03f9e564d8d5704f301021b700da61a684987908fd0fe6459fce9 -EBUILD evince-3.12.2-r1.ebuild 3079 SHA256 eddee9e7f9b38d446d45ea8787b195b440193c0b63804ff2743f5cd8b2f2b842 SHA512 97c30cd18809a709aa03ec72fd30cce1c56841948d19e38fbd2a62bc67bc197cb6f59fe6f8ddf8c19cb8ac32388d5f6bd8d649f67e22e854735a01bacf9d8fa5 WHIRLPOOL 95abe41468ebf09d7dec931326266a83a8ef7204b2c37f75f835a18ef717a0c459ec8c2666b83c5c94ebe60a5356cb77661674f0568c2f765d02939a12b510ed -EBUILD evince-3.12.2.ebuild 2721 SHA256 3d006e1dee77402054fbe99956455c6d453971ef86593ace3d22f59bfc837809 SHA512 3e7e7f36856ce2a4a7fedb7344857aba1b1ea16946be2fd5076bdea2b42c092f1cdd26b1860ca0b8828dc8cac6b442dcc156eddff64c7b08eb4853dc4395b817 WHIRLPOOL fc352d151c630d229da75e0a3ac37c3dff2ac0d1a0b9d1ba087c847608ed438d53f7d959d252bb46b49cef9d4af888404f7becf078463a9fc8a5f7df8b862980 -EBUILD evince-3.14.1-r1.ebuild 3899 SHA256 2ae35b7c209aa0f7771bd41197e5b103d93e43fc436d9ec93e78375e68503027 SHA512 45cbd2c1e3e3c083953c18fccb913126667b18e1b74b5032923903297392c4a2f6d07c7b7102373f6287d17684bf510782fa163e3436ac7ed969d90ab370c0fe WHIRLPOOL 1f51abafb20a2a953e0df9bc71a0a09e44c2ea8a4295a476e1c83b2ecf7c2cf45fcd554b9784de3cbfa933b3c8186e16226dfc68e203f8599fd5809898319a27 +DIST evince-3.16.1.tar.xz 3113776 SHA256 06ff75065b2a30cd588c402f6bd2ea88ee3166181805e0cc00bd54f71dbf6130 SHA512 bca890e2203e8c5d092a9a728f9e0545437e701eb2af790edc074b080d8529e639132e77caff2f77e8f1b8eb359b2c094af9252c08fb8518c98a6fb554c7dc6c WHIRLPOOL 69ce52248097cfc23848a14c71a845256c6b668d2a72f43af3eefbdeb0ceb2877811ef389bf337f410b6b54b9d456baa172b5067b9389eda7588c61ce44be8df EBUILD evince-3.14.2-r1.ebuild 2953 SHA256 a49addfbb9c231a43ef505a202744ca6ac977ce0dca2409f795091013cbf4c37 SHA512 7fc4db02efd88f80d125f518b1d49296ccf76cec5167b89ea70d60f698bdbafbd6b386d00260d4cc001538be690e8fa2539a42a3fdf9875332976ed84775c9f8 WHIRLPOOL 8eb9264bba876f10151f56b50791820aa3e138c8d05e1345a7485d24121fbe072e19493b7102ea7b98726ebf989a2813e227c023b3bd9758d4456a9b7a4c5c4e EBUILD evince-3.14.2.ebuild 2921 SHA256 ed36e1f0e8619a4d27191f762ad467deb168043fb24220add5358560e824e509 SHA512 329dc842703abe34fd7b68f6e24de4fd7adcd9633de467e16c0dab072bcafd0a52b6ab927a26f627af1c7feca938f55680d8ab367da9d7587da62f75ea1b90f5 WHIRLPOOL 319cc1981044a09f5a6b0ae431d5ece62eb36030a40b6612aa3e215ed801ddd0e9ecd36d0f4e409e037c7f24c16855e21b4d33f0cdb23ed4a1f0af40b92b5642 -MISC ChangeLog 44058 SHA256 f80c35f074391fe444c6a69e8fdd12b7c29f3077e777556163bf375d2a841f38 SHA512 ee02ebf5f8381bf4e2972216194f223822af609b9817bedb4edefbcc0d9308f42c265eca8fdbcfb8503fc9ee7c4579b6af0ec4d9831cdc3191b68e2ea54c21b2 WHIRLPOOL 93ec1963d18ee8fdc8977a187bde8edd75a300d95e35bc42f7be94311b3bd5621f55976c3253d7577558a2666ac4b0e98848b9c5a1f758154e876e8fc7ca7c71 +EBUILD evince-3.16.1.ebuild 2946 SHA256 96e8f1b189c30d4f305ec071c7a3f77285db065a2e4a4166e004a9be8e0029e5 SHA512 2c126b39bfd0a4b2f7bbb4aa6338d9a04b4e553fd4b5bfe4d97ad1898b09ab1fa4b900c31983ac21598d21a7f2a147fc938fe43701932fcb08d6aa17306013cc WHIRLPOOL c42c93c0a38cb2a36ed215932996fe83d2425fa41037c4e27803183568bb49b7252c536626c4c60c18c44f5f6e3b753d4ef6b2525b048cc9313a3f81003bd0ec +MISC ChangeLog 44840 SHA256 6b74fac93a5a0ebf3e6dc41964c45a8852d725e4537f23c82ab544768149b835 SHA512 832b0e298c2b9614af34903fcda57d23902d250b59503c0e879d747b2448375c5a21124d7d374cb9f2a11cb9e518a02b6ac6ee3b07a496747a32fd54e30769d5 WHIRLPOOL 25c50e588dc97648b59e0a156cb73bad911720a4a83e4703b59a26e9bf32064a50aceddcdb8f435adcb578590b7e186fc1933bc01ef1c45ed50ee2001242662c MISC metadata.xml 587 SHA256 6977b9daf0c11361cb1a1e8f44990a728c1420da4daeb5b8aacb0c4aa315ba34 SHA512 234effcc88c91018a986c4513dc7e1436123f0a4b25725bed5c704ae18143bd2827c3d97e39015d0f6b7b0218d32adfbc4f483899493cfbc47de6648bad21020 WHIRLPOOL 52deb1b8aa08dfcb8e4b655a10b00a83221b1a9918e0e26128718e50e89fe0fb3dc2b45dbf362534d41d31134ae5620e449704a7342eef74c9f3be30d8480056 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 +Version: GnuPG v2 -iQJ8BAEBCABmBQJVDxxHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx -OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNIcYP/Rk1Ut7IxaBZxquqLvD1j/Jj -Sa8BB+RNP0wh33tE2zzqerqyV4fsLPT2yDiPodVMGzzgQ0bMzy7IirKrORHiM6m6 -vvUtkImoGCb1sUQTJSQGnpMxXyocL7EeBZmN/s9za3t+2smeIPdqdGw7WMxRpNxj -O3kxiHl9TEkEIguQpVDzFkis4jLKR8YYJkKeTa2mJgzIDyAe5jLN6vYUwuqbgBjA -B3pzILnG69l/0ypkVmZo2ZiM59fN/VJHkPl9dyhzSsUXHVe/hNqTaxoHqrDVPg3i -IC7YAv3BzzLqkv4qJInH6/uJFAaLTyIxNA+rikIGhOGo7IrOmsX/qDPcmwIXi9KV -GaOTbaNUSNECmlYJFG0bExCu0Z6lWiWYSBrMC0XMA/2hEL+Z9oDMr3UWd4dcWb1f -NVeURmZU9I7Pz8zF99xIzkbkYk80Fv9IptVwSlCRzk7O7TNR9ubLCv7TtGToHDLY -9a9BHbC0HaPS5P9FLomHcF0wGuyVPIWV2+vKV0/YAwwuN12lxh3CXUuXqrVLsYJx -rUZSYuQnDyCFXUTiy+YA7OWVSKnDokZPskIT9WPhSnAoQ9G7kw9IcHxXfA+OVQtb -0S+Fhk2KxrqnMsEwnE0w0wpvgnCD1+TSVZzpbzWrslXuX0NjWu8Vm4/x6QOZglrh -P+Da4chByeHfesGmW3cb -=0kZS +iEYEAREIAAYFAlV2/44ACgkQ1fmVwcYIWAYrGgCgv83MJsZx84s5OGrA4ZOcsM1t +C6IAn0IJplJSx8hgUzXFQfK+VK2+kQO7 +=WmfS -----END PGP SIGNATURE----- diff --git a/app-text/evince/evince-3.12.2.ebuild b/app-text/evince/evince-3.12.2.ebuild deleted file mode 100644 index 78b724449c00..000000000000 --- a/app-text/evince/evince-3.12.2.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.12.2.ebuild,v 1.3 2014/12/19 13:34:40 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" - -inherit eutils gnome2 - -DESCRIPTION="Simple document viewer for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Evince" - -LICENSE="GPL-2+ CC-BY-SA-3.0" -# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3) -SLOT="0/evd3.4-evv3.3" -IUSE="debug djvu dvi +introspection libsecret nautilus +postscript t1lib tiff xps" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris" - -# Since 2.26.2, can handle poppler without cairo support. Make it optional ? -# not mature enough -# atk used in libview -# gdk-pixbuf used all over the place -# libX11 used for totem-screensaver -COMMON_DEPEND=" - dev-libs/atk - >=dev-libs/glib-2.36:2 - >=dev-libs/libxml2-2.5:2 - sys-libs/zlib:= - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.8:3[introspection?] - gnome-base/gsettings-desktop-schemas - >=x11-libs/cairo-1.10:= - >=app-text/poppler-0.24:=[cairo] - djvu? ( >=app-text/djvu-3.5.17:= ) - dvi? ( - virtual/tex-base - dev-libs/kpathsea:= - t1lib? ( >=media-libs/t1lib-5:= ) ) - introspection? ( >=dev-libs/gobject-introspection-1 ) - libsecret? ( >=app-crypt/libsecret-0.5 ) - nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] ) - postscript? ( >=app-text/libspectre-0.2:= ) - tiff? ( >=media-libs/tiff-3.6:0= ) - xps? ( >=app-text/libgxps-0.2.1:= ) -" -RDEPEND="${COMMON_DEPEND} - gnome-base/librsvg - || ( - >=x11-themes/gnome-icon-theme-2.17.1 - >=x11-themes/hicolor-icon-theme-0.10 ) - x11-themes/gnome-icon-theme-symbolic -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.3 - dev-util/gdbus-codegen - sys-devel/gettext - >=dev-util/gtk-doc-am-1.13 - >=dev-util/intltool-0.35 - virtual/pkgconfig -" - -# Needs dogtail and pyspi from http://fedorahosted.org/dogtail/ -# Releases: http://people.redhat.com/zcerza/dogtail/releases/ -RESTRICT="test" - -src_prepare() { - gnome2_src_prepare - - # Do not depend on gnome-icon-theme, bug #326855, #391859 - sed -e 's/gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED//g' \ - -i configure || die "sed failed" -} - -src_configure() { - gnome2_src_configure \ - --disable-static \ - --disable-tests \ - --enable-pdf \ - --enable-comics \ - --enable-thumbnailer \ - --with-platform=gnome \ - --enable-dbus \ - $(use_enable djvu) \ - $(use_enable dvi) \ - $(use_with libsecret keyring) \ - $(use_enable introspection) \ - $(use_enable nautilus) \ - $(use_enable postscript ps) \ - $(use_enable t1lib) \ - $(use_enable tiff) \ - $(use_enable xps) \ - ITSTOOL=$(type -P true) -} diff --git a/app-text/evince/evince-3.14.1-r1.ebuild b/app-text/evince/evince-3.14.1-r1.ebuild deleted file mode 100644 index 754b3831d3f8..000000000000 --- a/app-text/evince/evince-3.14.1-r1.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.14.1-r1.ebuild,v 1.2 2015/02/25 11:55:35 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" - -inherit autotools eutils gnome2 - -DESCRIPTION="Simple document viewer for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Evince" - -LICENSE="GPL-2+ CC-BY-SA-3.0" -# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3) -SLOT="0/evd3.4-evv3.3" -IUSE="debug djvu dvi gnome +introspection libsecret nautilus +postscript t1lib tiff xps" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris" - -# Since 2.26.2, can handle poppler without cairo support. Make it optional ? -# not mature enough -# atk used in libview -# gdk-pixbuf used all over the place -# libX11 used for totem-screensaver -COMMON_DEPEND=" - dev-libs/atk - >=dev-libs/glib-2.36:2 - >=dev-libs/libxml2-2.5:2 - sys-libs/zlib:= - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.14:3[introspection?] - gnome-base/gsettings-desktop-schemas - >=x11-libs/cairo-1.10:= - >=app-text/poppler-0.24:=[cairo] - djvu? ( >=app-text/djvu-3.5.17:= ) - dvi? ( - virtual/tex-base - dev-libs/kpathsea:= - t1lib? ( >=media-libs/t1lib-5:= ) ) - gnome? ( gnome-base/gnome-desktop:3 ) - introspection? ( >=dev-libs/gobject-introspection-1 ) - libsecret? ( >=app-crypt/libsecret-0.5 ) - nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] ) - postscript? ( >=app-text/libspectre-0.2:= ) - tiff? ( >=media-libs/tiff-3.6:0= ) - xps? ( >=app-text/libgxps-0.2.1:= ) -" -RDEPEND="${COMMON_DEPEND} - gnome-base/gvfs - gnome-base/librsvg - || ( - >=x11-themes/adwaita-icon-theme-2.17.1 - >=x11-themes/gnome-icon-theme-2.17.1 - >=x11-themes/hicolor-icon-theme-0.10 ) - x11-themes/gnome-icon-theme-symbolic -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.3 - app-text/yelp-tools - dev-util/gdbus-codegen - >=dev-util/gtk-doc-am-1.13 - >=dev-util/intltool-0.35 - sys-devel/gettext - virtual/pkgconfig -" -# eautoreconf needs: -# app-text/yelp-tools - -src_prepare() { - # Disable toggle-find action for documents not supporting find (from '3.14') - epatch "${FILESDIR}"/${P}-disable-toggle-find.patch - - # Handle incorrect 0 resolution found in TIFF files (from '3.14') - epatch "${FILESDIR}"/${P}-incorrect-resolution.patch - - # Fix runtime critical warning when starting in fullscreen mode (from '3.14') - epatch "${FILESDIR}"/${P}-critical-warning.patch - - # configure.ac: workaround quoting issues (from '3.14') - epatch "${FILESDIR}"/${PN}-3.14.0-non-bash-support.patch - - # Scroll to the search result selected by user (from '3.14') - epatch "${FILESDIR}"/${P}-scroll-search.patch - - # Show correct page when next search result requested (from '3.14') - epatch "${FILESDIR}"/${P}-show-correct.patch - - # Fix configuration with ligbnome-desktop (from '3.14') - epatch "${FILESDIR}"/${P}-gnome-desktop.patch - - # Use correct maximum size for thumbnail images (from '3.14') - epatch "${FILESDIR}"/${P}-thumbnail-size.patch - - eautoreconf - gnome2_src_prepare - - # Do not depend on adwaita-icon-theme, bug #326855, #391859 - # https://bugs.freedesktop.org/show_bug.cgi?id=29942 - sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \ - -i configure || die "sed failed" -} - -src_configure() { - gnome2_src_configure \ - --disable-static \ - --enable-pdf \ - --enable-comics \ - --enable-thumbnailer \ - --with-platform=gnome \ - --enable-dbus \ - --enable-browser-plugin \ - $(use_enable djvu) \ - $(use_enable dvi) \ - $(use_with libsecret keyring) \ - $(use_enable gnome libgnome-desktop) \ - $(use_enable introspection) \ - $(use_enable nautilus) \ - $(use_enable postscript ps) \ - $(use_enable t1lib) \ - $(use_enable tiff) \ - $(use_enable xps) \ - BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \ - ITSTOOL=$(type -P true) -} diff --git a/app-text/evince/evince-3.12.2-r1.ebuild b/app-text/evince/evince-3.16.1.ebuild index bc5f96fd110e..53ba845cfbdc 100644 --- a/app-text/evince/evince-3.12.2-r1.ebuild +++ b/app-text/evince/evince-3.16.1.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.12.2-r1.ebuild,v 1.1 2014/12/19 14:42:20 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.16.1.ebuild,v 1.1 2015/06/09 15:00:29 eva Exp $ EAPI="5" GCONF_DEBUG="yes" GNOME2_LA_PUNT="yes" -inherit eutils gnome2 +inherit gnome2 DESCRIPTION="Simple document viewer for GNOME" HOMEPAGE="https://wiki.gnome.org/Apps/Evince" @@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evince" LICENSE="GPL-2+ CC-BY-SA-3.0" # subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3) SLOT="0/evd3.4-evv3.3" -IUSE="debug djvu dvi +introspection libsecret nautilus +postscript t1lib tiff xps" +IUSE="djvu dvi gnome +introspection libsecret nautilus nsplugin +postscript t1lib tiff xps" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris" # Since 2.26.2, can handle poppler without cairo support. Make it optional ? @@ -24,11 +24,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86- # libX11 used for totem-screensaver COMMON_DEPEND=" dev-libs/atk - >=dev-libs/glib-2.36:2 + >=dev-libs/glib-2.36:2[dbus] >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.8:3[introspection?] + >=x11-libs/gtk+-3.15.3:3[introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-0.24:=[cairo] @@ -37,6 +37,7 @@ COMMON_DEPEND=" virtual/tex-base dev-libs/kpathsea:= t1lib? ( >=media-libs/t1lib-5:= ) ) + gnome? ( gnome-base/gnome-desktop:3 ) introspection? ( >=dev-libs/gobject-introspection-1 ) libsecret? ( >=app-crypt/libsecret-0.5 ) nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] ) @@ -45,46 +46,38 @@ COMMON_DEPEND=" xps? ( >=app-text/libgxps-0.2.1:= ) " RDEPEND="${COMMON_DEPEND} + gnome-base/gvfs gnome-base/librsvg || ( + >=x11-themes/adwaita-icon-theme-2.17.1 >=x11-themes/gnome-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 ) x11-themes/gnome-icon-theme-symbolic " DEPEND="${COMMON_DEPEND} app-text/docbook-xml-dtd:4.3 + app-text/yelp-tools dev-util/gdbus-codegen - sys-devel/gettext >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.35 + sys-devel/gettext virtual/pkgconfig " - -# Needs dogtail and pyspi from http://fedorahosted.org/dogtail/ -# Releases: http://people.redhat.com/zcerza/dogtail/releases/ -RESTRICT="test" +# eautoreconf needs: +# app-text/yelp-tools src_prepare() { - # Fix scrolling when searching, bug #532878 (from 'master') - epatch "${FILESDIR}"/${PN}-3.12.2-scroll-search-{1,2}.patch - - # Fix centering of documents when printing with a manual scale (from '3.12' branch) - epatch "${FILESDIR}"/${P}-print-center.patch - - # libview: fixing memory leak (from '3.12' branch) - epatch "${FILESDIR}"/${P}-memory-leak.patch - gnome2_src_prepare - # Do not depend on gnome-icon-theme, bug #326855, #391859 - sed -e 's/gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED//g' \ + # Do not depend on adwaita-icon-theme, bug #326855, #391859 + # https://bugs.freedesktop.org/show_bug.cgi?id=29942 + sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \ -i configure || die "sed failed" } src_configure() { gnome2_src_configure \ --disable-static \ - --disable-tests \ --enable-pdf \ --enable-comics \ --enable-thumbnailer \ @@ -93,11 +86,14 @@ src_configure() { $(use_enable djvu) \ $(use_enable dvi) \ $(use_with libsecret keyring) \ + $(use_enable gnome libgnome-desktop) \ $(use_enable introspection) \ $(use_enable nautilus) \ + $(use_enable nsplugin browser-plugin) \ $(use_enable postscript ps) \ $(use_enable t1lib) \ $(use_enable tiff) \ $(use_enable xps) \ + BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \ ITSTOOL=$(type -P true) } diff --git a/app-text/evince/files/evince-3.12.2-memory-leak.patch b/app-text/evince/files/evince-3.12.2-memory-leak.patch deleted file mode 100644 index 37b1f6dd1e32..000000000000 --- a/app-text/evince/files/evince-3.12.2-memory-leak.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 86cfddae23cacfbb24469f1926cb965522bec6ca Mon Sep 17 00:00:00 2001 -From: Giselle Reis <gisellemnr@src.gnome.org> -Date: Sat, 30 Aug 2014 00:23:04 +0200 -Subject: libview: fixing memory leak - -The memory leak was caused by a g_signal_connect -which was never disconnected. This patch makes -sure the signal is disconnected and the job is -cancelled before creating another rendering job. -It additionally introduces a helper function to -cleanly finalize the job. - -diff --git a/libview/ev-pixbuf-cache.c b/libview/ev-pixbuf-cache.c -index 897d3de..22170f9 100644 ---- a/libview/ev-pixbuf-cache.c -+++ b/libview/ev-pixbuf-cache.c -@@ -161,20 +161,27 @@ ev_pixbuf_cache_finalize (GObject *object) - } - - static void -+end_job (CacheJobInfo *job_info, -+ gpointer data) -+{ -+ g_signal_handlers_disconnect_by_func (job_info->job, -+ G_CALLBACK (job_finished_cb), -+ data); -+ ev_job_cancel (job_info->job); -+ g_object_unref (job_info->job); -+ job_info->job = NULL; -+} -+ -+static void - dispose_cache_job_info (CacheJobInfo *job_info, - gpointer data) - { - if (job_info == NULL) - return; - -- if (job_info->job) { -- g_signal_handlers_disconnect_by_func (job_info->job, -- G_CALLBACK (job_finished_cb), -- data); -- ev_job_cancel (job_info->job); -- g_object_unref (job_info->job); -- job_info->job = NULL; -- } -+ if (job_info->job) -+ end_job (job_info, data); -+ - if (job_info->surface) { - cairo_surface_destroy (job_info->surface); - job_info->surface = NULL; -@@ -281,14 +288,8 @@ copy_job_to_job_info (EvJobRender *job_render, - job_info->points_set = TRUE; - } - -- if (job_info->job) { -- g_signal_handlers_disconnect_by_func (job_info->job, -- G_CALLBACK (job_finished_cb), -- pixbuf_cache); -- ev_job_cancel (job_info->job); -- g_object_unref (job_info->job); -- job_info->job = NULL; -- } -+ if (job_info->job) -+ end_job (job_info, pixbuf_cache); - - job_info->page_ready = TRUE; - } -@@ -337,12 +338,7 @@ check_job_size_and_unref (EvPixbufCache *pixbuf_cache, - height == EV_JOB_RENDER (job_info->job)->target_height) - return; - -- g_signal_handlers_disconnect_by_func (job_info->job, -- G_CALLBACK (job_finished_cb), -- pixbuf_cache); -- ev_job_cancel (job_info->job); -- g_object_unref (job_info->job); -- job_info->job = NULL; -+ end_job (job_info, pixbuf_cache); - } - - /* Do all function that copies a job from an older cache to it's position in the -@@ -651,6 +647,9 @@ add_job (EvPixbufCache *pixbuf_cache, - cairo_region_destroy (job_info->region); - job_info->region = region ? cairo_region_reference (region) : NULL; - -+ if (job_info->job) -+ end_job (job_info, pixbuf_cache); -+ - job_info->job = ev_job_render_new (pixbuf_cache->document, - page, rotation, scale, - width, height); --- -cgit v0.10.1 - diff --git a/app-text/evince/files/evince-3.12.2-print-center.patch b/app-text/evince/files/evince-3.12.2-print-center.patch deleted file mode 100644 index 96e9ae8d9f6a..000000000000 --- a/app-text/evince/files/evince-3.12.2-print-center.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 1057dc0dd6dee5dc1992fc88b76e4c928d2ff0e7 Mon Sep 17 00:00:00 2001 -From: Carlos Garcia Campos <cgarcia@igalia.com> -Date: Thu, 14 Aug 2014 14:07:05 +0200 -Subject: print-operation: Fix centering of documents when printing with a - manual scale - -When a manual scale is used for printing, the document is not correctly -centered because the cairo context has a scale already applied. We need -to consider the current scale when centering the page and also convert -the coordinates before the cairo_translate(). - -https://bugzilla.gnome.org/show_bug.cgi?id=734788 - -diff --git a/libview/ev-print-operation.c b/libview/ev-print-operation.c -index b348038..df41c60 100644 ---- a/libview/ev-print-operation.c -+++ b/libview/ev-print-operation.c -@@ -1825,6 +1825,27 @@ _print_context_get_hard_margins (GtkPrintContext *context, - } - - static void -+ev_print_operation_print_get_scaled_page_size (EvPrintOperationPrint *print, -+ gint page, -+ gdouble *width, -+ gdouble *height) -+{ -+ GtkPrintSettings *settings; -+ gdouble manual_scale; -+ -+ ev_document_get_page_size (EV_PRINT_OPERATION (print)->document, -+ page, width, height); -+ -+ settings = gtk_print_operation_get_print_settings (print->op); -+ manual_scale = gtk_print_settings_get_scale (settings) / 100.0; -+ if (manual_scale == 1.0) -+ return; -+ -+ *width *= manual_scale; -+ *height *= manual_scale; -+} -+ -+static void - ev_print_operation_print_draw_page (EvPrintOperationPrint *print, - GtkPrintContext *context, - gint page) -@@ -1834,6 +1855,7 @@ ev_print_operation_print_draw_page (EvPrintOperationPrint *print, - gdouble cr_width, cr_height; - gdouble width, height, scale; - gdouble x_scale, y_scale; -+ gdouble x_offset, y_offset; - gdouble top, bottom, left, right; - - gtk_print_operation_set_defer_drawing (print->op); -@@ -1857,12 +1879,16 @@ ev_print_operation_print_draw_page (EvPrintOperationPrint *print, - cr = gtk_print_context_get_cairo_context (context); - cr_width = gtk_print_context_get_width (context); - cr_height = gtk_print_context_get_height (context); -- ev_document_get_page_size (op->document, page, &width, &height); -+ ev_print_operation_print_get_scaled_page_size (print, page, &width, &height); - - if (print->page_scale == EV_SCALE_NONE) { - /* Center document page on the printed page */ -- if (print->autorotate) -- cairo_translate (cr, (cr_width - width) / 2, (cr_height - height) / 2); -+ if (print->autorotate) { -+ x_offset = (cr_width - width) / 2; -+ y_offset = (cr_height - height) / 2; -+ cairo_device_to_user (cr, &x_offset, &y_offset); -+ cairo_translate (cr, x_offset, y_offset); -+ } - } else { - _print_context_get_hard_margins (context, &top, &bottom, &left, &right); - -@@ -1875,29 +1901,27 @@ ev_print_operation_print_draw_page (EvPrintOperationPrint *print, - scale = 1.0; - - if (print->autorotate) { -- double left_right_sides, top_bottom_sides; -- -- cairo_translate (cr, (cr_width - scale * width) / 2, -- (cr_height - scale * height) / 2); -+ x_offset = (cr_width - scale * width) / 2; -+ y_offset = (cr_height - scale * height) / 2; -+ cairo_device_to_user (cr, &x_offset, &y_offset); -+ cairo_translate (cr, x_offset, y_offset); - - /* Ensure document page is within the margins. The - * scale guarantees the document will fit in the - * margins so we just need to check each side and - * if it overhangs the margin, translate it to the -- * margin. */ -- left_right_sides = (cr_width - width*scale)/2; -- top_bottom_sides = (cr_height - height*scale)/2; -- if (left_right_sides < left) -- cairo_translate (cr, left - left_right_sides, 0); -+ * margin. */ -+ if (x_offset < left) -+ cairo_translate (cr, left - x_offset, 0); - -- if (left_right_sides < right) -- cairo_translate (cr, -(right - left_right_sides), 0); -+ if (x_offset < right) -+ cairo_translate (cr, -(right - x_offset), 0); - -- if (top_bottom_sides < top) -- cairo_translate (cr, 0, top - top_bottom_sides); -+ if (y_offset < top) -+ cairo_translate (cr, 0, top - y_offset); - -- if (top_bottom_sides < bottom) -- cairo_translate (cr, 0, -(bottom - top_bottom_sides)); -+ if (y_offset < bottom) -+ cairo_translate (cr, 0, -(bottom - y_offset)); - } else { - cairo_translate (cr, left, top); - } --- -cgit v0.10.1 - diff --git a/app-text/evince/files/evince-3.12.2-scroll-search-1.patch b/app-text/evince/files/evince-3.12.2-scroll-search-1.patch deleted file mode 100644 index af985baa5c17..000000000000 --- a/app-text/evince/files/evince-3.12.2-scroll-search-1.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 2cb9d88d7b396b6ac4bb01c035a40b48da419b65 Mon Sep 17 00:00:00 2001 -From: Marek Kasik <mkasik@redhat.com> -Date: Mon, 19 May 2014 14:32:19 +0200 -Subject: [PATCH 1/2] [libview] Scroll to the search result selected by user - -Scroll to page on which is the search result selected by user -when not in continuous mode. - -https://bugzilla.gnome.org/show_bug.cgi?id=730252 ---- - libview/ev-view.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/libview/ev-view.c b/libview/ev-view.c -index 7618bbd..393bf77 100644 ---- a/libview/ev-view.c -+++ b/libview/ev-view.c -@@ -7684,6 +7684,9 @@ jump_to_find_page (EvView *view, EvViewFindDirection direction, gint shift) - break; - } - } -+ -+ if (!view->continuous) -+ ev_document_model_set_page (view->model, view->find_page); - } - - static void -@@ -7808,6 +7811,7 @@ ev_view_find_set_result (EvView *view, gint page, gint result) - { - view->find_page = page; - view->find_result = result; -+ jump_to_find_page (view, EV_VIEW_FIND_NEXT, 0); - jump_to_find_result (view); - gtk_widget_queue_draw (GTK_WIDGET (view)); - } --- -1.9.0 - diff --git a/app-text/evince/files/evince-3.12.2-scroll-search-2.patch b/app-text/evince/files/evince-3.12.2-scroll-search-2.patch deleted file mode 100644 index f7dfaef773d7..000000000000 --- a/app-text/evince/files/evince-3.12.2-scroll-search-2.patch +++ /dev/null @@ -1,41 +0,0 @@ -From dd3df79ea999850c737b049081d81afa59af22d3 Mon Sep 17 00:00:00 2001 -From: Marek Kasik <mkasik@redhat.com> -Date: Tue, 18 Nov 2014 12:53:40 +0100 -Subject: [PATCH] [libview] Show correct page when next search result requested - -If there are more than 1 results on a page then requesting -next search result from the same page will not return you -to the page with the search results if you moved from the -page in the meantime (when you are not in continuous mode). -This applies also to previous results. - -https://bugzilla.gnome.org/show_bug.cgi?id=730252 ---- - libview/ev-view.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/libview/ev-view.c b/libview/ev-view.c -index f3aa033..a9159cd 100644 ---- a/libview/ev-view.c -+++ b/libview/ev-view.c -@@ -8250,6 +8250,8 @@ ev_view_find_next (EvView *view) - if (view->find_result >= n_results) { - view->find_result = 0; - jump_to_find_page (view, EV_VIEW_FIND_NEXT, 1); -+ } else if (view->find_page != view->current_page) { -+ jump_to_find_page (view, EV_VIEW_FIND_NEXT, 0); - } - - jump_to_find_result (view); -@@ -8264,6 +8266,8 @@ ev_view_find_previous (EvView *view) - if (view->find_result < 0) { - jump_to_find_page (view, EV_VIEW_FIND_PREV, -1); - view->find_result = MAX (0, ev_view_find_get_n_results (view, view->find_page) - 1); -+ } else if (view->find_page != view->current_page) { -+ jump_to_find_page (view, EV_VIEW_FIND_PREV, 0); - } - - jump_to_find_result (view); --- -2.1.0 - diff --git a/app-text/evince/files/evince-3.14.0-non-bash-support.patch b/app-text/evince/files/evince-3.14.0-non-bash-support.patch deleted file mode 100644 index 979d1860da65..000000000000 --- a/app-text/evince/files/evince-3.14.0-non-bash-support.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 59daf398bc0f1d7895eee3a776b33a9c9310ad21 Mon Sep 17 00:00:00 2001 -From: Alexander Tsoy <alexander@tsoy.me> -Date: Sun, 26 Oct 2014 23:54:47 +0300 -Subject: configure.ac: workaround quoting issues - -BROWSER_PLUGIN_DIR variable substitution is not portable. In particular -it does not work in dash. Replace it with conditional. - -https://bugzilla.gnome.org/show_bug.cgi?id=739226 - -diff --git a/configure.ac b/configure.ac -index 56bf93c..dd4bcab 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -455,7 +455,9 @@ AC_ARG_ENABLE([browser-plugin], - if test x$enable_browser_plugin = "xyes" ; then - PKG_CHECK_MODULES([BROWSER_PLUGIN],[gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED]) - -- BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}" -+ if test -z "${BROWSER_PLUGIN_DIR}"; then -+ BROWSER_PLUGIN_DIR="\${libdir}/mozilla/plugins" -+ fi - AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to]) - fi - --- -cgit v0.10.1 - diff --git a/app-text/evince/files/evince-3.14.1-critical-warning.patch b/app-text/evince/files/evince-3.14.1-critical-warning.patch deleted file mode 100644 index e45da56f4fee..000000000000 --- a/app-text/evince/files/evince-3.14.1-critical-warning.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8875003da7f78a6fbba36fcc70d6ed2d372da7a6 Mon Sep 17 00:00:00 2001 -From: Carlos Garcia Campos <carlosgc@gnome.org> -Date: Sun, 19 Oct 2014 16:01:38 +0200 -Subject: Fix runtime critical warning when starting in fullscreen mode - -The problem is that when running fullscreen mode we call -ev_window_update_links_model() to update the page action widget of the -fullscreen toolbar, but when running directly in fullscreen mode, this -can happen before the links have been loaded in the sidebar. Since -ev_window_update_links_model() is also called automatically when the -links model property changes, we can simply return early in -ev_window_update_links_model() when the model is NULL and it will be -called again with a valid model when the links job finishes. - -https://bugzilla.gnome.org/show_bug.cgi?id=737864 - -diff --git a/shell/ev-window.c b/shell/ev-window.c -index 4de4732..e7f6a96 100644 ---- a/shell/ev-window.c -+++ b/shell/ev-window.c -@@ -4024,6 +4024,9 @@ ev_window_update_links_model (EvWindow *window) - "model", &model, - NULL); - -+ if (!model) -+ return; -+ - page_selector = ev_toolbar_get_page_selector (EV_TOOLBAR (window->priv->toolbar)); - ev_page_action_widget_update_links_model (EV_PAGE_ACTION_WIDGET (page_selector), model); - if (window->priv->fs_toolbar) { --- -cgit v0.10.1 - diff --git a/app-text/evince/files/evince-3.14.1-disable-toggle-find.patch b/app-text/evince/files/evince-3.14.1-disable-toggle-find.patch deleted file mode 100644 index 38032e528469..000000000000 --- a/app-text/evince/files/evince-3.14.1-disable-toggle-find.patch +++ /dev/null @@ -1,23 +0,0 @@ -From bfa59b72ed0c86192ca9b1f0882ca5119aa7fe12 Mon Sep 17 00:00:00 2001 -From: Carlos Garcia Campos <carlosgc@gnome.org> -Date: Sun, 19 Oct 2014 15:24:18 +0200 -Subject: Disable toggle-find action for documents not supporting find - -https://bugzilla.gnome.org/show_bug.cgi?id=738262 - -diff --git a/shell/ev-window.c b/shell/ev-window.c -index c4f1f5d..4de4732 100644 ---- a/shell/ev-window.c -+++ b/shell/ev-window.c -@@ -502,6 +502,8 @@ ev_window_update_actions_sensitivity (EvWindow *ev_window) - can_get_text && !recent_view_mode); - ev_window_set_action_enabled (ev_window, "find", can_find && - !recent_view_mode); -+ ev_window_set_action_enabled (ev_window, "toggle-find", can_find && -+ !recent_view_mode); - ev_window_set_action_enabled (ev_window, "rotate-left", has_pages && - !recent_view_mode); - ev_window_set_action_enabled (ev_window, "rotate-right", has_pages && --- -cgit v0.10.1 - diff --git a/app-text/evince/files/evince-3.14.1-gnome-desktop.patch b/app-text/evince/files/evince-3.14.1-gnome-desktop.patch deleted file mode 100644 index d8fd8754da5a..000000000000 --- a/app-text/evince/files/evince-3.14.1-gnome-desktop.patch +++ /dev/null @@ -1,26 +0,0 @@ -From fa73b3b976a8aec415006d7fc99bab84d04650e4 Mon Sep 17 00:00:00 2001 -From: Marek Kasik <mkasik@redhat.com> -Date: Wed, 19 Nov 2014 10:53:29 +0100 -Subject: Fix configuration with ligbnome-desktop - -A typo caused fail of configuration with enabled -support for libgnome-desktop. - -https://bugzilla.gnome.org/show_bug.cgi?id=733721 - -diff --git a/configure.ac b/configure.ac -index dd4bcab..0ae92b1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -313,7 +313,7 @@ if test "$enable_gnome_desktop" != "no"; then - PKG_CHECK_MODULES([LIBGNOME_DESKTOP], [gnome-desktop-3.0], has_libgnome_desktop=yes, has_libgnome_desktop=no) - else - PKG_CHECK_MODULES([LIBGNOME_DESKTOP], [gnome-desktop-3.0]) -- has_libgnome_desktop = yes -+ has_libgnome_desktop=yes - fi - - if test x$has_libgnome_desktop = xyes; then --- -cgit v0.10.1 - diff --git a/app-text/evince/files/evince-3.14.1-incorrect-resolution.patch b/app-text/evince/files/evince-3.14.1-incorrect-resolution.patch deleted file mode 100644 index aa07053ec726..000000000000 --- a/app-text/evince/files/evince-3.14.1-incorrect-resolution.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 24a3d032728ab6cc530fab45d4eb5e232677c928 Mon Sep 17 00:00:00 2001 -From: Gabor Kelemen <kelemeng@gnome.hu> -Date: Fri, 10 Oct 2014 11:49:26 +0200 -Subject: tiff: Handle incorrect 0 resolution found in TIFF files - -https://bugzilla.gnome.org/show_bug.cgi?id=646414 - -diff --git a/backend/tiff/tiff-document.c b/backend/tiff/tiff-document.c -index 80ac0f5..8f40934 100644 ---- a/backend/tiff/tiff-document.c -+++ b/backend/tiff/tiff-document.c -@@ -172,9 +172,10 @@ tiff_document_get_resolution (TiffDocument *tiff_document, - gfloat *x_res, - gfloat *y_res) - { -- gfloat x = 72.0, y = 72.0; -+ gfloat x = 0.0; -+ gfloat y = 0.0; - gushort unit; -- -+ - if (TIFFGetField (tiff_document->tiff, TIFFTAG_XRESOLUTION, &x) && - TIFFGetField (tiff_document->tiff, TIFFTAG_YRESOLUTION, &y)) { - if (TIFFGetFieldDefaulted (tiff_document->tiff, TIFFTAG_RESOLUTIONUNIT, &unit)) { -@@ -185,8 +186,9 @@ tiff_document_get_resolution (TiffDocument *tiff_document, - } - } - -- *x_res = x; -- *y_res = y; -+ /* Handle 0 values: some software set TIFF resolution as `0 , 0` see bug #646414 */ -+ *x_res = x > 0 ? x : 72.0; -+ *y_res = y > 0 ? y : 72.0; - } - - static void --- -cgit v0.10.1 - diff --git a/app-text/evince/files/evince-3.14.1-scroll-search.patch b/app-text/evince/files/evince-3.14.1-scroll-search.patch deleted file mode 100644 index b4436339f30e..000000000000 --- a/app-text/evince/files/evince-3.14.1-scroll-search.patch +++ /dev/null @@ -1,35 +0,0 @@ -From aa988afb009307c6b854b5da366d34e0ee2ea763 Mon Sep 17 00:00:00 2001 -From: Marek Kasik <mkasik@redhat.com> -Date: Mon, 19 May 2014 14:32:19 +0200 -Subject: Scroll to the search result selected by user - -Scroll to page on which is the search result selected by user -when not in continuous mode. - -https://bugzilla.gnome.org/show_bug.cgi?id=730252 - -diff --git a/libview/ev-view.c b/libview/ev-view.c -index 5ed2d78..f3aa033 100644 ---- a/libview/ev-view.c -+++ b/libview/ev-view.c -@@ -8158,6 +8158,9 @@ jump_to_find_page (EvView *view, EvViewFindDirection direction, gint shift) - break; - } - } -+ -+ if (!view->continuous) -+ ev_document_model_set_page (view->model, view->find_page); - } - - static void -@@ -8282,6 +8285,7 @@ ev_view_find_set_result (EvView *view, gint page, gint result) - { - view->find_page = page; - view->find_result = result; -+ jump_to_find_page (view, EV_VIEW_FIND_NEXT, 0); - jump_to_find_result (view); - gtk_widget_queue_draw (GTK_WIDGET (view)); - } --- -cgit v0.10.1 - diff --git a/app-text/evince/files/evince-3.14.1-show-correct.patch b/app-text/evince/files/evince-3.14.1-show-correct.patch deleted file mode 100644 index 6d84190398bf..000000000000 --- a/app-text/evince/files/evince-3.14.1-show-correct.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f2c908cf8a8f8d5d0fbed1bc0871c8bdb531f751 Mon Sep 17 00:00:00 2001 -From: Marek Kasik <mkasik@redhat.com> -Date: Tue, 18 Nov 2014 12:53:40 +0100 -Subject: Show correct page when next search result requested - -If there are more than 1 results on a page then requesting -next search result from the same page will not return you -to the page with the search results if you moved from the -page in the meantime (when you are not in continuous mode). -This applies also to previous results. - -https://bugzilla.gnome.org/show_bug.cgi?id=730252 - -diff --git a/libview/ev-view.c b/libview/ev-view.c -index f3aa033..a9159cd 100644 ---- a/libview/ev-view.c -+++ b/libview/ev-view.c -@@ -8250,6 +8250,8 @@ ev_view_find_next (EvView *view) - if (view->find_result >= n_results) { - view->find_result = 0; - jump_to_find_page (view, EV_VIEW_FIND_NEXT, 1); -+ } else if (view->find_page != view->current_page) { -+ jump_to_find_page (view, EV_VIEW_FIND_NEXT, 0); - } - - jump_to_find_result (view); -@@ -8264,6 +8266,8 @@ ev_view_find_previous (EvView *view) - if (view->find_result < 0) { - jump_to_find_page (view, EV_VIEW_FIND_PREV, -1); - view->find_result = MAX (0, ev_view_find_get_n_results (view, view->find_page) - 1); -+ } else if (view->find_page != view->current_page) { -+ jump_to_find_page (view, EV_VIEW_FIND_PREV, 0); - } - - jump_to_find_result (view); --- -cgit v0.10.1 - diff --git a/app-text/evince/files/evince-3.14.1-thumbnail-size.patch b/app-text/evince/files/evince-3.14.1-thumbnail-size.patch deleted file mode 100644 index 122a2c1448c8..000000000000 --- a/app-text/evince/files/evince-3.14.1-thumbnail-size.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 1820802ff261d1ca05acd3c3153918c0fd1c686f Mon Sep 17 00:00:00 2001 -From: Sebastian Keller <sebastian-keller@gmx.de> -Date: Sat, 29 Nov 2014 03:46:27 +0100 -Subject: thumbnailer: Use correct maximum size for thumbnail images - -https://bugzilla.gnome.org/show_bug.cgi?id=740877 - -diff --git a/thumbnailer/evince-thumbnailer.c b/thumbnailer/evince-thumbnailer.c -index 1649252..998447d 100644 ---- a/thumbnailer/evince-thumbnailer.c -+++ b/thumbnailer/evince-thumbnailer.c -@@ -177,7 +177,7 @@ evince_thumbnail_pngenc_get (EvDocument *document, const char *thumbnail, int si - - ev_document_get_page_size (document, 0, &width, &height); - -- rc = ev_render_context_new (page, 0, size / width); -+ rc = ev_render_context_new (page, 0, size / MAX (height, width)); - pixbuf = ev_document_get_thumbnail (document, rc); - g_object_unref (rc); - g_object_unref (page); --- -cgit v0.10.1 - |