Merge branch 'release/debian/1.0.32-1'debian/1.0.32-1

4 files changed, 158 insertions, 0 deletions

diff --git a/patches/Rules-quot.patch b/patches/Rules-quot.patch
new file mode 100644
index 0000000..973ed86
--- /dev/null
+++ b/patches/Rules-quot.patch
@@ -0,0 +1,27 @@
+Author: Olaf Meeuwissen
+
+  Add custom options to commands used for generate .po files.  This
+  fixes word wrapping inconsistencies when using a custom width.
+
+  Do NOT put this file below po/ as all Rules-* files are included
+  in the po/Makefile *verbatim*!
+
+--- po/Rules-quot.orig	2019-06-30 13:46:34.281392263 +0900
++++ po/Rules-quot	2019-06-30 13:49:05.482142027 +0900
+@@ -22,13 +22,13 @@
+ 	LC_ALL=C; export LC_ALL; \
+ 	cd $(srcdir); \
+ 	if $(MSGINIT) $(MSGINIT_OPTIONS) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \
+-	   | $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | \
++	   | $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) $(MSGCONV_OPTIONS) -t UTF-8 | \
+ 	   { case `$(MSGFILTER) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+ 	     '' | 0.[0-9] | 0.[0-9].* | 0.1[0-8] | 0.1[0-8].*) \
+-	       $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed \
++	       $(MSGFILTER) $(MSGFILTER_OPTIONS) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed \
+ 	       ;; \
+ 	     *) \
+-	       $(MSGFILTER) `echo $$lang | sed -e 's/.*@//'` \
++	       $(MSGFILTER) $(MSGFILTER_OPTIONS) `echo $$lang | sed -e 's/.*@//'` \
+ 	       ;; \
+ 	     esac } 2>/dev/null > $$tmpdir/$$lang.new.po \
+ 	     ; then \
diff --git a/patches/ax_create_stdint_h.19-20.m4.patch b/patches/ax_create_stdint_h.19-20.m4.patch
new file mode 100644
index 0000000..ef54329
--- /dev/null
+++ b/patches/ax_create_stdint_h.19-20.m4.patch
@@ -0,0 +1,52 @@
+From: Guido Draheim <guidod@gmx.de>
+Date: Sat, 21 Jul 2018 10:31:26 +0000 (+0200)
+Subject: all-permissive for macros from Guido Draheim (only author)
+X-Git-Tag: v2019.01.06~19^2~22
+X-Git-Url: https://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=commitdiff_plain;h=817d63c5660776f8504381e769bf8aa4235571e4
+
+all-permissive for macros from Guido Draheim (only author)
+---
+
+diff --git a/m4/ax_create_stdint_h.m4 b/m4/ax_create_stdint_h.m4
+index 440069b..8fccde1 100644
+--- a/m4/ax_create_stdint_h.m4
++++ b/m4/ax_create_stdint_h.m4
+@@ -48,33 +48,12 @@
+ #
+ #   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+ #
+-#   This program is free software; you can redistribute it and/or modify it
+-#   under the terms of the GNU General Public License as published by the
+-#   Free Software Foundation; either version 3 of the License, or (at your
+-#   option) any later version.
+-#
+-#   This program is distributed in the hope that it will be useful, but
+-#   WITHOUT ANY WARRANTY; without even the implied warranty of
+-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+-#   Public License for more details.
+-#
+-#   You should have received a copy of the GNU General Public License along
+-#   with this program. If not, see <https://www.gnu.org/licenses/>.
+-#
+-#   As a special exception, the respective Autoconf Macro's copyright owner
+-#   gives unlimited permission to copy, distribute and modify the configure
+-#   scripts that are the output of Autoconf when processing the Macro. You
+-#   need not follow the terms of the GNU General Public License when using
+-#   or distributing such scripts, even though portions of the text of the
+-#   Macro appear in them. The GNU General Public License (GPL) does govern
+-#   all other use of the material that constitutes the Autoconf Macro.
+-#
+-#   This special exception to the GPL applies to versions of the Autoconf
+-#   Macro released by the Autoconf Archive. When you make and distribute a
+-#   modified version of the Autoconf Macro, you may extend this special
+-#   exception to the GPL to apply to your modified version as well.
++#   Copying and distribution of this file, with or without modification, are
++#   permitted in any medium without royalty provided the copyright notice
++#   and this notice are preserved.  This file is offered as-is, without any
++#   warranty.
+ 
+-#serial 19
++#serial 20
+ 
+ AC_DEFUN([AX_CHECK_DATA_MODEL],[
+    AC_CHECK_SIZEOF(char)
diff --git a/patches/ax_create_stdint_h.20-21.m4.patch b/patches/ax_create_stdint_h.20-21.m4.patch
new file mode 100644
index 0000000..eecf110
--- /dev/null
+++ b/patches/ax_create_stdint_h.20-21.m4.patch
@@ -0,0 +1,35 @@
+X-Git-Url: https://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=blobdiff_plain;f=m4%2Fax_create_stdint_h.m4;h=94fbeb404829c232787e27193d6c24b2509a6f24;hp=8fccde1d4121ab374aed30b4c78cf287ce3be7c9;hb=b26684dc2f29222d9581089ea8cfb2fc54319fb4;hpb=68e93457f1d6f73f8e5019e7a0a97851085dc0fa
+
+diff --git a/m4/ax_create_stdint_h.m4 b/m4/ax_create_stdint_h.m4
+index 8fccde1..94fbeb4 100644
+--- a/m4/ax_create_stdint_h.m4
++++ b/m4/ax_create_stdint_h.m4
+@@ -53,7 +53,7 @@
+ #   and this notice are preserved.  This file is offered as-is, without any
+ #   warranty.
+ 
+-#serial 20
++#serial 21
+ 
+ AC_DEFUN([AX_CHECK_DATA_MODEL],[
+    AC_CHECK_SIZEOF(char)
+@@ -152,14 +152,14 @@ AC_CACHE_VAL([ac_cv_header_stdint_t],[
+ old_CXXFLAGS="$CXXFLAGS" ; CXXFLAGS=""
+ old_CPPFLAGS="$CPPFLAGS" ; CPPFLAGS=""
+ old_CFLAGS="$CFLAGS"     ; CFLAGS=""
+-AC_TRY_COMPILE([#include <stdint.h>],[int_least32_t v = 0;],
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[int_least32_t v = 0;]])],
+ [ac_cv_stdint_result="(assuming C99 compatible system)"
+- ac_cv_header_stdint_t="stdint.h"; ],
+-[ac_cv_header_stdint_t=""])
++ ac_cv_header_stdint_t="stdint.h";],
++ [ac_cv_header_stdint_t=""])
+ if test "$GCC" = "yes" && test ".$ac_cv_header_stdint_t" = "."; then
+ CFLAGS="-std=c99"
+-AC_TRY_COMPILE([#include <stdint.h>],[int_least32_t v = 0;],
+-[AC_MSG_WARN(your GCC compiler has a defunct stdint.h for its default-mode)])
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[int_least32_t v = 0;]])],
++[AC_MSG_WARN(your GCC compiler has a defunct stdint.h for its default-mode)], [])
+ fi
+ CXXFLAGS="$old_CXXFLAGS"
+ CPPFLAGS="$old_CPPFLAGS"
diff --git a/patches/ltmain.sh.patch b/patches/ltmain.sh.patch
new file mode 100644
index 0000000..1187e81
--- /dev/null
+++ b/patches/ltmain.sh.patch
@@ -0,0 +1,44 @@
+Author: Henning Meirer-Geinitz
+
+    Use "libsane" soname for every backend (all systems but AIX and mingw)
+
+diff --git a/ltmain.sh b/ltmain.sh
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -9708,6 +9708,23 @@
+ 	  dlname=$soname
+ 	fi
+ 
++	# If -module or -export-dynamic was specified, set the dlname
++	if test "$module" = yes || test "$export_dynamic" = yes; then
++	  # On all known operating systems, these are identical.
++	  dlname="$soname"
++	fi
++
++	# On sane-backends the internal name for every lib is "libsane"
++	# not "libsane-backendname" so that linking to each backend is possible.
++	case $host in
++	  *mingw*)
++	    ;;
++	  *aix*)
++	    ;;
++	  *)
++	    soname=`echo $soname | sed -e "s/libsane-[A-Za-z_0-9]*/libsane/g"`
++	esac
++
+ 	lib=$output_objdir/$realname
+ 	linknames=
+ 	for link
+@@ -10166,12 +10183,6 @@
+ 	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
+ 	  fi
+ 	done
+-
+-	# If -module or -export-dynamic was specified, set the dlname.
+-	if test yes = "$module" || test yes = "$export_dynamic"; then
+-	  # On all known operating systems, these are identical.
+-	  dlname=$soname
+-	fi
+       fi
+       ;;
+