[110754] trunk/dports/gis/qgis

[vince at macports.org]

Revision: 110754
          https://trac.macports.org/changeset/110754
Author:   vince at macports.org
Date:     2013-09-05 02:02:16 -0700 (Thu, 05 Sep 2013)
Log Message:
-----------
Should fix #40380. Origin of the bug unknown.

Modified Paths:
--------------
    trunk/dports/gis/qgis/Portfile

Added Paths:
-----------
    trunk/dports/gis/qgis/files/patch-qgsmapcanvas_h.diff
    trunk/dports/gis/qgis/files/patch-qgsmaplayerregistry_h.diff

Modified: trunk/dports/gis/qgis/Portfile
===================================================================
--- trunk/dports/gis/qgis/Portfile	2013-09-05 08:36:41 UTC (rev 110753)
+++ trunk/dports/gis/qgis/Portfile	2013-09-05 09:02:16 UTC (rev 110754)
@@ -32,7 +32,9 @@
 worksrcdir          ${name}-${version}
 
 patchfiles          patch-conversions_sip.diff \
-                    patch-CMakeLists_txt.diff
+                    patch-CMakeLists_txt.diff \
+                    patch-qgsmapcanvas_h.diff \
+                    patch-qgsmaplayerregistry_h.diff
 
 depends_lib-append  port:libiconv \
                     port:expat \

Added: trunk/dports/gis/qgis/files/patch-qgsmapcanvas_h.diff
===================================================================
--- trunk/dports/gis/qgis/files/patch-qgsmapcanvas_h.diff	                        (rev 0)
+++ trunk/dports/gis/qgis/files/patch-qgsmapcanvas_h.diff	2013-09-05 09:02:16 UTC (rev 110754)
@@ -0,0 +1,27 @@
+--- src/gui/qgsmapcanvas.h.orig	2013-09-05 10:51:53.000000000 +0200
++++ src/gui/qgsmapcanvas.h	2013-09-05 10:53:04.000000000 +0200
+@@ -408,6 +408,12 @@
+     /// 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 );
+ 
+@@ -455,11 +461,6 @@
+        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;
+ 

Added: trunk/dports/gis/qgis/files/patch-qgsmaplayerregistry_h.diff
===================================================================
--- trunk/dports/gis/qgis/files/patch-qgsmaplayerregistry_h.diff	                        (rev 0)
+++ trunk/dports/gis/qgis/files/patch-qgsmaplayerregistry_h.diff	2013-09-05 09:02:16 UTC (rev 110754)
@@ -0,0 +1,25 @@
+--- src/core/qgsmaplayerregistry.h.orig	2013-09-05 10:40:28.000000000 +0200
++++ src/core/qgsmaplayerregistry.h	2013-09-05 10:40:45.000000000 +0200
+@@ -164,17 +164,17 @@
+ //! 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
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130905/e54dd004/attachment.html>