Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (f318696bff94ad20f050ff501cd1c14d4bce6d06)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (f318696bff94ad20f050ff501cd1c14d4bce6d06)
  • Date: Mon, 20 Oct 2008 04:04:49 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

e-17/e_module-bling/HISTORY | 4 +
e-17/e_module-bling/PRE_BUILD | 1
e-17/e_module-bling/bling.econfig.patch | 110
--------------------------------
3 files changed, 4 insertions(+), 111 deletions(-)

New commits:
commit f318696bff94ad20f050ff501cd1c14d4bce6d06
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

e_module-bling: bling.econfig.patch applied upstream

diff --git a/e-17/e_module-bling/HISTORY b/e-17/e_module-bling/HISTORY
index 7689bb5..dc075be 100644
--- a/e-17/e_module-bling/HISTORY
+++ b/e-17/e_module-bling/HISTORY
@@ -1,3 +1,7 @@
+2008-10-20 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Remove bling.econfig.patch
+ * bling.econfig.patch: Removed, applied upstream
+
2008-09-18 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: CVS -> SVN
* DEPENDS: Depends on subversion
diff --git a/e-17/e_module-bling/PRE_BUILD b/e-17/e_module-bling/PRE_BUILD
index cac9cb9..c64a499 100755
--- a/e-17/e_module-bling/PRE_BUILD
+++ b/e-17/e_module-bling/PRE_BUILD
@@ -1,6 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/bling.econfig.patch &&

#
# No longer complaing about missing unneeded config.rpath
diff --git a/e-17/e_module-bling/bling.econfig.patch
b/e-17/e_module-bling/bling.econfig.patch
deleted file mode 100644
index f91951a..0000000
--- a/e-17/e_module-bling/bling.econfig.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -Naur e_module-bling-cvs.orig/Makefile.am e_module-bling-cvs/Makefile.am
---- e_module-bling-cvs.orig/Makefile.am 2008-02-28 19:00:08.751301877
-0800
-+++ e_module-bling-cvs/Makefile.am 2008-02-28 19:49:31.761276128 -0800
-@@ -1,4 +1,3 @@
--ACLOCAL_AMFLAGS = -I m4
- MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
- config.sub configure depcomp install-sh ltmain.sh \
- missing config.rpath mkinstalldirs
-@@ -26,7 +25,9 @@
- -id $(top_srcdir)/images \
- -fd $(top_srcdir)/fonts
-
--filesdir = $(datadir)
-+# data files for the module
-+filesdir = $(datadir)
-+
- files_DATA = module.desktop \
- e-module-bling.edj
-
-diff -Naur e_module-bling-cvs.orig/configure.in
e_module-bling-cvs/configure.in
---- e_module-bling-cvs.orig/configure.in 2008-02-28 19:00:08.751301877
-0800
-+++ e_module-bling-cvs/configure.in 2008-02-28 19:46:50.114936291 -0800
-@@ -1,17 +1,26 @@
-+dnl Process this file with autoconf to produce a configure script.
-+
-+# get rid of that stupid cache mechanism
- rm -f config.cache
-
--AC_PREREQ(2.59)
- AC_INIT([bling], [0.0.1], [ibukun AT xcomputerman.com])
--AC_CONFIG_HEADERS(config.h)
--AC_CONFIG_MACRO_DIR([m4])
--AM_INIT_AUTOMAKE([1.8 foreign])
--
-+AC_PREREQ(2.59)
-+AC_CONFIG_SRCDIR(configure.in)
- AC_CANONICAL_BUILD
- AC_CANONICAL_HOST
-+AC_ISC_POSIX
-+
-+AM_INIT_AUTOMAKE(1.8)
-+AM_CONFIG_HEADER(config.h)
-
- AC_PROG_CC
--AM_PROG_LIBTOOL
-+AM_PROG_CC_STDC
- AC_HEADER_STDC
-+AC_C_CONST
-+
-+define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
-+define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
-+AC_PROG_LIBTOOL
-
- #AM_GNU_GETTEXT([external])
- AM_GNU_GETTEXT_VERSION(0.14)
-@@ -20,45 +29,20 @@
- AC_SUBST(MODULE_ARCH)
- AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
-
--datadir="${libdir}/enlightenment/modules/${PACKAGE}"
--localedir=${datadir}/locale
--AC_SUBST(LOCALEDIR, "${localedir}")
--AC_DEFINE_UNQUOTED(LOCALEDIR, "${localedir}", "Module Locale Directory")
--
--#
--# Check EFL Libs
--#
--PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0])
--AC_ARG_WITH(edje-cc,
--[ --with-edje-cc=PATH specify a specific path to edje_cc],
--[
-- v=$withval;
-- edje_cc=$v
-- echo " Enlightenment edje_cc explicitly set to "$edje_cc;
--],[
-- edje_cc=$(pkg-config --variable=prefix edje)/bin/edje_cc
--])
--AC_SUBST(edje_cc)
--
--#
--# Check Enlightenment
--#
--AC_ARG_WITH(enlightenment-config,
--[ --with-enlightenment-config=E_CONFIG use enlightenment-config
specified ],
--[
-- E_CONFIG=$withval;
-- echo "using "$E_CONFIG" for enlightenment-config";
--],[
-- PROG="enlightenment-config";
-- AC_PATH_PROG(E_CONFIG, $PROG, "", $PATH)
--])
--
-+AC_PATH_PROG(EDJE_CC, "edje_cc", "", $PATH)
-+
-+AC_PATH_PROG(E_CONFIG, "enlightenment-config", "", $PATH)
- e_cflags=`$E_CONFIG --cflags`
- e_libs=`$E_CONFIG --libs`
- e_modules=`$E_CONFIG --module-dir`
- AC_SUBST(e_cflags)
- AC_SUBST(e_libs)
--AC_SUBST(e_modules)
-+
-+datadir="${e_modules}/${PACKAGE}"
-+AC_ARG_ENABLE(homedir-install,
-+ AS_HELP_STRING([--enable-homedir-install], [Install module in homedir]),
-+ [ datadir="${HOME}/.e/e/modules/${PACKAGE}" ]
-+)
-
- #######################################
- ## Simple X11 build/link



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (f318696bff94ad20f050ff501cd1c14d4bce6d06), Eric Sandall, 10/20/2008

Archive powered by MHonArc 2.6.24.

Top of Page