All rncbc recipes: cleanup patches

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>

recipes-musicians/rncbc/drumkv1.bb

@@ -17,7 +17,7 @@ inherit qmake5_base autotools-brokensep pkgconfig gtk-icon-cache mime
 SRC_URI = " \
     ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
     git://github.com/TuriSc/hydrogen2drumkv1.py.git;name=hydrogen2drumkv1;destsuffix=hydrogen2drumkv1 \
-    file://0002-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
+    file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
     file://0002-Remove-extra-rpath.patch \
 "
 PV = "0.9.10"

recipes-musicians/rncbc/files/0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch

@@ -15,10 +15,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  1 file changed, 15 insertions(+), 28 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index f791a1d..1d46860 100644
+index a6156ef..f99502d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -265,23 +265,9 @@ if test -x $ac_qtchooser; then
+@@ -266,23 +266,9 @@ if test -x $ac_qtchooser; then
     export QT_SELECT=5
  fi
  
@@ -45,7 +45,7 @@ index f791a1d..1d46860 100644
  
  if test "x$ac_qmake" = "xno"; then
     AC_MSG_ERROR([qmake-qt5 $ac_errmsg (qt5-devel)])
-@@ -296,13 +282,6 @@ if test -d $ac_qt_install_path; then
+@@ -297,13 +283,6 @@ if test -d $ac_qt_install_path; then
     ac_path="$ac_qt_install_path:$ac_path"
  fi
  
@@ -59,7 +59,7 @@ index f791a1d..1d46860 100644
  AC_SUBST(ac_qmake)
  
  AC_CACHE_CHECK([for Qt install headers], [ac_cv_qt_install_headers], [
-@@ -338,28 +317,36 @@ AC_CACHE_CHECK([for Qt library version >= 5.1],
+@@ -339,14 +318,18 @@ AC_CACHE_CHECK([for Qt library version >= 5.1],
  ])
  
  # Check for Qt moc utility.
@@ -80,7 +80,8 @@ index f791a1d..1d46860 100644
  if test "x$ac_uic" = "xno"; then
     AC_MSG_ERROR([uic $ac_errmsg])
  fi
- AC_SUBST(ac_uic)
+@@ -354,7 +337,9 @@ AC_SUBST(ac_uic)
+ 
  
  # Check for Qt lupdate utility.
 -AC_PATH_TOOL(ac_lupdate, lupdate, [no], $ac_path)
@@ -88,8 +89,9 @@ index f791a1d..1d46860 100644
 +  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])
+    AC_PATH_TOOL(ac_cv_lupdate, lupdate-qt5, [no], $ac_path)
- fi
+    if test "x$ac_cv_lupdate" = "xno"; then
+@@ -366,7 +351,9 @@ fi
  AC_SUBST(ac_lupdate)
  
  # Check for Qt lrelease utility.
@@ -97,9 +99,9 @@ index f791a1d..1d46860 100644
 +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
+ if test "x$ac_lrelease" = "xno"; then
-    AC_MSG_ERROR([lrelease $ac_errmsg])
+    AC_PATH_TOOL(ac_cv_lrelease, lrelease-qt5, [no], $ac_path)
- fi
+    if test "x$ac_cv_lrelease" = "xno"; then
 -- 
-2.14.5
+2.21.0
 

recipes-musicians/rncbc/files/0002-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch

@@ -1,107 +0,0 @@
-From 42fa0e7e4ce43def9c34af83bfff22950f00b711 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-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 <schnitzeltony@gmail.com>
----
- configure.ac | 43 +++++++++++++++----------------------------
- 1 file changed, 15 insertions(+), 28 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a6156ef..f99502d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -266,23 +266,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 -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)])
-@@ -297,13 +283,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], [
-@@ -339,14 +318,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
-@@ -354,7 +337,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
-@@ -366,7 +351,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.0
-

recipes-musicians/rncbc/padthv1.bb

@@ -20,7 +20,7 @@ FFTWSINGLEPATCH = "${@bb.utils.contains('TUNE_FEATURES', 'neon', 'file://0001-Bu
 SRC_URI = " \
     ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
     http://linuxsynths.com/Padthv1PatchesDemos/Padthv1Patches.tar.gz;name=linuxsynths-padthv1-presets;subdir=linuxsynths-padthv1-presets \
-    file://0002-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
+    file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
     file://0002-Remove-extra-rpath.patch \
     \
     ${FFTWSINGLEPATCH} \

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://0002-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
+    file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
     file://QjackCtl.conf \
 "
 SRC_URI[md5sum] = "96f9547d61bf963704df988a5074bda0"

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://0002-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
+    file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
 "
 SRC_URI[md5sum] = "6ca36714245a0f60aa9d5198795e1bd8"
 SRC_URI[sha256sum] = "6b79f55dc47217af77012e94ab44ca93786d04ee70bdccc13f09e64a0409f89c"

recipes-musicians/rncbc/qmidinet.bb

@@ -15,7 +15,7 @@ inherit qmake5_base autotools-brokensep gtk-icon-cache qt5-translation
 
 SRC_URI = " \
     ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
-    file://0002-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
+    file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
 "
 SRC_URI[md5sum] = "af0c84228de51cd7695fd3526b6463c4"
 SRC_URI[sha256sum] = "166c5634cf8aee55c5688f6f1012adc1a19f157eefbb50b330a26786d4980f1e"

recipes-musicians/rncbc/qsampler.bb

@@ -16,7 +16,7 @@ inherit qmake5_base autotools-brokensep gtk-icon-cache qt5-translation mime
 
 SRC_URI = " \
     ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
-    file://0002-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
+    file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
 "
 SRC_URI[md5sum] = "5546e605a9a4b00eab98108298d26fbe"
 SRC_URI[sha256sum] = "03f2d4e1a19f0aeb520841b5c3e0c464d9ed68409837fbb4d976c3639a9730cf"

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://0002-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
+    file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
 "
 SRC_URI[md5sum] = "69820bc7af1a74deffe2039a5ea9adb6"
 SRC_URI[sha256sum] = "322a0097b6a74e8ebaf590f76b6acda4489d9ee7c612b97bffbac4e5b1047b9c"

recipes-musicians/rncbc/qtractor.bb

@@ -20,7 +20,7 @@ inherit qmake5_base autotools-brokensep pkgconfig gtk-icon-cache mime qt5-transl
 
 SRC_URI = " \
     git://github.com/rncbc//qtractor.git;branch=midiimportx \
-    file://0002-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
+    file://0001-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 \

recipes-musicians/rncbc/samplv1.bb

@@ -15,7 +15,7 @@ inherit qmake5_base autotools-brokensep pkgconfig gtk-icon-cache mime
 
 SRC_URI = " \
     ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
-    file://0002-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
+    file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
     file://0002-Remove-extra-rpath.patch \
 "
 PV = "0.9.10"

recipes-musicians/rncbc/synthv1.bb

@@ -17,7 +17,7 @@ SRC_URI = " \
     ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
     ${SOURCEFORGE_MIRROR}/project/autostatic/autostatic-synthv1-presets/autostatic-synthv1-presets1.tar.gz;name=autostatic-synthv1-presets1 \
     http://linuxsynths.com/Synthv1PatchesDemos/Synthv1Patches06.tar.gz;name=linuxsynths-synthv1-presets;subdir=linuxsynths-synthv1-presets \
-    file://0002-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
+    file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
     file://0002-Remove-extra-rpath.patch \
     \
     file://synthv1.conf \