diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2017-02-18 19:48:05 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2017-02-18 19:48:05 +0000 |
| commit | f3c180c3431372077934f7658922b8a244419bdf (patch) | |
| tree | 4d04227f02c7fda007ad74be01e1393168277b0b /devel/qt5-qmake/files | |
| parent | Upgrade from 2.2 to 2.3. (diff) | |
Update Qt5 to 5.7.1, and unify the Qt4 and Qt5 ports some more
* Update Qt5 to 5.7.1
* Move Qt4 binaries to lib/qt4/bin
* Move Qt5 libraries to lib/qt5/lib
By moving the libraries we should finally be able to get rid of the inplace
upgrade bug (see ports bugs 194088, 195105 and 198720): when Qt5's libraries
were lying in /usr/local/lib, which would often get added by pkgconfig to the
linker paths via dependencies, the already installed libraries were linked
against, instead of the ones that were being built. This forced us to make
sure, that -L${WRKSRC}/lib was always coming before -L/usr/local/lib in the
linker flags. With this change this should no longer be the case.
* Rename some ports to match the rest (foo-qtX -> qtX-foo)
* Depend on new port misc/qtchooser [see UPDATING & CHANGES]
There are several new Qt5 ports which all have been created by Marie Loise Nolden
<nolden@kde.org>. Thanks again.
PR: 216797
Exp-Run by: antoine
Reviewed by: rakuco, mat, groot_kde.org
Approved by: rakuco (mentor)
Differential Revision: https://reviews.freebsd.org/D9213
Diffstat (limited to 'devel/qt5-qmake/files')
| -rw-r--r-- | devel/qt5-qmake/files/patch-configure | 25 | ||||
| -rw-r--r-- | devel/qt5-qmake/files/patch-mkspecs__common__freebsd.conf | 43 |
2 files changed, 68 insertions, 0 deletions
diff --git a/devel/qt5-qmake/files/patch-configure b/devel/qt5-qmake/files/patch-configure new file mode 100644 index 000000000000..ab08286a75a4 --- /dev/null +++ b/devel/qt5-qmake/files/patch-configure @@ -0,0 +1,25 @@ +--- configure.orig 2016-02-24 19:25:11 UTC ++++ configure +@@ -4108,11 +4108,11 @@ if [ '!' -e "$outpath/bin/qmake" ]; then + echo "QT_MAJOR_VERSION = $QT_MAJOR_VERSION" >> "$mkfile" + echo "QT_MINOR_VERSION = $QT_MINOR_VERSION" >> "$mkfile" + echo "QT_PATCH_VERSION = $QT_PATCH_VERSION" >> "$mkfile" +- echo "EXTRA_CFLAGS = $EXTRA_CFLAGS" >> "$mkfile" +- echo "EXTRA_CXXFLAGS = $EXTRA_CXXFLAGS" >> "$mkfile" ++ echo "EXTRA_CFLAGS = $EXTRA_CFLAGS $CFLAGS" >> "$mkfile" ++ echo "EXTRA_CXXFLAGS = $EXTRA_CXXFLAGS $CXXFLAGS" >> "$mkfile" + echo "QTOBJS =" $EXTRA_OBJS >> "$mkfile" + echo "QTSRCS =" $EXTRA_SRCS >> "$mkfile" +- echo "LFLAGS = $EXTRA_LFLAGS" >> "$mkfile" ++ echo "LFLAGS = $EXTRA_LFLAGS $LDFLAGS" >> "$mkfile" + echo "EXEEXT = $EXEEXT" >> "$mkfile" + echo "RM_F = rm -f" >> "$mkfile" + echo "RM_RF = rm -rf" >> "$mkfile" +@@ -4131,6 +4131,7 @@ if [ '!' -e "$outpath/bin/qmake" ]; then + fi + fi + done ++ exit 0 + + if [ "$OPT_VERBOSE" = yes ]; then + # Show the output of make diff --git a/devel/qt5-qmake/files/patch-mkspecs__common__freebsd.conf b/devel/qt5-qmake/files/patch-mkspecs__common__freebsd.conf new file mode 100644 index 000000000000..f3dee42ec3f5 --- /dev/null +++ b/devel/qt5-qmake/files/patch-mkspecs__common__freebsd.conf @@ -0,0 +1,43 @@ +--- ./mkspecs/common/freebsd.conf.orig 2013-12-05 17:36:29.064198097 +0000 ++++ ./mkspecs/common/freebsd.conf 2013-12-05 17:38:34.413200492 +0000 +@@ -0,0 +1,40 @@ ++# ++# qmake configuration for FreeBSD ++# ++ ++MAKEFILE_GENERATOR = UNIX ++QMAKE_PLATFORM = freebsd bsd ++ ++QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE ++ ++QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD ++ ++# Addon software goes into /usr/local on the BSDs, by default we will look there ++QMAKE_INCDIR = %%LOCALBASE%%/include ++QMAKE_LIBDIR = %%LOCALBASE%%/lib ++ ++# Required at least by Qt5ConfigExtras.cmake so ports can include GL/gl.h. ++QMAKE_INCDIR_OPENGL = %%LOCALBASE%%/include ++QMAKE_LIBDIR_OPENGL = %%LOCALBASE%%/lib ++ ++QMAKE_LFLAGS_NOUNDEF = -Wl,--no-undefined ++QMAKE_LFLAGS_THREAD = -pthread ++ ++QMAKE_LIBS = ++QMAKE_LIBS_DYNLOAD = ++QMAKE_LIBS_EXECINFO = -lexecinfo ++QMAKE_LIBS_X11 = -lXext -lX11 -lm ++QMAKE_LIBS_OPENGL = -lGL ++QMAKE_LIBS_THREAD = ++ ++QMAKE_AR = ar cqs ++QMAKE_OBJCOPY = objcopy ++QMAKE_NM = nm -P ++QMAKE_RANLIB = ++ ++QMAKE_STRIP = strip ++QMAKE_STRIPFLAGS_LIB += --strip-unneeded ++QMAKE_INSTALL_FILE = install -m 644 -p ++QMAKE_INSTALL_PROGRAM = install -m 755 -p ++ ++include(unix.conf) |