Attachment #202086 for bug #235799

View | Details | Raw Unified | Return to bug 235799
Collapse All | Expand All

Lines 3-9 Link Here

(-)net-im/uTox/Makefile (-2 / +3 lines)
3	PORTNAME= uTox	3	PORTNAME= uTox
4	DISTVERSION= 0.17.0	4	DISTVERSION= 0.17.0
5	DISTVERSIONSUFFIX= -full	5	DISTVERSIONSUFFIX= -full
6	PORTREVISION= 5	6	PORTREVISION= 6
7	CATEGORIES= net-im net-p2p	7	CATEGORIES= net-im net-p2p
8	MASTER_SITES= https://github.com/uTox/uTox/releases/download/v${PORTVERSION}/	8	MASTER_SITES= https://github.com/uTox/uTox/releases/download/v${PORTVERSION}/
9		9
Lines 17-23 Link Here
17	BROKEN_armv6= fails to compile: endian.h:68:20: too many arguments provided to function-like macro invocation	17	BROKEN_armv6= fails to compile: endian.h:68:20: too many arguments provided to function-like macro invocation
18	BROKEN_armv7= fails to compile: endian.h:68:20: too many arguments provided to function-like macro invocation	18	BROKEN_armv7= fails to compile: endian.h:68:20: too many arguments provided to function-like macro invocation
19		19
20	BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat	20	BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
		21	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
21	LIB_DEPENDS= libfreetype.so:print/freetype2 \	22	LIB_DEPENDS= libfreetype.so:print/freetype2 \
22	libfontconfig.so:x11-fonts/fontconfig \	23	libfontconfig.so:x11-fonts/fontconfig \
23	libsodium.so:security/libsodium \	24	libsodium.so:security/libsodium \




--- src/xlib/main.c.orig	2019-02-17 05:10:45 UTC
+++ src/xlib/main.c
@@ -94,6 +94,11 @@ void init_ptt(void) {
 
 #ifdef __linux__
 #include <linux/input.h>
+#elif defined(__DragonFly__) || defined(__FreeBSD__)
+#include <linux/input.h>
+#endif
+
+#if defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__)
 static bool linux_check_ptt(void) {
     /* First, we try for direct access to the keyboard. */
     int ptt_key = KEY_LEFTCTRL; // TODO allow user to change this...
@@ -146,7 +151,7 @@ bool check_ptt_key(void) {
         return true; /* If push to talk is disabled, return true. */
     }
 
-#ifdef __linux__
+#if defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__)
     return linux_check_ptt();
 #else
     return bsd_check_ptt();

Return to bug 235799

Line 0 Link Here

(-)net-im/uTox/files/patch-src_xlib_main.c (+23 lines)
	1	--- src/xlib/main.c.orig 2019-02-17 05:10:45 UTC
	2	+++ src/xlib/main.c
	3	@@ -94,6 +94,11 @@ void init_ptt(void) {
	4
	5	#ifdef __linux__
	6	#include <linux/input.h>
	7	+#elif defined(__DragonFly__) \|\| defined(__FreeBSD__)
	8	+#include <linux/input.h>
	9	+#endif
	10	+
	11	+#if defined(__linux__) \|\| defined(__DragonFly__) \|\| defined(__FreeBSD__)
	12	static bool linux_check_ptt(void) {
	13	/* First, we try for direct access to the keyboard. */
	14	int ptt_key = KEY_LEFTCTRL; // TODO allow user to change this...
	15	@@ -146,7 +151,7 @@ bool check_ptt_key(void) {
	16	return true; /* If push to talk is disabled, return true. */
	17	}
	18
	19	-#ifdef __linux__
	20	+#if defined(__linux__) \|\| defined(__DragonFly__) \|\| defined(__FreeBSD__)
	21	return linux_check_ptt();
	22	#else
	23	return bsd_check_ptt();