svn commit: r478607 - in head: databases/clickhouse devel/android-tools-adb/files devel/googlemock devel/googletest devel/googletest/files emulators/dolphin-emu lang/cling science/libkml security/c...

Jan Beich jbeich at FreeBSD.org
Fri Aug 31 20:14:43 UTC 2018 

Author: jbeich
Date: Fri Aug 31 20:14:40 2018
New Revision: 478607
URL: https://svnweb.freebsd.org/changeset/ports/478607

Log:
  devel/google{test,mock}: update to 1.8.1
  
  Changes:	https://github.com/google/googletest/compare/9bda90b...release-1.8.1

Added:
  head/devel/android-tools-adb/files/patch-gtest-1.8.1   (contents, props changed)
Modified:
  head/databases/clickhouse/Makefile   (contents, props changed)
  head/devel/googlemock/Makefile   (contents, props changed)
  head/devel/googlemock/distinfo   (contents, props changed)
  head/devel/googletest/Makefile   (contents, props changed)
  head/devel/googletest/distinfo   (contents, props changed)
  head/devel/googletest/files/patch-bsd-defines   (contents, props changed)
  head/emulators/dolphin-emu/Makefile   (contents, props changed)
  head/lang/cling/Makefile   (contents, props changed)
  head/science/libkml/Makefile   (contents, props changed)
  head/security/certificate-transparency/Makefile   (contents, props changed)

Modified: head/databases/clickhouse/Makefile
==============================================================================
--- head/databases/clickhouse/Makefile	Fri Aug 31 19:45:04 2018	(r478606)
+++ head/databases/clickhouse/Makefile	Fri Aug 31 20:14:40 2018	(r478607)
@@ -5,7 +5,7 @@ PORTNAME=	clickhouse
 PORTVERSION=	18.1.0
 DISTVERSIONPREFIX=	v
 DISTVERSIONSUFFIX=	-stable
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 
 MAINTAINER=	proler at gmail.com

Added: head/devel/android-tools-adb/files/patch-gtest-1.8.1
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/android-tools-adb/files/patch-gtest-1.8.1	Fri Aug 31 20:14:40 2018	(r478607)
@@ -0,0 +1,55 @@
+bugreport_test.cpp:77:20: error: no member named 'tr1' in namespace 'std'
+            ::std::tr1::get<0>(args)->OnStdout(output_.c_str(), output_.size());
+            ~~~~~~~^
+bugreport_test.cpp:77:37: error: member reference type 'const testing::ActionInterface<void (StandardStreamsCallbackInterface *)>::ArgumentTuple' (aka 'const tuple<StandardStreamsCallbackInterface *>') is not a pointer; did you mean to use '.'?
+            ::std::tr1::get<0>(args)->OnStdout(output_.c_str(), output_.size());
+                              ~~~~~~^~
+                                    .
+bugreport_test.cpp:77:39: error: no member named 'OnStdout' in 'std::__1::tuple<StandardStreamsCallbackInterface *>'
+            ::std::tr1::get<0>(args)->OnStdout(output_.c_str(), output_.size());
+                              ~~~~~~  ^
+bugreport_test.cpp:80:20: error: no member named 'tr1' in namespace 'std'
+            ::std::tr1::get<0>(args)->OnStderr(output_.c_str(), output_.size());
+            ~~~~~~~^
+bugreport_test.cpp:80:37: error: member reference type 'const testing::ActionInterface<void (StandardStreamsCallbackInterface *)>::ArgumentTuple' (aka 'const tuple<StandardStreamsCallbackInterface *>') is not a pointer; did you mean to use '.'?
+            ::std::tr1::get<0>(args)->OnStderr(output_.c_str(), output_.size());
+                              ~~~~~~^~
+                                    .
+bugreport_test.cpp:80:39: error: no member named 'OnStderr' in 'std::__1::tuple<StandardStreamsCallbackInterface *>'
+            ::std::tr1::get<0>(args)->OnStderr(output_.c_str(), output_.size());
+                              ~~~~~~  ^
+bugreport_test.cpp:108:29: error: no member named 'tr1' in namespace 'std'
+        int status = ::std::tr1::get<0>(args)->Done(status_);
+                     ~~~~~~~^
+bugreport_test.cpp:108:46: error: member reference type 'const testing::ActionInterface<int (StandardStreamsCallbackInterface *)>::ArgumentTuple' (aka 'const tuple<StandardStreamsCallbackInterface *>') is not a pointer; did you mean to use '.'?
+        int status = ::std::tr1::get<0>(args)->Done(status_);
+                                       ~~~~~~^~
+                                             .
+bugreport_test.cpp:108:48: error: no member named 'Done' in 'std::__1::tuple<StandardStreamsCallbackInterface *>'
+        int status = ::std::tr1::get<0>(args)->Done(status_);
+                                       ~~~~~~  ^
+
+--- adb/bugreport_test.cpp.orig	2016-09-28 18:07:09 UTC
++++ adb/bugreport_test.cpp
+@@ -74,10 +74,10 @@ class OnStandardStreamsCallbackAction : public ActionI
+     }
+     virtual Result Perform(const ArgumentTuple& args) {
+         if (type_ == kStreamStdout) {
+-            ::std::tr1::get<0>(args)->OnStdout(output_.c_str(), output_.size());
++            std::get<0>(args)->OnStdout(output_.c_str(), output_.size());
+         }
+         if (type_ == kStreamStderr) {
+-            ::std::tr1::get<0>(args)->OnStderr(output_.c_str(), output_.size());
++            std::get<0>(args)->OnStderr(output_.c_str(), output_.size());
+         }
+     }
+ 
+@@ -105,7 +105,7 @@ class CallbackDoneAction : public ActionInterface<Call
+     explicit CallbackDoneAction(int status) : status_(status) {
+     }
+     virtual Result Perform(const ArgumentTuple& args) {
+-        int status = ::std::tr1::get<0>(args)->Done(status_);
++        int status = std::get<0>(args)->Done(status_);
+         return status;
+     }
+ 

