This is an autogenerated patch header for a single-debian-patch file. The
delta against upstream is either kept as a single patch, or maintained
in some VCS, and exported as a single patch instead of more manageable
atomic patches.

--- djview4-4.12.orig/config/acinclude.m4
+++ djview4-4.12/config/acinclude.m4
@@ -272,7 +272,7 @@ Unsetting them is better than setting th
     path=$QTDIR/bin:$PATH
   fi
   if test -z "$QMAKE" ; then
-    AC_PATH_PROGS([QMAKE], [qmake], [], [$path])
+    AC_PATH_TOOL([QMAKE], [qmake], [], [$path])
   fi
   if test -z "$QMAKE" ; then
     AC_MSG_ERROR([Cannot find the Qt program qmake. 
@@ -327,7 +327,7 @@ If you define QMAKESPEC, make sure it is
     altrcc="rcc-${qtversion}"
     altlupdate="lupdate-${qtversion}"
     altlrelease="lrelease-${qtversion}"
-  else
+  elif test `basename "$QMAKE"` = qmake ; then
     AC_MSG_CHECKING([for real qmake path])
     test -x "$QT_INSTALL_BINS/qmake" && QMAKE="$QT_INSTALL_BINS/qmake"
     AC_MSG_RESULT([$QMAKE])
--- djview4-4.12.orig/mac/make_djview_bundle.sh
+++ djview4-4.12/mac/make_djview_bundle.sh
@@ -79,55 +79,51 @@ run rmdir $bundle/bin || exit
 run ln -s ./MacOS $bundle/bin || exit
 run ln -s ./MacOS $bundle/plugins || exit
 
-# copy needed homebrew libraries
-for lib in $(otool -L $bundle/MacOS/ddjvu | awk '/^\t/{print $1}') ; do
-  case "$lib" in 
-    $BREWDIR/*) 
-        libname=$(basename "$lib")
-        test -r "./$bundle/lib/$libname" || \
-	    run cp "$lib" "./$bundle/lib/$libname" || exit ;;
-  esac
-done
 
 # copy needed qt plugins
 ( cd "$QTDIR" ; \
   ls -1 plugins/{platforms,imageformats,styles,printsupport}/*.dylib | \
-  grep -v libqwebgl.dylib | \
-  grep -v _debug.dylib ) | \
+      grep -v libqwebgl.dylib | \
+      grep -v libqpdf.dylib | \
+      grep -v libqsvg.dylib | \
+      grep -v _debug.dylib ) | \
 while read plugin ; do
   run mkdir -p $bundle/$(dirname "$plugin") || exit
   run cp "$QTDIR/$plugin" $bundle/"$plugin" || exit
 done
 
-
-
-# copy needed libraries  
-for loader in \
-    $bundle/MacOS/djview \
-    $bundle/MacOS/*/*.dylib 
-do 
-  for lib in $(otool -L $loader | awk '/^\t/{print $1}') 
+# copy needed libraries
+function getlibs() {
+  for loader in $*
   do
-    if [ $(basename "$lib") != $(basename "$loader") ]
-    then
-      case "$lib" in 
-      $BREWDIR/*) 
-        libname=$(basename "$lib")
-	test -r "./$bundle/lib/$libname" || \
-	    run cp "$lib" "./$bundle/lib/$libname" || exit ;;
-      @rpath/*)
-        libname=$(basename "$lib")
-        lib="$QTDIR/lib${lib/#@rpath//}"
-	test -r "./$bundle/lib/$libname" || \
-	    run cp "$lib" "./$bundle/lib/$libname" || exit ;;
-      $QTDIR/*)
-        libname=$(basename "$lib")
-	test -r "./$bundle/lib/$libname" || \
-	    run cp "$lib" "./$bundle/lib/$libname" || exit ;;
-      esac
-    fi
+    for lib in $(otool -L $loader | awk '/^\t/{print $1}') 
+    do
+      if [ $(basename "$lib") != $(basename "$loader") ]
+      then
+        case "$lib" in 
+          $BREWDIR/*) 
+              libname=$(basename "$lib")
+	      test -r "./$bundle/lib/$libname" || \
+	          run cp "$lib" "./$bundle/lib/$libname" || exit ;;
+          @rpath/*)
+              libname=$(basename "$lib")
+              lib="$QTDIR/lib${lib/#@rpath//}"
+	      test -r "./$bundle/lib/$libname" || \
+	          run cp "$lib" "./$bundle/lib/$libname" || exit ;;
+          $QTDIR/*)
+              libname=$(basename "$lib")
+	      test -r "./$bundle/lib/$libname" || \
+	          run cp "$lib" "./$bundle/lib/$libname" || exit ;;
+        esac
+      fi
+    done
   done
-done
+}
+getlibs $bundle/MacOS/ddjvu
+getlibs $bundle/MacOS/djview
+getlibs $bundle/MacOS/*/*.dylib 
+getlibs $bundle/lib/Qt*
+getlibs $bundle/lib/*.dylib
 
 # copy translations
 languages=$(ls -1 ../src/*.qm | sed -e 's/^[^_]*_//' -e 's/\.qm$//')
--- djview4-4.12.orig/mac/make_djview_dmg.sh
+++ djview4-4.12/mac/make_djview_dmg.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-dmgname="DjVuLibre-3.5.27+DjView-4.10.6-intel64"
+dmgname="DjVuLibre-3.5.28+DjView-4.12-intel64-3"
 
 cd $(dirname $0)
 if ! test -d DjView.app ; then
--- djview4-4.12.orig/src/qdjviewexporters.cpp
+++ djview4-4.12/src/qdjviewexporters.cpp
@@ -405,9 +405,9 @@ QDjViewDjVuExporter::save(QString fname)
   fromPage = qBound(0, fromPage, pagenum-1);
   QByteArray pagespec;
   if (fromPage == toPage && pagenum > 1)
-    pagespec.append(QString("--pages=%1").arg(fromPage+1));
+    pagespec.append(QString("--pages=%1").arg(fromPage+1).toLocal8Bit());
   else if (fromPage != 0 || toPage != pagenum - 1)
-    pagespec.append(QString("--pages=%1-%2").arg(fromPage+1).arg(toPage+1));
+    pagespec.append(QString("--pages=%1-%2").arg(fromPage+1).arg(toPage+1).toLocal8Bit());
   QByteArray namespec;
   if (indirect)
     namespec = "--indirect=" + fname.toUtf8();
