Skip to Content.
Sympa Menu

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

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 (a961638bf33b82c2234ab53cc531106b5dbfe2b8)
  • Date: Wed, 9 May 2007 00:22:54 -0500

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

x11/tightvnc/BUILD | 4
x11/tightvnc/DETAILS | 9 --
x11/tightvnc/HISTORY | 6 +
x11/tightvnc/gcc34.patch | 156
-------------------------------------
x11/tightvnc/malloc-redefine.patch | 29 ------
5 files changed, 10 insertions(+), 194 deletions(-)

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

tightvnc: Updated to version 1.3.9. Removed not needed patches.

diff --git a/x11/tightvnc/BUILD b/x11/tightvnc/BUILD
index b958ecc..ee6d000 100755
--- a/x11/tightvnc/BUILD
+++ b/x11/tightvnc/BUILD
@@ -1,7 +1,3 @@
-patch -p0 < $SCRIPT_DIRECTORY/malloc-redefine.patch &&
-if ! use_gcc 3.3; then
- patch -p0 < $SCRIPT_DIRECTORY/gcc34.patch
-fi &&
xmkmf &&
make_single &&
make World &&
diff --git a/x11/tightvnc/DETAILS b/x11/tightvnc/DETAILS
index ac998ba..c63c002 100755
--- a/x11/tightvnc/DETAILS
+++ b/x11/tightvnc/DETAILS
@@ -1,17 +1,16 @@
SPELL=tightvnc
if [ "$DEVEL" = "y" ]; then
- VERSION=1.3dev5
- MD5[0]=becfca1b3151f612ddf4b262f59b9fbc
+ VERSION=1.3.9
+
SOURCE_HASH=sha512:e4fc1360bab6b9fba4474d167759bd9c442796c7866183eaf339da1df20485fc02938ea8631f5227516a7ee99e0f820723e586d6aa3faf9747325a89b3ad4e9c

else
- VERSION=1.2.9
-
SOURCE_HASH=sha512:c96c593ece0260d58b5623c4f392df96c5595930dc2e99a69e1cb10b1f2b90204b3244b6cad7bf89cb807ce3c57717caa43da98426a238d2a262eff667011e19
+ VERSION=1.3.9
+
SOURCE_HASH=sha512:e4fc1360bab6b9fba4474d167759bd9c442796c7866183eaf339da1df20485fc02938ea8631f5227516a7ee99e0f820723e586d6aa3faf9747325a89b3ad4e9c
fi
SOURCE=$SPELL-${VERSION}_unixsrc.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/vnc_unixsrc
SOURCE_URL[0]=$SOURCEFORGE_URL/vnc-tight/$SOURCE
WEB_SITE=http://www.tightvnc.com
ENTERED=20020326
- UPDATED=20030906
LICENSE=GPL
KEYWORDS="x11"
SHORT="tightvnc is a better vnc"
diff --git a/x11/tightvnc/HISTORY b/x11/tightvnc/HISTORY
index 64be1fb..875489f 100755
--- a/x11/tightvnc/HISTORY
+++ b/x11/tightvnc/HISTORY
@@ -1,3 +1,9 @@
+2007-05-09 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated devel and stable to 1.3.9.
+ * BUILD: Removed uneeded patches. Fixed Upstream
+ * gcc34.patch: Removed
+ * malloc-redefine.patch: Removed
+
2006-06-28 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Removed BUILD_API=2, set grimoire-wide

