| 1 |
commit: f8044cf9528733d636ee8e3d65e46421079e7f29 |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Oct 1 13:34:36 2017 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 30 21:26:15 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8044cf9 |
| 7 |
|
| 8 |
media-libs/libmediaart: remove unused patch. |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/5828 |
| 11 |
|
| 12 |
.../libmediaart/files/libmediaart-0.7.0-qt5.patch | 47 ---------------------- |
| 13 |
1 file changed, 47 deletions(-) |
| 14 |
|
| 15 |
diff --git a/media-libs/libmediaart/files/libmediaart-0.7.0-qt5.patch b/media-libs/libmediaart/files/libmediaart-0.7.0-qt5.patch |
| 16 |
deleted file mode 100644 |
| 17 |
index ecf9de908cf..00000000000 |
| 18 |
--- a/media-libs/libmediaart/files/libmediaart-0.7.0-qt5.patch |
| 19 |
+++ /dev/null |
| 20 |
@@ -1,47 +0,0 @@ |
| 21 |
-Solves automagic selection of Qt version. |
| 22 |
- |
| 23 |
-https://bugs.gentoo.org/show_bug.cgi?id=523122 |
| 24 |
-https://bugzilla.gnome.org/show_bug.cgi?id=737174 |
| 25 |
- |
| 26 |
-diff --git a/configure.ac b/configure.ac |
| 27 |
-index e9ead09..3ee710a 100644 |
| 28 |
---- a/configure.ac |
| 29 |
-+++ b/configure.ac |
| 30 |
-@@ -206,6 +206,10 @@ AC_ARG_ENABLE(qt, |
| 31 |
- AS_HELP_STRING([--enable-qt], |
| 32 |
- [enable Qt support, (MP3 album art) [[default=auto]]]),, |
| 33 |
- [enable_qt=auto]) |
| 34 |
-+AC_ARG_WITH(qt-version, |
| 35 |
-+ AS_HELP_STRING([--with-qt-version=major], |
| 36 |
-+ [Force specific Qt version [[default=auto]]]),, |
| 37 |
-+ [with_qt_version=auto]) |
| 38 |
- |
| 39 |
- selected_for_media_art="no (disabled)" |
| 40 |
- |
| 41 |
-@@ -218,14 +222,18 @@ if test "x$enable_qt" == "xyes" && test "x$enable_gdkpixbuf" == "xyes"; then |
| 42 |
- fi |
| 43 |
- |
| 44 |
- if test "x$enable_qt" != "xno" && test "x$enable_gdkpixbuf" != "xyes"; then |
| 45 |
-- PKG_CHECK_MODULES(QT5, |
| 46 |
-- [Qt5Gui >= $QT5_REQUIRED], |
| 47 |
-- [have_qt5=yes], |
| 48 |
-- [have_qt5=no]) |
| 49 |
-- PKG_CHECK_MODULES(QT4, |
| 50 |
-- [QtGui >= $QT4_REQUIRED], |
| 51 |
-- [have_qt4=yes], |
| 52 |
-- [have_qt4=no]) |
| 53 |
-+ if test "x$with_qt_version" == "xauto" || test "x$with_qt_version" == "x5"; then |
| 54 |
-+ PKG_CHECK_MODULES(QT5, |
| 55 |
-+ [Qt5Gui >= $QT5_REQUIRED], |
| 56 |
-+ [have_qt5=yes], |
| 57 |
-+ [have_qt5=no]) |
| 58 |
-+ fi |
| 59 |
-+ if test "x$with_qt_version" == "xauto" || test "x$with_qt_version" == "x4"; then |
| 60 |
-+ PKG_CHECK_MODULES(QT4, |
| 61 |
-+ [QtGui >= $QT4_REQUIRED], |
| 62 |
-+ [have_qt4=yes], |
| 63 |
-+ [have_qt4=no]) |
| 64 |
-+ fi |
| 65 |
- |
| 66 |
- if test "x$have_qt5" = "xyes"; then |
| 67 |
- BACKEND_CFLAGS="$QT5_CFLAGS -fPIC" |
Archives