diff options
author | Janek Thomaschewski | 2021-02-03 16:44:00 +0100 |
---|---|---|
committer | Janek Thomaschewski | 2021-02-03 16:44:00 +0100 |
commit | c6d8734eb56a91a1048887f8d836702089a7a6e1 (patch) | |
tree | 8bf71ef4342b4962b199f1974007ec7439e84820 | |
parent | 5be4443ed42318cb23c6c55f42c3ab5c26e4d51c (diff) | |
download | aur-c6d8734eb56a91a1048887f8d836702089a7a6e1.tar.gz |
upgpkg: webstorm-eap 211.5538.3-1
workaround jbr issue by using jbr from previous build
+ restructure pkgbuild
-rw-r--r-- | .SRCINFO | 2 | ||||
-rwxr-xr-x | PKGBUILD | 33 |
2 files changed, 27 insertions, 8 deletions
@@ -8,9 +8,11 @@ pkgbase = webstorm-eap license = custom options = !strip source = https://download.jetbrains.com/webstorm/WebStorm-211.5538.3.tar.gz + source = https://download.jetbrains.com/webstorm/WebStorm-211.4961.31.tar.gz source = jetbrains-webstorm-eap.desktop source = WebStorm_license.txt sha256sums = fee273cdb00aa0708d7b44b5515191635badf3651289c6be2610baacb1f030af + sha256sums = 5675221f57dcc250ca5b77565d573eea70e2a3571598d2648d72924c30b0027c sha256sums = e8d1be7f980b7d371ef5aa65f2375397d970e887659bf3b280601cced8498e32 sha256sums = 8464fc766dbb4f6a0de4acd84007fc2916b50ca48ce7d22654144f549c8c6f4c @@ -15,26 +15,40 @@ license=('custom') depends=() source=(https://download.jetbrains.com/webstorm/${_pkgname}-${pkgver}.tar.gz + https://download.jetbrains.com/webstorm/${_pkgname}-211.4961.31.tar.gz jetbrains-webstorm-eap.desktop ${_pkgname}_license.txt) sha256sums=('fee273cdb00aa0708d7b44b5515191635badf3651289c6be2610baacb1f030af' + '5675221f57dcc250ca5b77565d573eea70e2a3571598d2648d72924c30b0027c' 'e8d1be7f980b7d371ef5aa65f2375397d970e887659bf3b280601cced8498e32' '8464fc766dbb4f6a0de4acd84007fc2916b50ca48ce7d22654144f549c8c6f4c') -package() { - cd "${srcdir}" - mkdir -p "${pkgdir}/opt/${pkgname}" - cp -r ${srcdir}/${_pkgname}-${pkgver}/* "${pkgdir}/opt/${pkgname}" +prepare() { + cd "${srcdir}/${_pkgname}-${pkgver}" + + # Remove bin/libs of non-matching architectures if [[ $CARCH = 'i686' ]]; then - rm -f "${pkgdir}/opt/${pkgname}/bin/libyjpagent-linux64.so" - rm -f "${pkgdir}/opt/${pkgname}/bin/fsnotifier64" + rm bin/fsnotifier64 + rm bin/libdbm64.so + rm bin/webstorm64.vmoptions + rm -rf lib/pty4j-native/linux/x86_64 fi if [[ $CARCH = 'x86_64' ]]; then - rm -f "${pkgdir}/opt/${pkgname}/bin/libyjpagent-linux.so" - rm -f "${pkgdir}/opt/${pkgname}/bin/fsnotifier" + rm bin/fsnotifier + rm bin/webstorm.vmoptions + rm -rf lib/pty4j-native/linux/x86 fi + # The JBR of this version is broken, see https://youtrack.jetbrains.com/issue/JBR-3066 + rm -rf jbr +} + +package() { + cd "${srcdir}" + mkdir -p "${pkgdir}/opt/${pkgname}" + cp -r ${srcdir}/${_pkgname}-${pkgver}/* "${pkgdir}/opt/${pkgname}" + mkdir -p "${pkgdir}/usr/bin" mkdir -p "${pkgdir}/usr/share/applications" mkdir -p "${pkgdir}/usr/share/pixmaps" @@ -43,4 +57,7 @@ package() { install -m 644 "${startdir}/jetbrains-${pkgname}.desktop" "${pkgdir}/usr/share/applications" install -m 644 "${pkgdir}/opt/${pkgname}/bin/webstorm.svg" "${pkgdir}/usr/share/pixmaps/${pkgname}.svg" install -m 644 "${startdir}/${_pkgname}_license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/${_pkgname}_license.txt" + + echo 'Using the JBR from build 211.4961.31...' + cp -r "${srcdir}/${_pkgname}-211.4961.31/jbr" "${pkgdir}/opt/${pkgname}/jbr" } |