SOURCES: gdal-DESTDIR.patch, gdal-gcc4.patch, gdal-pgsql.patch - u...

qboosh qboosh at pld-linux.org
Sat Jun 3 17:50:44 CEST 2006 

Author: qboosh                       Date: Sat Jun  3 15:50:44 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 1.3.2

---- Files affected:
SOURCES:
   gdal-DESTDIR.patch (1.6 -> 1.7) , gdal-gcc4.patch (1.1 -> 1.2) , gdal-pgsql.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/gdal-DESTDIR.patch
diff -u SOURCES/gdal-DESTDIR.patch:1.6 SOURCES/gdal-DESTDIR.patch:1.7
--- SOURCES/gdal-DESTDIR.patch:1.6	Wed Oct 19 23:25:09 2005
+++ SOURCES/gdal-DESTDIR.patch	Sat Jun  3 17:50:39 2006
@@ -1,6 +1,6 @@
---- gdal-1.3.1/GNUmakefile.orig	2005-09-16 17:47:29.000000000 +0200
-+++ gdal-1.3.1/GNUmakefile	2005-10-19 21:59:38.015231792 +0200
-@@ -132,8 +132,8 @@
+--- gdal-1.3.2/GNUmakefile.orig	2006-03-24 17:51:56.000000000 +0100
++++ gdal-1.3.2/GNUmakefile	2006-05-29 07:38:45.280728750 +0200
+@@ -141,8 +141,8 @@
  
  install-docs:
  	(cd ogr; $(MAKE) install-docs)
