uTox-git: Update patches

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: uTox-git: Update patches
From: Mateusz Poszwa <old4%o2.pl@localhost>
Date: Sat, 19 Mar 2016 10:57:45 +0000
Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Sat Mar 19 11:57:45 2016 +0100
Changeset:	5640e0c66eff3e95da7fdbe3584b144cc9eed9bd

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=5640e0c66eff3e95da7fdbe3584b144cc9eed9bd

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         | 47 ++++++++++++++++++++-------------
 uTox-git/patches/patch-src_main.h       |  4 +--
 uTox-git/patches/patch-src_xlib_main.c  |  2 +-
 uTox-git/patches/patch-src_xlib_video.c |  4 +--
 5 files changed, 37 insertions(+), 28 deletions(-)

diffs:
diff --git a/uTox-git/distinfo b/uTox-git/distinfo
index 158281e..8fdd373 100644
--- a/uTox-git/distinfo
+++ b/uTox-git/distinfo
@@ -1,7 +1,7 @@
 $NetBSD$
 
-SHA1 (patch-Makefile) = 5d4be90089c550fe23269f82794714671149c900
-SHA1 (patch-src_main.h) = b4cfefec1f239d870403578bababef1a54889fe3
-SHA1 (patch-src_xlib_main.c) = ca58bd2868299e1ff4a1ea04e2459af89761d885
+SHA1 (patch-Makefile) = 66ced51cb81d70c4c6929f6dfa81636f2c7e2c85
+SHA1 (patch-src_main.h) = 83755101d10aad9d7b0aa9c4ea6ed9c0fa130516
+SHA1 (patch-src_xlib_main.c) = 81bf15940b6e8d766ce1a4c586b60896807db2f0
 SHA1 (patch-src_xlib_v4l.c) = 159ac6e676c0361262daeb3f5324e4916b09b16a
-SHA1 (patch-src_xlib_video.c) = b072978c84b5577b76ddb2f8085b2cc2f1df6290
+SHA1 (patch-src_xlib_video.c) = 0dfc3d168fe765ad6a0921323c1f4938bf25d145
diff --git a/uTox-git/patches/patch-Makefile b/uTox-git/patches/patch-Makefile
index 13a5497..71cace5 100644
--- a/uTox-git/patches/patch-Makefile
+++ b/uTox-git/patches/patch-Makefile
@@ -2,10 +2,11 @@ $NetBSD$
 
 Treat non-Cygwin platforms similarly.
 Use dl library only on Linux.
+Allow separate destination for manuals.
 
---- Makefile.orig	2015-12-29 21:26:38.000000000 +0000
+--- Makefile.orig	2016-03-18 02:00:21.000000000 +0000
 +++ Makefile
-@@ -18,7 +18,24 @@ ifeq ($(FILTER_AUDIO), 1)
+@@ -18,7 +18,25 @@ ifeq ($(FILTER_AUDIO), 1)
  	CFLAGS += -DAUDIO_FILTERING
  endif
  
@@ -16,8 +17,9 @@ Use dl library only on Linux.
 +	CFLAGS  += -static
 +	LDFLAGS += /usr/x86_64-w64-mingw32/sys-root/mingw/lib/libwinpthread.a
 +
-+	CFLAGS  += $(shell x86_64-w64-mingw32-pkg-config --cflags $(DEPS))
-+	LDFLAGS += $(shell x86_64-w64-mingw32-pkg-config --libs   $(DEPS))
++	PKG_CONFIG = x86_64-w64-mingw32-pkg-config
++	CFLAGS  += $(shell $(PKG_CONFIG) --cflags $(DEPS))
++	LDFLAGS += $(shell $(PKG_CONFIG) --libs   $(DEPS))
 +
 +	LDFLAGS += -liphlpapi -lws2_32 -lgdi32 -lmsimg32 -ldnsapi -lcomdlg32
 +	LDFLAGS += -Wl,-subsystem,windows -lwinmm -lole32 -loleaut32 -lstrmiids
@@ -31,20 +33,19 @@ Use dl library only on Linux.
  	OUT_FILE = utox
  
  	DEPS += fontconfig freetype2 x11 xext xrender
-@@ -41,8 +58,10 @@ ifeq ($(UNAME_S), Linux)
- 	endif
+@@ -44,7 +62,10 @@ ifeq ($(UNAME_S), Linux)
+ 
+ 	CFLAGS += $(shell $(PKG_CONFIG) --cflags $(DEPS))
  
- 	CFLAGS += $(shell pkg-config --cflags $(DEPS))
--
 -	LDFLAGS += -lresolv -ldl
 +	LDFLAGS += -lresolv
 +	ifeq ($(UNAME_S), Linux)
 +		LDFLAGS += -ldl
 +	endif