Modified: head/devel/googlemock/Makefile
==============================================================================
--- head/devel/googlemock/Makefile	Fri Aug 31 19:45:04 2018	(r478606)
+++ head/devel/googlemock/Makefile	Fri Aug 31 20:14:40 2018	(r478607)
@@ -3,8 +3,7 @@
 
 PORTNAME=	googlemock
 DISTVERSIONPREFIX=	release-
-DISTVERSION=	1.8.0-712
-DISTVERSIONSUFFIX=	-g9bda90b
+DISTVERSION=	1.8.1
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich at FreeBSD.org

Modified: head/devel/googlemock/distinfo
==============================================================================
--- head/devel/googlemock/distinfo	Fri Aug 31 19:45:04 2018	(r478606)
+++ head/devel/googlemock/distinfo	Fri Aug 31 20:14:40 2018	(r478607)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1520457288
-SHA256 (google-googletest-release-1.8.0-712-g9bda90b_GH0.tar.gz) = edddf29136d95c595ce7596ddf7aa1b402f6a6254e634b45f29116d7aaf9f937
-SIZE (google-googletest-release-1.8.0-712-g9bda90b_GH0.tar.gz) = 966266
+TIMESTAMP = 1535728917
+SHA256 (google-googletest-release-1.8.1_GH0.tar.gz) = 9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c
+SIZE (google-googletest-release-1.8.1_GH0.tar.gz) = 992298

Modified: head/devel/googletest/Makefile
==============================================================================
--- head/devel/googletest/Makefile	Fri Aug 31 19:45:04 2018	(r478606)
+++ head/devel/googletest/Makefile	Fri Aug 31 20:14:40 2018	(r478607)
@@ -3,8 +3,7 @@
 
 PORTNAME=	googletest
 DISTVERSIONPREFIX=	release-
-DISTVERSION=	1.8.0-712
-DISTVERSIONSUFFIX=	-g9bda90b
+DISTVERSION=	1.8.1
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich at FreeBSD.org

Modified: head/devel/googletest/distinfo
==============================================================================
--- head/devel/googletest/distinfo	Fri Aug 31 19:45:04 2018	(r478606)
+++ head/devel/googletest/distinfo	Fri Aug 31 20:14:40 2018	(r478607)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1520457288
-SHA256 (google-googletest-release-1.8.0-712-g9bda90b_GH0.tar.gz) = edddf29136d95c595ce7596ddf7aa1b402f6a6254e634b45f29116d7aaf9f937
-SIZE (google-googletest-release-1.8.0-712-g9bda90b_GH0.tar.gz) = 966266
+TIMESTAMP = 1535728917
+SHA256 (google-googletest-release-1.8.1_GH0.tar.gz) = 9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c
+SIZE (google-googletest-release-1.8.1_GH0.tar.gz) = 992298

Modified: head/devel/googletest/files/patch-bsd-defines
==============================================================================
--- head/devel/googletest/files/patch-bsd-defines	Fri Aug 31 19:45:04 2018	(r478606)
+++ head/devel/googletest/files/patch-bsd-defines	Fri Aug 31 20:14:40 2018	(r478607)
@@ -15,9 +15,9 @@ o Work around StreamingListenerTest with GCC 4.2
  #elif defined __FreeBSD__
  # define GTEST_OS_FREEBSD 1
  #elif defined __Fuchsia__
---- include/gtest/internal/gtest-port.h.orig	2017-09-23 23:21:02 UTC
+--- include/gtest/internal/gtest-port.h.orig	2018-08-31 15:21:57 UTC
 +++ include/gtest/internal/gtest-port.h
-@@ -121,7 +121,9 @@
+@@ -125,7 +125,9 @@
  //
  //   GTEST_OS_AIX      - IBM AIX
  //   GTEST_OS_CYGWIN   - Cygwin
