Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (84037ce840c6f9f49c92a7b6daf8322aff1f2330)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (84037ce840c6f9f49c92a7b6daf8322aff1f2330)
  • Date: Mon, 12 May 2008 03:59:59 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

dev/null |binary
shell-term-fm/mc/CONFIGURE | 2 -
shell-term-fm/mc/DETAILS | 10 +++----
shell-term-fm/mc/HISTORY | 6 ----
shell-term-fm/mc/PRE_BUILD | 20 +++------------
shell-term-fm/mc/mc-4.6.1-bash-all.patch | 33
++++++++++++++++++++++++++
shell-term-fm/mc/mc-4.6.1-utf8-all.patch.bz2 |binary
shell-term-fm/mc/mc-4.6.2-pre1-patches-1.tbz2 | 0
8 files changed, 43 insertions(+), 28 deletions(-)

New commits:
commit 84037ce840c6f9f49c92a7b6daf8322aff1f2330
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

Revert "mc 4.6.2-pre1"

mc 4.6.2-pre1 doesn't compile and I don't see any reason why a
pre-release should be the default for a spell.

This reverts commit 4515155eb53776d629a45646891def5a5b289518.

diff --git a/shell-term-fm/mc/CONFIGURE b/shell-term-fm/mc/CONFIGURE
index d81db08..bf49686 100755
--- a/shell-term-fm/mc/CONFIGURE
+++ b/shell-term-fm/mc/CONFIGURE
@@ -1,4 +1,4 @@
-#config_query MC_UNICODE "Enable Unicode support?" n &&
+config_query MC_UNICODE "Enable Unicode support?" n &&

config_query_list MC_GLIB "MC depends on either glib or glib2" glib2 glib &&
config_query_list MC_SCREEN "MC depends on either ncurses or slang" ncurses
slang &&
diff --git a/shell-term-fm/mc/DETAILS b/shell-term-fm/mc/DETAILS
index 8282b35..42952e7 100755
--- a/shell-term-fm/mc/DETAILS
+++ b/shell-term-fm/mc/DETAILS
@@ -1,12 +1,12 @@
SPELL=mc
- VERSION=4.6.2-pre1
- PATCHLEVEL=0
+ VERSION=4.6.1
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://ftp.gnu.org/gnu/mc/$SOURCE
- WEB_SITE=http://www.gnu.org/software/mc/
+
SOURCE_URL[0]=http://www.ibiblio.org/pub/Linux/utils/file/managers/$SPELL/$SOURCE
+ WEB_SITE=http://www.ibiblio.org/mc/
ENTERED=20010922
-
SOURCE_HASH=sha512:348922624ddcaf1deb848c8a97895f92b93954a86985c0e5c28721e71fc175d5af784a24ebd50ac508f37880ae913ea99e32eecc27926e63ca02d5be82e8445c
+
SOURCE_HASH=sha512:61f837aaada88cfecc5165b9673ffc02308b3c9b50957782e5d265725c15b7943ed05baf5da1e79a50e186a73b82c7c30141c708c57dac49d60c9ee908347871
LICENSE[0]=GPL
KEYWORDS="console"
SHORT="The GNU Midnight Commander is a Unix file manager and
shell"
diff --git a/shell-term-fm/mc/HISTORY b/shell-term-fm/mc/HISTORY
index 58bd940..4c064ca 100644
--- a/shell-term-fm/mc/HISTORY
+++ b/shell-term-fm/mc/HISTORY
@@ -1,9 +1,3 @@
-2008-05-01 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 4.6.2-pre1, new WEB_SITE and SOURCE_URL[0]
- * mc-4.6.1-bash-all.patch, mc-4.6.1-utf8-all.patch.bz2: removed
patches
- * CONFIGURE: unicode support is included in Gentoo patch
- * PRE_BUILD, mc-4.6.2-pre1-patches-1.tbz2: added Gentoo patch
-
2008-04-09 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: cleaned up
* CONFIGURE, DEPENDS: added selection for ncurses/slang, cleaned up,
diff --git a/shell-term-fm/mc/PRE_BUILD b/shell-term-fm/mc/PRE_BUILD
index 1d71e4d..7afff00 100755
--- a/shell-term-fm/mc/PRE_BUILD
+++ b/shell-term-fm/mc/PRE_BUILD
@@ -1,20 +1,8 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-tar xjf $SPELL_DIRECTORY/mc-4.6.2-pre1-patches-1.tbz2 &&
+patch -p1 < $SPELL_DIRECTORY/mc-4.6.1-bash-all.patch &&

