[osgearth] 01/04: Drop libkml-dev build dependency, replace with libminizip-dev.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sun Jul 26 22:16:47 UTC 2015


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch stretch
in repository osgearth.

commit 55e3240847ed5cb274b5862c51224d35cdf970e9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jul 26 22:31:05 2015 +0200

    Drop libkml-dev build dependency, replace with libminizip-dev.
---
 debian/changelog                       |   1 +
 debian/control                         |   2 +-
 debian/patches/cmake-FindMiniZip.patch | 133 ---------------------------------
 debian/patches/series                  |   1 -
 4 files changed, 2 insertions(+), 135 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9199a45..de3beb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 osgearth (2.5.0+dfsg-4) UNRELEASED; urgency=medium
 
   * Add libcurl-ssl-dev as alternative for libcurl-gnutls-dev build dependency.
+  * Drop libkml-dev build dependency, replace with libminizip-dev.
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 25 Jun 2015 21:02:14 +0200
 
diff --git a/debian/control b/debian/control
index 671c603..a998c17 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 9),
                libexpat1-dev,
                libcurl4-gnutls-dev | libcurl-ssl-dev,
                zlib1g-dev,
-               libkml-dev (>= 1.3.0~r864),
+               libminizip-dev,
                libsqlite3-dev,
                libqt4-dev,
                libqt4-opengl-dev,
