2008-07-14 Darren Kenny <[email protected]> gnome-2-22
authordkenny
Mon, 14 Jul 2008 14:46:05 +0000
branchgnome-2-22
changeset 12467 6830bb7a5bbd
parent 12466 cc05ce1b1d3e
child 12468 34b8793610f3
2008-07-14 Darren Kenny <[email protected]> * base-specs/evince.spec, patches/evince-03-static-enum.diff: Add patch to fix crash when using presentation mode (bug#6724495), and logged upstream bugzilla bug#542924.
ChangeLog
base-specs/evince.spec
patches/evince-03-static-enum.diff
--- a/ChangeLog	Mon Jul 14 09:46:17 2008 +0000
+++ b/ChangeLog	Mon Jul 14 14:46:05 2008 +0000
@@ -1,3 +1,10 @@
+2008-07-14  Darren Kenny  <[email protected]>
+
+	* base-specs/evince.spec,
+	  patches/evince-03-static-enum.diff:
+	  Add patch to fix crash when using presentation mode (bug#6724495), and
+	  logged upstream bugzilla bug#542924.
+
 2008-07-14  Laszlo (Laca) Peter  <[email protected]>
 
 	* indiana/indiana-branded.speclist: add SUNWevolution-exchange.spec
--- a/base-specs/evince.spec	Mon Jul 14 09:46:17 2008 +0000
+++ b/base-specs/evince.spec	Mon Jul 14 14:46:05 2008 +0000
@@ -26,6 +26,8 @@
 Patch1:	      evince-01-menu-entry.diff
 # date:2006-05-29 type:branding owner:dkenny bugster:6430428,6431474,6553312
 Patch2:	      evince-02-gs-sfw.diff
+# date:2008-07-14 type:bug owner:dkenny bugster:6724495 bugzilla:542924
+Patch3:       evince-03-static-enum.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/%{name}
@@ -59,6 +61,7 @@
 %endif
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # Remove DOS line end chars. Fixes #395105.
 dos2unix -ascii po/be.po po/be.po
@@ -122,6 +125,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Mon Jul 14 2008 - [email protected]
+- Add patch evince-03-static-enum.diff to make GEnum types be "static const".
+  fixing bug#6724495, logged upstream bug#542924
 * Thu May 29 2008 - [email protected]
 - Bump to 2.22.2.
 * Wed Apr 09 2008 - [email protected]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/evince-03-static-enum.diff	Mon Jul 14 14:46:05 2008 +0000
@@ -0,0 +1,31 @@
+diff -up evince-2.22.2/libdocument/ev-transition-effect.c.orig evince-2.22.2/libdocument/ev-transition-effect.c
+--- evince-2.22.2/libdocument/ev-transition-effect.c.orig	2008-05-28 22:14:02.000000000 +0100
++++ evince-2.22.2/libdocument/ev-transition-effect.c	2008-07-14 14:09:41.986906712 +0100
+@@ -56,7 +56,7 @@ ev_transition_effect_type_get_type (void
+ 	static GType type = 0;
+ 
+ 	if (G_UNLIKELY (type == 0)) {
+-		const GEnumValue values[] = {
++		static const GEnumValue values[] = {
+ 			{ EV_TRANSITION_EFFECT_REPLACE, "EV_TRANSITION_EFFECT_REPLACE", "replace" },
+ 			{ EV_TRANSITION_EFFECT_SPLIT, "EV_TRANSITION_EFFECT_SPLIT", "split" },
+ 			{ EV_TRANSITION_EFFECT_BLINDS, "EV_TRANSITION_EFFECT_BLINDS", "blinds" },
+@@ -84,7 +84,7 @@ ev_transition_effect_alignment_get_type 
+ 	static GType type = 0;
+ 
+ 	if (G_UNLIKELY (type == 0)) {
+-		const GEnumValue values[] = {
++		static const GEnumValue values[] = {
+ 			{ EV_TRANSITION_ALIGNMENT_HORIZONTAL, "EV_TRANSITION_ALIGNMENT_HORIZONTAL", "horizontal" },
+ 			{ EV_TRANSITION_ALIGNMENT_VERTICAL, "EV_TRANSITION_ALIGNMENT_VERTICAL", "vertical" },
+ 			{ 0, NULL, NULL }
+@@ -102,7 +102,7 @@ ev_transition_effect_direction_get_type 
+ 	static GType type = 0;
+ 
+ 	if (G_UNLIKELY (type == 0)) {
+-		const GEnumValue values[] = {
++		static const GEnumValue values[] = {
+ 			{ EV_TRANSITION_DIRECTION_INWARD, "EV_TRANSITION_DIRECTION_INWARD", "inward" },
+ 			{ EV_TRANSITION_DIRECTION_OUTWARD, "EV_TRANSITION_DIRECTION_OUTWARD", "outward" },
+ 			{ 0, NULL, NULL }
+