@@ -35,17 +35,17 @@ o Work around StreamingListenerTest with GCC 4.2
     GTEST_OS_FREEBSD || GTEST_OS_NACL || GTEST_OS_NETBSD || GTEST_OS_FUCHSIA)
  #endif  // GTEST_HAS_PTHREAD
  
-@@ -803,7 +806,8 @@ using ::std::tuple_size;
-      (GTEST_OS_MAC && !GTEST_OS_IOS) || \
-      (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \
+@@ -829,7 +832,8 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SE
+      (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) ||          \
       GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \
--     GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD || GTEST_OS_NETBSD)
-+     GTEST_OS_GNU_KFREEBSD || GTEST_OS_DRAGONFLY || GTEST_OS_NETBSD ||	\
-+     GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD)
+      GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD || \
+-     GTEST_OS_NETBSD || GTEST_OS_FUCHSIA)
++     GTEST_OS_NETBSD || GTEST_OS_FUCHSIA || GTEST_OS_DRAGONFLY || \
++     GTEST_OS_GNU_KFREEBSD)
  # define GTEST_HAS_DEATH_TEST 1
  #endif
  
-@@ -835,7 +839,8 @@ using ::std::tuple_size;
+@@ -856,7 +860,8 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SE
      (GTEST_OS_WINDOWS || GTEST_OS_CYGWIN || GTEST_OS_SYMBIAN || GTEST_OS_AIX)
  
  // Determines whether test results can be streamed to a socket.
@@ -164,15 +164,16 @@ o Work around StreamingListenerTest with GCC 4.2
  # include <netdb.h>  // NOLINT
  # include <sys/socket.h>  // NOLINT
  # include <sys/types.h>  // NOLINT
---- test/gtest-port_test.cc.orig	2017-09-23 23:21:02 UTC
-+++ test/gtest-port_test.cc
-@@ -304,7 +304,8 @@ TEST(FormatCompilerIndependentFileLocationTest, Format
+--- test/googletest-port-test.cc.orig	2018-08-31 15:21:57 UTC
++++ test/googletest-port-test.cc
+@@ -293,7 +293,9 @@ TEST(FormatCompilerIndependentFileLocationTest, Format
    EXPECT_EQ("unknown file", FormatCompilerIndependentFileLocation(NULL, -1));
  }
  
--#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX
-+#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_DRAGONFLY || \
-+    GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || GTEST_OS_NETBSD || GTEST_OS_OPENBSD
+-#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA
++#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA || \
++    GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || \
++    GTEST_OS_NETBSD || GTEST_OS_OPENBSD
  void* ThreadFunc(void* data) {
    internal::Mutex* mutex = static_cast<internal::Mutex*>(data);
    mutex->Lock();

Modified: head/emulators/dolphin-emu/Makefile
==============================================================================
--- head/emulators/dolphin-emu/Makefile	Fri Aug 31 19:45:04 2018	(r478606)
+++ head/emulators/dolphin-emu/Makefile	Fri Aug 31 20:14:40 2018	(r478607)
@@ -3,7 +3,7 @@
 
 PORTNAME=	dolphin-emu
 PORTVERSION=	5.0
-PORTREVISION=	23
+PORTREVISION=	24
 CATEGORIES=	emulators
 
 MAINTAINER=	martymac at FreeBSD.org

Modified: head/lang/cling/Makefile
==============================================================================
--- head/lang/cling/Makefile	Fri Aug 31 19:45:04 2018	(r478606)
+++ head/lang/cling/Makefile	Fri Aug 31 20:14:40 2018	(r478607)
@@ -3,6 +3,7 @@
 
 PORTNAME=		cling
 DISTVERSION=		0.5-2018-08-13
+PORTREVISION=		1
 CATEGORIES=		lang devel
 MASTER_SITES=		https://root.cern.ch/download/cling/
 DISTNAME=		${PORTNAME}_${DISTVERSION:C/^[0-9]\.[0-9]-//}_sources

Modified: head/science/libkml/Makefile
==============================================================================
--- head/science/libkml/Makefile	Fri Aug 31 19:45:04 2018	(r478606)
+++ head/science/libkml/Makefile	Fri Aug 31 20:14:40 2018	(r478607)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libkml
 PORTVERSION=	1.3.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	science
 
 MAINTAINER=	sunpoet at FreeBSD.org

Modified: head/security/certificate-transparency/Makefile
==============================================================================
--- head/security/certificate-transparency/Makefile	Fri Aug 31 19:45:04 2018	(r478606)
+++ head/security/certificate-transparency/Makefile	Fri Aug 31 20:14:40 2018	(r478607)
@@ -3,7 +3,7 @@
 
 PORTNAME=	certificate-transparency
 PORTVERSION=	20161015
-PORTREVISION=	26
+PORTREVISION=	27
 CATEGORIES=	security
 
 MAINTAINER=	ports at FreeBSD.org

More information about the svn-ports-all mailing list