diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2022-02-07 06:56:10 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2022-02-07 06:56:10 +0100 |
| commit | 43f33c72804e63306580755049c09d5a81ad83e3 (patch) | |
| tree | 805caeb00a832ed96a331907987d4e6a2056a391 /debian/patches/0125-multiarch_dll_search_path.patch | |
| parent | 0f86c5490ea7c2218a4394bf4c21bf3f9267a47c (diff) | |
| parent | 6427d36e269d8c14e6bc55373102a4ebc971ca38 (diff) | |
Merge branch 'release/debian/1.1.1-1'debian/1.1.1-1
Diffstat (limited to 'debian/patches/0125-multiarch_dll_search_path.patch')
| -rw-r--r-- | debian/patches/0125-multiarch_dll_search_path.patch | 11 |
1 files changed, 5 insertions, 6 deletions
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. |