Received: by mail.netbsd.org (Postfix, from userid 605) id 2E63084E53; Tue, 15 May 2018 09:50:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id AED0184DD3 for ; Tue, 15 May 2018 09:50:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id ek3DqTgXGrEa for ; Tue, 15 May 2018 09:50:50 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 03F1284CD4 for ; Tue, 15 May 2018 09:50:50 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id F32E6FBEC; Tue, 15 May 2018 09:50:49 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1526377849257050" MIME-Version: 1.0 Date: Tue, 15 May 2018 09:50:49 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/x11/vte3 To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20180515095049.F32E6FBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1526377849257050 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Tue May 15 09:50:49 UTC 2018 Modified Files: pkgsrc/x11/vte3: Makefile distinfo pkgsrc/x11/vte3/patches: patch-configure patch-src_pty.cc Added Files: pkgsrc/x11/vte3/patches: patch-src_vte.cc Log Message: vte3: Various fixes, now builds on SunOS. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/vte3/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/vte3/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/vte3/patches/patch-configure \ pkgsrc/x11/vte3/patches/patch-src_pty.cc cvs rdiff -u -r0 -r1.1 pkgsrc/x11/vte3/patches/patch-src_vte.cc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1526377849257050 Content-Disposition: inline Content-Length: 6782 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/vte3/Makefile diff -u pkgsrc/x11/vte3/Makefile:1.9 pkgsrc/x11/vte3/Makefile:1.10 --- pkgsrc/x11/vte3/Makefile:1.9 Mon May 14 12:09:22 2018 +++ pkgsrc/x11/vte3/Makefile Tue May 15 09:50:49 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2018/05/14 12:09:22 youri Exp $ +# $NetBSD: Makefile,v 1.10 2018/05/15 09:50:49 jperkin Exp $ # DISTNAME= vte-0.50.3 @@ -18,11 +18,17 @@ GNU_CONFIGURE= yes USE_TOOLS+= gmake intltool msgfmt pkg-config bash USE_LANGUAGES= c c++ +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "SunOS" +CONFIGURE_ARGS+= --disable-Bsymbolic +.else CONFIGURE_ARGS+= --enable-Bsymbolic=auto +.endif CONFIGURE_ARGS+= --disable-introspection CONFIGURE_ARGS+= --disable-vala - +.include "../../devel/gperf/buildlink3.mk" .include "../../devel/pcre2/buildlink3.mk" .include "../../security/gnutls/buildlink3.mk" .include "../../x11/gtk3/buildlink3.mk" Index: pkgsrc/x11/vte3/distinfo diff -u pkgsrc/x11/vte3/distinfo:1.3 pkgsrc/x11/vte3/distinfo:1.4 --- pkgsrc/x11/vte3/distinfo:1.3 Mon May 14 12:09:22 2018 +++ pkgsrc/x11/vte3/distinfo Tue May 15 09:50:49 2018 @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.3 2018/05/14 12:09:22 youri Exp $ +$NetBSD: distinfo,v 1.4 2018/05/15 09:50:49 jperkin Exp $ SHA1 (vte-0.50.3.tar.xz) = 4578c34a3ce7722b7b05d6e46ca6d9146ddb8d50 RMD160 (vte-0.50.3.tar.xz) = c538601e5ca48a3ce8a583f1683024610f675b75 SHA512 (vte-0.50.3.tar.xz) = 1c1f0dac7cc33798e76fd6ccc89c1403447c84084e7e7053cb0d9da454ea72889cf2fcd5a9136091c3eced4a56ce69bd4bbcfc5e4a223faec12e0af99da6e196 Size (vte-0.50.3.tar.xz) = 1010076 bytes -SHA1 (patch-src_pty.cc) = 075106560922d6bb387904ce5451b27a5e13bad2 +SHA1 (patch-configure) = 9a570f27c0ec4e4680d517a8c2498b37728d52ae +SHA1 (patch-src_pty.cc) = cc2e0be62a90ffefcb21f8b07cb25f281b30df1e +SHA1 (patch-src_vte.cc) = b07315fef8593e6b51427ac039b9b4724e9fd18b Index: pkgsrc/x11/vte3/patches/patch-configure diff -u pkgsrc/x11/vte3/patches/patch-configure:1.1 pkgsrc/x11/vte3/patches/patch-configure:1.2 --- pkgsrc/x11/vte3/patches/patch-configure:1.1 Fri Feb 2 09:48:17 2018 +++ pkgsrc/x11/vte3/patches/patch-configure Tue May 15 09:50:49 2018 @@ -1,15 +1,15 @@ -$NetBSD: patch-configure,v 1.1 2018/02/02 09:48:17 jperkin Exp $ +$NetBSD: patch-configure,v 1.2 2018/05/15 09:50:49 jperkin Exp $ Leave pkgsrc to handle security features. ---- configure.orig 2015-10-12 14:36:52.000000000 +0000 +--- configure.orig 2018-04-09 21:44:54.000000000 +0000 +++ configure -@@ -13550,8 +13550,6 @@ _ACEOF - -fno-common \ - -fdiagnostics-show-option \ - -fno-strict-aliasing \ -- -fstack-protector \ -- -fstack-protector-strong \ - -Wno-deprecated-declarations \ - ; do +@@ -19290,7 +19290,7 @@ _ACEOF + + +- for flag in -pipe -Wall -Wcast-align -Wendif-labels -Werror=declaration-after-statement "-Werror=format=2 -Werror=format-nonliteral -Werror=format-security" -Werror=implicit-function-declaration -Werror=init-self -Werror=missing-include-dirs -Werror=missing-prototypes -Werror=pointer-arith -Wextra -Wfloat-equal -Wlogical-op -Wmisleading-indentation -Wmissing-declarations -Wmissing-include-dirs -Wmissing-format-attribute -Wmissing-noreturn -Wno-missing-field-initializers -Wno-switch-enum -Wno-unused-parameter -Wno-packed -Wshadow -Wsign-compare -Wstrict-aliasing=2 -Wundef -Wuninitialized -Wunsafe-loop-optimizations -Wwrite-strings -fno-common -fdiagnostics-show-option -fno-strict-aliasing -fstack-protector -fstack-protector-strong -fno-semantic-interposition -Wno-deprecated-declarations -Waggregate-return -Wimplicit -Wnested-externs -Wold-style-definition -Wstrict-prototypes ; do ++ for flag in -pipe -Wall -Wcast-align -Wendif-labels -Werror=declaration-after-statement "-Werror=format=2 -Werror=format-nonliteral -Werror=format-security" -Werror=implicit-function-declaration -Werror=init-self -Werror=missing-include-dirs -Werror=missing-prototypes -Werror=pointer-arith -Wextra -Wfloat-equal -Wlogical-op -Wmisleading-indentation -Wmissing-declarations -Wmissing-include-dirs -Wmissing-format-attribute -Wmissing-noreturn -Wno-missing-field-initializers -Wno-switch-enum -Wno-unused-parameter -Wno-packed -Wshadow -Wsign-compare -Wstrict-aliasing=2 -Wundef -Wuninitialized -Wunsafe-loop-optimizations -Wwrite-strings -fno-common -fdiagnostics-show-option -fno-strict-aliasing -fno-semantic-interposition -Wno-deprecated-declarations -Waggregate-return -Wimplicit -Wnested-externs -Wold-style-definition -Wstrict-prototypes ; do + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag $flag in envvar CFLAGS" >&5 + $as_echo_n "checking if $CC supports flag $flag in envvar CFLAGS... " >&6; } Index: pkgsrc/x11/vte3/patches/patch-src_pty.cc diff -u pkgsrc/x11/vte3/patches/patch-src_pty.cc:1.1 pkgsrc/x11/vte3/patches/patch-src_pty.cc:1.2 --- pkgsrc/x11/vte3/patches/patch-src_pty.cc:1.1 Mon May 14 13:55:23 2018 +++ pkgsrc/x11/vte3/patches/patch-src_pty.cc Tue May 15 09:50:49 2018 @@ -1,16 +1,28 @@ -$NetBSD: patch-src_pty.cc,v 1.1 2018/05/14 13:55:23 youri Exp $ +$NetBSD: patch-src_pty.cc,v 1.2 2018/05/15 09:50:49 jperkin Exp $ NetBSD fix +Use correct includes on SunOS. --- src/pty.cc.orig 2018-04-09 21:43:51.000000000 +0000 +++ src/pty.cc -@@ -624,7 +624,12 @@ _vte_pty_open_posix(void) +@@ -60,7 +60,9 @@ + #ifdef HAVE_PTY_H + #include + #endif +-#if defined(__sun) && defined(HAVE_STROPTS_H) ++#if defined(__sun) ++#include ++#include + #include + #endif + #include +@@ -624,7 +626,12 @@ _vte_pty_open_posix(void) fd = posix_openpt(O_RDWR | O_NOCTTY | O_NONBLOCK | O_CLOEXEC); #ifndef __linux__ /* Other kernels may not support CLOEXEC or NONBLOCK above, so try to fall back */ - bool need_cloexec = false, need_nonblocking = false; + bool need_cloexec = false; -+#if __NetBSD__ ++#ifdef __NetBSD__ + bool need_nonblocking = true; +#else + bool need_nonblocking = false; Added files: Index: pkgsrc/x11/vte3/patches/patch-src_vte.cc diff -u /dev/null pkgsrc/x11/vte3/patches/patch-src_vte.cc:1.1 --- /dev/null Tue May 15 09:50:49 2018 +++ pkgsrc/x11/vte3/patches/patch-src_vte.cc Tue May 15 09:50:49 2018 @@ -0,0 +1,16 @@ +$NetBSD: patch-src_vte.cc,v 1.1 2018/05/15 09:50:49 jperkin Exp $ + +Use correct includes on SunOS. + +--- src/vte.cc.orig 2018-04-09 21:43:51.000000000 +0000 ++++ src/vte.cc +@@ -25,6 +25,9 @@ + #include + #include + #include /* howmany() */ ++#ifdef __sun ++#include ++#endif + #include + #include + #include --_----------=_1526377849257050--