Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.61 grimoire by Vlad Glagolev (f127ed7a4c27d7463a20541b8b5cd382b97ce419)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.61 grimoire by Vlad Glagolev (f127ed7a4c27d7463a20541b8b5cd382b97ce419)
  • Date: Sun, 13 May 2012 15:27:14 -0500

GIT changes to stable-rc-0.61 grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

ChangeLog | 3 +++
FUNCTIONS | 8 ++++----
editors/elvis/DEPENDS | 6 +++++-
editors/elvis/HISTORY | 5 +++--
editors/elvis/badmatch.patch | 11 +++++++++++
utils/util-linux/CONFIGURE | 30 ++++++++++++++++++++++++++++++
utils/util-linux/FINAL | 11 +----------
utils/util-linux/HISTORY | 3 +++
utils/util-linux/PRE_BUILD | 6 +-----
9 files changed, 61 insertions(+), 22 deletions(-)

New commits:
commit f127ed7a4c27d7463a20541b8b5cd382b97ce419
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

util-linux: properly handle /etc/inittab upgrade
(cherry picked from commit 75091c855e9cd777ba717fd8e90c5b5b28d4df0a)

commit 98c566ced08a6a96c24099d72aaf698298f7505b
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

FUNCTIONS: have disable_pic handle multiple PIC opts
(cherry picked from commit c939eb35af04f393df2c7204e62cc4eb52b3dff8)

Conflicts:

ChangeLog

commit 2aa5634acf68fd2cca554348c5e78b189faeeee0
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

elvis: corrected X dep and crashing under Fluxbox and friends
(cherry picked from commit 8e90cd7ac13dab02ed068369d15a2624b47dfaa9)

diff --git a/ChangeLog b/ChangeLog
index 1af80e0..af5035b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2012-05-13 Remko van der Vossen <wich AT sourcemage.org>
+ * FUNCTIONS: have disable_pic handle multiple PIC opts
+
2012-05-11 Ismael Luceno <ismael AT sourcemage.org>
* perl-cpan/net-smtp-ssl: new spell, SSL support for Net::SMTP

