diff --git a/srcpkgs/enlightenment/patches/blackscreenfix.patch b/srcpkgs/enlightenment/patches/blackscreenfix.patch deleted file mode 100644 index c8f5c35d83c..00000000000 --- a/srcpkgs/enlightenment/patches/blackscreenfix.patch +++ /dev/null @@ -1,48 +0,0 @@ -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 132d3428432..4c70396d346 100644 --- a/srcpkgs/enlightenment/template +++ b/srcpkgs/enlightenment/template @@ -1,7 +1,7 @@ # Template file for 'enlightenment' pkgname=enlightenment -version=0.17.4 -revision=4 +version=0.17.5 +revision=1 build_style=gnu-configure configure_args="--disable-static --enable-pam --disable-device-hal --enable-device-udev --disable-mount-hal --enable-mount-udisks @@ -14,11 +14,12 @@ short_desc="Enlightenment window manager DR17 (aka e17)" maintainer="Juan RP " license="BSD" distfiles="http://download.enlightenment.org/releases/${pkgname}-${version}.tar.bz2" -checksum=cb3acf3f255c273dcbf7c5cd985d48aaab0c57598557b107da0ebf1ce23ae669 +checksum=136bfe69ee8d2c885b393a8fc7d6d7378cbcd3da68c459bef1ee54b24d6bf9b5 hostmakedepends="pkg-config" -makedepends="alsa-lib-devel pam-devel e_dbus-devel>=${version} edje-devel>=${version} - eeze-devel>=${version} efreet-devel>=${version} elementary-devel>=${version}_2 +makedepends=" + alsa-lib-devel pam-devel e_dbus-devel>=${version} edje-devel>=${version} + eeze-devel>=${version} efreet-devel>=${version} elementary-devel>=${version} evas_generic_loaders>=${version} xcb-util-keysyms-devel hicolor-icon-theme desktop-file-utils"