[SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (c8306056441bb2bf2ed8b1b879e53ed28416b126)

Juuso Alasuutari scm at sourcemage.org
Mon Apr 28 20:19:02 EDT 2008


GIT changes to master grimoire by Juuso Alasuutari <iuso at sourcemage.org>:

 net/wvstreams/BUILD             |    5 +----
 net/wvstreams/HISTORY           |    5 +++++
 net/wvstreams/PRE_BUILD         |    5 +++++
 net/wvstreams/gcc43.patch       |   11 +++++++++++
 net/wvstreams/include_fix.patch |   10 ++++++++++
 5 files changed, 32 insertions(+), 4 deletions(-)

New commits:
commit c8306056441bb2bf2ed8b1b879e53ed28416b126
Author: Juuso Alasuutari <iuso at sourcemage.org>
Commit: Juuso Alasuutari <iuso at sourcemage.org>

    wvstreams: Removed unnecessary forking of a sub-shell in BUILD.

commit 902f0ed1f0b162001118e0ac53c98fc77cebf3b4
Author: Juuso Alasuutari <iuso at sourcemage.org>
Commit: Juuso Alasuutari <iuso at sourcemage.org>

    wvstreams: Added patches to fix a missing include and a build error with gcc 4.3.

diff --git a/net/wvstreams/BUILD b/net/wvstreams/BUILD
index 8c79652..752c7f1 100755
--- a/net/wvstreams/BUILD
+++ b/net/wvstreams/BUILD
@@ -1,4 +1 @@
-(
-  export CPPFLAGS="-I/usr/include/qt"  &&
-  default_build
-)
+CPPFLAGS="-I/usr/include/qt $CPPFLAGS"  default_build
diff --git a/net/wvstreams/HISTORY b/net/wvstreams/HISTORY
index cade5ee..449182c 100644
--- a/net/wvstreams/HISTORY
+++ b/net/wvstreams/HISTORY
@@ -1,3 +1,8 @@
+2008-04-29 Juuso Alasuutari <iuso at sourcemage.org>
+	* include_fix.patch, gcc43.patch, PRE_BUILD: Added, fixes
+	  for a missing include and a build error with gcc 4.3.
+	* BUILD: Removed unnecessary sub-shell fork.
+
 2008-03-11 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated to 4.4.1
 
diff --git a/net/wvstreams/PRE_BUILD b/net/wvstreams/PRE_BUILD
new file mode 100755
index 0000000..34c9aac
--- /dev/null
+++ b/net/wvstreams/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build        &&
+cd  "$SOURCE_DIRECTORY"  &&
+
+patch -p0 < "$SCRIPT_DIRECTORY/include_fix.patch"  &&
+patch -p0 < "$SCRIPT_DIRECTORY/gcc43.patch"
diff --git a/net/wvstreams/gcc43.patch b/net/wvstreams/gcc43.patch
new file mode 100644
index 0000000..cef6d53
--- /dev/null
+++ b/net/wvstreams/gcc43.patch
@@ -0,0 +1,11 @@
+--- include/wvserialize.h~	2008-04-29 03:05:22.000000000 +0300
++++ include/wvserialize.h	2008-04-29 03:06:13.000000000 +0300
+@@ -349,7 +349,7 @@
+  * except as the last character.
+  */
+ template <>
+-extern WvString _wv_deserialize<WvString>(WvBuf &buf);
++WvString _wv_deserialize<WvString>(WvBuf &buf);
+ 
+ 
+ /** Deserialize a WvBuf. */
diff --git a/net/wvstreams/include_fix.patch b/net/wvstreams/include_fix.patch
new file mode 100644
index 0000000..4129218
--- /dev/null
+++ b/net/wvstreams/include_fix.patch
@@ -0,0 +1,10 @@
+--- include/uniconfkey.h~	2008-04-29 02:48:50.000000000 +0300
++++ include/uniconfkey.h	2008-04-29 02:49:03.000000000 +0300
+@@ -7,6 +7,7 @@
+ #ifndef __UNICONFKEY_H
+ #define __UNICONFKEY_H
+ 
++#include <limits.h>
+ #include "wvstring.h"
+ #include "wvlinklist.h"
+ 



More information about the SM-Commit mailing list