From ee4c53f5ff6947d44b3ecadac29abad12093a83d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 27 Aug 2013 22:14:06 +0200 Subject: [PATCH] enlightenment: fix regression introduced in 0.17.4 (blackscreen fix). --- .../patches/blackscreenfix.patch | 48 +++++++++++++++++++ srcpkgs/enlightenment/template | 2 +- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/enlightenment/patches/blackscreenfix.patch diff --git a/srcpkgs/enlightenment/patches/blackscreenfix.patch b/srcpkgs/enlightenment/patches/blackscreenfix.patch new file mode 100644 index 00000000000..c8f5c35d83c --- /dev/null +++ b/srcpkgs/enlightenment/patches/blackscreenfix.patch @@ -0,0 +1,48 @@ +From b17a9b9cc9438b6dfac4402ac4107f08e23a4373 Mon Sep 17 00:00:00 2001 +From: Chris Michael +Date: Wed, 29 May 2013 11:50:17 +0000 +Subject: Backport: 45b4d9f :: Move xinerama init until After randr has setup the screens. + +NB: Old Man, THIS should fix your black screen problem ;) + +Signed-off-by: Chris Michael +Signed-off-by: Deon Thomas +--- +diff --git a/src/bin/e_main.c b/src/bin/e_main.c +index ee8fd8a..ed58cfd 100644 +--- src/bin/e_main.c ++++ 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()) + { +-- +cgit v0.9.2 diff --git a/srcpkgs/enlightenment/template b/srcpkgs/enlightenment/template index 55601b64579..132d3428432 100644 --- a/srcpkgs/enlightenment/template +++ b/srcpkgs/enlightenment/template @@ -1,7 +1,7 @@ # Template file for 'enlightenment' pkgname=enlightenment version=0.17.4 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-static --enable-pam --disable-device-hal --enable-device-udev --disable-mount-hal --enable-mount-udisks