diff --git a/FUNCTIONS b/FUNCTIONS
index 0eb70eb..c0fc73c 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -472,10 +472,10 @@ disable_pic() {
[[ "${SMGL_COMPAT_ARCHS[1]}" != "alpha" ]] ||
[[ "$1" == "force" ]]
then
- CFLAGS=${CFLAGS/-fPIC} &&
- CFLAGS=${CFLAGS/-DPIC} &&
- CXXFLAGS=${CXXFLAGS/-fPIC} &&
- CXXFLAGS=${CXXFLAGS/-DPIC}
+ CFLAGS=${CFLAGS//-fPIC} &&
+ CFLAGS=${CFLAGS//-DPIC} &&
+ CXXFLAGS=${CXXFLAGS//-fPIC} &&
+ CXXFLAGS=${CXXFLAGS//-DPIC}
fi
}

diff --git a/editors/elvis/DEPENDS b/editors/elvis/DEPENDS
index 7dc2945..c604c77 100755
--- a/editors/elvis/DEPENDS
+++ b/editors/elvis/DEPENDS
@@ -7,5 +7,9 @@ optional_depends libx11 \

if is_depends_enabled $SPELL libx11; then
depends expat &&
- depends libxft
+
+ optional_depends libxft \
+ "--with-xft" \
+ "--without-xft" \
+ "for Xft support in X11"
fi
diff --git a/editors/elvis/HISTORY b/editors/elvis/HISTORY
index 9917787..3744c61 100644
--- a/editors/elvis/HISTORY
+++ b/editors/elvis/HISTORY
@@ -1,10 +1,11 @@
2012-05-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: removed UPDATED; quoting paths
* DEPENDS: killed xorg-libs, see #14699 on old bug tracker; added
- missing deps
+ missing deps; made libxft optional
* BUILD: verbosity++; corrected manuals installation
* PRE_BUILD: apply the patches
- * badmatch.patch: added, official patch to ignore innocent X11 errors
+ * badmatch.patch: added, official patch to ignore innocent X11 errors;
+ include fixes for windowmanagers like Fluxbox and IceWM
* freetype.patch: added, to fix conflict with FreeType

2009-07-30 Ladislav Hagara <hgr AT vabo.cz>
diff --git a/editors/elvis/badmatch.patch b/editors/elvis/badmatch.patch
index d4cfb28..40d92eb 100644
--- a/editors/elvis/badmatch.patch
+++ b/editors/elvis/badmatch.patch
@@ -24,6 +24,17 @@


/* Test whether this GUI is available in this environment.
+@@ -1546,10 +1545,6 @@
+ x_ta_drawcursor(hadfocus);
+ }
+
+- /* Explicitly change the focus */
+- XSetInputFocus(x_display, xw->win, RevertToParent, x_now);
+- x_hasfocus = xw;
+- x_didcmd = ElvTrue;
+ return ElvTrue;
+ }
+
@@ -1719,6 +1720,7 @@
guicmd(NULL, "newtoolbar");

diff --git a/utils/util-linux/CONFIGURE b/utils/util-linux/CONFIGURE
index 3b00f63..1e8f012 100755
--- a/utils/util-linux/CONFIGURE
+++ b/utils/util-linux/CONFIGURE
@@ -1,3 +1,33 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
+local OLD_SPELL_VERSION="" &&
+spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)" &&
+
+# util-linux 2.20 needs ttyX in /etc/inittab without /dev
+# http://www.sourcemage.org/issues/110
+message "${MESSAGE_COLOR}Checking sanity of /etc/inittab...${DEFAULT_COLOR}"
&&
+
+if grep -iq "/dev/tty" "$INSTALL_ROOT/etc/inittab"; then
+ if is_version_less ${OLD_SPELL_VERSION} 2.20 && is_version_less 2.19.1
${VERSION}; then
+ message "${PROBLEM_COLOR}" &&
+ message "WARNING: $INSTALL_ROOT/etc/inittab needs syntax update. You
need to" &&
+ message "replace all '/dev/tty*' lines to 'tty*' equivalents, e.g.:" &&
+ message "${MESSAGE_COLOR}Before: tty1:linux:/sbin/agetty /dev/tty1 9600"
&&
+ message "After: tty1:linux:/sbin/agetty tty1 9600${PROBLEM_COLOR}" &&
+ message "Press 'n' to abort cast and do that manually by editing" &&
+ message "$INSTALL_ROOT/etc/inittab file under superuser, then recast
$SPELL." &&
+ message "${DEFAULT_COLOR}" &&
+
+ if ! query "Attempt to replace the lines automatically?" n; then
+ return 1
+ else
+ cp $INSTALL_ROOT/etc/inittab $INSTALL_ROOT/etc/inittab-$(date
+'%Y%m%d%H%M') &&
+ sedit "s:/dev/tty:tty:g" "$INSTALL_ROOT/etc/inittab" &&
+ message "${MESSAGE_COLOR}Updated${DEFAULT_COLOR}"
+ fi
+ fi
+fi &&
+
if [[ ! -e "$INSTALL_ROOT/etc/sysconfig/hwclock" ]]; then
config_query UTC "Should the hardware clock store time in UTC (may break
systems like MS Windows)?" y
fi
diff --git a/utils/util-linux/FINAL b/utils/util-linux/FINAL
index 7ebc168..25efe01 100755
--- a/utils/util-linux/FINAL
+++ b/utils/util-linux/FINAL
@@ -1,14 +1,5 @@
-# util-linux 2.20 needs ttyX in /etc/inittab without /dev
-# http://www.sourcemage.org/issues/110
-if [ "${VERSION:0:4}" == "2.20" ] && [ "${OLD_SPELL_VERSION:0:4}" == "2.19"
]; then
- message "New version of util-linux needs to update /etc/inittab ..." &&
- cp $INSTALL_ROOT/etc/inittab $INSTALL_ROOT/etc/inittab-$(date
+'%Y%m%d%H%M') &&
- sed -i "s:/dev/tty:tty:" $INSTALL_ROOT/etc/inittab &&
- message "Updated"
-fi &&
-
if test -f "$INSTALL_ROOT/etc/sysconfig/hwclock" && [[ $UTC ]]; then
sed -i "s/^UTC=.*$/UTC=$UTC/" "$INSTALL_ROOT/etc/sysconfig/hwclock"
-fi
+fi &&

persistent_remove UTC || true
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index 35fb0eb..8cdaf26 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,6 @@
+2012-05-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFIGURE, PRE_BUILD, FINAL: properly handle /etc/inittab upgrade
+
2012-04-14 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: unbrake AES version

diff --git a/utils/util-linux/PRE_BUILD b/utils/util-linux/PRE_BUILD
index 56366db..5757181 100755
--- a/utils/util-linux/PRE_BUILD
+++ b/utils/util-linux/PRE_BUILD
@@ -3,8 +3,4 @@ cd "$SOURCE_DIRECTORY" &&

if [[ $UL_VERSION == aes ]]; then
bzcat "$SOURCE_CACHE/$SOURCE3" | patch -p1
-fi &&
-
-# OLD_SPELL_VERSION is needed in FINAL
-local OLD_SPELL_VERSION=""
-spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
+fi



  • [SM-Commit] GIT changes to stable-rc-0.61 grimoire by Vlad Glagolev (f127ed7a4c27d7463a20541b8b5cd382b97ce419), Vlad Glagolev, 05/13/2012

Archive powered by MHonArc 2.6.24.

Top of Page