From a3ac50da2d0c3d411ff7aa246dc7aa10cc762322 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Sat, 17 Dec 2011 11:07:21 +0000 Subject: [PATCH] Fix menu categories, bug #393585 by Sergey S. Starikoff; apply another patch from 2.32 branch to fix another crash. Remove old. Package-Manager: portage-2.1.10.40/cvs/Linux x86_64 --- app-text/evince/ChangeLog | 10 ++++++- app-text/evince/Manifest | 16 +++++----- ...32.0-r2.ebuild => evince-2.32.0-r4.ebuild} | 29 +++++++++++++------ ...e-2.32.0-create_thumbnail_frame-null.patch | 25 ++++++++++++++++ .../evince-2.32.0-desktop-categories.patch | 20 +++++++++++++ 5 files changed, 83 insertions(+), 17 deletions(-) rename app-text/evince/{evince-2.32.0-r2.ebuild => evince-2.32.0-r4.ebuild} (81%) create mode 100644 app-text/evince/files/evince-2.32.0-create_thumbnail_frame-null.patch create mode 100644 app-text/evince/files/evince-2.32.0-desktop-categories.patch diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog index 1583549c311b..493ee8b86067 100644 --- a/app-text/evince/ChangeLog +++ b/app-text/evince/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-text/evince # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.235 2011/12/04 04:34:41 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.236 2011/12/17 11:07:21 pacho Exp $ + +*evince-2.32.0-r4 (17 Dec 2011) + + 17 Dec 2011; Pacho Ramos +evince-2.32.0-r4.ebuild, + +files/evince-2.32.0-create_thumbnail_frame-null.patch, + +files/evince-2.32.0-desktop-categories.patch, -evince-2.32.0-r2.ebuild: + Fix menu categories, bug #393585 by Sergey S. Starikoff; apply another patch + from 2.32 branch to fix another crash. Remove old. 04 Dec 2011; Alexandre Rostovtsev evince-3.2.1.ebuild, evince-3.2.1-r1.ebuild: diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest index d6d00b8625cb..4dba9d00635f 100644 --- a/app-text/evince/Manifest +++ b/app-text/evince/Manifest @@ -1,7 +1,9 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 AUX evince-0.7.1-display-menu.patch 476 RMD160 a16a5e1f32490a7db219442b23cbcf77773e6bdd SHA1 73a97e83b12ad80f6645339978717bcf8c7da575 SHA256 1f450dfe57ef3325cb4642141d76fc8e7bf837c221d81a2593214913af058f4d +AUX evince-2.32.0-create_thumbnail_frame-null.patch 853 RMD160 a0f2b71a4a14425fb6b8c8d2e740fddfb848a425 SHA1 9f9ed33e6fdd3c58dfb861500b09947f701fd172 SHA256 3d6472d77e07602cca0e5834a3c132702facbaac1ae684fa86fa72893a7a0833 +AUX evince-2.32.0-desktop-categories.patch 709 RMD160 7d2b4c1135c07cba4b22f33cc6b18ac5507af1f9 SHA1 39b59d44a527c3eac810f1d26f9bb7bd0033a8fc SHA256 d95489555d5b48b4aba28b41265c2cb152dd5d5163e38df3e3b5dfbfbebcab53 AUX evince-2.32.0-dvi-CVEs.patch 3386 RMD160 af5b7e0f74566716b86974a1e2efc34e1b925be5 SHA1 3c4084017e790ed5f0a1a422c1c742e97f89918f SHA256 49d1ed8adc734a005d4d8fdc1912bb115d97f734071d64bcae0aae60f2b5626a AUX evince-2.32.0-dvi-security.patch 816 RMD160 e1183dbeac1e404098d042a2ef87cbdce6d075da SHA1 c557404ba9dbc56e6d02d41b6969fa4dcc558616 SHA256 86e1e3ae2af8471896594b063726d6e7390169c443864b11797b7e3b937caea8 AUX evince-2.32.0-gold.patch 445 RMD160 33f5c8b593ef7b8064111d74326c6abd3e211a46 SHA1 084160c0351907cb66f95984fcb72b8f10cd3af7 SHA256 5bfa37ed69f0754b8b9e9475c4f71e8b0a7b3b32925d72fb2e64f6efd69d693c @@ -16,16 +18,16 @@ AUX gconf-2.m4 1579 RMD160 48aa5e5e77d4c024efb70b643403bec8969fe815 SHA1 5e3c470 DIST evince-2.32.0.tar.bz2 2295272 RMD160 a2d52685ac119b70cf40f320de457b3dfbac2587 SHA1 2f06a2b9dfd8667f4b4c6e90be3c49f6fe026fc8 SHA256 2a4c91ae38f8b5028cebb91b9da9ddc50ea8ae3f3d429df89ba351da2d787ff7 DIST evince-3.2.1-synctex-1.17.patch.bz2 11938 RMD160 800c8f7254e9e225f74da7ce07e8167d28815bb5 SHA1 1c012cc97bad52876f34ef7571a9f77bee303b66 SHA256 929cf0300a4c67d447eeb417f8bfbaafa9988f036c23869728cd76c529243aa5 DIST evince-3.2.1.tar.xz 3782932 RMD160 74a81f8970542c46717ea47243973cb81dbc4ee8 SHA1 993610957907df22677dab6f46648edf4b998c8f SHA256 9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35 -EBUILD evince-2.32.0-r2.ebuild 3829 RMD160 8adb2145684d7d2309481c3bf50e3cfaf2234b88 SHA1 a659fceed843fb65e3c84d9dd763eacb6273eb31 SHA256 44ebc76ca4f11f58beeecb16bb3b9886fc14aaf776c3144912a4fa20c529eb33 EBUILD evince-2.32.0-r3.ebuild 4154 RMD160 46ae6aa4e6a43869f3e551c1bfc5929613ddbe1d SHA1 ba2072ddfc5bccd8b61b39b1ade13bcda22d2ee5 SHA256 daf8392de6a7c58c8bdd1e01b25877872ed475cf6bc9b94fed47c9dfa0719f79 +EBUILD evince-2.32.0-r4.ebuild 4300 RMD160 144068ef624777ab66c3e1faf5c95d30492318e0 SHA1 fdfa982ca28009bb20df48ed84e106f7854b677a SHA256 e409b234ffeb347a73375d89b667de23ad6c915c7519303d93b8dc03527c225d EBUILD evince-3.2.1-r1.ebuild 3315 RMD160 92c247163baec41d05afe9ba3a6296a434460342 SHA1 b44dbd3a80c6932611a23d441662696f57feea67 SHA256 b6f032566e3eb49c639c9ab564dba997d0e1af76ce890e537231cf7d918bc502 EBUILD evince-3.2.1.ebuild 2970 RMD160 0ee6603a7e00c25d68709b689173a3b881aead06 SHA1 5c77e44724659604de0489d19df593cae9600a2c SHA256 b0a3124f8cd97d1d8bcd905de6ab3370d3d432b679baa0154b9661282a8c3c11 -MISC ChangeLog 34822 RMD160 08f93b61c8837785ec183205b5348cfaf54345cc SHA1 0ed0635ff02e7f211faf3ade3d44647fba6b0a24 SHA256 b0248d0f52864d0824bae387b061449e034f99269370784df66b399ca2311ecf +MISC ChangeLog 35189 RMD160 466a6047e52b037a6c711e8ca7aa86fe1272c10b SHA1 e2bc9e940ddf3cecc002e82dbca37672cb509d1b SHA256 96cbbd905a769671d561693def8d6e42626248e58972263e2b2283f69e6cbd83 MISC metadata.xml 788 RMD160 ddf6d5febf8fc7ac34fb1635150d00a776868307 SHA1 733f3038b004e15b00ff9f6d5735bc0e48da9112 SHA256 0a7faaea7094f6abb9429988ccea9ba62daa7c251b894da77d3c38dc3d9b0f6a -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk7a+GcACgkQdjK8w9WeBnBsmAD/XmgAAyR8A8SKP506ytbWmenz -bjUSSQci/PhrQtVvA1oA/jofDCpX9IcDgCuOcc8rUyAfVFLvEUdc3VPC4QYaw8zY -=zIju +iEYEARECAAYFAk7sd+8ACgkQCaWpQKGI+9QBfwCcCT2jnXFqB72CZrTEyFI4Ra9S +zoMAnizZva5KT+QOconn5rz8NUBcTc1P +=mEvr -----END PGP SIGNATURE----- diff --git a/app-text/evince/evince-2.32.0-r2.ebuild b/app-text/evince/evince-2.32.0-r4.ebuild similarity index 81% rename from app-text/evince/evince-2.32.0-r2.ebuild rename to app-text/evince/evince-2.32.0-r4.ebuild index 1d96162b731d..e0b8f755cd65 100644 --- a/app-text/evince/evince-2.32.0-r2.ebuild +++ b/app-text/evince/evince-2.32.0-r4.ebuild @@ -1,9 +1,11 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.32.0-r2.ebuild,v 1.9 2011/11/16 10:56:15 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.32.0-r4.ebuild,v 1.1 2011/12/17 11:07:21 pacho Exp $ -EAPI="3" +EAPI="4" GCONF_DEBUG="yes" +GNOME2_LA_PUNT="yes" +GNOME_TARBALL_SUFFIX="bz2" inherit eutils gnome2 autotools @@ -12,7 +14,7 @@ HOMEPAGE="http://projects.gnome.org/evince/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris" IUSE="dbus debug djvu doc dvi gnome gnome-keyring +introspection nautilus t1lib tiff" @@ -70,7 +72,6 @@ pkg_setup() { --with-platform=gnome --with-gtk=2.0 --enable-help - --disable-maintainer-mode $(use_enable dbus) $(use_enable djvu) $(use_enable dvi) @@ -102,6 +103,18 @@ src_prepare() { # Update poppler api epatch "${FILESDIR}"/${P}-update-poppler.patch + # Stop the GtkSpinner when the loading window is hidden, upstream bug #637390 + epatch "${FILESDIR}"/${P}-stop-spinner.patch + + # Use a popup window instead of a toplevel for loading window, upstream bug #633475 + epatch "${FILESDIR}"/${P}-use-popup.patch + + # document: create_thumbnail_frame should return NULL when + epatch "${FILESDIR}"/${P}-create_thumbnail_frame-null.patch + + # Fix .desktop categories, upstream bug #666346 + epatch "${FILESDIR}"/${P}-desktop-categories.patch + # Fix intltoolize broken file, see upstream #577133 sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \ || die "intltoolize sed failed" @@ -117,12 +130,10 @@ src_prepare() { cp "${FILESDIR}/gconf-2.m4" m4/ || die "Copying gconf-2.m4 failed!" fi + # Fix underlinking with gold + epatch "${FILESDIR}"/${P}-gold.patch + intltoolize --force --copy --automake || die "intltoolize failed" eautoreconf gnome2_src_prepare } - -src_install() { - gnome2_src_install - find "${ED}" -name "*.la" -delete || die "remove of lafiles failed" -} diff --git a/app-text/evince/files/evince-2.32.0-create_thumbnail_frame-null.patch b/app-text/evince/files/evince-2.32.0-create_thumbnail_frame-null.patch new file mode 100644 index 000000000000..19eaf1c91a2a --- /dev/null +++ b/app-text/evince/files/evince-2.32.0-create_thumbnail_frame-null.patch @@ -0,0 +1,25 @@ +From 0fd1f66767ab3b71bef571bf734ce0038d696f4f Mon Sep 17 00:00:00 2001 +From: José Aliste +Date: Fri, 26 Nov 2010 14:56:45 +0000 +Subject: document: create_thumbnail_frame should return NULL when + +source_pixbuf is NULL and width and height are not positive. + +Fixes bug #594408 +(cherry picked from commit 3d8180a605e8c98172e9e0e739e22b7f50ed7bad) +--- +diff --git a/libdocument/ev-document-misc.c b/libdocument/ev-document-misc.c +index d597127..6099b7f 100644 +--- a/libdocument/ev-document-misc.c ++++ b/libdocument/ev-document-misc.c +@@ -56,7 +56,7 @@ create_thumbnail_frame (int width, + } + + /* make sure no one is passing us garbage */ +- g_assert (width_r >= 0 && height_r >= 0); ++ g_return_val_if_fail (width_r >= 0 && height_r >= 0, NULL); + + retval = gdk_pixbuf_new (GDK_COLORSPACE_RGB, + TRUE, 8, +-- +cgit v0.9.0.2 diff --git a/app-text/evince/files/evince-2.32.0-desktop-categories.patch b/app-text/evince/files/evince-2.32.0-desktop-categories.patch new file mode 100644 index 000000000000..eaceaed345fc --- /dev/null +++ b/app-text/evince/files/evince-2.32.0-desktop-categories.patch @@ -0,0 +1,20 @@ +From ed7cda334dddc08b4b10a4c1c49df3f6c0a1bc41 Mon Sep 17 00:00:00 2001 +From: Carlos Garcia Campos +Date: Sat, 17 Dec 2011 10:28:19 +0000 +Subject: evince.desktop: Add Office category + +Fixes bug #666346. +--- +diff --git a/data/evince.desktop.in.in b/data/evince.desktop.in.in +index e3b0160..7106d97 100644 +--- a/data/evince.desktop.in.in ++++ b/data/evince.desktop.in.in +@@ -13,5 +13,5 @@ X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=evince + X-GNOME-Bugzilla-Component=BugBuddyBugs + X-GNOME-Bugzilla-Version=@VERSION@ +-Categories=GNOME;GTK;Graphics;VectorGraphics;Viewer; ++Categories=GNOME;GTK;Office;Viewer;Graphics;VectorGraphics; + MimeType=@EVINCE_MIME_TYPES@ +-- +cgit v0.9.0.2 -- 2.26.2