Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (4382f4e1a09b7a05a99700cf64fdf2bcbd74b973)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (4382f4e1a09b7a05a99700cf64fdf2bcbd74b973)
  • Date: Sun, 31 Jul 2022 22:59:01 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

shell-term-fm/mksh/BUILD |
2
shell-term-fm/mksh/DETAILS |
4
shell-term-fm/mksh/HISTORY |
4
shell-term-fm/oksh/DETAILS |
4
shell-term-fm/oksh/HISTORY |
3
shell-term-fm/oksh/INSTALL |
2
x11/tightvnc/BUILD |
2
x11/tightvnc/DEPENDS |
14
x11/tightvnc/HISTORY |
8
x11/tightvnc/PRE_BUILD |
3
x11/tightvnc/patches-1.3.x/0001-Imake-Fix-build-with-binutils-2.36.patch |
49 +
x11/tightvnc/patches-1.3.x/0002-Add-missing-function-prototypes.patch |
36 +
x11/tightvnc/patches-1.3.x/0003-Fix-missing-includes.patch |
279 ++++++++++
x11/tightvnc/patches-1.3.x/0004-Remove-abs-macro.patch |
37 +
xorg-util/xorg-cf-files/DETAILS |
4
xorg-util/xorg-cf-files/HISTORY |
3
16 files changed, 441 insertions(+), 13 deletions(-)

New commits:
commit 4382f4e1a09b7a05a99700cf64fdf2bcbd74b973
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

tightvnc: Fix build with newer toolchains

commit 20b7da3816f813ee04d153dafa9b5a1364ede806
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

oksh 7.1

commit 16f7db75d664964a47481a1ec9181cfd5f175417
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

mksh R59c

commit 4adedde1ef8525a7a89a8d867655b10b0eedb34e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

xorg-cf-files 1.0.7

diff --git a/shell-term-fm/mksh/BUILD b/shell-term-fm/mksh/BUILD
index f44ae21..2bc940e 100755
--- a/shell-term-fm/mksh/BUILD
+++ b/shell-term-fm/mksh/BUILD
@@ -1,4 +1,4 @@
-sh ./Build.sh -r -c lto &&
+sh ./Build.sh -r &&
gzip -n9 mksh.1 &&

if [[ $MKSH_TEST == y ]]; then
diff --git a/shell-term-fm/mksh/DETAILS b/shell-term-fm/mksh/DETAILS
index 92b2b4a..576b3de 100755
--- a/shell-term-fm/mksh/DETAILS
+++ b/shell-term-fm/mksh/DETAILS
@@ -1,5 +1,5 @@
SPELL=mksh
- VERSION=R52b
+ VERSION=R59c
SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
SOURCE_URL[1]=https://pub.allbsd.org/MirOS/dist/mir/$SPELL/$SOURCE
WEB_SITE=https://www.mirbsd.org/mksh.htm
ENTERED=20060928
-
SOURCE_HASH=sha512:d204f0d0e221a8592dc0efdb31b909ce522792708937ab1f3ec0a4b1098f2d5171c06cda029a9f7e63eb087a1acf53210f4701cee5564868c15c6294e6fe322f
+
SOURCE_HASH=sha512:f56b6956f9e1dd88ddce2294301a5eb698050d9d4f49286fdcd8f9df8554eabbcc71d37e2bf3eb7234e3968a17231cc6de8aa7efbf17768834a90b14e8cdf340
# I suggest to add this to the list (shortname MIROS or MIRBSD please)
LICENSE[0]=http://mirbsd.de/MirOS-Licence
SHORT="MirBSD Korn Shell"
diff --git a/shell-term-fm/mksh/HISTORY b/shell-term-fm/mksh/HISTORY
index 520486c..72004e7 100644
--- a/shell-term-fm/mksh/HISTORY
+++ b/shell-term-fm/mksh/HISTORY
@@ -1,3 +1,7 @@
+2022-08-01 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to R59c
+ * BUILD: removed -c lto; support dropped by upstream
+
2016-02-04 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to R52b

