# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1524276911 -10800
# Node ID b4e75a82fdf3b0c51ee0d28939ed7e4ea01b179e
# Parent  0222c6257a8dc865b61cf45c20b1aaca67d0e363
xrdp: up 0.9.3.1; zopfli: fix build; gcc61: attempt to fix; add gcc6 (latest among 6.x.x).
gcc61 and gcc6 are broken now.

diff -r 0222c6257a8d -r b4e75a82fdf3 gcc6/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gcc6/receipt	Sat Apr 21 05:15:11 2018 +0300
@@ -0,0 +1,105 @@
+# SliTaz package receipt v2.
+
+PACKAGE="gcc6"
+VERSION="6.4.0"
+CATEGORY="development"
+SHORT_DESC="The GNU Compiler Collection"
+MAINTAINER="pankso@slitaz.org"
+LICENSE="GPL2"
+WEB_SITE="http://gcc.gnu.org/"
+
+TARBALL="gcc-$VERSION.tar.xz"
+WGET_URL="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$TARBALL"
+
+# We need gawk since busybox awk is not sufficient. We have BUILD_DEPENDS
+# for cookutils that are not used by tazwok/cook-toolchain since it installs
+# and uses its own copy.
+BUILD_DEPENDS="mpc-library-dev mpfr-dev gmp-dev elfutils-dev zlib-dev"
+SPLIT="gcc6-lib-base"
+
+compile_rules() {
+	case $ARCH in
+		arm*)
+			ARCH_ARGS="--with-tune=armv6"
+			;;
+		i?86)
+			ARCH_ARGS="--with-tune=$ARCH"
+			export CFLAGS="-march=i486 -Os -pipe"
+			export CXXFLAGS="$CFLAGS"
+			;;
+		x86_64)
+			ARCH_ARGS="--with-tune=nocona"
+			export CFLAGS="-march=nocona -Os -pipe"
+			export CXXFLAGS="$CFLAGS"
+			;;
+	esac
+
+	echo "CFLAGS   : $CFLAGS"
+	echo "LDFLAGS  : $LDFLAGS"
+
+	pkgversion="SliTaz"
+	languages="c,c++"
+
+	# Use libiberty.a from binutils.
+	sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in || return 1
+
+	sed -i 's/^T_CFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in
+
+	mkdir -p ../gcc-build && cd ../gcc-build
+
+	$src/configure \
+		--libexecdir=/usr/lib \
+		--enable-nls \
+		--enable-languages=${languages} \
+		--enable-shared \
+		--with-system-zlib \
+		--enable-clocale=gnu \
+		--enable-objc-gc \
+		--enable-__cxa_atexit \
+		--enable-lto \
+		--enable-threads=posix \
+		--disable-bootstrap \
+		--program-suffix=-6 \
+		--libdir=/usr/libgcc6 \
+		--with-pkgversion="$pkgversion" \
+		--disable-multilib \
+		$ARCH_ARGS \
+		$CONFIGURE_ARGS &&
+	make && make install
+}
+
+genpkg_rules() {
+	case $PACKAGE in
+		gcc6)
+			mkdir -p  $fs/usr/share
+			cp -a $install/usr/bin $fs/usr
+
+			# Copy all libs. Do not hide gcc-lib-base.
+			cp -a $install/usr/lib* $fs/usr
+
+			# Include files.
+			cp -a $install/usr/include $fs/usr
+
+			# Remove build directory.
+			rm -rf $WOK/$PACKAGE/source/$PACKAGE-build
+			rm -rf $WOK/$PACKAGE/$PACKAGE-build
+			DEPENDS="binutils libgomp libobjc gcc-lib-base mpc-library elfutils"
+			TAGS="compiler C C++"
+			;;
+		gcc6-lib-base)
+			mkdir -p $fs/usr/lib
+			cp -a $install/usr/libgcc61/libgcc_s.so* $fs/usr/lib
+			cp -a $install/usr/libgcc61/libstdc++.so* $fs/usr/lib
+			rm -f $fs/usr/lib/*-gdb.py
+			CAT="development|base libraries, libgcc_s and libstdc++"
+			PROVIDE="gcc-lib-base"
+			;;
+	esac
+}
+
+post_remove_gcc61_lib_base() {
+	cd "$1/usr/lib"
+	ln -s libstdc++.so.6.*.* libstdc++.so.6
+	ln -s libstdc++.so.6.*.* libstdc++.so
+	cd - >/dev/null
+}
diff -r 0222c6257a8d -r b4e75a82fdf3 gcc6/stuff/patches/gcc-6.4.0.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gcc6/stuff/patches/gcc-6.4.0.patch	Sat Apr 21 05:15:11 2018 +0300
@@ -0,0 +1,16 @@
+./md-unwind-support.h: In function 'x86_64_fallback_frame_state':
+./md-unwind-support.h:65:47: error: dereferencing pointer to incomplete type 'struct ucontext'
+       sc = (struct sigcontext *) (void *) &uc_->uc_mcontext;
+                                               ^~
+
+--- a/libgcc/config/i386/linux-unwind.h
++++ b/libgcc/config/i386/linux-unwind.h
+@@ -58,7 +58,7 @@
+   if (*(unsigned char *)(pc+0) == 0x48
+       && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL)
+     {
+-      struct ucontext *uc_ = context->cfa;
++      struct ucontext_t *uc_ = context->cfa;
+       /* The void * cast is necessary to avoid an aliasing warning.
+          The aliasing warning is correct, but should not be a problem
+          because it does not alias anything.  */
diff -r 0222c6257a8d -r b4e75a82fdf3 gcc6/stuff/patches/series
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gcc6/stuff/patches/series	Sat Apr 21 05:15:11 2018 +0300
@@ -0,0 +1,1 @@
+gcc-6.4.0.patch
diff -r 0222c6257a8d -r b4e75a82fdf3 gcc61/receipt
--- a/gcc61/receipt	Fri Apr 20 14:55:15 2018 +0300
+++ b/gcc61/receipt	Sat Apr 21 05:15:11 2018 +0300
@@ -19,11 +19,24 @@
 
 compile_rules() {
 	case $ARCH in
-		arm*)   ARCH_ARGS="--with-tune=armv6";;
-		i?86)   ARCH_ARGS="--with-tune=$ARCH";;
-		x86_64) ARCH_ARGS="--with-tune=nocona";;
+		arm*)
+			ARCH_ARGS="--with-tune=armv6"
+			;;
+		i?86)
+			ARCH_ARGS="--with-tune=$ARCH"
+			export CFLAGS="-march=i486 -Os -pipe"
+			export CXXFLAGS="$CFLAGS"
+			;;
+		x86_64)
+			ARCH_ARGS="--with-tune=nocona"
+			export CFLAGS="-march=nocona -Os -pipe"
+			export CXXFLAGS="$CFLAGS"
+			;;
 	esac
 
