diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/0045-disable_lock_test_at_build_time.patch~ | 27 | ||||
| -rw-r--r-- | debian/patches/0060-cross.patch~ | 45 |
2 files changed, 0 insertions, 72 deletions
diff --git a/debian/patches/0045-disable_lock_test_at_build_time.patch~ b/debian/patches/0045-disable_lock_test_at_build_time.patch~ deleted file mode 100644 index e5f82f3..0000000 --- a/debian/patches/0045-disable_lock_test_at_build_time.patch~ +++ /dev/null @@ -1,27 +0,0 @@ -Description: Disable lock test at buildtime -Author: Jörg Frings-Fürst <debian@jff.emaill> -Forwarded: not-needed -Last-Update: 2020-08-28 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/acinclude.m4 -=================================================================== ---- trunk.orig/acinclude.m4 -+++ trunk/acinclude.m4 -@@ -359,11 +359,11 @@ AC_DEFUN([SANE_CHECK_LOCKING], - touch sanetest.file - chgrp $LOCKPATH_GROUP sanetest.file 2>/dev/null || lasterror=$? - rm -f sanetest.file -- if test ! -z "$lasterror"; then -- AC_MSG_WARN([Group $LOCKPATH_GROUP does not exist on this system.]) -- AC_MSG_WARN([Locking feature will be disabled.]) -- use_locking=no -- fi -+# if test ! -z "$lasterror"; then -+# AC_MSG_WARN([Group $LOCKPATH_GROUP does not exist on this system.]) -+# AC_MSG_WARN([Locking feature will be disabled.]) -+# use_locking=no -+# fi - fi - if test $use_locking = yes ; then - INSTALL_LOCKPATH=install-lockpath diff --git a/debian/patches/0060-cross.patch~ b/debian/patches/0060-cross.patch~ deleted file mode 100644 index e3a24f8..0000000 --- a/debian/patches/0060-cross.patch~ +++ /dev/null @@ -1,45 +0,0 @@ ---- sane-backends-1.0.27.orig/acinclude.m4 -+++ sane-backends-1.0.27/acinclude.m4 -@@ -439,15 +439,19 @@ AC_DEFUN([SANE_CHECK_GPHOTO2], - # a program. And, if that works, then add the -l flags to - # GPHOTO2_LIBS and any other flags to GPHOTO2_LDFLAGS to pass to - # sane-config. -- if test "$with_gphoto2" != "no" ; then -- AC_CHECK_TOOL(HAVE_GPHOTO2, pkg-config, false) -+ AS_IF([test "$with_gphoto2" != "no"],[ -+ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -+ if test "x$PKG_CONFIG" = x; then -+ HAVE_GPHOTO2=false -+ else -+ HAVE_GPHOTO2=$PKG_CONFIG -+ fi - - if test ${HAVE_GPHOTO2} != "false" ; then -- if pkg-config --exists libgphoto2 ; then -- with_gphoto2="`pkg-config --modversion libgphoto2`" -- GPHOTO2_CPPFLAGS="`pkg-config --cflags libgphoto2`" -- GPHOTO2_LIBS="`pkg-config --libs libgphoto2`" -- -+ if $PKG_CONFIG --exists libgphoto2 ; then -+ with_gphoto2="`$PKG_CONFIG --modversion libgphoto2`" -+ GPHOTO2_CPPFLAGS="`$PKG_CONFIG --cflags libgphoto2`" -+ GPHOTO2_LIBS="`$PKG_CONFIG --libs libgphoto2`" - saved_CPPFLAGS="${CPPFLAGS}" - CPPFLAGS="${GPHOTO2_CPPFLAGS}" - saved_LIBS="${LIBS}" -@@ -431,13 +436,13 @@ - GPHOTO2_LIBS="" - else - SANE_EXTRACT_LDFLAGS(GPHOTO2_LIBS, GPHOTO2_LDFLAGS) -- if pkg-config --atleast-version=2.5.0 libgphoto2; then -+ if $PKG_CONFIG --atleast-version=2.5.0 libgphoto2; then - AC_DEFINE([GPLOGFUNC_NO_VARGS], [1], - [Define if GPLogFunc does not take a va_list.]) - fi - fi - fi -- fi -+ ]) - AC_SUBST(GPHOTO2_CPPFLAGS) - AC_SUBST(GPHOTO2_LIBS) - AC_SUBST(GPHOTO2_LDFLAGS) |