| 1 |
commit: 0e8f0e428682a108ef9286fcc6719429036d27a6 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 1 06:50:53 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 1 18:27:37 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e8f0e42 |
| 7 |
|
| 8 |
media-libs/libmediaart: fix qt5 build with non-bash shell |
| 9 |
|
| 10 |
Removes bashisms from configure.*. |
| 11 |
|
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
...libmediaart-1.9.4-drop-bashisms-configure.patch | 38 ++++++++++++++++++++++ |
| 15 |
media-libs/libmediaart/libmediaart-1.9.4.ebuild | 1 + |
| 16 |
2 files changed, 39 insertions(+) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..8d65e7cd5c9 |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-libs/libmediaart/files/libmediaart-1.9.4-drop-bashisms-configure.patch |
| 23 |
@@ -0,0 +1,38 @@ |
| 24 |
+From a193e48dd01ad3aef9dd998c1247f649719f0a80 Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Sam James <sam@g.o> |
| 26 |
+Date: Sun, 1 Aug 2021 07:48:51 +0100 |
| 27 |
+Subject: [PATCH] Drop bashisms from configure.ac |
| 28 |
+ |
| 29 |
+--- |
| 30 |
+ configure.ac | 6 +++--- |
| 31 |
+ 1 file changed, 3 insertions(+), 3 deletions(-) |
| 32 |
+ |
| 33 |
+diff --git a/configure.ac b/configure.ac |
| 34 |
+index 9ae1292..106ea57 100644 |
| 35 |
+--- a/configure.ac |
| 36 |
++++ b/configure.ac |
| 37 |
+@@ -218,18 +218,18 @@ selected_for_media_art="no (disabled)" |
| 38 |
+ # Choose between backends (GdkPixbuf/Qt/etc) |
| 39 |
+ ################################################################## |
| 40 |
+ |
| 41 |
+-if test "x$enable_qt" == "xyes" && test "x$enable_gdkpixbuf" == "xyes"; then |
| 42 |
++if test "x$enable_qt" = "xyes" && test "x$enable_gdkpixbuf" = "xyes"; then |
| 43 |
+ AC_MSG_ERROR([Can not enable both Qt and GdkPixbuf backends, please pick one]) |
| 44 |
+ fi |
| 45 |
+ |
| 46 |
+ if test "x$enable_qt" != "xno" && test "x$enable_gdkpixbuf" != "xyes"; then |
| 47 |
+- if test "x$with_qt_version" == "xauto" || test "x$with_qt_version" == "x5"; then |
| 48 |
++ if test "x$with_qt_version" = "xauto" || test "x$with_qt_version" = "x5"; then |
| 49 |
+ PKG_CHECK_MODULES(QT5, |
| 50 |
+ [Qt5Gui >= $QT5_REQUIRED], |
| 51 |
+ [have_qt5=yes], |
| 52 |
+ [have_qt5=no]) |
| 53 |
+ fi |
| 54 |
+- if test "x$with_qt_version" == "xauto" || test "x$with_qt_version" == "x4"; then |
| 55 |
++ if test "x$with_qt_version" = "xauto" || test "x$with_qt_version" = "x4"; then |
| 56 |
+ PKG_CHECK_MODULES(QT4, |
| 57 |
+ [QtGui >= $QT4_REQUIRED], |
| 58 |
+ [have_qt4=yes], |
| 59 |
+-- |
| 60 |
+2.32.0 |
| 61 |
+ |
| 62 |
|
| 63 |
diff --git a/media-libs/libmediaart/libmediaart-1.9.4.ebuild b/media-libs/libmediaart/libmediaart-1.9.4.ebuild |
| 64 |
index 31eaf816245..34189436fe6 100644 |
| 65 |
--- a/media-libs/libmediaart/libmediaart-1.9.4.ebuild |
| 66 |
+++ b/media-libs/libmediaart/libmediaart-1.9.4.ebuild |
| 67 |
@@ -47,6 +47,7 @@ src_prepare() { |
| 68 |
mv html/libmediaart{,-${SLOT}}.devhelp2 || die |
| 69 |
cd "${S}" || die |
| 70 |
|
| 71 |
+ eapply "${FILESDIR}"/${PN}-1.9.4-drop-bashisms-configure.patch |
| 72 |
eautoreconf |
| 73 |
|
| 74 |
use vala && vala_src_prepare |
Archives