Control: tags -1 patch

The explanation seems to be that 0125-multiarch_dll_search_path.patch was disabled instead of refreshed.

https://jff.email/cgit/sane-backends.git/commit/?id=7380432d

I think the patch is still needed and that the attached debdiff would fix it.

--
Rgds,
Gunnar Hjalmarsson
diff -ru 
backends-1.0.32.orig/debian/patches/0125-multiarch_dll_search_path.patch 
backends-1.0.32/debian/patches/0125-multiarch_dll_search_path.patch
--- backends-1.0.32.orig/debian/patches/0125-multiarch_dll_search_path.patch    
2020-09-10 19:11:29.000000000 +0200
+++ backends-1.0.32/debian/patches/0125-multiarch_dll_search_path.patch 
2021-12-28 01:39:12.760295342 +0100
@@ -7,7 +7,7 @@
 ===================================================================
 --- 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 @@
        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);
      }
diff -ru backends-1.0.32.orig/debian/patches/series 
backends-1.0.32/debian/patches/series
--- backends-1.0.32.orig/debian/patches/series  2021-07-13 09:06:52.000000000 
+0200
+++ backends-1.0.32/debian/patches/series       2021-12-28 01:39:34.300238264 
+0100
@@ -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

Reply via email to