diff options
| author | markd <markd@pkgsrc.org> | 2008-01-08 08:35:18 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2008-01-08 08:35:18 +0000 |
| commit | 9092d85e37c6e13dc7d73f05135a18845d17eac4 (patch) | |
| tree | 74a07c8cf5a2b5b1ca645488e5b924552fed2bd9 | |
| parent | 449a2762e4d1576d99ee269ad9d62356e0a7586b (diff) | |
| download | pkgsrc-9092d85e37c6e13dc7d73f05135a18845d17eac4.tar.gz | |
Dont default QT_NO_DBUS to on in qconfig.h to be consistent with qt4-qdbus
package. (and therefore set it explicitly in qt4-tools)
Bump PKGREVISION of qt4-libs.
| -rw-r--r-- | x11/qt4-libs/Makefile | 3 | ||||
| -rw-r--r-- | x11/qt4-libs/distinfo | 3 | ||||
| -rw-r--r-- | x11/qt4-libs/patches/patch-aq | 16 | ||||
| -rw-r--r-- | x11/qt4-tools/Makefile | 3 |
4 files changed, 22 insertions, 3 deletions
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile index f20778affd7..a078ecbb514 100644 --- a/x11/qt4-libs/Makefile +++ b/x11/qt4-libs/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.20 2007/12/17 22:19:43 adam Exp $ +# $NetBSD: Makefile,v 1.21 2008/01/08 08:35:18 markd Exp $ .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-libs-${QTVERSION} +PKGREVISION= 1 COMMENT= C++ X GUI toolkit BUILD_TARGET= sub-src diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo index 984daee4111..ce4d3295b62 100644 --- a/x11/qt4-libs/distinfo +++ b/x11/qt4-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.19 2008/01/07 21:09:05 ghen Exp $ +$NetBSD: distinfo,v 1.20 2008/01/08 08:35:18 markd Exp $ SHA1 (qt-x11-opensource-src-4.3.3.tar.gz) = 77d00e2438efa793f6c16c54b64c8ba440ee3228 RMD160 (qt-x11-opensource-src-4.3.3.tar.gz) = 410daca03b6802ba5cc6662219c2ba7a190bd292 @@ -19,3 +19,4 @@ SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381 SHA1 (patch-an) = 6c9044134516d089e97b47a2750beab0e4c4952f SHA1 (patch-ao) = 04361d820325b1b8a0bc66ecaf47bab5f92e7825 SHA1 (patch-ap) = 99402ac9ef527e7fa9b1825c8e1b8a299bc4ffe7 +SHA1 (patch-aq) = afdc1fcacc6f2f421a209d96d2c80141f1aa6dc3 diff --git a/x11/qt4-libs/patches/patch-aq b/x11/qt4-libs/patches/patch-aq new file mode 100644 index 00000000000..5a9a4ec9a9c --- /dev/null +++ b/x11/qt4-libs/patches/patch-aq @@ -0,0 +1,16 @@ +$NetBSD: patch-aq,v 1.1 2008/01/08 08:35:19 markd Exp $ + +Dont default QT_NO_DBUS on in qconfig.h to be consistent with qt4-qdbus +package. + +--- configure.orig 2007-12-05 05:42:56.000000000 +1300 ++++ configure +@@ -5281,7 +5281,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" + [ "$CFG_TABLET" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_TABLET" + [ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6" + [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE" +-[ "$CFG_QDBUS" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" ++#[ "$CFG_QDBUS" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" + + # X11/Unix/Mac only configs + [ "$CFG_CUPS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CUPS" diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile index d31e7013f8f..d06eb6714b8 100644 --- a/x11/qt4-tools/Makefile +++ b/x11/qt4-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2008/01/05 22:15:24 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2008/01/08 08:35:19 markd Exp $ .include "../../x11/qt4-libs/Makefile.common" @@ -9,6 +9,7 @@ COMMENT= QT GUI (WYSIWYG) builder and other tools DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib +CONFIGURE_ARGS+= -DQT_NO_DBUS BUILD_TARGET= sub-tools |