[QGIS-trac] Re: [Quantum GIS] #3583: patch to use the same pal instance for labeling-ng and for diagrams

[Quantum GIS]

#3583: patch to use the same pal instance for labeling-ng and for diagrams
---------------------------------------------------------+------------------
   Reporter:  mhugent                                    |              Owner:  nobody       
       Type:  patch                                      |             Status:  new          
   Priority:  critical: causes crash or data corruption  |          Milestone:  Version 1.7.0
  Component:  Build/Install                              |            Version:               
   Keywords:                                             |   Platform_version:               
   Platform:  Debian                                     |           Must_fix:  No           
Status_info:  0                                          |  
---------------------------------------------------------+------------------

Comment(by timlinux):

 Replying to [comment:6 mhugent]:
 > Hi Tim
 >
 > With svn patches, you always need to remove added files before applying
 a second time (otherwise, the content of the added file is just appended
 to the existing one and you get the redefinition errors).

 Hi. Sorry I did git reset --hard before building but I didnt notice your
 patch added new files so those never got cleaned away. It built
 successfully now.

 Regards

 Tim


 >
 > the following should work:
 > rm src/core/qgsdiagram.h
 > rm src/core/qgsdiagram.cpp
 > rm src/core/qgsdiagramrendererv2.h
 > rm src/core/qgsdiagramrendererv2.cpp
 > svn revert -R .
 > patch -p0 < patchfile
 >
 > then compile again

-- 
Ticket URL: <http://trac.osgeo.org/qgis/ticket/3583#comment:7>
Quantum GIS <http://qgis.org>
Quantum GIS is an Open Source GIS viewer/editor supporting OGR, PostGIS, and GRASS formats