uTox-git: Update patches

[Mateusz Poszwa <old4%o2.pl@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Mon Mar 21 10:19:29 2016 +0100
Changeset:	f70494362457a204c696fbdfcc04a62ca69d41dc

Modified Files:
	uTox-git/distinfo
	uTox-git/patches/patch-Makefile
	uTox-git/patches/patch-src_main.h
	uTox-git/patches/patch-src_xlib_main.c
	uTox-git/patches/patch-src_xlib_video.c

Log Message:
uTox-git: Update patches

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f70494362457a204c696fbdfcc04a62ca69d41dc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 uTox-git/distinfo                       |  8 ++++----
 uTox-git/patches/patch-Makefile         | 18 +++++++++++++-----
 uTox-git/patches/patch-src_main.h       |  2 +-
 uTox-git/patches/patch-src_xlib_main.c  |  2 +-
 uTox-git/patches/patch-src_xlib_video.c |  2 +-
 5 files changed, 20 insertions(+), 12 deletions(-)

diffs:
diff --git a/uTox-git/distinfo b/uTox-git/distinfo
index 8fdd373..55492f0 100644
--- a/uTox-git/distinfo
+++ b/uTox-git/distinfo
@@ -1,7 +1,7 @@
 $NetBSD$
 
-SHA1 (patch-Makefile) = 66ced51cb81d70c4c6929f6dfa81636f2c7e2c85
-SHA1 (patch-src_main.h) = 83755101d10aad9d7b0aa9c4ea6ed9c0fa130516
-SHA1 (patch-src_xlib_main.c) = 81bf15940b6e8d766ce1a4c586b60896807db2f0
+SHA1 (patch-Makefile) = 5dd6a6529616839179156aff2617c04b3f46ea1f
+SHA1 (patch-src_main.h) = fa3881c6369ffe22244f0e74929ce0ae5ddcf5f6
+SHA1 (patch-src_xlib_main.c) = 9ec90c640dd7603634593b3e00cba6714c955901
 SHA1 (patch-src_xlib_v4l.c) = 159ac6e676c0361262daeb3f5324e4916b09b16a
-SHA1 (patch-src_xlib_video.c) = 0dfc3d168fe765ad6a0921323c1f4938bf25d145
+SHA1 (patch-src_xlib_video.c) = 4154194ba0d1a28f89a7bca9ce4004cc6064bdd1
diff --git a/uTox-git/patches/patch-Makefile b/uTox-git/patches/patch-Makefile
index 71cace5..f9bac40 100644
--- a/uTox-git/patches/patch-Makefile
+++ b/uTox-git/patches/patch-Makefile
@@ -4,9 +4,9 @@ Treat non-Cygwin platforms similarly.
 Use dl library only on Linux.
 Allow separate destination for manuals.
 
---- Makefile.orig	2016-03-18 02:00:21.000000000 +0000
+--- Makefile.orig	2016-03-21 09:05:38.000000000 +0000
 +++ Makefile
-@@ -18,7 +18,25 @@ ifeq ($(FILTER_AUDIO), 1)
+@@ -19,7 +19,29 @@ ifeq ($(FILTER_AUDIO), 1)
  	CFLAGS += -DAUDIO_FILTERING
  endif
  
@@ -14,6 +14,10 @@ Allow separate destination for manuals.
 +ifeq ($(UNAME_O), Cygwin)
 +	OUT_FILE = utox.exe
 +
++	ifeq ($(XP), 1)
++		CFLAGS += -D__WIN_LEGACY
++	endif
++
 +	CFLAGS  += -static
 +	LDFLAGS += /usr/x86_64-w64-mingw32/sys-root/mingw/lib/libwinpthread.a
 +
@@ -33,7 +37,7 @@ Allow separate destination for manuals.
  	OUT_FILE = utox
  
  	DEPS += fontconfig freetype2 x11 xext xrender
-@@ -44,7 +62,10 @@ ifeq ($(UNAME_S), Linux)
+@@ -45,7 +67,10 @@ ifeq ($(UNAME_S), Linux)
  
  	CFLAGS += $(shell $(PKG_CONFIG) --cflags $(DEPS))
  
@@ -45,13 +49,17 @@ Allow separate destination for manuals.
  	LDFLAGS += $(shell $(PKG_CONFIG) --libs $(DEPS))
  
  	OS_SRC = $(wildcard src/xlib/*.c)
-@@ -52,30 +73,13 @@ ifeq ($(UNAME_S), Linux)
+@@ -53,34 +78,13 @@ ifeq ($(UNAME_S), Linux)
  
  	TRAY_OBJ = icons/utox-128x128.o
  	TRAY_GEN = $(LD) -r -b binary icons/utox-128x128.png -o
 -else ifeq ($(UNAME_O), Cygwin)
 -	OUT_FILE = utox.exe
 -
+-	ifeq ($(XP), 1)
+-		CFLAGS += -D__WIN_LEGACY
+-	endif
+-
 -	CFLAGS  += -static
 -	LDFLAGS += /usr/x86_64-w64-mingw32/sys-root/mingw/lib/libwinpthread.a
 -
@@ -77,7 +85,7 @@ Allow separate destination for manuals.
  
  SRC = $(wildcard src/*.c)
  HEADERS = $(wildcard src/*.h src/*/*.h langs/*.h)
-@@ -127,8 +131,8 @@ install: utox
+@@ -132,8 +136,8 @@ install: utox
  	install -m 644 src/utox.desktop $(DESTDIR)$(DATAROOTDIR)/applications/utox.desktop
  	if [ "$(UNITY)" -eq "1" ]; then echo "X-MessagingMenu-UsesChatSection=true" >> $(DESTDIR)$(DATAROOTDIR)/applications/utox.desktop; fi
  
diff --git a/uTox-git/patches/patch-src_main.h b/uTox-git/patches/patch-src_main.h
index ec2d025..a2dd93c 100644
--- a/uTox-git/patches/patch-src_main.h
+++ b/uTox-git/patches/patch-src_main.h
@@ -2,7 +2,7 @@ $NetBSD$
 
 The volatile macro is used in {amd64,i386,machine}/mcontext.h on NetBSD.
 
---- src/main.h.orig	2016-03-08 20:06:44.000000000 +0000
+--- src/main.h.orig	2016-03-21 09:05:38.000000000 +0000
 +++ src/main.h
 @@ -33,7 +33,7 @@
  #define countof(x) (sizeof(x)/sizeof(*(x)))
diff --git a/uTox-git/patches/patch-src_xlib_main.c b/uTox-git/patches/patch-src_xlib_main.c
index bf6a5d0..7627a0f 100644
--- a/uTox-git/patches/patch-src_xlib_main.c
+++ b/uTox-git/patches/patch-src_xlib_main.c
@@ -2,7 +2,7 @@ $NetBSD$
 
 Avoid using Linux-specific headers when not compiling for Linux.
 
---- src/xlib/main.c.orig	2016-03-18 02:00:21.000000000 +0000
+--- src/xlib/main.c.orig	2016-03-21 09:05:38.000000000 +0000
 +++ src/xlib/main.c
 @@ -73,8 +73,9 @@ void postmessage(uint32_t msg, uint16_t 
      XFlush(display);
diff --git a/uTox-git/patches/patch-src_xlib_video.c b/uTox-git/patches/patch-src_xlib_video.c
index 82ee274d8..54e40cb 100644
--- a/uTox-git/patches/patch-src_xlib_video.c
+++ b/uTox-git/patches/patch-src_xlib_video.c
@@ -2,7 +2,7 @@ $NetBSD$
 
 The volatile macro is used in {amd64,i386,machine}/mcontext.h on NetBSD.
 
---- src/xlib/video.c.orig	2016-03-18 02:00:21.000000000 +0000
+--- src/xlib/video.c.orig	2016-03-21 09:05:38.000000000 +0000
 +++ src/xlib/video.c
 @@ -152,6 +152,10 @@ _Bool video_init(void *handle) {
      if(isdesktop(handle)) {