diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/patches/0125-multiarch_dll_search_path.patch | 45 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 48 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 299b1c7..59f4474 100644 --- a/debian/changelog +++ b/debian/changelog @@ -63,8 +63,9 @@ sane-backends (1.0.29-1~experimental1) experimental; urgency=medium debian/not-installed. * Fix autopkgtest. * Remove unused files and patches. + * Reuse debian/patches/0125-multiarch_dll_search_path.patch (Closes: #931297). - -- Jörg Frings-Fürst <debian@jff.email> Sat, 15 Feb 2020 21:42:48 +0100 + -- Jörg Frings-Fürst <debian@jff.email> Sat, 15 Feb 2020 23:20:13 +0100 sane-backends (1.0.27-3.2) unstable; urgency=medium diff --git a/debian/patches/0125-multiarch_dll_search_path.patch b/debian/patches/0125-multiarch_dll_search_path.patch new file mode 100644 index 0000000..a213060 --- /dev/null +++ b/debian/patches/0125-multiarch_dll_search_path.patch @@ -0,0 +1,45 @@ +Description: Keep /usr/lib/sane as a fallback for SANE backends + Make /usr/lib/arch_triplet/sane the default location for SANE backends, + but keep /usr/lib/sane as a fallback for now. +Author: Julien BLACHE <jblache@debian.org> + +Index: trunk/backend/dll.c +=================================================================== +--- trunk.orig/backend/dll.c ++++ trunk/backend/dll.c +@@ -466,7 +466,7 @@ load (struct backend *be) + + if (path) + { +- src_len = strlen (path) + strlen (DIR_SEP) + strlen(LIBDIR) + 1; ++ src_len = strlen (path) + strlen (DIR_SEP) + strlen(DEB_DLL_LIBDIR) + 1; + src = malloc (src_len); + if (!src) + { +@@ -476,11 +476,11 @@ load (struct backend *be) + if (orig_src) + free (orig_src); + orig_src = src; +- snprintf (src, src_len, "%s%s%s", path, DIR_SEP, LIBDIR); ++ snprintf (src, src_len, "%s%s%s", path, DIR_SEP, DEB_DLL_LIBDIR); + } + else + { +- src = LIBDIR; ++ src = DEB_DLL_LIBDIR; + src = strdup (src); + if (!src) + { +Index: trunk/backend/Makefile.am +=================================================================== +--- trunk.orig/backend/Makefile.am ++++ trunk/backend/Makefile.am +@@ -4,7 +4,7 @@ + ## This file is part of the "Sane" build infra-structure. See + ## included LICENSE file for license information. + +-AM_CPPFLAGS += -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include $(USB_CFLAGS) -DLIBDIR="\"$(libdir)/sane\"" ++AM_CPPFLAGS += -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include $(USB_CFLAGS) -DLIBDIR="\"$(libdir)/sane\"" -DDEB_DLL_LIBDIR="\"$(libdir)/sane:$(prefix)/lib/sane\"" + + AM_LDFLAGS += $(STRICT_LDFLAGS) + # The -rpath option is added because we are creating _LTLIBRARIES based diff --git a/debian/patches/series b/debian/patches/series index 370ae4d..2f5c253 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +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 0140-avahi.patch 0145-avahi.patch 0600-scanimage_manpage.patch |