Hello community, here is the log from the commit of package brltty for openSUSE:Factory checked in at 2020-05-01 11:07:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/brltty (Old) and /work/SRC/openSUSE:Factory/.brltty.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "brltty" Fri May 1 11:07:47 2020 rev:49 rq:798836 version:6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/brltty/brltty.changes 2019-10-22 15:37:24.045166783 +0200 +++ /work/SRC/openSUSE:Factory/.brltty.new.2738/brltty.changes 2020-05-01 11:08:02.919155286 +0200 @@ -1,0 +2,11 @@ +Thu Apr 9 22:04:54 UTC 2020 - Michael Gorse <[email protected]> + +- Update to version 6.1: + + See ChangeLog for changes. +- Rebased brltty-5.5-systemd-install.patch +- api_version is now 0.8.0, and sover is now 0_8 +- Add brltty-gcc10.patch: fix build with -fno-common. +- Adjust line to remove xsession file. +- Remove brltty-alsa.patch + +------------------------------------------------------------------- Old: ---- brltty-6.0.tar.xz brltty-alsa.patch New: ---- brltty-6.1.tar.xz brltty-gcc10.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ brltty.spec ++++++ --- /var/tmp/diff_new_pack.k2CJ9E/_old 2020-05-01 11:08:05.219160288 +0200 +++ /var/tmp/diff_new_pack.k2CJ9E/_new 2020-05-01 11:08:05.219160288 +0200 @@ -1,7 +1,7 @@ # # spec file for package brltty # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,8 +18,8 @@ %{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)} %{!?tcl_sitearch: %global tcl_sitearch %{_libdir}/tcl/tcl%{tcl_version}} -%define api_version 0.7.0 -%define sover 0_7 +%define api_version 0.8.0 +%define sover 0_8 %define soname libbrlapi%{sover} %define with_polkit 1 @@ -33,18 +33,18 @@ %endif Name: brltty -Version: 6.0 +Version: 6.1 Release: 0 # FIXME libbraille driver when libbraille is in factory Summary: Braille display driver for Linux/Unix License: LGPL-2.1-or-later Group: System/Daemons -Url: https://brltty.app/ +URL: https://brltty.app/ Source0: https://brltty.app/archive/%{name}-%{version}.tar.xz Source1: README.SUSE Patch0: brltty-5.5-systemd-install.patch -Patch1: brltty-alsa.patch +Patch1: brltty-gcc10.patch BuildRequires: %{espeakdev} BuildRequires: bison @@ -346,7 +346,7 @@ %endif rm %{buildroot}%{_libdir}/libbrlapi.a rm %{buildroot}%{_libdir}/ocaml/brlapi/libbrlapi_stubs.a -rm %{buildroot}/etc/X11/Xsession.d/60xbrlapi # TODO: install this somewhere? +rm %{buildroot}/etc/X11/Xsession.d/90xbrlapi # TODO: install this somewhere? # fix missing executable bits test ! -x %{buildroot}%{_bindir}/brltty-config chmod a+x %{buildroot}%{_bindir}/brltty-config @@ -429,6 +429,7 @@ %config(noreplace) %{_sysconfdir}/brltty.conf %{_sysconfdir}/brltty/ %{_bindir}/brltty +%{_bindir}/brltty-clip %{_bindir}/brltty-atb %{_bindir}/brltty-cldr %{_bindir}/brltty-config @@ -447,7 +448,8 @@ %{_datadir}/polkit-1/actions/org.a11y.brlapi.policy %endif %{_libdir}/brltty/ -%{_libexecdir}/%{name}-systemd-wrapper +%{_libexecdir}/brltty/ +%{_libexecdir}/%{name}/systemd-wrapper %{_mandir}/man1/brltty.1* %{_mandir}/man1/eutp.1.gz %{_udevdir}/rules.d/69-%{name}.rules ++++++ brltty-5.5-systemd-install.patch ++++++ --- /var/tmp/diff_new_pack.k2CJ9E/_old 2020-05-01 11:08:05.251160358 +0200 +++ /var/tmp/diff_new_pack.k2CJ9E/_new 2020-05-01 11:08:05.255160366 +0200 @@ -1,14 +1,14 @@ -diff -urp brltty-6.0.orig/Autostart/Systemd/Makefile.in brltty-6.0/Autostart/Systemd/Makefile.in ---- brltty-6.0.orig/Autostart/Systemd/Makefile.in 2019-02-03 12:01:38.000000000 -0600 -+++ brltty-6.0/Autostart/Systemd/Makefile.in 2019-02-28 10:29:41.755615178 -0600 +diff -urp brltty-6.1.orig/Autostart/Systemd/Makefile.in brltty-6.1/Autostart/Systemd/Makefile.in +--- brltty-6.1.orig/Autostart/Systemd/Makefile.in 2020-04-05 05:35:34.000000000 -0500 ++++ brltty-6.1/Autostart/Systemd/Makefile.in 2020-04-09 17:00:32.653483273 -0500 @@ -17,8 +17,8 @@ ############################################################################### #SYSTEMD_UNITS_DIRECTORY = $(INSTALL_ROOT)$(sysconfdir)/systemd/system -SYSTEMD_UNITS_DIRECTORY = $(INSTALL_ROOT)$(libdir)/systemd/system --SYSTEMD_SCRIPTS_DIRECTORY = $(INSTALL_ROOT)/usr/libexec -+SYSTEMD_UNITS_DIRECTORY = $(INSTALL_ROOT)/usr/lib/systemd/system -+SYSTEMD_SCRIPTS_DIRECTORY = $(INSTALL_ROOT)$(libexecdir) +-SYSTEMD_SCRIPTS_DIRECTORY = $(INSTALL_ROOT)$(libdir)/$(PACKAGE_TARNAME) ++SYSTEMD_UNITS_DIRECTORY = $(INSTALL_ROOT)$(libexecdir)/systemd/system ++SYSTEMD_SCRIPTS_DIRECTORY = $(INSTALL_ROOT)$(libexecdir)/$(PACKAGE_TARNAME) install: install-units install-scripts ++++++ brltty-6.0.tar.xz -> brltty-6.1.tar.xz ++++++ ++++ 160997 lines of diff (skipped) ++++++ brltty-gcc10.patch ++++++ >From 5f9a609f278a6b3934b46f036ec671ecfe15fadc Mon Sep 17 00:00:00 2001 From: Samuel Thibault <[email protected]> Date: Tue, 7 Apr 2020 11:01:08 +0200 Subject: [PATCH] brlapi server: Fix build with -fno-common and --disable-contracted-braille --- Programs/brlapi_server.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Programs/brlapi_server.c b/Programs/brlapi_server.c index 242b1f0ea..8136d4ce2 100644 --- a/Programs/brlapi_server.c +++ b/Programs/brlapi_server.c @@ -1964,6 +1964,7 @@ PARAM_WRITER(computerBrailleTable) return param_writeString(changeTextTable, data, size); } +#ifdef ENABLE_CONTRACTED_BRAILLE /* BRLAPI_PARAM_LITERARY_BRAILLE_TABLE */ PARAM_READER(literaryBrailleTable) { @@ -1975,6 +1976,7 @@ PARAM_WRITER(literaryBrailleTable) { return param_writeString(changeContractionTable, data, size); } +#endif /* BRLAPI_PARAM_MESSAGE_LOCALE */ PARAM_READER(messageLocale) @@ -2173,11 +2175,13 @@ static const ParamDispatch paramDispatch[BRLAPI_PARAM_COUNT] = { .write = param_computerBrailleTable_write, }, +#ifdef ENABLE_CONTRACTED_BRAILLE [BRLAPI_PARAM_LITERARY_BRAILLE_TABLE] = { .global = 1, .read = param_literaryBrailleTable_read, .write = param_literaryBrailleTable_write, }, +#endif /* ENABLE_CONTRACTED_BRAILLE */ [BRLAPI_PARAM_MESSAGE_LOCALE] = { .global = 1, -- 2.26.0
