From 8f78dbdb931f5c6e1001300bc1f7071cb43121c2 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Sun, 18 Jan 2015 11:35:30 +0000 Subject: Apply multiple upstream patches, tests are no longer provided in 3.14 cycle as they were broken, drop old Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4 --- app-text/evince/ChangeLog | 17 ++- app-text/evince/Manifest | 16 ++- app-text/evince/evince-3.14.1-r1.ebuild | 123 +++++++++++++++++++++ .../files/evince-3.14.1-critical-warning.patch | 33 ++++++ .../files/evince-3.14.1-disable-toggle-find.patch | 23 ++++ .../evince/files/evince-3.14.1-gnome-desktop.patch | 26 +++++ .../files/evince-3.14.1-incorrect-resolution.patch | 39 +++++++ .../evince/files/evince-3.14.1-scroll-search.patch | 35 ++++++ .../evince/files/evince-3.14.1-show-correct.patch | 38 +++++++ .../files/evince-3.14.1-thumbnail-size.patch | 23 ++++ 10 files changed, 367 insertions(+), 6 deletions(-) create mode 100644 app-text/evince/evince-3.14.1-r1.ebuild create mode 100644 app-text/evince/files/evince-3.14.1-critical-warning.patch create mode 100644 app-text/evince/files/evince-3.14.1-disable-toggle-find.patch create mode 100644 app-text/evince/files/evince-3.14.1-gnome-desktop.patch create mode 100644 app-text/evince/files/evince-3.14.1-incorrect-resolution.patch create mode 100644 app-text/evince/files/evince-3.14.1-scroll-search.patch create mode 100644 app-text/evince/files/evince-3.14.1-show-correct.patch create mode 100644 app-text/evince/files/evince-3.14.1-thumbnail-size.patch (limited to 'app-text') diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog index aa66e9b51a18..c6595cd73ff6 100644 --- a/app-text/evince/ChangeLog +++ b/app-text/evince/ChangeLog @@ -1,6 +1,19 @@ # ChangeLog for app-text/evince -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.280 2014/12/27 16:19:23 eva Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.281 2015/01/18 11:35:29 pacho Exp $ + +*evince-3.14.1-r1 (18 Jan 2015) + + 18 Jan 2015; Pacho Ramos +evince-3.14.1-r1.ebuild, + +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: + Apply multiple upstream patches, tests are no longer provided in 3.14 cycle as + they were broken, drop old 27 Dec 2014; Gilles Dartiguelongue evince-3.14.1.ebuild: Add missing dependency for eautoreconf, bug #533682. diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest index 0d606263c22c..a9bcf962bf72 100644 --- a/app-text/evince/Manifest +++ b/app-text/evince/Manifest @@ -6,17 +6,25 @@ AUX evince-3.12.2-print-center.patch 4859 SHA256 eb14027664f9f84ab0366968e5d7917 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 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 3882 SHA256 29e5d915bb914aff74ee0cdaaa6df282c7b682a0bd26156057c2cfa2c59ff757 SHA512 383943e8e0331079e29b786e895badadaebf56aa990d1fd64973e5851fa20dcc1344c2f3e162e4e008df08dd43d99ca493ecaab6043f14ea302d7e2f5bf96380 WHIRLPOOL 96e60afbb36ce1f3774e130bf06695d444a3aa7d9de214190d1d8b80f53717ac4007b7482d9ba0caeef0ea8f2957585c8914f6994d131a883cdfa147158a717b EBUILD evince-3.14.1.ebuild 3154 SHA256 20f6735c0818520a7b27b5c8d0d8625746a9814adb0734ed40992d1488ecc1b0 SHA512 fc3d7b748a379b365bb0ff0dd722494040c702055571055e0a5f33a2b4cc22b0bbc676ccbef27ad80bd2a24bd0424508594e6d116f0eba4db161a32d423d05d9 WHIRLPOOL f7e02811f8d2f557e85918279b0289c0ce2b1d15187d0def4032c1e16d56a328b7550638427def91fbd89cd3875fa0dff9c1ae6f24b8f7be150440ae884057e2 -MISC ChangeLog 42852 SHA256 fb367cce408fc9cc55535bf87c35e35e13830f148b51b3115d8e3d3c07840d51 SHA512 a169445f9c682a8ef72a04a0d906c9ad998a2e58c06f6d034174193ea6fa21d1aaafabc2afdc861ac7cd3e090ff5c0e788a1603b0c6855bf0c82c527b23389cc WHIRLPOOL 08960a89ac748c2368a1d4e49ab461ceb0bb23bde8979c3287beac62ec7ddceac37a0e5c38db800eec384203847580997c88f4e470c80314705415cb1a1787ab +MISC ChangeLog 43394 SHA256 c9f4a812e7a06b9618293e4c18f68cbee52ce09a7f11b8cb1864f99bbc28c298 SHA512 349448680f6db819c6c9e25cb267842bb5171d327ab20fd05da2ac82c0958b1cbaaff2d37a7760fb29f0350761a9f1b57b11dd95f8b707f0ccb7665150bfba54 WHIRLPOOL 3bc6cf44d792514bb7226eff71cec8e1b1c97843852eaa3fafaf5e9931050510553cce8b25ba79bfcebc0294f8a31c598fa112591f7d5ff04adff9fe3b280d01 MISC metadata.xml 587 SHA256 6977b9daf0c11361cb1a1e8f44990a728c1420da4daeb5b8aacb0c4aa315ba34 SHA512 234effcc88c91018a986c4513dc7e1436123f0a4b25725bed5c704ae18143bd2827c3d97e39015d0f6b7b0218d32adfbc4f483899493cfbc47de6648bad21020 WHIRLPOOL 52deb1b8aa08dfcb8e4b655a10b00a83221b1a9918e0e26128718e50e89fe0fb3dc2b45dbf362534d41d31134ae5620e449704a7342eef74c9f3be30d8480056 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlSe3AwACgkQ1fmVwcYIWAbKHgCfXFt5sWfXMlKX6sKe1HPrHsdE -zxgAn0OGmYMD8y3yihdLW6+xLuu1eWTC -=jnpd +iEYEAREIAAYFAlS7moIACgkQCaWpQKGI+9Ru7ACfSQgxP82ED4B2nOwV43bnSW6O +3fwAn3bDb5BptHWNNeTLFvcRka5I6pj+ +=jVBq -----END PGP SIGNATURE----- diff --git a/app-text/evince/evince-3.14.1-r1.ebuild b/app-text/evince/evince-3.14.1-r1.ebuild new file mode 100644 index 000000000000..5ea939173d32 --- /dev/null +++ b/app-text/evince/evince-3.14.1-r1.ebuild @@ -0,0 +1,123 @@ +# 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.1 2015/01/18 11:35:29 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/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/files/evince-3.14.1-critical-warning.patch b/app-text/evince/files/evince-3.14.1-critical-warning.patch new file mode 100644 index 000000000000..e45da56f4fee --- /dev/null +++ b/app-text/evince/files/evince-3.14.1-critical-warning.patch @@ -0,0 +1,33 @@ +From 8875003da7f78a6fbba36fcc70d6ed2d372da7a6 Mon Sep 17 00:00:00 2001 +From: Carlos Garcia Campos +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 new file mode 100644 index 000000000000..38032e528469 --- /dev/null +++ b/app-text/evince/files/evince-3.14.1-disable-toggle-find.patch @@ -0,0 +1,23 @@ +From bfa59b72ed0c86192ca9b1f0882ca5119aa7fe12 Mon Sep 17 00:00:00 2001 +From: Carlos Garcia Campos +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 new file mode 100644 index 000000000000..d8fd8754da5a --- /dev/null +++ b/app-text/evince/files/evince-3.14.1-gnome-desktop.patch @@ -0,0 +1,26 @@ +From fa73b3b976a8aec415006d7fc99bab84d04650e4 Mon Sep 17 00:00:00 2001 +From: Marek Kasik +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 new file mode 100644 index 000000000000..aa07053ec726 --- /dev/null +++ b/app-text/evince/files/evince-3.14.1-incorrect-resolution.patch @@ -0,0 +1,39 @@ +From 24a3d032728ab6cc530fab45d4eb5e232677c928 Mon Sep 17 00:00:00 2001 +From: Gabor Kelemen +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 new file mode 100644 index 000000000000..b4436339f30e --- /dev/null +++ b/app-text/evince/files/evince-3.14.1-scroll-search.patch @@ -0,0 +1,35 @@ +From aa988afb009307c6b854b5da366d34e0ee2ea763 Mon Sep 17 00:00:00 2001 +From: Marek Kasik +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 new file mode 100644 index 000000000000..6d84190398bf --- /dev/null +++ b/app-text/evince/files/evince-3.14.1-show-correct.patch @@ -0,0 +1,38 @@ +From f2c908cf8a8f8d5d0fbed1bc0871c8bdb531f751 Mon Sep 17 00:00:00 2001 +From: Marek Kasik +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 new file mode 100644 index 000000000000..122a2c1448c8 --- /dev/null +++ b/app-text/evince/files/evince-3.14.1-thumbnail-size.patch @@ -0,0 +1,23 @@ +From 1820802ff261d1ca05acd3c3153918c0fd1c686f Mon Sep 17 00:00:00 2001 +From: Sebastian Keller +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 + -- cgit v1.2.3-65-gdbad