[Pkg-e-commits] [SCM] Enlightenment 17 branch, master, updated. debian/0.16.999.050+svn20081207-1-3-g24c0092
Albin Tonnerre
albin.tonnerre at gmail.com
Fri Jan 2 18:31:40 UTC 2009
The following commit has been merged in the master branch:
commit fefabb29148bddd01261bcf48d2e70a0a7a7eeb2
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date: Fri Jan 2 17:13:02 2009 +0100
Fix properly the file manager operations
diff --git a/debian/changelog b/debian/changelog
index a2b4c27..3bc68b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,9 @@ e17 (0.16.999.050+svn20081207-1) experimental; urgency=low
- Add buttons for halt/shutdown/etc to the syscon module for the default
profile. Without that, users upgrading from older versions would have an
empty 'system' menu
+ * debian/patches/{03_fix_src-bin-makefile,04_fix_e_fm_main_svn38418}.diff:
+ - Cherry-pick patches from SVN to fix the file manager operations when it
+ is installed in /usr/lib/enlightenment
* debian/patches/01_install_internal-use_binaries_in_usr_lib_enlightenment.diff:
- update, as a new binary going in /usr/lib/enlightenment was introduced
* lintian fixes:
diff --git a/debian/patches/03_fix_src-bin-makefile.diff b/debian/patches/03_fix_src-bin-makefile.diff
new file mode 100644
index 0000000..d114ba5
--- /dev/null
+++ b/debian/patches/03_fix_src-bin-makefile.diff
@@ -0,0 +1,67 @@
+diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
+index faef192..8d4b2ba 100644
+--- a/src/bin/Makefile.am
++++ b/src/bin/Makefile.am
+@@ -340,8 +340,7 @@ enlightenment_thumb_LDFLAGS = @e_libs@
+ enlightenment_fm_SOURCES = \
+ e_fm_main.c \
+ e_user.c \
+-e_sha1.c \
+-e_prefix.c
++e_sha1.c
+
+ enlightenment_fm_LDFLAGS = @e_libs@ @dlopen_libs@
+ enlightenment_fm_CFLAGS = $(INCLUDES)
+diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in
+index 6ac3d48..9775187 100644
+--- a/src/bin/Makefile.in
++++ b/src/bin/Makefile.in
+@@ -120,8 +120,7 @@ enlightenment_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(enlightenment_LDFLAGS) $(LDFLAGS) -o $@
+ am_enlightenment_fm_OBJECTS = enlightenment_fm-e_fm_main.$(OBJEXT) \
+ enlightenment_fm-e_user.$(OBJEXT) \
+- enlightenment_fm-e_sha1.$(OBJEXT) \
+- enlightenment_fm-e_prefix.$(OBJEXT)
++ enlightenment_fm-e_sha1.$(OBJEXT)
+ enlightenment_fm_OBJECTS = $(am_enlightenment_fm_OBJECTS)
+ enlightenment_fm_LDADD = $(LDADD)
+ enlightenment_fm_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+@@ -709,8 +708,7 @@ enlightenment_thumb_LDFLAGS = @e_libs@
+ enlightenment_fm_SOURCES = \
+ e_fm_main.c \
+ e_user.c \
+-e_sha1.c \
+-e_prefix.c
++e_sha1.c
+
+ enlightenment_fm_LDFLAGS = @e_libs@ @dlopen_libs@
+ enlightenment_fm_CFLAGS = $(INCLUDES)
+@@ -976,7 +974,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_xinerama.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_zone.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/enlightenment_fm-e_fm_main.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/enlightenment_fm-e_prefix.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/enlightenment_fm-e_sha1.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/enlightenment_fm-e_user.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/enlightenment_fm_op-e_fm_op.Po at am__quote@
+@@ -1046,20 +1043,6 @@ enlightenment_fm-e_sha1.obj: e_sha1.c
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(enlightenment_fm_CFLAGS) $(CFLAGS) -c -o enlightenment_fm-e_sha1.obj `if test -f 'e_sha1.c'; then $(CYGPATH_W) 'e_sha1.c'; else $(CYGPATH_W) '$(srcdir)/e_sha1.c'; fi`
+
+-enlightenment_fm-e_prefix.o: e_prefix.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(enlightenment_fm_CFLAGS) $(CFLAGS) -MT enlightenment_fm-e_prefix.o -MD -MP -MF $(DEPDIR)/enlightenment_fm-e_prefix.Tpo -c -o enlightenment_fm-e_prefix.o `test -f 'e_prefix.c' || echo '$(srcdir)/'`e_prefix.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/enlightenment_fm-e_prefix.Tpo $(DEPDIR)/enlightenment_fm-e_prefix.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='e_prefix.c' object='enlightenment_fm-e_prefix.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(enlightenment_fm_CFLAGS) $(CFLAGS) -c -o enlightenment_fm-e_prefix.o `test -f 'e_prefix.c' || echo '$(srcdir)/'`e_prefix.c
+-
+-enlightenment_fm-e_prefix.obj: e_prefix.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(enlightenment_fm_CFLAGS) $(CFLAGS) -MT enlightenment_fm-e_prefix.obj -MD -MP -MF $(DEPDIR)/enlightenment_fm-e_prefix.Tpo -c -o enlightenment_fm-e_prefix.obj `if test -f 'e_prefix.c'; then $(CYGPATH_W) 'e_prefix.c'; else $(CYGPATH_W) '$(srcdir)/e_prefix.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/enlightenment_fm-e_prefix.Tpo $(DEPDIR)/enlightenment_fm-e_prefix.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='e_prefix.c' object='enlightenment_fm-e_prefix.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(enlightenment_fm_CFLAGS) $(CFLAGS) -c -o enlightenment_fm-e_prefix.obj `if test -f 'e_prefix.c'; then $(CYGPATH_W) 'e_prefix.c'; else $(CYGPATH_W) '$(srcdir)/e_prefix.c'; fi`
+-
+ enlightenment_fm_op-e_fm_op.o: e_fm_op.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(enlightenment_fm_op_CFLAGS) $(CFLAGS) -MT enlightenment_fm_op-e_fm_op.o -MD -MP -MF $(DEPDIR)/enlightenment_fm_op-e_fm_op.Tpo -c -o enlightenment_fm_op-e_fm_op.o `test -f 'e_fm_op.c' || echo '$(srcdir)/'`e_fm_op.c
+ @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/enlightenment_fm_op-e_fm_op.Tpo $(DEPDIR)/enlightenment_fm_op-e_fm_op.Po
diff --git a/debian/patches/04_fix_e_fm_main_svn38418.diff b/debian/patches/04_fix_e_fm_main_svn38418.diff
new file mode 100644
index 0000000..f31390e
--- /dev/null
+++ b/debian/patches/04_fix_e_fm_main_svn38418.diff
@@ -0,0 +1,170 @@
+diff --git a/src/bin/e_fm_main.c b/src/bin/e_fm_main.c
+index a5facaa..cbc6f5c 100644
+--- a/src/bin/e_fm_main.c
++++ b/src/bin/e_fm_main.c
+@@ -40,10 +40,8 @@
+
+ #define E_TYPEDEFS
+ #include "e_fm_op.h"
+-#include "e_prefix.h"
+ #undef E_TYPEDEFS
+ #include "e_fm_op.h"
+-#include "e_prefix.h"
+
+ /* FIXME: things to add to the slave enlightenment_fm process and ipc to e:
+ *
+@@ -252,17 +250,6 @@ main(int argc, char **argv)
+ ecore_file_init();
+ ecore_ipc_init();
+
+- if (!e_prefix_determine(argv[0]))
+- {
+- fprintf(stderr,
+- "ERROR: Enlightenment cannot determine its installed\n"
+- " prefix from the system or argv[0].\n"
+- " This is because it is not on Linux AND has been\n"
+- " Executed strangely. This is unusual.\n"
+- );
+- e_prefix_fallback();
+- }
+-
+ ecore_event_handler_add(ECORE_EXE_EVENT_DATA, _e_fm_slave_data_cb, NULL);
+ ecore_event_handler_add(ECORE_EXE_EVENT_ERROR, _e_fm_slave_error_cb, NULL);
+ ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _e_fm_slave_del_cb, NULL);
+@@ -304,8 +291,6 @@ main(int argc, char **argv)
+ e_dbus_shutdown();
+ _e_storage_volume_edd_shutdown();
+
+- e_prefix_shutdown();
+-
+ ecore_ipc_shutdown();
+ ecore_file_shutdown();
+ eina_stringshare_shutdown();
+@@ -2173,9 +2158,11 @@ _e_prepare_command(E_Fm_Op_Type type, const char *args)
+ else
+ strcpy(command, "cp");
+
+- length = 256 + strlen(e_prefix_bin_get()) + strlen(args);
++ length = 256 + strlen(getenv("E_LIB_DIR")) + strlen(args);
+ buffer = malloc(length);
+- length = snprintf(buffer, length, "%s/enlightenment/enlightenment_fm_op %s %s", e_prefix_lib_get(), command, args);
++ length = snprintf(buffer, length,
++ "%s/enlightenment/enlightenment_fm_op %s %s",
++ getenv("E_LIB_DIR"), command, args);
+
+ return buffer;
+ }
+diff --git a/src/bin/e_prefix.c b/src/bin/e_prefix.c
+index dac1b13..f007a6e 100644
+--- a/src/bin/e_prefix.c
++++ b/src/bin/e_prefix.c
+@@ -29,6 +29,7 @@ e_prefix_determine(char *argv0)
+ {
+ char *p, buf[4096];
+
++ printf("e_prefix_determine()\n");
+ e_prefix_shutdown();
+
+ /* if user provides E_PREFIX - then use that or also more specific sub
+@@ -37,28 +38,40 @@ e_prefix_determine(char *argv0)
+ {
+ _prefix_path = strdup(getenv("E_PREFIX"));
+ if (getenv("E_BIN_DIR"))
+- snprintf(buf, sizeof(buf), "%s/bin", getenv("E_BIN_DIR"));
++ _prefix_path_bin = strdup(getenv("E_BIN_DIR"));
+ else
+- snprintf(buf, sizeof(buf), "%s/bin", _prefix_path);
+- _prefix_path_bin = strdup(buf);
++ {
++ snprintf(buf, sizeof(buf), "%s/bin", _prefix_path);
++ _prefix_path_bin = strdup(buf);
++ e_util_env_set("E_BIN_DIR", _prefix_path_bin);
++ }
+
+ if (getenv("E_LIB_DIR"))
+- snprintf(buf, sizeof(buf), "%s/lib", getenv("E_LIB_DIR"));
++ _prefix_path_lib = strdup(getenv("E_LIB_DIR"));
+ else
+- snprintf(buf, sizeof(buf), "%s/lib", _prefix_path);
+- _prefix_path_lib = strdup(buf);
++ {
++ snprintf(buf, sizeof(buf), "%s/lib", _prefix_path);
++ _prefix_path_lib = strdup(buf);
++ e_util_env_set("E_LIB_DIR", _prefix_path_lib);
++ }
+
+ if (getenv("E_DATA_DIR"))
+- snprintf(buf, sizeof(buf), "%s/"SHARE_D, getenv("E_DATA_DIR"));
++ _prefix_path_data = strdup(getenv("E_DATA_DIR"));
+ else
+- snprintf(buf, sizeof(buf), "%s/"SHARE_D, _prefix_path);
+- _prefix_path_data = strdup(buf);
++ {
++ snprintf(buf, sizeof(buf), "%s/"SHARE_D, _prefix_path);
++ _prefix_path_data = strdup(buf);
++ e_util_env_set("E_DATA_DIR", _prefix_path_data);
++ }
+
+ if (getenv("E_LOCALE_DIR"))
+- snprintf(buf, sizeof(buf), "%s/"LOCALE_D, getenv("E_LOCALE_DIR"));
++ _prefix_path_locale = strdup(getenv("E_LOCALE_DIR"));
+ else
+- snprintf(buf, sizeof(buf), "%s/"LOCALE_D, _prefix_path);
+- _prefix_path_locale = strdup(buf);
++ {
++ snprintf(buf, sizeof(buf), "%s/"LOCALE_D, _prefix_path);
++ _prefix_path_locale = strdup(buf);
++ e_util_env_set("E_LOCALE_DIR", _prefix_path_locale);
++ }
+ return 1;
+ }
+ /* no env var - examine process and possible argv0 */
+@@ -67,6 +80,10 @@ e_prefix_determine(char *argv0)
+ if (!_e_prefix_try_argv(argv0))
+ {
+ e_prefix_fallback();
++ e_util_env_set("E_PREFIX", _prefix_path);
++ e_util_env_set("E_BIN_DIR", _prefix_path_bin);
++ e_util_env_set("E_LIB_DIR", _prefix_path_lib);
++ e_util_env_set("E_DATA_DIR", _prefix_path_data);
+ return 0;
+ }
+ }
+@@ -121,14 +138,26 @@ e_prefix_determine(char *argv0)
+ else
+ {
+ e_prefix_fallback();
++ e_util_env_set("E_PREFIX", _prefix_path);
++ e_util_env_set("E_BIN_DIR", _prefix_path_bin);
++ e_util_env_set("E_LIB_DIR", _prefix_path_lib);
++ e_util_env_set("E_DATA_DIR", _prefix_path_data);
+ return 0;
+ }
+ }
++ e_util_env_set("E_PREFIX", _prefix_path);
++ e_util_env_set("E_BIN_DIR", _prefix_path_bin);
++ e_util_env_set("E_LIB_DIR", _prefix_path_lib);
++ e_util_env_set("E_DATA_DIR", _prefix_path_data);
+ return 1;
+ }
+ else
+ {
+ e_prefix_fallback();
++ e_util_env_set("E_PREFIX", _prefix_path);
++ e_util_env_set("E_BIN_DIR", _prefix_path_bin);
++ e_util_env_set("E_LIB_DIR", _prefix_path_lib);
++ e_util_env_set("E_DATA_DIR", _prefix_path_data);
+ return 0;
+ }
+ }
+@@ -136,6 +165,10 @@ e_prefix_determine(char *argv0)
+ }
+ }
+ e_prefix_fallback();
++ e_util_env_set("E_PREFIX", _prefix_path);
++ e_util_env_set("E_BIN_DIR", _prefix_path_bin);
++ e_util_env_set("E_LIB_DIR", _prefix_path_lib);
++ e_util_env_set("E_DATA_DIR", _prefix_path_data);
+ return 0;
+ }
+
--
Enlightenment 17
More information about the Pkg-e-commits
mailing list