app-accessibility/brltty: fix makedev() autodetection, bug #581130

Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/581130

Package-Manager: portage-2.3.2

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 80195c7b54afb8e4cfd8543c83c9a3b50567d475..46daab6052fe473e6c5c61fd5bd9af50c77c9623 100644 (file)
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -31,7 +31,7 @@ COMMON_DEP="bluetooth? ( net-wireless/bluez )
        iconv? ( virtual/libiconv )
        icu? ( dev-libs/icu:= )
        python? ( ${PYTHON_DEPS} )
-       ncurses? ( sys-libs/ncurses )
+       ncurses? ( sys-libs/ncurses:0= )
        nls? ( virtual/libintl )
        tcl? ( >=dev-lang/tcl-8.4.15:0= )
        usb? ( virtual/libusb:0 )
@@ -46,7 +46,8 @@ RDEPEND="java? ( >=virtual/jre-1.4 )
 src_prepare() {
        epatch "${FILESDIR}"/${P}-fix-ldflags.patch \
                "${FILESDIR}"/${P}-udev.patch \
-               "${FILESDIR}"/${P}-respect-AR.patch
+               "${FILESDIR}"/${P}-respect-AR.patch \
+               "${FILESDIR}"/${P}-major.patch
 
        java-pkg-opt-2_src_prepare
 

diff --git a/app-accessibility/brltty/files/brltty-5.2-major.patch b/app-accessibility/brltty/files/brltty-5.2-major.patch
new file mode 100644 (file)
index 0000000..7c591b1
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-5.2-major.patch
@@ -0,0 +1,59 @@
+Bug: https://bugs.gentoo.org/581130
+diff --git a/Programs/system_linux.c b/Programs/system_linux.c
+index c73bd39..ef7d807 100644
+--- a/Programs/system_linux.c
++++ b/Programs/system_linux.c
+@@ -25,6 +25,12 @@
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+ 
++#ifdef MAJOR_IN_MKDEV
++#include <sys/mkdev.h>
++#elif defined MAJOR_IN_SYSMACROS
++#include <sys/sysmacros.h>
++#endif
++
+ #include "log.h"
+ #include "file.h"
+ #include "device.h"
+diff --git a/configure.ac b/configure.ac
+index 96305f7..dcae1e1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -555,6 +555,8 @@ BRLTTY_ARG_DISABLE(
+ ])
+ AC_SUBST([install_messages])
+ 
++AC_HEADER_MAJOR
++
+ AC_CHECK_FUNC([wcslen], [AC_CHECK_HEADERS([wchar.h], [dnl
+    AC_CHECK_FUNCS([wcwidth])
+ ])])
+diff --git a/config.h.in b/config.h.in
+index 71341c6..ff201c2 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -457,2 +457,10 @@ extern "C" {
+ 
++/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
++   */
++#undef MAJOR_IN_MKDEV
++
++/* Define to 1 if `major', `minor', and `makedev' are declared in
++   <sysmacros.h>. */
++#undef MAJOR_IN_SYSMACROS
++
+ /* Define this to be a string containing the path to the root of the Mikropuhe package. */
+diff --git a/Programs/brlapi_client.c b/Programs/brlapi_client.c
+index bd6497b..df63b30 100644
+--- a/Programs/brlapi_client.c
++++ b/Programs/brlapi_client.c
+@@ -32,2 +32,8 @@
+ 
++#ifdef MAJOR_IN_MKDEV
++#include <sys/mkdev.h>
++#elif defined MAJOR_IN_SYSMACROS
++#include <sys/sysmacros.h>
++#endif
++
+ #ifndef __MINGW32__