pkgsrc-WIP-changes archive

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

uTox-git: Drop patches applied upstream



Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Mon Apr 24 19:43:13 2017 +0200
Changeset:	5ee953b3f31691d4e0ff76462b4c5c99084a840f

Modified Files:
	uTox-git/distinfo
Removed Files:
	uTox-git/patches/patch-src_main.h
	uTox-git/patches/patch-src_updater.c
	uTox-git/patches/patch-src_xlib_CMakeLists.txt
	uTox-git/patches/patch-src_xlib_main.c
	uTox-git/patches/patch-src_xlib_v4l.c

Log Message:
uTox-git: Drop patches applied upstream

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

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

diffstat:
 uTox-git/distinfo                              |  5 ----
 uTox-git/patches/patch-src_main.h              | 15 ------------
 uTox-git/patches/patch-src_updater.c           | 14 -----------
 uTox-git/patches/patch-src_xlib_CMakeLists.txt | 21 -----------------
 uTox-git/patches/patch-src_xlib_main.c         | 32 --------------------------
 uTox-git/patches/patch-src_xlib_v4l.c          | 20 ----------------
 6 files changed, 107 deletions(-)

diffs:
diff --git a/uTox-git/distinfo b/uTox-git/distinfo
index 1e2d543ecd..afc76512f4 100644
--- a/uTox-git/distinfo
+++ b/uTox-git/distinfo
@@ -1,7 +1,2 @@
 $NetBSD$
 
-SHA1 (patch-src_main.h) = 1def46cb26e474b20a5e34ae5a471a7c9fbb004c
-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_main.h b/uTox-git/patches/patch-src_main.h
deleted file mode 100644
index 7aee249ca3..0000000000
--- a/uTox-git/patches/patch-src_main.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-The volatile macro is used in {amd64,i386,machine}/mcontext.h on NetBSD.
-
---- src/main.h.orig	2016-05-11 09:22:11.668807995 +0000
-+++ src/main.h
-@@ -40,7 +40,7 @@
- //  fixes compile with apple headers
- /*** This breaks both android and Windows video... but it's needed to fix complation in clang (Cocoa & asan)
-  ***  TODO fix them?
--#ifndef __OBJC__
-+##if !defined(__OBJC__) && !defined(__NetBSD__)
- #define volatile(x) (*((volatile typeof(x)*)&x))
- #endif */
- 
diff --git a/uTox-git/patches/patch-src_updater.c b/uTox-git/patches/patch-src_updater.c
deleted file mode 100644
index 836e847807..0000000000
--- a/uTox-git/patches/patch-src_updater.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Include netinet/in.h for IPPROTO_TCP
-
---- src/updater.c.orig	2017-04-10 16:23:09.000000000 +0000
-+++ src/updater.c
-@@ -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
deleted file mode 100644
index fe2ae2318d..0000000000
--- a/uTox-git/patches/patch-src_xlib_CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-Don’t link with dl on non-Linux
-
---- src/xlib/CMakeLists.txt.orig	2017-04-10 16:23:09.000000000 +0000
-+++ src/xlib/CMakeLists.txt
-@@ -73,10 +73,13 @@ target_link_libraries(utoxNATIVE
-                       fontconfig
-                       ${FREETYPE_LIBRARIES}
-                       resolv
--                      dl
-                       ${DBUS_LIBRARIES}
-                       )
- 
-+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-+    target_link_libraries(utoxNATIVE dl)
-+endif()
-+
- include(GNUInstallDirs)
- 
- install(FILES
diff --git a/uTox-git/patches/patch-src_xlib_main.c b/uTox-git/patches/patch-src_xlib_main.c
deleted file mode 100644
index 62b3bc49c9..0000000000
--- a/uTox-git/patches/patch-src_xlib_main.c
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD$
-
-Avoid using Linux-specific headers when not compiling for Linux.
-
---- src/xlib/main.c.orig	2017-01-16 21:01:20.000000000 +0000
-+++ src/xlib/main.c
-@@ -38,7 +38,9 @@ void postmessage_utox(UTOX_MSG msg, uint
-     XFlush(display);
- }
- 
-+#ifdef __linux__
- #include <linux/input.h>
-+#endif
- FILE    *ptt_keyboard_handle;
- Display *ptt_display;
- void     init_ptt(void) {
-@@ -63,6 +65,7 @@ bool check_ptt_key(void) {
-     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! */
-@@ -79,6 +82,7 @@ bool check_ptt_key(void) {
-             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-git/patches/patch-src_xlib_v4l.c b/uTox-git/patches/patch-src_xlib_v4l.c
deleted file mode 100644
index 2f61833358..0000000000
--- a/uTox-git/patches/patch-src_xlib_v4l.c
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-Use Linux headers when on Linux, not when not on OpenBSD.
-
---- src/xlib/v4l.c.orig	2015-12-29 21:26:38.000000000 +0000
-+++ src/xlib/v4l.c
-@@ -3,10 +3,10 @@
- int utox_v4l_fd = -1;
- 
- #include <sys/mman.h>
--#ifdef __OpenBSD__
--#include <sys/videoio.h>
--#else
-+#ifdef __linux__
- #include <linux/videodev2.h>
-+#else
-+#include <sys/videoio.h>
- #endif
- 
- #ifndef NO_V4LCONVERT


Home | Main Index | Thread Index | Old Index