head 1.2; access; symbols pkgsrc-2014Q3:1.1.0.2 pkgsrc-2014Q3-base:1.1; locks; strict; comment @# @; 1.2 date 2014.11.13.10.53.49; author markd; state dead; branches; next 1.1; commitid cAGBpNg54OBrS0Yx; 1.1 date 2014.08.21.21.34.33; author wiz; state Exp; branches; next ; commitid wqPXP5DXALBN7hNx; desc @@ 1.2 log @Update to KDE SC 4.14.3 @ text @$NetBSD: patch-sip_solid_networking.sip,v 1.1 2014/08/21 21:34:33 wiz Exp $ --- sip/solid/networking.sip.orig 2014-01-02 19:29:04.000000000 +0000 +++ sip/solid/networking.sip @@@@ -51,6 +51,20 @@@@ Solid::Networking::Status status (); //ig void setDisconnectPolicy (Solid::Networking::ManagementPolicy policy); //ig Solid::Networking::ManagementPolicy disconnectPolicy (); +// SIP 4.16 renamed the PyQt4NoQMetaObject annotation to PyQtNoQMetaObject. +// Since SIP does not have a preprocessor, we have to duplicate the class +// definition with different annotations. +%If (SIP_4_16 - ) +class Notifier : QObject /Abstract,PyQtNoQMetaObject/ +{ + void statusChanged (Solid::Networking::Status status); + void shouldConnect (); + void shouldDisconnect (); +protected: + Notifier (); +}; +%End +%If ( - SIP_4_16) class Notifier : QObject /Abstract,PyQt4NoQMetaObject/ { void statusChanged (Solid::Networking::Status status); @@@@ -59,6 +73,7 @@@@ class Notifier : QObject /Abstract,PyQt4 protected: Notifier (); }; +%End Solid::Networking::Notifier* notifier (); }; @ 1.1 log @Update for py-sip-4.16/py-qt4-4.11 using patches from upstream git. @ text @d1 1 a1 1 $NetBSD$ @