[SCM] qtbase packaging branch, ubuntu+1, updated. debian/5.6.0+dfsg-2-154-g197063f

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=197063f

The following commit has been merged in the ubuntu+1 branch:
commit 197063f08928ac9cabe9eb6d2dcde5a4b6a3d48a
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed May 18 13:44:27 2016 +0000

    Add arm64 to gles archs.
---
 debian/changelog          |  1 +
 debian/libqt5gui5.symbols | 38 +++++++++++++++++++-------------------
 debian/rules              |  2 +-
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e4c27fc..80e08fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ qtbase-opensource-src (5.6.0+dfsg-2ubuntu1) UNRELEASED; urgency=medium
   * Drop xcb_fix_parent_screen_of_embedded_windows.patch:
     - Fixed differently in Qt 5.6.
   * Tests enablement for Qt 5.6.
+  * Add arm64 to gles archs.
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Mon, 18 Jan 2016 10:06:17 +0000
 
diff --git a/debian/libqt5gui5.symbols b/debian/libqt5gui5.symbols
index 9159589..a3d734b 100644
--- a/debian/libqt5gui5.symbols
+++ b/debian/libqt5gui5.symbols
@@ -2604,22 +2604,22 @@ libQt5Gui.so.5 libqt5gui5 #MINVER# | libqt5gui5-gles #MINVER#
  (optional)_ZN20QOpenGLFunctions_3_1D0Ev at Qt_5 5.2.0
  (optional)_ZN20QOpenGLFunctions_3_1D1Ev at Qt_5 5.2.0
  (optional)_ZN20QOpenGLFunctions_3_1D2Ev at Qt_5 5.2.0
- (optional|arch=!armhf !armel)_ZN20QOpenGLFunctions_ES214versionProfileEv at Qt_5 5.2.0
- (arch=armhf armel)_ZN20QOpenGLFunctions_ES214versionProfileEv at Qt_5 5.2.0
- (optional|arch=!armhf !armel)_ZN20QOpenGLFunctions_ES219isContextCompatibleEP14QOpenGLContext at Qt_5 5.2.0
- (arch=armhf armel)_ZN20QOpenGLFunctions_ES219isContextCompatibleEP14QOpenGLContext at Qt_5 5.2.0
- (optional|arch=!armhf !armel)_ZN20QOpenGLFunctions_ES225initializeOpenGLFunctionsEv at Qt_5 5.2.0
- (arch=armhf armel)_ZN20QOpenGLFunctions_ES225initializeOpenGLFunctionsEv at Qt_5 5.2.0
- (optional|arch=!armhf !armel)_ZN20QOpenGLFunctions_ES2C1Ev at Qt_5 5.2.0
- (arch=armhf armel)_ZN20QOpenGLFunctions_ES2C1Ev at Qt_5 5.2.0
- (optional|arch=!armhf !armel)_ZN20QOpenGLFunctions_ES2C2Ev at Qt_5 5.2.0
- (arch=armhf armel)_ZN20QOpenGLFunctions_ES2C2Ev at Qt_5 5.2.0
- (optional|arch=!armhf !armel)_ZN20QOpenGLFunctions_ES2D0Ev at Qt_5 5.2.0
- (arch=armhf armel)_ZN20QOpenGLFunctions_ES2D0Ev at Qt_5 5.2.0
- (optional|arch=!armhf !armel)_ZN20QOpenGLFunctions_ES2D1Ev at Qt_5 5.2.0
- (arch=armhf armel)_ZN20QOpenGLFunctions_ES2D1Ev at Qt_5 5.2.0
- (optional|arch=!armhf !armel)_ZN20QOpenGLFunctions_ES2D2Ev at Qt_5 5.2.0
- (arch=armhf armel)_ZN20QOpenGLFunctions_ES2D2Ev at Qt_5 5.2.0
+ (optional|arch=!armhf !arm64 !armel)_ZN20QOpenGLFunctions_ES214versionProfileEv at Qt_5 5.2.0
+ (arch=armhf arm64 armel)_ZN20QOpenGLFunctions_ES214versionProfileEv at Qt_5 5.2.0
+ (optional|arch=!armhf !arm64 !armel)_ZN20QOpenGLFunctions_ES219isContextCompatibleEP14QOpenGLContext at Qt_5 5.2.0
+ (arch=armhf arm64 armel)_ZN20QOpenGLFunctions_ES219isContextCompatibleEP14QOpenGLContext at Qt_5 5.2.0
+ (optional|arch=!armhf !arm64 !armel)_ZN20QOpenGLFunctions_ES225initializeOpenGLFunctionsEv at Qt_5 5.2.0
+ (arch=armhf arm64 armel)_ZN20QOpenGLFunctions_ES225initializeOpenGLFunctionsEv at Qt_5 5.2.0
+ (optional|arch=!armhf !arm64 !armel)_ZN20QOpenGLFunctions_ES2C1Ev at Qt_5 5.2.0
+ (arch=armhf arm64 armel)_ZN20QOpenGLFunctions_ES2C1Ev at Qt_5 5.2.0
+ (optional|arch=!armhf !arm64 !armel)_ZN20QOpenGLFunctions_ES2C2Ev at Qt_5 5.2.0
+ (arch=armhf arm64 armel)_ZN20QOpenGLFunctions_ES2C2Ev at Qt_5 5.2.0
+ (optional|arch=!armhf !arm64 !armel)_ZN20QOpenGLFunctions_ES2D0Ev at Qt_5 5.2.0
+ (arch=armhf arm64 armel)_ZN20QOpenGLFunctions_ES2D0Ev at Qt_5 5.2.0
+ (optional|arch=!armhf !arm64 !armel)_ZN20QOpenGLFunctions_ES2D1Ev at Qt_5 5.2.0
+ (arch=armhf arm64 armel)_ZN20QOpenGLFunctions_ES2D1Ev at Qt_5 5.2.0
+ (optional|arch=!armhf !arm64 !armel)_ZN20QOpenGLFunctions_ES2D2Ev at Qt_5 5.2.0
+ (arch=armhf arm64 armel)_ZN20QOpenGLFunctions_ES2D2Ev at Qt_5 5.2.0
  _ZN20QOpenGLShaderProgram11qt_metacallEN11QMetaObject4CallEiPPv at Qt_5 5.0.2
  _ZN20QOpenGLShaderProgram11qt_metacastEPKc at Qt_5 5.0.2
  _ZN20QOpenGLShaderProgram12removeShaderEP13QOpenGLShader at Qt_5 5.0.2