- 	LDFLAGS += $(shell pkg-config --libs $(DEPS))
+ 	LDFLAGS += $(shell $(PKG_CONFIG) --libs $(DEPS))
  
  	OS_SRC = $(wildcard src/xlib/*.c)
-@@ -50,23 +69,6 @@ ifeq ($(UNAME_S), Linux)
+@@ -52,30 +73,13 @@ ifeq ($(UNAME_S), Linux)
  
  	TRAY_OBJ = icons/utox-128x128.o
  	TRAY_GEN = $(LD) -r -b binary icons/utox-128x128.png -o
@@ -54,8 +55,9 @@ Use dl library only on Linux.
 -	CFLAGS  += -static
 -	LDFLAGS += /usr/x86_64-w64-mingw32/sys-root/mingw/lib/libwinpthread.a
 -
--	CFLAGS  += $(shell x86_64-w64-mingw32-pkg-config --cflags $(DEPS))
--	LDFLAGS += $(shell x86_64-w64-mingw32-pkg-config --libs   $(DEPS))
+-	PKG_CONFIG = x86_64-w64-mingw32-pkg-config
+-	CFLAGS  += $(shell $(PKG_CONFIG) --cflags $(DEPS))
+-	LDFLAGS += $(shell $(PKG_CONFIG) --libs   $(DEPS))
 -
 -	LDFLAGS += -liphlpapi -lws2_32 -lgdi32 -lmsimg32 -ldnsapi -lcomdlg32
 -	LDFLAGS += -Wl,-subsystem,windows -lwinmm -lole32 -loleaut32 -lstrmiids
@@ -68,14 +70,21 @@ Use dl library only on Linux.
  endif
  
  
-@@ -123,8 +125,8 @@ install: utox
- 	install -m 644 src/utox.desktop $(DESTDIR)$(PREFIX)/share/applications/utox.desktop
- 	if [ "$(UNITY)" -eq "1" ]; then echo "X-MessagingMenu-UsesChatSection=true" >> $(DESTDIR)$(PREFIX)/share/applications/utox.desktop; fi
+ DESTDIR ?=
+ PREFIX ?= /usr/local
+ DATAROOTDIR ?= $(PREFIX)/share
++MANROOTDIR ?= $(PREFIX)/man
+ 
+ SRC = $(wildcard src/*.c)
+ HEADERS = $(wildcard src/*.h src/*/*.h langs/*.h)
+@@ -127,8 +131,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
  
--	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
--	install -m 644 src/utox.1 $(DESTDIR)$(PREFIX)/share/man/man1/utox.1
-+	mkdir -p $(DESTDIR)$(PREFIX)/man/man1
-+	install -m 644 src/utox.1 $(DESTDIR)$(PREFIX)/man/man1/utox.1
+-	mkdir -p $(DESTDIR)$(DATAROOTDIR)/man/man1
+-	install -m 644 src/utox.1 $(DESTDIR)$(DATAROOTDIR)/man/man1/utox.1
++	mkdir -p $(DESTDIR)$(MANROOTDIR)/man1
++	install -m 644 src/utox.1 $(DESTDIR)$(MANROOTDIR)/man1/utox.1
  
  $(OBJ): %.o: %.c $(HEADERS)
  	@echo "  CC    $@"
diff --git a/uTox-git/patches/patch-src_main.h b/uTox-git/patches/patch-src_main.h
index 646ef59..ec2d025 100644
--- a/uTox-git/patches/patch-src_main.h
+++ b/uTox-git/patches/patch-src_main.h
@@ -2,9 +2,9 @@ $NetBSD$
 
 The volatile macro is used in {amd64,i386,machine}/mcontext.h on NetBSD.
 
---- src/main.h.orig	2015-12-29 21:26:38.000000000 +0000
+--- src/main.h.orig	2016-03-08 20:06:44.000000000 +0000
 +++ src/main.h
-@@ -30,7 +30,7 @@
+@@ -33,7 +33,7 @@
  #define countof(x) (sizeof(x)/sizeof(*(x)))
  
  //  fixes compile with apple headers
diff --git a/uTox-git/patches/patch-src_xlib_main.c b/uTox-git/patches/patch-src_xlib_main.c
index c05aae2..bf6a5d0 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	2015-12-29 21:26:38.000000000 +0000
+--- src/xlib/main.c.orig	2016-03-18 02:00:21.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 df941eb..82ee274d8 100644
--- a/uTox-git/patches/patch-src_xlib_video.c
+++ b/uTox-git/patches/patch-src_xlib_video.c
@@ -2,9 +2,9 @@ $NetBSD$
 
 The volatile macro is used in {amd64,i386,machine}/mcontext.h on NetBSD.
 
---- src/xlib/video.c.orig	2015-12-29 21:26:38.000000000 +0000
+--- src/xlib/video.c.orig	2016-03-18 02:00:21.000000000 +0000
 +++ src/xlib/video.c
-@@ -151,6 +151,10 @@ _Bool video_init(void *handle) {
+@@ -152,6 +152,10 @@ _Bool video_init(void *handle) {
      if(isdesktop(handle)) {
          utox_v4l_fd = -1;
Prev by Date: libpwquality: Try to fix python plist generation
Next by Date: libpwquality: Fix config installation.
Previous by Thread: libpwquality: Try to fix python plist generation
Next by Thread: uTox-git: Update patches
Indexes:
Home | Main Index | Thread Index | Old Index