commit: 0e8f0e428682a108ef9286fcc6719429036d27a6 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Aug 1 06:50:53 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Aug 1 18:27:37 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e8f0e42
media-libs/libmediaart: fix qt5 build with non-bash shell Removes bashisms from configure.*. Signed-off-by: Sam James <sam <AT> gentoo.org> ...libmediaart-1.9.4-drop-bashisms-configure.patch | 38 ++++++++++++++++++++++ media-libs/libmediaart/libmediaart-1.9.4.ebuild | 1 + 2 files changed, 39 insertions(+) diff --git a/media-libs/libmediaart/files/libmediaart-1.9.4-drop-bashisms-configure.patch b/media-libs/libmediaart/files/libmediaart-1.9.4-drop-bashisms-configure.patch new file mode 100644 index 00000000000..8d65e7cd5c9 --- /dev/null +++ b/media-libs/libmediaart/files/libmediaart-1.9.4-drop-bashisms-configure.patch @@ -0,0 +1,38 @@ +From a193e48dd01ad3aef9dd998c1247f649719f0a80 Mon Sep 17 00:00:00 2001 +From: Sam James <s...@gentoo.org> +Date: Sun, 1 Aug 2021 07:48:51 +0100 +Subject: [PATCH] Drop bashisms from configure.ac + +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9ae1292..106ea57 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -218,18 +218,18 @@ selected_for_media_art="no (disabled)" + # Choose between backends (GdkPixbuf/Qt/etc) + ################################################################## + +-if test "x$enable_qt" == "xyes" && test "x$enable_gdkpixbuf" == "xyes"; then ++if test "x$enable_qt" = "xyes" && test "x$enable_gdkpixbuf" = "xyes"; then + AC_MSG_ERROR([Can not enable both Qt and GdkPixbuf backends, please pick one]) + fi + + if test "x$enable_qt" != "xno" && test "x$enable_gdkpixbuf" != "xyes"; then +- if test "x$with_qt_version" == "xauto" || test "x$with_qt_version" == "x5"; then ++ if test "x$with_qt_version" = "xauto" || test "x$with_qt_version" = "x5"; then + PKG_CHECK_MODULES(QT5, + [Qt5Gui >= $QT5_REQUIRED], + [have_qt5=yes], + [have_qt5=no]) + fi +- if test "x$with_qt_version" == "xauto" || test "x$with_qt_version" == "x4"; then ++ if test "x$with_qt_version" = "xauto" || test "x$with_qt_version" = "x4"; then + PKG_CHECK_MODULES(QT4, + [QtGui >= $QT4_REQUIRED], + [have_qt4=yes], +-- +2.32.0 + diff --git a/media-libs/libmediaart/libmediaart-1.9.4.ebuild b/media-libs/libmediaart/libmediaart-1.9.4.ebuild index 31eaf816245..34189436fe6 100644 --- a/media-libs/libmediaart/libmediaart-1.9.4.ebuild +++ b/media-libs/libmediaart/libmediaart-1.9.4.ebuild @@ -47,6 +47,7 @@ src_prepare() { mv html/libmediaart{,-${SLOT}}.devhelp2 || die cd "${S}" || die + eapply "${FILESDIR}"/${PN}-1.9.4-drop-bashisms-configure.patch eautoreconf use vala && vala_src_prepare