@@ -11,7 +11,7 @@
  
  web-update:	docs
  	cp html/*.* $(WEB_DIR)
-@@ -141,9 +141,9 @@
+@@ -150,9 +150,9 @@
  install:	default install-actions
  
  install-actions: install-lib
@@ -24,10 +24,10 @@
  	(cd port; $(MAKE) install)
  	(cd gcore; $(MAKE) install)
  	(cd frmts; $(MAKE) install)
-@@ -155,14 +155,14 @@
- 	(cd pymod; $(MAKE) install)
- endif
+@@ -166,14 +166,14 @@
+ ifneq ($(BINDINGS),)
  	(cd swig; $(MAKE) install)
+ endif
 -	for f in data/*.* ; do $(INSTALL_DATA) $$f $(INST_DATA) ; done
 -	$(LIBTOOL_FINISH) $(INST_LIB)
 +	for f in data/*.* ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done
@@ -43,7 +43,7 @@
  
  else
  
-@@ -172,21 +172,21 @@
+@@ -183,21 +183,21 @@
  GDAL_SLIB_B	=	$(notdir $(GDAL_SLIB))
  
  install-lib:
@@ -74,20 +74,22 @@
  
  endif # HAVE_LD_SHARED=no 
  
---- gdal-1.2.0/ogr/GNUmakefile.orig	2004-02-21 16:36:44.000000000 +0100
-+++ gdal-1.2.0/ogr/GNUmakefile	2004-04-07 21:59:04.108178552 +0200
-@@ -74,8 +74,8 @@
- 	cp ogrsf_frmts/ogr_formats.html html
+--- gdal-1.3.2/ogr/GNUmakefile.orig	2006-03-24 17:51:57.000000000 +0100
++++ gdal-1.3.2/ogr/GNUmakefile	2006-05-29 07:39:20.254914500 +0200
+@@ -81,9 +81,9 @@
+ 	cp ogr_feature_style.html html
  
  install-docs:
 -	$(INSTALL_DIR) $(INST_DOCS)/ogr
 -	cp html/* $(INST_DOCS)/ogr
+-	cp ../doc/ogr/*.gif $(INST_DOCS)/ogr
 +	$(INSTALL_DIR) $(DESTDIR)$(INST_DOCS)/ogr
 +	cp html/* $(DESTDIR)$(INST_DOCS)/ogr
++	cp ../doc/ogr/*.gif $(DESTDIR)$(INST_DOCS)/ogr
  
  gdalso:	$(GDAL_SLIB)
  
-@@ -115,14 +115,14 @@
+@@ -123,14 +123,14 @@
  
  ifeq ($(OGR_ENABLED),yes)
  install-full:	apps
@@ -197,26 +199,29 @@
  install:
 -	$(INSTALL_DATA) rawdataset.h $(INST_INCLUDE)
 +	$(INSTALL_DATA) rawdataset.h $(DESTDIR)$(INST_INCLUDE)
---- gdal-1.3.1/swig/python/GNUmakefile.orig	2005-09-07 03:14:39.000000000 +0200
-+++ gdal-1.3.1/swig/python/GNUmakefile	2005-10-19 22:00:54.027676144 +0200
-@@ -25,4 +25,4 @@
+--- gdal-1.3.2/swig/python/GNUmakefile.orig	2006-03-24 17:51:58.000000000 +0100
++++ gdal-1.3.2/swig/python/GNUmakefile	2006-05-29 07:39:37.868015250 +0200
+@@ -24,4 +24,4 @@
  	python setup.py build
  
- install: generate
+ install:
 -	python setup.py install --prefix=$(prefix)
 +	python setup.py install --prefix=$(DESTDIR)$(prefix)
---- gdal-1.3.1/swig/ruby/RubyMakefile.mk.orig	2005-10-02 00:01:29.000000000 +0200
-+++ gdal-1.3.1/swig/ruby/RubyMakefile.mk	2005-10-19 22:02:19.063748696 +0200
-@@ -47,10 +47,10 @@
+--- gdal-1.3.2/swig/ruby/RubyMakefile.mk.orig	2006-01-14 02:48:46.000000000 +0100
++++ gdal-1.3.2/swig/ruby/RubyMakefile.mk	2006-05-29 07:40:11.162096000 +0200
+@@ -38,11 +38,11 @@
+ veryclean: clean
  	rm -frd $(INSTALL_DIR)
  
- $(INSTALL_DIR):
+-$(INSTALL_DIR):
 -	mkdir -v $(INSTALL_DIR)
++$(DESTDIR)$(INSTALL_DIR):
 +	mkdir -v $(DESTDIR)$(INSTALL_DIR)
  
- install: $(INSTALL_DIR)
--	cp *.so $(INSTALL_DIR)
-+	cp *.so $(DESTDIR)$(INSTALL_DIR)
+-install: $(INSTALL_DIR)
+-	$(INSTALL) $(RUBY_MODULES) $(INSTALL_DIR) 
++install: $(DESTDIR)$(INSTALL_DIR)
++	$(INSTALL) $(RUBY_MODULES) $(DESTDIR)$(INSTALL_DIR) 
  
  $(RUBY_MODULES): %.so: %_wrap.o
- 	$(LD) $(LDFLAGS) $(LIBS) $(GDAL_LIB) $(RUBY_LIB) $< -o $@
+ 	$(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@

================================================================
Index: SOURCES/gdal-gcc4.patch
diff -u SOURCES/gdal-gcc4.patch:1.1 SOURCES/gdal-gcc4.patch:1.2
--- SOURCES/gdal-gcc4.patch:1.1	Sun Mar  5 15:01:55 2006
+++ SOURCES/gdal-gcc4.patch	Sat Jun  3 17:50:39 2006
@@ -1,14 +1,5 @@
---- gdal-1.3.1/frmts/fit/fitdataset.cpp.orig	2005-07-05 19:10:52.000000000 +0200
-+++ gdal-1.3.1/frmts/fit/fitdataset.cpp	2006-03-05 13:07:26.440480750 +0100
-@@ -174,7 +174,7 @@
- 
- public:
- 
--    FITRasterBand::FITRasterBand( FITDataset *, int );
-+    FITRasterBand( FITDataset *, int );
- 	~FITRasterBand();
-     
-     // should override RasterIO eventually.
+--- gdal-1.3.2/frmts/fit/fitdataset.cpp.orig	2005-07-05 19:10:52.000000000 +0200
++++ gdal-1.3.2/frmts/fit/fitdataset.cpp	2006-03-05 13:07:26.440480750 +0100
 @@ -1016,7 +1016,7 @@
          CPLDebug("FIT", "Loading file with header version 01");
  
@@ -18,3 +9,22 @@
          gst_swapb(head->dataOffset);
  	info->dataOffset = head01->dataOffset;
  
+--- gdal-1.3.2/ogr/ogrsf_frmts/ili/ogrili2layer.cpp.orig	2005-11-21 15:56:31.000000000 +0100
++++ gdal-1.3.2/ogr/ogrsf_frmts/ili/ogrili2layer.cpp	2006-06-03 12:49:56.937947000 +0200
+@@ -73,7 +73,7 @@
+     poFeatureDefn->SetGeomType( eReqType );
+ 
+     bWriter = bWriterIn;
+-    listFeatureIt = 0;
++    listFeatureIt = listFeature.begin();
+ }
+ 
+ /************************************************************************/
+@@ -132,7 +132,6 @@
+ /************************************************************************/
+ 
+ OGRFeature *OGRILI2Layer::GetNextFeature() {
+-    if (listFeatureIt == 0) listFeatureIt = listFeature.begin();
+     if (listFeatureIt != listFeature.end())
+         return *(listFeatureIt++);
+     return NULL;

================================================================
Index: SOURCES/gdal-pgsql.patch
diff -u SOURCES/gdal-pgsql.patch:1.2 SOURCES/gdal-pgsql.patch:1.3
--- SOURCES/gdal-pgsql.patch:1.2	Thu Sep  1 14:28:12 2005
+++ SOURCES/gdal-pgsql.patch	Sat Jun  3 17:50:39 2006
@@ -1,11 +1,11 @@
---- gdal-1.3.0/configure.in        2005-09-01 13:48:13.006852880 +0200
-+++ gdal-1.3.0/configure.in.new    2005-09-01 13:51:53.766292344 +0200
-@@ -237,7 +237,7 @@
-
-   HAVE_PG=yes
-   LIBS="-L`$PG_CONFIG --libdir` -lpq $LIBS"
--  PG_INC="-I`$PG_CONFIG --includedir`"
-+  PG_INC="-I`$PG_CONFIG --includedir` -I`$PG_CONFIG --includedir-server`"
-
-   AC_MSG_RESULT([yes])
-
+--- gdal-1.3.2/configure.in.orig	2006-05-01 18:22:48.000000000 +0200
++++ gdal-1.3.2/configure.in	2006-05-29 01:24:48.086491750 +0200
+@@ -275,7 +275,7 @@
+   PG_EXTRA_DEC=""
+   AC_CHECK_LIB(pq,PQputCopyData,,PG_EXTRA_DEC=-DPG_PRE74,)
+ 
+-  PG_INC="-I`$PG_CONFIG --includedir` $PG_EXTRA_DEC"
++  PG_INC="-I`$PG_CONFIG --includedir` -I`$PG_CONFIG --includedir-server` $PG_EXTRA_DEC"
+ fi
+ 
+ AC_SUBST(HAVE_PG,$HAVE_PG)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/gdal-DESTDIR.patch?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SOURCES/gdal-gcc4.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/gdal-pgsql.patch?r1=1.2&r2=1.3&f=u

More information about the pld-cvs-commit mailing list