Attachment 170250 Details for Bug 209424 – uTox.diff

uTox.diff

patch-uTox.txt (text/plain), 4.54 KB, created by Ivan Klymenko on 2016-05-13 15:51:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Klymenko

Created: 2016-05-13 15:51:35 UTC

Size: 4.54 KB

patch

obsolete

>diff --git a/uTox.orig/Makefile b/uTox.new/Makefile
>index 15a12d1..9d31dc4 100644
>--- a/uTox.orig/Makefile
>+++ b/uTox.new/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	uTox
>-PORTVERSION=	0.7.0.20160321
>+PORTVERSION=	0.8.2.20160511
> CATEGORIES=	net-im net-p2p
> 
> MAINTAINER=	fidaj@ukr.net
>@@ -20,7 +20,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:net-im/tox
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	GrayHatter
>-GH_TAGNAME=	9524f98
>+GH_TAGNAME=	cc4388c
> 
> USES=		compiler:c11 desktop-file-utils gmake openal:al pkgconfig
> USE_XORG=	x11 xext xrender
>diff --git a/uTox.orig/distinfo b/uTox.new/distinfo
>index 64d055a..63de3ac 100644
>--- a/uTox.orig/distinfo
>+++ b/uTox.new/distinfo
>@@ -1,2 +1,2 @@
>-SHA256 (GrayHatter-uTox-0.7.0.20160321-9524f98_GH0.tar.gz) = 5e6a6023e63ec77f5378541ed5f03981aa8b71b5586d8b02b24335dfcc88a636
>-SIZE (GrayHatter-uTox-0.7.0.20160321-9524f98_GH0.tar.gz) = 1986717
>+SHA256 (GrayHatter-uTox-0.8.2.20160511-cc4388c_GH0.tar.gz) = 7c436cec5bd524ffcce3e1824dbebb7a93a121d0bc5d6860f8dadd1494e67067
>+SIZE (GrayHatter-uTox-0.8.2.20160511-cc4388c_GH0.tar.gz) = 2015584
>diff --git a/uTox.orig/files/patch-Makefile b/uTox.new/files/patch-Makefile
>index d14d973..b5fe715 100644
>--- a/uTox.orig/files/patch-Makefile
>+++ b/uTox.new/files/patch-Makefile
>@@ -1,4 +1,4 @@
>---- Makefile.orig	2016-03-21 02:14:57 UTC
>+--- Makefile.orig	2016-05-10 07:09:15 UTC
> +++ Makefile
> @@ -2,9 +2,9 @@
>  # set to anything else to disable them
>@@ -12,7 +12,7 @@
>  
>  DEPS = libtoxav libtoxcore openal vpx libsodium
>  
>-@@ -53,6 +53,37 @@ ifeq ($(UNAME_S), Linux)
>+@@ -54,6 +54,37 @@ ifeq ($(UNAME_S), Linux)
>  
>  	TRAY_OBJ = icons/utox-128x128.o
>  	TRAY_GEN = $(LD) -r -b binary icons/utox-128x128.png -o
>@@ -49,4 +49,3 @@
> +	TRAY_GEN = $(LD) -r -b binary icons/utox-128x128.png -o
>  else ifeq ($(UNAME_O), Cygwin)
>  	OUT_FILE = utox.exe
>- 
>diff --git a/uTox.new/files/patch-src_main.h b/uTox.new/files/patch-src_main.h
>new file mode 100644
>index 0000000..2576d87
>--- /dev/null
>+++ b/uTox.new/files/patch-src_main.h
>@@ -0,0 +1,11 @@
>+--- src/main.h.orig	2016-05-13 18:05:27.586256000 +0300
>++++ src/main.h	2016-05-13 18:06:21.738883000 +0300
>+@@ -74,7 +74,7 @@
>+ #define volatile(x) (*((volatile typeof(x)*)&x))
>+ #endif */
>+ 
>+-#ifndef __OBJC__
>++#if !defined(__OBJC__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
>+ #define volatile(x) (x)
>+ #endif
>+ /* UTOX_SCALE is used as the default so that we have a lot of options for scale size.
>diff --git a/uTox.orig/files/patch-src_ui.c b/uTox.new/files/patch-src_ui.c
>index 0e496b1..c91c997 100644
>--- a/uTox.orig/files/patch-src_ui.c
>+++ b/uTox.new/files/patch-src_ui.c
>@@ -1,6 +1,6 @@
>---- src/ui.c.orig	2016-03-21 02:14:57 UTC
>+--- src/ui.c.orig	2016-05-10 07:09:15 UTC
> +++ src/ui.c
>-@@ -275,16 +275,9 @@ static void draw_settings_header(int UNU
>+@@ -271,16 +271,9 @@ static void draw_settings_header(int UNU
>      setfont(FONT_SELF_NAME);
>      drawstr(MAIN_LEFT + SCALE(10), SCALE(10), UTOX_SETTINGS);
>      #ifdef GIT_VERSION
>diff --git a/uTox.new/files/patch-src_xlib_main.c b/uTox.new/files/patch-src_xlib_main.c
>new file mode 100644
>index 0000000..a8e6eb8
>--- /dev/null
>+++ b/uTox.new/files/patch-src_xlib_main.c
>@@ -0,0 +1,29 @@
>+--- src/xlib/main.c.orig	2016-05-13 17:52:03.371614000 +0300
>++++ src/xlib/main.c	2016-05-13 17:53:38.294993000 +0300
>+@@ -73,8 +73,9 @@
>+     XFlush(display);
>+ }
>+ 
>+-
>++#ifdef __LINUX__
>+ #include <linux/input.h>
>++#endif
>+ FILE *ptt_keyboard_handle;
>+ Display *ptt_display;
>+ void init_ptt(void){
>+@@ -100,6 +101,7 @@
>+     int ptt_key;
>+ 
>+     /* First, we try for direct access to the keyboard. */
>++#ifdef __LINUX__
>+     ptt_key = KEY_LEFTCTRL;                                      // TODO allow user to change this...
>+     if (ptt_keyboard_handle) {
>+         /* Nice! we have direct access to the keyboard! */
>+@@ -117,6 +119,7 @@
>+             return 0;
>+         }
>+     }
>++#endif
>+     /* Okay nope, lets' fallback to xinput... *pouts*
>+      * Fall back to Querying the X for the current keymap. */
>+     ptt_key = XKeysymToKeycode(display, XK_Control_L);
>diff --git a/uTox.new/files/patch-src_xlib_video.c b/uTox.new/files/patch-src_xlib_video.c
>new file mode 100644
>index 0000000..416ef22
>--- /dev/null
>+++ b/uTox.new/files/patch-src_xlib_video.c
>@@ -0,0 +1,12 @@
>+--- src/xlib/video.c.orig	2016-05-13 18:12:01.175591000 +0300
>++++ src/xlib/video.c	2016-05-13 18:12:27.944571000 +0300
>+@@ -152,6 +152,9 @@
>+     if(isdesktop(handle)) {
>+         utox_v4l_fd = -1;
>+ 
>++#ifndef volatile
>++#define volatile(x) (*((volatile typeof(x)*)&x))
>++#endif
>+         video_x = volatile(grabx);
>+         video_y = volatile(graby);
>+         video_width = volatile(grabpx);

Actions: View

Attachments on bug 209424: 170179 | 170216 | 170250