diff options
| author | rakuco <rakuco@FreeBSD.org> | 2015-09-16 16:55:04 +0800 |
|---|---|---|
| committer | rakuco <rakuco@FreeBSD.org> | 2015-09-16 16:55:04 +0800 |
| commit | d5338a9cd4d4b1f27857bddfb442b5aa31c9ec39 (patch) | |
| tree | e7c188c382abfae82fd4ac0c5e99a8570491f129 /textproc | |
| parent | 0fdf37c9da152a83e3f3fbafad84909f358db8e2 (diff) | |
| download | freebsd-ports-gnome-d5338a9cd4d4b1f27857bddfb442b5aa31c9ec39.tar.gz freebsd-ports-gnome-d5338a9cd4d4b1f27857bddfb442b5aa31c9ec39.tar.zst freebsd-ports-gnome-d5338a9cd4d4b1f27857bddfb442b5aa31c9ec39.zip | |
Update the Qt4 ports to 4.8.7.
According to upstream, this is the last planned Qt4 release.
A list of changes since 4.8.6 can be found here:
<http://download.qt.io/official_releases/qt/4.8/4.8.7/changes-4.8.7>
Porting notes and changes:
- Remove several patches that have been upstreamed.
- Make Uses/qmake.mk pass the contents of LIBS to the qmake environment. [1]
- Repurpose devel/qt4/files/extrapatch-src-corelib-global-qglobal.h now the
original patch is part of the release (curiously enough, the original
patch was never actually used, as the ?= assignment in r362837 after
r362770 was never possible).
This works around the way compiler support for C++11 features is detected
in Qt 4.8.7: while it originally only uses the compiler to determine if
something is supported or not, the initializer lists feature also depends
on the C++ standard library being used. It's a problem in FreeBSD 9.x,
where USES=compiler:c++0x or USES=compiler:c++11-lang means we will use
clang to build a port but use libstdc++ from base (GCC 4.2). The latter
obviously does not support initializer lists, and the build fails because
Qt tries to include headers that do not exist (<initializer_list>).
Since detecting libstdc++'s version is not trivial (we need to include a
non-lightweight header like cstdio and then check for __GLIBCXX__), we
just enable Q_COMPILER_INITIALIZER_LISTS support only when libc++ is used
(there should be no reason for someone to be using clang with GCC 4.8's
libstdc++, for example).
x11/kdelibs4's FindQt4.cmake had to include a backported change from the
upstream FindQt4.cmake in CMake itself to use a C++ compiler to detect
flags like Q_WS_X11, otherwise the inclusion of <ciso646> in qglobal.h
makes the build fail.
This patch contains changes by me, makc@ and alonso@.
PR: 202552 [1]
PR: 202808 [exp-run]
Submitted by: pawel@ [1]
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/clucene-qt4/Makefile | 1 | ||||
| -rw-r--r-- | textproc/qt4-xml/Makefile | 1 | ||||
| -rw-r--r-- | textproc/qt4-xmlpatterns/Makefile | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/textproc/clucene-qt4/Makefile b/textproc/clucene-qt4/Makefile index 13b8fe2dd1f2..cff5e5a3f878 100644 --- a/textproc/clucene-qt4/Makefile +++ b/textproc/clucene-qt4/Makefile @@ -3,7 +3,6 @@ PORTNAME= clucene DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= textproc PKGNAMEPREFIX= qt4- diff --git a/textproc/qt4-xml/Makefile b/textproc/qt4-xml/Makefile index d70e941022ea..9039e335239e 100644 --- a/textproc/qt4-xml/Makefile +++ b/textproc/qt4-xml/Makefile @@ -3,7 +3,6 @@ PORTNAME= xml DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= textproc PKGNAMEPREFIX= qt4- diff --git a/textproc/qt4-xmlpatterns/Makefile b/textproc/qt4-xmlpatterns/Makefile index 11012253c4b7..e878a0f1d91e 100644 --- a/textproc/qt4-xmlpatterns/Makefile +++ b/textproc/qt4-xmlpatterns/Makefile @@ -3,7 +3,6 @@ PORTNAME= xmlpatterns DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= textproc PKGNAMEPREFIX= qt4- |