add an adapted patch from upstream to adapt to new py-sip
This commit is contained in:
parent
5310ae4122
commit
5dc0a1c734
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.29 2013/10/11 23:49:45 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.30 2013/11/08 22:40:38 sthen Exp $
|
||||
|
||||
BROKEN-powerpc= doesn't build, assembler error: operand out of range
|
||||
|
||||
@ -8,6 +8,7 @@ ONLY_FOR_ARCHS = ${GCC4_ARCHS}
|
||||
SHARED_ONLY = Yes
|
||||
|
||||
DISTNAME = qgis-1.7.4
|
||||
REVISION = 0
|
||||
EXTRACT_SUFX = .tar.bz2
|
||||
CATEGORIES = geo x11
|
||||
|
||||
|
32
geo/qgis/patches/patch-src_core_qgsmaplayerregistry_h
Normal file
32
geo/qgis/patches/patch-src_core_qgsmaplayerregistry_h
Normal file
@ -0,0 +1,32 @@
|
||||
$OpenBSD: patch-src_core_qgsmaplayerregistry_h,v 1.1 2013/11/08 22:40:38 sthen Exp $
|
||||
|
||||
commit 641359d3cb70706f367014648cd961e905bca2dd
|
||||
Author: Christian Urich <christian.urich@gmail.com>
|
||||
Date: Tue Sep 10 12:21:08 2013 +1000
|
||||
|
||||
Fix with newer sip
|
||||
|
||||
--- src/core/qgsmaplayerregistry.h.orig Wed Feb 22 20:48:14 2012
|
||||
+++ src/core/qgsmaplayerregistry.h Fri Nov 8 10:31:53 2013
|
||||
@@ -121,16 +121,17 @@ class CORE_EXPORT QgsMapLayerRegistry : public QObject
|
||||
//! 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;
|
||||
|
||||
QMap<QString, QgsMapLayer*> mMapLayers;
|
||||
|
||||
- /** debugging member
|
||||
- invoked when a connect() is made to this object
|
||||
- */
|
||||
- void connectNotify( const char * signal );
|
||||
|
||||
|
||||
}; // class QgsMapLayerRegistry
|
34
geo/qgis/patches/patch-src_gui_qgsmapcanvas_h
Normal file
34
geo/qgis/patches/patch-src_gui_qgsmapcanvas_h
Normal file
@ -0,0 +1,34 @@
|
||||
$OpenBSD: patch-src_gui_qgsmapcanvas_h,v 1.1 2013/11/08 22:40:38 sthen Exp $
|
||||
|
||||
Adapted from commit 641359d3cb70706f367014648cd961e905bca2dd
|
||||
Author: Christian Urich <christian.urich@gmail.com>
|
||||
Date: Tue Sep 10 12:21:08 2013 +1000
|
||||
|
||||
Fix with newer sip
|
||||
|
||||
--- src/gui/qgsmapcanvas.h.orig Wed Feb 22 20:48:14 2012
|
||||
+++ src/gui/qgsmapcanvas.h Fri Nov 8 10:35:47 2013
|
||||
@@ -389,6 +389,11 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
|
||||
/// 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:
|
||||
/// this class is non-copyable
|
||||
/**
|
||||
@@ -432,11 +437,6 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
|
||||
rendering may put their sizes into this list. The canvas then picks up
|
||||
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;
|
Loading…
x
Reference in New Issue
Block a user