Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (cc7d5d14363f7baa576ef15ac4153cedd6040826)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (cc7d5d14363f7baa576ef15ac4153cedd6040826)
  • Date: Thu, 21 Aug 2008 07:48:44 -0500

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

x11/lavaps/BUILD | 5 +++-
x11/lavaps/HISTORY | 4 +++
x11/lavaps/PRE_BUILD | 5 ++++
x11/lavaps/lavaps-2.7-build-fixes.patch | 34
++++++++++++++++++++++++++++++++
x11/lavaps/lavaps-2.7-gcc43.patch | 30 ++++++++++++++++++++++++++++
5 files changed, 77 insertions(+), 1 deletion(-)

New commits:
commit cc7d5d14363f7baa576ef15ac4153cedd6040826
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

lavaps: made it compile #14651

diff --git a/x11/lavaps/BUILD b/x11/lavaps/BUILD
index 3f4aea4..8c2cfe9 100755
--- a/x11/lavaps/BUILD
+++ b/x11/lavaps/BUILD
@@ -13,4 +13,7 @@ fi &&
--disable-schemas-install \
$OPTS &&

-make
+make_single &&
+make &&
+make_normal
+
diff --git a/x11/lavaps/HISTORY b/x11/lavaps/HISTORY
index 1f5821b..912f401 100644
--- a/x11/lavaps/HISTORY
+++ b/x11/lavaps/HISTORY
@@ -1,3 +1,7 @@
+2008-08-21 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * BUILD: make_single, failed with 5 jobs
+ * PRE_BUILD, 2 2.7 patches: made it compile using gentoo patches
#14651
+
2008-08-19 Robert Figura <rfigura AT sourcemage.org>
* DEPENDS: added dependency for libgnomeui

diff --git a/x11/lavaps/PRE_BUILD b/x11/lavaps/PRE_BUILD
new file mode 100755
index 0000000..8a08f46
--- /dev/null
+++ b/x11/lavaps/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SPELL_DIRECTORY/lavaps-2.7-build-fixes.patch
+patch -p1 < $SPELL_DIRECTORY/lavaps-2.7-gcc43.patch
diff --git a/x11/lavaps/lavaps-2.7-build-fixes.patch
b/x11/lavaps/lavaps-2.7-build-fixes.patch
new file mode 100644
index 0000000..08111f5
--- /dev/null
+++ b/x11/lavaps/lavaps-2.7-build-fixes.patch
@@ -0,0 +1,34 @@
+--- lavaps-2.7/src/process_model.cc
++++ lavaps-2.7/src/process_model.cc
+@@ -86,7 +86,7 @@
+ void
+ process_model::dump()
+ {
+- cout << int(this) << " "<< pid_ << " " << uid_ << " " << cmd_.c_str()
<< " " <<
++ cout << long(this) << " "<< pid_ << " " << uid_ << " " <<
cmd_.c_str() << " " <<
+ endl;
+ }
+
+--- lavaps-2.7/src/blob.cc
++++ lavaps-2.7/src/blob.cc
+@@ -503,7 +503,7 @@
+ blob::print()
+ {
+ ENTRY_TRACE(__FILE__,__LINE__);
+- cout << O_("blob: ") << (unsigned)this << O_(" x=") << x_ << O_("
step=") << x_step_ << O_(" num=") << num_ << O_(":");
++ cout << O_("blob: ") << (unsigned long)this << O_(" x=") << x_ <<
O_(" step=") << x_step_ << O_(" num=") << num_ << O_(":");
+ for (int i = 0; i < num_; i++) {
+ cout << O_(" ") << y_lows_[i] << O_("-") << y_highs_[i];
+ };
+--- lavaps-2.7/src/linux/proc/ps.h
++++ lavaps-2.7/src/linux/proc/ps.h
+@@ -5,9 +5,6 @@
+ /* get definition of HZ */
+ #include <asm/param.h>
+
+-/* get page info */
+-#include <asm/page.h>
+-
+ char *wchan(unsigned long);
+ char *find_func(unsigned long address);
+ void *xcalloc(void *pointer, int size);
diff --git a/x11/lavaps/lavaps-2.7-gcc43.patch
b/x11/lavaps/lavaps-2.7-gcc43.patch
new file mode 100644
index 0000000..9e79ec1
--- /dev/null
+++ b/x11/lavaps/lavaps-2.7-gcc43.patch
@@ -0,0 +1,30 @@
+diff -NrU5 lavaps-2.7.orig/src/const_str.hh lavaps-2.7/src/const_str.hh
+--- lavaps-2.7.orig/src/const_str.hh 2008-06-29 14:39:09.000000000 +0200
++++ lavaps-2.7/src/const_str.hh 2008-06-29 14:39:29.000000000 +0200
+@@ -22,10 +22,11 @@
+
+
+ #ifndef lavaps_const_str_h
+ #define lavaps_const_str_h
+
++#include <cstdlib>
+ #include <string.h>
+
+ class const_str {
+ protected:
+ const char *rep_;
+diff -NrU5 lavaps-2.7.orig/src/lava_signal.cc lavaps-2.7/src/lava_signal.cc
+--- lavaps-2.7.orig/src/lava_signal.cc 2008-06-29 14:38:04.000000000 +0200
++++ lavaps-2.7/src/lava_signal.cc 2008-06-29 14:40:13.000000000 +0200
+@@ -28,10 +28,11 @@
+ #include "main.hh"
+
+ #include <sys/time.h>
+ #include <sys/resource.h>
+ #include <sys/types.h>
++#include <cstring>
+ #include <signal.h>
+
+ int
+ lava_signal(int pid, int sig)
+ {



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (cc7d5d14363f7baa576ef15ac4153cedd6040826), Jaka Kranjc, 08/21/2008

Archive powered by MHonArc 2.6.24.

Top of Page