From 2d982de8b0d8235f063f331d3b574746419c7c74 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 10 Mar 2013 20:45:30 -0600 Subject: [PATCH] - Update to 1.9.2 - Drop poppler and java-swig patches applied upstream --- .gitignore | 1 + gdal-1.9.1-java-swig.patch | 29 ------ gdal-1.9.1-poppler020.patch | 187 ------------------------------------ gdal-cleaner.sh | 2 +- gdal.spec | 18 ++-- sources | 2 +- 6 files changed, 9 insertions(+), 230 deletions(-) delete mode 100644 gdal-1.9.1-java-swig.patch delete mode 100644 gdal-1.9.1-poppler020.patch diff --git a/.gitignore b/.gitignore index 61c7269..a219059 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ gdalautotest-1.7.0.tar.gz /gdal-1.9.0-fedora.tar.gz /gdalautotest-1.9.0.tar.gz /gdal-1.9.1-fedora.tar.gz +/gdal-1.9.2-fedora.tar.gz diff --git a/gdal-1.9.1-java-swig.patch b/gdal-1.9.1-java-swig.patch deleted file mode 100644 index 36b1d09..0000000 --- a/gdal-1.9.1-java-swig.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: /branches/1.9/gdal/swig/include/XMLNode.i -=================================================================== ---- /branches/1.9/gdal/swig/include/XMLNode.i (revision 19751) -+++ /branches/1.9/gdal/swig/include/XMLNode.i (revision 24440) -@@ -38,16 +38,16 @@ - } CPLXMLNodeType; - --%rename (XMLNode) _CPLXMLNode; --%rename (Type) _CPLXMLNode::eType; --%rename (Value) _CPLXMLNode::pszValue; --%rename (Next) _CPLXMLNode::psNext; --%rename (Child) _CPLXMLNode::psChild; --typedef struct _CPLXMLNode -+%rename (XMLNode) CPLXMLNode; -+%rename (Type) CPLXMLNode::eType; -+%rename (Value) CPLXMLNode::pszValue; -+%rename (Next) CPLXMLNode::psNext; -+%rename (Child) CPLXMLNode::psChild; -+typedef struct CPLXMLNode - { - %immutable; - CPLXMLNodeType eType; - char *pszValue; -- struct _CPLXMLNode *psNext; -- struct _CPLXMLNode *psChild; -+ struct CPLXMLNode *psNext; -+ struct CPLXMLNode *psChild; - %mutable; - } CPLXMLNode; diff --git a/gdal-1.9.1-poppler020.patch b/gdal-1.9.1-poppler020.patch deleted file mode 100644 index e2ad912..0000000 --- a/gdal-1.9.1-poppler020.patch +++ /dev/null @@ -1,187 +0,0 @@ -Index: /branches/1.9/gdal/configure -=================================================================== ---- /branches/1.9/gdal/configure (revision 24333) -+++ /branches/1.9/gdal/configure (revision 24437) -@@ -639,4 +639,5 @@ - HAVE_PODOFO - POPPLER_INC -+POPPLER_0_20_OR_LATER - POPPLER_BASE_STREAM_HAS_TWO_ARGS - POPPLER_HAS_OPTCONTENT -@@ -26470,4 +26471,5 @@ - POPPLER_HAS_OPTCONTENT=no - POPPLER_BASE_STREAM_HAS_TWO_ARGS=no -+POPPLER_0_20_OR_LATER=no - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for poppler" >&5 -@@ -26536,4 +26538,20 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } -+ -+ # And now we check if we have Poppler >= 0.20.0 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have Poppler >= 0.20.0" >&5 -+$as_echo_n "checking if we have Poppler >= 0.20.0... " >&6; } -+ rm -f testpoppler.* -+ echo '#include ' > testpoppler.cpp -+ echo 'int main(int argc, char** argv) { setErrorCallback(0,0); return 0; }' >> testpoppler.cpp -+ if test -z "`${CXX} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then -+ POPPLER_0_20_OR_LATER=yes -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+ fi -+ - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -@@ -26556,4 +26574,6 @@ - - POPPLER_BASE_STREAM_HAS_TWO_ARGS=$POPPLER_BASE_STREAM_HAS_TWO_ARGS -+ -+POPPLER_0_20_OR_LATER=$POPPLER_0_20_OR_LATER - - POPPLER_INC=$POPPLER_INC -Index: /branches/1.9/gdal/nmake.opt -=================================================================== ---- /branches/1.9/gdal/nmake.opt (revision 23610) -+++ /branches/1.9/gdal/nmake.opt (revision 24437) -@@ -469,8 +469,10 @@ - # Uncomment for PDF support - # Uncomment POPPLER_BASE_STREAM_HAS_TWO_ARGS = YES for Poppler >= 0.16.0 -+# Uncomment POPPLER_0_20_OR_LATER = YES for Poppler >= 0.20.0 - #POPPLER_ENABLED = YES - #POPPLER_CFLAGS = -Ie:/kde/include -Ie:/kde/include/poppler - #POPPLER_HAS_OPTCONTENT = YES - #POPPLER_BASE_STREAM_HAS_TWO_ARGS = YES -+#POPPLER_0_20_OR_LATER = YES - #POPPLER_LIBS = e:/kde/lib/poppler.lib e:/kde/lib/freetype.lib e:/kde/lib/liblcms-1.lib advapi32.lib gdi32.lib - -Index: /branches/1.9/gdal/configure.in -=================================================================== ---- /branches/1.9/gdal/configure.in (revision 24333) -+++ /branches/1.9/gdal/configure.in (revision 24437) -@@ -2941,4 +2941,5 @@ - POPPLER_HAS_OPTCONTENT=no - POPPLER_BASE_STREAM_HAS_TWO_ARGS=no -+POPPLER_0_20_OR_LATER=no - - AC_MSG_CHECKING([for poppler]) -@@ -3000,4 +3001,17 @@ - POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes - AC_MSG_RESULT([yes]) -+ -+ # And now we check if we have Poppler >= 0.20.0 -+ AC_MSG_CHECKING([if we have Poppler >= 0.20.0]) -+ rm -f testpoppler.* -+ echo '#include ' > testpoppler.cpp -+ echo 'int main(int argc, char** argv) { setErrorCallback(0,0); return 0; }' >> testpoppler.cpp -+ if test -z "`${CXX} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then -+ POPPLER_0_20_OR_LATER=yes -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+ fi -+ - else - AC_MSG_RESULT([no]) -@@ -3015,4 +3029,5 @@ - AC_SUBST(POPPLER_HAS_OPTCONTENT, $POPPLER_HAS_OPTCONTENT) - AC_SUBST(POPPLER_BASE_STREAM_HAS_TWO_ARGS, $POPPLER_BASE_STREAM_HAS_TWO_ARGS) -+AC_SUBST(POPPLER_0_20_OR_LATER, $POPPLER_0_20_OR_LATER) - AC_SUBST(POPPLER_INC, $POPPLER_INC) - -Index: /branches/1.9/gdal/frmts/pdf/pdfdataset.cpp -=================================================================== ---- /branches/1.9/gdal/frmts/pdf/pdfdataset.cpp (revision 23986) -+++ /branches/1.9/gdal/frmts/pdf/pdfdataset.cpp (revision 24437) -@@ -327,5 +327,9 @@ - poSplashOut = new SplashOutputDev(splashModeRGB8, 4, gFalse, sColor); - PDFDoc* poDoc = poGDS->poDoc; -+#ifdef POPPLER_0_20_OR_LATER -+ poSplashOut->startDoc(poDoc); -+#else - poSplashOut->startDoc(poDoc->getXRef()); -+#endif - double dfDPI = poGDS->dfDPI; - -@@ -518,4 +522,19 @@ - - #ifdef USE_POPPLER -+#ifdef POPPLER_0_20_OR_LATER -+static void PDFDatasetErrorFunction(void* userData, ErrorCategory eErrCatagory, int nPos, char *pszMsg) -+{ -+ CPLString osError; -+ -+ if (nPos >= 0) -+ osError.Printf("Pos = %d, ", nPos); -+ osError += pszMsg; -+ -+ if (strcmp(osError.c_str(), "Incorrect password") == 0) -+ return; -+ -+ CPLError(CE_Failure, CPLE_AppDefined, "%s", osError.c_str()); -+} -+#else - static void PDFDatasetErrorFunction(int nPos, char *pszMsg, va_list args) - { -@@ -531,4 +550,5 @@ - CPLError(CE_Failure, CPLE_AppDefined, "%s", osError.c_str()); - } -+#endif - #endif - -@@ -567,5 +587,9 @@ - - /* Set custom error handler for poppler errors */ -+#ifdef POPPLER_0_20_OR_LATER -+ setErrorCallback(PDFDatasetErrorFunction, NULL); -+#else - setErrorFunction(PDFDatasetErrorFunction); -+#endif - - /* poppler global variable */ -Index: /branches/1.9/gdal/frmts/pdf/makefile.vc -=================================================================== ---- /branches/1.9/gdal/frmts/pdf/makefile.vc (revision 22493) -+++ /branches/1.9/gdal/frmts/pdf/makefile.vc (revision 24437) -@@ -7,5 +7,5 @@ - - !IFDEF POPPLER_ENABLED --EXTRAFLAGS = $(POPPLER_CFLAGS) $(POPPLER_HAS_OPTCONTENT_FLAGS) $(POPPLER_BASE_STREAM_HAS_TWO_ARGS_FLAGS) -DUSE_POPPLER -+EXTRAFLAGS = $(POPPLER_CFLAGS) $(POPPLER_HAS_OPTCONTENT_FLAGS) $(POPPLER_BASE_STREAM_HAS_TWO_ARGS_FLAGS) $(POPPLER_0_20_OR_LATER_FLAGS) -DUSE_POPPLER - - !IFDEF POPPLER_HAS_OPTCONTENT -@@ -15,4 +15,8 @@ - !IFDEF POPPLER_BASE_STREAM_HAS_TWO_ARGS - POPPLER_BASE_STREAM_HAS_TWO_ARGS_FLAGS = -DPOPPLER_BASE_STREAM_HAS_TWO_ARGS -+!ENDIF -+ -+!IFDEF POPPLER_0_20_OR_LATER -+POPPLER_0_20_OR_LATER_FLAGS = -DPOPPLER_0_20_OR_LATER - !ENDIF - -Index: /branches/1.9/gdal/frmts/pdf/GNUmakefile -=================================================================== ---- /branches/1.9/gdal/frmts/pdf/GNUmakefile (revision 22491) -+++ /branches/1.9/gdal/frmts/pdf/GNUmakefile (revision 24437) -@@ -16,4 +16,9 @@ - endif - -+ifeq ($(POPPLER_0_20_OR_LATER),yes) -+CPPFLAGS += -DPOPPLER_0_20_OR_LATER -+endif -+ -+ - CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) $(POPPLER_INC) $(PODOFO_INC) - -Index: /branches/1.9/gdal/GDALmake.opt.in -=================================================================== ---- /branches/1.9/gdal/GDALmake.opt.in (revision 24419) -+++ /branches/1.9/gdal/GDALmake.opt.in (revision 24437) -@@ -386,4 +386,5 @@ - POPPLER_HAS_OPTCONTENT = @POPPLER_HAS_OPTCONTENT@ - POPPLER_BASE_STREAM_HAS_TWO_ARGS = @POPPLER_BASE_STREAM_HAS_TWO_ARGS@ -+POPPLER_0_20_OR_LATER = @POPPLER_0_20_OR_LATER@ - POPPLER_INC = @POPPLER_INC@ - diff --git a/gdal-cleaner.sh b/gdal-cleaner.sh index 3681315..8a0d644 100755 --- a/gdal-cleaner.sh +++ b/gdal-cleaner.sh @@ -1,6 +1,6 @@ #!/bin/bash # Volker Fröhlich -VERSION="1.9.1" +VERSION="1.9.2" tar xvfz gdal-"${VERSION}".tar.gz diff --git a/gdal.spec b/gdal.spec index 06b1351..39922c3 100644 --- a/gdal.spec +++ b/gdal.spec @@ -32,8 +32,8 @@ Name: gdal -Version: 1.9.1 -Release: 18%{?dist} +Version: 1.9.2 +Release: 1%{?dist} Summary: GIS file format library Group: System Environment/Libraries License: MIT @@ -51,14 +51,6 @@ Source3: %{name}-cleaner.sh # Patch to use system g2clib Patch1: %{name}-g2clib.patch -# Support poppler 0.20 -# http://trac.osgeo.org/gdal/ticket/4668 -# Solved in 1.9.2 -Patch2: %{name}-1.9.1-poppler020.patch - -# http://trac.osgeo.org/gdal/changeset/24440#file0 -Patch3: %{name}-1.9.1-java-swig.patch - Patch4: %{name}-1.9.1-dods-3.11.3.patch # Fedora uses Alternatives for Java @@ -289,8 +281,6 @@ rm -rf frmts/gtiff/libgeotiff \ rm -r frmts/grib/degrib18/g2clib-1.0.4 %patch1 -p1 -b .g2clib~ -%patch2 -p4 -b .poppler~ -%patch3 -p4 -b .java-swig~ %patch4 -p1 -b .dods~ %patch8 -p1 -b .java~ %patch9 -p1 -b .man~ @@ -812,6 +802,10 @@ rm -rf %{buildroot} #Or as before, using ldconfig %changelog +* Sun Mar 10 2013 Orion Poplawski - 1.9.2-1 +- Update to 1.9.2 +- Drop poppler and java-swig patches applied upstream + * Fri Jan 25 2013 Devrim GÜNDÜZ - 1.9.1-18 - Rebuild with geos 3.3.7. diff --git a/sources b/sources index 1066945..8cbf7d4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -45d1a1853a612af71e1dd2dc7232a49a gdal-1.9.1-fedora.tar.gz +1cc5e615ee5bcf32f4f2999e9021042e gdal-1.9.2-fedora.tar.gz 0d1e425b45465f64f6d1f32790d8bea0 gdalautotest-1.9.0.tar.gz