summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen L Arnold <nerdboy@gentoo.org>2017-12-02 15:45:25 -0800
committerStephen L Arnold <nerdboy@gentoo.org>2017-12-02 15:46:27 -0800
commit2962db62851f26ba9ec7fa4aba505b7b372a1072 (patch)
tree062de93697eddc6ee545550f42c8c5712ead7b5c /app-accessibility
parentdev-python/dkimpy: Add new package (diff)
downloadgentoo-2962db62851f26ba9ec7fa4aba505b7b372a1072.tar.gz
gentoo-2962db62851f26ba9ec7fa4aba505b7b372a1072.tar.bz2
gentoo-2962db62851f26ba9ec7fa4aba505b7b372a1072.zip
app-accessibility/brltty: misc build and QA fixes
* add libtinfo check for ncurses * add sysmacros.h patch for newer glibc breakage * fix repoman warnings * fixes bug 547786 and minor/major symbol errors Package-Manager: Portage-2.3.16, Repoman-2.3.6
Diffstat (limited to 'app-accessibility')
-rw-r--r--app-accessibility/brltty/Manifest2
-rw-r--r--app-accessibility/brltty/brltty-5.2-r1.ebuild15
-rw-r--r--app-accessibility/brltty/files/brltty-5.2-sysmacros.patch24
3 files changed, 35 insertions, 6 deletions
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index 6e11ab2ba9c..018608d0bc4 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1 +1 @@
-DIST brltty-5.2.tar.xz 2532684 SHA256 f1293940317a675d0eaeaf3f363bbfe4bfaa5225c2116123a61ce2d3c71943f7 SHA512 8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f WHIRLPOOL 33fcf326be381309f2baa3f59807145a0ca3a614f32b0b27e4b76af1c1f46f6459f7be1d629002538588ce71ab017b52bfc642fc06aa2c3f883aba272e61f20e
+DIST brltty-5.2.tar.xz 2532684 BLAKE2B 9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f SHA512 8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f
diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 59aa9142308..12ea62ef94e 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
FINDLIB_USE="ocaml"
inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
@@ -15,14 +15,14 @@ SRC_URI="http://brltty.com/archive/${P}.tar.xz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 x86"
IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
java +midi ncurses nls ocaml +pcm python usb +speech
tcl X"
REQUIRED_USE="doc? ( api )
java? ( api )
ocaml? ( api )
- python? ( api ${PYTHON_REQUIRED_USE} )
+ python? ( api )
tcl? ( api )"
COMMON_DEP="bluetooth? ( net-wireless/bluez )
@@ -30,7 +30,7 @@ COMMON_DEP="bluetooth? ( net-wireless/bluez )
iconv? ( virtual/libiconv )
icu? ( dev-libs/icu:= )
python? ( ${PYTHON_DEPS} )
- ncurses? ( sys-libs/ncurses:0= )
+ ncurses? ( sys-libs/ncurses:= )
nls? ( virtual/libintl )
tcl? ( >=dev-lang/tcl-8.4.15:0= )
usb? ( virtual/libusb:0 )
@@ -46,7 +46,7 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-fix-ldflags.patch \
"${FILESDIR}"/${P}-udev.patch \
"${FILESDIR}"/${P}-respect-AR.patch \
- "${FILESDIR}"/${P}-major.patch
+ "${FILESDIR}"/${P}-sysmacros.patch
java-pkg-opt-2_src_prepare
@@ -64,6 +64,11 @@ src_prepare() {
}
src_configure() {
+ filter-flags "_*_SOURCE*"
+ append-cppflags -D_DEFAULT_SOURCE
+ has_version ">=sys-libs/glibc-2.25-r5" && append-cppflags -DHAVE_SYS_SYSMACROS_H
+ has_version "sys-libs/ncurses[tinfo]" && append-libs -ltinfo
+
tc-export AR LD PKG_CONFIG
# override prefix in order to install into /
# braille terminal needs to be available as soon in the boot process as
diff --git a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
new file mode 100644
index 00000000000..d45d6104e4b
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
@@ -0,0 +1,24 @@
+--- a/Programs/system_linux.c 2017-12-02 12:54:34.098643832 -0800
++++ b/Programs/system_linux.c 2017-12-02 12:59:00.683592161 -0800
+@@ -24,6 +24,9 @@
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h> /* major() w/newer glibc */
++#endif
+
+ #include "log.h"
+ #include "file.h"
+--- a/Programs/brlapi_client.c 2017-12-02 14:29:37.524205316 -0800
++++ b/Programs/brlapi_client.c 2017-12-02 14:32:45.679948051 -0800
+@@ -73,6 +73,9 @@
+ #include <linux/tty.h>
+ #include <linux/vt.h>
+ #define MAXIMUM_VIRTUAL_CONSOLE MAX_NR_CONSOLES
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h> /* major() w/newer glibc */
++#endif
+ #endif /* linux */
+
+ #ifdef __OpenBSD__