<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0dafcec12825b9b2e9dd90d2e22f8c7b004da577">https://github.com/macports/macports-ports/commit/0dafcec12825b9b2e9dd90d2e22f8c7b004da577</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0dafcec12825b9b2e9dd90d2e22f8c7b004da577
</span>Author: Peter Newman <peternewman@users.noreply.github.com>
AuthorDate: Sun Nov 22 11:17:18 2020 +0000
<span style='display:block; white-space:pre;color:#404040;'> ola: Remove some patches that aren't required anymore 3
</span>---
net/ola/files/patch-protobuf3.diff | 56 --------------------------------------
1 file changed, 56 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/ola/files/patch-protobuf3.diff b/net/ola/files/patch-protobuf3.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c8c5fac1a02..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/ola/files/patch-protobuf3.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,56 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b129b22a3..3bcd7d0ba 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -66,21 +66,27 @@ AM_CONDITIONAL([SUPPORTS_GNU_PLUS_PLUS_11], [test "x$ac_cv_gnu_plus_plus_11" = x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # force us into gnu++98 mode if necessary
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If gnu++11 and gnu++98 then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# If no unit tests, force to gnu++98
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# If unittests and cppunit < 1.14.0, force to gnu++98
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Else turn off deprecation messages for std::auto_ptr and run gnu++11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# If protobuf < 3.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# If no unit tests, force to gnu++98
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Else we have unit tests
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# If cppunit < 1.14.0, force to gnu++98
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Else turn off deprecation messages for std::auto_ptr and run gnu++11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Else assume we have protobuf >= 3.6 (later checks will confirm that for certain), turn off deprecation messages for std::auto_ptr and run gnu++11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_gnu_plus_plus_11="no"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AS_IF([test "x$ac_cv_gnu_plus_plus_11" = xyes],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [AS_IF([test "x$ac_cv_gnu_plus_plus_98" = xyes],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [AS_IF([test "x$enable_unittests" = xno],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [CXXFLAGS="$CXXFLAGS -std=gnu++98"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [PKG_CHECK_MODULES([CPPUNIT1], [cppunit < 1.14.0],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [PKG_CHECK_MODULES([PROTOBUF1], [protobuf < 3.6],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [AS_IF([test "x$enable_unittests" = xno],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [CXXFLAGS="$CXXFLAGS -std=gnu++98"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [PKG_CHECK_MODULES([CPPUNIT2], [cppunit >= 1.14.0],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [require_gnu_plus_plus_11="yes"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [AC_MSG_WARN([OLA requires std::auto_ptr support.])])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [PKG_CHECK_MODULES([CPPUNIT1], [cppunit < 1.14.0],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [CXXFLAGS="$CXXFLAGS -std=gnu++98"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [PKG_CHECK_MODULES([CPPUNIT2], [cppunit >= 1.14.0],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [require_gnu_plus_plus_11="yes"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [AC_MSG_WARN([OLA requires std::auto_ptr support.])])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [require_gnu_plus_plus_11="yes"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AS_IF([test "x$require_gnu_plus_plus_11" = xyes],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/config/ola.m4 b/config/ola.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6080932e9..d3b8cc8f8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/config/ola.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/config/ola.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,9 +24,6 @@ AC_DEFUN([PROTOBUF_SUPPORT],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_REQUIRE_CPP()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKG_CHECK_MODULES(libprotobuf, [protobuf >= $1])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PKG_CHECK_MODULES(libprotobuf2, [protobuf < 3.2], [],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [AC_MSG_ERROR([OLA currently requires protobuf < 3.2, see issue 1192])])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST([libprotobuf_CFLAGS])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_ARG_WITH([protoc],
</span></pre><pre style='margin:0'>
</pre>