This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 96d5e74a30ea8571c3e403bd5d5b3080aaa193f1 Author: Mirraz Mirraz <mirraz1@rambler.ru> Date: Fri Feb 13 13:34:16 2015 +0100 Handle some serious compilation warnings (603_nx-X11_compilation_warnings.full.patch). --- .../603_nx-X11_compilation_warnings.full.patch | 38 -------------------- debian/patches/series | 1 - nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c | 1 - nx-X11/lib/X11/imLcPrs.c | 2 +- nx-X11/programs/Xserver/xkb/ddxLoad.c | 6 ++++ 5 files changed, 7 insertions(+), 41 deletions(-) diff --git a/debian/patches/603_nx-X11_compilation_warnings.full.patch b/debian/patches/603_nx-X11_compilation_warnings.full.patch deleted file mode 100644 index 3656461..0000000 --- a/debian/patches/603_nx-X11_compilation_warnings.full.patch +++ /dev/null @@ -1,38 +0,0 @@ -Description: Handle some serious compilation warnings -Author: Mirraz Mirraz <mirraz1@rambler.ru> ---- a/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c 2013-08-30 20:18:40.000000000 +0600 -+++ b/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c 2013-09-30 18:39:42.357560169 +0600 -@@ -3259,7 +3259,6 @@ - vp->SrcReg[0].Swizzle = SWIZZLE_NOOP; - vp->SrcReg[1].Swizzle = SWIZZLE_NOOP; - vp->SrcReg[2].Swizzle = SWIZZLE_NOOP; -- vp->SrcReg[3].Swizzle = SWIZZLE_NOOP; - vp->DstReg.WriteMask = 0xf; - - switch (type) { ---- a/nx-X11/lib/X11/imLcPrs.c 2013-08-30 20:18:40.000000000 +0600 -+++ b/nx-X11/lib/X11/imLcPrs.c 2013-09-30 19:02:56.925125678 +0600 -@@ -589,7 +589,7 @@ - - l = _Xmbstoutf8(local_utf8_buf, rhs_string_mb, LOCAL_UTF8_BUFSIZE - 1); - if (l == LOCAL_UTF8_BUFSIZE - 1) { -- local_wc_buf[l] = '\0'; -+ local_utf8_buf[l] = '\0'; - } - if( (rhs_string_utf8 = (char *)Xmalloc(l + 1)) == NULL ) { - Xfree( rhs_string_wc ); ---- a/nx-X11/programs/Xserver/xkb/ddxLoad.c 2013-08-30 20:18:40.000000000 +0600 -+++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c 2013-09-30 18:56:27.358995920 +0600 -@@ -37,6 +37,12 @@ - #include <errno.h> - #include <stdio.h> - #include <ctype.h> -+ -+/* stat() */ -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <unistd.h> -+ - #define NEED_EVENTS 1 - #include <X11/X.h> - #include <X11/Xos.h> diff --git a/debian/patches/series b/debian/patches/series index c805706..1d0f53b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ #401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch -603_nx-X11_compilation_warnings.full.patch 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch 606_nx-X11_build-on-aarch64.full.patch 607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch diff --git a/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c b/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c index 57891b2..ed1cbd9 100644 --- a/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c +++ b/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c @@ -3259,7 +3259,6 @@ parse_vp_instruction (GLcontext * ctx, GLubyte ** inst, vp->SrcReg[0].Swizzle = SWIZZLE_NOOP; vp->SrcReg[1].Swizzle = SWIZZLE_NOOP; vp->SrcReg[2].Swizzle = SWIZZLE_NOOP; - vp->SrcReg[3].Swizzle = SWIZZLE_NOOP; vp->DstReg.WriteMask = 0xf; switch (type) { diff --git a/nx-X11/lib/X11/imLcPrs.c b/nx-X11/lib/X11/imLcPrs.c index fbad5a2..9736e13 100644 --- a/nx-X11/lib/X11/imLcPrs.c +++ b/nx-X11/lib/X11/imLcPrs.c @@ -589,7 +589,7 @@ parseline( l = _Xmbstoutf8(local_utf8_buf, rhs_string_mb, LOCAL_UTF8_BUFSIZE - 1); if (l == LOCAL_UTF8_BUFSIZE - 1) { - local_wc_buf[l] = '\0'; + local_utf8_buf[l] = '\0'; } if( (rhs_string_utf8 = (char *)Xmalloc(l + 1)) == NULL ) { Xfree( rhs_string_wc ); diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c b/nx-X11/programs/Xserver/xkb/ddxLoad.c index 0b779b7..7caf9b1 100644 --- a/nx-X11/programs/Xserver/xkb/ddxLoad.c +++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c @@ -37,6 +37,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <errno.h> #include <stdio.h> #include <ctype.h> + +/* stat() */ +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> + #define NEED_EVENTS 1 #include <X11/X.h> #include <X11/Xos.h> -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git