Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (d3a6ea859f074a5204b08f0d07357980bf134de8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (d3a6ea859f074a5204b08f0d07357980bf134de8)
  • Date: Wed, 26 Nov 2014 13:26:49 -0600

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

editors/emacs/BUILD | 7 +++++--
editors/emacs/CONFIGURE | 2 ++
editors/emacs/DEPENDS | 28 +++++++++++++++++++---------
editors/emacs/DETAILS | 6 +++---
editors/emacs/DOWNLOAD | 8 --------
editors/emacs/HISTORY | 4 ++++
6 files changed, 33 insertions(+), 22 deletions(-)

New commits:
commit d3a6ea859f074a5204b08f0d07357980bf134de8
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

emacs: Switch to Git SCM

Emacs recently switched to Git, it seems, and the bzr repo is lagging
behind.

commit 522fad02ab4345af0bb41f9bdffdf110b8e6970b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

emacs: Allow selecting the X toolkit to use

diff --git a/editors/emacs/BUILD b/editors/emacs/BUILD
index 2675cc1..f5092cf 100755
--- a/editors/emacs/BUILD
+++ b/editors/emacs/BUILD
@@ -9,13 +9,16 @@ export LDFLAGS="${LDFLAGS/-z combreloc/}" &&
#
export LDFLAGS="${LDFLAGS//-Wl,-O1/}" &&

+OPTS="$OPTS --with-x-toolkit=$EMACS_XTOOLKIT" &&
if [[ "$EMACS_BRANCH" == "scm" ]]; then
# Crashes with -O3
export CFLAGS="${CFLAGS//-O3/-O2}" &&

- OPTS="$OPTS --build=${BUILD}"
+ OPTS="$OPTS --build=${BUILD}" &&

- [[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}"
+ if [[ $CROSS_INSTALL == on ]]; then
+ OPTS="$OPTS --host=${HOST}"
+ fi &&

# Fix broken permissions
chmod +x build-aux/update-subdirs &&
diff --git a/editors/emacs/CONFIGURE b/editors/emacs/CONFIGURE
new file mode 100755
index 0000000..4340986
--- /dev/null
+++ b/editors/emacs/CONFIGURE
@@ -0,0 +1,2 @@
+config_query_list EMACS_XTOOLKIT "Select the X toolkit:" \
+ gtk gtk3 lucid motif no
diff --git a/editors/emacs/DEPENDS b/editors/emacs/DEPENDS
index 2c7520b..65c76ec 100755
--- a/editors/emacs/DEPENDS
+++ b/editors/emacs/DEPENDS
@@ -1,7 +1,22 @@
-optional_depends "xaw3d" \
- --with-xaw3d \
- --without-xaw3d \
- "for fancy 3D-style scroll bars" &&
+case "$EMACS_XTOOLKIT" in
+ lucid)
+ optional_depends xaw3d \
+ --with{,out}-xaw3d \
+ "for fancy 3D-style scroll bars" &&
+ if ! is_depends_enabled $SPELL xaw3d; then
+ depends libxaw
+ fi
+ ;;
+ gtk)
+ depends gtk+2
+ ;;
+ gtk3)
+ depends gtk+3
+ ;;
+ motif)
+ depends MOTIF
+ ;;
+esac &&

optional_depends "imlib" \
"" \
@@ -53,11 +68,6 @@ optional_depends libxml2 \
--without-xml2 \
"for XML parsing support" &&

-optional_depends "gtk+2" \
- "--with-x-toolkit=gtk" \
- "" \
- "for GTK+2 look" &&
-
optional_depends libxft \
--with-xft \
--without-xft \
diff --git a/editors/emacs/DETAILS b/editors/emacs/DETAILS
index 41a66d9..8ca8935 100755
--- a/editors/emacs/DETAILS
+++ b/editors/emacs/DETAILS
@@ -2,9 +2,9 @@
SPELL=emacs
if [[ "$EMACS_BRANCH" == "scm" ]]; then
VERSION=$(get_scm_version)
- SOURCE=$SPELL-trunk.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-trunk
- SOURCE_URL[0]=bzr://bzr.savannah.gnu.org/emacs/trunk/:emacs-trunk
+ SOURCE=$SPELL-git.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
+ SOURCE_URL[0]=git://git.sv.gnu.org/emacs.git:emacs-git
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=1
else
diff --git a/editors/emacs/DOWNLOAD b/editors/emacs/DOWNLOAD
deleted file mode 100755
index e2d74a1..0000000
--- a/editors/emacs/DOWNLOAD
+++ /dev/null
@@ -1,8 +0,0 @@
-. $GRIMOIRE/FUNCTIONS &&
-
-if [[ "$EMACS_BRANCH" == "scm" ]]
-then
- bzr_download
-else
- default_download
-fi
diff --git a/editors/emacs/HISTORY b/editors/emacs/HISTORY
index e873644..8632f1b 100644
--- a/editors/emacs/HISTORY
+++ b/editors/emacs/HISTORY
@@ -1,3 +1,7 @@
+2014-11-26 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, CONFIGURE: Allow selecting the X toolkit to use
+ * DETAILS, DOWNLOAD: Switched to Git SCM
+
2014-07-16 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: Depedency for SVG support is on librsvg2




  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (d3a6ea859f074a5204b08f0d07357980bf134de8), Ismael Luceno, 11/26/2014

Archive powered by MHonArc 2.6.24.

Top of Page