[rpm] Remove fGetActiveUniformName. Contributes to JB#24362

See mozilla bug 1207205. This can be removed when updating to
Gecko 44>.

rpm/0001-Configure-system-sqlite-to-use-jemalloc.patch

@@ -1,7 +1,7 @@
-From 27f7ada21cb998775417a3b793698b4db222002e Mon Sep 17 00:00:00 2001
+From 094f6fbdadc93d9a77856e956d14b50a8a0227e1 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Mon, 12 Oct 2015 16:18:14 +0300
-Subject: [PATCH 01/12] Configure system sqlite to use jemalloc
+Subject: [PATCH 01/13] Configure system sqlite to use jemalloc
 
 See bug JB25229
 

rpm/0002-Workaround-for-bug-977015.patch

@@ -1,7 +1,7 @@
-From 4b848115452528cad24fbefd1888c14e74b0dbc5 Mon Sep 17 00:00:00 2001
+From 9b24dbcf40439382602f88ac94e8e94781df6113 Mon Sep 17 00:00:00 2001
 From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 Date: Mon, 11 May 2015 13:01:34 +0300
-Subject: [PATCH 02/12] Workaround for bug 977015
+Subject: [PATCH 02/13] Workaround for bug 977015
 
 See bug JB16252
 

rpm/0003-Workaround-wrong-viewport-in-wikipedia.patch

@@ -1,7 +1,7 @@
-From d468c5a7b7416895911a82e88fb8e31deeb1f5a5 Mon Sep 17 00:00:00 2001
+From 87f918d8fd91ddc74487d1978bd7743768772f22 Mon Sep 17 00:00:00 2001
 From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 Date: Mon, 11 May 2015 13:03:43 +0300
-Subject: [PATCH 03/12] Workaround wrong viewport in wikipedia
+Subject: [PATCH 03/13] Workaround wrong viewport in wikipedia
 
 See bug JB11251
 

rpm/0004-Supply-source-uri-to-gstreamer-pipeline.patch

@@ -1,7 +1,7 @@
-From e25d36534b0a09999f25bbf5839fb81582e2eb65 Mon Sep 17 00:00:00 2001
+From 24dfcb31c9c7d4dcbd8521c62e49471e35ce3ec5 Mon Sep 17 00:00:00 2001
 From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 Date: Mon, 11 May 2015 13:10:46 +0300
-Subject: [PATCH 04/12] Supply source uri to gstreamer pipeline
+Subject: [PATCH 04/13] Supply source uri to gstreamer pipeline
 
 See bug JB19511
 