-patch -p1 < patches/01_all_gen_syntax.patch &&
-patch -p1 < patches/02_all_gen_nonblock.patch &&
-patch -p1 < patches/04_all_deb_off64t.patch &&
-patch -p1 < patches/22_all_deb_main.c.patch &&
-patch -p1 < patches/28_all_deb_mc-ctype.patch &&
-patch -p2 < patches/28_all_deb_mc-dontrewrite.patch &&
-patch -p0 < patches/45_all_deb_ftpfs_symlink2.patch &&
-patch -p1 < patches/48_all_deb_utf8-slang2.patch &&
-patch -p1 < patches/49_all_deb_64bit.patch &&
-patch -p1 < patches/50_all_deb_ignore_ftp_chmod_error.patch &&
-patch -p1 < patches/60_all_deb_recode.patch &&
-patch -p1 < patches/61_all_deb_escaping.patch &&
-patch -p1 < patches/62_all_deb_dont_hang_on_errors.patch &&
-patch -p1 < patches/63_all_deb_fix_whitespace_via_fish.patch &&
-patch -p0 < patches/64_all_deb_visible_tabs.patch
+if [[ $MC_UNICODE == y ]]; then
+ bunzip2 -c $SPELL_DIRECTORY/mc-4.6.1-utf8-all.patch.bz2 | patch -p1
+fi
diff --git a/shell-term-fm/mc/mc-4.6.1-bash-all.patch
b/shell-term-fm/mc/mc-4.6.1-bash-all.patch
new file mode 100644
index 0000000..e3e2afc
--- /dev/null
+++ b/shell-term-fm/mc/mc-4.6.1-bash-all.patch
@@ -0,0 +1,33 @@
+--- /src/subshell.c.000 2006-05-08 23:11:48.000000000 +0200
++++ /src/subshell.c 2006-10-28 15:40:46.000000000 +0200
+@@ -745,29 +745,13 @@ subshell_name_quote (const char *s)
+ memcpy (d, cmd_start, len);
+ d += len;
+
+- /*
+- * Print every character in octal format with the leading backslash.
+- * tcsh and zsh may require 4-digit octals, bash < 2.05b doesn't like
them.
+- */
+- if (subshell_type == BASH) {
+ for (; *s; s++) {
+- /* Must quote numbers, so that they are not glued to octals */
+ if (isalpha ((unsigned char) *s)) {
+ *d++ = (unsigned char) *s;
+ } else {
+- sprintf (d, "\\%03o", (unsigned char) *s);
+- d += 4;
+- }
+- }
+- } else {
+- for (; *s; s++) {
+- if (isalnum ((unsigned char) *s)) {
+- *d++ = (unsigned char) *s;
+- } else {
+ sprintf (d, "\\0%03o", (unsigned char) *s);
+ d += 5;
+ }
+- }
+ }
+
+ memcpy (d, common_end, sizeof (common_end));
+
diff --git a/shell-term-fm/mc/mc-4.6.1-utf8-all.patch.bz2
b/shell-term-fm/mc/mc-4.6.1-utf8-all.patch.bz2
new file mode 100644
index 0000000..992288e
Binary files /dev/null and b/shell-term-fm/mc/mc-4.6.1-utf8-all.patch.bz2
differ
diff --git a/shell-term-fm/mc/mc-4.6.2-pre1-patches-1.tbz2
b/shell-term-fm/mc/mc-4.6.2-pre1-patches-1.tbz2
deleted file mode 100644
index 1f38b03..0000000
Binary files a/shell-term-fm/mc/mc-4.6.2-pre1-patches-1.tbz2 and /dev/null
differ




Archive powered by MHonArc 2.6.24.

Top of Page