From: "Sergei Trofimovich" <slyfox@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-accessibility/brltty/files/, app-accessibility/brltty/
Date: Mon, 28 Nov 2016 09:21:41 +0000 (UTC) [thread overview]
Message-ID: <1480324880.433c45c715bdee3e008e924a7475080e79e0aa25.slyfox@gentoo> (raw)
commit: 433c45c715bdee3e008e924a7475080e79e0aa25
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 28 09:21:08 2016 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Nov 28 09:21:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=433c45c7
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
app-accessibility/brltty/brltty-5.2-r1.ebuild | 5 +-
.../brltty/files/brltty-5.2-major.patch | 59 ++++++++++++++++++++++
2 files changed, 62 insertions(+), 2 deletions(-)
diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 80195c7..46daab6 100644
--- 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
index 00000000..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__
next reply other threads:[~2016-11-28 9:21 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-28 9:21 Sergei Trofimovich [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-12-04 10:26 [gentoo-commits] repo/gentoo:master commit in: app-accessibility/brltty/files/, app-accessibility/brltty/ David Seifert
2018-03-26 20:19 Aaron Bauman
2019-03-22 14:59 Lars Wendler
2020-08-13 20:25 Michał Górny
2023-01-14 13:55 Sam James
2023-06-30 11:50 David Seifert
2023-10-10 5:44 Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1480324880.433c45c715bdee3e008e924a7475080e79e0aa25.slyfox@gentoo \
--to=slyfox@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox