1807751 - [abrt] sane-backends: std::__replacement_assert(): scanimage killed by SIGABRT

This commit is contained in:
Zdenek Dohnal 2020-03-23 07:45:27 +01:00
parent 69109eadf3
commit e3d65fa239
2 changed files with 19 additions and 1 deletions

View File

@ -0,0 +1,13 @@
diff --git a/backend/genesys/gl841.cpp b/backend/genesys/gl841.cpp
index 470f9ba..c11a434 100644
--- a/backend/genesys/gl841.cpp
+++ b/backend/genesys/gl841.cpp
@@ -944,7 +944,7 @@ HOME_FREE: 3
r->value |= REG_0x02_MTRREV;
}
- gl841_send_slope_table(dev, 3, fast_table.table, 256);
+ gl841_send_slope_table(dev, 3, fast_table.table, 255);
r = sanei_genesys_get_address(reg, 0x67);
r->value = 0x3f;

View File

@ -14,7 +14,7 @@
Summary: Scanner access software Summary: Scanner access software
Name: sane-backends Name: sane-backends
Version: 1.0.29 Version: 1.0.29
Release: 4%{?dist} Release: 5%{?dist}
# lib/ is LGPLv2+, backends are GPLv2+ with exceptions # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
# Tools are GPLv2+, docs are public domain # Tools are GPLv2+, docs are public domain
# see LICENSE for details # see LICENSE for details
@ -39,6 +39,7 @@ Patch3: sane-backends-saned-manpage.patch
# undeclared variable on s390x, from upstream # undeclared variable on s390x, from upstream
# https://gitlab.com/sane-project/backends/-/merge_requests/329 # https://gitlab.com/sane-project/backends/-/merge_requests/329
Patch4: sane-genesys-s390x-ftbfs.patch Patch4: sane-genesys-s390x-ftbfs.patch
Patch5: genesys-slope-assert.patch
URL: http://www.sane-project.org URL: http://www.sane-project.org
@ -155,6 +156,7 @@ access image acquisition devices available on the local host.
%patch2 -p1 -b .sane-config-multilib %patch2 -p1 -b .sane-config-multilib
%patch3 -p1 -b .saned-manpage %patch3 -p1 -b .saned-manpage
%patch4 -p1 -b .genesys-s390x-ftbfs %patch4 -p1 -b .genesys-s390x-ftbfs
%patch5 -p1 -b .genesys-slope-assert
%build %build
CFLAGS="%optflags -fno-strict-aliasing" CFLAGS="%optflags -fno-strict-aliasing"
@ -422,6 +424,9 @@ exit 0
%{_unitdir}/saned@.service %{_unitdir}/saned@.service
%changelog %changelog
* Mon Mar 23 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1.0.29-5
- 1807751 - [abrt] sane-backends: std::__replacement_assert(): scanimage killed by SIGABRT
* Mon Feb 10 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1.0.29-4 * Mon Feb 10 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1.0.29-4
- really fix it... - really fix it...