mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-12 03:00:28 +00:00
Code Issues Releases Activity

Ensure qconfig-modules.h does not include qconfig-webkit.h

Browse Source 
r448361 updated Qt WebKit and dropped QT_DIST and QT_DEFINES, which led to
existing installations being upgraded to remove qconfig-webkit.h while not
removing the corresponding #include <QtCore/modules/qconfig-webkit.h> from
qconfig-modules.h.

Consequently, any build that uses existing Qt5 ports (i.e. building a port
locally, or any project using Qt5) fails with errors like:

    /usr/local/include/qt5/QtCore/qconfig-modules.h:8:10: fatal error:
    'QtCore/modules/qconfig-webkit.h' file not found

Add a pkg-install that takes care of removing any offending lines from
qconfig-modules.h.

PR:		221828
Reviewed by:	tcberner, Adriaan de Groot <groot@kde.org>
This commit is contained in:
Raphael Kubo da Costa 2017-08-27 14:06:05 +00:00
parent 994b3ce426
commit e9a6c165fa
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=448821
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/qt5-webkit/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= webkit
DISTVERSION= 5.212.0-alpha2
PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= https://github.com/annulen/${PORTNAME}/releases/download/${DISTNAME}/
PKGNAMEPREFIX= qt5-
@ -46,4 +47,7 @@ CXXFLAGS+= -DNDEBUG
PLIST_SUB= FULLVER="${PORTVERSION:R}"
SUB_FILES= pkg-install
SUB_LIST= QT_INCDIR="${QT_INCDIR}"
.include <bsd.port.mk>

11
www/qt5-webkit/files/pkg-install.in Normal file
View File

@ -0,0 +1,11 @@
#!/bin/sh
# Before r448361, QtWebKit had QT_DEFINES, which caused qconfig-modules.h to
# include qconfig-webkit.h, which we no longer set. We no longer ship
# qconfig-webkit.h, we need to make sure qconfig-modules.h no longer includes
# it (see bug 221828).
if [ "$2" = "POST-INSTALL" ]; then
sed -i "" '/qconfig-webkit.h/d' \
%%QT_INCDIR%%/QtCore/qconfig-modules.h 2>/dev/null || true
fi