Attachment #177616 for bug #214393

Lines 2-8 Link Here

(-)net-im/qTox/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= qTox	4	PORTNAME= qTox
5	PORTVERSION= 1.5.2	5	PORTVERSION= 1.6.0
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	CATEGORIES= net-im net-p2p	7	CATEGORIES= net-im net-p2p
8		8
Lines 25-31 Link Here
25	libfontconfig.so:x11-fonts/fontconfig	25	libfontconfig.so:x11-fonts/fontconfig
26		26
27	USE_GITHUB= yes	27	USE_GITHUB= yes
28	GH_ACCOUNT= tux3	28	GH_ACCOUNT= qTox
29		29
30	SUB_FILES= pkg-message	30	SUB_FILES= pkg-message
31		31

Lines 1-3 Link Here

(-)net-im/qTox/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1475432358	1	TIMESTAMP = 1480684987
2	SHA256 (tux3-qTox-v1.5.2_GH0.tar.gz) = 0307122993d7999b44f5310bd690cbb9bd4a43646a88edecf56a315a36ce84be	2	SHA256 (qTox-qTox-v1.6.0_GH0.tar.gz) = 7450e751da5cc6dce00b58df6d06a309e2674c7bd9311de6af21e53c36c3f155
3	SIZE (tux3-qTox-v1.5.2_GH0.tar.gz) = 3452479	3	SIZE (qTox-qTox-v1.6.0_GH0.tar.gz) = 3481328




--- qtox.pro.orig	2016-11-13 15:20:00 UTC
+++ qtox.pro
@@ -53,11 +53,11 @@ include(translations/i18n.pri)
 system($$fromfile(translations/i18n.pri, updateallqm))
 
 isEmpty(GIT_VERSION) {

 }
 DEFINES += GIT_DESCRIBE=\"\\\"$$quote($$GIT_DESCRIBE)\\\"\"
 # date works on linux/mac, but it would hangs qmake on windows
@@ -493,3 +493,15 @@ SOURCES += \
     src/widget/form/groupinviteform.cpp \
     src/widget/tool/profileimporter.cpp \
     src/widget/passwordedit.cpp
     src/video/videomode.cpp
+
+unix {
+    target.path  = $$PREFIX/bin

Lines 1-6 Link Here

(-)net-im/qTox/files/patch-src_main.cpp (-2 / +2 lines)
1	--- src/main.cpp.orig 2016-08-09 23:12:33 UTC	1	--- src/main.cpp.orig 2016-11-13 15:20:00 UTC
2	+++ src/main.cpp	2	+++ src/main.cpp
3	@@ -306,3 +306,10 @@ int main(int argc, char *argv[])	3	@@ -317,3 +317,10 @@ int main(int argc, char *argv[])
4	#endif	4	#endif
5	return errorcode;	5	return errorcode;
6	}	6	}

Lines 1-4 Link Here

(-)net-im/qTox/files/patch-src_platform_camera_v4l2.h (-1 / +1 lines)
1	--- src/platform/camera/v4l2.h.orig 2016-08-09 23:12:33 UTC	1	--- src/platform/camera/v4l2.h.orig 2016-11-13 15:20:00 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>




--- 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

     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

     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

     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

 	return v4l2::betterPixelFormat(a, b);
 #else
 	return false;
@@ -524,7 +524,7 @@ bool CameraDevice::getDefaultInputFormat
     avdevice_register_all();
 
     // Desktop capture input formats

     idesktopFormat = av_find_input_format("x11grab");
 #endif
 #ifdef Q_OS_WIN
@@ -532,7 +532,7 @@ bool CameraDevice::getDefaultInputFormat
 #endif
 
     // Webcam input formats

Lines 1-4 Link Here