diff --git a/shell-term-fm/oksh/DETAILS b/shell-term-fm/oksh/DETAILS
index dc9509f..ad518aa 100755
--- a/shell-term-fm/oksh/DETAILS
+++ b/shell-term-fm/oksh/DETAILS
@@ -1,8 +1,8 @@
SPELL=oksh
- VERSION=6.5
+ VERSION=7.1
SOURCE=${SPELL}-${VERSION}.tar.gz

SOURCE_URL[0]=https://github.com/ibara/${SPELL}/releases/download/${SPELL}-${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:ea6da8d6a8e9f238f1b58a0d2b0e723455c56f2bb566747b51d32f25223217f0eaf88e666b5f686e14d3ac711ef6f6e1c47fafe0ad3b661d85072cdc17551c3e
+
SOURCE_HASH=sha512:05ca7dfa9d72f52891ec2ca47456e23486e4ed427277e27bb340b57ee7543468c95b47f889fe4a140ecc280281b99314cc20ef876ce12ad98f0fcb57912c2eac
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
DOCS="CONTRIBUTORS LEGAL NOTES PROJECTS ${DOCS}"
WEB_SITE=https://github.com/ibara/oksh
diff --git a/shell-term-fm/oksh/HISTORY b/shell-term-fm/oksh/HISTORY
index f076d6d..5043c3c 100644
--- a/shell-term-fm/oksh/HISTORY
+++ b/shell-term-fm/oksh/HISTORY
@@ -1,3 +1,6 @@
+2022-08-01 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, INSTALL: updated spell to 7.1
+
2019-05-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, DEPENDS, BUILD, CONFIGURE, INSTALL, PROVIDES: created
spell,
version 6.5
diff --git a/shell-term-fm/oksh/INSTALL b/shell-term-fm/oksh/INSTALL
index 297f47a..5987b00 100755
--- a/shell-term-fm/oksh/INSTALL
+++ b/shell-term-fm/oksh/INSTALL
@@ -1,4 +1,4 @@
default_install &&

-install_config_file "${SOURCE_DIRECTORY}/profile" \
+install_config_file "${SOURCE_DIRECTORY}/dot.profile" \
"${INSTALL_ROOT}/etc/profile"
diff --git a/x11/tightvnc/BUILD b/x11/tightvnc/BUILD
index 5be2339..249ba23 100755
--- a/x11/tightvnc/BUILD
+++ b/x11/tightvnc/BUILD
@@ -1,3 +1,5 @@
+# XXX needed with GCC 10.x+
+sedit '/^#define CcCmd\t/{s/$/ -fcommon/}' Xvnc/config/cf/linux.cf &&
check_tmp_noexec /tmp &&
xmkmf &&
make_single &&
diff --git a/x11/tightvnc/DEPENDS b/x11/tightvnc/DEPENDS
index 484fc6e..07a94fb 100755
--- a/x11/tightvnc/DEPENDS
+++ b/x11/tightvnc/DEPENDS
@@ -1,5 +1,9 @@
-depends gccmakedep &&
-depends imake &&
-depends JPEG &&
-depends X11-SERVER &&
-depends libxaw
+. "$GRIMOIRE"/VDEPENDS &&
+vdepends <<-!
+ JPEG
+ X11-SERVER
+ gccmakedep
+ imake
+ libxaw
+ xorg-cf-files >= 1.0.7
+!
diff --git a/x11/tightvnc/HISTORY b/x11/tightvnc/HISTORY
index b08f739..67ed39b 100644
--- a/x11/tightvnc/HISTORY
+++ b/x11/tightvnc/HISTORY
@@ -1,3 +1,11 @@
+2022-07-31 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD, 0001-Imake-Fix-build-with-binutils-2.36.patch,
+ 0002-Add-missing-function-prototypes.patch,
+ 0003-Fix-missing-includes.patch, 0004-Remove-abs-macro.patch:
+ fixed build with newer toolchains
+ * DEPENDS: depends on xorg-cf-files >= 1.0.7 (for binutils 2.36)
+ * BUILD: added -fcommon flag; fixes build with GCC 10+
+
2019-08-28 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: switch dependency from xorg-server to X11-SERVER

