From 0b34c60a0ab0fa645f2f874cde54a8cc96072fa7 Mon Sep 17 00:00:00 2001
From: Andre Barboza <bmg.andre@gmail.com>
Date: Tue, 13 Dec 2016 16:50:03 +0700
Subject: libraries/glog: Updated for version 0.3.4 + new maintainer.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 libraries/glog/glog.SlackBuild | 10 +++---
 libraries/glog/glog.info       | 10 +++---
 libraries/glog/glog.patch      | 71 ------------------------------------------
 3 files changed, 9 insertions(+), 82 deletions(-)
 delete mode 100644 libraries/glog/glog.patch

(limited to 'libraries/glog')

diff --git a/libraries/glog/glog.SlackBuild b/libraries/glog/glog.SlackBuild
index 59623dd9584b..e089aa209dc5 100644
--- a/libraries/glog/glog.SlackBuild
+++ b/libraries/glog/glog.SlackBuild
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=glog
-VERSION=${VERSION:-0.3.3}
+VERSION=${VERSION:-0.3.4}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -61,9 +61,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cp $CWD/glog.patch $PRGNAM-$VERSION/glog.patch
 cd $PRGNAM-$VERSION
-patch -p1 < glog.patch
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/libraries/glog/glog.info b/libraries/glog/glog.info
index b07d86b82236..a1417e2f834b 100644
--- a/libraries/glog/glog.info
+++ b/libraries/glog/glog.info
@@ -1,10 +1,10 @@
 PRGNAM="glog"
-VERSION="0.3.3"
+VERSION="0.3.4"
 HOMEPAGE="https://github.com/google/glog"
-DOWNLOAD="http://pkgs.fedoraproject.org/repo/pkgs/glog/glog-0.3.3.tar.gz/a6fd2c22f8996846e34c763422717c18/glog-0.3.3.tar.gz"
-MD5SUM="a6fd2c22f8996846e34c763422717c18"
+DOWNLOAD="https://github.com/google/glog/archive/v0.3.4/glog-0.3.4.tar.gz"
+MD5SUM="df92e05c9d02504fb96674bc776a41cb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Jack Hunt"
-EMAIL="jackmileshunt[at]gmail.com"
+MAINTAINER="Andre Barboza"
+EMAIL="bmg.andre@gmail.com"
diff --git a/libraries/glog/glog.patch b/libraries/glog/glog.patch
deleted file mode 100644
index 7d3e50c5079a..000000000000
--- a/libraries/glog/glog.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -Naur glog-0.3.3/src/demangle_unittest.cc glog-0.3.3-patched/src/demangle_unittest.cc
---- glog-0.3.3/src/demangle_unittest.cc	2012-01-11 04:14:17.000000000 -0500
-+++ glog-0.3.3-patched/src/demangle_unittest.cc	2014-04-24 12:13:53.967735046 -0400
-@@ -41,6 +41,11 @@
- #include "googletest.h"
- #include "config.h"
- 
-+#ifdef HAVE_LIB_GFLAGS
-+#include <gflags/gflags.h>
-+using namespace gflags;
-+#endif
-+
- GLOG_DEFINE_bool(demangle_filter, false,
-                  "Run demangle_unittest in filter mode");
- 
-diff -Naur glog-0.3.3/src/logging_unittest.cc glog-0.3.3-patched/src/logging_unittest.cc
---- glog-0.3.3/src/logging_unittest.cc	2013-01-30 23:39:40.000000000 -0500
-+++ glog-0.3.3-patched/src/logging_unittest.cc	2014-04-24 12:12:11.977883984 -0400
-@@ -61,6 +61,7 @@
- 
- #ifdef HAVE_LIB_GFLAGS
- #include <gflags/gflags.h>
-+using namespace gflags;
- #endif
- 
- #ifdef HAVE_LIB_GMOCK
-diff -Naur glog-0.3.3/src/signalhandler_unittest.cc glog-0.3.3-patched/src/signalhandler_unittest.cc
---- glog-0.3.3/src/signalhandler_unittest.cc	2012-01-11 04:14:17.000000000 -0500
-+++ glog-0.3.3-patched/src/signalhandler_unittest.cc	2014-04-24 12:15:14.976822615 -0400
-@@ -41,6 +41,11 @@
- #include <string>
- #include "glog/logging.h"
- 
-+#ifdef HAVE_LIB_GFLAGS
-+#include <gflags/gflags.h>
-+using namespace gflags;
-+#endif
-+
- using namespace GOOGLE_NAMESPACE;
- 
- void* DieInThread(void*) {
-diff -Naur glog-0.3.3/src/symbolize_unittest.cc glog-0.3.3-patched/src/symbolize_unittest.cc
---- glog-0.3.3/src/symbolize_unittest.cc	2012-01-11 04:14:17.000000000 -0500
-+++ glog-0.3.3-patched/src/symbolize_unittest.cc	2014-04-24 12:14:18.077463477 -0400
-@@ -41,6 +41,11 @@
- #include "googletest.h"
- #include "config.h"
- 
-+#ifdef HAVE_LIB_GFLAGS
-+#include <gflags/gflags.h>
-+using namespace gflags;
-+#endif
-+
- using namespace std;
- using namespace GOOGLE_NAMESPACE;
- 
-diff -Naur glog-0.3.3/src/utilities_unittest.cc glog-0.3.3-patched/src/utilities_unittest.cc
---- glog-0.3.3/src/utilities_unittest.cc	2012-01-11 04:14:17.000000000 -0500
-+++ glog-0.3.3-patched/src/utilities_unittest.cc	2014-04-24 12:14:54.963048001 -0400
-@@ -33,6 +33,11 @@
- #include "googletest.h"
- #include "glog/logging.h"
- 
-+#ifdef HAVE_LIB_GFLAGS
-+#include <gflags/gflags.h>
-+using namespace gflags;
-+#endif
-+
- using namespace GOOGLE_NAMESPACE;
- 
- TEST(utilities, sync_val_compare_and_swap) {
-- 
cgit v1.2.3