| 1 |
ssuominen 10/02/19 16:15:01 |
| 2 |
|
| 3 |
Added: svxlink-090426-noqt.patch |
| 4 |
Log: |
| 5 |
Remove automagic x11-libs/qt:3 detection wrt #301744, thanks to Ben de Groot and Thomas Beierlein. |
| 6 |
(Portage version: 2.2_rc62/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-radio/svxlink/files/svxlink-090426-noqt.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-radio/svxlink/files/svxlink-090426-noqt.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-radio/svxlink/files/svxlink-090426-noqt.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: svxlink-090426-noqt.patch |
| 15 |
=================================================================== |
| 16 |
Remove automagic Qt3 detection |
| 17 |
|
| 18 |
https://bugs.gentoo.org/301744 |
| 19 |
|
| 20 |
--- create_config.sh |
| 21 |
+++ create_config.sh |
| 22 |
@@ -60,45 +60,6 @@ |
| 23 |
output "ECHO=/bin/echo -e" |
| 24 |
fi |
| 25 |
|
| 26 |
-# Checking for QT |
| 27 |
-info "--- Checking for QT..." |
| 28 |
-if which pkg-config > /dev/null 2>&1; then |
| 29 |
- if pkg-config qt; then |
| 30 |
- info "yes (pkg-config qt)\n" |
| 31 |
- output "QT_LIBPATH=$(pkg-config qt --libs-only-L)" |
| 32 |
- output "QT_LIBS=$(pkg-config qt --libs-only-l)" |
| 33 |
- output "QT_INCPATH=$(pkg-config qt --cflags-only-I)" |
| 34 |
- output "QT_CFLAGS=$(pkg-config qt --cflags-only-other)" |
| 35 |
- QT_PREFIX=$(pkg-config qt --variable=prefix) |
| 36 |
- elif pkg-config qt-mt; then |
| 37 |
- info "yes (pkg-config qt-mt)\n" |
| 38 |
- output "QT_LIBPATH=$(pkg-config qt-mt --libs-only-L)" |
| 39 |
- output "QT_LIBS=$(pkg-config qt-mt --libs-only-l)" |
| 40 |
- output "QT_INCPATH=$(pkg-config qt-mt --cflags-only-I)" |
| 41 |
- output "QT_CFLAGS=$(pkg-config qt-mt --cflags-only-other)" |
| 42 |
- QT_PREFIX=$(pkg-config qt-mt --variable=prefix) |
| 43 |
- fi |
| 44 |
-fi |
| 45 |
-if [ -z "$QT_PREFIX" -a -n "$QTDIR" ]; then |
| 46 |
- info "yes (QTDIR)\n" |
| 47 |
- output "QT_LIBPATH=-L${QTDIR}/lib" |
| 48 |
- if [ -n "$(ls ${QTDIR}/lib/libqt-mt* 2> /dev/null)" ]; then |
| 49 |
- output "QT_LIBS=-lqt-mt" |
| 50 |
- else |
| 51 |
- output "QT_LIBS=-lqt" |
| 52 |
- fi |
| 53 |
- output "QT_INCPATH=-I${QTDIR}/include" |
| 54 |
- output "QT_CFLAGS=" |
| 55 |
- QT_PREFIX=${QTDIR} |
| 56 |
-fi |
| 57 |
-if [ -n "$QT_PREFIX" ]; then |
| 58 |
- QT_BIN="${QT_PREFIX}/bin" |
| 59 |
- output "QT_BIN=${QT_BIN}" |
| 60 |
- output "QT_MOC=${QT_BIN}/moc" |
| 61 |
- output "QT_UIC=${QT_BIN}/uic" |
| 62 |
-else |
| 63 |
- info "no (optional)\n" |
| 64 |
-fi |
| 65 |
|
| 66 |
# Checking for libsigc++ |
| 67 |
sigc_version=1.2 |
Archives