Update of /cvsroot/fink/experimental/dmacks/finkinfo In directory vz-cvs-3.sog:/tmp/cvs-serv28233/experimental/dmacks/finkinfo
Modified Files: spatialite-gis.info spatialite-gis.patch Log Message: fix deps and buildability (simple missing ones, and also wxgtk2.8 no longer has ctx that this package requires so switch up to wxcocoa293). Fails at runtime: ./src/generic/statusbr.cpp(179): assert "(size_t)n == m_panes.GetCount()" failed in SetStatusWidths(): status bar field count mismatch and then no gui ever appears Index: spatialite-gis.patch =================================================================== RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/spatialite-gis.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- spatialite-gis.patch 7 Jun 2012 17:51:32 -0000 1.1 +++ spatialite-gis.patch 7 Jun 2012 17:53:18 -0000 1.2 @@ -1,6 +1,18 @@ -diff -ruN spatialite-gis-1.0-ALPHA-1.orig/Makefile-OsX spatialite-gis-1.0-ALPHA-1/Makefile-OsX ---- spatialite-gis-1.0-ALPHA-1.orig/Makefile-OsX 2009-07-01 18:12:24.000000000 +0900 -+++ spatialite-gis-1.0-ALPHA-1/Makefile-OsX 2009-12-15 08:25:21.000000000 +0900 +diff -Nurd -x'*~' spatialite-gis-1.0-ALPHA-1.orig/Classdef.h spatialite-gis-1.0-ALPHA-1/Classdef.h +--- spatialite-gis-1.0-ALPHA-1.orig/Classdef.h 2009-07-05 15:55:23.000000000 -0400 ++++ spatialite-gis-1.0-ALPHA-1/Classdef.h 2012-06-07 12:39:46.000000000 -0400 +@@ -2669,7 +2669,7 @@ + } + void SetMapToolsState(); + void PrepareMap(); +- void ZoomTo(double minx, double minx, double maxx, double maxy); ++ void ZoomTo(double minx, double miny, double maxx, double maxy); + void ZoomToMarkedEntities(); + + void ComputeMapExtent(); +diff -Nurd -x'*~' spatialite-gis-1.0-ALPHA-1.orig/Makefile-OsX spatialite-gis-1.0-ALPHA-1/Makefile-OsX +--- spatialite-gis-1.0-ALPHA-1.orig/Makefile-OsX 2009-07-01 05:12:24.000000000 -0400 ++++ spatialite-gis-1.0-ALPHA-1/Makefile-OsX 2012-06-07 13:43:11.000000000 -0400 @@ -11,14 +11,14 @@ INCLUDE = Classdef.h @@ -8,7 +20,7 @@ -CXXFLAGS = $(shell wx-config --cxxflags) -LIB = $(shell wx-config --libs) +CXXFLAGS = $(shell @PREFIX@/bin/wx-config --cxxflags) -+LIB = $(shell @PREFIX@/bin/wx-config --libs) ++LIB = $(shell @PREFIX@/bin/wx-config --libs) -lwx_osx_cocoau_aui-2.9 EXTRAFLAGS = -Wall -Wextra -Wno-ctor-dtor-privacy \ - -fno-strict-aliasing -I/usr/local/include -EXTRALIBS = /usr/local/lib/libspatialite.a /usr/local/lib/libgeos_c.a \ @@ -23,3 +35,28 @@ all: $(EXE) +diff -Nurd -x'*~' spatialite-gis-1.0-ALPHA-1.orig/MapView.cpp spatialite-gis-1.0-ALPHA-1/MapView.cpp +--- spatialite-gis-1.0-ALPHA-1.orig/MapView.cpp 2009-07-05 15:55:23.000000000 -0400 ++++ spatialite-gis-1.0-ALPHA-1/MapView.cpp 2012-06-07 13:34:22.000000000 -0400 +@@ -945,8 +945,9 @@ + } + if (layer->GetType() == VECTOR_LAYER) + { ++ const char *wxcast; // wxString does not have a non-const *char + if (layer->GetTableName() == active->GetTableName() && +- layer->GetGeometryColumn() && active->GetGeometryColumn()) ++ (wxcast=layer->GetGeometryColumn()) && (wxcast=active->GetGeometryColumn())) + { + // OK: performing Identify + Identify(layer, IdentifyMouseX, IdentifyMouseY); +@@ -1496,8 +1497,9 @@ + } + if (layer->GetType() == VECTOR_LAYER) + { ++ const char *wxcast; // wxString does not have a non-const *char + if (layer->GetTableName() == active->GetTableName() && +- layer->GetGeometryColumn() && active->GetGeometryColumn()) ++ (wxcast=layer->GetGeometryColumn()) && (wxcast=active->GetGeometryColumn())) + { + // OK: performing Identify + Identify(layer, MouseIdentifyX, MouseIdentifyY); Index: spatialite-gis.info =================================================================== RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/spatialite-gis.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- spatialite-gis.info 7 Jun 2012 17:51:32 -0000 1.1 +++ spatialite-gis.info 7 Jun 2012 17:53:18 -0000 1.2 @@ -1,7 +1,7 @@ Info3: << Package: spatialite-gis Version: 1.0 -Revision: 1 +Revision: 2 Description: Minimalistic GIS built on SpatiaLite License: GPL Homepage: http://www.gaia-gis.it/spatialite @@ -10,15 +10,26 @@ Depends: << libspatialite1-shlibs, librasterlite1-shlibs, - libgettext3-shlibs, - wxgtk2.8-shlibs + libgeos3-shlibs, + libgeosc1-shlibs, + libgeotiff-shlibs, + libgettext8-shlibs, + libiconv, + proj-shlibs, + wxcocoa293-shlibs << BuildDepends: << fink (>= 0.28), libspatialite1, librasterlite1, - libgettext3-shlibs, - wxgtk2.8 + libgeos3, + libgeosc1, + libgeotiff, + libgettext8-dev, + libiconv-dev, + proj, + wxcocoa293 << +GCC: 4.0 # Unpack Phase. @@ -26,7 +37,7 @@ Source-MD5: ba92f76e91f6ba0caa68be054bf6486f PatchFile: %n.patch -PatchFile-MD5: c430b2fc79ca5561d41b34ebc8124a39 +PatchFile-MD5: d14ae6cbe609c478cd178b0b798b0ffb PatchScript: sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1 CompileScript: << ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs