From a1fa1c1df1b370c666f64c6134ddc8557dc1d008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 17 Dec 2020 22:41:10 +0100 Subject: [PATCH] qsynth: upgrade 0.6.3 -> 0.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...uild-tools-by-configure-options-auto.patch | 107 ------------------ recipes-musicians/rncbc/qsynth.bb | 6 +- 2 files changed, 3 insertions(+), 110 deletions(-) delete mode 100644 recipes-musicians/rncbc/files/0001-find-native-qt-build-tools-by-configure-options-auto.patch diff --git a/recipes-musicians/rncbc/files/0001-find-native-qt-build-tools-by-configure-options-auto.patch b/recipes-musicians/rncbc/files/0001-find-native-qt-build-tools-by-configure-options-auto.patch deleted file mode 100644 index 09cf3bf..0000000 --- a/recipes-musicians/rncbc/files/0001-find-native-qt-build-tools-by-configure-options-auto.patch +++ /dev/null @@ -1,107 +0,0 @@ -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 866416a..9709b7a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -277,23 +277,9 @@ if test -x $ac_qtchooser; then - export QT_SELECT=5 - fi - --# 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 -lt 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)]) -@@ -308,13 +294,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], [ -@@ -350,14 +329,18 @@ 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 -@@ -365,7 +348,9 @@ 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_PATH_TOOL(ac_cv_lupdate, lupdate-qt5, [no], $ac_path) - if test "x$ac_cv_lupdate" = "xno"; then -@@ -377,7 +362,9 @@ 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_lrelease" = "xno"; then - AC_PATH_TOOL(ac_cv_lrelease, lrelease-qt5, [no], $ac_path) - if test "x$ac_cv_lrelease" = "xno"; then --- -2.21.3 - diff --git a/recipes-musicians/rncbc/qsynth.bb b/recipes-musicians/rncbc/qsynth.bb index fac3a2a..5379fcd 100644 --- a/recipes-musicians/rncbc/qsynth.bb +++ b/recipes-musicians/rncbc/qsynth.bb @@ -17,10 +17,10 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ - file://0001-find-native-qt-build-tools-by-configure-options-auto.patch \ + file://0001-find-native-qt-build-tools-by-configure-options-auto-qt6.patch \ " -SRC_URI[sha256sum] = "1b5733d35b4b24679d59812cf9a5f3152ac0c78046ba1db71870cb7effad3876" -PV = "0.6.3" +SRC_URI[sha256sum] = "72ab545c39b7ca518be3dfaaee61c8ce88b20d4c34dff946898a8ca7d8e85ae4" +PV = "0.9.0" EXTRA_OECONF = " \ --with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \