From 2d15118fd66f13dda4c7fa91b12386be6e5ef9de Mon Sep 17 00:00:00 2001
From: Rene Rebe <rene.rebe@gmx.net>
Date: Tue, 20 Jan 2004 17:49:12 +0000
Subject: [PATCH] worked arounded evas packaging bugs and added xdm
 registration and the rock registry parsing cron-job

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2205 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/rene/entrance/entrance.conf | 11 +++++++++
 package/rene/entrance/entrance.cron | 35 +++++++++++++++++++++++++++++
 package/rene/evas/evas.conf         |  4 ++--
 3 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 package/rene/entrance/entrance.cron

diff --git a/package/rene/entrance/entrance.conf b/package/rene/entrance/entrance.conf
index 74baa58f2..7c4f91937 100644
--- a/package/rene/entrance/entrance.conf
+++ b/package/rene/entrance/entrance.conf
@@ -22,5 +22,16 @@
 
 . $base/package/*/imlib2/e17.conf
 
+entrance_pm() {
+	register_xdm entrance 'Entrance - E17 display manager' \
+	             "$sbindir/entranced -nodaemon"
+
+	cp -fv $confdir/entrance.cron $root/etc/cron.daily/90-entrance
+	chmod +x $root/etc/cron.daily/90-entrance
+}
+
+var_append confopt " " "--with-xsession=/usr/X11/lib/X11/xdm/Xsession"
 var_append CC_WRAPPER_INSERT " " "-I$includedir -L$libdir"
 
+hook_add postmake 3 "entrance_pm"
+
diff --git a/package/rene/entrance/entrance.cron b/package/rene/entrance/entrance.cron
new file mode 100644
index 000000000..56b532de8
--- /dev/null
+++ b/package/rene/entrance/entrance.cron
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+s=0
+
+echo "Updating entrance session database from ROCK wm registry ..."
+for x in /usr/share/rock-registry/wm/* ; do
+	. $x
+
+	short="`basename $x`"
+	echo "  $name ($short) ..."
+
+	# adding into database ...
+	edb_ed /etc/opt/e17/entrance_config.db add /entrance/session/$s/title str $name
+	edb_ed /etc/opt/e17/entrance_config.db add /entrance/session/$s/session str $exec
+
+	# match entrance icon
+	icon=""
+	case "$short" in
+	  kde*) icon=kde ;;
+	  *nome*) icon=gnome ;;
+	  blackbox) icon=blackbox ;;
+	  windowmaker) icon=windowmaker ;;
+	  xfce) icon=xfce ;;
+	  *) icon=default ;;
+	esac
+	icon=$icon.png
+
+	edb_ed /etc/opt/e17/entrance_config.db add /entrance/session/$s/icon str $icon
+
+	echo $(( s++ ))
+done
+
+# set the session count ...
+edb_ed /etc/opt/e17/entrance_config.db add /entrance/session/count int $s
+
diff --git a/package/rene/evas/evas.conf b/package/rene/evas/evas.conf
index 8c05ec49e..5f9f7c9d6 100644
--- a/package/rene/evas/evas.conf
+++ b/package/rene/evas/evas.conf
@@ -30,7 +30,7 @@
 
 confopt="$confopt --enable-software-x11 --enable-gl-x11 \
 --enable-image-loader-png  --enable-image-loader-jpeg \
---enable-image-loader-eet \
+--enable-image-loader-eet --enable-image-loader-edb \
 --enable-cpu-c \
 --enable-scale-smooth \
 --enable-scale-sample \
@@ -51,5 +51,5 @@ confopt="$confopt --enable-software-x11 --enable-gl-x11 \
 --enable-convert-32-rgb-rot-0"
 
 # work around to utilize libpng ...
-var_append CC_WRAPPER_APPEND " " "-lz -lm"
+var_append CC_WRAPPER_APPEND " " "-lz -lm -L$libdir"