From f4543671ac4e4c6798f2c45c2fe82f2653b12d16 Mon Sep 17 00:00:00 2001
From: Jason Robitaille <jason.robitaille@lge.com>
Date: Mon, 9 Dec 2019 15:59:07 -0800
Subject: [PATCH] enact-framework=v3.2.5

:Release Notes:
Enact 3.2.5 submission framework release

:Detailed Notes:
* Updated build framework Enact to 3.2.5
* Preserve package.json and shrinkwrap for repeat compiles

enact 3.2.4..3.2.5:
fc3f21ca Version value updating
0f64f066 Update changelogs for 3.2.5
e1ce7d34 PLAT-94532: Prevent double read of marqueeing text
906891ca ENYO-6352: Fix Notification to support 3 full-width buttons in
         one line

:Testing Performed:
Verf built and locally tested

:QA Notes:

:Issues Addressed:
[PLAT-97351] Create CCC for Enact 3.2.5 into RP
[PLAT-97190] Enact app recompile fails
[PLAT-97352] CCC: enact-framework=v3.2.5

Change-Id: I917e3313304976b809b896e1e33fe08f01b595df
---
 meta-webos/classes/webos_enactjs_app.bbclass             | 5 +++++
 meta-webos/recipes-webos/enactjs-apps/enact-framework.bb | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/meta-webos/classes/webos_enactjs_app.bbclass b/meta-webos/classes/webos_enactjs_app.bbclass
index ee8a09787..1275f46c4 100644
--- a/meta-webos/classes/webos_enactjs_app.bbclass
+++ b/meta-webos/classes/webos_enactjs_app.bbclass
@@ -108,6 +108,9 @@ do_compile() {
         exit 1
     fi
 
+    cp -f package.json package.json.bak
+    cp -f npm-shrinkwrap.json npm-shrinkwrap.json.bak
+
     # apply shrinkwrap override, rerouting to shared enact framework tarballs as needed
     if [ "${WEBOS_ENACTJS_SHRINKWRAP_OVERRIDE}" = "true" ] ; then
         bbnote "Attempting to use submission enact framework"
@@ -187,6 +190,8 @@ do_compile() {
         fi
     fi
 
+    cp -f package.json.bak package.json
+    cp -f npm-shrinkwrap.json.bak npm-shrinkwrap.json
     cd ${working}
 }
 
diff --git a/meta-webos/recipes-webos/enactjs-apps/enact-framework.bb b/meta-webos/recipes-webos/enactjs-apps/enact-framework.bb
index 715791182..a01b18b66 100644
--- a/meta-webos/recipes-webos/enactjs-apps/enact-framework.bb
+++ b/meta-webos/recipes-webos/enactjs-apps/enact-framework.bb
@@ -19,8 +19,8 @@ SRC_URI = "${ENACTJS_GIT_REPO}/enact.git;nobranch=1;destsuffix=git/enact"
 # algorithm properly recognizes that a pre-release precedes the associated final
 # release (e.g., 1.0-pre.1 < 1.0).
 
-PV = "3.2.4"
-SRCREV = "170e35cb472bb0ff73e9b5187dd653ced254438d"
+PV = "3.2.5"
+SRCREV = "5f5c308a08f279518c873c2272017583770829cc"
 
 # Ordered dependency list for Enact; provides shrink-wrap style locking in of package versions
 WEBOS_ENACT_DEPENDENCIES ??= "\