mirror of
https://git.freebsd.org/ports.git
synced 2025-07-10 22:09:22 -04:00
7d5e6b666c
Mk/Uses/qmake.mk: - Add support for out-of-source builds - Add support for Qt 5 ports - Respect WITH_DEBUG Mk/bsd.qt.mk: - Massive rework for Qt 5 ports - Remove '-phonon' from global configure args, thus allow qt4-designer and qt4-qtconfig to be built without Phonon support [1] devel/qmake4: - Improve mkspecs for gcc (mainly sync with linux version) and clang devel/qt4-corelib: - Convert to USES=iconv - Remove ancient patch devel/qt4-designer: - Remove reference to WRKSRC from installed pkgconfig files [2] - Don't build Qt Designer plugin for Phonon from outdated Qt sources. Separate port for plugin will be committed later devel/qt4-assistant-adp, devel/qt4-libqtassistantclient: - Convert to USES=qmake Clean up Qt4 ports: - Update comments - Update description; use common description - Consistently use QT_INCDIR, QT_LIBDIR, etc. - Use options helpers - Convert to new LIB_DEPENDS syntax - Update DESKTOP_ENTRIES to avoid conflicts with Qt 5 ports - Rename/move several ports for unification with Qt 5 ports PR: ports/184620 [1] Reported by: Kevin Zheng <kevinz5000@gmail.com> PR: ports/181141 [2] Reported by: thierry PR: ports/185101 Exp-run by: bdrewery This is mostly solely avilla's work in area51, kudos to him! And a couple commits from myself, so you know who's collecting pointyhats :)
55 lines
1.5 KiB
Text
55 lines
1.5 KiB
Text
--- ./configure.orig 2013-06-07 07:16:41.000000000 +0200
|
|
+++ ./configure 2013-10-27 23:22:00.000000000 +0100
|
|
@@ -916,7 +916,7 @@
|
|
CFG_SILENT=no
|
|
CFG_GRAPHICS_SYSTEM=default
|
|
CFG_RUNTIME_SYSTEM=
|
|
-CFG_ALSA=auto
|
|
+CFG_ALSA=no
|
|
CFG_PULSEAUDIO=auto
|
|
CFG_COREWLAN=auto
|
|
CFG_ICD=auto
|
|
@@ -2704,11 +2704,6 @@
|
|
fi
|
|
done
|
|
|
|
- # symlink the mkspecs directory
|
|
- mkdir -p "$outpath/mkspecs"
|
|
- rm -rf "$outpath"/mkspecs/*
|
|
- ln -s "$relpath"/mkspecs/* "$outpath/mkspecs"
|
|
- rm -f "$outpath/mkspecs/default"
|
|
|
|
ShadowMkspecs()
|
|
{
|
|
@@ -3019,6 +3014,7 @@
|
|
PLATFORMS=`find "$relpath/mkspecs/" -type f | grep -v qws | sed "s,$relpath/mkspecs/qws/,,"`
|
|
fi
|
|
|
|
+PLATFORM=`realpath $PLATFORM`
|
|
[ -z "$XPLATFORM" ] && XPLATFORM="$PLATFORM"
|
|
|
|
case `basename "$XPLATFORM"` in win32-g++*) XPLATFORM_MINGW=yes;; esac
|
|
@@ -4908,7 +4904,7 @@
|
|
}
|
|
|
|
# build qmake
|
|
-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
|
|
+if false; then ###[ '!' -f "$outpath/bin/qmake" ];
|
|
echo "Creating qmake. Please wait..."
|
|
|
|
OLD_QCONFIG_H=
|
|
@@ -6001,14 +5997,6 @@
|
|
X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
|
|
fi
|
|
|
|
- # Check we actually have X11 :-)
|
|
- compileTest x11/xlib "XLib" $X11TESTS_FLAGS
|
|
- if [ $? != "0" ]; then
|
|
- echo "Basic XLib functionality test failed!"
|
|
- echo " You might need to modify the include and library search paths by editing"
|
|
- echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
|
|
- exit 1
|
|
- fi
|
|
fi
|
|
|
|
# X11/MINGW/SYMBIAN OpenGL
|