Received: by mail.netbsd.org (Postfix, from userid 605) id 0357284E3B; Tue, 19 Dec 2017 08:17:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 80EB784D71 for ; Tue, 19 Dec 2017 08:17:22 +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 DPsHeYDO81c3 for ; Tue, 19 Dec 2017 08:17:21 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id C537B84C8D for ; Tue, 19 Dec 2017 08:17:21 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id BBB64FB40; Tue, 19 Dec 2017 08:17:21 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1513671441139960" MIME-Version: 1.0 Date: Tue, 19 Dec 2017 08:17:21 +0000 From: "Mark Davies" Subject: CVS commit: pkgsrc/devel/frama-c To: pkgsrc-changes@NetBSD.org Reply-To: markd@netbsd.org X-Mailer: log_accum Message-Id: <20171219081721.BBB64FB40@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. --_----------=_1513671441139960 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: markd Date: Tue Dec 19 08:17:21 UTC 2017 Modified Files: pkgsrc/devel/frama-c: distinfo pkgsrc/devel/frama-c/patches: patch-configure patch-src_plugins_wp_configure patch-src_plugins_wp_configure.ac Added Files: pkgsrc/devel/frama-c/patches: patch-src_plugins_gui_gtk__helper.ml Log Message: frama-c: allow coq 8.7 To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/frama-c/distinfo cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/frama-c/patches/patch-configure cvs rdiff -u -r0 -r1.1 \ pkgsrc/devel/frama-c/patches/patch-src_plugins_gui_gtk__helper.ml cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/devel/frama-c/patches/patch-src_plugins_wp_configure \ pkgsrc/devel/frama-c/patches/patch-src_plugins_wp_configure.ac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1513671441139960 Content-Disposition: inline Content-Length: 5905 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/frama-c/distinfo diff -u pkgsrc/devel/frama-c/distinfo:1.8 pkgsrc/devel/frama-c/distinfo:1.9 --- pkgsrc/devel/frama-c/distinfo:1.8 Tue Sep 5 07:42:00 2017 +++ pkgsrc/devel/frama-c/distinfo Tue Dec 19 08:17:21 2017 @@ -1,14 +1,15 @@ -$NetBSD: distinfo,v 1.8 2017/09/05 07:42:00 dholland Exp $ +$NetBSD: distinfo,v 1.9 2017/12/19 08:17:21 markd Exp $ SHA1 (frama-c-Phosphorus-20170501.tar.gz) = d9372127ba80636cc1c692a141a7a02dee8325da RMD160 (frama-c-Phosphorus-20170501.tar.gz) = 24a5b8578491d3c15aa539da69062803d0c6d137 SHA512 (frama-c-Phosphorus-20170501.tar.gz) = b3b73932378cba7be8ac0cbb1f7311e8f60dde68cad55c10659ffa40e76ab3f106d554e245ccd90ffb5307b9a42b6ce51154a5b9c006687b8c5808c77ca4c2f3 Size (frama-c-Phosphorus-20170501.tar.gz) = 7431131 bytes SHA1 (patch-Makefile) = d9a23653196d4586c3cca87091518aea6791ddcc -SHA1 (patch-configure) = a415684ab5ecb4fed276dede90439fa8ba6a09ed +SHA1 (patch-configure) = 84c96178f487a65fe875a336e0f271a7d101e5a7 SHA1 (patch-share_Makefile.common) = f5230aee768e6af4c7458d96f1f210172daa9bb2 SHA1 (patch-src_libraries_utils_c__bindings.c) = b37db1c51e9082e4a328a6a7189f57db3f12d624 SHA1 (patch-src_plugins_e-acsl_Makefile.in) = 8b1c4838ecd609504c1070917c0b61433f1e1f12 -SHA1 (patch-src_plugins_wp_configure) = 6f0fb756d2460b6abf27313d367672e293a8d9e7 -SHA1 (patch-src_plugins_wp_configure.ac) = 3b15ff7b551da79ad1580b134258631f1527bc42 +SHA1 (patch-src_plugins_gui_gtk__helper.ml) = 9870ffaaa9b042d4052d3eff1affaec6e254597b +SHA1 (patch-src_plugins_wp_configure) = a32631ddfe6f5c639b98cac2778aa9f5279e1033 +SHA1 (patch-src_plugins_wp_configure.ac) = a68d7ecebae07106d0d76ddbed4bf01ba0026e1a SHA1 (patch-src_plugins_wp_share_coqwp_Zbits.v) = 26fac23dc015087b7126e40a47d566eb49a24293 Index: pkgsrc/devel/frama-c/patches/patch-configure diff -u pkgsrc/devel/frama-c/patches/patch-configure:1.2 pkgsrc/devel/frama-c/patches/patch-configure:1.3 --- pkgsrc/devel/frama-c/patches/patch-configure:1.2 Tue Sep 5 07:30:00 2017 +++ pkgsrc/devel/frama-c/patches/patch-configure Tue Dec 19 08:17:21 2017 @@ -1,4 +1,4 @@ -$NetBSD: patch-configure,v 1.2 2017/09/05 07:30:00 dholland Exp $ +$NetBSD: patch-configure,v 1.3 2017/12/19 08:17:21 markd Exp $ Recognize more recent coq. @@ -9,7 +9,7 @@ Recognize more recent coq. COQVERSION=`coqc -v | sed -n -e 's|.*version* *\([^ ]*\) .*$|\1|p' ` case $COQVERSION in - 8.4pl6|8.5*|trunk) -+ 8.4pl6|8.5*|8.6*|trunk) ++ 8.4pl6|8.5*|8.6*|8.7*|trunk) { $as_echo "$as_me:${as_lineno-$LINENO}: result: coqc version $COQVERSION found" >&5 $as_echo "coqc version $COQVERSION found" >&6; } ;; Index: pkgsrc/devel/frama-c/patches/patch-src_plugins_wp_configure diff -u pkgsrc/devel/frama-c/patches/patch-src_plugins_wp_configure:1.1 pkgsrc/devel/frama-c/patches/patch-src_plugins_wp_configure:1.2 --- pkgsrc/devel/frama-c/patches/patch-src_plugins_wp_configure:1.1 Tue Sep 5 07:30:00 2017 +++ pkgsrc/devel/frama-c/patches/patch-src_plugins_wp_configure Tue Dec 19 08:17:21 2017 @@ -1,4 +1,4 @@ -$NetBSD: patch-src_plugins_wp_configure,v 1.1 2017/09/05 07:30:00 dholland Exp $ +$NetBSD: patch-src_plugins_wp_configure,v 1.2 2017/12/19 08:17:21 markd Exp $ Recognize more recent coq. @@ -9,7 +9,7 @@ Recognize more recent coq. COQVERSION=`coqc -v | sed -n -e 's|.*version* *\([^ ]*\) .*$|\1|p' ` case $COQVERSION in - 8.4pl6|8.5*|trunk) -+ 8.4pl6|8.5*|8.6*|trunk) ++ 8.4pl6|8.5*|8.6*|8.7*|trunk) { $as_echo "$as_me:${as_lineno-$LINENO}: result: coqc version $COQVERSION found" >&5 $as_echo "coqc version $COQVERSION found" >&6; } ;; Index: pkgsrc/devel/frama-c/patches/patch-src_plugins_wp_configure.ac diff -u pkgsrc/devel/frama-c/patches/patch-src_plugins_wp_configure.ac:1.1 pkgsrc/devel/frama-c/patches/patch-src_plugins_wp_configure.ac:1.2 --- pkgsrc/devel/frama-c/patches/patch-src_plugins_wp_configure.ac:1.1 Tue Sep 5 07:30:00 2017 +++ pkgsrc/devel/frama-c/patches/patch-src_plugins_wp_configure.ac Tue Dec 19 08:17:21 2017 @@ -1,4 +1,4 @@ -$NetBSD: patch-src_plugins_wp_configure.ac,v 1.1 2017/09/05 07:30:00 dholland Exp $ +$NetBSD: patch-src_plugins_wp_configure.ac,v 1.2 2017/12/19 08:17:21 markd Exp $ Recognize more recent coq. @@ -9,7 +9,7 @@ Recognize more recent coq. COQVERSION=`coqc -v | sed -n -e 's|.*version* *\([[^ ]]*\) .*$|\1|p' ` case $COQVERSION in - 8.4pl6|8.5*|trunk) -+ 8.4pl6|8.5*|8.6*|trunk) ++ 8.4pl6|8.5*|8.6*|8.7*|trunk) AC_MSG_RESULT(coqc version $COQVERSION found) ;; *) Added files: Index: pkgsrc/devel/frama-c/patches/patch-src_plugins_gui_gtk__helper.ml diff -u /dev/null pkgsrc/devel/frama-c/patches/patch-src_plugins_gui_gtk__helper.ml:1.1 --- /dev/null Tue Dec 19 08:17:21 2017 +++ pkgsrc/devel/frama-c/patches/patch-src_plugins_gui_gtk__helper.ml Tue Dec 19 08:17:21 2017 @@ -0,0 +1,17 @@ +$NetBSD: patch-src_plugins_gui_gtk__helper.ml,v 1.1 2017/12/19 08:17:21 markd Exp $ + +Glib.Io.read wants bytes so dont convert to string + +--- src/plugins/gui/gtk_helper.ml.orig 2017-06-01 08:02:15.000000000 +0000 ++++ src/plugins/gui/gtk_helper.ml +@@ -319,9 +319,7 @@ let channel_redirector channel callback + (* On Windows, you must use Io.read *) + (* buf' is added only to work around the suspicious type of + Glib.Io.read *) +- let buf' = Bytes.to_string buf in +- let len = Glib.Io.read channel ~buf:buf' ~pos:0 ~len in +- let buf = Bytes.of_string buf' in ++ let len = Glib.Io.read channel ~buf:buf ~pos:0 ~len in + len >= 1 && + (let full_string = !current_partial ^ Bytes.sub_string buf 0 len in + let to_emit, c = splitting_for_utf8 full_string in --_----------=_1513671441139960--