Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (ef53d2bd205660a1c8b4e14d25c8d829f5126bb9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (ef53d2bd205660a1c8b4e14d25c8d829f5126bb9)
  • Date: Wed, 5 Aug 2009 07:22:14 -0500

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

x11/vnc/HISTORY | 4 ++++
x11/vnc/PRE_BUILD | 3 +++
x11/vnc/stdlib-include-fixes.patch | 33 +++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+)

New commits:
commit ef53d2bd205660a1c8b4e14d25c8d829f5126bb9
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

vnc: Added patch to fix bug 15330.

diff --git a/x11/vnc/HISTORY b/x11/vnc/HISTORY
index 0ebe4c4..63cb168 100644
--- a/x11/vnc/HISTORY
+++ b/x11/vnc/HISTORY
@@ -1,3 +1,7 @@
+2009-08-05 George Sherwood <gsherwood AT sourcemage.org>
+ * PRE_BUILD: Added patch. Bug #15330
+ * stdlib-include-fixes.patch: Added patch from Bug #15330
+
2008-06-25 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: stray space

diff --git a/x11/vnc/PRE_BUILD b/x11/vnc/PRE_BUILD
index fcf8539..88fb9bb 100755
--- a/x11/vnc/PRE_BUILD
+++ b/x11/vnc/PRE_BUILD
@@ -1,6 +1,9 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

+# Patch to fix Bug 15330
+patch -p0 < $SPELL_DIRECTORY/stdlib-include-fixes.patch &&
+
if [[ $VNC_SERVER == y ]]; then
# building Xvnc requires the X source tree #8752
if ! test -e $SOURCE_CACHE/xorg-server-$(installed_version xorg-server)*;
then
diff --git a/x11/vnc/stdlib-include-fixes.patch
b/x11/vnc/stdlib-include-fixes.patch
new file mode 100644
index 0000000..bd4ee79
--- /dev/null
+++ b/x11/vnc/stdlib-include-fixes.patch
@@ -0,0 +1,33 @@
+--- common/network/TcpSocket.h 2009-08-04 11:54:33.309180758 -0700
++++ common/network/TcpSocket.h 2009-08-04 11:54:44.254190679 -0700
+@@ -29,7 +29,7 @@
+ #define __NETWORK_TCP_SOCKET_H__
+
+ #include <network/Socket.h>
+-
++#include <cstdlib>
+ #include <list>
+
+ namespace network {
+--- unix/tx/TXImage.h 2009-08-04 11:56:13.726180121 -0700
++++ unix/tx/TXImage.h 2009-08-04 11:56:28.816180860 -0700
+@@ -32,7 +32,7 @@
+
+ #ifndef __TXIMAGE_H__
+ #define __TXIMAGE_H__
+-
++#include <cstdlib>
+ #include <X11/Xlib.h>
+ #include <rfb/PixelBuffer.h>
+ #include <rfb/ColourMap.h>
+--- unix/x0vncserver/Image.h 2009-08-04 11:57:38.605253378 -0700
++++ unix/x0vncserver/Image.h 2009-08-04 11:57:50.430195205 -0700
+@@ -21,7 +21,7 @@
+
+ #ifndef __IMAGE_H__
+ #define __IMAGE_H__
+-
++#include <cstdlib>
+ #include <X11/Xlib.h>
+ #include <X11/extensions/XShm.h>
+



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (ef53d2bd205660a1c8b4e14d25c8d829f5126bb9), George Sherwood, 08/05/2009

Archive powered by MHonArc 2.6.24.

Top of Page