Update default player version to 32.0

4 files changed, 91 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6559907b1729..5f83a2c48c51 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = apache-flex-sdk
 	pkgdesc = The open-source framework for building expressive web and mobile applications
 	pkgver = 4.16.1
-	pkgrel = 12
+	pkgrel = 13
 	url = https://flex.apache.org/
 	install = apache-flex-sdk.install
 	arch = any
@@ -18,11 +18,14 @@ pkgbase = apache-flex-sdk
 	source = https://downloads.apache.org/flex/4.16.1/binaries/apache-flex-sdk-4.16.1-bin.tar.gz
 	source = https://downloads.apache.org/flex/4.16.1/binaries/apache-flex-sdk-4.16.1-bin.tar.gz.md5
 	source = playerglobal.swc::https://fpdownload.macromedia.com/get/flashplayer/updaters/32/playerglobal32_0.swc
+	source = 27.0-to-32.0.patch
+	source = 27.0-to-32.0-frameworks.patch
 	source = apache-flex-sdk.sh
 	sha256sums = 17fda7ac8d3e476cad3127f345455ef316acfb87c6f4322e5897bd8d9b09388e
 	sha256sums = SKIP
 	sha256sums = 7d4d6168d27603cfb3b750302448e354e0bbc1bdd58f5d101c3dcf6891e9bb65
+	sha256sums = 6eb5c8842b109bebe3a87c4400b24131c00b6437eba7204a123174a3b1acca0c
+	sha256sums = 53eace428741c38097b2824e3ebe7f6d7a1e139128a20bbb50098551daebc6e1
 	sha256sums = 13a4d4a11e44023f52ae9f3ac984065054604ebe6b1f2e3e69897f723d5fbd5d
 
 pkgname = apache-flex-sdk
-
diff --git a/27.0-to-32.0-frameworks.patch b/27.0-to-32.0-frameworks.patch
new file mode 100644
index 000000000000..c739c4cd6df1
--- /dev/null
+++ b/27.0-to-32.0-frameworks.patch
@@ -0,0 +1,39 @@
+diff --git a/air-config.xml b/air-config.xml
+index e640387..6755e53 100644
+--- a/air-config.xml
++++ b/air-config.xml
+@@ -21,7 +21,7 @@
+ 

+ <flex-config>

+     <!-- Specifies the minimum player version that will run the compiled SWF. -->

+-    <target-player>27.0</target-player>

++    <target-player>32.0</target-player>

+ 

+     <!-- Specifies the version of the compiled SWF -->

+     <swf-version>38</swf-version>

+diff --git a/airmobile-config.xml b/airmobile-config.xml
+index a529a3e..8f22bf6 100644
+--- a/airmobile-config.xml
++++ b/airmobile-config.xml
+@@ -21,7 +21,7 @@
+ 

+ <flex-config>

+     <!-- Specifies the minimum player version that will run the compiled SWF. -->

+-    <target-player>27.0</target-player>

++    <target-player>32.0</target-player>

+ 

+     <!-- Specifies the version of the compiled SWF -->

+     <swf-version>38</swf-version>

+diff --git a/flex-config.xml b/flex-config.xml
+index 259370b..d9f4ef9 100644
+--- a/flex-config.xml
++++ b/flex-config.xml
+@@ -22,7 +22,7 @@
+ 

+ <flex-config>

+     <!-- Specifies the minimum player version that will run the compiled SWF. -->

+-   <target-player>27.0</target-player>

++   <target-player>32.0</target-player>

+ 

+     <!-- Specifies the version of the compiled SWF -->

+    <swf-version>38</swf-version>

diff --git a/27.0-to-32.0.patch b/27.0-to-32.0.patch
new file mode 100644
index 000000000000..c5158e27b3d3
--- /dev/null
+++ b/27.0-to-32.0.patch
@@ -0,0 +1,32 @@
+diff --git a/build.properties b/build.properties
+index 61a38ac..dd19035 100644
+--- a/build.properties
++++ b/build.properties
+@@ -25,12 +25,12 @@ release.version = 4.16.1
+ build.number = 0

+ 

+ # Flash player version for which player global swc to use

+-playerglobal.version = 27.0

++playerglobal.version = 32.0

+ 

+ playerglobal.swfversion = 38

+ 

+ # AIR version number

+-air.version = 27.0

++air.version = 32.0

+ 

+ # Default locale for the SDK

+ locale = en_US

+diff --git a/flex-sdk-description.xml b/flex-sdk-description.xml
+index 52c5221..7bb8e35 100644
+--- a/flex-sdk-description.xml
++++ b/flex-sdk-description.xml
+@@ -18,7 +18,7 @@
+ 

+ -->

+ <flex-sdk-description>

+-<name>Apache Flex 4.16.1 FP27.0 AIR27.0 en_US</name>

++<name>Apache Flex 4.16.1 FP32.0 AIR27.0 en_US</name>

+ <version>4.16.1</version>

+ <build>20171115</build>

+ </flex-sdk-description>

diff --git a/PKGBUILD b/PKGBUILD
index 07b971be0925..b2133d36273e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,8 @@
 _player_ver=32.0
 pkgname=apache-flex-sdk
 pkgver=4.16.1
-pkgrel=12
+_srcdir="${pkgname}-${pkgver}-bin"
+pkgrel=13
 pkgdesc='The open-source framework for building expressive web and mobile applications'
 arch=('any')
 url='https://flex.apache.org/'
@@ -22,20 +23,31 @@ options=('!strip' '!emptydirs')
 install="${pkgname}.install"
 source=("https://downloads.apache.org/flex/${pkgver}/binaries/apache-flex-sdk-${pkgver}-bin.tar.gz"{,.md5}
         "playerglobal.swc::https://fpdownload.macromedia.com/get/flashplayer/updaters/32/playerglobal${_player_ver/./_}.swc"
+        '27.0-to-32.0.patch'
+        '27.0-to-32.0-frameworks.patch'
         'apache-flex-sdk.sh')
 noextract=('playerglobal.swc')
 sha256sums=('17fda7ac8d3e476cad3127f345455ef316acfb87c6f4322e5897bd8d9b09388e' 'SKIP'
             '7d4d6168d27603cfb3b750302448e354e0bbc1bdd58f5d101c3dcf6891e9bb65'
+            '6eb5c8842b109bebe3a87c4400b24131c00b6437eba7204a123174a3b1acca0c'
+            '53eace428741c38097b2824e3ebe7f6d7a1e139128a20bbb50098551daebc6e1'
             '13a4d4a11e44023f52ae9f3ac984065054604ebe6b1f2e3e69897f723d5fbd5d')
 
 package() {
     # remove windows files
-    rm "${pkgname}-${pkgver}-bin/"{bin,ide}/*.bat
+    rm "${_srcdir}/"{bin,ide}/*.bat
+
+    (
+    cd "$_srcdir"
+    patch -i "${srcdir}/27.0-to-32.0.patch" # Update default version from 27.0 to 32.0
+    cd frameworks
+    patch -i "${srcdir}/27.0-to-32.0-frameworks.patch"
+    )
 
     install -d "${pkgdir}/opt"
     
     # sdk files
-    cp -dr --no-preserve='ownership' "${pkgname}-${pkgver}-bin" "${pkgdir}/opt/${pkgname}"
+    cp -dr --no-preserve='ownership' "$_srcdir" "${pkgdir}/opt/${pkgname}"
     
     # player
     install -D -m644 "${srcdir}/playerglobal.swc" "${pkgdir}/opt/${pkgname}/player/${_player_ver}/playerglobal.swc"