pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/qt5-qttools qt5-qttools: fix build when the base p...
details: https://anonhg.NetBSD.org/pkgsrc/rev/2c35d066c3d1
branches: trunk
changeset: 425109:2c35d066c3d1
user: tnn <tnn%pkgsrc.org@localhost>
date: Wed Mar 18 23:04:21 2020 +0000
description:
qt5-qttools: fix build when the base package was built w/o dbus support
diffstat:
x11/qt5-qttools/Makefile | 7 ++++++-
x11/qt5-qttools/PLIST | 6 +++---
2 files changed, 9 insertions(+), 4 deletions(-)
diffs (41 lines):
diff -r 57e1bac956e8 -r 2c35d066c3d1 x11/qt5-qttools/Makefile
--- a/x11/qt5-qttools/Makefile Wed Mar 18 21:58:38 2020 +0000
+++ b/x11/qt5-qttools/Makefile Wed Mar 18 23:04:21 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2020/03/10 22:09:15 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2020/03/18 23:04:21 tnn Exp $
DISTNAME= qttools-everywhere-src-${QTVERSION}
PKGNAME= qt5-qttools-${QTVERSION}
@@ -34,6 +34,11 @@
${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
.endfor
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+PLIST_VARS+= dbus
+.if ${PKG_BUILD_OPTIONS.qt5-qtbase:Mdbus}
+PLIST.dbus= yes
+.endif
.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
.include "../../x11/qt5-qtlocation/buildlink3.mk"
.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
diff -r 57e1bac956e8 -r 2c35d066c3d1 x11/qt5-qttools/PLIST
--- a/x11/qt5-qttools/PLIST Wed Mar 18 21:58:38 2020 +0000
+++ b/x11/qt5-qttools/PLIST Wed Mar 18 23:04:21 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2020/03/18 21:55:24 tnn Exp $
+@comment $NetBSD: PLIST,v 1.19 2020/03/18 23:04:21 tnn Exp $
lib/pkgconfig/Qt5Designer.pc
lib/pkgconfig/Qt5Help.pc
lib/pkgconfig/Qt5UiTools.pc
@@ -13,8 +13,8 @@
qt5/bin/lupdate-pro
qt5/bin/pixeltool
qt5/bin/qcollectiongenerator
-qt5/bin/qdbus
-qt5/bin/qdbusviewer
+${PLIST.dbus}qt5/bin/qdbus
+${PLIST.dbus}qt5/bin/qdbusviewer
qt5/bin/qdistancefieldgenerator
${PLIST.llvm}qt5/bin/qdoc
qt5/bin/qhelpgenerator
Home |
Main Index |
Thread Index |
Old Index