[SM-Commit] PERFORCE change 80324 by Flavien Bridault for review
Perforce Review Daemon
p4review at smee.org
Tue Jun 6 16:45:01 EDT 2006
Change 80324 by flavien_bridault at flavien-Gargamel on 2006/06/06 21:43:02
Added CVS version, that can use GTK+2, making emacs much nicer... :-)
Affected files ...
... //sgl/grimoires/devel/editors/emacs/BUILD#3 edit
... //sgl/grimoires/devel/editors/emacs/DEPENDS#3 edit
... //sgl/grimoires/devel/editors/emacs/DETAILS#7 edit
... //sgl/grimoires/devel/editors/emacs/HISTORY#14 edit
... //sgl/grimoires/devel/editors/emacs/PREPARE#1 add
Differences ...
==== //sgl/grimoires/devel/editors/emacs/BUILD#3 (xtext) ====
@@ -1,7 +1,24 @@
-# don't make it track all info files in /usr/share/info
-sedit 's:${COPYDESTS} ${infodir}:${COPYDESTS}:' Makefile.in &&
-# Fixes Bug #2938
-export LDFLAGS="${LDFLAGS/-z combreloc/}" &&
-# add support for AMD64 (modified patch from Gentoo)
-patch -p1 < $SCRIPT_DIRECTORY/emacs-21-amd64.diff &&
-default_build
+ # don't make it track all info files in /usr/share/info
+# sedit 's:${COPYDESTS} ${infodir}:${COPYDESTS}:' Makefile.in &&
+ # Fixes Bug #2938
+ export LDFLAGS="${LDFLAGS/-z combreloc/}" &&
+if [ "$CVS" == "y" ]; then
+ # Crashes with -03
+ export CFLAGS="${CFLAGS//-O3/-O2}" &&
+
+ OPTS="$OPTS --build=${BUILD}"
+
+ [[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}"
+
+ ./configure --prefix=${INSTALL_ROOT}/usr \
+ --sysconfdir=${INSTALL_ROOT}/etc \
+ --localstatedir=${INSTALL_ROOT}/var \
+ --mandir=${INSTALL_ROOT}/usr/share/man \
+ --infodir=${INSTALL_ROOT}/usr/share/info \
+ $OPTS &&
+ make bootstrap
+else
+ # add support for AMD64 (modified patch from Gentoo)
+ patch -p1 < $SCRIPT_DIRECTORY/emacs-21-amd64.diff &&
+ default_build
+fi
==== //sgl/grimoires/devel/editors/emacs/DEPENDS#3 (xtext) ====
@@ -9,26 +9,27 @@
"lets Emacs use its own color allocation functions" &&
optional_depends "libpng" \
- "" \
- "" \
+ "--with-png" \
+ "--without-png" \
"for PNG format support" &&
-optional_depends "zlib" \
- "" \
- "" \
- "for PNG format support" &&
-
optional_depends "jpeg" \
- "" \
- "" \
+ "--with-jpeg" \
+ "--without-jpeg" \
"for JPEG format support" &&
optional_depends "tiff" \
- "" \
- "" \
+ "--with-tiff" \
+ "--without-tiff" \
"for TIFF format support" &&
-optional_depends "libungif" \
+optional_depends LIBGIF \
+ "--with-gif" \
+ "--without-gif" \
+ "for GIF format support"
+if [ "$CVS" == "y" ]; then
+optional_depends "gtk+2" \
+ "--with-gtk" \
"" \
- "" \
- "for GIF format support"
+ "for GTK+2 look"
+fi
==== //sgl/grimoires/devel/editors/emacs/DETAILS#7 (xtext) ====
@@ -1,4 +1,15 @@
SPELL=emacs
+if [ "$CVS" == "y" ]; then
+ if [ "$CVS_AUTOUPDATE" == "y" ]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=cvs
+ fi
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=cvs://:pserver:anonymous@cvs.savannah.gnu.org:/sources/emacs:emacs
+ SOURCE_IGNORE=volatile
+else
VERSION=21.4a
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=${SOURCE}.sig
@@ -9,6 +20,7 @@
SOURCE2_URL[1]=ftp://ftp.gnu.org/pub/gnu/${SPELL}/${SOURCE2}
SOURCE_GPG=gnu-verified.gpg:${SOURCE2}
SOURCE2_IGNORE=signature
+fi
WEB_SITE=http://www.gnu.org/software/emacs
LICENSE[0]=GPL
ENTERED=20010922
==== //sgl/grimoires/devel/editors/emacs/HISTORY#14 (text) ====
@@ -1,3 +1,8 @@
+2006-06-05 Flavien Bridault <vlaaad at sourcemage.org>
+ * PREPARE, DETAILS, BUILD: added CVS building
+ * DEPENDS: added gtk+2 for CVS build, added configure options to
+ enable/disable image formats, replaced libungif by LIBGIF provider
+
2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
* DETAILS: (automated) Add KEYWORDS
More information about the SM-Commit
mailing list