| 1 |
kensington 15/01/01 13:25:34 |
| 2 |
|
| 3 |
Added: libmediaart-0.7.0-qt5.patch |
| 4 |
Log: |
| 5 |
Add patch by Paweł Stankowski <aambitny@×××××.com> to solve automagic Qt version selection wrt bug #523122. |
| 6 |
|
| 7 |
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-libs/libmediaart/files/libmediaart-0.7.0-qt5.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmediaart/files/libmediaart-0.7.0-qt5.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmediaart/files/libmediaart-0.7.0-qt5.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: libmediaart-0.7.0-qt5.patch |
| 16 |
=================================================================== |
| 17 |
Solves automagic selection of Qt version. |
| 18 |
|
| 19 |
https://bugs.gentoo.org/show_bug.cgi?id=523122 |
| 20 |
https://bugzilla.gnome.org/show_bug.cgi?id=737174 |
| 21 |
|
| 22 |
diff --git a/configure.ac b/configure.ac |
| 23 |
index e9ead09..3ee710a 100644 |
| 24 |
--- a/configure.ac |
| 25 |
+++ b/configure.ac |
| 26 |
@@ -206,6 +206,10 @@ AC_ARG_ENABLE(qt, |
| 27 |
AS_HELP_STRING([--enable-qt], |
| 28 |
[enable Qt support, (MP3 album art) [[default=auto]]]),, |
| 29 |
[enable_qt=auto]) |
| 30 |
+AC_ARG_WITH(qt-version, |
| 31 |
+ AS_HELP_STRING([--with-qt-version=major], |
| 32 |
+ [Force specific Qt version [[default=auto]]]),, |
| 33 |
+ [with_qt_version=auto]) |
| 34 |
|
| 35 |
selected_for_media_art="no (disabled)" |
| 36 |
|
| 37 |
@@ -218,14 +222,18 @@ if test "x$enable_qt" == "xyes" && test "x$enable_gdkpixbuf" == "xyes"; then |
| 38 |
fi |
| 39 |
|
| 40 |
if test "x$enable_qt" != "xno" && test "x$enable_gdkpixbuf" != "xyes"; then |
| 41 |
- PKG_CHECK_MODULES(QT5, |
| 42 |
- [Qt5Gui >= $QT5_REQUIRED], |
| 43 |
- [have_qt5=yes], |
| 44 |
- [have_qt5=no]) |
| 45 |
- PKG_CHECK_MODULES(QT4, |
| 46 |
- [QtGui >= $QT4_REQUIRED], |
| 47 |
- [have_qt4=yes], |
| 48 |
- [have_qt4=no]) |
| 49 |
+ if test "x$with_qt_version" == "xauto" || test "x$with_qt_version" == "x5"; then |
| 50 |
+ PKG_CHECK_MODULES(QT5, |
| 51 |
+ [Qt5Gui >= $QT5_REQUIRED], |
| 52 |
+ [have_qt5=yes], |
| 53 |
+ [have_qt5=no]) |
| 54 |
+ fi |
| 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 |
+ [have_qt4=no]) |
| 60 |
+ fi |
| 61 |
|
| 62 |
if test "x$have_qt5" = "xyes"; then |
| 63 |
BACKEND_CFLAGS="$QT5_CFLAGS -fPIC" |
Archives