SOURCES: enlightenment-edirconf.patch, enlightenment-ac_am_fixes.p...
sparky
sparky at pld-linux.org
Mon Jul 17 23:41:55 CEST 2006
Author: sparky Date: Mon Jul 17 21:41:55 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for e16
---- Files affected:
SOURCES:
enlightenment-edirconf.patch (1.1 -> 1.2) , enlightenment-ac_am_fixes.patch (1.7 -> 1.8)
---- Diffs:
================================================================
Index: SOURCES/enlightenment-edirconf.patch
diff -u SOURCES/enlightenment-edirconf.patch:1.1 SOURCES/enlightenment-edirconf.patch:1.2
--- SOURCES/enlightenment-edirconf.patch:1.1 Wed Oct 27 23:12:42 2004
+++ SOURCES/enlightenment-edirconf.patch Mon Jul 17 23:41:50 2006
@@ -1,88 +1,49 @@
-diff -Nur enlightenment-0.16.7.1.orig/src/config.c enlightenment-0.16.7.1/src/config.c
---- enlightenment-0.16.7.1.orig/src/config.c 2004-08-20 23:35:46.000000000 +0200
-+++ enlightenment-0.16.7.1/src/config.c 2004-10-01 01:32:53.715493632 +0200
-@@ -3348,7 +3348,7 @@
- i++;
- }
- Esnprintf(execline, sizeof(execline), "%s " "-P " "-nostdinc " "-undef "
-- "-include %s/config/definitions " "-I%s " "-I%s/config "
-+ "-include %s/definitions " "-I%s " "-I%s "
- "-D ENLIGHTENMENT_VERSION=%s " "-D ENLIGHTENMENT_ROOT=%s "
- "-D ENLIGHTENMENT_BIN=%s "
- "-D ENLIGHTENMENT_THEME=%s " "-D ECONFDIR=%s "
-@@ -3357,7 +3357,7 @@
- "-D SCREEN_DEPTH_%i=1 " "-D USER_NAME=%s " "-D HOME_DIR=%s "
- "-D USER_SHELL=%s " "-D ENLIGHTENMENT_VERSION_015=1 "
- "%s %s/cached/cfg/%s.preparsed",
-- epp_path, EDirRoot(), themepath, EDirRoot(),
-+ epp_path, EDirConf(), themepath, EDirConf(),
- ENLIGHTENMENT_VERSION, EDirRoot(), EDirBin(),
- themepath, EDirUser(), EDirUserCache(), VRoot.w, VRoot.h,
- VRoot.w, VRoot.h, VRoot.depth, def_user, def_home, def_shell,
-@@ -3586,7 +3586,7 @@
- EDBUG_RETURN(Estrdup(s));
+diff -urd e16-0.16.8.1/src/config.c e16-0.16.8.1.edirconf/src/config.c
+--- e16-0.16.8.1/src/config.c 2006-03-28 20:06:00.000000000 +0200
++++ e16-0.16.8.1.edirconf/src/config.c 2006-07-17 21:58:47.000000000 +0200
+@@ -200,7 +200,7 @@
+ def_shell = usershell(getuid());
+
+ Esnprintf(execline, sizeof(execline), "%s " "-P " "-nostdinc " "-undef "
+- "-include %s/config/definitions " "-I%s " "-I%s/config "
++ "-include %s/definitions " "-I%s " "-I%s "
+ "-D ENLIGHTENMENT_VERSION=%s " "-D ENLIGHTENMENT_ROOT=%s "
+ "-D ENLIGHTENMENT_BIN=%s "
+ "-D ENLIGHTENMENT_THEME=%s " "-D ECONFDIR=%s "
+@@ -209,7 +209,7 @@
+ "-D SCREEN_DEPTH_%i=1 " "-D USER_NAME=%s " "-D HOME_DIR=%s "
+ "-D USER_SHELL=%s " "-D ENLIGHTENMENT_VERSION_015=1 "
+ "%s %s",
+- epp_path, EDirRoot(), Mode.theme.path, EDirRoot(),
++ epp_path, EDirConf(), Mode.theme.path, EDirConf(),
+ ENLIGHTENMENT_VERSION, EDirRoot(), EDirBin(),
+ Mode.theme.path, EDirUser(), EDirUserCache(), VRoot.w,
+ VRoot.h, VRoot.w, VRoot.h, VRoot.depth, def_user, def_home,
+@@ -450,7 +450,7 @@
+ }
/* look in system config dir */
-- Esnprintf(s, sizeof(s), "%s/config/%s", EDirRoot(), file);
-+ Esnprintf(s, sizeof(s), "%s/%s", EDirConf(), file);
- if (findLocalizedFile(s) || isfile(s))
- EDBUG_RETURN(Estrdup(s));
+- Esnprintf(s, sizeof(s), "%s/config", EDirRoot());
++ Esnprintf(s, sizeof(s), "%s", EDirConf());
+ p = FindFileLocalized(file, s, localized);
+ if (p)
+ return p;
+diff -urd e16-0.16.8.1/src/E.h e16-0.16.8.1.edirconf/src/E.h
+--- e16-0.16.8.1/src/E.h 2006-03-28 20:06:01.000000000 +0200
++++ e16-0.16.8.1.edirconf/src/E.h 2006-07-17 21:59:16.000000000 +0200
+@@ -825,6 +825,7 @@
-@@ -3615,7 +3615,7 @@
- EDBUG_RETURN(Estrdup(s));
-
- /* look in system config dir */
-- Esnprintf(s, sizeof(s), "%s/config/%s", EDirRoot(), file);
-+ Esnprintf(s, sizeof(s), "%s/%s", EDirConf(), file);
- if (findLocalizedFile(s) || isfile(s))
- EDBUG_RETURN(Estrdup(s));
-
-@@ -3692,7 +3692,7 @@
- EDBUG(5, "LoadEConfig");
-
- Esnprintf(s, sizeof(s), "%s/", EDirUser());
-- Esnprintf(s, sizeof(s), "%s/config/", EDirRoot());
-+ Esnprintf(s, sizeof(s), "%s/", EDirConf());
-
- /* save the current theme */
- if ((themelocation) && (themelocation[0] != 0))
-diff -Nur enlightenment-0.16.7.1.orig/src/E.h enlightenment-0.16.7.1/src/E.h
---- enlightenment-0.16.7.1.orig/src/E.h 2004-08-20 23:35:46.000000000 +0200
-+++ enlightenment-0.16.7.1/src/E.h 2004-10-01 01:23:11.338028464 +0200
-@@ -2381,6 +2381,7 @@
-
- /* misc.c */
- void BlumFlimFrub(void);
+ /* main.c */
+ void EExit(int exitcode);
+const char *EDirConf(void);
const char *EDirRoot(void);
const char *EDirBin(void);
- void EDirUserSet(const char *d);
-diff -Nur enlightenment-0.16.7.1.orig/src/file.c enlightenment-0.16.7.1/src/file.c
---- enlightenment-0.16.7.1.orig/src/file.c 2004-08-20 23:35:46.000000000 +0200
-+++ enlightenment-0.16.7.1/src/file.c 2004-10-01 01:30:04.091280432 +0200
-@@ -300,7 +300,7 @@
- {
- struct stat st;
-
-- EDBUG(9, "filesize");
-+ EDBUG(9, "fileinode");
- if ((!s) || (!*s))
- EDBUG_RETURN(0);
- if (stat(s, &st) < 0)
-@@ -313,7 +313,7 @@
- {
- struct stat st;
-
-- EDBUG(9, "filesize");
-+ EDBUG(9, "filedev");
- if ((!s) || (!*s))
- EDBUG_RETURN(0);
- if (stat(s, &st) < 0)
-diff -Nur enlightenment-0.16.7.1.orig/src/misc.c enlightenment-0.16.7.1/src/misc.c
---- enlightenment-0.16.7.1.orig/src/misc.c 2004-08-20 23:35:46.000000000 +0200
-+++ enlightenment-0.16.7.1/src/misc.c 2004-10-01 01:30:25.558016992 +0200
-@@ -76,6 +76,13 @@
- return ENLIGHTENMENT_ROOT;
+ const char *EDirUser(void);
+diff -urd e16-0.16.8.1/src/misc.c e16-0.16.8.1.edirconf/src/misc.c
+--- e16-0.16.8.1/src/misc.c 2006-03-28 20:06:01.000000000 +0200
++++ e16-0.16.8.1.edirconf/src/misc.c 2006-07-17 21:56:16.000000000 +0200
+@@ -147,6 +147,13 @@
+ return k1 + x * l;
}
+const char *
@@ -93,16 +54,5 @@
+
+
void
- EDirUserSet(const char *d)
- {
-diff -Nur enlightenment-0.16.7.1.orig/src/setup.c enlightenment-0.16.7.1/src/setup.c
---- enlightenment-0.16.7.1.orig/src/setup.c 2004-08-20 23:35:46.000000000 +0200
-+++ enlightenment-0.16.7.1/src/setup.c 2004-10-01 01:26:45.939404096 +0200
-@@ -568,6 +568,7 @@
+ ETimedLoopInit(int k1, int k2, int speed)
{
- char s[1024];
-
-+ // EDirConf ?
- Esetenv("EVERSION", ENLIGHTENMENT_VERSION, 1);
- Esetenv("EROOT", EDirRoot(), 1);
- Esetenv("EBIN", EDirBin(), 1);
================================================================
Index: SOURCES/enlightenment-ac_am_fixes.patch
diff -u SOURCES/enlightenment-ac_am_fixes.patch:1.7 SOURCES/enlightenment-ac_am_fixes.patch:1.8
--- SOURCES/enlightenment-ac_am_fixes.patch:1.7 Sun Dec 26 16:44:38 2004
+++ SOURCES/enlightenment-ac_am_fixes.patch Mon Jul 17 23:41:50 2006
@@ -1,6 +1,6 @@
-diff -Nur enlightenment-0.16.7.1.orig/config/Makefile.am enlightenment-0.16.7.1/config/Makefile.am
---- enlightenment-0.16.7.1.orig/config/Makefile.am 2004-07-12 21:41:53.000000000 +0200
-+++ enlightenment-0.16.7.1/config/Makefile.am 2004-10-09 20:19:33.830189704 +0200
+diff -urd e16-0.16.8.1/config/Makefile.am e16-0.16.8.1.edirconf/config/Makefile.am
+--- e16-0.16.8.1/config/Makefile.am 2006-03-18 22:58:14.000000000 +0100
++++ e16-0.16.8.1.edirconf/config/Makefile.am 2006-07-17 22:09:56.000000000 +0200
@@ -1,6 +1,6 @@
SUBDIRS = pix
@@ -10,32 +10,32 @@
backup-borders.cfg \
backup-colormodifiers.cfg \
@@ -14,10 +14,10 @@
- keybindings.cfg \
- menus.cfg
+ menus.cfg \
+ e16keyedit.db
-configdatadir = $(ENLIGHTENMENT_ROOT)/config
+configdatadir = $(sysconfdir)
- TRANSLATIONS = config.ja config.pl config.ko
+ TRANSLATIONS = # config.ja config.pl config.ko
-EXTRA_DIST = $(configdata_DATA) $(TRANSLATIONS) strings.c
+EXTRA_DIST = $(sysconf_DATA) $(TRANSLATIONS) strings.c
- install-data-local:
+ no-install-data-local:
$(mkinstalldirs) $(DESTDIR)$(configdatadir)
-diff -Nur enlightenment-0.16.7.1.orig/config/pix/Makefile.am enlightenment-0.16.7.1/config/pix/Makefile.am
---- enlightenment-0.16.7.1.orig/config/pix/Makefile.am 2003-07-15 07:46:24.000000000 +0200
-+++ enlightenment-0.16.7.1/config/pix/Makefile.am 2004-10-09 20:19:33.832189400 +0200
+diff -urd e16-0.16.8.1/config/pix/Makefile.am e16-0.16.8.1.edirconf/config/pix/Makefile.am
+--- e16-0.16.8.1/config/pix/Makefile.am 2003-07-15 07:46:24.000000000 +0200
++++ e16-0.16.8.1.edirconf/config/pix/Makefile.am 2006-07-17 22:06:17.000000000 +0200
@@ -1,4 +1,4 @@
-epixdir = $(ENLIGHTENMENT_ROOT)/config/pix
+epixdir = $(sysconfdir)/pix
epix_DATA = wait1.png wait2.png wait3.png wait4.png \
wait5.png wait6.png wait7.png wait8.png \
-diff -Nur enlightenment-0.16.7.1.orig/configure.in enlightenment-0.16.7.1/configure.in
---- enlightenment-0.16.7.1.orig/configure.in 2004-08-13 21:18:28.000000000 +0200
-+++ enlightenment-0.16.7.1/configure.in 2004-10-09 20:20:06.645201064 +0200
+diff -urd e16-0.16.8.1/configure.in e16-0.16.8.1.edirconf/configure.in
+--- e16-0.16.8.1/configure.in 2006-03-28 19:53:50.000000000 +0200
++++ e16-0.16.8.1.edirconf/configure.in 2006-07-17 22:11:57.000000000 +0200
@@ -30,7 +30,7 @@
- AC_DEFINE_UNQUOTED(ENLIGHTENMENT_RELEASE, "$ENLIGHTENMENT_RELEASE", [Release])
+ AC_DEFINE_UNQUOTED(ENLIGHTENMENT_RELEASE, "$ENLIGHTENMENT_RELEASE", [Release])
fi
-ALL_LINGUAS="bg bs da de en_US es fr hu ko nl no ru sv pt pl pt_BR tr ja"
@@ -43,17 +43,18 @@
AC_PROG_CC
AC_PROG_MAKE_SET
-@@ -70,9 +70,6 @@
- AC_SUBST(LIBINTL)
- fi
+@@ -68,10 +68,6 @@
+ AM_GNU_GETTEXT
+ AM_GNU_GETTEXT_VERSION(0.12.1)
-AC_ARG_ENABLE(fsstd,
-- [ --enable-fsstd install files following FSSTD [default=no]], ,enable_fsstd=no)
+- [ --enable-fsstd install files following FSSTD @<:@default=yes@:>@],,
+- enable_fsstd=yes)
-
AC_ARG_ENABLE(sound,
- [ --enable-sound compile with sound support [default=yes]], ,enable_sound=yes)
-
-@@ -89,20 +86,16 @@
+ [ --enable-sound compile with sound support @<:@default=yes@:>@],,
+ enable_sound=yes)
+@@ -92,20 +88,16 @@
dnl The following test must come after AM_GNU_GETTEXT as it relies on
dnl ${DATADIRNAME} being defined.
@@ -61,10 +62,10 @@
- LOCALEDIR=${prefix}/${DATADIRNAME}/locale
-else
- datadir=${prefix}
-- exec_prefix=${prefix}/enlightenment
-- LOCALEDIR=${prefix}/enlightenment/locale
+- exec_prefix=${prefix}/e16
+- LOCALEDIR=${prefix}/e16/locale
-fi
- ENLIGHTENMENT_ROOT=`eval echo ${datadir}/enlightenment`
+ ENLIGHTENMENT_ROOT=`eval echo ${datadir}/e16`
ENLIGHTENMENT_BIN=`eval echo ${bindir}`
+ENLIGHTENMENT_CONF=`eval echo ${sysconfdir}`
AC_SUBST(ENLIGHTENMENT_ROOT)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/enlightenment-edirconf.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/enlightenment-ac_am_fixes.patch?r1=1.7&r2=1.8&f=u
More information about the pld-cvs-commit
mailing list