diff options
| author | nros <nros> | 2016-01-18 20:52:43 +0000 |
|---|---|---|
| committer | nros <nros> | 2016-01-18 20:52:43 +0000 |
| commit | 82b756c5efdec6c5f434d12a4a164de386a75f6f (patch) | |
| tree | a3094af53d92ee3be2e5003ac9616173728ad62e /x11 | |
| parent | cec9666a5811bddc214fb95464f30fd0a6bd0331 (diff) | |
| download | pkgsrc-82b756c5efdec6c5f434d12a4a164de386a75f6f.tar.gz | |
Fix some stuff in qt5-qtbase.
Fix gtk2 option. PR pkg/49277.
Explicitly turn off all database drivers since they might be picked up, as
shown in joyents linux bulk build.
Bump pkgrevision.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/qt5-qtbase/Makefile | 9 | ||||
| -rw-r--r-- | x11/qt5-qtbase/PLIST | 4 | ||||
| -rw-r--r-- | x11/qt5-qtbase/options.mk | 5 |
3 files changed, 14 insertions, 4 deletions
diff --git a/x11/qt5-qtbase/Makefile b/x11/qt5-qtbase/Makefile index 841ecb27b49..b2a88c6b0ea 100644 --- a/x11/qt5-qtbase/Makefile +++ b/x11/qt5-qtbase/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.28 2015/10/26 19:03:59 adam Exp $ +# $NetBSD: Makefile,v 1.29 2016/01/18 20:52:43 nros Exp $ DISTNAME= qtbase-opensource-src-${QTVERSION} PKGNAME= qt5-qtbase-${QTVERSION} +PKGREVISION= 1 COMMENT= C++ X GUI toolkit .include "../../x11/qt5-qtbase/Makefile.common" @@ -26,9 +27,15 @@ CONFIGURE_ARGS+= -openssl-linked CONFIGURE_ARGS+= -nomake examples CONFIGURE_ARGS+= -nomake tests CONFIGURE_ARGS+= -no-pch +CONFIGURE_ARGS+= -no-sql-db2 +CONFIGURE_ARGS+= -no-sql-ibase CONFIGURE_ARGS+= -no-sql-mysql +CONFIGURE_ARGS+= -no-sql-oci +CONFIGURE_ARGS+= -no-sql-odbc CONFIGURE_ARGS+= -no-sql-psql CONFIGURE_ARGS+= -no-sql-sqlite +CONFIGURE_ARGS+= -no-sql-sqlite2 +CONFIGURE_ARGS+= -no-sql-tds CONFIGURE_ARGS+= -no-strip CONFIGURE_ARGS+= -system-harfbuzz CONFIGURE_ARGS+= -system-libjpeg diff --git a/x11/qt5-qtbase/PLIST b/x11/qt5-qtbase/PLIST index 8b7289bb0ca..51ab75ba6d5 100644 --- a/x11/qt5-qtbase/PLIST +++ b/x11/qt5-qtbase/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2015/11/10 12:18:44 abs Exp $ +@comment $NetBSD: PLIST,v 1.11 2016/01/18 20:52:43 nros Exp $ lib/pkgconfig/Qt5Bootstrap.pc lib/pkgconfig/Qt5Concurrent.pc lib/pkgconfig/Qt5Core.pc @@ -2355,6 +2355,7 @@ ${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QComposePlatformInputContextPlugin.cmak ${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QEglFSIntegrationPlugin.cmake ${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QEglFSX11IntegrationPlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QGifPlugin.cmake +${PLIST.gtk2}qt5/lib/cmake/Qt5Gui/Qt5Gui_QGtk2ThemePlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QICOPlugin.cmake ${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QIbusPlatformInputContextPlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QJpegPlugin.cmake @@ -2934,6 +2935,7 @@ qt5/plugins/platforms/libqminimal.la ${PLIST.egl}qt5/plugins/platforms/libqminimalegl.la qt5/plugins/platforms/libqoffscreen.la ${PLIST.unix}qt5/plugins/platforms/libqxcb.la +${PLIST.gtk2}qt5/plugins/platformthemes/libqgtk2.la ${PLIST.mac}qt5/plugins/printsupport/libcocoaprintersupport.la ${PLIST.cups}qt5/plugins/printsupport/libcupsprintersupport.la ${PLIST.unix}qt5/plugins/xcbglintegrations/libqxcb-glx-integration.la diff --git a/x11/qt5-qtbase/options.mk b/x11/qt5-qtbase/options.mk index 9dff0a03ec1..1cc7ee6641d 100644 --- a/x11/qt5-qtbase/options.mk +++ b/x11/qt5-qtbase/options.mk @@ -1,11 +1,11 @@ -# $NetBSD: options.mk,v 1.6 2015/10/26 19:03:59 adam Exp $ +# $NetBSD: options.mk,v 1.7 2016/01/18 20:52:43 nros Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.qt5 PKG_SUPPORTED_OPTIONS= cups debug gtk2 .include "../../mk/bsd.options.mk" -PLIST_VARS+= cups +PLIST_VARS+= cups gtk2 .if !empty(PKG_OPTIONS:Mcups) . include "../../print/cups15/buildlink3.mk" @@ -18,6 +18,7 @@ CONFIGURE_ARGS+= -no-cups .if !empty(PKG_OPTIONS:Mgtk2) . include "../../x11/gtk2/buildlink3.mk" CONFIGURE_ARGS+= -gtkstyle +PLIST.gtk2= yes .else CONFIGURE_ARGS+= -no-gtkstyle .endif |