void-packages/srcpkgs/gftp/patches/ftbfs.patch
Đoàn Trần Công Danh 7fc9190f0e srcpkgs/g*: convert patches to -Np1
* gcc is kept at -Np0, because of void-cross

```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
	for p in ${template%/template}/patches/*; do
		sed -i '
			\,^[+-][+-][+-] /dev/null,b
			/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
			s,^[*][*][*] ,&a/,
			/^--- /{
				s,\(^--- \)\(./\)*,\1a/,
				s,[.][Oo][Rr][Ii][Gg]\([	/]\),\1,
				s/[.][Oo][Rr][Ii][Gg]$//
				s/[.]patched[.]\([^.]\)/.\1/
				h
			}
			/^+++ -/{
				g
				s/^--- a/+++ b/
				b
			}
			s,\(^+++ \)\(./\)*,\1b/,
		' "$p"
	done
	sed -i '/^patch_args=/d' $template
done
```
2021-06-20 13:17:29 +07:00

26 lines
602 B
Diff

We need sysmacros.h for major/minor. Also, stropts.h has been
removed from glibc in the 2.30 version and is actually not used.
--- a/lib/gftp.h
+++ b/lib/gftp.h
@@ -48,6 +48,7 @@
#endif
#include <sys/wait.h>
#include <sys/utsname.h>
+#include <sys/sysmacros.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <glib.h>
--- a/lib/pty.c
+++ b/lib/pty.c
@@ -61,10 +61,6 @@ _gftp_ptys_open (int fdm, int fds, char *pts_name)
#elif HAVE_GRANTPT
-#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__))
-#include <stropts.h>
-#endif
-
char *
gftp_get_pty_impl (void)
{