[SCM] qsynth/master: Add patch to fix FTCBFS. (Closes: #886543)

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Sun Jan 7 15:17:03 UTC 2018


The following commit has been merged in the master branch:
commit aecaf15bf2570db3525b4147543d0f7b5303f632
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sun Jan 7 16:06:45 2018 +0100

    Add patch to fix FTCBFS. (Closes: #886543)

diff --git a/debian/patches/5001-cross.patch b/debian/patches/5001-cross.patch
new file mode 100644
index 0000000..ff2565f
--- /dev/null
+++ b/debian/patches/5001-cross.patch
@@ -0,0 +1,24 @@
+Description: Fix FTCBFS: uses the build architecture qmake
+Author: Helmut Grohne <helmut at subdivi.de>
+Forwarded: Rui Nuno Capela <rncbc at rncbc.org>
+
+Index: qsynth/configure.ac
+===================================================================
+--- qsynth.orig/configure.ac
++++ qsynth/configure.ac
+@@ -202,12 +202,12 @@ done
+ ac_errmsg="not found in current PATH. Maybe QT development environment isn't available."
+ 
+ if test "x$ac_qt4" = "xyes"; then
+-   AC_PATH_PROG(ac_qmake, qmake-qt4, [no], $ac_path)
++   AC_PATH_TOOL(ac_qmake, qmake-qt4, [no], $ac_path)
+ else
+-   AC_PATH_PROG(ac_qmake, qmake-qt5, [no], $ac_path)
++   AC_PATH_TOOL(ac_qmake, qmake-qt5, [no], $ac_path)
+ fi
+ if test "x$ac_qmake" = "xno"; then
+-   AC_PATH_PROG(ac_cv_qmake, qmake, [no], $ac_path)
++   AC_PATH_TOOL(ac_cv_qmake, qmake, [no], $ac_path)
+    ac_qmake=$ac_cv_qmake
+ fi
+ if test "x$ac_qmake" = "xno"; then
diff --git a/debian/patches/series b/debian/patches/series
index 214e6af..48766a2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 1001-soundfont_default_dir.patch
 3001-hardening.patch
+5001-cross.patch

-- 
qsynth packaging



More information about the pkg-multimedia-commits mailing list