Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (ab6dd801f6de719eaa6da598c0b416293e1c9b2e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (ab6dd801f6de719eaa6da598c0b416293e1c9b2e)
  • Date: Sat, 5 Dec 2009 05:07:39 -0600

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

e/imlib2/DEPENDS | 5 -----
e/imlib2/DETAILS | 13 -------------
e/imlib2/HISTORY | 4 ++++
e/imlib2/PREPARE | 6 ------
e/imlib2/PRE_BUILD | 7 -------
5 files changed, 4 insertions(+), 31 deletions(-)

New commits:
commit ab6dd801f6de719eaa6da598c0b416293e1c9b2e
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

imlib2: removed non-working cvs option

diff --git a/e/imlib2/DEPENDS b/e/imlib2/DEPENDS
index 4b7dc70..5d73ff3 100755
--- a/e/imlib2/DEPENDS
+++ b/e/imlib2/DEPENDS
@@ -2,11 +2,6 @@ depends libtool &&
depends zlib &&
depends freetype2 &&

-if [[ $IMLIB2_CVS == y ]]; then
- depends CVS &&
- depends automake-1.9
-fi &&
-
if [[ -z $IMLIB2_X11 ]]; then
depends libx11
depends libxext
diff --git a/e/imlib2/DETAILS b/e/imlib2/DETAILS
index 7bbd017..103873c 100755
--- a/e/imlib2/DETAILS
+++ b/e/imlib2/DETAILS
@@ -1,23 +1,10 @@
SPELL=imlib2
-if [[ $IMLIB2_CVS == y ]]; then
- if [[ $IMLIB2_CVS_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=cvs
- fi
- SOURCE=$SPELL-cvs.tar.bz2
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-cvs"
-
SOURCE_URL[0]=cvs://:pserver:anonymous AT anoncvs.enlightenment.org:/var/cvs/e:e17/libs/$SPELL
- SOURCE_IGNORE=volatile
- FORCE_DOWNLOAD=on
-else
VERSION=1.4.2
SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/enlightenment/$SOURCE

SOURCE_HASH=sha512:d2db1f5efef58c1705cb7088b22323d29996229a2964655723f0e3812df08645b1c18b543bce774b990e2c3db32ff23b709059a1d8e941c0f7f45f1602661596
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION%-*}"
-fi
WEB_SITE=http://enlightenment.org/Libraries/Imlib2/
ENTERED=20010922
LICENSE[0]=BSD
diff --git a/e/imlib2/HISTORY b/e/imlib2/HISTORY
index 6561e1a..3b480a0 100644
--- a/e/imlib2/HISTORY
+++ b/e/imlib2/HISTORY
@@ -1,3 +1,7 @@
+2009-12-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS, DETAILS, PRE_BUILD: removed non-working CVS option
+ * PREPARE: removed
+
2009-6-19 Justin Boffemmyer <flux AT sourcemage.org>
* DEPENDS: corrected xorg-libs dependencies: now depends directly on
libx11 and libxext, and only when X support is selected (forgot to
diff --git a/e/imlib2/PREPARE b/e/imlib2/PREPARE
deleted file mode 100755
index 48873b9..0000000
--- a/e/imlib2/PREPARE
+++ /dev/null
@@ -1,6 +0,0 @@
-config_query IMLIB2_CVS "Use CVS version?" n &&
-
-if [[ $IMLIB2_CVS == y ]]; then
- config_query IMLIB2_CVS_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
diff --git a/e/imlib2/PRE_BUILD b/e/imlib2/PRE_BUILD
index e859dc1..0e20c0d 100755
--- a/e/imlib2/PRE_BUILD
+++ b/e/imlib2/PRE_BUILD
@@ -1,13 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-if [[ $IMLIB2_CVS == y ]]; then
- sed -i "s/root//" autogen.sh &&
- sed -i "s/; aclocal/; aclocal-1.9/" autogen.sh &&
- sed -i "s/; automake/; automake-1.9/" autogen.sh &&
- NOCONFIGURE=ON ./autogen.sh
-fi
-
if [[ $IMLIB2_X11 == "--without-x" ]]; then
patch -p0 < "$SCRIPT_DIRECTORY"/Imlib2.h.patch
fi



  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (ab6dd801f6de719eaa6da598c0b416293e1c9b2e), Arwed von Merkatz, 12/05/2009

Archive powered by MHonArc 2.6.24.

Top of Page