diff --git a/recipes-musicians/rncbc/files/0001-old-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch b/recipes-musicians/rncbc/files/0001-old-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch new file mode 100644 index 0000000..6b526ef --- /dev/null +++ b/recipes-musicians/rncbc/files/0001-old-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch @@ -0,0 +1,105 @@ +From 42fa0e7e4ce43def9c34af83bfff22950f00b711 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 24 Nov 2018 16:30:08 +0100 +Subject: [PATCH] find native qt build tools by configure options - auto + detection does not work +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [cross specific] + +Signed-off-by: Andreas Müller +--- + configure.ac | 43 +++++++++++++++---------------------------- + 1 file changed, 15 insertions(+), 28 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f791a1d..1d46860 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -236,23 +236,9 @@ done + # A common error message: + ac_errmsg="not found in current PATH. Maybe QT development environment isn't available." + +-# Check for proper qmake path/version alternatives. +-AC_PATH_TOOL(ac_qmake, qmake, [no], $ac_path) +-if test "x$ac_qmake" = "xno"; then +- AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path) +- ac_qmake=$ac_cv_qmake +-fi +- +-# Check for proper Qt major version. +-AC_CACHE_CHECK([for Qt major version], [ac_cv_qt_version_major], [ +- ac_cv_qt_version_major=$($ac_qmake -query QT_VERSION | cut -d'.' -f1) +- ac_cv_qt_version_major=$(($ac_cv_qt_version_major + 0)) +-]) +-ac_qt_version_major=$ac_cv_qt_version_major +-if test $ac_qt_version_major -ne 5; then +- AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path) +- ac_qmake=$ac_cv_qmake +-fi ++AC_ARG_WITH(qmake, ++ AC_HELP_STRING([--with-qmake=PATH], [use alternate qmake path]), ++ [ac_qmake="$withval"], [ac_qmake="no"]) + + if test "x$ac_qmake" = "xno"; then + AC_MSG_ERROR([qmake-qt5 $ac_errmsg (qt5-devel)]) +@@ -267,13 +253,6 @@ if test -d $ac_qt_install_path; then + ac_path="$ac_qt_install_path:$ac_path" + fi + +-# Check it again, now with updated PATH, just in case... +-AC_PATH_TOOL(ac_cv_qmake, qmake, [no], $ac_path) +-ac_qmake=$ac_cv_qmake +-if test "x$ac_qmake" = "xno"; then +- AC_MSG_ERROR([qmake $ac_errmsg]) +-fi +- + AC_SUBST(ac_qmake) + + AC_CACHE_CHECK([for Qt install headers], [ac_cv_qt_install_headers], [ +@@ -309,28 +288,36 @@ AC_CACHE_CHECK([for Qt library version >= 5.1], + ]) + + # Check for Qt moc utility. +-AC_PATH_TOOL(ac_moc, moc, [no], $ac_path) ++AC_ARG_WITH(moc, ++ AC_HELP_STRING([--with-moc=PATH], [use alternate moc path]), ++ [ac_moc="$withval"], [ac_moc="no"]) + if test "x$ac_moc" = "xno"; then + AC_MSG_ERROR([moc $ac_errmsg]) + fi + AC_SUBST(ac_moc) + + # Check for Qt uic utility. +-AC_PATH_TOOL(ac_uic, uic, [no], $ac_path) ++AC_ARG_WITH(uic, ++ AC_HELP_STRING([--with-uic=PATH], [use alternate uic path]), ++ [ac_uic="$withval"], [ac_uic="no"]) + if test "x$ac_uic" = "xno"; then + AC_MSG_ERROR([uic $ac_errmsg]) + fi + AC_SUBST(ac_uic) + + # Check for Qt lupdate utility. +-AC_PATH_TOOL(ac_lupdate, lupdate, [no], $ac_path) ++AC_ARG_WITH(lupdate, ++ AC_HELP_STRING([--with-lupdate=PATH], [use alternate lupdate path]), ++ [ac_lupdate="$withval"], [ac_lupdate="no"]) + if test "x$ac_lupdate" = "xno"; then + AC_MSG_ERROR([lupdate $ac_errmsg]) + fi + AC_SUBST(ac_lupdate) + + # Check for Qt lrelease utility. +-AC_PATH_TOOL(ac_lrelease, lrelease, [no], $ac_path) ++AC_ARG_WITH(lrelease, ++ AC_HELP_STRING([--with-lrelease=PATH], [use alternate lrelease path]), ++ [ac_lrelease="$withval"], [ac_lrelease="no"]) + if test "x$ac_release" = "xno"; then + AC_MSG_ERROR([lrelease $ac_errmsg]) + fi +-- +2.14.5 + diff --git a/recipes-musicians/rncbc/qjackctl.bb b/recipes-musicians/rncbc/qjackctl.bb index 695cac0..4bf5a72 100644 --- a/recipes-musicians/rncbc/qjackctl.bb +++ b/recipes-musicians/rncbc/qjackctl.bb @@ -17,7 +17,7 @@ inherit qmake5_base autotools-brokensep gtk-icon-cache qt5-translation SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ - file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \ + file://0001-old-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \ file://QjackCtl.conf \ " SRC_URI[md5sum] = "963dc4d1da21b10018a520f487290047" diff --git a/recipes-musicians/rncbc/qmidictl.bb b/recipes-musicians/rncbc/qmidictl.bb index 73608ad..5fb064a 100644 --- a/recipes-musicians/rncbc/qmidictl.bb +++ b/recipes-musicians/rncbc/qmidictl.bb @@ -14,7 +14,7 @@ inherit qmake5_base autotools-brokensep gtk-icon-cache qt5-translation SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ - file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \ + file://0001-old-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \ " SRC_URI[md5sum] = "3b14754de8024bbd6b90deefeae6db85" SRC_URI[sha256sum] = "532babf7f3bc8b60579b53e61e710b6e9f442c87aa470ded56cd74be85a84963" diff --git a/recipes-musicians/rncbc/qsynth.bb b/recipes-musicians/rncbc/qsynth.bb index a2aa8bb..4106b4e 100644 --- a/recipes-musicians/rncbc/qsynth.bb +++ b/recipes-musicians/rncbc/qsynth.bb @@ -17,7 +17,7 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ - file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \ + file://0001-old-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \ " SRC_URI[md5sum] = "6fe95a27a9eab56680330cc93393c03d" SRC_URI[sha256sum] = "a6eb404778fad87bb37fa1fb4caf1d80f24a324f9c3a22b669df2f8c94849040" diff --git a/recipes-musicians/rncbc/qtractor.bb b/recipes-musicians/rncbc/qtractor.bb index e83e1de..4bee82a 100644 --- a/recipes-musicians/rncbc/qtractor.bb +++ b/recipes-musicians/rncbc/qtractor.bb @@ -19,7 +19,7 @@ inherit qmake5_base autotools-brokensep pkgconfig gtk-icon-cache mime qt5-transl SRC_URI = " \ git://github.com/rncbc//qtractor.git;branch=midiimportx \ - file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \ + file://0001-old-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \ \ file://0001-do-nor-try-run-for-float-sse-detection.patch \ file://0002-do-nor-try-run-for-suil-libs-detection.patch \