diff --git a/x11/tightvnc/PRE_BUILD b/x11/tightvnc/PRE_BUILD
new file mode 100755
index 0000000..56fcefb
--- /dev/null
+++ b/x11/tightvnc/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches-1.3.x
diff --git
a/x11/tightvnc/patches-1.3.x/0001-Imake-Fix-build-with-binutils-2.36.patch
b/x11/tightvnc/patches-1.3.x/0001-Imake-Fix-build-with-binutils-2.36.patch
new file mode 100644
index 0000000..4067c0f
--- /dev/null
+++ b/x11/tightvnc/patches-1.3.x/0001-Imake-Fix-build-with-binutils-2.36.patch
@@ -0,0 +1,49 @@
+From 842fd986eb561d0e5fe63d8a11b7ab72d3777c3c Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Sun, 31 Jul 2022 19:51:28 +0200
+Subject: [PATCH 1/4] Imake: Fix build with binutils 2.36
+
+Remove -l flag from Ar*Cmd; this flag was traditionally unused/ignored by
+both GNU and BSD variants.
+
+In binutils 2.36, GNU ar modified it's behavior to use it to specify
+library dependencies.
+
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ Xvnc/config/cf/Imake.tmpl | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/Xvnc/config/cf/Imake.tmpl b/Xvnc/config/cf/Imake.tmpl
+index f04b4b1435c9..cfadbae79923 100644
+--- a/Xvnc/config/cf/Imake.tmpl
++++ b/Xvnc/config/cf/Imake.tmpl
+@@ -595,25 +595,13 @@ TCLIBDIR = TclLibDir
+ #define ArCmdBase ar
+ #endif
+ #ifndef ArCmd
+-#if HasLargeTmp || SystemV4
+ #define ArCmd ArCmdBase cq
+-#else
+-#define ArCmd ArCmdBase clq
+-#endif
+ #endif
+ #ifndef ArAddCmd
+-#if HasLargeTmp || SystemV4
+ #define ArAddCmd ArCmdBase ru
+-#else
+-#define ArAddCmd ArCmdBase rul
+-#endif
+ #endif
+ #ifndef ArExtCmd
+-#if HasLargeTmp || SystemV4
+ #define ArExtCmd ArCmdBase x
+-#else
+-#define ArExtCmd ArCmdBase xl
+-#endif
+ #endif
+ #ifndef BootstrapCFlags
+ #define BootstrapCFlags /**/
+--
+2.37.1
+
diff --git
a/x11/tightvnc/patches-1.3.x/0002-Add-missing-function-prototypes.patch
b/x11/tightvnc/patches-1.3.x/0002-Add-missing-function-prototypes.patch
new file mode 100644
index 0000000..8d09056
--- /dev/null
+++ b/x11/tightvnc/patches-1.3.x/0002-Add-missing-function-prototypes.patch
@@ -0,0 +1,36 @@
+From 466bd9484a235531700b664fba6fe81724727a32 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Sun, 31 Jul 2022 19:04:29 +0200
+Subject: [PATCH 2/4] Add missing function prototypes
+
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ include/vncauth.h | 2 ++
+ vncviewer/vncviewer.h | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/include/vncauth.h b/include/vncauth.h
+index 86dc455ca722..ea6c023c9f3f 100644
+--- a/include/vncauth.h
++++ b/include/vncauth.h
+@@ -28,3 +28,5 @@ extern int vncEncryptAndStorePasswd(char *passwd, char
*fname);
+ extern char *vncDecryptPasswdFromFile(char *fname);
+ extern void vncRandomBytes(unsigned char *bytes);
+ extern void vncEncryptBytes(unsigned char *bytes, char *passwd);
++extern int vncEncryptAndStorePasswd2(char *, char *, char *);
++extern int vncDecryptPasswdFromFile2(char *, char *, char *);
+diff --git a/vncviewer/vncviewer.h b/vncviewer/vncviewer.h
+index 755a4807627c..9d92aa0b48cf 100644
+--- a/vncviewer/vncviewer.h
++++ b/vncviewer/vncviewer.h
+@@ -140,6 +140,7 @@ extern void SetVisualAndCmap();
+
+ extern Bool HandleCursorShape(int xhot, int yhot, int width, int height,
+ CARD32 enc);
++extern Bool HandleCursorPos(int x, int y);
+ extern void SoftCursorLockArea(int x, int y, int w, int h);
+ extern void SoftCursorUnlockScreen(void);
+ extern void SoftCursorMove(int x, int y);
+--
+2.37.1
+
diff --git a/x11/tightvnc/patches-1.3.x/0003-Fix-missing-includes.patch
b/x11/tightvnc/patches-1.3.x/0003-Fix-missing-includes.patch
new file mode 100644
index 0000000..cf0a8ae
--- /dev/null
+++ b/x11/tightvnc/patches-1.3.x/0003-Fix-missing-includes.patch
@@ -0,0 +1,279 @@
+From 2aa6867ec00e6e1c242baad25344b38f412ed0ab Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Sun, 31 Jul 2022 18:56:20 +0200
+Subject: [PATCH 3/4] Fix missing includes
+
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ Xvnc/config/makedepend/ifparser.c | 1 +
+ Xvnc/config/util/lndir.c | 1 +
+ Xvnc/lib/Xau/AuDispose.c | 1 +
+ Xvnc/lib/Xdmcp/Alloc.c | 2 +-
+ Xvnc/lib/font/Type1/objects.c | 1 +
+ Xvnc/lib/font/Type1/spaces.c | 2 ++
+ Xvnc/lib/font/Type1/t1malloc.c | 2 ++
+ Xvnc/lib/font/Type1/t1stub.c | 2 ++
+ Xvnc/programs/Xserver/Xext/xprint.c | 1 +
+ Xvnc/programs/Xserver/cfb/cfbmskbits.h | 1 +
+ Xvnc/programs/Xserver/hw/vnc/init.c | 1 +
+ Xvnc/programs/Xserver/hw/vnc/kbdptr.c | 1 +
+ Xvnc/programs/Xserver/hw/vnc/sockets.c | 1 +
+ Xvnc/programs/Xserver/hw/vnc/translate.c | 1 +
+ Xvnc/programs/Xserver/os/xdmcp.c | 1 +
+ libvncauth/vncauth.c | 1 +
+ vncconnect/vncconnect.c | 2 ++
+ vncviewer/corre.c | 2 ++
+ vncviewer/misc.c | 1 +
+ vncviewer/rre.c | 2 ++
+ 20 files changed, 26 insertions(+), 1 deletion(-)
+
+diff --git a/Xvnc/config/makedepend/ifparser.c
b/Xvnc/config/makedepend/ifparser.c
+index dfac1526a2c3..4e9dacc62718 100644
+--- a/Xvnc/config/makedepend/ifparser.c
++++ b/Xvnc/config/makedepend/ifparser.c
+@@ -62,6 +62,7 @@
+
+ #include "ifparser.h"
+ #include <ctype.h>
++#include <string.h>
+
+
/****************************************************************************
+ Internal Macros and Utilities for Parser
+diff --git a/Xvnc/config/util/lndir.c b/Xvnc/config/util/lndir.c
+index 1ffb9c4d4e94..4684347f9f47 100644
+--- a/Xvnc/config/util/lndir.c
++++ b/Xvnc/config/util/lndir.c
+@@ -47,6 +47,7 @@ in this Software without prior written authorization from
the X Consortium.
+ #include <X11/Xos.h>
+ #include <X11/Xfuncproto.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <sys/stat.h>
+ #if !defined(MINIX) && !defined(Lynx)
+ #include <sys/param.h>
+diff --git a/Xvnc/lib/Xau/AuDispose.c b/Xvnc/lib/Xau/AuDispose.c
+index 23b45253939a..4d2c900aef88 100644
+--- a/Xvnc/lib/Xau/AuDispose.c
++++ b/Xvnc/lib/Xau/AuDispose.c
+@@ -27,6 +27,7 @@ in this Software without prior written authorization from
the X Consortium.
+
+ */
+
++#include <stdlib.h>
+ #include <X11/Xauth.h>
+
+ void
+diff --git a/Xvnc/lib/Xdmcp/Alloc.c b/Xvnc/lib/Xdmcp/Alloc.c
+index 758e1c6a0706..756dd5cb8c44 100644
+--- a/Xvnc/lib/Xdmcp/Alloc.c
++++ b/Xvnc/lib/Xdmcp/Alloc.c
+@@ -31,7 +31,7 @@ in this Software without prior written authorization from
the X Consortium.
+
+ /* stubs for use when Xalloc, Xrealloc and Xfree are not defined */
+
+-extern char *malloc (), *realloc ();
++#include <stdlib.h>
+
+ unsigned long *
+ Xalloc (amount)
+diff --git a/Xvnc/lib/font/Type1/objects.c b/Xvnc/lib/font/Type1/objects.c
+index 9fffa62216c9..b79c508017ca 100644
+--- a/Xvnc/lib/font/Type1/objects.c
++++ b/Xvnc/lib/font/Type1/objects.c
+@@ -53,6 +53,7 @@ system it is a pretty safe bet that these are external
entry points and
+ you do do not need to include these header files.
+ */
+
++#include <stdio.h>
+ #include <string.h>
+ #include <ctype.h>
+
+diff --git a/Xvnc/lib/font/Type1/spaces.c b/Xvnc/lib/font/Type1/spaces.c
+index f026420fd966..2092ab671b5a 100644
+--- a/Xvnc/lib/font/Type1/spaces.c
++++ b/Xvnc/lib/font/Type1/spaces.c
+@@ -37,6 +37,8 @@ This module is responsible for handling the TYPE1IMAGER
"XYspace" object.
+
+ :h3.Include Files
+ */
++#include <stdio.h>
++#include <string.h>
+ #include "objects.h"
+ #include "spaces.h"
+ #include "paths.h"
+diff --git a/Xvnc/lib/font/Type1/t1malloc.c b/Xvnc/lib/font/Type1/t1malloc.c
+index be93bdaf1e1d..8805c40f1b79 100644
+--- a/Xvnc/lib/font/Type1/t1malloc.c
++++ b/Xvnc/lib/font/Type1/t1malloc.c
+@@ -37,6 +37,8 @@ routines (malloc/free).
+
+ */
+
++#include <stdio.h>
++#include <stdlib.h>
+ #include "objects.h" /* get #define for abort() */
+
+ static combine();
+diff --git a/Xvnc/lib/font/Type1/t1stub.c b/Xvnc/lib/font/Type1/t1stub.c
+index f2d8af44264c..73970e514d19 100644
+--- a/Xvnc/lib/font/Type1/t1stub.c
++++ b/Xvnc/lib/font/Type1/t1stub.c
+@@ -28,6 +28,8 @@
+ * SOFTWARE.
+ */
+
++#include <stdio.h>
++#include <stdlib.h>
+ #include "objects.h" /* get #define for abort() */
+
+ xiStub()
+diff --git a/Xvnc/programs/Xserver/Xext/xprint.c
b/Xvnc/programs/Xserver/Xext/xprint.c
+index 5fc535dec101..e11649830307 100644
+--- a/Xvnc/programs/Xserver/Xext/xprint.c
++++ b/Xvnc/programs/Xserver/Xext/xprint.c
+@@ -66,6 +66,7 @@ copyright holders.
+ ********************************************************************/
+ /* $XFree86: xc/programs/Xserver/Xext/xprint.c,v 1.4 1997/01/02 04:05:05
dawes Exp $ */
+
++#include <stdlib.h>
+ #include "X.h"
+ #define NEED_EVENTS
+ #include "Xproto.h"
+diff --git a/Xvnc/programs/Xserver/cfb/cfbmskbits.h
b/Xvnc/programs/Xserver/cfb/cfbmskbits.h
+index 92275c83eb8c..e45dc2796adf 100644
+--- a/Xvnc/programs/Xserver/cfb/cfbmskbits.h
++++ b/Xvnc/programs/Xserver/cfb/cfbmskbits.h
+@@ -31,6 +31,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ /* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.h,v 3.3.2.1 1997/05/27
06:28:09 dawes Exp $ */
+ /* Optimizations for PSZ == 32 added by Kyle Marvin (marvin AT vitec.com) */
+
++#include <stdlib.h>
+ #include "X.h"
+ #include "Xmd.h"
+ #include "servermd.h"
+diff --git a/Xvnc/programs/Xserver/hw/vnc/init.c
b/Xvnc/programs/Xserver/hw/vnc/init.c
+index c2d82e0ada29..18019d39a708 100644
+--- a/Xvnc/programs/Xserver/hw/vnc/init.c
++++ b/Xvnc/programs/Xserver/hw/vnc/init.c
+@@ -54,6 +54,7 @@ from the X Consortium.
+ /* Use ``#define CORBA'' to enable CORBA control interface */
+
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <stdarg.h>
+ #include <sys/types.h>
+diff --git a/Xvnc/programs/Xserver/hw/vnc/kbdptr.c
b/Xvnc/programs/Xserver/hw/vnc/kbdptr.c
+index d991c9161647..95e9391e4dfd 100644
+--- a/Xvnc/programs/Xserver/hw/vnc/kbdptr.c
++++ b/Xvnc/programs/Xserver/hw/vnc/kbdptr.c
+@@ -24,6 +24,7 @@
+ */
+
+ #include <stdio.h>
++#include <stdlib.h>
+
+ #include "X11/X.h"
+ #define NEED_EVENTS
+diff --git a/Xvnc/programs/Xserver/hw/vnc/sockets.c
b/Xvnc/programs/Xserver/hw/vnc/sockets.c
+index 7e4cf87d9aa2..86ba5d04bd9c 100644
+--- a/Xvnc/programs/Xserver/hw/vnc/sockets.c
++++ b/Xvnc/programs/Xserver/hw/vnc/sockets.c
+@@ -38,6 +38,7 @@
+ */
+
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/socket.h>
+diff --git a/Xvnc/programs/Xserver/hw/vnc/translate.c
b/Xvnc/programs/Xserver/hw/vnc/translate.c
+index 188e4aa240d1..fc442dcfc4c6 100644
+--- a/Xvnc/programs/Xserver/hw/vnc/translate.c
++++ b/Xvnc/programs/Xserver/hw/vnc/translate.c
+@@ -22,6 +22,7 @@
+ */
+
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "rfb.h"
+
+ static void PrintPixelFormat(rfbPixelFormat *pf);
+diff --git a/Xvnc/programs/Xserver/os/xdmcp.c
b/Xvnc/programs/Xserver/os/xdmcp.c
+index 5de14cd3250f..a7de53905086 100644
+--- a/Xvnc/programs/Xserver/os/xdmcp.c
++++ b/Xvnc/programs/Xserver/os/xdmcp.c
+@@ -50,6 +50,7 @@
+ #endif
+ #endif
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "X.h"
+ #include "Xmd.h"
+ #include "misc.h"
+diff --git a/libvncauth/vncauth.c b/libvncauth/vncauth.c
+index a92d3223ef60..b8d870ced49a 100644
+--- a/libvncauth/vncauth.c
++++ b/libvncauth/vncauth.c
+@@ -29,6 +29,7 @@
+ #include <unistd.h>
+ #include <vncauth.h>
+ #include <d3des.h>
++#include <time.h>
+
+
+ /*
+diff --git a/vncconnect/vncconnect.c b/vncconnect/vncconnect.c
+index 101c2adc2fba..82b4d6410ae0 100644
+--- a/vncconnect/vncconnect.c
++++ b/vncconnect/vncconnect.c
+@@ -3,6 +3,8 @@
+ */
+
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xatom.h>
+
+diff --git a/vncviewer/corre.c b/vncviewer/corre.c
+index c846a10de379..b760d41b0a02 100644
+--- a/vncviewer/corre.c
++++ b/vncviewer/corre.c
+@@ -26,6 +26,8 @@
+ * encoded rectangle with BPP bits per pixel.
+ */
+
++#include <stdlib.h>
++
+ #define HandleCoRREBPP CONCAT2E(HandleCoRRE,BPP)
+ #define CARDBPP CONCAT2E(CARD,BPP)
+
+diff --git a/vncviewer/misc.c b/vncviewer/misc.c
+index be78597f4f8d..36d690d763d3 100644
+--- a/vncviewer/misc.c
++++ b/vncviewer/misc.c
+@@ -24,6 +24,7 @@
+ #include <vncviewer.h>
+ #include <signal.h>
+ #include <fcntl.h>
++#include <sys/wait.h>
+
+ static void CleanupSignalHandler(int sig);
+ static int CleanupXErrorHandler(Display *dpy, XErrorEvent *error);
+diff --git a/vncviewer/rre.c b/vncviewer/rre.c
+index 277dffb71d0e..263b7e21d244 100644
+--- a/vncviewer/rre.c
++++ b/vncviewer/rre.c
+@@ -26,6 +26,8 @@
+ * encoded rectangle with BPP bits per pixel.
+ */
+
++#include <stdlib.h>
++
+ #define HandleRREBPP CONCAT2E(HandleRRE,BPP)
+ #define CARDBPP CONCAT2E(CARD,BPP)
+
+--
+2.37.1
+
diff --git a/x11/tightvnc/patches-1.3.x/0004-Remove-abs-macro.patch
b/x11/tightvnc/patches-1.3.x/0004-Remove-abs-macro.patch
new file mode 100644
index 0000000..fdad9e3
--- /dev/null
+++ b/x11/tightvnc/patches-1.3.x/0004-Remove-abs-macro.patch
@@ -0,0 +1,37 @@
+From cf8a363e7beb8767180b2013bc9e0ae3c17c96ea Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Mon, 1 Aug 2022 00:05:20 +0200
+Subject: [PATCH 4/4] Remove abs macro
+
+Defined as a function in <stdlib.h> since C99.
+
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ Xvnc/programs/Xserver/include/misc.h | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/Xvnc/programs/Xserver/include/misc.h
b/Xvnc/programs/Xserver/include/misc.h
+index f01f3e95e2a7..dde05c431a17 100644
+--- a/Xvnc/programs/Xserver/include/misc.h
++++ b/Xvnc/programs/Xserver/include/misc.h
+@@ -158,16 +158,10 @@ typedef struct _xReq *xReqPtr;
+
+ #define min(a, b) (((a) < (b)) ? (a) : (b))
+ #define max(a, b) (((a) > (b)) ? (a) : (b))
+-#if !defined(AMOEBA) && !defined(__EMX__)
+-#ifndef abs
+-#define abs(a) ((a) > 0 ? (a) : -(a))
+-#endif
+-#else /* AMOEBA || __EMX__ */
+-/* abs() is a function, not a macro; include the file declaring
++/* abs() is a function since C99, not a macro; include the file declaring
+ * it in case we haven't done that yet.
+ */
+ #include <stdlib.h>
+-#endif /* AMOEBA */
+ #ifndef Fabs
+ #define Fabs(a) ((a) > 0.0 ? (a) : -(a)) /* floating absolute value */
+ #endif
+--
+2.37.1
+
diff --git a/xorg-util/xorg-cf-files/DETAILS b/xorg-util/xorg-cf-files/DETAILS
index dad7a90..6fc9352 100755
--- a/xorg-util/xorg-cf-files/DETAILS
+++ b/xorg-util/xorg-cf-files/DETAILS
@@ -1,9 +1,9 @@
SPELL=xorg-cf-files
- VERSION=1.0.6
+ VERSION=1.0.7
SOURCE=$SPELL-$VERSION.tar.bz2
# SOURCE_GPG="gurus.gpg:

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/util/${SOURCE}
-
SOURCE_HASH=sha512:1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa
+
SOURCE_HASH=sha512:0dd73b9db9fc16bddc94ef23f11434be6ea2f8e0c7bc5ef3c3bfe6749e13843f88d397eed9f980bbbe9e74147172326bd3c3ccb7adedc9150302756e4b07191e
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
diff --git a/xorg-util/xorg-cf-files/HISTORY b/xorg-util/xorg-cf-files/HISTORY
index 578b069..2cae973 100644
--- a/xorg-util/xorg-cf-files/HISTORY
+++ b/xorg-util/xorg-cf-files/HISTORY
@@ -1,3 +1,6 @@
+2022-07-31 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.0.7
+
2015-12-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.6




  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (4382f4e1a09b7a05a99700cf64fdf2bcbd74b973), Ismael Luceno, 07/31/2022

Archive powered by MHonArc 2.6.24.

Top of Page