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