summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2019-10-13 11:13:19 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2019-10-13 11:13:19 +0700
commit6b96212dea1c13a6a8b9cc2338f97bd7ab69b05d (patch)
treeca06bf3a5efb3bea95df9d5b21084dfa1d741ca6
parente87c3b1acc1ce37c691fea0f68c4e7c22363acc7 (diff)
downloadslackbuilds-6b96212dea1c13a6a8b9cc2338f97bd7ab69b05d.tar.gz
misc/protobuf3: Updated for version 3.10.0.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--misc/protobuf3/protobuf3.SlackBuild10
-rw-r--r--misc/protobuf3/protobuf3.info8
-rw-r--r--misc/protobuf3/protobuf3.patch10
3 files changed, 15 insertions, 13 deletions
diff --git a/misc/protobuf3/protobuf3.SlackBuild b/misc/protobuf3/protobuf3.SlackBuild
index 82dc64d3b3..136585e976 100644
--- a/misc/protobuf3/protobuf3.SlackBuild
+++ b/misc/protobuf3/protobuf3.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=protobuf3
-VERSION=${VERSION:-3.9.1}
+VERSION=${VERSION:-3.10.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -66,7 +66,6 @@ mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $SRCNAM-$VERSION
tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-tar xvf $CWD/$GTEST-$GTESTVERSION.tar.gz
cd $SRCNAM-$VERSION
chown -R root:root .
find -L . \
@@ -75,12 +74,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Avoid downloading gtest automatically
-# It doesn't detect system-wide gtest installation
-rm -rf gmock googletest
-cp -rf ../$GTEST-$GTESTVERSION/googlemock gmock
-cp -rf ../$GTEST-$GTESTVERSION/googletest googletest
-ln -sf ../googletest gmock/gtest
+patch -p1 < $CWD/protobuf3.patch
./autogen.sh
CFLAGS="$SLKCFLAGS" \
diff --git a/misc/protobuf3/protobuf3.info b/misc/protobuf3/protobuf3.info
index 7bcfebc707..775e9fa8df 100644
--- a/misc/protobuf3/protobuf3.info
+++ b/misc/protobuf3/protobuf3.info
@@ -1,10 +1,8 @@
PRGNAM="protobuf3"
-VERSION="3.9.1"
+VERSION="3.10.0"
HOMEPAGE="https://github.com/google/protobuf"
-DOWNLOAD="https://github.com/google/protobuf/archive/v3.9.1/protobuf-3.9.1.tar.gz \
- https://github.com/google/googletest/archive/release-1.8.1/googletest-release-1.8.1.tar.gz"
-MD5SUM="ea53e87a5ece35f77aa006b91aceee56 \
- 2e6fbeb6a91310a16efe181886c59596"
+DOWNLOAD="https://github.com/google/protobuf/archive/v3.10.0/protobuf-3.10.0.tar.gz"
+MD5SUM="ea53e87a5ece35f77aa006b91aceee56"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/misc/protobuf3/protobuf3.patch b/misc/protobuf3/protobuf3.patch
new file mode 100644
index 0000000000..8211c981fb
--- /dev/null
+++ b/misc/protobuf3/protobuf3.patch
@@ -0,0 +1,10 @@
+--- protobuf-3.10.0/src/google/protobuf/text_format.h.orig 2019-10-13 10:42:21.345593616 +0700
++++ protobuf-3.10.0/src/google/protobuf/text_format.h 2019-10-13 10:42:34.151188015 +0700
+@@ -42,6 +42,7 @@
+ #include <memory>
+ #include <string>
+ #include <vector>
++#include <cmath>
+
+ #include <google/protobuf/stubs/common.h>
+ #include <google/protobuf/descriptor.h>