Skip to Content.
Sympa Menu

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

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-0.61 grimoire by Vlad Glagolev (6bf31e0a2bdd4652e0b2def1e23ef8f1e57942b2)
  • Date: Thu, 12 Feb 2015 12:56:24 -0600

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

disk/lvm/HISTORY | 4 ++++
disk/lvm/PRE_BUILD | 4 ++++
disk/lvm/readline63.patch | 11 +++++++++++
disk/reiser4progs/BUILD | 2 +-
disk/reiser4progs/DEPENDS | 7 ++++++-
disk/reiser4progs/HISTORY | 6 ++++++
disk/reiser4progs/PRE_BUILD | 4 ++++
disk/reiser4progs/readline63.patch | 11 +++++++++++
http/lynx/HISTORY | 4 ++++
http/lynx/PRE_BUILD | 4 ++++
http/lynx/locale.patch | 11 +++++++++++
11 files changed, 66 insertions(+), 2 deletions(-)

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

reiser4progs: fixed build with readline 6.3

commit 4ba01339abaaeb7cb7082608c44c8c6d76429a3f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

lvm: fixed build with readline 6.3

commit 1d002cceeee95c0863bbf8fcfc23f0553c003220
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

lynx: fixed build with default CFLAGS

diff --git a/disk/lvm/HISTORY b/disk/lvm/HISTORY
index fcd0376..f26b79a 100644
--- a/disk/lvm/HISTORY
+++ b/disk/lvm/HISTORY
@@ -1,3 +1,7 @@
+2015-02-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: added, apply the patch
+ * readline63.patch: added, to fix build with readline 6.3
+
2012-02-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.02.92

diff --git a/disk/lvm/PRE_BUILD b/disk/lvm/PRE_BUILD
new file mode 100755
index 0000000..f57b714
--- /dev/null
+++ b/disk/lvm/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/readline63.patch"
diff --git a/disk/lvm/readline63.patch b/disk/lvm/readline63.patch
new file mode 100644
index 0000000..7f1c9d6
--- /dev/null
+++ b/disk/lvm/readline63.patch
@@ -0,0 +1,11 @@
+--- tools/lvm.c.orig 2015-02-12 09:49:09.480001104 +0000
++++ tools/lvm.c 2015-02-12 09:49:47.670001106 +0000
+@@ -186,7 +186,7 @@
+ char *input = NULL, *args[MAX_ARGS], **argv;
+
+ rl_readline_name = "lvm";
+- rl_attempted_completion_function = (CPPFunction *) _completion;
++ rl_attempted_completion_function = (rl_completion_func_t *)
_completion;
+
+ _read_history(cmd);
+
diff --git a/disk/reiser4progs/BUILD b/disk/reiser4progs/BUILD
index 131b8ab..a29ec08 100755
--- a/disk/reiser4progs/BUILD
+++ b/disk/reiser4progs/BUILD
@@ -1,2 +1,2 @@
-OPTS="${OPTS} ${LIB_MINIMAL}"
&&
+OPTS="${OPTS} ${LIB_MINIMAL}" &&
default_build
diff --git a/disk/reiser4progs/DEPENDS b/disk/reiser4progs/DEPENDS
index c0bb464..28716f2 100755
--- a/disk/reiser4progs/DEPENDS
+++ b/disk/reiser4progs/DEPENDS
@@ -1 +1,6 @@
-depends libaal
+depends libaal &&
+
+optional_depends readline \
+ "--with-readline" \
+ "--without-readline" \
+ "for fancy command line editing support"
diff --git a/disk/reiser4progs/HISTORY b/disk/reiser4progs/HISTORY
index 7ff8721..3b0d919 100644
--- a/disk/reiser4progs/HISTORY
+++ b/disk/reiser4progs/HISTORY
@@ -1,3 +1,9 @@
+2015-02-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing optional dependency -- readline
+ * BUILD: cleaned up
+ * PRE_BUILD: added, to apply the patch
+ * readline63.patch: added, to fix build with readline 6.3
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/disk/reiser4progs/PRE_BUILD b/disk/reiser4progs/PRE_BUILD
new file mode 100755
index 0000000..f57b714
--- /dev/null
+++ b/disk/reiser4progs/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/readline63.patch"
diff --git a/disk/reiser4progs/readline63.patch
b/disk/reiser4progs/readline63.patch
new file mode 100644
index 0000000..15cfd21
--- /dev/null
+++ b/disk/reiser4progs/readline63.patch
@@ -0,0 +1,11 @@
+--- libmisc/ui.c.orig 2015-02-12 13:38:15.110001105 +0000
++++ libmisc/ui.c 2015-02-12 13:41:23.940001104 +0000
+@@ -257,7 +257,7 @@
+ #if defined(HAVE_LIBREADLINE) && defined(HAVE_READLINE_READLINE_H)
+ rl_initialize();
+ rl_attempted_completion_function =
+- (CPPFunction *)misc_complete;
++ (rl_completion_func_t *)misc_complete;
+ #endif
+
+ aal_exception_set_handler(misc_exception_handler);
diff --git a/http/lynx/HISTORY b/http/lynx/HISTORY
index 7860812..3f7baeb 100644
--- a/http/lynx/HISTORY
+++ b/http/lynx/HISTORY
@@ -1,3 +1,7 @@
+2015-02-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: added, to apply the patch
+ * locale.patch: fixed build with default CFLAGS
+
2012-05-15 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added more dependencies
* BUILD: use LYNX_OPTS
diff --git a/http/lynx/PRE_BUILD b/http/lynx/PRE_BUILD
new file mode 100755
index 0000000..d028efb
--- /dev/null
+++ b/http/lynx/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/locale.patch"
diff --git a/http/lynx/locale.patch b/http/lynx/locale.patch
new file mode 100644
index 0000000..407f7b6
--- /dev/null
+++ b/http/lynx/locale.patch
@@ -0,0 +1,11 @@
+--- src/LYMain.c.orig 2015-02-11 17:08:22.080000232 +0000
++++ src/LYMain.c 2015-02-11 17:08:47.350000293 +0000
+@@ -57,7 +57,7 @@
+ #include <io.h>
+ #endif
+
+-#if defined(LOCALE) && !defined(HAVE_LIBINTL_H)
++#if defined(LOCALE)
+ #undef gettext /* Solaris locale.h prototypes
gettext() */
+ #include <locale.h>
+ #ifndef HAVE_GETTEXT



  • [SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (6bf31e0a2bdd4652e0b2def1e23ef8f1e57942b2), Vlad Glagolev, 02/12/2015

Archive powered by MHonArc 2.6.24.

Top of Page