From 0dd1e17db875e18b83f173619e2addf01c9cac98 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 03 2016 05:42:30 +0000 Subject: import brltty-4.5-13.el7 --- diff --git a/SOURCES/brltty-4.5-relro-full.patch b/SOURCES/brltty-4.5-relro-full.patch new file mode 100644 index 0000000..53dddac --- /dev/null +++ b/SOURCES/brltty-4.5-relro-full.patch @@ -0,0 +1,13 @@ +diff --git a/Programs/Makefile.in b/Programs/Makefile.in +index 33d8c8a..622f206 100644 +--- a/Programs/Makefile.in ++++ b/Programs/Makefile.in +@@ -475,7 +475,7 @@ BRLTTY_OBJECTS = main.$O $(CORE_OBJECTS) + BRLTTY_LIBRARIES = $(BRAILLE_DRIVER_LIBRARIES) $(SPEECH_DRIVER_LIBRARIES) $(SCREEN_DRIVER_LIBRARIES) $(USB_LIBS) $(BLUETOOTH_LIBS) $(ICU_LIBRARIES) $(LDLIBS) + + brltty$X: $(BRLTTY_OBJECTS) +- $(CC) $(LDFLAGS) -o $@ $(BRLTTY_OBJECTS) $(BRLTTY_LIBRARIES) ++ $(CC) $(LDFLAGS) -pie -Wl,-z,relro,-z,now -o $@ $(BRLTTY_OBJECTS) $(BRLTTY_LIBRARIES) + + main.$O: + $(CC) $(CFLAGS) -c $(SRC_DIR)/main.c diff --git a/SOURCES/brltty-4.5-xw-fonts-fix.patch b/SOURCES/brltty-4.5-xw-fonts-fix.patch new file mode 100644 index 0000000..a0572cc --- /dev/null +++ b/SOURCES/brltty-4.5-xw-fonts-fix.patch @@ -0,0 +1,35 @@ +diff --git a/Drivers/Braille/XWindow/braille.c b/Drivers/Braille/XWindow/braille.c +index 26ca705..ccabdcd 100644 +--- a/Drivers/Braille/XWindow/braille.c ++++ b/Drivers/Braille/XWindow/braille.c +@@ -211,7 +211,7 @@ typedef enum { + static int cols,lines; + static int input; + static char *model = "simple"; +-static const char *fontname = "-*-clearlyu-*-r-*-*-17-*-*-*-*-*-iso10646-1,-*-fixed-*-r-*-*-17-*-*-*-*-*-iso10646-1,-*-unifont-*-r-*-*-17-*-*-*-*-*-iso10646-1,-*-fixed-*-*-*-*-*-*-*-*-*-*-iso10646-1,-*-fixed-*-*-*-*-*-*-*-*-*-*-iso8859-1"; ++static const char *fontname = "-*-clearlyu-*-r-*-*-17-*-*-*-*-*-iso10646-1,-*-fixed-*-r-*-*-*-*-*-*-*-*-iso10646-1,-*-unifont-*-r-*-*-17-*-*-*-*-*-iso10646-1,-*-fixed-*-*-*-*-*-*-*-*-*-*-iso10646-1,-*-fixed-*-*-*-*-*-*-*-*-*-*-iso8859-1"; + static int xtArgc = 1; + static char *xtDefArgv[]= { "brltty", NULL }; + static char **xtArgv = xtDefArgv; +@@ -944,7 +944,6 @@ static int generateToplevel(void) + #ifdef USE_XAW + XtNshowGrip,False, + XtNinternational, True, +- XNFontSet, fontset, + #else /* USE_XAW */ + XmNpaneMaximum,20, + XmNpaneMinimum,20, +@@ -952,10 +951,11 @@ static int generateToplevel(void) + #endif /* USE_XAW */ + #ifdef USE_XAW + XtNlabel, disp, ++ fontset ? XNFontSet : NULL, fontset, NULL + #else /* USE_XAW */ +- XmNlabelString, display_cs, ++ XmNlabelString, display_cs, NULL + #endif /* USE_XAW */ +- NULL); ++ ); + + #ifdef USE_XAW + if (fontset) { diff --git a/SPECS/brltty.spec b/SPECS/brltty.spec index 3efdda1..4721f21 100644 --- a/SPECS/brltty.spec +++ b/SPECS/brltty.spec @@ -19,7 +19,7 @@ Name: brltty Version: %{pkg_version} -Release: 9%{?dist} +Release: 13%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: http://mielke.cc/brltty/ @@ -28,9 +28,12 @@ Source1: brltty.service # patch sent upstream Patch3: brltty-4.5-man-fix.patch Patch4: brltty-loadLibrary.patch +Patch5: brltty-4.5-xw-fonts-fix.patch +Patch6: brltty-4.5-relro-full.patch Summary: Braille display driver for Linux/Unix -BuildRequires: byacc glibc-kernheaders bluez-libs-devel -BuildRequires: systemd +BuildRequires: byacc, glibc-kernheaders, bluez-libs-devel +BuildRequires: at-spi-devel, at-spi2-core-devel, systemd +Requires: brlapi%{?_isa} = %{api_version}-%{release} # work around a bug in the install process: Requires(post): coreutils Requires(post): systemd @@ -52,7 +55,7 @@ Summary: Speech Dispatcher driver for BRLTTY Group: System Environment/Daemons License: GPLv2+ BuildRequires: speech-dispatcher-devel -Requires: %{name} = %{pkg_version}-%{release} +Requires: %{name}%{?_isa} = %{pkg_version}-%{release} %description speech-dispatcher This package provides the Speech Dispatcher driver for BRLTTY. %endif @@ -71,7 +74,8 @@ Summary: XWindow driver for BRLTTY Group: System Environment/Daemons License: GPLv2+ BuildRequires: libSM-devel libICE-devel libX11-devel libXaw-devel libXext-devel libXt-devel libXtst-devel -Requires: %{name} = %{pkg_version}-%{release} +Requires: %{name}%{?_isa} = %{pkg_version}-%{release} +Requires: xorg-x11-fonts-misc, ucs-miscfixed-fonts %description xw This package provides the XWindow driver for BRLTTY. @@ -80,11 +84,19 @@ Summary: AtSpi driver for BRLTTY Group: System Environment/Daemons # The data files are licensed under LGPLv2+, see the README file. License: GPLv2+ and LGPLv2+ -BuildRequires: at-spi-devel -Requires: %{name} = %{pkg_version}-%{release} +Requires: %{name}%{?_isa} = %{pkg_version}-%{release} %description at-spi This package provides the AtSpi driver for BRLTTY. +%package at-spi2 +Summary: AtSpi2 driver for BRLTTY +Group: System Environment/Daemons +# The data files are licensed under LGPLv2+, see the README file. +License: GPLv2+ and LGPLv2+ +Requires: %{name}%{?_isa} = %{pkg_version}-%{release} +%description at-spi2 +This package provides the AtSpi2 driver for BRLTTY. + %package -n brlapi Version: %{api_version} Group: Applications/System @@ -102,7 +114,7 @@ a refreshable braille display. Version: %{api_version} Group: Development/System License: LGPLv2+ -Requires: brlapi = %{api_version}-%{release} +Requires: brlapi%{?_isa} = %{api_version}-%{release} Summary: Headers, static archive, and documentation for BrlAPI %description -n brlapi-devel @@ -121,7 +133,7 @@ which directly accesses a refreshable braille display. Version: %{api_version} Group: Development/System License: LGPLv2+ -Requires: brlapi = %{api_version}-%{release} +Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: tcl-devel Summary: Tcl binding for BrlAPI %description -n tcl-brlapi @@ -131,7 +143,7 @@ This package provides the Tcl binding for BrlAPI. Version: %{api_version} Group: Development/System License: LGPLv2+ -Requires: brlapi = %{api_version}-%{release} +Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: Cython BuildRequires: python2-devel Summary: Python binding for BrlAPI @@ -143,7 +155,7 @@ This package provides the Python binding for BrlAPI. Version: %{api_version} Group: Development/System License: LGPLv2+ -Requires: brlapi = %{api_version}-%{release} +Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: Cython BuildRequires: python3-devel Summary: Python 3 binding for BrlAPI @@ -155,7 +167,7 @@ This package provides the Python 3 binding for BrlAPI. Version: %{api_version} Group: Development/System License: LGPLv2+ -Requires: brlapi = %{api_version}-%{release} +Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: jpackage-utils BuildRequires: java-devel Summary: Java binding for BrlAPI @@ -167,7 +179,7 @@ This package provides the Java binding for BrlAPI. Version: %{api_version} Group: Development/System License: LGPLv2+ -Requires: brlapi = %{api_version}-%{release} +Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: ocaml Summary: OCaml binding for BrlAPI %description -n ocaml-brlapi @@ -181,6 +193,8 @@ This package provides the OCaml binding for BrlAPI. %setup -q %patch3 -p1 -b .man-fix %patch4 -p1 -b .loadLibrary +%patch5 -p1 -b .xw-fonts-fix +%patch6 -p1 -b .relro-full %if 0%{?with_python3} # Make a copy of the source tree for building the Python 3 module @@ -274,6 +288,9 @@ mv Documents/BrlAPIref/{html,BrlAPIref} # Don't want static lib rm -rf $RPM_BUILD_ROOT/%{_libdir}/libbrlapi.a +# make brltty-config executable +chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/brltty-config + %post %systemd_post brltty.service @@ -300,6 +317,7 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/libbrlapi.a %exclude %{_libdir}/brltty/libbrlttyssd.so %endif %exclude %{_libdir}/brltty/libbrlttyxas.so +%exclude %{_libdir}/brltty/libbrlttyxa2.so %doc LICENSE-GPL LICENSE-LGPL %doc %{_mandir}/man[15]/brltty.* @@ -321,6 +339,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/libbrlapi.a %files at-spi %{_libdir}/brltty/libbrlttyxas.so +%files at-spi2 +%{_libdir}/brltty/libbrlttyxa2.so + %files -n brlapi %{_bindir}/vstp %{_bindir}/xbrlapi @@ -362,6 +383,30 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/libbrlapi.a %endif %changelog +* Fri May 6 2016 Jaroslav Škarvada - 4.5-13 +- Made brltty-config executable, currently useless, but FHS compliant + Resolves: rhbz#1332981 +- Fixed multilib + Related: rhbz#1324850 + +* Mon Apr 11 2016 Jaroslav Škarvada - 4.5-12 +- Improved fix for Braille characters not displaying in the XW driver window + Related: rhbz#1324669 + +* Thu Apr 7 2016 Jaroslav Škarvada - 4.5-11 +- Fixed Braille characters not displaying in the XW driver window + Resolves: rhbz#1324669 +- Added AT-SPI2 driver + Resolves: rhbz#1324672 +- Fixed requirements + Resolves: rhbz#1324850 + +* Tue Apr 5 2016 Jaroslav Škarvada - 4.5-10 +- Hardened build + Resolves: rhbz#1092547 +- Fixed Braille display emulator to start + Resolves: rhbz#1304725 + * Fri Oct 24 2014 Richard W.M. Jones - 4.5-9 - Rebuild for OCaml 4.01.0 resolves: rhbz#1155561