diff options
| author | nros <nros@pkgsrc.org> | 2015-04-19 14:50:11 +0000 |
|---|---|---|
| committer | nros <nros@pkgsrc.org> | 2015-04-19 14:50:11 +0000 |
| commit | 885f76c2344c639d660c02508b100adf56e40277 (patch) | |
| tree | 70a3b8fadd84ebd8f869871b829911ff8bbc98ac | |
| parent | 0338631be8c0455dd07a6dc4bd9f79b2cc81aab5 (diff) | |
| download | pkgsrc-885f76c2344c639d660c02508b100adf56e40277.tar.gz | |
If x11/qt5-qtwebchannel is installed qtwebkit finds it during configure
and tries to use it and the build breaks. Make x11/qt5-qtwebchannel a
dependecy to qtwebkit to fix this.
Bump pkgrevision.
| -rw-r--r-- | x11/qt5-qtwebkit/Makefile | 5 | ||||
| -rw-r--r-- | x11/qt5-qtwebkit/buildlink3.mk | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/x11/qt5-qtwebkit/Makefile b/x11/qt5-qtwebkit/Makefile index 2bb9667dbd8..267426e5135 100644 --- a/x11/qt5-qtwebkit/Makefile +++ b/x11/qt5-qtwebkit/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.25 2015/04/06 08:17:20 adam Exp $ +# $NetBSD: Makefile,v 1.26 2015/04/19 14:50:11 nros Exp $ DISTNAME= qtwebkit-opensource-src-${QTVERSION} PKGNAME= qt5-qtwebkit-${QTVERSION} -PKGREVISION= 2 +PKGREVISION= 3 COMMENT= Qt5 WebView module BUILD_DEPENDS+= gperf-[0-9]*:../../devel/gperf @@ -47,6 +47,7 @@ post-install: .include "../../x11/qt5-qtlocation/buildlink3.mk" .include "../../x11/qt5-qtmultimedia/buildlink3.mk" .include "../../x11/qt5-qtsensors/buildlink3.mk" +.include "../../x11/qt5-qtwebchannel/buildlink3.mk" PYTHON_FOR_BUILD_ONLY= yes .include "../../lang/python/tool.mk" .include "../../lang/ruby/buildlink3.mk" diff --git a/x11/qt5-qtwebkit/buildlink3.mk b/x11/qt5-qtwebkit/buildlink3.mk index 51e170d6947..f1c6fe8485c 100644 --- a/x11/qt5-qtwebkit/buildlink3.mk +++ b/x11/qt5-qtwebkit/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2015/04/06 08:17:20 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2015/04/19 14:50:11 nros Exp $ BUILDLINK_TREE+= qt5-qtwebkit @@ -6,7 +6,7 @@ BUILDLINK_TREE+= qt5-qtwebkit QT5_QTWEBKIT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qt5-qtwebkit+= qt5-qtwebkit>=5.4.0 -BUILDLINK_ABI_DEPENDS.qt5-qtwebkit+= qt5-qtwebkit>=5.4.0nb2 +BUILDLINK_ABI_DEPENDS.qt5-qtwebkit+= qt5-qtwebkit>=5.4.0nb3 BUILDLINK_PKGSRCDIR.qt5-qtwebkit?= ../../x11/qt5-qtwebkit BUILDLINK_INCDIRS.qt5-qtwebkit+= qt5/include @@ -24,6 +24,7 @@ BUILDLINK_LIBDIRS.qt5-qtwebkit+= qt5/plugins .include "../../x11/qt5-qtlocation/buildlink3.mk" .include "../../x11/qt5-qtmultimedia/buildlink3.mk" .include "../../x11/qt5-qtsensors/buildlink3.mk" +.include "../../x11/qt5-qtwebchannel/buildlink3.mk" PYTHON_FOR_BUILD_ONLY= yes .include "../../lang/python/tool.mk" .include "../../lang/ruby/buildlink3.mk" |