gentoo resync : 07.01.2022

2 files changed, 39 insertions, 49 deletions

diff --git a/net-im/toxic/files/toxic-0.11.3-NAME_MAX-and-PATH_MAX.patch b/net-im/toxic/files/toxic-0.11.3-NAME_MAX-and-PATH_MAX.patch
new file mode 100644
index 000000000000..2101b64e3d9f
--- /dev/null
+++ b/net-im/toxic/files/toxic-0.11.3-NAME_MAX-and-PATH_MAX.patch
@@ -0,0 +1,39 @@
+diff -ruN src/autocomplete.c src/autocomplete.c
+--- src/autocomplete.c
++++ src/autocomplete.c
+@@ -29,6 +29,7 @@
+ #include <sys/dir.h>
+ #else
+ #include <dirent.h>
++#include <linux/limits.h>
+ #endif /* __APPLE__ */
+ 
+ #include "configdir.h"
+diff -ruN src/file_transfers.h src/file_transfers.h
+--- src/file_transfers.h
++++ src/file_transfers.h
+@@ -25,6 +25,10 @@
+ 
+ #include <limits.h>
+ 
++#ifdef __linux__
++#include <linux/limits.h>
++#endif
++
+ #include "notify.h"
+ #include "toxic.h"
+ #include "windows.h"
+diff -ruN src/settings.h src/settings.h
+--- src/settings.h
++++ src/settings.h
+@@ -25,6 +25,10 @@
+ 
+ #include <limits.h>
+ 
++#ifdef __linux__
++#include <linux/limits.h>
++#endif
++
+ #include <tox/tox.h>
+ 
+ /* Represents line_* hints max strlen */
diff --git a/net-im/toxic/files/toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch b/net-im/toxic/files/toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch
deleted file mode 100644
index 11dc43c6b778..000000000000
--- a/net-im/toxic/files/toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ruN src/autocomplete.c src/autocomplete.c
---- src/autocomplete.c	2021-07-26 10:43:37.453154392 -0400
-+++ src/autocomplete.c	2021-07-26 10:59:29.856460938 -0400
-@@ -27,8 +27,11 @@
- #ifdef __APPLE__
- #include <sys/types.h>
- #include <sys/dir.h>
--#else
-+//This include NAME_MAX
-+#include <sys/sysinfo.h>
-+#elif __linux__
- #include <dirent.h>
-+#include <linux/limits.h>//This includes NAME_MAX
- #endif /* __APPLE__ */
- 
- #include "windows.h"
-diff -ruN src/file_transfers.h src/file_transfers.h
---- src/file_transfers.h	2021-07-26 10:43:37.456487724 -0400
-+++ src/file_transfers.h	2021-07-26 11:41:30.513057111 -0400
-@@ -24,6 +24,12 @@
- #define FILE_TRANSFERS_H
- 
- #include <limits.h>
-+//This includes PATH_MAX
-+#ifdef __APPLE__
-+#include <sys/sysinfo.h>
-+#elif __linux__
-+#include <linux/limits.h>
-+#endif
- 
- #include "toxic.h"
- #include "windows.h"
-diff -ruN src/settings.h src/settings.h
---- src/settings.h	2021-07-26 10:43:37.459821058 -0400
-+++ src/settings.h	2021-07-26 11:45:46.709716594 -0400
-@@ -25,6 +25,13 @@
- 
- #include <limits.h>
- 
-+//This includes PATH_MAX
-+#ifdef __APPLE__
-+#include <sys/sysinfo.h>
-+#elif __linux__
-+#include <linux/limits.h>
-+#endif
-+
- #include <tox/tox.h>
- 
- /* Represents line_* hints max strlen */