View | Details | Raw Unified | Return to bug 204591 | Differences between
and this patch

Collapse All | Expand All

(-)net-im/qTox/Makefile (-3 / +2 lines)
Lines 2-9 Link Here
2
# $FreeBSD: head/net-im/qTox/Makefile 401587 2015-11-14 19:34:12Z jbeich $
2
# $FreeBSD: head/net-im/qTox/Makefile 401587 2015-11-14 19:34:12Z jbeich $
3
3
4
PORTNAME=	qTox
4
PORTNAME=	qTox
5
PORTVERSION=	0.150614
5
PORTVERSION=	0.151116
6
PORTREVISION=	2
7
CATEGORIES=	net-im net-p2p
6
CATEGORIES=	net-im net-p2p
8
7
9
MAINTAINER=	yuri@rawbw.com
8
MAINTAINER=	yuri@rawbw.com
Lines 23-29 Link Here
23
22
24
USE_GITHUB=	yes
23
USE_GITHUB=	yes
25
GH_ACCOUNT=	tux3
24
GH_ACCOUNT=	tux3
26
GH_TAGNAME=	ce2c830
25
GH_TAGNAME=	db52ef6
27
26
28
USES=		compiler:c++11-lib desktop-file-utils openal:soft qmake gmake
27
USES=		compiler:c++11-lib desktop-file-utils openal:soft qmake gmake
29
USE_GNOME=	glib20 gtk20 cairo gdkpixbuf2
28
USE_GNOME=	glib20 gtk20 cairo gdkpixbuf2
(-)net-im/qTox/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (tux3-qTox-0.150614-ce2c830_GH0.tar.gz) = c59580b98886acf9ec5acb1a85b7f6544d53bc2d72491dddeb8865b4d64dd3f6
1
SHA256 (tux3-qTox-0.151116-db52ef6_GH0.tar.gz) = 3920a71131666bef8044c7428e56e75ac9136b22b9e7d51d2c506da24e34ff91
2
SIZE (tux3-qTox-0.150614-ce2c830_GH0.tar.gz) = 4556369
2
SIZE (tux3-qTox-0.151116-db52ef6_GH0.tar.gz) = 4627473
(-)net-im/qTox/files/patch-qtox.pro (-4 / +126 lines)
Lines 1-8 Link Here
1
--- qtox.pro.orig	2015-06-12 10:53:59 UTC
1
--- qtox.pro.orig	2015-11-14 22:51:30 UTC
2
+++ qtox.pro
2
+++ qtox.pro
3
@@ -483,6 +483,18 @@ SOURCES += \
3
@@ -203,26 +203,26 @@ unix:!macx:!android {
4
     src/widget/translator.cpp \
4
 contains(ENABLE_SYSTRAY_UNITY_BACKEND, YES) {
5
     src/persistence/settingsserializer.cpp
5
     DEFINES += ENABLE_SYSTRAY_UNITY_BACKEND
6
 
7
-    INCLUDEPATH += "/usr/include/glib-2.0"
8
-    INCLUDEPATH += "/usr/include/gtk-2.0"
9
-    INCLUDEPATH += "/usr/include/atk-1.0"
10
-    INCLUDEPATH += "/usr/include/cairo"
11
-    INCLUDEPATH += "/usr/include/ffmpeg"
12
-    INCLUDEPATH += "/usr/include/gdk-pixbuf-2.0"
13
-    INCLUDEPATH += "/usr/include/libappindicator-0.1"
14
-    INCLUDEPATH += "/usr/include/libdbusmenu-glib-0.4"
15
-    INCLUDEPATH += "/usr/include/pango-1.0"
16
+    INCLUDEPATH += "/usr/local/include/glib-2.0"
17
+    INCLUDEPATH += "/usr/local/include/gtk-2.0"
18
+    INCLUDEPATH += "/usr/local/include/atk-1.0"
19
+    INCLUDEPATH += "/usr/local/include/cairo"
20
+    INCLUDEPATH += "/usr/local/include/ffmpeg"
21
+    INCLUDEPATH += "/usr/local/include/gdk-pixbuf-2.0"
22
+    INCLUDEPATH += "/usr/local/include/libappindicator-0.1"
23
+    INCLUDEPATH += "/usr/local/include/libdbusmenu-glib-0.4"
24
+    INCLUDEPATH += "/usr/local/include/pango-1.0"
25
     equals(QT_ARCH, x86_64) {
26
-        INCLUDEPATH += "/usr/lib64/glib-2.0/include"
27
-        INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/glib-2.0/include"
28
-        INCLUDEPATH += "/usr/lib64/gtk-2.0/include"
29
-        INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/gtk-2.0/include"
30
+        INCLUDEPATH += "/usr/local/lib/glib-2.0/include"
31
+        INCLUDEPATH += "/usr/local/lib/x86_64-linux-gnu/glib-2.0/include"
32
+        INCLUDEPATH += "/usr/local/lib/gtk-2.0/include"
33
+        INCLUDEPATH += "/usr/local/lib/x86_64-linux-gnu/gtk-2.0/include"
34
     }
35
     else {
36
-        INCLUDEPATH += "/usr/lib/glib-2.0/include"
37
-        INCLUDEPATH += "/usr/lib/i386-linux-gnu/glib-2.0/include"
38
-        INCLUDEPATH += "/usr/lib/gtk-2.0/include"
39
-        INCLUDEPATH += "/usr/lib/i386-linux-gnu/gtk-2.0/include"
40
+        INCLUDEPATH += "/usr/local/lib/glib-2.0/include"
41
+        INCLUDEPATH += "/usr/local/lib/i386-linux-gnu/glib-2.0/include"
42
+        INCLUDEPATH += "/usr/local/lib/gtk-2.0/include"
43
+        INCLUDEPATH += "/usr/local/lib/i386-linux-gnu/gtk-2.0/include"
44
     }
45
 
46
     LIBS += -lgobject-2.0 -lappindicator -lgtk-x11-2.0
47
@@ -235,24 +235,24 @@ contains(ENABLE_SYSTRAY_STATUSNOTIFIER_B
48
 } else {
49
     DEFINES += ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND
50
 
51
-    INCLUDEPATH += "/usr/include/glib-2.0"
52
-    INCLUDEPATH += "/usr/include/gtk-2.0"
53
-    INCLUDEPATH += "/usr/include/atk-1.0"
54
-    INCLUDEPATH += "/usr/include/cairo"
55
-    INCLUDEPATH += "/usr/include/ffmpeg"
56
-    INCLUDEPATH += "/usr/include/gdk-pixbuf-2.0"
57
-    INCLUDEPATH += "/usr/include/pango-1.0"
58
+    INCLUDEPATH += "/usr/local/include/glib-2.0"
59
+    INCLUDEPATH += "/usr/local/include/gtk-2.0"
60
+    INCLUDEPATH += "/usr/local/include/atk-1.0"
61
+    INCLUDEPATH += "/usr/local/include/cairo"
62
+    INCLUDEPATH += "/usr/local/include/ffmpeg"
63
+    INCLUDEPATH += "/usr/local/include/gdk-pixbuf-2.0"
64
+    INCLUDEPATH += "/usr/local/include/pango-1.0"
65
     equals(QT_ARCH, x86_64) {
66
-        INCLUDEPATH += "/usr/lib64/glib-2.0/include"
67
-        INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/glib-2.0/include"
68
-        INCLUDEPATH += "/usr/lib64/gtk-2.0/include"
69
-        INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/gtk-2.0/include"
70
+        INCLUDEPATH += "/usr/local/lib/glib-2.0/include"
71
+        INCLUDEPATH += "/usr/local/lib/x86_64-linux-gnu/glib-2.0/include"
72
+        INCLUDEPATH += "/usr/local/lib/gtk-2.0/include"
73
+        INCLUDEPATH += "/usr/local/lib/x86_64-linux-gnu/gtk-2.0/include"
74
     }
75
     else {
76
-        INCLUDEPATH += "/usr/lib/glib-2.0/include"
77
-        INCLUDEPATH += "/usr/lib/i386-linux-gnu/glib-2.0/include"
78
-        INCLUDEPATH += "/usr/lib/gtk-2.0/include"
79
-        INCLUDEPATH += "/usr/lib/i386-linux-gnu/gtk-2.0/include"
80
+        INCLUDEPATH += "/usr/local/lib/glib-2.0/include"
81
+        INCLUDEPATH += "/usr/local/lib/i386-linux-gnu/glib-2.0/include"
82
+        INCLUDEPATH += "/usr/local/lib/gtk-2.0/include"
83
+        INCLUDEPATH += "/usr/local/lib/i386-linux-gnu/gtk-2.0/include"
84
     }
85
 
86
 
87
@@ -275,23 +275,23 @@ contains(ENABLE_SYSTRAY_GTK_BACKEND, NO)
88
 } else {
89
     DEFINES += ENABLE_SYSTRAY_GTK_BACKEND
90
 
91
-    INCLUDEPATH += "/usr/include/glib-2.0"
92
-    INCLUDEPATH += "/usr/include/gtk-2.0"
93
-    INCLUDEPATH += "/usr/include/atk-1.0"
94
-    INCLUDEPATH += "/usr/include/gdk-pixbuf-2.0"
95
-    INCLUDEPATH += "/usr/include/cairo"
96
-    INCLUDEPATH += "/usr/include/pango-1.0"
97
+    INCLUDEPATH += "/usr/local/include/glib-2.0"
98
+    INCLUDEPATH += "/usr/local/include/gtk-2.0"
99
+    INCLUDEPATH += "/usr/local/include/atk-1.0"
100
+    INCLUDEPATH += "/usr/local/include/gdk-pixbuf-2.0"
101
+    INCLUDEPATH += "/usr/local/include/cairo"
102
+    INCLUDEPATH += "/usr/local/include/pango-1.0"
103
     equals(QT_ARCH, x86_64) {
104
-        INCLUDEPATH += "/usr/lib64/glib-2.0/include"
105
-        INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/glib-2.0/include"
106
-        INCLUDEPATH += "/usr/lib64/gtk-2.0/include"
107
-        INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/gtk-2.0/include"
108
+        INCLUDEPATH += "/usr/local/lib/glib-2.0/include"
109
+        INCLUDEPATH += "/usr/local/lib/x86_64-linux-gnu/glib-2.0/include"
110
+        INCLUDEPATH += "/usr/local/lib/gtk-2.0/include"
111
+        INCLUDEPATH += "/usr/local/lib/x86_64-linux-gnu/gtk-2.0/include"
112
     }
113
     else {
114
-        INCLUDEPATH += "/usr/lib/glib-2.0/include"
115
-        INCLUDEPATH += "/usr/lib/i386-linux-gnu/glib-2.0/include"
116
-        INCLUDEPATH += "/usr/lib/gtk-2.0/include"
117
-        INCLUDEPATH += "/usr/lib/i386-linux-gnu/gtk-2.0/include"
118
+        INCLUDEPATH += "/usr/local/lib/glib-2.0/include"
119
+        INCLUDEPATH += "/usr/local/lib/i386-linux-gnu/glib-2.0/include"
120
+        INCLUDEPATH += "/usr/local/lib/gtk-2.0/include"
121
+        INCLUDEPATH += "/usr/local/lib/i386-linux-gnu/gtk-2.0/include"
122
     }
123
 
124
 
125
@@ -504,6 +504,18 @@ SOURCES += \
126
     src/video/groupnetcamview.cpp \
127
     src/core/toxcall.cpp
6
 
128
 
7
+unix {
129
+unix {
8
+    target.path  = $$PREFIX/bin
130
+    target.path  = $$PREFIX/bin
(-)net-im/qTox/files/patch-src_main.cpp (-2 / +2 lines)
Lines 1-6 Link Here
1
--- src/main.cpp.orig	2015-06-12 10:53:59 UTC
1
--- src/main.cpp.orig	2015-11-14 22:51:30 UTC
2
+++ src/main.cpp
2
+++ src/main.cpp
3
@@ -280,3 +280,10 @@ int main(int argc, char *argv[])
3
@@ -269,3 +269,10 @@ int main(int argc, char *argv[])
4
     qDebug() << "Clean exit with status"<<errorcode;
4
     qDebug() << "Clean exit with status"<<errorcode;
5
     return errorcode;
5
     return errorcode;
6
 }
6
 }
(-)net-im/qTox/files/patch-src_platform_camera_v4l2.cpp (-10 lines)
Lines 1-10 Link Here
1
--- src/platform/camera/v4l2.cpp.orig	2015-06-15 03:25:21 UTC
2
+++ src/platform/camera/v4l2.cpp
3
@@ -26,6 +26,7 @@
4
 #include <fcntl.h>
5
 #include <sys/ioctl.h>
6
 #include <linux/videodev2.h>
7
+#include <errno.h>
8
 
9
 /**
10
  * Most of this file is adapted from libavdevice's v4l2.c,
(-)net-im/qTox/files/patch-src_platform_camera_v4l2.h (-1 / +1 lines)
Lines 1-4 Link Here
1
--- src/platform/camera/v4l2.h.orig	2015-06-12 10:53:59 UTC
1
--- src/platform/camera/v4l2.h.orig	2015-11-14 22:51:30 UTC
2
+++ src/platform/camera/v4l2.h
2
+++ src/platform/camera/v4l2.h
3
@@ -24,7 +24,7 @@
3
@@ -24,7 +24,7 @@
4
 #include <QPair>
4
 #include <QPair>
(-)net-im/qTox/files/patch-src_video_cameradevice.cpp (+65 lines)
Line 0 Link Here
1
--- src/video/cameradevice.cpp.orig	2015-11-15 08:11:58 UTC
2
+++ src/video/cameradevice.cpp
3
@@ -31,7 +31,7 @@ extern "C" {
4
 #ifdef Q_OS_WIN
5
 #include "src/platform/camera/directshow.h"
6
 #endif
7
-#ifdef Q_OS_LINUX
8
+#ifdef Q_OS_UNIX
9
 #include "src/platform/camera/v4l2.h"
10
 #endif
11
 
12
@@ -105,7 +105,7 @@ CameraDevice* CameraDevice::open(QString
13
 
14
     AVDictionary* options = nullptr;
15
     if (!iformat);
16
-#ifdef Q_OS_LINUX
17
+#ifdef Q_OS_UNIX
18
     else if (devName.startsWith("x11grab#"))
19
     {
20
         QSize screen;
21
@@ -142,7 +142,7 @@ CameraDevice* CameraDevice::open(QString
22
         av_dict_set(&options, "framerate", QString().setNum(mode.FPS).toStdString().c_str(), 0);
23
     }
24
 #endif
25
-#ifdef Q_OS_LINUX
26
+#ifdef Q_OS_UNIX
27
     else if (iformat->name == QString("video4linux2,v4l2") && mode)
28
     {
29
         av_dict_set(&options, "video_size", QString("%1x%2").arg(mode.width).arg(mode.height).toStdString().c_str(), 0);
30
@@ -264,7 +264,7 @@ QVector<QPair<QString, QString>> CameraD
31
     else if (iformat->name == QString("dshow"))
32
         devices += DirectShow::getDeviceList();
33
 #endif
34
-#ifdef Q_OS_LINUX
35
+#ifdef Q_OS_UNIX
36
     else if (iformat->name == QString("video4linux2,v4l2"))
37
         devices += v4l2::getDeviceList();
38
 #endif
39
@@ -307,7 +307,7 @@ QVector<VideoMode> CameraDevice::getVide
40
     else if (iformat->name == QString("dshow"))
41
         return DirectShow::getDeviceModes(devName);
42
 #endif
43
-#ifdef Q_OS_LINUX
44
+#ifdef Q_OS_UNIX
45
     else if (iformat->name == QString("video4linux2,v4l2"))
46
         return v4l2::getDeviceModes(devName);
47
 #endif
48
@@ -327,7 +327,7 @@ bool CameraDevice::getDefaultInputFormat
49
     avdevice_register_all();
50
 
51
     // Desktop capture input formats
52
-#ifdef Q_OS_LINUX
53
+#ifdef Q_OS_UNIX
54
     idesktopFormat = av_find_input_format("x11grab");
55
 #endif
56
 #ifdef Q_OS_WIN
57
@@ -335,7 +335,7 @@ bool CameraDevice::getDefaultInputFormat
58
 #endif
59
 
60
     // Webcam input formats
61
-#ifdef Q_OS_LINUX
62
+#ifdef Q_OS_UNIX
63
     if ((iformat = av_find_input_format("v4l2")))
64
         return true;
65
 #endif

Return to bug 204591