diff --git a/x11/tightvnc/gcc34.patch b/x11/tightvnc/gcc34.patch
deleted file mode 100644
index acd3fe2..0000000
--- a/x11/tightvnc/gcc34.patch
+++ /dev/null
@@ -1,156 +0,0 @@
---- Xvnc/include/Xpoll.h~ 2004-06-30 17:26:29.150359031 +0200
-+++ Xvnc/include/Xpoll.h 2004-06-30 17:31:44.504165469 +0200
-@@ -115,50 +115,50 @@
- * array.
- */
- #define XFD_ANYSET(p) \
-- ((p)->fds_bits[0] || (p)->fds_bits[1] || \
-- (p)->fds_bits[2] || (p)->fds_bits[3] || \
-- (p)->fds_bits[4] || (p)->fds_bits[5] || \
-- (p)->fds_bits[6] || (p)->fds_bits[7])
-+ ((p)->__fds_bits[0] || (p)->__fds_bits[1] || \
-+ (p)->__fds_bits[2] || (p)->__fds_bits[3] || \
-+ (p)->__fds_bits[4] || (p)->__fds_bits[5] || \
-+ (p)->__fds_bits[6] || (p)->__fds_bits[7])
-
- #define XFD_COPYSET(src,dst) \
-- (dst)->fds_bits[0] = (src)->fds_bits[0]; \
-- (dst)->fds_bits[1] = (src)->fds_bits[1]; \
-- (dst)->fds_bits[2] = (src)->fds_bits[2]; \
-- (dst)->fds_bits[3] = (src)->fds_bits[3]; \
-- (dst)->fds_bits[4] = (src)->fds_bits[4]; \
-- (dst)->fds_bits[5] = (src)->fds_bits[5]; \
-- (dst)->fds_bits[6] = (src)->fds_bits[6]; \
-- (dst)->fds_bits[7] = (src)->fds_bits[7];
-+ (dst)->__fds_bits[0] = (src)->__fds_bits[0]; \
-+ (dst)->__fds_bits[1] = (src)->__fds_bits[1]; \
-+ (dst)->__fds_bits[2] = (src)->__fds_bits[2]; \
-+ (dst)->__fds_bits[3] = (src)->__fds_bits[3]; \
-+ (dst)->__fds_bits[4] = (src)->__fds_bits[4]; \
-+ (dst)->__fds_bits[5] = (src)->__fds_bits[5]; \
-+ (dst)->__fds_bits[6] = (src)->__fds_bits[6]; \
-+ (dst)->__fds_bits[7] = (src)->__fds_bits[7];
-
- #define XFD_ANDSET(dst,b1,b2) \
-- (dst)->fds_bits[0] = ((b1)->fds_bits[0] & (b2)->fds_bits[0]);
\
-- (dst)->fds_bits[1] = ((b1)->fds_bits[1] & (b2)->fds_bits[1]);
\
-- (dst)->fds_bits[2] = ((b1)->fds_bits[2] & (b2)->fds_bits[2]);
\
-- (dst)->fds_bits[3] = ((b1)->fds_bits[3] & (b2)->fds_bits[3]);
\
-- (dst)->fds_bits[4] = ((b1)->fds_bits[4] & (b2)->fds_bits[4]);
\
-- (dst)->fds_bits[5] = ((b1)->fds_bits[5] & (b2)->fds_bits[5]);
\
-- (dst)->fds_bits[6] = ((b1)->fds_bits[6] & (b2)->fds_bits[6]);
\
-- (dst)->fds_bits[7] = ((b1)->fds_bits[7] & (b2)->fds_bits[7]);
-+ (dst)->__fds_bits[0] = ((b1)->__fds_bits[0] &
(b2)->__fds_bits[0]); \
-+ (dst)->__fds_bits[1] = ((b1)->__fds_bits[1] &
(b2)->__fds_bits[1]); \
-+ (dst)->__fds_bits[2] = ((b1)->__fds_bits[2] &
(b2)->__fds_bits[2]); \
-+ (dst)->__fds_bits[3] = ((b1)->__fds_bits[3] &
(b2)->__fds_bits[3]); \
-+ (dst)->__fds_bits[4] = ((b1)->__fds_bits[4] &
(b2)->__fds_bits[4]); \
-+ (dst)->__fds_bits[5] = ((b1)->__fds_bits[5] &
(b2)->__fds_bits[5]); \
-+ (dst)->__fds_bits[6] = ((b1)->__fds_bits[6] &
(b2)->__fds_bits[6]); \
-+ (dst)->__fds_bits[7] = ((b1)->__fds_bits[7] &
(b2)->__fds_bits[7]);
-
- #define XFD_ORSET(dst,b1,b2) \
-- (dst)->fds_bits[0] = ((b1)->fds_bits[0] | (b2)->fds_bits[0]);
\
-- (dst)->fds_bits[1] = ((b1)->fds_bits[1] | (b2)->fds_bits[1]);
\
-- (dst)->fds_bits[2] = ((b1)->fds_bits[2] | (b2)->fds_bits[2]);
\
-- (dst)->fds_bits[3] = ((b1)->fds_bits[3] | (b2)->fds_bits[3]);
\
-- (dst)->fds_bits[4] = ((b1)->fds_bits[4] | (b2)->fds_bits[4]);
\
-- (dst)->fds_bits[5] = ((b1)->fds_bits[5] | (b2)->fds_bits[5]);
\
-- (dst)->fds_bits[6] = ((b1)->fds_bits[6] | (b2)->fds_bits[6]);
\
-- (dst)->fds_bits[7] = ((b1)->fds_bits[7] | (b2)->fds_bits[7]);
-+ (dst)->__fds_bits[0] = ((b1)->__fds_bits[0] |
(b2)->__fds_bits[0]); \
-+ (dst)->__fds_bits[1] = ((b1)->__fds_bits[1] |
(b2)->__fds_bits[1]); \
-+ (dst)->__fds_bits[2] = ((b1)->__fds_bits[2] |
(b2)->__fds_bits[2]); \
-+ (dst)->__fds_bits[3] = ((b1)->__fds_bits[3] |
(b2)->__fds_bits[3]); \
-+ (dst)->__fds_bits[4] = ((b1)->__fds_bits[4] |
(b2)->__fds_bits[4]); \
-+ (dst)->__fds_bits[5] = ((b1)->__fds_bits[5] |
(b2)->__fds_bits[5]); \
-+ (dst)->__fds_bits[6] = ((b1)->__fds_bits[6] |
(b2)->__fds_bits[6]); \
-+ (dst)->__fds_bits[7] = ((b1)->__fds_bits[7] |
(b2)->__fds_bits[7]);
-
- #define XFD_UNSET(dst,b1) \
-- (dst)->fds_bits[0] &= ~((b1)->fds_bits[0]); \
-- (dst)->fds_bits[1] &= ~((b1)->fds_bits[1]); \
-- (dst)->fds_bits[2] &= ~((b1)->fds_bits[2]); \
-- (dst)->fds_bits[3] &= ~((b1)->fds_bits[3]); \
-- (dst)->fds_bits[4] &= ~((b1)->fds_bits[4]); \
-- (dst)->fds_bits[5] &= ~((b1)->fds_bits[5]); \
-- (dst)->fds_bits[6] &= ~((b1)->fds_bits[6]); \
-- (dst)->fds_bits[7] &= ~((b1)->fds_bits[7]);
-+ (dst)->__fds_bits[0] &= ~((b1)->__fds_bits[0]); \
-+ (dst)->__fds_bits[1] &= ~((b1)->__fds_bits[1]); \
-+ (dst)->__fds_bits[2] &= ~((b1)->__fds_bits[2]); \
-+ (dst)->__fds_bits[3] &= ~((b1)->__fds_bits[3]); \
-+ (dst)->__fds_bits[4] &= ~((b1)->__fds_bits[4]); \
-+ (dst)->__fds_bits[5] &= ~((b1)->__fds_bits[5]); \
-+ (dst)->__fds_bits[6] &= ~((b1)->__fds_bits[6]); \
-+ (dst)->__fds_bits[7] &= ~((b1)->__fds_bits[7]);
-
- #else /* USE_POLL */
- #include <sys/poll.h>
---- Xvnc/programs/Xserver/os/WaitFor.c~ 2000-06-11 14:00:52.000000000
+0200
-+++ Xvnc/programs/Xserver/os/WaitFor.c 2004-06-30 17:43:05.445375799 +0200
-@@ -390,7 +390,7 @@
- XFD_ANDSET(&devicesReadable, &LastSelectMask, &EnabledDevices);
- XFD_ANDSET(&clientsReadable, &LastSelectMask, &AllClients);
- #ifndef WIN32
-- if (LastSelectMask.fds_bits[0] &
WellKnownConnections.fds_bits[0])
-+ if (LastSelectMask.__fds_bits[0] &
WellKnownConnections.__fds_bits[0])
- #else
- XFD_ANDSET(&tmp_set, &LastSelectMask, &WellKnownConnections);
- if (XFD_ANYSET(&tmp_set))
-@@ -414,11 +414,11 @@
- {
- int highest_priority;
-
-- while (clientsReadable.fds_bits[i])
-+ while (clientsReadable.__fds_bits[i])
- {
- int client_priority, client_index;
-
-- curclient = ffs (clientsReadable.fds_bits[i]) - 1;
-+ curclient = ffs (clientsReadable.__fds_bits[i]) - 1;
- client_index = ConnectionTranslation[curclient + (i << 5)];
- #else
- int highest_priority;
-@@ -463,7 +463,7 @@
- pClientsReady[nready++] = client_index;
- }
- #ifndef WIN32
-- clientsReadable.fds_bits[i] &= ~(((fd_mask)1) << curclient);
-+ clientsReadable.__fds_bits[i] &= ~(((fd_mask)1) << curclient);
- }
- #else
- FD_CLR(curclient, &clientsReadable);
---- Xvnc/programs/Xserver/os/connection.c~ 2004-06-30 17:55:38.654375206
+0200
-+++ Xvnc/programs/Xserver/os/connection.c 2004-06-30 17:55:49.991930173
+0200
-@@ -783,7 +783,7 @@
- #ifndef AMOEBA
- XFD_ANDSET (&tmask, (fd_set*)closure, &WellKnownConnections);
- #ifndef WIN32
-- readyconnections = tmask.fds_bits[0];
-+ readyconnections = tmask.__fds_bits[0];
- if (!readyconnections)
- return TRUE;
- #else
-@@ -984,7 +984,7 @@
- #ifndef WIN32
- for (i=0; i<howmany(XFD_SETSIZE, NFDBITS); i++)
- {
-- mask = AllClients.fds_bits[i];
-+ mask = AllClients.__fds_bits[i];
- while (mask)
- {
- curoff = ffs (mask) - 1;
---- Xvnc/programs/Xserver/os/io.c~ 2000-06-11 14:00:52.000000000 +0200
-+++ Xvnc/programs/Xserver/os/io.c 2004-06-30 17:57:09.493797226 +0200
-@@ -992,8 +992,8 @@
- #ifndef WIN32
- for (base = 0; base < howmany(XFD_SETSIZE, NFDBITS); base++)
- {
-- mask = OutputPending.fds_bits[ base ];
-- OutputPending.fds_bits[ base ] = 0;
-+ mask = OutputPending.__fds_bits[ base ];
-+ OutputPending.__fds_bits[ base ] = 0;
- while (mask)
- {
- index = ffs(mask) - 1;
diff --git a/x11/tightvnc/malloc-redefine.patch
b/x11/tightvnc/malloc-redefine.patch
deleted file mode 100644
index e3d0ef2..0000000
--- a/x11/tightvnc/malloc-redefine.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- Xvnc/lib/Xau/AuRead.c~ 2000-06-11 14:00:52.000000000 +0200
-+++ Xvnc/lib/Xau/AuRead.c 2004-06-30 17:52:59.126707877 +0200
-@@ -49,7 +49,7 @@
- FILE *file;
- {
- unsigned short len;
-- char *data, *malloc ();
-+ char *data;
-
- if (read_short (&len, file) == 0)
- return 0;
-@@ -76,7 +76,6 @@
- {
- Xauth local;
- Xauth *ret;
-- char *malloc ();
-
- if (read_short (&local.family, auth_file) == 0)
- return 0;
---- Xvnc/lib/Xau/AuWrite.c~ 2000-06-11 14:00:52.000000000 +0200
-+++ Xvnc/lib/Xau/AuWrite.c 2004-06-30 17:53:17.939310108 +0200
-@@ -61,7 +61,6 @@
- FILE *auth_file;
- Xauth *auth;
- {
-- char *malloc ();
-
- if (write_short (auth->family, auth_file) == 0)
- return 0;



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (a961638bf33b82c2234ab53cc531106b5dbfe2b8), George Sherwood, 05/09/2007

Archive powered by MHonArc 2.6.24.

Top of Page