[rpm] Add patch reverting bug 1114594. Contributes to JB#32870

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

@@ -1,7 +1,7 @@
-From 094f6fbdadc93d9a77856e956d14b50a8a0227e1 Mon Sep 17 00:00:00 2001
+From c05c12e2b1dbf5415ad37baf7f7cac097d60c595 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/13] Configure system sqlite to use jemalloc
+Subject: [PATCH 01/14] Configure system sqlite to use jemalloc
 
 See bug JB25229
 

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

@@ -1,7 +1,7 @@
-From 9b24dbcf40439382602f88ac94e8e94781df6113 Mon Sep 17 00:00:00 2001
+From d2379e312103766ae9adac25f82761fadb3105dc 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/13] Workaround for bug 977015
+Subject: [PATCH 02/14] Workaround for bug 977015
 
 See bug JB16252
 

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

@@ -1,7 +1,7 @@
-From 87f918d8fd91ddc74487d1978bd7743768772f22 Mon Sep 17 00:00:00 2001
+From c460f842ba854543bb1a41b03ff073a5f00a176a 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/13] Workaround wrong viewport in wikipedia
+Subject: [PATCH 03/14] Workaround wrong viewport in wikipedia
 
 See bug JB11251
 

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

@@ -1,7 +1,7 @@
-From 24dfcb31c9c7d4dcbd8521c62e49471e35ce3ec5 Mon Sep 17 00:00:00 2001
+From 26f60c514fafa02f6c1da15f777f81d70a373f46 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/13] Supply source uri to gstreamer pipeline
+Subject: [PATCH 04/14] 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..8746198c 100644
+index d455954..8746198 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 fcabf990f835eca0e77ed4116855b09c2cff556c Mon Sep 17 00:00:00 2001
+From efebb20a80c2f36a25cc9b4d4e09d2e76c559147 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/13] Workaround for late access message loop.
+Subject: [PATCH 05/14] Workaround for late access message loop.
 
 See bug JB10381
 
@@ -11,10 +11,10 @@ Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/ipc/glue/MessagePump.cpp b/ipc/glue/MessagePump.cpp
-index 7d52e9a..1ca7749 100644
+index d402720..43f8dbc 100644
 --- a/ipc/glue/MessagePump.cpp
 +++ b/ipc/glue/MessagePump.cpp
-@@ -223,6 +223,9 @@ DoWorkRunnable::Run()
+@@ -226,6 +226,9 @@ DoWorkRunnable::Run()
  {
    MessageLoop* loop = MessageLoop::current();
    MOZ_ASSERT(loop);

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

@@ -1,7 +1,7 @@
-From 985aacf94fe4c287723cd738434a38796ab50776 Mon Sep 17 00:00:00 2001
+From fa9086636cc227e50e55e016cd2b20d42cb59361 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/13] Define HAS_NEMO_RESOURCE in config
+Subject: [PATCH 06/14] 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 1d02ae0742dc3d7117043d585cde8df15e8d560e Mon Sep 17 00:00:00 2001
+From ea34db8dc26f0e80c01e8ac98dc5296c77938ad9 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/13] Don't decode all images on shell activation if
+Subject: [PATCH 07/14] 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 418e48f14f0a2be5780b4c3fd1e750fe96d21014 Mon Sep 17 00:00:00 2001
+From 01bc5cc98194796afb4e88b535414188ac28ce15 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/13] Limit surface area rather than width and height
+Subject: [PATCH 08/14] 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 066af14200632c59195bc72db9487a4de21e1c12 Mon Sep 17 00:00:00 2001
+From b2919651ada218aa52dcf0186c55f5fc70b71e7b 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/13] Make TextureImageEGL hold a reference to GLContext.
+Subject: [PATCH 09/14] 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 7c949f8f5fb8108772b2b765bddb9f8656d08d91 Mon Sep 17 00:00:00 2001
+From a482bc98e1930f76f98feaa8adc8b30edb75ddd1 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/13] Limit maximum scale to 4x. Fixes JB#25377
+Subject: [PATCH 10/14] 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 5905dc0f67be3b5d93eaf1285e49a137aca9f2b6 Mon Sep 17 00:00:00 2001
+From 6776211a3cb46214c1f634bac4147f16436494e2 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/13] Bug 1209446 - Make sure mFrameInProgress flag is set to
+Subject: [PATCH 11/14] Bug 1209446 - Make sure mFrameInProgress flag is set to
  true only when we actually begin drawing new frame. r=nical
 
 --HG--
@@ -13,18 +13,18 @@ Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/gfx/layers/opengl/CompositorOGL.cpp b/gfx/layers/opengl/CompositorOGL.cpp
-index d4fe0ce..f65a51e 100644
+index b6e6cef..b4b42cd 100644
 --- a/gfx/layers/opengl/CompositorOGL.cpp
 +++ b/gfx/layers/opengl/CompositorOGL.cpp
-@@ -583,7 +583,6 @@ CompositorOGL::BeginFrame(const nsIntRegion& aInvalidRegion,
+@@ -584,7 +584,6 @@ CompositorOGL::BeginFrame(const nsIntRegion& aInvalidRegion,
 
    MOZ_ASSERT(!mFrameInProgress, "frame still in progress (should have called EndFrame");
 
 -  mFrameInProgress = true;
    gfx::Rect rect;
    if (mUseExternalSurfaceSize) {
      rect = gfx::Rect(0, 0, mSurfaceSize.width, mSurfaceSize.height);
-@@ -605,6 +604,9 @@ CompositorOGL::BeginFrame(const nsIntRegion& aInvalidRegion,
+@@ -606,6 +605,9 @@ CompositorOGL::BeginFrame(const nsIntRegion& aInvalidRegion,
      return;
    }
 

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

@@ -1,7 +1,7 @@
-From 85beb3dae212bb14b128e403f66ba88999feb010 Mon Sep 17 00:00:00 2001
+From f383941e546ecbac49ba7a6b3217f4044c1a1b3c 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/13] Adapt LoginManager to EmbedLite. Fixes JB21980
+Subject: [PATCH 12/14] Adapt LoginManager to EmbedLite. Fixes JB21980
 
 Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 ---

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

@@ -1,7 +1,7 @@
-From cae41440bc1b43f498d6cd2bee99064f3b136016 Mon Sep 17 00:00:00 2001
+From 5de0d09b244fe0ca95da684c2335f4759f6acb1d 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
+Subject: [PATCH 13/14] Bug 1207205 - Remove fGetActiveUniformName. r=jrmuizel
 
 Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
 ---