pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

uTox-git: Update patches



Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Mon Apr 10 18:35:35 2017 +0200
Changeset:	070cfc52eea5fd8d0ba08a19e3cbd37fa58ce091

Modified Files:
	uTox-git/distinfo
	uTox-git/patches/patch-src_updater.c
	uTox-git/patches/patch-src_xlib_CMakeLists.txt

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=070cfc52eea5fd8d0ba08a19e3cbd37fa58ce091

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

diffstat:
 uTox-git/distinfo                              |  4 ++--
 uTox-git/patches/patch-src_updater.c           |  6 +++---
 uTox-git/patches/patch-src_xlib_CMakeLists.txt | 20 +++++++++++---------
 3 files changed, 16 insertions(+), 14 deletions(-)

diffs:
diff --git a/uTox-git/distinfo b/uTox-git/distinfo
index 4265e98959..1e2d543ecd 100644
--- a/uTox-git/distinfo
+++ b/uTox-git/distinfo
@@ -1,7 +1,7 @@
 $NetBSD$
 
 SHA1 (patch-src_main.h) = 1def46cb26e474b20a5e34ae5a471a7c9fbb004c
-SHA1 (patch-src_updater.c) = c02cec879f954d6c2abb3e1ea6b0e0a01b4e0b50
-SHA1 (patch-src_xlib_CMakeLists.txt) = ae45b48127d1a8a712176b786aae6900d5ee5813
+SHA1 (patch-src_updater.c) = 06e175bce066833351989cdbebce009a6d8a7906
+SHA1 (patch-src_xlib_CMakeLists.txt) = bf1f499e3be06a4aebdad0601e9d7e77ca282a0e
 SHA1 (patch-src_xlib_main.c) = f474254680c6da875e5e3454afcb07455f858bbf
 SHA1 (patch-src_xlib_v4l.c) = 8f8de28684886ea9a135820b21f3bb3a91ba87b9
diff --git a/uTox-git/patches/patch-src_updater.c b/uTox-git/patches/patch-src_updater.c
index 2262eb8676..836e847807 100644
--- a/uTox-git/patches/patch-src_updater.c
+++ b/uTox-git/patches/patch-src_updater.c
@@ -2,13 +2,13 @@ $NetBSD$
 
 Include netinet/in.h for IPPROTO_TCP
 
---- src/updater.c.orig	2017-01-24 20:49:40.564174586 +0000
+--- src/updater.c.orig	2017-04-10 16:23:09.000000000 +0000
 +++ src/updater.c
-@@ -20,6 +20,7 @@
+@@ -25,6 +25,7 @@
  #include <sys/socket.h>
  #include <sys/types.h>
  #include <netdb.h>
 +#include <netinet/in.h>
  #endif
  
- 
+ #include "native/main.h" // Include after winsock2
diff --git a/uTox-git/patches/patch-src_xlib_CMakeLists.txt b/uTox-git/patches/patch-src_xlib_CMakeLists.txt
index 2fb72d7c5e..fe2ae2318d 100644
--- a/uTox-git/patches/patch-src_xlib_CMakeLists.txt
+++ b/uTox-git/patches/patch-src_xlib_CMakeLists.txt
@@ -2,18 +2,20 @@ $NetBSD$
 
 Don’t link with dl on non-Linux
 
---- src/xlib/CMakeLists.txt.orig	2017-02-06 18:58:47.000000000 +0000
+--- src/xlib/CMakeLists.txt.orig	2017-04-10 16:23:09.000000000 +0000
 +++ src/xlib/CMakeLists.txt
-@@ -39,7 +39,11 @@ message("X library: ${X11_LIBRARIES}")
- message("Xrender include: ${X11_Xrender_INCLUDE_PATH}")
- message("Xrender library: ${X11_Xrender_LIB}")
+@@ -73,10 +73,13 @@ target_link_libraries(utoxNATIVE
+                       fontconfig
+                       ${FREETYPE_LIBRARIES}
+                       resolv
+-                      dl
+                       ${DBUS_LIBRARIES}
+                       )
  
--target_link_libraries(utoxNATIVE icon v4lconvert ${X11_LIBRARIES} ${X11_Xrender_LIB} fontconfig ${FREETYPE_LIBRARIES} resolv dl )
-+target_link_libraries(utoxNATIVE icon v4lconvert ${X11_LIBRARIES} ${X11_Xrender_LIB} fontconfig ${FREETYPE_LIBRARIES} resolv )
-+
 +if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-+  target_link_libraries(utoxNATIVE dl)
++    target_link_libraries(utoxNATIVE dl)
 +endif()
- 
++
  include(GNUInstallDirs)
  
+ install(FILES


Home | Main Index | Thread Index | Old Index