svn commit: r326433 - in head/x11-wm/enlightenment: . files

[Grzegorz Blach]

Author: gblach
Date: Thu Sep  5 18:20:35 2013
New Revision: 326433
URL: http://svnweb.freebsd.org/changeset/ports/326433

Log:
  - Fix freeze when splash screen is enabled
  - Bump PORTREVISION
  
  Approved by:	crees, tabthorpe (mentors, implicit)

Added:
  head/x11-wm/enlightenment/files/patch-src-bin-e_main.c   (contents, props changed)
Modified:
  head/x11-wm/enlightenment/Makefile

Modified: head/x11-wm/enlightenment/Makefile
==============================================================================
--- head/x11-wm/enlightenment/Makefile	Thu Sep  5 18:15:29 2013	(r326432)
+++ head/x11-wm/enlightenment/Makefile	Thu Sep  5 18:20:35 2013	(r326433)
@@ -3,6 +3,7 @@
 
 PORTNAME=	enlightenment
 PORTVERSION=	0.17.4
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://download.enlightenment.fr/releases/ \

Added: head/x11-wm/enlightenment/files/patch-src-bin-e_main.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-wm/enlightenment/files/patch-src-bin-e_main.c	Thu Sep  5 18:20:35 2013	(r326433)
@@ -0,0 +1,34 @@
+--- src/bin/e_main.c.orig
++++ 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())
+      {