Attachment 178268 Details for Bug 215556 – patch

[patch] patch

qTox.patch (text/plain), 5.09 KB, created by Yuri Victorovich on 2016-12-25 20:54:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2016-12-25 20:54:36 UTC

Size: 5.09 KB

patch

obsolete

>Index: net-im/qTox/Makefile
>===================================================================
>--- net-im/qTox/Makefile	(revision 429407)
>+++ net-im/qTox/Makefile	(working copy)
>@@ -2,9 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	qTox
>-PORTVERSION=	1.6.0
>+PORTVERSION=	1.7.0
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	1
> CATEGORIES=	net-im net-p2p
> 
> MAINTAINER=	yuri@rawbw.com
>Index: net-im/qTox/distinfo
>===================================================================
>--- net-im/qTox/distinfo	(revision 429407)
>+++ net-im/qTox/distinfo	(working copy)
>@@ -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 = 1482697032
>+SHA256 (qTox-qTox-v1.7.0_GH0.tar.gz) = b33916b64f3992a46c1b1da8ce124e41048b76a780732c9c73e3645706334ec9
>+SIZE (qTox-qTox-v1.7.0_GH0.tar.gz) = 3563009
>Index: net-im/qTox/files/patch-qtox.pro
>===================================================================
>--- net-im/qTox/files/patch-qtox.pro	(revision 429407)
>+++ net-im/qTox/files/patch-qtox.pro	(working copy)
>@@ -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
>Index: net-im/qTox/files/patch-src_main.cpp
>===================================================================
>--- net-im/qTox/files/patch-src_main.cpp	(revision 429407)
>+++ net-im/qTox/files/patch-src_main.cpp	(working copy)
>@@ -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
>Index: net-im/qTox/files/patch-src_platform_camera_v4l2.cpp
>===================================================================
>--- net-im/qTox/files/patch-src_platform_camera_v4l2.cpp	(revision 429407)
>+++ net-im/qTox/files/patch-src_platform_camera_v4l2.cpp	(working copy)
>@@ -2,7 +2,7 @@
> 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.orig	2016-12-25 17:46:01 UTC
> +++ src/platform/camera/v4l2.cpp
> @@ -29,6 +29,7 @@
>  #include <linux/videodev2.h>
>Index: net-im/qTox/files/patch-src_platform_camera_v4l2.h
>===================================================================
>--- net-im/qTox/files/patch-src_platform_camera_v4l2.h	(revision 429407)
>+++ net-im/qTox/files/patch-src_platform_camera_v4l2.h	(working copy)
>@@ -1,8 +1,8 @@
>---- src/platform/camera/v4l2.h.orig	2016-11-13 15:20:00 UTC
>+--- src/platform/camera/v4l2.h.orig	2016-12-25 17:46:01 UTC
> +++ src/platform/camera/v4l2.h
> @@ -24,7 +24,7 @@
>  #include <QPair>
>- #include "src/video/videomode.h"
>+ #include "video/videomode.h"
>  
> -#ifndef Q_OS_LINUX
> +#ifndef Q_OS_UNIX
>Index: net-im/qTox/files/patch-src_video_cameradevice.cpp
>===================================================================
>--- net-im/qTox/files/patch-src_video_cameradevice.cpp	(revision 429407)
>+++ net-im/qTox/files/patch-src_video_cameradevice.cpp	(working copy)
>@@ -1,12 +1,12 @@
>---- src/video/cameradevice.cpp.orig	2016-11-13 15:20:00 UTC
>+--- src/video/cameradevice.cpp.orig	2016-12-25 20:19:46 UTC
> +++ src/video/cameradevice.cpp
> @@ -31,7 +31,7 @@ extern "C" {
>  #ifdef Q_OS_WIN
>- #include "src/platform/camera/directshow.h"
>+ #include "platform/camera/directshow.h"
>  #endif
> -#ifdef Q_OS_LINUX
> +#ifdef Q_OS_UNIX
>- #include "src/platform/camera/v4l2.h"
>+ #include "platform/camera/v4l2.h"
>  #endif
>  #ifdef Q_OS_OSX
> @@ -150,7 +150,7 @@ CameraDevice* CameraDevice::open(QString
>Index: net-im/qTox/files/patch-src_video_videomode.cpp
>===================================================================
>--- net-im/qTox/files/patch-src_video_videomode.cpp	(revision 429407)
>+++ net-im/qTox/files/patch-src_video_videomode.cpp	(working copy)
>@@ -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 @@
>  */
>Index: net-im/qTox/files/patch-src_widget_form_settings_aboutsettings.ui
>===================================================================
>--- net-im/qTox/files/patch-src_widget_form_settings_aboutsettings.ui	(revision 429407)
>+++ net-im/qTox/files/patch-src_widget_form_settings_aboutsettings.ui	(working copy)
>@@ -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">

Flags:

yuri: maintainer-approval+

Actions: View | Diff

Attachments on bug 215556: 178268 | 178387