+	echo "CFLAGS   : $CFLAGS"
+	echo "LDFLAGS  : $LDFLAGS"
+
 	pkgversion="SliTaz"
 	languages="c,c++"
 
diff -r 0222c6257a8d -r b4e75a82fdf3 gcc61/stuff/patches/gcc-6.1.0.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gcc61/stuff/patches/gcc-6.1.0.patch	Sat Apr 21 05:15:11 2018 +0300
@@ -0,0 +1,29 @@
+${src}/gcc/ubsan.c:1473:23: error: ISO C++ forbids comparison between pointer and integer [-fpermissive]
+
+--- a/gcc/ubsan.c
++++ b/gcc/ubsan.c
+@@ -1470,7 +1470,7 @@
+ 
+   expanded_location xloc = expand_location (loc);
+   if (xloc.file == NULL || strncmp (xloc.file, "\1", 2) == 0
+-      || xloc.file == '\0' || xloc.file[0] == '\xff'
++      || *xloc.file == '\0' || xloc.file[0] == '\xff'
+       || xloc.file[1] == '\xff')
+     return false;
+ 
+./md-unwind-support.h: In function 'x86_64_fallback_frame_state':
+./md-unwind-support.h:65:47: error: dereferencing pointer to incomplete type 'struct ucontext'
+       sc = (struct sigcontext *) (void *) &uc_->uc_mcontext;
+                                               ^~
+
+--- a/libgcc/config/i386/linux-unwind.h
++++ b/libgcc/config/i386/linux-unwind.h
+@@ -58,7 +58,7 @@
+   if (*(unsigned char *)(pc+0) == 0x48
+       && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL)
+     {
+-      struct ucontext *uc_ = context->cfa;
++      struct ucontext_t *uc_ = context->cfa;
+       /* The void * cast is necessary to avoid an aliasing warning.
+          The aliasing warning is correct, but should not be a problem
+          because it does not alias anything.  */
diff -r 0222c6257a8d -r b4e75a82fdf3 gcc61/stuff/patches/series
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gcc61/stuff/patches/series	Sat Apr 21 05:15:11 2018 +0300
@@ -0,0 +1,1 @@
+gcc-6.1.0.patch
diff -r 0222c6257a8d -r b4e75a82fdf3 xrdp/receipt
--- a/xrdp/receipt	Fri Apr 20 14:55:15 2018 +0300
+++ b/xrdp/receipt	Sat Apr 21 05:15:11 2018 +0300
@@ -1,20 +1,20 @@
 # SliTaz package receipt v2.
 
 PACKAGE="xrdp"
-VERSION="0.6.1"
+VERSION="0.9.3.1"
 CATEGORY="network"
-SHORT_DESC="An open source remote desktop protocol(rdp) server"
+SHORT_DESC="An open source remote desktop protocol (RDP) server"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.xrdp.org/"
 
-TARBALL="$PACKAGE-v$VERSION.tar.gz"
-WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WGET_URL="https://github.com/neutrinolabs/xrdp/releases/download/v$VERSION/$TARBALL"
 
-BUILD_DEPENDS="autoconf automake libtool openssl-dev pam-dev xorg-dev"
+BUILD_DEPENDS="autoconf automake libtool openssl-dev pam-dev xorg-dev nasm"
+SPLIT="xrdp-dev"
 
 compile_rules() {
-	./bootstrap &&
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
@@ -32,7 +32,14 @@
 }
 
 genpkg_rules() {
-	copy @std
-	DEPENDS="openssl zlib xorg-libX11 xorg-libXfixes xorg-libxcb xorg-libXau \
-	xorg-libXdmcp pam tightvnc"
+	case $PACKAGE in
+		xrdp)
+			copy @std
+			DEPENDS="openssl pam xorg-libX11 xorg-libXfixes xorg-libXrandr   \
+			tightvnc"
+			;;
+		*-dev)
+			copy @dev
+			;;
+	esac
 }
diff -r 0222c6257a8d -r b4e75a82fdf3 zopfli/receipt
--- a/zopfli/receipt	Fri Apr 20 14:55:15 2018 +0300
+++ b/zopfli/receipt	Sat Apr 21 05:15:11 2018 +0300
@@ -1,28 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="zopfli"
 VERSION="1.0.1"
 CATEGORY="base-system"
-SHORT_DESC="A good, but slow, deflate or zlib compressor."
+SHORT_DESC="A good, but slow, deflate or zlib compressor"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="Apache"
+WEB_SITE="https://github.com/google/zopfli"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://github.com/google/zopfli"
 WGET_URL="$WEB_SITE/archive/$TARBALL"
-TAGS="compression"
 
-DEPENDS="gcc-lib-base"
+compile_rules() {
+	make zopfli
+	make zopflipng
+#	make libzopfli
+#	make libzopflipng
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make zopflipng zopfli libzopfli
+	install -Dm755 zopfli    $install/usr/bin/zopfli
+	install -Dm755 zopflipng $install/usr/bin/zopflipng
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp -a $src/zopfli $fs/usr/bin
-	cp -a $src/zopflipng $fs/usr/bin
+genpkg_rules() {
+	copy @std
+	TAGS="compression"
 }