Wed Aug 28 02:50:44 PDT 2013

2 files changed, 69 insertions, 13 deletions

diff --git a/extra/enlightenment17/PKGBUILD b/extra/enlightenment17/PKGBUILD
index 99555540e..5935d54e5 100644
--- a/extra/enlightenment17/PKGBUILD
+++ b/extra/enlightenment17/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 193669 2013-08-26 20:20:21Z ronald $
+# $Id: PKGBUILD 193683 2013-08-27 18:28:14Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=enlightenment17
 _pkgname=enlightenment
 pkgver=0.17.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Enlightenment window manager DR17 (aka e17)"
 arch=('i686' 'x86_64')
 url="http://www.enlightenment.org"
@@ -19,12 +19,25 @@ backup=('etc/enlightenment/sysactions.conf')
 options=('!libtool' '!emptydirs')
 install=enlightenment17.install
 source=(http://download.enlightenment.org/releases/$_pkgname-$pkgver.tar.gz
-  'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch')
+  'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch' 
+  'blackscreenfix.patch')
 sha1sums=('29f5f4c10bcc7b32f79013ccbc7257abeea78faf'
           'e08cc63cb8a188a06705b42d03e032b9fcfa7ee5'
           '3f53931ae86de8fe99e386aeb097521aac0decd8'
-          '86f1c5e36dc274c3101362532378be034e89c593')
+          '86f1c5e36dc274c3101362532378be034e89c593'
+          '85f9b1378ebb7a05ed7f0e8db6982d88a0f46be4')
+	
+prepare() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  patch -p0 < $srcdir/quickstart.patch
+
+  # upstream fix for blackscreen problem on existing configs
+  patch -Np1 -i $srcdir/blackscreenfix.patch
+
+  # default to systemd for sysactions
+  patch -Np0 < $srcdir/sysactions_systemd.patch
 
+}
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
 
@@ -32,11 +45,6 @@ build() {
   export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
   export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
 
-  patch -p0 < $srcdir/quickstart.patch
-
-  # default to systemd for sysactions
-  patch -Np0 < $srcdir/sysactions_systemd.patch 
-
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
@@ -67,13 +75,13 @@ package() {
   make DESTDIR=$pkgdir install
 
 # install license files
-  if [ -e $srcdir/$_pkgname-$_pkgver/COPYING ]; then
-    install -Dm644 $srcdir/$_pkgname-$_pkgver/COPYING \
+  if [ -e $srcdir/$_pkgname-$pkgver/COPYING ]; then
+    install -Dm644 $srcdir/$_pkgname-$pkgver/COPYING \
         $pkgdir/usr/share/licenses/$pkgname/COPYING
   fi
 
-  if [ -e $srcdir/$_pkgname-$_pkgver/COPYING-PLAIN ]; then
-    install -Dm644 $srcdir/$_pkgname-$_pkgver/COPYING-PLAIN \
+  if [ -e $srcdir/$_pkgname-$pkgver/COPYING-PLAIN ]; then
+    install -Dm644 $srcdir/$_pkgname-$pkgver/COPYING-PLAIN \
         $pkgdir/usr/share/licenses/$pkgname/COPYING-PLAIN
   fi
 
diff --git a/extra/enlightenment17/blackscreenfix.patch b/extra/enlightenment17/blackscreenfix.patch
new file mode 100644
index 000000000..817d6c105
--- /dev/null
+++ b/extra/enlightenment17/blackscreenfix.patch
@@ -0,0 +1,48 @@
+From b17a9b9cc9438b6dfac4402ac4107f08e23a4373 Mon Sep 17 00:00:00 2001
+From: Chris Michael <cp.michael@samsung.com>
+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 <cp.michael@samsung.com>
+Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
+---
+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())
+      {
+--
+cgit v0.9.2