User: frankie Date: 06/06/21 15:45:43 Modified: debian/patches 00list libname.dpatch Added: debian/patches ogrili2layer.cpp.dpatch Log: First hacks for 1.3.2 Revision Changes Path 1.5 +4 -3 gdal/debian/patches/00list CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/gdal/debian/patches/00list?annotate=1.5&cvsroot= CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/gdal/debian/patches/00list?rev=1.5&content-type=text/x-cvsweb-markup&cvsroot= CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/gdal/debian/patches/00list.diff?r1=1.5&r2=1.4&cvsroot= ----------------------------------- Index: 00list =================================================================== RCS file: /cvsroot/pkg-grass/gdal/debian/patches/00list,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- 00list 4 Apr 2006 07:50:18 -0000 1.4 +++ 00list 21 Jun 2006 15:45:42 -0000 1.5 @@ -1,4 +1,5 @@ libname -351372_mipsel_ftbfs -357189_gcc4.1_ftbfs -360389_amd64_ftbfs +ogrili2layer.cpp +#351372_mipsel_ftbfs +#357189_gcc4.1_ftbfs +#360389_amd64_ftbfs 1.2 +17 -17 gdal/debian/patches/libname.dpatch CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/gdal/debian/patches/libname.dpatch?annotate=1.2&cvsroot= CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/gdal/debian/patches/libname.dpatch?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot= CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/gdal/debian/patches/libname.dpatch.diff?r1=1.2&r2=1.1&cvsroot= ----------------------------------- Index: libname.dpatch =================================================================== RCS file: /cvsroot/pkg-grass/gdal/debian/patches/libname.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libname.dpatch 24 Jan 2006 10:16:50 -0000 1.1 +++ libname.dpatch 21 Jun 2006 15:45:42 -0000 1.2 @@ -5,45 +5,45 @@ ## DP: No description. @DPATCH@ -diff -urNad gdal-1.3.1~/GDALmake.opt.in gdal-1.3.1/GDALmake.opt.in ---- gdal-1.3.1~/GDALmake.opt.in 2006-01-24 10:54:25.000000000 +0100 -+++ gdal-1.3.1/GDALmake.opt.in 2006-01-24 11:14:57.000000000 +0100 -@@ -103,7 +103,7 @@ +diff -urNad gdal-1.3.2~/GDALmake.opt.in gdal-1.3.2/GDALmake.opt.in +--- gdal-1.3.2~/GDALmake.opt.in 2006-06-20 14:53:51.000000000 +0200 ++++ gdal-1.3.2/GDALmake.opt.in 2006-06-20 15:05:19.000000000 +0200 +@@ -102,7 +102,7 @@ -I$(GDAL_ROOT)/ogr -I$(GDAL_ROOT)/ogr/ogrsf_frmts # libtool targets and help variables --LIBGDAL := $(GDAL_ROOT)/libgdal.la -+LIBGDAL := $(GDAL_ROOT)/libgdal1.3.1.la - LIBGDAL_CURRENT := 10 +-LIBGDAL := libgdal.la ++LIBGDAL := libgdal1.3.2.la + LIBGDAL_CURRENT := 11 LIBGDAL_REVISION := 0 - LIBGDAL_AGE := 9 -@@ -111,9 +111,9 @@ + LIBGDAL_AGE := 10 +@@ -110,9 +110,9 @@ # native build targets and variables GDAL_VER = @GDAL_VER@ -GDAL_LIB = $(GDAL_ROOT)/libgdal.a -GDAL_SLIB = $(GDAL_ROOT)/libgdal.$(SO_EXT) -GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal -+GDAL_LIB = $(GDAL_ROOT)/libgdal1.3.1.a -+GDAL_SLIB = $(GDAL_ROOT)/libgdal1.3.1.$(SO_EXT) -+GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal1.3.1 ++GDAL_LIB = $(GDAL_ROOT)/libgdal1.3.2.a ++GDAL_SLIB = $(GDAL_ROOT)/libgdal1.3.2.$(SO_EXT) ++GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal1.3.2 # # OGR/PostgreSQL support. -@@ -258,14 +258,14 @@ +@@ -298,14 +298,14 @@ ifeq ($(HAVE_LIBTOOL), yes) - CONFIG_LIBS = $(LIBGDAL) + CONFIG_LIBS = $(GDAL_ROOT)/$(LIBGDAL) -CONFIG_LIBS_INS = -L$(INST_LIB) -lgdal -+CONFIG_LIBS_INS = -L$(INST_LIB) -lgdal1.3.1 - EXE_DEP_LIBS = $(LIBGDAL) ++CONFIG_LIBS_INS = -L$(INST_LIB) -lgdal1.3.2 + EXE_DEP_LIBS = $(GDAL_ROOT)/$(LIBGDAL) SO_EXT = la else ifeq ($(HAVE_LD_SHARED),yes) CONFIG_LIBS = $(GDAL_SLIB_LINK) $(LIBS) -CONFIG_LIBS_INS = -L$(INST_LIB) -lgdal -+CONFIG_LIBS_INS = -L$(INST_LIB) -lgdal1.3.1 ++CONFIG_LIBS_INS = -L$(INST_LIB) -lgdal1.3.2 EXE_DEP_LIBS = $(GDAL_SLIB) else CONFIG_LIBS = $(GDAL_LIBS) $(LIBS) 1.1 gdal/debian/patches/ogrili2layer.cpp.dpatch CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/gdal/debian/patches/ogrili2layer.cpp.dpatch?annotate=1.1&cvsroot= CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/gdal/debian/patches/ogrili2layer.cpp.dpatch?rev=1.1&content-type=text/x-cvsweb-markup&cvsroot= ----------------------------------- Index: ogrili2layer.cpp.dpatch =================================================================== #! /bin/sh /usr/share/dpatch/dpatch-run ## ogrili2layer.cpp.dpatch by Francesco Paolo Lovergine <[EMAIL PROTECTED]> ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. @DPATCH@ diff -urNad gdal-1.3.2~/ogr/ogrsf_frmts/ili/ogrili2layer.cpp gdal-1.3.2/ogr/ogrsf_frmts/ili/ogrili2layer.cpp --- gdal-1.3.2~/ogr/ogrsf_frmts/ili/ogrili2layer.cpp 2005-11-21 15:56:31.000000000 +0100 +++ gdal-1.3.2/ogr/ogrsf_frmts/ili/ogrili2layer.cpp 2006-06-21 16:58:26.000000000 +0200 @@ -1,5 +1,5 @@ /****************************************************************************** - * $Id: ogrili2layer.cpp.dpatch,v 1.1 2006/06/21 15:45:42 frankie Exp $ + * $Id: ogrili2layer.cpp.dpatch,v 1.1 2006/06/21 15:45:42 frankie Exp $ * * Project: Interlis 2 Translator * Purpose: Implements OGRILI2Layer class. @@ -28,6 +28,9 @@ ****************************************************************************** * * $Log: ogrili2layer.cpp.dpatch,v $ * Revision 1.1 2006/06/21 15:45:42 frankie * First hacks for 1.3.2 * + * Revision 1.5 2006/06/06 17:49:07 pka + * STL compatibility (Bug 1178) + * * Revision 1.4 2005/11/21 14:56:31 pka * Fix for call of GetNextFeature without ResetReading (Interlis 2) * Fix for polygonizer crash on Linux with GEOS 2.1.3 (Interlis 1) @@ -47,7 +50,7 @@ #include "cpl_conv.h" #include "cpl_string.h" -CPL_CVSID("$Id: ogrili2layer.cpp.dpatch,v 1.1 2006/06/21 15:45:42 frankie Exp $"); +CPL_CVSID("$Id: ogrili2layer.cpp.dpatch,v 1.1 2006/06/21 15:45:42 frankie Exp $"); /************************************************************************/ /* OGRILI2Layer() */ @@ -73,7 +76,6 @@ poFeatureDefn->SetGeomType( eReqType ); bWriter = bWriterIn; - listFeatureIt = 0; } /************************************************************************/ @@ -116,6 +118,7 @@ OGRErr OGRILI2Layer::SetFeature (OGRFeature *poFeature) { listFeature.push_back(poFeature); + if (listFeature.size() == 1) ResetReading(); return OGRERR_NONE; } @@ -132,7 +135,6 @@ /************************************************************************/ OGRFeature *OGRILI2Layer::GetNextFeature() { - if (listFeatureIt == 0) listFeatureIt = listFeature.begin(); if (listFeatureIt != listFeature.end()) return *(listFeatureIt++); return NULL;
_______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
