Attachment 163180 Details for Bug 204591 – patch

[patch] patch

qTox.patch (text/plain), 11.42 KB, created by Yuri Victorovich on 2015-11-16 07:45:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2015-11-16 07:45:22 UTC

Size: 11.42 KB

patch

obsolete

>diff -ruN net-im/qTox/Makefile net-im/qTox/Makefile
>--- net-im/qTox/Makefile	2015-11-15 00:27:21.641657000 -0800
>+++ net-im/qTox/Makefile	2015-11-15 22:34:37.409912000 -0800
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/net-im/qTox/Makefile 401587 2015-11-14 19:34:12Z jbeich $
> 
> PORTNAME=	qTox
>-PORTVERSION=	0.150614
>-PORTREVISION=	2
>+PORTVERSION=	0.151116
> CATEGORIES=	net-im net-p2p
> 
> MAINTAINER=	yuri@rawbw.com
>@@ -23,7 +22,7 @@
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	tux3
>-GH_TAGNAME=	ce2c830
>+GH_TAGNAME=	db52ef6
> 
> USES=		compiler:c++11-lib desktop-file-utils openal:soft qmake gmake
> USE_GNOME=	glib20 gtk20 cairo gdkpixbuf2
>diff -ruN net-im/qTox/distinfo net-im/qTox/distinfo
>--- net-im/qTox/distinfo	2015-11-15 00:27:21.661341000 -0800
>+++ net-im/qTox/distinfo	2015-11-15 22:37:15.257449000 -0800
>@@ -1,2 +1,2 @@
>-SHA256 (tux3-qTox-0.150614-ce2c830_GH0.tar.gz) = c59580b98886acf9ec5acb1a85b7f6544d53bc2d72491dddeb8865b4d64dd3f6
>-SIZE (tux3-qTox-0.150614-ce2c830_GH0.tar.gz) = 4556369
>+SHA256 (tux3-qTox-0.151116-db52ef6_GH0.tar.gz) = 3920a71131666bef8044c7428e56e75ac9136b22b9e7d51d2c506da24e34ff91
>+SIZE (tux3-qTox-0.151116-db52ef6_GH0.tar.gz) = 4627473
>diff -ruN net-im/qTox/files/patch-qtox.pro net-im/qTox/files/patch-qtox.pro
>--- net-im/qTox/files/patch-qtox.pro	2015-11-15 00:27:21.701021000 -0800
>+++ net-im/qTox/files/patch-qtox.pro	2015-11-15 00:13:21.601894000 -0800
>@@ -1,8 +1,130 @@
>---- qtox.pro.orig	2015-06-12 10:53:59 UTC
>+--- qtox.pro.orig	2015-11-14 22:51:30 UTC
> +++ qtox.pro
>-@@ -483,6 +483,18 @@ SOURCES += \
>-     src/widget/translator.cpp \
>-     src/persistence/settingsserializer.cpp
>+@@ -203,26 +203,26 @@ unix:!macx:!android {
>+ contains(ENABLE_SYSTRAY_UNITY_BACKEND, YES) {
>+     DEFINES += ENABLE_SYSTRAY_UNITY_BACKEND
>+ 
>+-    INCLUDEPATH += "/usr/include/glib-2.0"
>+-    INCLUDEPATH += "/usr/include/gtk-2.0"
>+-    INCLUDEPATH += "/usr/include/atk-1.0"
>+-    INCLUDEPATH += "/usr/include/cairo"
>+-    INCLUDEPATH += "/usr/include/ffmpeg"
>+-    INCLUDEPATH += "/usr/include/gdk-pixbuf-2.0"
>+-    INCLUDEPATH += "/usr/include/libappindicator-0.1"
>+-    INCLUDEPATH += "/usr/include/libdbusmenu-glib-0.4"
>+-    INCLUDEPATH += "/usr/include/pango-1.0"
>++    INCLUDEPATH += "/usr/local/include/glib-2.0"
>++    INCLUDEPATH += "/usr/local/include/gtk-2.0"
>++    INCLUDEPATH += "/usr/local/include/atk-1.0"
>++    INCLUDEPATH += "/usr/local/include/cairo"
>++    INCLUDEPATH += "/usr/local/include/ffmpeg"
>++    INCLUDEPATH += "/usr/local/include/gdk-pixbuf-2.0"
>++    INCLUDEPATH += "/usr/local/include/libappindicator-0.1"
>++    INCLUDEPATH += "/usr/local/include/libdbusmenu-glib-0.4"
>++    INCLUDEPATH += "/usr/local/include/pango-1.0"
>+     equals(QT_ARCH, x86_64) {
>+-        INCLUDEPATH += "/usr/lib64/glib-2.0/include"
>+-        INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/glib-2.0/include"
>+-        INCLUDEPATH += "/usr/lib64/gtk-2.0/include"
>+-        INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/gtk-2.0/include"
>++        INCLUDEPATH += "/usr/local/lib/glib-2.0/include"
>++        INCLUDEPATH += "/usr/local/lib/x86_64-linux-gnu/glib-2.0/include"
>++        INCLUDEPATH += "/usr/local/lib/gtk-2.0/include"
>++        INCLUDEPATH += "/usr/local/lib/x86_64-linux-gnu/gtk-2.0/include"
>+     }
>+     else {
>+-        INCLUDEPATH += "/usr/lib/glib-2.0/include"
>+-        INCLUDEPATH += "/usr/lib/i386-linux-gnu/glib-2.0/include"
>+-        INCLUDEPATH += "/usr/lib/gtk-2.0/include"
>+-        INCLUDEPATH += "/usr/lib/i386-linux-gnu/gtk-2.0/include"
>++        INCLUDEPATH += "/usr/local/lib/glib-2.0/include"
>++        INCLUDEPATH += "/usr/local/lib/i386-linux-gnu/glib-2.0/include"
>++        INCLUDEPATH += "/usr/local/lib/gtk-2.0/include"
>++        INCLUDEPATH += "/usr/local/lib/i386-linux-gnu/gtk-2.0/include"
>+     }
>+ 
>+     LIBS += -lgobject-2.0 -lappindicator -lgtk-x11-2.0
>+@@ -235,24 +235,24 @@ contains(ENABLE_SYSTRAY_STATUSNOTIFIER_B
>+ } else {
>+     DEFINES += ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND
>+ 
>+-    INCLUDEPATH += "/usr/include/glib-2.0"
>+-    INCLUDEPATH += "/usr/include/gtk-2.0"
>+-    INCLUDEPATH += "/usr/include/atk-1.0"
>+-    INCLUDEPATH += "/usr/include/cairo"
>+-    INCLUDEPATH += "/usr/include/ffmpeg"
>+-    INCLUDEPATH += "/usr/include/gdk-pixbuf-2.0"
>+-    INCLUDEPATH += "/usr/include/pango-1.0"
>++    INCLUDEPATH += "/usr/local/include/glib-2.0"
>++    INCLUDEPATH += "/usr/local/include/gtk-2.0"
>++    INCLUDEPATH += "/usr/local/include/atk-1.0"
>++    INCLUDEPATH += "/usr/local/include/cairo"
>++    INCLUDEPATH += "/usr/local/include/ffmpeg"
>++    INCLUDEPATH += "/usr/local/include/gdk-pixbuf-2.0"
>++    INCLUDEPATH += "/usr/local/include/pango-1.0"
>+     equals(QT_ARCH, x86_64) {
>+-        INCLUDEPATH += "/usr/lib64/glib-2.0/include"
>+-        INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/glib-2.0/include"
>+-        INCLUDEPATH += "/usr/lib64/gtk-2.0/include"
>+-        INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/gtk-2.0/include"
>++        INCLUDEPATH += "/usr/local/lib/glib-2.0/include"
>++        INCLUDEPATH += "/usr/local/lib/x86_64-linux-gnu/glib-2.0/include"
>++        INCLUDEPATH += "/usr/local/lib/gtk-2.0/include"
>++        INCLUDEPATH += "/usr/local/lib/x86_64-linux-gnu/gtk-2.0/include"
>+     }
>+     else {
>+-        INCLUDEPATH += "/usr/lib/glib-2.0/include"
>+-        INCLUDEPATH += "/usr/lib/i386-linux-gnu/glib-2.0/include"
>+-        INCLUDEPATH += "/usr/lib/gtk-2.0/include"
>+-        INCLUDEPATH += "/usr/lib/i386-linux-gnu/gtk-2.0/include"
>++        INCLUDEPATH += "/usr/local/lib/glib-2.0/include"
>++        INCLUDEPATH += "/usr/local/lib/i386-linux-gnu/glib-2.0/include"
>++        INCLUDEPATH += "/usr/local/lib/gtk-2.0/include"
>++        INCLUDEPATH += "/usr/local/lib/i386-linux-gnu/gtk-2.0/include"
>+     }
>+ 
>+ 
>+@@ -275,23 +275,23 @@ contains(ENABLE_SYSTRAY_GTK_BACKEND, NO)
>+ } else {
>+     DEFINES += ENABLE_SYSTRAY_GTK_BACKEND
>+ 
>+-    INCLUDEPATH += "/usr/include/glib-2.0"
>+-    INCLUDEPATH += "/usr/include/gtk-2.0"
>+-    INCLUDEPATH += "/usr/include/atk-1.0"
>+-    INCLUDEPATH += "/usr/include/gdk-pixbuf-2.0"
>+-    INCLUDEPATH += "/usr/include/cairo"
>+-    INCLUDEPATH += "/usr/include/pango-1.0"
>++    INCLUDEPATH += "/usr/local/include/glib-2.0"
>++    INCLUDEPATH += "/usr/local/include/gtk-2.0"
>++    INCLUDEPATH += "/usr/local/include/atk-1.0"
>++    INCLUDEPATH += "/usr/local/include/gdk-pixbuf-2.0"
>++    INCLUDEPATH += "/usr/local/include/cairo"
>++    INCLUDEPATH += "/usr/local/include/pango-1.0"
>+     equals(QT_ARCH, x86_64) {
>+-        INCLUDEPATH += "/usr/lib64/glib-2.0/include"
>+-        INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/glib-2.0/include"
>+-        INCLUDEPATH += "/usr/lib64/gtk-2.0/include"
>+-        INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/gtk-2.0/include"
>++        INCLUDEPATH += "/usr/local/lib/glib-2.0/include"
>++        INCLUDEPATH += "/usr/local/lib/x86_64-linux-gnu/glib-2.0/include"
>++        INCLUDEPATH += "/usr/local/lib/gtk-2.0/include"
>++        INCLUDEPATH += "/usr/local/lib/x86_64-linux-gnu/gtk-2.0/include"
>+     }
>+     else {
>+-        INCLUDEPATH += "/usr/lib/glib-2.0/include"
>+-        INCLUDEPATH += "/usr/lib/i386-linux-gnu/glib-2.0/include"
>+-        INCLUDEPATH += "/usr/lib/gtk-2.0/include"
>+-        INCLUDEPATH += "/usr/lib/i386-linux-gnu/gtk-2.0/include"
>++        INCLUDEPATH += "/usr/local/lib/glib-2.0/include"
>++        INCLUDEPATH += "/usr/local/lib/i386-linux-gnu/glib-2.0/include"
>++        INCLUDEPATH += "/usr/local/lib/gtk-2.0/include"
>++        INCLUDEPATH += "/usr/local/lib/i386-linux-gnu/gtk-2.0/include"
>+     }
>+ 
>+ 
>+@@ -504,6 +504,18 @@ SOURCES += \
>+     src/video/groupnetcamview.cpp \
>+     src/core/toxcall.cpp
>  
> +unix {
> +    target.path  = $$PREFIX/bin
>diff -ruN net-im/qTox/files/patch-src_main.cpp net-im/qTox/files/patch-src_main.cpp
>--- net-im/qTox/files/patch-src_main.cpp	2015-11-15 00:27:21.740630000 -0800
>+++ net-im/qTox/files/patch-src_main.cpp	2015-11-15 00:13:21.610978000 -0800
>@@ -1,6 +1,6 @@
>---- src/main.cpp.orig	2015-06-12 10:53:59 UTC
>+--- src/main.cpp.orig	2015-11-14 22:51:30 UTC
> +++ src/main.cpp
>-@@ -280,3 +280,10 @@ int main(int argc, char *argv[])
>+@@ -269,3 +269,10 @@ int main(int argc, char *argv[])
>      qDebug() << "Clean exit with status"<<errorcode;
>      return errorcode;
>  }
>diff -ruN net-im/qTox/files/patch-src_platform_camera_v4l2.cpp net-im/qTox/files/patch-src_platform_camera_v4l2.cpp
>--- net-im/qTox/files/patch-src_platform_camera_v4l2.cpp	2015-11-15 00:27:21.720612000 -0800
>+++ net-im/qTox/files/patch-src_platform_camera_v4l2.cpp	1969-12-31 16:00:00.000000000 -0800
>@@ -1,10 +0,0 @@
>---- src/platform/camera/v4l2.cpp.orig	2015-06-15 03:25:21 UTC
>-+++ src/platform/camera/v4l2.cpp
>-@@ -26,6 +26,7 @@
>- #include <fcntl.h>
>- #include <sys/ioctl.h>
>- #include <linux/videodev2.h>
>-+#include <errno.h>
>- 
>- /**
>-  * Most of this file is adapted from libavdevice's v4l2.c,
>diff -ruN net-im/qTox/files/patch-src_platform_camera_v4l2.h net-im/qTox/files/patch-src_platform_camera_v4l2.h
>--- net-im/qTox/files/patch-src_platform_camera_v4l2.h	2015-11-15 00:27:21.760633000 -0800
>+++ net-im/qTox/files/patch-src_platform_camera_v4l2.h	2015-11-15 00:13:21.619735000 -0800
>@@ -1,4 +1,4 @@
>---- src/platform/camera/v4l2.h.orig	2015-06-12 10:53:59 UTC
>+--- src/platform/camera/v4l2.h.orig	2015-11-14 22:51:30 UTC
> +++ src/platform/camera/v4l2.h
> @@ -24,7 +24,7 @@
>  #include <QPair>
>diff -ruN net-im/qTox/files/patch-src_video_cameradevice.cpp net-im/qTox/files/patch-src_video_cameradevice.cpp
>--- net-im/qTox/files/patch-src_video_cameradevice.cpp	1969-12-31 16:00:00.000000000 -0800
>+++ net-im/qTox/files/patch-src_video_cameradevice.cpp	2015-11-15 00:13:21.628629000 -0800
>@@ -0,0 +1,65 @@
>+--- src/video/cameradevice.cpp.orig	2015-11-15 08:11:58 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
>+ 
>+@@ -105,7 +105,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;
>+@@ -142,7 +142,7 @@ CameraDevice* CameraDevice::open(QString
>+         av_dict_set(&options, "framerate", QString().setNum(mode.FPS).toStdString().c_str(), 0);
>+     }
>+ #endif
>+-#ifdef Q_OS_LINUX
>++#ifdef Q_OS_UNIX
>+     else if (iformat->name == QString("video4linux2,v4l2") && mode)
>+     {
>+         av_dict_set(&options, "video_size", QString("%1x%2").arg(mode.width).arg(mode.height).toStdString().c_str(), 0);
>+@@ -264,7 +264,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
>+@@ -307,7 +307,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
>+@@ -327,7 +327,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
>+@@ -335,7 +335,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

Actions: View | Diff

Attachments on bug 204591: 163180 | 163181 | 163182