Chase toxcore and upgrade to 1.7.1.

PR:		215556
Submitted by:	maintainer (Yuri Victorovich)

9 files changed, 10 insertions, 110 deletions

diff --git a/net-im/qTox/Makefile b/net-im/qTox/Makefile
index 025fc570fcff..2fb2fe000273 100644
--- a/net-im/qTox/Makefile
+++ b/net-im/qTox/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	qTox
-PORTVERSION=	1.6.0
+PORTVERSION=	1.7.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	net-im net-p2p
 
 MAINTAINER=	yuri@rawbw.com
diff --git a/net-im/qTox/distinfo b/net-im/qTox/distinfo
index 5f616abcc193..8582a001c879 100644
--- a/net-im/qTox/distinfo
+++ b/net-im/qTox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480684987
-SHA256 (qTox-qTox-v1.6.0_GH0.tar.gz) = 7450e751da5cc6dce00b58df6d06a309e2674c7bd9311de6af21e53c36c3f155
-SIZE (qTox-qTox-v1.6.0_GH0.tar.gz) = 3481328
+TIMESTAMP = 1483083785
+SHA256 (qTox-qTox-v1.7.1_GH0.tar.gz) = 0d2a94be6f470e64f2722d261b9294b6ecc3418e374c47f722ca1a24058486e8
+SIZE (qTox-qTox-v1.7.1_GH0.tar.gz) = 3563251
diff --git a/net-im/qTox/files/patch-qtox.pro b/net-im/qTox/files/patch-qtox.pro
index f429471cc2f4..4eb98d81f3ce 100644
--- a/net-im/qTox/files/patch-qtox.pro
+++ b/net-im/qTox/files/patch-qtox.pro
@@ -1,6 +1,6 @@
---- qtox.pro.orig	2016-11-13 15:20:00 UTC
+--- qtox.pro.orig	2016-12-25 17:46:01 UTC
 +++ qtox.pro
-@@ -53,11 +53,11 @@ include(translations/i18n.pri)
+@@ -68,11 +68,11 @@ include(translations/i18n.pri)
  system($$fromfile(translations/i18n.pri, updateallqm))
  
  isEmpty(GIT_VERSION) {
@@ -14,7 +14,7 @@
  }
  DEFINES += GIT_DESCRIBE=\"\\\"$$quote($$GIT_DESCRIBE)\\\"\"
  # date works on linux/mac, but it would hangs qmake on windows
-@@ -493,3 +493,15 @@ SOURCES += \
+@@ -510,3 +510,15 @@ SOURCES += \
      src/widget/form/groupinviteform.cpp \
      src/widget/tool/profileimporter.cpp \
      src/widget/passwordedit.cpp
diff --git a/net-im/qTox/files/patch-src_main.cpp b/net-im/qTox/files/patch-src_main.cpp
index ea0419f4e090..b9bcdf92e0a0 100644
--- a/net-im/qTox/files/patch-src_main.cpp
+++ b/net-im/qTox/files/patch-src_main.cpp
@@ -1,4 +1,4 @@
---- src/main.cpp.orig	2016-11-13 15:20:00 UTC
+--- src/main.cpp.orig	2016-12-25 17:46:01 UTC
 +++ src/main.cpp
 @@ -317,3 +317,10 @@ int main(int argc, char *argv[])
  #endif
