diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-02-19 16:15:01 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-02-19 16:15:01 +0000 |
commit | 281224d30f3deac6a418f166212dff5bc8352dc3 (patch) | |
tree | f1015b70154b312198ad865a0dae8fb89e4c6c0b /media-radio/svxlink/files | |
parent | unused patches (diff) | |
download | gentoo-2-281224d30f3deac6a418f166212dff5bc8352dc3.tar.gz gentoo-2-281224d30f3deac6a418f166212dff5bc8352dc3.tar.bz2 gentoo-2-281224d30f3deac6a418f166212dff5bc8352dc3.zip |
Remove automagic x11-libs/qt:3 detection wrt #301744, thanks to Ben de Groot and Thomas Beierlein.
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'media-radio/svxlink/files')
-rw-r--r-- | media-radio/svxlink/files/svxlink-090426-noqt.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/media-radio/svxlink/files/svxlink-090426-noqt.patch b/media-radio/svxlink/files/svxlink-090426-noqt.patch new file mode 100644 index 000000000000..01ee4e1eb0e2 --- /dev/null +++ b/media-radio/svxlink/files/svxlink-090426-noqt.patch @@ -0,0 +1,52 @@ +Remove automagic Qt3 detection + +https://bugs.gentoo.org/301744 + +--- create_config.sh ++++ create_config.sh +@@ -60,45 +60,6 @@ + output "ECHO=/bin/echo -e" + fi + +-# Checking for QT +-info "--- Checking for QT..." +-if which pkg-config > /dev/null 2>&1; then +- if pkg-config qt; then +- info "yes (pkg-config qt)\n" +- output "QT_LIBPATH=$(pkg-config qt --libs-only-L)" +- output "QT_LIBS=$(pkg-config qt --libs-only-l)" +- output "QT_INCPATH=$(pkg-config qt --cflags-only-I)" +- output "QT_CFLAGS=$(pkg-config qt --cflags-only-other)" +- QT_PREFIX=$(pkg-config qt --variable=prefix) +- elif pkg-config qt-mt; then +- info "yes (pkg-config qt-mt)\n" +- output "QT_LIBPATH=$(pkg-config qt-mt --libs-only-L)" +- output "QT_LIBS=$(pkg-config qt-mt --libs-only-l)" +- output "QT_INCPATH=$(pkg-config qt-mt --cflags-only-I)" +- output "QT_CFLAGS=$(pkg-config qt-mt --cflags-only-other)" +- QT_PREFIX=$(pkg-config qt-mt --variable=prefix) +- fi +-fi +-if [ -z "$QT_PREFIX" -a -n "$QTDIR" ]; then +- info "yes (QTDIR)\n" +- output "QT_LIBPATH=-L${QTDIR}/lib" +- if [ -n "$(ls ${QTDIR}/lib/libqt-mt* 2> /dev/null)" ]; then +- output "QT_LIBS=-lqt-mt" +- else +- output "QT_LIBS=-lqt" +- fi +- output "QT_INCPATH=-I${QTDIR}/include" +- output "QT_CFLAGS=" +- QT_PREFIX=${QTDIR} +-fi +-if [ -n "$QT_PREFIX" ]; then +- QT_BIN="${QT_PREFIX}/bin" +- output "QT_BIN=${QT_BIN}" +- output "QT_MOC=${QT_BIN}/moc" +- output "QT_UIC=${QT_BIN}/uic" +-else +- info "no (optional)\n" +-fi + + # Checking for libsigc++ + sigc_version=1.2 |