From 1b81a7988e2a511e95e1d4769d6d78826ee012d4 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Tue, 21 Apr 2009 14:17:42 +0000 Subject: [PATCH] 1. embryo shoudl have soname 2. yes local.conf slipped in - ignore 3. added soname version release to module arch dirs 4. adapted extra-modules to use the revision in arch 5. made e17 also have a release rev 6. dummy release stuff in eet - wont use it as its already released. SVN revision: 40267 --- configure.ac | 5 ++++- enlightenment.pc.in | 1 + src/modules/conf_wallpaper2/e_int_config_wallpaper.c | 4 +++- x-ui.sh | 4 ++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index f1b8492a0..8c9edb253 100644 --- a/configure.ac +++ b/configure.ac @@ -26,6 +26,9 @@ define([AC_LIBTOOL_LANG_F77_CONFIG], [:]) AC_DISABLE_STATIC AC_PROG_LIBTOOL +release="ver-pre-svn-00" +AC_SUBST(release) + AC_CHECK_FUNCS(setenv) AC_CHECK_FUNCS(unsetenv) @@ -63,7 +66,7 @@ dnl AC_E_CHECK_PKG(VALGRIND, [valgrind >= 2.4.0], [], [:]) AC_SUBST(VALGRIND_CFLAGS) AC_SUBST(VALGRIND_LIBS) -MODULE_ARCH="$host_os-$host_cpu" +MODULE_ARCH="$host_os-$host_cpu-$release" AC_SUBST(MODULE_ARCH) AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture") diff --git a/enlightenment.pc.in b/enlightenment.pc.in index 70bb204a9..dc7b39849 100644 --- a/enlightenment.pc.in +++ b/enlightenment.pc.in @@ -4,6 +4,7 @@ libdir=@libdir@ includedir=@includedir@/@PACKAGE@ modules=@libdir@/@PACKAGE@/modules config_apps=@prefix@/share/@PACKAGE@/config-apps +release=@release@ Name: enlightenment Description: Enlightenmnt Window Manager diff --git a/src/modules/conf_wallpaper2/e_int_config_wallpaper.c b/src/modules/conf_wallpaper2/e_int_config_wallpaper.c index 347125bd5..a8ac205a8 100644 --- a/src/modules/conf_wallpaper2/e_int_config_wallpaper.c +++ b/src/modules/conf_wallpaper2/e_int_config_wallpaper.c @@ -11,7 +11,9 @@ // need to make thumb white rect better (shaded etc.) // need to make "theme wallpaper" have different look // need to make "exchange" wallpapers have a different look -// need to sort files (alphabetically/ by color? etc.) +// need indicator that sort is pending +// need signal to emit for popping down slide-up panel +// bug: animated wp doesnt workon first show typedef struct _Info Info; typedef struct _Smart_Data Smart_Data; diff --git a/x-ui.sh b/x-ui.sh index 3ed1192b5..b184a8d16 100755 --- a/x-ui.sh +++ b/x-ui.sh @@ -1,7 +1,7 @@ #!/bin/sh -Xephyr :1 -noreset -ac -br -dpi 284 -screen 480x640x16 & -#Xephyr :1 -noreset -ac -br -dpi 284 -screen 480x640 & +#Xephyr :1 -noreset -ac -br -dpi 284 -screen 480x640x16 & +Xephyr :1 -noreset -ac -br -dpi 284 -screen 480x640 & #Xephyr :1 -noreset -ac -br -dpi 284 -screen 640x480x16 & #Xephyr :1 -noreset -ac -br -dpi 284 -screen 640x480 & #Xephyr :1 -noreset -ac -br -dpi 181 -screen 320x320x16 &