This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qgis.
commit ccc62313c6641f424ba0945aee43af02a5d849df Author: Bas Couwenberg <[email protected]> Date: Fri Mar 25 15:05:39 2016 +0100 Drop globe-adapt-to-osgearth-2.7.patch, included upstream. Refresh remaining patches. --- debian/changelog | 2 + debian/patches/globe-adapt-to-osgearth-2.7.patch | 102 ----------------------- debian/patches/number-typo.patch | 5 +- debian/patches/occurred-typo.patch | 2 +- debian/patches/series | 1 - 5 files changed, 6 insertions(+), 106 deletions(-) diff --git a/debian/changelog b/debian/changelog index cc0d3de..f1cf988 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ qgis (2.14.1+dfsg-1) UNRELEASED; urgency=medium - Group CMake files by Simon Edwards * Re-enable QwtPolar, qwtpolar-1.1 supports Qwt > 6.0. * Enable all hardening buildflags. + * Drop globe-adapt-to-osgearth-2.7.patch, included upstream. + Refresh remaining patches. -- Bas Couwenberg <[email protected]> Fri, 25 Mar 2016 14:41:00 +0100 diff --git a/debian/patches/globe-adapt-to-osgearth-2.7.patch b/debian/patches/globe-adapt-to-osgearth-2.7.patch deleted file mode 100644 index edddf46..0000000 --- a/debian/patches/globe-adapt-to-osgearth-2.7.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 63275585de4d22e7ae0252c6719d524d4da62f58 Mon Sep 17 00:00:00 2001 -From: "Juergen E. Fischer" <[email protected]> -Date: Tue, 8 Mar 2016 21:35:10 +0100 -Origin: https://github.com/qgis/QGIS/commit/63275585de4d22e7ae0252c6719d524d4da62f58 -Bug: https://hub.qgis.org/issues/12550 -Subject: [PATCH] globe: adapt to osgearth 2.7 - ---- - src/plugins/globe/globe_plugin.cpp | 37 ++++++++++++++++++++++++++++++++----- - 1 file changed, 32 insertions(+), 5 deletions(-) - ---- a/src/plugins/globe/globe_plugin.cpp -+++ b/src/plugins/globe/globe_plugin.cpp -@@ -57,7 +57,11 @@ - #include <osgEarth/Map> - #include <osgEarth/MapNode> - #include <osgEarth/TileSource> -+#if OSGEARTH_MIN_VERSION_REQUIRED(2,7,0) -+#include <osgEarthUtil/Sky> -+#else - #include <osgEarthUtil/SkyNode> -+#endif - #include <osgEarthUtil/AutoClipPlaneHandler> - #include <osgEarthDrivers/gdal/GDALOptions> - #include <osgEarthDrivers/tms/TMSOptions> -@@ -394,9 +398,18 @@ void GlobePlugin::run() - } - - // Set a home viewpoint -+#if OSGEARTH_VERSION_GREATER_OR_EQUAL( 2, 7, 0 ) -+ osgEarth::Util::Viewpoint vp; -+ vp.focalPoint()->vec3d() = osg::Vec3d( -90, 0, 0 ); -+ vp.heading() = 0.0; -+ vp.pitch() = -90.0; -+ vp.range() = 2e7; -+ manip->setHomeViewpoint( vp, 1.0 ); -+#else - manip->setHomeViewpoint( - osgEarth::Util::Viewpoint( osg::Vec3d( -90, 0, 0 ), 0.0, -90.0, 2e7 ), - 1.0 ); -+#endif - - setupControls(); - -@@ -454,12 +467,14 @@ void GlobePlugin::setupMap() - //nodeOptions.proxySettings() = - //nodeOptions.enableLighting() = false; - -+#if OSGEARTH_VERSION_LESS_THAN( 2, 7, 0 ) - //LoadingPolicy loadingPolicy( LoadingPolicy::MODE_SEQUENTIAL ); - TerrainOptions terrainOptions; - //terrainOptions.loadingPolicy() = loadingPolicy; - terrainOptions.compositingTechnique() = TerrainOptions::COMPOSITING_MULTITEXTURE_FFP; - //terrainOptions.lodFallOff() = 6.0; - nodeOptions.setTerrainOptions( terrainOptions ); -+#endif - - // The MapNode will render the Map object in the scene graph. - mMapNode = new osgEarth::MapNode( map, nodeOptions ); -@@ -605,7 +620,15 @@ void GlobePlugin::syncExtent() - - OE_NOTICE << "map extent: " << height << " camera distance: " << distance << std::endl; - -+#if OSGEARTH_VERSION_GREATER_OR_EQUAL( 2, 7, 0 ) -+ osgEarth::Util::Viewpoint viewpoint; -+ viewpoint.focalPoint()->vec3d() = osg::Vec3d( extent.center().x(), extent.center().y(), 0.0 ); -+ viewpoint.heading() = 0.0; -+ viewpoint.pitch() = -90.0; -+ viewpoint.range() = distance; -+#else - osgEarth::Util::Viewpoint viewpoint( osg::Vec3d( extent.center().x(), extent.center().y(), 0.0 ), 0.0, -90.0, distance ); -+#endif - manip->setViewpoint( viewpoint, 4.0 ); - } - -@@ -930,17 +953,21 @@ void GlobePlugin::setSkyParameters( bool - { - // Create if not yet done - if ( !mSkyNode.get() ) -+#if OSGEARTH_VERSION_GREATER_OR_EQUAL( 2, 7, 0 ) -+ mSkyNode = SkyNode::create( mMapNode ); -+#else - mSkyNode = new SkyNode( mMapNode->getMap() ); -+#endif - --#if OSGEARTH_VERSION_GREATER_OR_EQUAL( 2, 4, 0 ) -+#if OSGEARTH_VERSION_GREATER_OR_EQUAL( 2, 4, 0 ) && OSGEARTH_VERSION_LESS_THAN( 2, 7, 0 ) - mSkyNode->setAutoAmbience( autoAmbience ); - #else - Q_UNUSED( autoAmbience ); - #endif -- mSkyNode->setDateTime( dateTime.date().year() -- , dateTime.date().month() -- , dateTime.date().day() -- , dateTime.time().hour() + dateTime.time().minute() / 60.0 ); -+ mSkyNode->setDateTime( DateTime( dateTime.date().year() -+ , dateTime.date().month() -+ , dateTime.date().day() -+ , dateTime.time().hour() + dateTime.time().minute() / 60.0 ) ); - //sky->setSunPosition( osg::Vec3(0,-1,0) ); - mSkyNode->attach( mOsgViewer ); - mRootNode->addChild( mSkyNode ); diff --git a/debian/patches/number-typo.patch b/debian/patches/number-typo.patch index 2c6f22a..e7757f1 100644 --- a/debian/patches/number-typo.patch +++ b/debian/patches/number-typo.patch @@ -1,5 +1,6 @@ Description: Fix 'nubmer' typo, replace with 'number'. Author: Bas Couwenberg <[email protected]> +Forwarded: https://github.com/qgis/QGIS/pull/2946 --- a/i18n/qgis_ar.ts +++ b/i18n/qgis_ar.ts @@ -69,7 +70,7 @@ Author: Bas Couwenberg <[email protected]> are interpreted. --- a/i18n/qgis_de.ts +++ b/i18n/qgis_de.ts -@@ -89787,7 +89787,7 @@ Each attribute also has a data type, one +@@ -89960,7 +89960,7 @@ Each attribute also has a data type, one or real number. The data type is inferred from the content of the fields - if every non blank value is a valid integer then the type is integer, otherwise if it is a valid long long @@ -472,7 +473,7 @@ Author: Bas Couwenberg <[email protected]> are interpreted. --- a/src/providers/wcs/qgswcsprovider.cpp +++ b/src/providers/wcs/qgswcsprovider.cpp -@@ -193,7 +193,7 @@ QgsWcsProvider::QgsWcsProvider( QString +@@ -185,7 +185,7 @@ QgsWcsProvider::QgsWcsProvider( QString return; } diff --git a/debian/patches/occurred-typo.patch b/debian/patches/occurred-typo.patch index 38572b0..4cb8d00 100644 --- a/debian/patches/occurred-typo.patch +++ b/debian/patches/occurred-typo.patch @@ -89,7 +89,7 @@ Forwarded: not-needed <message> --- a/i18n/qgis_de.ts +++ b/i18n/qgis_de.ts -@@ -25669,11 +25669,11 @@ Fehler: %3 +@@ -25684,11 +25684,11 @@ Fehler: %3 <translation>Proxy-Authentifikation erforderlich</translation> </message> <message numerus="yes"> diff --git a/debian/patches/series b/debian/patches/series index 91c4b65..5d76f65 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,4 +4,3 @@ developersmap-use-debian-package.patch exclude-elvensword-resources.patch occurred-typo.patch number-typo.patch -globe-adapt-to-osgearth-2.7.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
