diff options
Diffstat (limited to 'devel/py-pykde4')
-rw-r--r-- | devel/py-pykde4/Makefile | 20 | ||||
-rw-r--r-- | devel/py-pykde4/distinfo | 4 | ||||
-rw-r--r-- | devel/py-pykde4/files/patch-sip_4.15 | 335 | ||||
-rw-r--r-- | devel/py-pykde4/pkg-plist | 16 |
4 files changed, 20 insertions, 355 deletions
diff --git a/devel/py-pykde4/Makefile b/devel/py-pykde4/Makefile index 01cdc99f08ce..baa8a544c290 100644 --- a/devel/py-pykde4/Makefile +++ b/devel/py-pykde4/Makefile @@ -2,17 +2,15 @@ PORTNAME= pykde4 PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 CATEGORIES= devel kde python -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src +MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for KDE -LIB_DEPENDS= qwt.5:${PORTSDIR}/x11-toolkits/qwt5 +LIB_DEPENDS= libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtDesigner.so:${PORTSDIR}/devel/py-qt4-designer \ ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \ @@ -29,7 +27,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} \ USE_KDE4= kdehier kdelibs kdeprefix okular pimlibs \ akonadi automoc4 soprano -USE_PYTHON= yes +USE_PYTHON= 2 USE_QT4= corelib dbus designer_build gui network xml \ qmake_build moc_build uic_build rcc_build USE_XZ= yes @@ -43,9 +41,6 @@ PLIST_SUB+= SIPDIR=share/sip OPTIONS_DEFINE= EXAMPLES -NO_STAGE= yes -.include <bsd.port.options.mk> - post-patch: ${FIND} -d ${PATCH_WRKSRC}/sip -name "*.orig" -delete @@ -56,10 +51,9 @@ pre-configure: ${RM} ${WRKSRC}/examples/CMakeLists.txt post-install: -.if ${PORT_OPTIONS:MEXAMPLES} - ${MKDIR} ${EXAMPLESDIR} - cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR} -.endif - ${INSTALL_DATA} ${WRKDIR}/kdebindings4.pth ${PYTHON_SITELIBDIR} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} + ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} + ${INSTALL_DATA} ${WRKDIR}/kdebindings4.pth ${STAGEDIR}${PYTHON_SITELIBDIR} .include <bsd.port.mk> diff --git a/devel/py-pykde4/distinfo b/devel/py-pykde4/distinfo index 8c02814c6933..3526c5fd39a8 100644 --- a/devel/py-pykde4/distinfo +++ b/devel/py-pykde4/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/4.10.5/pykde4-4.10.5.tar.xz) = f34cd1d4d7ac36d5ba15b714970de0134b713b844d83ac734d7131d74cdf5881 -SIZE (KDE/4.10.5/pykde4-4.10.5.tar.xz) = 2046180 +SHA256 (KDE/4.12.2/pykde4-4.12.2.tar.xz) = f2b38abd77f33e8e270cd123bf30d8aab8000aabd9c0966fb85284cfc2f87b74 +SIZE (KDE/4.12.2/pykde4-4.12.2.tar.xz) = 2005172 diff --git a/devel/py-pykde4/files/patch-sip_4.15 b/devel/py-pykde4/files/patch-sip_4.15 deleted file mode 100644 index 4a041e95d8d2..000000000000 --- a/devel/py-pykde4/files/patch-sip_4.15 +++ /dev/null @@ -1,335 +0,0 @@ -commit 63a75c5131b44d4a1af6771fab119574e06fb8a0 -Author: Simon Edwards <simon@simonzone.com> -Date: Sun Sep 8 20:45:57 2013 +0200 - - Make it work on the latest SIP and PyQt versions. - -commit 7c0648b3931e069892943bc645dc61f246375cdf -Author: Luca Beltrame <lbeltrame@kde.org> -Date: Wed Sep 11 00:02:54 2013 +0200 - - More fixes for the build system: this is the "harmless" part of the - patch used by Debian (and made by Simon Edwards himself) which adds the - "protected is public" hack to allow for proper building with SIP 4.15+. - - PyKDE4 needs some code adjustments, however: those exist in patch form - (see bug) but aren't yet committed. Simon, should I push them already, - or should I wait till the issues on ARM are resolved? - - CCMAIL: simon@simonzone.com - CCBUG: 323950 - -commit 783d073f30e253e8db52d8801c1c829e6f405e60 -Author: Luca Beltrame <lbeltrame@kde.org> -Date: Sun Sep 1 17:33:30 2013 +0200 - - First step in trying to make PyKDE4 work with newer SIP. - Context is http://lists.kde.org/?l=kde-bindings&m=137759567504203&w=2 - - Notice that this change alone will not fix the issues: a newer SIP - (unreleased) is needed and more work is needed in the bindings to fix issues - - CCBUG: 323899 -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 09fcc34..cf133d7 100644 ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -114,20 +114,20 @@ set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug) - if (PYTHON_VERSION_MAJOR GREATER 2) - if(PYQT4_VERSION STRGREATER "040904") - # Disable for newer PyQt -- set(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector) -+ set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector) - else () - set(SIP_EXTRA_OPTIONS -g) - endif() - else (PYTHON_VERSION_MAJOR GREATER 2) - if(PYQT4_VERSION STRGREATER "040904") - # Disable for newer PyQt -- set(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector -x Py_v3) -+ set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x Py_v3) - else () - set(SIP_EXTRA_OPTIONS -g -x Py_v3) - endif() - endif () - --add_definitions(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API) -+add_definitions(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API -DSIP_PROTECTED_IS_PUBLIC -Dprotected=public) - - file(GLOB kdecore_files_sip sip/kdecore/*.sip) - set(SIP_EXTRA_FILES_DEPEND ${kdecore_files_sip}) -diff --git a/sip/akonadi/entitytreemodel.sip b/sip/akonadi/entitytreemodel.sip -index 99cfbb4..a60690c 100644 ---- sip/akonadi/entitytreemodel.sip -+++ sip/akonadi/entitytreemodel.sip -@@ -122,5 +122,12 @@ public: - }; - bool includeUnsubscribed () const; - void setIncludeUnsubscribed (bool show); -+//force -+private: -+ virtual bool removeColumns(int, int, const QModelIndex&); -+ virtual bool removeRows(int, int, const QModelIndex&); -+ virtual bool insertColumns(int, int, const QModelIndex&); -+ virtual bool insertRows(int, int, const QModelIndex&); -+//end - }; - }; -diff --git a/sip/akonadi/favoritecollectionsmodel.sip b/sip/akonadi/favoritecollectionsmodel.sip -index 4f27942..0f7efdb 100644 ---- sip/akonadi/favoritecollectionsmodel.sip -+++ sip/akonadi/favoritecollectionsmodel.sip -@@ -42,5 +42,9 @@ public: - virtual bool dropMimeData (const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent); - virtual QStringList mimeTypes () const; - virtual Qt::ItemFlags flags (const QModelIndex& index) const; -+//force -+private: -+ virtual void setSourceModel(QAbstractItemModel *); -+//end - }; - }; -diff --git a/sip/kdeui/highlighter.sip b/sip/kdeui/highlighter.sip -index 79dbe8e..45f0a4c 100644 ---- sip/kdeui/highlighter.sip -+++ sip/kdeui/highlighter.sip -@@ -70,6 +70,11 @@ private: - public: - ~Highlighter (); - bool checkerEnabledByDefault () const; -+//force -+private: -+ virtual void connectNotify(const char* signal); -+ virtual void disconnectNotify(const char* signal); -+//end - }; - // Highlighter - -diff --git a/sip/kdeui/kdatetable.sip b/sip/kdeui/kdatetable.sip -index 9c73e70..32d06ca 100644 ---- sip/kdeui/kdatetable.sip -+++ sip/kdeui/kdatetable.sip -@@ -61,8 +61,10 @@ class KDateValidator : QValidator - - public: - KDateValidator (QWidget* parent /TransferThis/ = 0); -- virtual QValidator::State validate (QString& text, int& e /In/) const; -- virtual void fixup (QString& input) const; -+ virtual QValidator::State validate(QString & /In,Out/, int & /In,Out/) const = 0 /API=QString:2 - /; -+ virtual QValidator::State validate(QString & /Constrained/, int & /In,Out/) const = 0 /API=QString: - 2/; -+ virtual void fixup(QString &input /In,Out/) const /API=QString:2 - /; -+ virtual void fixup(QString & /Constrained/) const /API=QString: - 2/; - QValidator::State date (const QString& text, QDate& date) const; - }; - // KDateValidator -diff --git a/sip/kdeui/knumvalidator.sip b/sip/kdeui/knumvalidator.sip -index baa13dc..d842fcc 100644 ---- sip/kdeui/knumvalidator.sip -+++ sip/kdeui/knumvalidator.sip -@@ -30,8 +30,10 @@ class KIntValidator : QValidator - public: - explicit KIntValidator (QWidget* parent /TransferThis/, int base = 10); - KIntValidator (int bottom, int top, QWidget* parent /TransferThis/, int base = 10); -- virtual QValidator::State validate (QString&, int& /In/) const; -- virtual void fixup (QString&) const; -+ virtual QValidator::State validate(QString & /In,Out/, int & /In,Out/) const = 0 /API=QString:2 - /; -+ virtual QValidator::State validate(QString & /Constrained/, int & /In,Out/) const = 0 /API=QString: - 2/; -+ virtual void fixup(QString &input /In,Out/) const /API=QString:2 - /; -+ virtual void fixup(QString & /Constrained/) const /API=QString: - 2/; - virtual void setRange (int bottom, int top); - virtual void setBase (int base); - virtual int bottom () const; -@@ -53,8 +55,10 @@ public: - explicit KFloatValidator (QWidget* parent /TransferThis/); - KFloatValidator (double bottom, double top, QWidget* parent /TransferThis/); - KFloatValidator (double bottom, double top, bool localeAware, QWidget* parent /TransferThis/); -- virtual QValidator::State validate (QString&, int& /In/) const; -- virtual void fixup (QString&) const; -+ virtual QValidator::State validate(QString & /In,Out/, int & /In,Out/) const = 0 /API=QString:2 - /; -+ virtual QValidator::State validate(QString & /Constrained/, int & /In,Out/) const = 0 /API=QString: - 2/; -+ virtual void fixup(QString &input /In,Out/) const /API=QString:2 - /; -+ virtual void fixup(QString & /Constrained/) const /API=QString: - 2/; - virtual void setRange (double bottom, double top); - virtual double bottom () const; - virtual double top () const; -@@ -75,7 +79,8 @@ class KDoubleValidator : QDoubleValidator - public: - explicit KDoubleValidator (QObject* parent /TransferThis/); - KDoubleValidator (double bottom, double top, int decimals, QObject* parent /TransferThis/); -- virtual QValidator::State validate (QString& input, int& pos /In/) const; -+ virtual QValidator::State validate(QString & /In,Out/, int & /In,Out/) const = 0 /API=QString:2 - /; -+ virtual QValidator::State validate(QString & /Constrained/, int & /In,Out/) const = 0 /API=QString: - 2/; - bool acceptLocalizedNumbers () const; - void setAcceptLocalizedNumbers (bool accept); - ~KDoubleValidator (); -diff --git a/sip/kdeui/kpixmapregionselectorwidget.sip b/sip/kdeui/kpixmapregionselectorwidget.sip -index 44a9b09..4e5b294 100644 ---- sip/kdeui/kpixmapregionselectorwidget.sip -+++ sip/kdeui/kpixmapregionselectorwidget.sip -@@ -57,6 +57,7 @@ protected: - private: - //force - KPixmapRegionSelectorWidget (const KPixmapRegionSelectorWidget&); -+ virtual bool eventFilter(QObject*, QEvent*); - //end - public: - ~KPixmapRegionSelectorWidget (); -diff --git a/sip/kdeui/kpixmapsequenceoverlaypainter.sip b/sip/kdeui/kpixmapsequenceoverlaypainter.sip -index 60236d0..e438482 100644 ---- sip/kdeui/kpixmapsequenceoverlaypainter.sip -+++ sip/kdeui/kpixmapsequenceoverlaypainter.sip -@@ -39,4 +39,8 @@ public: - void setOffset (const QPoint& offset); - void start (); - void stop (); -+//force -+private: -+ virtual bool eventFilter(QObject*, QEvent*); -+//end - }; -diff --git a/sip/kdeui/krecursivefilterproxymodel.sip b/sip/kdeui/krecursivefilterproxymodel.sip -index 40acaff..ca131e5 100644 ---- sip/kdeui/krecursivefilterproxymodel.sip -+++ sip/kdeui/krecursivefilterproxymodel.sip -@@ -31,4 +31,8 @@ protected: - virtual bool acceptRow (int sourceRow, const QModelIndex& sourceParent) const; - public: - virtual QModelIndexList match (const QModelIndex& start, int role, const QVariant& value, int hits = 1, Qt::MatchFlags flags = Qt::MatchFlags(Qt::MatchStartsWith|Qt::MatchWrap)) const; -+//force -+private: -+ virtual bool filterAcceptsRow(int, const QModelIndex&) const; -+//end - }; -diff --git a/sip/kdeui/kstringvalidator.sip b/sip/kdeui/kstringvalidator.sip -index 3e8705d..47604e2 100644 ---- sip/kdeui/kstringvalidator.sip -+++ sip/kdeui/kstringvalidator.sip -@@ -35,8 +35,10 @@ public: - bool isFixupEnabled () const; - void setStringList (const QStringList& list); - QStringList stringList () const; -- virtual QValidator::State validate (QString& input, int& pos /Out/) const; -- virtual void fixup (QString& input) const; -+ virtual QValidator::State validate(QString & /In,Out/, int & /In,Out/) const = 0 /API=QString:2 - /; -+ virtual QValidator::State validate(QString & /Constrained/, int & /In,Out/) const = 0 /API=QString: - 2/; -+ virtual void fixup(QString &input /In,Out/) const /API=QString:2 - /; -+ virtual void fixup(QString & /Constrained/) const /API=QString: - 2/; - ~KStringListValidator (); - }; - // KStringListValidator -@@ -51,8 +53,10 @@ class KMimeTypeValidator : QValidator - - public: - explicit KMimeTypeValidator (QObject* parent /TransferThis/ = 0); -- virtual QValidator::State validate (QString& input, int& pos /Out/) const; -- virtual void fixup (QString& input) const; -+ virtual QValidator::State validate(QString & /In,Out/, int & /In,Out/) const = 0 /API=QString:2 - /; -+ virtual QValidator::State validate(QString & /Constrained/, int & /In,Out/) const = 0 /API=QString: - 2/; -+ virtual void fixup(QString &input /In,Out/) const /API=QString:2 - /; -+ virtual void fixup(QString & /Constrained/) const /API=QString: - 2/; - ~KMimeTypeValidator (); - }; - // KMimeTypeValidator -diff --git a/sip/kdeui/ktogglefullscreenaction.sip b/sip/kdeui/ktogglefullscreenaction.sip -index 962363b..71626e5 100644 ---- sip/kdeui/ktogglefullscreenaction.sip -+++ sip/kdeui/ktogglefullscreenaction.sip -@@ -37,7 +37,10 @@ protected: - bool eventFilter (QObject* object, QEvent* event); - public: - ~KToggleFullScreenAction (); -+ -+//force -+private: -+ virtual void slotToggled(bool); -+//end - }; - // KToggleFullScreenAction -- -- -diff --git a/sip/kdeui/ktoggletoolbaraction.sip b/sip/kdeui/ktoggletoolbaraction.sip -index 67efc7a..c52b39b 100644 ---- sip/kdeui/ktoggletoolbaraction.sip -+++ sip/kdeui/ktoggletoolbaraction.sip -@@ -33,6 +33,10 @@ public: - KToolBar* toolBar (); - virtual bool eventFilter (QObject* watched, QEvent* event); - ~KToggleToolBarAction (); -+//force -+private: -+ virtual void slotToggled( bool checked ); -+//end - }; - // KToggleToolBarAction - -diff --git a/sip/kio/kdirmodel.sip b/sip/kio/kdirmodel.sip -index 25dc775..ed90376 100644 ---- sip/kio/kdirmodel.sip -+++ sip/kio/kdirmodel.sip -@@ -105,6 +105,13 @@ public: - ~KDirModel (); - void setJobTransfersVisible (bool value); - bool jobTransfersVisible () const; -+//force -+private: -+ virtual bool removeColumns(int, int, const QModelIndex&); -+ virtual bool removeRows(int, int, const QModelIndex&); -+ virtual bool insertColumns(int, int, const QModelIndex&); -+ virtual bool insertRows(int, int, const QModelIndex&); -+//end - }; - // KDirModel - -diff --git a/sip/kio/kshellcompletion.sip b/sip/kio/kshellcompletion.sip -index 6bd865c..4fd9ccb 100644 ---- sip/kio/kshellcompletion.sip -+++ sip/kio/kshellcompletion.sip -@@ -39,5 +39,3 @@ public: - ~KShellCompletion (); - }; - // KShellCompletion -- -- -diff --git a/sip/kio/metainfojob.sip b/sip/kio/metainfojob.sip -index de1bb23..1596f08 100644 ---- sip/kio/metainfojob.sip -+++ sip/kio/metainfojob.sip -@@ -51,7 +51,7 @@ protected: - private: - //force - MetaInfoJob (); -- -+ virtual void start(); - //end - public: - ~MetaInfoJob (); -diff --git a/sip/plasma/applet.sip b/sip/plasma/applet.sip -index a5fd606..2e2cadc 100644 ---- sip/plasma/applet.sip -+++ sip/plasma/applet.sip -@@ -217,6 +217,10 @@ public: - void showConfigurationInterface (QWidget* widget); - bool isUserConfiguring () const; - explicit Applet (const KPluginInfo& info, QGraphicsItem* parent = 0, uint appletId = 0); -+//force -+private: -+ virtual void paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget*); -+//end - }; - // Applet - -diff --git a/sip/plasma/glapplet.sip b/sip/plasma/glapplet.sip -index 2e4fbc0..ab35ccb 100644 ---- sip/plasma/glapplet.sip -+++ sip/plasma/glapplet.sip -@@ -52,6 +52,10 @@ public: - ~GLApplet (); - GLuint bindTexture (const QImage& image, GLenum target = GL_TEXTURE_2D); - void deleteTexture (GLuint texture_id); -+ -+private: -+ virtual void paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget*); -+ virtual void paintInterface(QPainter*, const QStyleOptionGraphicsItem*, const QRect&); - //end - }; - // GLApplet diff --git a/devel/py-pykde4/pkg-plist b/devel/py-pykde4/pkg-plist index fde5588f4c23..98e12b462ff5 100644 --- a/devel/py-pykde4/pkg-plist +++ b/devel/py-pykde4/pkg-plist @@ -666,31 +666,37 @@ lib/kde4/kpythonpluginfactory.so %%SIPDIR%%/PyKDE4/kterminal/kterminalmod.sip %%SIPDIR%%/PyKDE4/kterminal/terminal_interface.sip %%SIPDIR%%/PyKDE4/kterminal/terminal_interface_v2.sip +%%SIPDIR%%/PyKDE4/ktexteditor/annotationinterface.sip %%SIPDIR%%/PyKDE4/ktexteditor/attribute.sip %%SIPDIR%%/PyKDE4/ktexteditor/codecompletioninterface.sip %%SIPDIR%%/PyKDE4/ktexteditor/codecompletionmodel.sip +%%SIPDIR%%/PyKDE4/ktexteditor/codecompletionmodelcontrollerinterface.sip %%SIPDIR%%/PyKDE4/ktexteditor/commandinterface.sip %%SIPDIR%%/PyKDE4/ktexteditor/configinterface.sip %%SIPDIR%%/PyKDE4/ktexteditor/configpage.sip %%SIPDIR%%/PyKDE4/ktexteditor/containerinterface.sip %%SIPDIR%%/PyKDE4/ktexteditor/cursor.sip -%%SIPDIR%%/PyKDE4/ktexteditor/cursorfeedback.sip %%SIPDIR%%/PyKDE4/ktexteditor/document.sip %%SIPDIR%%/PyKDE4/ktexteditor/editor.sip %%SIPDIR%%/PyKDE4/ktexteditor/editorchooser.sip %%SIPDIR%%/PyKDE4/ktexteditor/factory.sip +%%SIPDIR%%/PyKDE4/ktexteditor/highlightinterface.sip %%SIPDIR%%/PyKDE4/ktexteditor/ktexteditormod.sip +%%SIPDIR%%/PyKDE4/ktexteditor/loadsavefiltercheckplugin.sip %%SIPDIR%%/PyKDE4/ktexteditor/markinterface.sip +%%SIPDIR%%/PyKDE4/ktexteditor/modeinterface.sip %%SIPDIR%%/PyKDE4/ktexteditor/modificationinterface.sip +%%SIPDIR%%/PyKDE4/ktexteditor/movingcursor.sip +%%SIPDIR%%/PyKDE4/ktexteditor/movinginterface.sip +%%SIPDIR%%/PyKDE4/ktexteditor/movingrange.sip +%%SIPDIR%%/PyKDE4/ktexteditor/movingrangefeedback.sip %%SIPDIR%%/PyKDE4/ktexteditor/plugin.sip %%SIPDIR%%/PyKDE4/ktexteditor/range.sip -%%SIPDIR%%/PyKDE4/ktexteditor/rangefeedback.sip +%%SIPDIR%%/PyKDE4/ktexteditor/recoveryinterface.sip %%SIPDIR%%/PyKDE4/ktexteditor/searchinterface.sip %%SIPDIR%%/PyKDE4/ktexteditor/sessionconfiginterface.sip -%%SIPDIR%%/PyKDE4/ktexteditor/smartcursor.sip -%%SIPDIR%%/PyKDE4/ktexteditor/smartinterface.sip -%%SIPDIR%%/PyKDE4/ktexteditor/smartrange.sip %%SIPDIR%%/PyKDE4/ktexteditor/templateinterface.sip +%%SIPDIR%%/PyKDE4/ktexteditor/templateinterface2.sip %%SIPDIR%%/PyKDE4/ktexteditor/texthintinterface.sip %%SIPDIR%%/PyKDE4/ktexteditor/variableinterface.sip %%SIPDIR%%/PyKDE4/ktexteditor/view.sip |