diff --git a/debian/patches/cmake-FindMiniZip.patch b/debian/patches/cmake-FindMiniZip.patch
deleted file mode 100644
index 0c63603..0000000
--- a/debian/patches/cmake-FindMiniZip.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-Description: Support libminizip path as used by the libkml-dev package.
-Author: Bas Couwenberg <sebastic at debian.org>
-Last-Update: 2013-10-09
---- a/CMakeModules/FindMiniZip.cmake
-+++ b/CMakeModules/FindMiniZip.cmake
-@@ -32,6 +32,7 @@ IF(NOT MINIZIP_FOUND)
- 		~/Library/Frameworks
- 		/Library/Frameworks
- 		/usr/local/include
-+		/usr/include/minizip
- 		/usr/include
- 		/sw/include # Fink
- 		/opt/local/include # DarwinPorts
-@@ -53,6 +54,7 @@ IF(NOT MINIZIP_FOUND)
- 		~/Library/Frameworks
- 		/Library/Frameworks
- 		/usr/local/lib
-+		/usr/lib/${DEB_HOST_MULTIARCH}
- 		/usr/lib
- 		/sw/lib
- 		/opt/local/lib
-@@ -67,4 +69,9 @@ IF(NOT MINIZIP_FOUND)
- 		SET(MINIZIP_FOUND "YES")
- 		ADD_DEFINITIONS(-DOSGEARTH_HAVE_MINIZIP)
- 	ENDIF(MINIZIP_LIBRARY AND MINIZIP_INCLUDE_DIR)
-+
-+	INCLUDE(FindPackageHandleStandardArgs)
-+	FIND_PACKAGE_HANDLE_STANDARD_ARGS(MiniZip DEFAULT_MSG MINIZIP_LIBRARY MINIZIP_INCLUDE_DIR)
-+	MARK_AS_ADVANCED(MINIZIP_LIBRARY MINIZIP_INCLUDE_DIR)
-+
- ENDIF(NOT MINIZIP_FOUND)
---- a/src/osgEarthDrivers/kml/KMZArchive
-+++ b/src/osgEarthDrivers/kml/KMZArchive
-@@ -27,7 +27,7 @@
- 
- #include <osgDB/Archive>
- #include <osgEarth/URI>
--#include "unzip.h"  // minizip
-+#include "minizip/unzip.h"  // minizip
- 
- using namespace osgEarth;
- 
---- a/src/osgEarthDrivers/kml/KMZArchive.cpp
-+++ b/src/osgEarthDrivers/kml/KMZArchive.cpp
-@@ -83,7 +83,7 @@ _bufsize( 1024000 )
-         localURI = downloadToCache( archiveURI );
-     }
- 
--    _uf = unzOpen( localURI.full().c_str() );
-+    _uf = libkml_unzOpen( localURI.full().c_str() );
-     _buf = (void*)new char[_bufsize];
- }
- 
-@@ -169,9 +169,9 @@ KMZArchive::readToBuffer( const std::str
-     {
-         // special case; first try the master file (doc.kml), then failing that, look
-         // for the first KML file in the archive.
--        if ( unzLocateFile( _uf, "doc.kml", 0 ) != 0 )
-+        if ( libkml_unzLocateFile( _uf, "doc.kml", 0 ) != 0 )
-         {
--            if ( unzGoToFirstFile( _uf ) != UNZ_OK )
-+            if ( libkml_unzGoToFirstFile( _uf ) != UNZ_OK )
-             {
-                 OE_WARN << LC << "Archive is empty" << std::endl;
-                 return false;
-@@ -179,7 +179,7 @@ KMZArchive::readToBuffer( const std::str
- 
-             while( err == UNZ_OK )
-             {
--                if ( unzGetCurrentFileInfo( _uf, &file_info, filename_inzip, sizeof(filename_inzip), 0L, 0, 0L, 0) )
-+                if ( libkml_unzGetCurrentFileInfo( _uf, &file_info, filename_inzip, sizeof(filename_inzip), 0L, 0, 0L, 0) )
-                 {
-                     OE_WARN << LC << "Error with zipfile " << _archiveURI.base() << std::endl;
-                     return false;
-@@ -192,7 +192,7 @@ KMZArchive::readToBuffer( const std::str
-                     break;
-                 }
- 
--                err = unzGoToNextFile( _uf );
-+                err = libkml_unzGoToNextFile( _uf );
-             }
- 
-             if ( err != UNZ_OK )
-@@ -203,7 +203,7 @@ KMZArchive::readToBuffer( const std::str
-         }
-     }
- 
--    else if ( unzLocateFile( _uf, fileInZip.c_str(), 0 ) )
-+    else if ( libkml_unzLocateFile( _uf, fileInZip.c_str(), 0 ) )
-     {
-         OE_WARN << LC << "Failed to locate '" << fileInZip << "' in '" << _archiveURI.base() << "'" << std::endl;
-         return false;
-@@ -211,26 +211,26 @@ KMZArchive::readToBuffer( const std::str
- 
-     if ( !got_file_info )
-     {
--        if ( unzGetCurrentFileInfo( _uf, &file_info, filename_inzip, sizeof(filename_inzip), 0L, 0, 0L, 0) )
-+        if ( libkml_unzGetCurrentFileInfo( _uf, &file_info, filename_inzip, sizeof(filename_inzip), 0L, 0, 0L, 0) )
-         {
-             OE_WARN << LC << "Error with zipfile " << _archiveURI.base() << std::endl;
-             return false;
-         }
-     }
- 
--    err = unzOpenCurrentFilePassword( _uf, 0L );
-+    err = libkml_unzOpenCurrentFilePassword( _uf, 0L );
-     if ( err != UNZ_OK )
-     {
--        OE_WARN << LC << "unzOpenCurrentFilePassword failed" << std::endl;
-+        OE_WARN << LC << "libkml_unzOpenCurrentFilePassword failed" << std::endl;
-         return false;
-     }
- 
-     do
-     {
--        err = unzReadCurrentFile( _uf, _buf, _bufsize );
-+        err = libkml_unzReadCurrentFile( _uf, _buf, _bufsize );
-         if ( err < 0 )
-         {
--            OE_WARN << LC << "Error in unzReadCurrentFile" << std::endl;
-+            OE_WARN << LC << "Error in libkml_unzReadCurrentFile" << std::endl;
-             break;
-         }
-         if ( err > 0 )
-@@ -243,7 +243,7 @@ KMZArchive::readToBuffer( const std::str
-     }
-     while( err > 0 );
- 
--    err = unzCloseCurrentFile( _uf );
-+    err = libkml_unzCloseCurrentFile( _uf );
-     if ( err != UNZ_OK )
-     {
-         //ignore it...
diff --git a/debian/patches/series b/debian/patches/series
index f82696a..87c8d57 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 soversion.patch
 fallback-getCurrentThreadId.patch
 kfreebsd-getCurrentThreadId.patch
-cmake-FindMiniZip.patch
 undefined-reference-to-symbol-XInitThreads.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osgearth.git



More information about the Pkg-grass-devel mailing list