1 |
commit: 433c45c715bdee3e008e924a7475080e79e0aa25 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 28 09:21:08 2016 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 28 09:21:20 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=433c45c7 |
7 |
|
8 |
app-accessibility/brltty: fix makedev() autodetection, bug #581130 |
9 |
|
10 |
Reported-by: Toralf Förster |
11 |
Bug: https://bugs.gentoo.org/581130 |
12 |
|
13 |
Package-Manager: portage-2.3.2 |
14 |
|
15 |
app-accessibility/brltty/brltty-5.2-r1.ebuild | 5 +- |
16 |
.../brltty/files/brltty-5.2-major.patch | 59 ++++++++++++++++++++++ |
17 |
2 files changed, 62 insertions(+), 2 deletions(-) |
18 |
|
19 |
diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild b/app-accessibility/brltty/brltty-5.2-r1.ebuild |
20 |
index 80195c7..46daab6 100644 |
21 |
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild |
22 |
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild |
23 |
@@ -31,7 +31,7 @@ COMMON_DEP="bluetooth? ( net-wireless/bluez ) |
24 |
iconv? ( virtual/libiconv ) |
25 |
icu? ( dev-libs/icu:= ) |
26 |
python? ( ${PYTHON_DEPS} ) |
27 |
- ncurses? ( sys-libs/ncurses ) |
28 |
+ ncurses? ( sys-libs/ncurses:0= ) |
29 |
nls? ( virtual/libintl ) |
30 |
tcl? ( >=dev-lang/tcl-8.4.15:0= ) |
31 |
usb? ( virtual/libusb:0 ) |
32 |
@@ -46,7 +46,8 @@ RDEPEND="java? ( >=virtual/jre-1.4 ) |
33 |
src_prepare() { |
34 |
epatch "${FILESDIR}"/${P}-fix-ldflags.patch \ |
35 |
"${FILESDIR}"/${P}-udev.patch \ |
36 |
- "${FILESDIR}"/${P}-respect-AR.patch |
37 |
+ "${FILESDIR}"/${P}-respect-AR.patch \ |
38 |
+ "${FILESDIR}"/${P}-major.patch |
39 |
|
40 |
java-pkg-opt-2_src_prepare |
41 |
|
42 |
|
43 |
diff --git a/app-accessibility/brltty/files/brltty-5.2-major.patch b/app-accessibility/brltty/files/brltty-5.2-major.patch |
44 |
new file mode 100644 |
45 |
index 00000000..7c591b1 |
46 |
--- /dev/null |
47 |
+++ b/app-accessibility/brltty/files/brltty-5.2-major.patch |
48 |
@@ -0,0 +1,59 @@ |
49 |
+Bug: https://bugs.gentoo.org/581130 |
50 |
+diff --git a/Programs/system_linux.c b/Programs/system_linux.c |
51 |
+index c73bd39..ef7d807 100644 |
52 |
+--- a/Programs/system_linux.c |
53 |
++++ b/Programs/system_linux.c |
54 |
+@@ -25,6 +25,12 @@ |
55 |
+ #include <sys/ioctl.h> |
56 |
+ #include <sys/stat.h> |
57 |
+ |
58 |
++#ifdef MAJOR_IN_MKDEV |
59 |
++#include <sys/mkdev.h> |
60 |
++#elif defined MAJOR_IN_SYSMACROS |
61 |
++#include <sys/sysmacros.h> |
62 |
++#endif |
63 |
++ |
64 |
+ #include "log.h" |
65 |
+ #include "file.h" |
66 |
+ #include "device.h" |
67 |
+diff --git a/configure.ac b/configure.ac |
68 |
+index 96305f7..dcae1e1 100644 |
69 |
+--- a/configure.ac |
70 |
++++ b/configure.ac |
71 |
+@@ -555,6 +555,8 @@ BRLTTY_ARG_DISABLE( |
72 |
+ ]) |
73 |
+ AC_SUBST([install_messages]) |
74 |
+ |
75 |
++AC_HEADER_MAJOR |
76 |
++ |
77 |
+ AC_CHECK_FUNC([wcslen], [AC_CHECK_HEADERS([wchar.h], [dnl |
78 |
+ AC_CHECK_FUNCS([wcwidth]) |
79 |
+ ])]) |
80 |
+diff --git a/config.h.in b/config.h.in |
81 |
+index 71341c6..ff201c2 100644 |
82 |
+--- a/config.h.in |
83 |
++++ b/config.h.in |
84 |
+@@ -457,2 +457,10 @@ extern "C" { |
85 |
+ |
86 |
++/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>. |
87 |
++ */ |
88 |
++#undef MAJOR_IN_MKDEV |
89 |
++ |
90 |
++/* Define to 1 if `major', `minor', and `makedev' are declared in |
91 |
++ <sysmacros.h>. */ |
92 |
++#undef MAJOR_IN_SYSMACROS |
93 |
++ |
94 |
+ /* Define this to be a string containing the path to the root of the Mikropuhe package. */ |
95 |
+diff --git a/Programs/brlapi_client.c b/Programs/brlapi_client.c |
96 |
+index bd6497b..df63b30 100644 |
97 |
+--- a/Programs/brlapi_client.c |
98 |
++++ b/Programs/brlapi_client.c |
99 |
+@@ -32,2 +32,8 @@ |
100 |
+ |
101 |
++#ifdef MAJOR_IN_MKDEV |
102 |
++#include <sys/mkdev.h> |
103 |
++#elif defined MAJOR_IN_SYSMACROS |
104 |
++#include <sys/sysmacros.h> |
105 |
++#endif |
106 |
++ |
107 |
+ #ifndef __MINGW32__ |