@@ -7061,8 +7061,8 @@ libQt5Gui.so.5 libqt5gui5 #MINVER# | libqt5gui5-gles #MINVER#
  (optional)_ZTS20QOpenGLFunctions_2_1 at Qt_5 5.2.0
  (optional)_ZTS20QOpenGLFunctions_3_0 at Qt_5 5.2.0
  (optional)_ZTS20QOpenGLFunctions_3_1 at Qt_5 5.2.0
- (optional|arch=!armhf !armel)_ZTS20QOpenGLFunctions_ES2 at Qt_5 5.2.0
- (arch=armhf armel)_ZTS20QOpenGLFunctions_ES2 at Qt_5 5.2.0
+ (optional|arch=!armhf !arm64 !armel)_ZTS20QOpenGLFunctions_ES2 at Qt_5 5.2.0
+ (arch=armhf arm64 armel)_ZTS20QOpenGLFunctions_ES2 at Qt_5 5.2.0
  _ZTS20QOpenGLShaderProgram at Qt_5 5.0.2
  _ZTS20QPictureFormatPlugin at Qt_5 5.0.2
  _ZTS20QPlatformIntegration at Qt_5 5.0.2 1
@@ -7320,7 +7320,7 @@ libQt5Gui.so.5 libqt5gui5 #MINVER# | libqt5gui5-gles #MINVER#
  (optional)_ZTV20QOpenGLFunctions_2_1 at Qt_5 5.2.0
  (optional)_ZTV20QOpenGLFunctions_3_0 at Qt_5 5.2.0
  (optional)_ZTV20QOpenGLFunctions_3_1 at Qt_5 5.2.0
- (arch=armhf armel)_ZTV20QOpenGLFunctions_ES2 at Qt_5 5.2.0
+ (arch=armhf arm64 armel)_ZTV20QOpenGLFunctions_ES2 at Qt_5 5.2.0
  _ZTV20QOpenGLShaderProgram at Qt_5 5.0.2
  _ZTV20QPictureFormatPlugin at Qt_5 5.0.2
  _ZTV20QPlatformIntegration at Qt_5 5.0.2 1
diff --git a/debian/rules b/debian/rules
index 62bbd6f..e7cff9c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,7 @@ ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(no_pch_architectures)))
 	extra_configure_opts += -no-pch
 endif
 
-gles2_architectures := armel armhf
+gles2_architectures := armel armhf arm64
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
 	extra_configure_opts += -opengl es2
 else

-- 
qtbase packaging