@@ -212,7 +212,7 @@ index 3c92e53..c07fa15 100644
    GstCaps *caps =
      GStreamerFormatHelper::ConvertFormatsToCaps(mDecoder->GetResource()->GetContentType().get(),
 diff --git a/dom/media/gstreamer/GStreamerReader.h b/dom/media/gstreamer/GStreamerReader.h
-index d455954..8746198 100644
+index d455954..8746198c 100644
 --- a/dom/media/gstreamer/GStreamerReader.h
 +++ b/dom/media/gstreamer/GStreamerReader.h
 @@ -118,6 +118,15 @@ private:

rpm/0005-Workaround-for-late-access-message-loop.patch

@@ -1,7 +1,7 @@
-From 3afbdb6c5f77650eae62c2f1884500e9320e2b7e Mon Sep 17 00:00:00 2001
+From fcabf990f835eca0e77ed4116855b09c2cff556c Mon Sep 17 00:00:00 2001
 From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 Date: Mon, 11 May 2015 13:12:04 +0300
-Subject: [PATCH 05/12] Workaround for late access message loop.
+Subject: [PATCH 05/13] Workaround for late access message loop.
 
 See bug JB10381
 

rpm/0006-Define-HAS_NEMO_RESOURCE-in-config.patch

@@ -1,7 +1,7 @@
-From 1815809875520676ce7ce53cce1d27fea0dab30d Mon Sep 17 00:00:00 2001
+From 985aacf94fe4c287723cd738434a38796ab50776 Mon Sep 17 00:00:00 2001
 From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 Date: Mon, 11 May 2015 13:13:03 +0300
-Subject: [PATCH 06/12] Define HAS_NEMO_RESOURCE in config
+Subject: [PATCH 06/13] Define HAS_NEMO_RESOURCE in config
 
 See bugs JB10947, JB30305, and JB30517
 

rpm/0007-Don-t-decode-all-images-on-shell-activation-if-decod.patch

@@ -1,7 +1,7 @@
-From 90c886be64b2c8aea428c2740a1871d58ab905f9 Mon Sep 17 00:00:00 2001
+From 1d02ae0742dc3d7117043d585cde8df15e8d560e Mon Sep 17 00:00:00 2001
 From: Piotr Tworek <piotr.tworek@jollamobile.com>
 Date: Fri, 3 Jul 2015 14:12:32 +0200
-Subject: [PATCH 07/12] Don't decode all images on shell activation if
+Subject: [PATCH 07/13] Don't decode all images on shell activation if
  decodeondraw is enabled. Fixes JB#25287
 
 Currently if the page contains a lot images in nsDocument::mImageTracker

rpm/0008-Limit-surface-area-rather-than-width-and-height.patch

@@ -1,7 +1,7 @@
-From 27f298f50667033838d8dac274b6abbb7f75ae62 Mon Sep 17 00:00:00 2001
+From 418e48f14f0a2be5780b4c3fd1e750fe96d21014 Mon Sep 17 00:00:00 2001
 From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 Date: Mon, 11 May 2015 13:17:36 +0300
-Subject: [PATCH 08/12] Limit surface area rather than width and height
+Subject: [PATCH 08/13] Limit surface area rather than width and height
 
 See bug JB26935
 

rpm/0009-Make-TextureImageEGL-hold-a-reference-to-GLContext.-.patch

@@ -1,7 +1,7 @@
-From 6787580fea3378ffcecb7c5d7a860e1b91fe1d18 Mon Sep 17 00:00:00 2001
+From 066af14200632c59195bc72db9487a4de21e1c12 Mon Sep 17 00:00:00 2001
 From: Piotr Tworek <piotr.tworek@jollamobile.com>
 Date: Wed, 8 Jul 2015 16:13:11 +0200
-Subject: [PATCH 09/12] Make TextureImageEGL hold a reference to GLContext.
+Subject: [PATCH 09/13] Make TextureImageEGL hold a reference to GLContext.
  Fixes JB#30109.
 
 Due to rather non standard view shutdown procedure of EmbedLite port

rpm/0010-Limit-maximum-scale-to-4x.-Fixes-JB-25377.patch

@@ -1,7 +1,7 @@
-From 4a7c0290659a401d85c798fb3d3a6919481596d1 Mon Sep 17 00:00:00 2001
+From 7c949f8f5fb8108772b2b765bddb9f8656d08d91 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Mon, 12 Oct 2015 16:22:59 +0300
-Subject: [PATCH 10/12] Limit maximum scale to 4x. Fixes JB#25377
+Subject: [PATCH 10/13] Limit maximum scale to 4x. Fixes JB#25377
 
 The default zoom contraints now matches to the EmbedContentController.
 

rpm/0011-Bug-1209446-Make-sure-mFrameInProgress-flag-is-set-t.patch

@@ -1,7 +1,7 @@
-From 970b12db1f33de802491b77ee14b6e9cb4a8f94b Mon Sep 17 00:00:00 2001
+From 5905dc0f67be3b5d93eaf1285e49a137aca9f2b6 Mon Sep 17 00:00:00 2001
 From: Piotr Tworek <tworaz666@gmail.com>
 Date: Tue, 29 Sep 2015 08:18:00 +0200
-Subject: [PATCH 11/12] Bug 1209446 - Make sure mFrameInProgress flag is set to
+Subject: [PATCH 11/13] Bug 1209446 - Make sure mFrameInProgress flag is set to
  true only when we actually begin drawing new frame. r=nical
 
 --HG--

rpm/0012-Adapt-LoginManager-to-EmbedLite.-Fixes-JB21980.patch

@@ -1,7 +1,7 @@
-From 9d43fee6a410cf8162dc319773af5f156ffccdd1 Mon Sep 17 00:00:00 2001
+From 85beb3dae212bb14b128e403f66ba88999feb010 Mon Sep 17 00:00:00 2001
 From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 Date: Wed, 28 Oct 2015 16:07:36 +0200
-Subject: [PATCH 12/12] Adapt LoginManager to EmbedLite. Fixes JB21980
+Subject: [PATCH 12/13] Adapt LoginManager to EmbedLite. Fixes JB21980
 
 Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 ---

rpm/0013-Bug-1207205-Remove-fGetActiveUniformName.-r-jrmuizel.patch

@@ -0,0 +1,65 @@
+From cae41440bc1b43f498d6cd2bee99064f3b136016 Mon Sep 17 00:00:00 2001
+From: Dan Glastonbury <dglastonbury@mozilla.com>
+Date: Wed, 30 Sep 2015 14:04:17 +1300
+Subject: [PATCH 13/13] Bug 1207205 - Remove fGetActiveUniformName. r=jrmuizel
+
+Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
+---
+ gfx/gl/GLContext.cpp      | 3 ++-
+ gfx/gl/GLContext.h        | 9 ---------
+ gfx/gl/GLContextSymbols.h | 2 --
+ 3 files changed, 2 insertions(+), 12 deletions(-)
+
+diff --git a/gfx/gl/GLContext.cpp b/gfx/gl/GLContext.cpp
+index fd874f0..0eb66db 100644
+--- a/gfx/gl/GLContext.cpp
++++ b/gfx/gl/GLContext.cpp
+@@ -1314,10 +1314,11 @@ GLContext::InitWithPrefix(const char *prefix, bool trygl)
+         }
+
+         if (IsSupported(GLFeature::uniform_buffer_object)) {
++            // Note: Don't query for glGetActiveUniformName because it is not
++            // supported by GL ES 3.
+             SymLoadStruct uboSymbols[] = {
+                 { (PRFuncPtr*) &mSymbols.fGetUniformIndices, { "GetUniformIndices", nullptr } },
+                 { (PRFuncPtr*) &mSymbols.fGetActiveUniformsiv, { "GetActiveUniformsiv", nullptr } },
+-                { (PRFuncPtr*) &mSymbols.fGetActiveUniformName, { "GetActiveUniformName", nullptr } },
+                 { (PRFuncPtr*) &mSymbols.fGetUniformBlockIndex, { "GetUniformBlockIndex", nullptr } },
+                 { (PRFuncPtr*) &mSymbols.fGetActiveUniformBlockiv, { "GetActiveUniformBlockiv", nullptr } },
+                 { (PRFuncPtr*) &mSymbols.fGetActiveUniformBlockName, { "GetActiveUniformBlockName", nullptr } },
+diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
+index 05406c9..912cfb2 100644
+--- a/gfx/gl/GLContext.h
++++ b/gfx/gl/GLContext.h
+@@ -3026,15 +3026,6 @@ public:
+         AFTER_GL_CALL;
+     }
+
+-    void fGetActiveUniformName(GLuint program, GLuint uniformIndex, GLsizei bufSize,
+-                               GLsizei* length, GLchar* uniformName)
+-    {
+-        ASSERT_SYMBOL_PRESENT(fGetActiveUniformName);
+-        BEFORE_GL_CALL;
+-        mSymbols.fGetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
+-        AFTER_GL_CALL;
+-    }
+-
+     GLuint fGetUniformBlockIndex(GLuint program, const GLchar* uniformBlockName) {
+         ASSERT_SYMBOL_PRESENT(fGetUniformBlockIndex);
+         BEFORE_GL_CALL;
+diff --git a/gfx/gl/GLContextSymbols.h b/gfx/gl/GLContextSymbols.h
+index 91ff5ac..c7fd838 100644
+--- a/gfx/gl/GLContextSymbols.h
++++ b/gfx/gl/GLContextSymbols.h
+@@ -600,8 +600,6 @@ struct GLContextSymbols
+     typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMSIVPROC) (GLuint program, GLsizei uniformCount, const GLuint* uniformIndices,
+                                                              GLenum pname, GLint* params);
+     PFNGLGETACTIVEUNIFORMSIVPROC fGetActiveUniformsiv;
+-    typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMNAMEPROC) (GLuint program, GLuint uniformIdex, GLsizei bufSize, GLsizei* length, GLchar* uniformName);
+-    PFNGLGETACTIVEUNIFORMNAMEPROC fGetActiveUniformName;
+     typedef GLuint (GLAPIENTRY * PFNGLGETUNIFORMBLOCKINDEXPROC) (GLuint program, const GLchar* uniformBlockName);
+     PFNGLGETUNIFORMBLOCKINDEXPROC fGetUniformBlockIndex;
+     typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMBLOCKIVPROC) (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint* params);
+-- 
+2.1.4
+

rpm/xulrunner-qt5.spec

@@ -54,6 +54,7 @@ Patch9:     0009-Make-TextureImageEGL-hold-a-reference-to-GLContext.-.patch
 Patch10:    0010-Limit-maximum-scale-to-4x.-Fixes-JB-25377.patch
 Patch11:    0011-Bug-1209446-Make-sure-mFrameInProgress-flag-is-set-t.patch
 Patch12:    0012-Adapt-LoginManager-to-EmbedLite.-Fixes-JB21980.patch
+Patch13:    0013-Bug-1207205-Remove-fGetActiveUniformName.-r-jrmuizel.patch
 BuildRequires:  pkgconfig(Qt5Quick)
 BuildRequires:  pkgconfig(Qt5Network)
 BuildRequires:  pkgconfig(pango)
@@ -143,6 +144,7 @@ Tests and misc files for xulrunner.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 mkdir -p "%BUILD_DIR"
 cp -rf "%BASE_CONFIG" "%BUILD_DIR"/mozconfig