| 1 |
idella4 15/04/30 16:44:32 |
| 2 |
|
| 3 |
Added: qt4-select.patch |
| 4 |
Log: |
| 5 |
add patch to address selection of qt4 vs qt5, patch by Karol Herbst, comment 19, bug #541678, tested and endorsed by users and proxy maintainer, limited to versioned ebuilds for now, finally closes said bug |
| 6 |
|
| 7 |
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-video/vlc/files/qt4-select.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/files/qt4-select.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/files/qt4-select.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: qt4-select.patch |
| 16 |
=================================================================== |
| 17 |
https://gist.github.com/karolherbst/fb9e3d8f6ba05f1f5d54 |
| 18 |
For use until upstream ever accepts this patch or fixes it themsleves |
| 19 |
--- configure.ac.orig 2015-03-01 02:28:48.983932684 +0100 |
| 20 |
+++ configure.ac 2015-03-01 02:41:29.641927072 +0100 |
| 21 |
@@ -3709,7 +3709,8 @@ |
| 22 |
]) |
| 23 |
]) |
| 24 |
AS_IF([test "${enable_qt}" != "no"], [ |
| 25 |
- PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [ |
| 26 |
+ AS_IF([test "${enable_qt}" != "4"], [ |
| 27 |
+ PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [ |
| 28 |
PKG_CHECK_MODULES([QTX11], [Qt5X11Extras], [ |
| 29 |
VLC_ADD_LIBS([qt4],[${QTX11_LIBS}]) |
| 30 |
VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11]) |
| 31 |
@@ -3721,20 +3722,23 @@ |
| 32 |
AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) |
| 33 |
AC_PATH_PROGS(RCC, [rcc-qt5 rcc], rcc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) |
| 34 |
AC_PATH_PROGS(UIC, [uic-qt5 uic], uic, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) |
| 35 |
+ enable_qt="5" |
| 36 |
- ], [ |
| 37 |
- PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [ |
| 38 |
- AS_IF([test -n "${enable_qt}"],[ |
| 39 |
- AC_MSG_ERROR([${QT_PKG_ERRORS}.]) |
| 40 |
- ],[ |
| 41 |
- AC_MSG_WARN([${QT_PKG_ERRORS}.]) |
| 42 |
- ]) |
| 43 |
- enable_qt="no" |
| 44 |
+ ]) |
| 45 |
+ ]) |
| 46 |
+ AS_IF([test "${enable_qt}" != "5"], [ |
| 47 |
+ PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [ |
| 48 |
+ AS_IF([test -n "${enable_qt}"],[ |
| 49 |
+ AC_MSG_ERROR([${QT_PKG_ERRORS}.]) |
| 50 |
+ ],[ |
| 51 |
+ AC_MSG_WARN([${QT_PKG_ERRORS}.]) |
| 52 |
]) |
| 53 |
- QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)" |
| 54 |
- AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) |
| 55 |
- AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin]) |
| 56 |
- AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) |
| 57 |
+ enable_qt="no" |
| 58 |
]) |
| 59 |
+ QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)" |
| 60 |
+ AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) |
| 61 |
+ AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin]) |
| 62 |
+ AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) |
| 63 |
+ ]) |
| 64 |
]) |
| 65 |
AS_IF([test "${enable_qt}" != "no"], [ |
| 66 |
VLC_ADD_PLUGIN([qt4]) |
Archives