Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (7b12c2b26642fcaa843ffe0204b415c3a977dab9)

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 master grimoire by Vlad Glagolev (7b12c2b26642fcaa843ffe0204b415c3a977dab9)
  • Date: Sat, 21 Feb 2015 04:26:44 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

disk/reiser4progs/BUILD | 2 +-
disk/reiser4progs/DEPENDS | 7 ++++++-
disk/reiser4progs/HISTORY | 6 ++++++
disk/reiser4progs/PRE_BUILD | 4 ++++
disk/reiser4progs/readline63.patch | 11 +++++++++++
5 files changed, 28 insertions(+), 2 deletions(-)

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

reiser4progs: fixed build with readline 6.3
(cherry picked from commit 6bf31e0a2bdd4652e0b2def1e23ef8f1e57942b2)

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);



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (7b12c2b26642fcaa843ffe0204b415c3a977dab9), Vlad Glagolev, 02/21/2015

Archive powered by MHonArc 2.6.24.

Top of Page