summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2010-07-18 13:08:58 +0000
committermarkd <markd@pkgsrc.org>2010-07-18 13:08:58 +0000
commitbea9a70465e72c9f808bec35c8b80e7c7e80ec6a (patch)
tree7a386b09f8ac581ea3bbd27444caf579b97cdc1d /x11
parent6a8b933fd02cca2239add7d2117200c22c0d5e4f (diff)
downloadpkgsrc-bea9a70465e72c9f808bec35c8b80e7c7e80ec6a.tar.gz
Patch from SVN to fix building with recent SIP.
Bump PKGREVISION.
Diffstat (limited to 'x11')
-rw-r--r--x11/kdebindings4-python/Makefile7
-rw-r--r--x11/kdebindings4-python/distinfo3
-rw-r--r--x11/kdebindings4-python/patches/patch-ad17
3 files changed, 24 insertions, 3 deletions
diff --git a/x11/kdebindings4-python/Makefile b/x11/kdebindings4-python/Makefile
index 35bce53bfa1..90baf3a6a2b 100644
--- a/x11/kdebindings4-python/Makefile
+++ b/x11/kdebindings4-python/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2010/07/14 11:11:40 sbd Exp $
+# $NetBSD: Makefile,v 1.16 2010/07/18 13:08:58 markd Exp $
PKGNAME= kdebindings4-python-${_KDE_VERSION}
DISTNAME= kdebindings-${_KDE_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= misc
COMMENT= Python bindings for the KDE integrated X11 desktop
@@ -31,6 +31,9 @@ REPLACE_PYTHON+= \
post-extract:
${CP} ${FILESDIR}/FindPolkitQt.cmake ${WRKSRC}/cmake/modules
+post-patch:
+ rm ${WRKSRC}/python/pykde4/sip/akonadi/addressattribute.sip.orig
+
.include "../../meta-pkgs/kde4/kde4.mk"
.include "../../lang/python/application.mk"
diff --git a/x11/kdebindings4-python/distinfo b/x11/kdebindings4-python/distinfo
index b6ac9ca3e6c..9a6b2fd315e 100644
--- a/x11/kdebindings4-python/distinfo
+++ b/x11/kdebindings4-python/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2010/07/04 11:02:35 markd Exp $
+$NetBSD: distinfo,v 1.12 2010/07/18 13:08:58 markd Exp $
SHA1 (kdebindings-4.4.5.tar.bz2) = 2f041c5b050da879e8f5d09f668b56881f9f1bb2
RMD160 (kdebindings-4.4.5.tar.bz2) = 057cafc1922a5ab3999e6dcc532d656dd4cf446c
@@ -6,3 +6,4 @@ Size (kdebindings-4.4.5.tar.bz2) = 5092007 bytes
SHA1 (patch-aa) = f01b1d350a8e79e639f46c797baf035684275158
SHA1 (patch-ab) = cae51d216ad914009b4e9c80a17a172ec5a5eaec
SHA1 (patch-ac) = 698eaecc5cb2489b16409bc14c4beee5ca93a296
+SHA1 (patch-ad) = 1f0170c454dd5eecf7433b937667ad200e1bd3a8
diff --git a/x11/kdebindings4-python/patches/patch-ad b/x11/kdebindings4-python/patches/patch-ad
new file mode 100644
index 00000000000..a862463e64b
--- /dev/null
+++ b/x11/kdebindings4-python/patches/patch-ad
@@ -0,0 +1,17 @@
+$NetBSD: patch-ad,v 1.1 2010/07/18 13:08:58 markd Exp $
+
+svn 1150377
+
+--- python/pykde4/sip/akonadi/addressattribute.sip 2010/07/15 20:17:59 1150376
++++ python/pykde4/sip/akonadi/addressattribute.sip 2010/07/15 20:19:01 1150377
+@@ -57,6 +57,10 @@
+ else if (dynamic_cast<Akonadi::MessageThreadingAttribute*>(sipCpp))
+ sipType = sipType_Akonadi_MessageThreadingAttribute;
+ %End
++private:
++//force
++Akonadi::AddressAttribute& operator = (const Akonadi::AddressAttribute&);
++//end
+ };
+ };
+ %ModuleHeaderCode