diff --git a/net-im/qTox/files/patch-src_platform_camera_v4l2.cpp b/net-im/qTox/files/patch-src_platform_camera_v4l2.cpp
deleted file mode 100644
index 14811e362db2..000000000000
--- a/net-im/qTox/files/patch-src_platform_camera_v4l2.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix build with GCC 4.9
-src/platform/camera/v4l2.cpp:204:24: error: 'printf' was not declared in this scope
-         printf("BAD!\n");
-
---- src/platform/camera/v4l2.cpp.orig	2016-12-02 20:44:09 UTC
-+++ src/platform/camera/v4l2.cpp
-@@ -29,6 +29,7 @@
- #include <linux/videodev2.h>
- #include <dirent.h>
- #include <map>
-+#include <cstdio>
- 
- /**
-  * Most of this file is adapted from libavdevice's v4l2.c,
diff --git a/net-im/qTox/files/patch-src_platform_camera_v4l2.h b/net-im/qTox/files/patch-src_platform_camera_v4l2.h
deleted file mode 100644
index 41c7934ec714..000000000000
--- a/net-im/qTox/files/patch-src_platform_camera_v4l2.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/platform/camera/v4l2.h.orig	2016-11-13 15:20:00 UTC
-+++ src/platform/camera/v4l2.h
-@@ -24,7 +24,7 @@
- #include <QPair>
- #include "src/video/videomode.h"
- 
--#ifndef Q_OS_LINUX
-+#ifndef Q_OS_UNIX
- #error "This file is only meant to be compiled for Linux targets"
- #endif
- 
diff --git a/net-im/qTox/files/patch-src_video_cameradevice.cpp b/net-im/qTox/files/patch-src_video_cameradevice.cpp
deleted file mode 100644
index 00ab21da2715..000000000000
--- a/net-im/qTox/files/patch-src_video_cameradevice.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
---- src/video/cameradevice.cpp.orig	2016-11-13 15:20:00 UTC
-+++ src/video/cameradevice.cpp
-@@ -31,7 +31,7 @@ extern "C" {
- #ifdef Q_OS_WIN
- #include "src/platform/camera/directshow.h"
- #endif
--#ifdef Q_OS_LINUX
-+#ifdef Q_OS_UNIX
- #include "src/platform/camera/v4l2.h"
- #endif
- #ifdef Q_OS_OSX
-@@ -150,7 +150,7 @@ CameraDevice* CameraDevice::open(QString
- 
-     AVDictionary* options = nullptr;
-     if (!iformat);
--#ifdef Q_OS_LINUX
-+#ifdef Q_OS_UNIX
-     else if (devName.startsWith("x11grab#"))
-     {
-         QSize screen;
-@@ -359,7 +359,7 @@ QVector<QPair<QString, QString>> CameraD
-     else if (iformat->name == QString("dshow"))
-         devices += DirectShow::getDeviceList();
- #endif
--#ifdef Q_OS_LINUX
-+#ifdef Q_OS_UNIX
-     else if (iformat->name == QString("video4linux2,v4l2"))
-         devices += v4l2::getDeviceList();
- #endif
-@@ -467,7 +467,7 @@ QVector<VideoMode> CameraDevice::getVide
-     else if (iformat->name == QString("dshow"))
-         return DirectShow::getDeviceModes(devName);
- #endif
--#ifdef Q_OS_LINUX
-+#ifdef Q_OS_UNIX
-     else if (iformat->name == QString("video4linux2,v4l2"))
-         return v4l2::getDeviceModes(devName);
- #endif
-@@ -488,7 +488,7 @@ QVector<VideoMode> CameraDevice::getVide
-  */
- QString CameraDevice::getPixelFormatString(uint32_t pixel_format)
- {
--#ifdef Q_OS_LINUX
-+#ifdef Q_OS_UNIX
-     return v4l2::getPixelFormatString(pixel_format);
- #else
-     return QString("unknown");
-@@ -504,7 +504,7 @@ QString CameraDevice::getPixelFormatStri
-  */
- bool CameraDevice::betterPixelFormat(uint32_t a, uint32_t b)
- {
--#ifdef Q_OS_LINUX
-+#ifdef Q_OS_UNIX
- 	return v4l2::betterPixelFormat(a, b);
- #else
- 	return false;
-@@ -524,7 +524,7 @@ bool CameraDevice::getDefaultInputFormat
-     avdevice_register_all();
- 
-     // Desktop capture input formats
--#ifdef Q_OS_LINUX
-+#ifdef Q_OS_UNIX
-     idesktopFormat = av_find_input_format("x11grab");
- #endif
- #ifdef Q_OS_WIN
-@@ -532,7 +532,7 @@ bool CameraDevice::getDefaultInputFormat
- #endif
- 
-     // Webcam input formats
--#ifdef Q_OS_LINUX
-+#ifdef Q_OS_UNIX
-     if ((iformat = av_find_input_format("v4l2")))
-         return true;
- #endif
diff --git a/net-im/qTox/files/patch-src_video_videomode.cpp b/net-im/qTox/files/patch-src_video_videomode.cpp
index 7e251d5db440..efd55d729b03 100644
--- a/net-im/qTox/files/patch-src_video_videomode.cpp
+++ b/net-im/qTox/files/patch-src_video_videomode.cpp
@@ -1,4 +1,4 @@
---- src/video/videomode.cpp.orig	2016-11-13 15:20:00 UTC
+--- src/video/videomode.cpp.orig	2016-12-25 17:46:01 UTC
 +++ src/video/videomode.cpp
 @@ -18,6 +18,7 @@
  */
diff --git a/net-im/qTox/files/patch-src_widget_form_settings_aboutsettings.ui b/net-im/qTox/files/patch-src_widget_form_settings_aboutsettings.ui
index 40ec2cf12b47..32d1d7992b04 100644
--- a/net-im/qTox/files/patch-src_widget_form_settings_aboutsettings.ui
+++ b/net-im/qTox/files/patch-src_widget_form_settings_aboutsettings.ui
@@ -1,4 +1,4 @@
---- src/widget/form/settings/aboutsettings.ui.orig	2016-11-13 15:20:00 UTC
+--- src/widget/form/settings/aboutsettings.ui.orig	2016-12-25 17:46:01 UTC
 +++ src/widget/form/settings/aboutsettings.ui
 @@ -111,6 +111,9 @@
              <property name="text">