diff options
| author | markd <markd@pkgsrc.org> | 2011-01-08 09:29:35 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2011-01-08 09:29:35 +0000 |
| commit | e6b5ad6e27c1aef172ba33090515375f083aea04 (patch) | |
| tree | d3fd510a57f4c305873fee9554eebc64298a1ac2 | |
| parent | 83a66b7d278b280829b1b52998963b3a39816338 (diff) | |
| download | pkgsrc-e6b5ad6e27c1aef172ba33090515375f083aea04.tar.gz | |
patch from svn to fix compile with qt4.7
| -rw-r--r-- | www/konq-plugins/Makefile | 4 | ||||
| -rw-r--r-- | www/konq-plugins/distinfo | 3 | ||||
| -rw-r--r-- | www/konq-plugins/patches/patch-aa | 15 |
3 files changed, 19 insertions, 3 deletions
diff --git a/www/konq-plugins/Makefile b/www/konq-plugins/Makefile index dbbf65e2f0d..2b81039ad56 100644 --- a/www/konq-plugins/Makefile +++ b/www/konq-plugins/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2010/11/15 22:58:51 abs Exp $ +# $NetBSD: Makefile,v 1.9 2011/01/08 09:29:35 markd Exp $ # DISTNAME= konq-plugins-4.4.0 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= www kde MASTER_SITES= ${MASTER_SITE_KDE:=4.4.0/src/extragear/} EXTRACT_SUFX= .tar.bz2 diff --git a/www/konq-plugins/distinfo b/www/konq-plugins/distinfo index a58f7e99e1d..a2a17e84429 100644 --- a/www/konq-plugins/distinfo +++ b/www/konq-plugins/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2010/04/10 03:13:34 markd Exp $ +$NetBSD: distinfo,v 1.3 2011/01/08 09:29:35 markd Exp $ SHA1 (konq-plugins-4.4.0.tar.bz2) = d352fa8b01998182187d0220ecca0d68d7fff919 RMD160 (konq-plugins-4.4.0.tar.bz2) = 6cec3f25ca320ebb961358b3f7d0926720f8e01c Size (konq-plugins-4.4.0.tar.bz2) = 1123983 bytes +SHA1 (patch-aa) = 45334098f82a29f612d08659d59b5650533bebdc diff --git a/www/konq-plugins/patches/patch-aa b/www/konq-plugins/patches/patch-aa new file mode 100644 index 00000000000..e8f077604dc --- /dev/null +++ b/www/konq-plugins/patches/patch-aa @@ -0,0 +1,15 @@ +$NetBSD: patch-aa,v 1.1 2011/01/08 09:29:35 markd Exp $ + +svn 1102482 and 1145054 compile fixes for qt4.7 + +--- adblock/adblock.cpp.orig 2010-02-11 22:12:41.000000000 +0000 ++++ adblock/adblock.cpp +@@ -300,7 +300,7 @@ void AdBlock::updateFilters() + // ---------------------------------------------------------------------------- + + AdElement::AdElement() : +- m_url(0), m_category(0), m_type(0), m_blocked(false) {} ++ m_url(QString()), m_category(QString()), m_type(QString()), m_blocked(false) {} + + AdElement::AdElement(const QString &url, const QString &category, + const QString &type, bool blocked, const DOM::Node&node) : |