summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/0125-multiarch_dll_search_path.patch11
-rw-r--r--debian/patches/series2
3 files changed, 8 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 671efd9..9c593af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ sane-backends (1.1.1-1) UNRELEASED; urgency=medium
- Add home dir for user/group saned (Closes: #995732).
* debian/sane-utils.postrm:
- Use --remove-home instead --remove-all-files (Closes: #1001960).
+ * Reactivate debian/patches/0125-multiarch_dll_search_path.patch
+ (Closes: #1002704).
-- Jörg Frings-Fürst <debian@jff.email> Tue, 05 Oct 2021 11:56:18 +0200
diff --git a/debian/patches/0125-multiarch_dll_search_path.patch b/debian/patches/0125-multiarch_dll_search_path.patch
index 25726c7..67b9484 100644
--- a/debian/patches/0125-multiarch_dll_search_path.patch
+++ b/debian/patches/0125-multiarch_dll_search_path.patch
@@ -7,7 +7,7 @@ Index: trunk/backend/dll.c
===================================================================
--- trunk.orig/backend/dll.c
+++ trunk/backend/dll.c
-@@ -470,7 +470,7 @@ load (struct backend *be)
+@@ -468,18 +468,18 @@ load (struct backend *be)
if (path)
{
@@ -16,10 +16,9 @@ Index: trunk/backend/dll.c
src = malloc (src_len);
if (!src)
{
-@@ -480,11 +480,11 @@ load (struct backend *be)
- if (orig_src)
- free (orig_src);
- orig_src = src;
+ DBG (1, "load: malloc failed: %s\n", strerror (errno));
+ return SANE_STATUS_NO_MEM;
+ }
- snprintf (src, src_len, "%s%s%s", path, DIR_SEP, LIBDIR);
+ snprintf (src, src_len, "%s%s%s", path, DIR_SEP, DEB_DLL_LIBDIR);
}
@@ -34,7 +33,7 @@ Index: trunk/backend/Makefile.am
===================================================================
--- trunk.orig/backend/Makefile.am
+++ trunk/backend/Makefile.am
-@@ -4,7 +4,7 @@
+@@ -5,7 +5,7 @@
## This file is part of the "Sane" build infra-structure. See
## included LICENSE file for license information.
diff --git a/debian/patches/series b/debian/patches/series
index 8cdd39e..a1dd4c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,7 @@
0035-trim-libraries-in-sane-backends.pc.in.patch
0040-remove_git.patch
0100-source_spelling.patch
-#0125-multiarch_dll_search_path.patch
+0125-multiarch_dll_search_path.patch
0175-fix_tests.patch
0140-avahi.patch
0145-avahi.patch