summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-08-01 07:50:53 +0100
committerSam James <sam@gentoo.org>2021-08-01 19:27:37 +0100
commit0e8f0e428682a108ef9286fcc6719429036d27a6 (patch)
treed0ce8dfee70f66c8946e50649467e0069aaeff6c /media-libs
parentgames-strategy/freeciv: drop obsolete qt5 C++11 workaround (diff)
downloadgentoo-0e8f0e428682a108ef9286fcc6719429036d27a6.tar.gz
gentoo-0e8f0e428682a108ef9286fcc6719429036d27a6.tar.bz2
gentoo-0e8f0e428682a108ef9286fcc6719429036d27a6.zip
media-libs/libmediaart: fix qt5 build with non-bash shell
Removes bashisms from configure.*. Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/libmediaart/files/libmediaart-1.9.4-drop-bashisms-configure.patch38
-rw-r--r--media-libs/libmediaart/libmediaart-1.9.4.ebuild1
2 files changed, 39 insertions, 0 deletions
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 000000000000..8d65e7cd5c9f
--- /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 <sam@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 31eaf8162456..34189436fe67 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