(-)net-im/qTox/files/patch-src_video_videomode.cpp (-2 / +2 lines)
1	--- src/video/videomode.cpp.orig 2016-08-10 16:00:51 UTC	1	--- src/video/videomode.cpp.orig 2016-11-13 15:20:00 UTC
2	+++ src/video/videomode.cpp	2	+++ src/video/videomode.cpp
3	@@ -18,6 +18,7 @@	3	@@ -18,6 +18,7 @@
4	*/	4	*/
Lines 7-10 Link Here
7	+#include <stdlib.h>	7	+#include <stdlib.h>
8		8
9	/**	9	/**
10	@struct VideoMode	10	* @struct VideoMode

Lines 1-8 Link Here

(-)net-im/qTox/files/patch-src_widget_form_settings_aboutsettings.ui (-2 / +2 lines)
1	--- src/widget/form/settings/aboutsettings.ui.orig 2016-08-09 23:12:33 UTC	1	--- src/widget/form/settings/aboutsettings.ui.orig 2016-11-13 15:20:00 UTC
2	+++ src/widget/form/settings/aboutsettings.ui	2	+++ src/widget/form/settings/aboutsettings.ui
3	@@ -111,6 +111,9 @@	3	@@ -111,6 +111,9 @@
4	<property name="text">	4	<property name="text">
5	<string>Commit hash: <a href="https://github.com/qTox/qTox/commit/$GIT_VERSION">$GIT_VERSION</a></string>	5	<string notr="true">{GIT_VERSION}</string>
6	</property>	6	</property>
7	+ <property name="visible">	7	+ <property name="visible">
8	+ <bool>false</bool>	8	+ <bool>false</bool>

Return to bug 214393

Lines 1-6 Link Here

(-)net-im/qTox/files/patch-qtox.pro (-5 / +5 lines)
1	--- qtox.pro.orig 2016-08-09 23:12:33 UTC	1	--- qtox.pro.orig 2016-11-13 15:20:00 UTC
2	+++ qtox.pro	2	+++ qtox.pro
3	@@ -48,11 +48,11 @@ include(translations/i18n.pri)	3	@@ -53,11 +53,11 @@ include(translations/i18n.pri)
4	system($$fromfile(translations/i18n.pri, updateallqm))	4	system($$fromfile(translations/i18n.pri, updateallqm))
5		5
6	isEmpty(GIT_VERSION) {	6	isEmpty(GIT_VERSION) {
Lines 14-23 Link Here
14	}	14	}
15	DEFINES += GIT_DESCRIBE=\"\\\"$$quote($$GIT_DESCRIBE)\\\"\"	15	DEFINES += GIT_DESCRIBE=\"\\\"$$quote($$GIT_DESCRIBE)\\\"\"
16	# date works on linux/mac, but it would hangs qmake on windows	16	# date works on linux/mac, but it would hangs qmake on windows
17	@@ -481,3 +481,15 @@ SOURCES += \	17	@@ -493,3 +493,15 @@ SOURCES += \
		18	src/widget/form/groupinviteform.cpp \
18	src/widget/tool/profileimporter.cpp \	19	src/widget/tool/profileimporter.cpp \
19	src/widget/passwordedit.cpp \	20	src/widget/passwordedit.cpp
20	src/video/videomode.cpp
21	+	21	+
22	+unix {	22	+unix {
23	+ target.path = $$PREFIX/bin	23	+ target.path = $$PREFIX/bin

Lines 1-4 Link Here

(-)net-im/qTox/files/patch-src_video_cameradevice.cpp (-8 / +8 lines)
1	--- src/video/cameradevice.cpp.orig 2016-08-09 23:12:33 UTC	1	--- src/video/cameradevice.cpp.orig 2016-11-13 15:20:00 UTC
2	+++ src/video/cameradevice.cpp	2	+++ src/video/cameradevice.cpp
3	@@ -31,7 +31,7 @@ extern "C" {	3	@@ -31,7 +31,7 @@ extern "C" {
4	#ifdef Q_OS_WIN	4	#ifdef Q_OS_WIN
Lines 27-33 Link Here
27	else if (iformat->name == QString("video4linux2,v4l2"))	27	else if (iformat->name == QString("video4linux2,v4l2"))
28	devices += v4l2::getDeviceList();	28	devices += v4l2::getDeviceList();
29	#endif	29	#endif
30	@@ -461,7 +461,7 @@ QVector<VideoMode> CameraDevice::getVide	30	@@ -467,7 +467,7 @@ QVector<VideoMode> CameraDevice::getVide
31	else if (iformat->name == QString("dshow"))	31	else if (iformat->name == QString("dshow"))
32	return DirectShow::getDeviceModes(devName);	32	return DirectShow::getDeviceModes(devName);
33	#endif	33	#endif
Lines 36-43 Link Here
36	else if (iformat->name == QString("video4linux2,v4l2"))	36	else if (iformat->name == QString("video4linux2,v4l2"))
37	return v4l2::getDeviceModes(devName);	37	return v4l2::getDeviceModes(devName);
38	#endif	38	#endif
39	@@ -482,7 +482,7 @@ QVector<VideoMode> CameraDevice::getVide	39	@@ -488,7 +488,7 @@ QVector<VideoMode> CameraDevice::getVide
40	*/	40	*/
41	QString CameraDevice::getPixelFormatString(uint32_t pixel_format)	41	QString CameraDevice::getPixelFormatString(uint32_t pixel_format)
42	{	42	{
43	-#ifdef Q_OS_LINUX	43	-#ifdef Q_OS_LINUX
Lines 45-52 Link Here
45	return v4l2::getPixelFormatString(pixel_format);	45	return v4l2::getPixelFormatString(pixel_format);
46	#else	46	#else
47	return QString("unknown");	47	return QString("unknown");
48	@@ -498,7 +498,7 @@ false otherwise (such as if there's no p	48	@@ -504,7 +504,7 @@ QString CameraDevice::getPixelFormatStri
49	*/	49	*/
50	bool CameraDevice::betterPixelFormat(uint32_t a, uint32_t b)	50	bool CameraDevice::betterPixelFormat(uint32_t a, uint32_t b)
51	{	51	{
52	-#ifdef Q_OS_LINUX	52	-#ifdef Q_OS_LINUX
Lines 54-60 Link Here
54	return v4l2::betterPixelFormat(a, b);	54	return v4l2::betterPixelFormat(a, b);
55	#else	55	#else
56	return false;	56	return false;
57	@@ -518,7 +518,7 @@ bool CameraDevice::getDefaultInputFormat	57	@@ -524,7 +524,7 @@ bool CameraDevice::getDefaultInputFormat
58	avdevice_register_all();	58	avdevice_register_all();
59		59
60	// Desktop capture input formats	60	// Desktop capture input formats
Lines 63-69 Link Here
63	idesktopFormat = av_find_input_format("x11grab");	63	idesktopFormat = av_find_input_format("x11grab");
64	#endif	64	#endif
65	#ifdef Q_OS_WIN	65	#ifdef Q_OS_WIN
66	@@ -526,7 +526,7 @@ bool CameraDevice::getDefaultInputFormat	66	@@ -532,7 +532,7 @@ bool CameraDevice::getDefaultInputFormat
67	#endif	67	#endif
68		68
69	// Webcam input formats	69	// Webcam input formats