sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (1dcac5b324d8c70117d298d9cbd121d4f07ef366)

From: Pavel Vinogradov <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (1dcac5b324d8c70117d298d9cbd121d4f07ef366)
Date: Sun, 18 Sep 2016 21:32:03 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

editors/emacs/BUILD | 19 +----------
editors/emacs/CONFIGURE | 5 ++
editors/emacs/DEPENDS | 81
+++++++++++++++++++++++++-----------------------
editors/emacs/HISTORY | 8 ++++
editors/emacs/PRE_BUILD | 9 +++++
5 files changed, 66 insertions(+), 56 deletions(-)

New commits:
commit 1dcac5b324d8c70117d298d9cbd121d4f07ef366
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

editors/emacs: added new dependencies and features, corrected code for
scm branch + cleanups

diff --git a/editors/emacs/BUILD b/editors/emacs/BUILD
index c079582..9c6ef57 100755
--- a/editors/emacs/BUILD
+++ b/editors/emacs/BUILD
@@ -12,27 +12,12 @@ export LDFLAGS="${LDFLAGS//-Wl,-O1/}" &&
# XXX Causes a segfault during the bootstrapping
CFLAGS="${CFLAGS/-ftree-loop-if-convert-stores}" &&

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

- OPTS="$OPTS --build=${BUILD}" &&
-
- if [[ $CROSS_INSTALL == on ]]; then
- OPTS="$OPTS --host=${HOST}"
- fi &&
-
- # Fix broken permissions
- chmod +x build-aux/update-subdirs &&
-
- ./autogen.sh &&
- ./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 &&
+ default_build_configure &&
make bootstrap
else
default_build
diff --git a/editors/emacs/CONFIGURE b/editors/emacs/CONFIGURE
index 4340986..081abd1 100755
--- a/editors/emacs/CONFIGURE
+++ b/editors/emacs/CONFIGURE
@@ -1,2 +1,5 @@
config_query_list EMACS_XTOOLKIT "Select the X toolkit:" \
- gtk gtk3 lucid motif no
+ gtk gtk3 lucid motif no &&
+
+config_query_option EMACS_OPTS "Enable dynamic modules support?" n \
+ "--with-modules" "--without-modules"
diff --git a/editors/emacs/DEPENDS b/editors/emacs/DEPENDS
index 525574b..51e5fa7 100755
--- a/editors/emacs/DEPENDS
+++ b/editors/emacs/DEPENDS
@@ -1,9 +1,10 @@
case "$EMACS_XTOOLKIT" in
lucid)
optional_depends xaw3d \
- --with{,out}-xaw3d \
- "for fancy 3D-style scroll bars" &&
- if ! is_depends_enabled $SPELL xaw3d; then
+ "--with-xaw3d" \
+ "--without-xaw3d" \
+ "for fancy 3D-style scroll bars" &&
+ if ! is_depends_enabled ${SPELL} xaw3d; then
depends libxaw
fi
;;
@@ -11,7 +12,11 @@ case "$EMACS_XTOOLKIT" in
depends gtk+2
;;
gtk3)
- depends gtk+3
+ depends gtk+3 &&
+ optional_depends "webkitgtk3" \
+ "--with-xwidgets" \
+ "--without-xwidgets" \
+ "for XWidgets support"
;;
motif)
depends MOTIF
@@ -39,24 +44,24 @@ optional_depends "tiff" \
"--without-tiff" \
"for TIFF format support" &&

-optional_depends GIFLIB \
+optional_depends "GIFLIB" \
"--with-gif" \
"--without-gif" \
"for GIF format support" &&

-optional_depends libxpm \
- --with-xpm \
- --without-xpm \
+optional_depends "libxpm" \
+ "--with-xpm" \
+ "--without-xpm" \
"for XPM (X pixmap) suport" &&

-optional_depends librsvg2 \
- --with-rsvg \
- --without-rsvg \
+optional_depends "librsvg2" \
+ "--with-rsvg" \
+ "--without-rsvg" \
"for SVG (Scalable Vector Graphics) support" &&

-optional_depends imagemagick \
- --with-imagemagick \
- --without-imagemagick \
+optional_depends "imagemagick" \
+ "--with-imagemagick" \
+ "--without-imagemagick" \
"for ImageMagick image support" &&

optional_depends "gpm" \
@@ -64,14 +69,14 @@ optional_depends "gpm" \
"--without-gpm" \
"for mouse support on a GNU/Linux console" &&

-optional_depends libxml2 \
- --with-xml2 \
- --without-xml2 \
+optional_depends "libxml2" \
+ "--with-xml2" \
+ "--without-xml2" \
"for XML parsing support" &&

-optional_depends libxft \
- --with-xft \
- --without-xft \
+optional_depends "libxft" \
+ "--with-xft" \
+ "--without-xft" \
"for XFT anti-aliased font support" &&

#optional_depends libotf \
@@ -79,34 +84,34 @@ optional_depends libxft \
# --without-libotf \
# "for OpenType font support" &&

-optional_depends dbus \
- --with-dbus \
- --without-dbus \
+optional_depends "dbus" \
+ "--with-dbus" \
+ "--without-dbus" \
"for D-Bus support" &&

-optional_depends gconf2 \
- --with-gconf \
- --without-gconf \
+optional_depends "gconf2" \
+ "--with-gconf" \
+ "--without-gconf" \
"for GConf support" &&

-optional_depends libselinux \
- --with-selinux \
- --without-selinux \
+optional_depends "libselinux" \
+ "--with-selinux" \
+ "--without-selinux" \
"for SELinux support" &&

-optional_depends gnutls \
- --with-gnutls \
- --without-gnutls \
+optional_depends "gnutls" \
+ "--with-gnutls" \
+ "--without-gnutls" \
"for SSL/TLS support" &&

-optional_depends cairo \
- --with-cairo \
- --without-cairo \
+optional_depends "cairo" \
+ "--with-cairo" \
+ "--without-cairo" \
"use cairo for drawing" &&

-optional_depends zlib \
- --with-zlib \
- --without-zlib \
+optional_depends "zlib" \
+ "--with-zlib" \
+ "--without-zlib" \
"for zlib decompression support" &&

if [[ "$EMACS_BRANCH" == "scm" ]]; then
diff --git a/editors/emacs/HISTORY b/editors/emacs/HISTORY
index d8c400e..1051583 100644
--- a/editors/emacs/HISTORY
+++ b/editors/emacs/HISTORY
@@ -1,3 +1,11 @@
+2016-09-18 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD: ./configure ... -> default_build_configure for scm branch,
+ moved ./autogen.sh call to PRE_BUIILD, introduced EMACS_OPTS to OPTS
+ * CONFIGURE: added option for dynamic modules feature
+ * DEPENDS: optionally depends on webkitgtk3 if gtk3 interface was
+ selected, quoting++, reoved bashisms
+ * PRE_BUILD: added to handle scm branch
+
2016-09-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, DEPENDS: version 25.1
* A0B0F199.gpg: removed
diff --git a/editors/emacs/PRE_BUILD b/editors/emacs/PRE_BUILD
new file mode 100755
index 0000000..cf1cc4f
--- /dev/null
+++ b/editors/emacs/PRE_BUILD
@@ -0,0 +1,9 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+if [[ "$EMACS_BRANCH" == "scm" ]]; then
+ # No need to run ./autogen.sh twice
+ sed -i 's;./autogen.sh;true;' Makefile.in &&
+
+ ./autogen.sh
+fi

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (1dcac5b324d8c70117d298d9cbd121d4f07ef366), Pavel Vinogradov, 09/18/2016