[enlightenment/f19] Fix startup crashes
Dan Mashal
vicodan at fedoraproject.org
Sat Oct 19 22:03:09 UTC 2013
commit 0f5e1c69a97c0b3fc88dc80136b788bc5cbe24f2
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date: Sat Oct 19 15:02:49 2013 -0700
Fix startup crashes
enlightenment.spec | 9 ++++++++-
fix-startup-crash.patch | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 44 insertions(+), 1 deletions(-)
---
diff --git a/enlightenment.spec b/enlightenment.spec
index e8ba2de..d3a8544 100644
--- a/enlightenment.spec
+++ b/enlightenment.spec
@@ -1,6 +1,6 @@
Name: enlightenment
Version: 0.17.4
-Release: 4%{?dist}
+Release: 5%{?dist}
License: BSD
Summary: Enlightenment window manager
Url: http://enlightenment.org
@@ -32,6 +32,9 @@ Requires: evas-generic-loaders >= 1.7.8
Requires: redhat-menus
Provides: firstboot(windowmanager) = enlightenment
+#Fix crashes on startup
+Patch0: fix-startup-crash.patch
+
%description
Enlightenment window manager is a lean, fast, modular and very extensible window
manager for X11 and Linux. It is classed as a "desktop shell" providing the
@@ -55,6 +58,7 @@ Headers, test programs and documentation for enlightenment
%prep
%setup -q
+%patch0 -p1
%build
%configure --disable-static --disable-rpath
@@ -90,6 +94,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
%{_includedir}/enlightenment
%changelog
+* Mon Oct 07 2013 Dan Mashal <dan.mashal at fedoraproject.org> 0.17.4-5
+- Fix startup crashes.
+
* Mon Oct 07 2013 Dan Mashal <dan.mashal at fedoraproject.org> 0.17.4-4
- Add hard runtime requirements so one package can install the entire stack.
diff --git a/fix-startup-crash.patch b/fix-startup-crash.patch
new file mode 100644
index 0000000..a52dba6
--- /dev/null
+++ b/fix-startup-crash.patch
@@ -0,0 +1,36 @@
+diff --git a/src/bin/e_main.c b/src/bin/e_main.c
+index ee8fd8a..ed58cfd 100644
+--- a/src/bin/e_main.c
++++ b/src/bin/e_main.c
+@@ -462,15 +462,6 @@ main(int argc, char **argv)
+ TS("E_Alert Init Done");
+ _e_main_shutdown_push(e_alert_shutdown);
+
+- TS("E_Xinerama Init");
+- if (!e_xinerama_init())
+- {
+- e_error_message_show(_("Enlightenment cannot initialize E_Xinerama!\n"));
+- _e_main_shutdown(-1);
+- }
+- TS("E_Xinerama Init Done");
+- _e_main_shutdown_push(e_xinerama_shutdown);
+-
+ TS("E_Hints Init");
+ e_hints_init();
+ TS("E_Hints Init Done");
+@@ -521,6 +512,15 @@ main(int argc, char **argv)
+ _e_main_shutdown_push(e_randr_shutdown);
+ TS("E_Randr Init Done");
+
++ TS("E_Xinerama Init");
++ if (!e_xinerama_init())
++ {
++ e_error_message_show(_("Enlightenment cannot initialize E_Xinerama!\n"));
++ _e_main_shutdown(-1);
++ }
++ TS("E_Xinerama Init Done");
++ _e_main_shutdown_push(e_xinerama_shutdown);
++
+ TS("E_Env Init");
+ if (!e_env_init())
+ {
More information about the scm-commits
mailing list