The following commit has been merged in the master branch: commit dc54d61e46c077b23a74340d279e9969ff24e2dd Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri Jan 17 00:20:02 2014 +0100
Add patch to fix building with SIP 4.15. diff --git a/debian/changelog b/debian/changelog index 4025e14..f3ecd76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,7 @@ qgis (2.0.1-1) unstable; urgency=low (closes: #691333) * Change priority to optional. * Update libgdal-dev build dependency. + * Add patch to fix building with SIP 4.15. -- Bas Couwenberg <sebas...@xs4all.nl> Thu, 16 Jan 2014 21:28:09 +0100 diff --git a/debian/patches/series b/debian/patches/series index c8f98d9..de65c74 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ qgis_arm.patch an-other-typo.patch allows-to-typo.patch +sip-api-4.15.patch diff --git a/debian/patches/sip-api-4.15.patch b/debian/patches/sip-api-4.15.patch new file mode 100644 index 0000000..d0cfee3 --- /dev/null +++ b/debian/patches/sip-api-4.15.patch @@ -0,0 +1,85 @@ +Description: Support building with SIP 4.15 +Origin: http://hub.qgis.org/projects/quantum-gis/repository/revisions/641359d3cb70706f367014648cd961e905bca2dd +Author: Christian Urich <christian.ur...@gmail.com> +Bug: http://hub.qgis.org/issues/8507 + +--- a/src/core/qgsmaplayerregistry.h ++++ b/src/core/qgsmaplayerregistry.h +@@ -239,6 +239,11 @@ class CORE_EXPORT QgsMapLayerRegistry : + //! protected constructor + QgsMapLayerRegistry( QObject * parent = 0 ); + ++ /** debugging member ++ invoked when a connect() is made to this object ++ */ ++ void connectNotify( const char * signal ); ++ + private: + + static QgsMapLayerRegistry* mInstance; +@@ -246,10 +251,6 @@ class CORE_EXPORT QgsMapLayerRegistry : + QMap<QString, QgsMapLayer*> mMapLayers; + QSet<QgsMapLayer*> mOwnedLayers; + +- /** debugging member +- invoked when a connect() is made to this object +- */ +- void connectNotify( const char * signal ); + + + }; // class QgsMapLayerRegistry +--- a/src/gui/qgsattributedialog.h ++++ b/src/gui/qgsattributedialog.h +@@ -59,9 +59,10 @@ class GUI_EXPORT QgsAttributeDialog : pu + + void dialogDestroyed(); + +- private: ++ protected: + bool eventFilter( QObject *obj, QEvent *event ); + ++ private: + QDialog *mDialog; + QString mSettingsPath; + // Used to sync multiple widgets for the same field +--- a/src/gui/qgsmapcanvas.h ++++ b/src/gui/qgsmapcanvas.h +@@ -410,6 +410,11 @@ class GUI_EXPORT QgsMapCanvas : public Q + /// Handle pattern for implementation object + std::auto_ptr<CanvasProperties> mCanvasProperties; + ++ /**debugging member ++ invoked when a connect() is made to this object ++ */ ++ void connectNotify( const char * signal ); ++ + private slots: + void crsTransformEnabled( bool ); + +@@ -459,11 +464,6 @@ class GUI_EXPORT QgsMapCanvas : public Q + the last entry in case a lot of resize events arrive in short time*/ + QList< QPair<int, int> > mResizeQueue; + +- /**debugging member +- invoked when a connect() is made to this object +- */ +- void connectNotify( const char * signal ); +- + //! current layer in legend + QgsMapLayer* mCurrentLayer; + +--- a/src/gui/qgsmessagelogviewer.h ++++ b/src/gui/qgsmessagelogviewer.h +@@ -42,10 +42,11 @@ class GUI_EXPORT QgsMessageLogViewer: pu + public slots: + void logMessage( QString message, QString tag, QgsMessageLog::MessageLevel level ); + +- private: ++ protected: + void showEvent( QShowEvent * ); + void hideEvent( QHideEvent * ); + ++ private: + QToolButton *mButton; + int mCount; + -- The Quantum GIS in Debian project _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel