gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

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

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

Package-Manager: portage-2.3.2
This commit is contained in:
Sergei Trofimovich
2016-11-28 09:21:08 +00:00
parent 169474c314
commit 433c45c715
2 changed files with 62 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app-accessibility/brltty/brltty-5.2-r1.ebuild
View File

@@ -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

59
app-accessibility/brltty/files/brltty-5.2-major.patch Normal file
View File

@@ -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__