Updated to v1.3.0, fixes for Wayland and Manjaro, udev rules installation enabled by default

3 files changed, 31 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 842a965c4a9c..7358a9297cee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = stm32cubeide
 	pkgdesc = Integrated Development Environment for STM32
-	pkgver = 1.2.0
+	pkgver = 1.3.0
 	pkgrel = 1
 	url = https://www.st.com/en/development-tools/stm32cubeide.html
 	arch = x86_64
@@ -13,10 +13,10 @@ pkgbase = stm32cubeide
 	depends = libusb
 	optdepends = stlink
 	options = !strip
-	source = local://en.st-stm32cubeide_1.2.0_5034_20200108_0926_amd64.sh.zip
+	source = local://en.st-stm32cubeide_1.3.0_5720_20200220_1053_amd64.sh.zip
 	source = stm32cubeide.desktop
-	sha256sums = cc4d5eba6d6de747f0b3c85164ab10e49478efa06e2a59183434efedb472f251
-	sha256sums = 415d652cfe852206036af695168b5764e02d048f2026e81da536d8d3f0cc2980
+	sha256sums = 7ee5b50075d178cc84530b4eed353cba55c894bce619800462e5238f042a38c4
+	sha256sums = 1f8684115576ba36cd8019810cc1fbb027197bb866c1b448aa2e3a0f174b3c3a
 
 pkgname = stm32cubeide
 
diff --git a/PKGBUILD b/PKGBUILD
index ca653e1a177b..d578867a59c9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: nightuser <nightuser.android@gmail.com>
 
 pkgname="stm32cubeide"
-pkgver=1.2.0
-_pkgver_ext="$pkgver"_5034_20200108_0926
+pkgver=1.3.0
+_pkgver_ext="$pkgver"_5720_20200220_1053
 _pkg_file_name=en.st-stm32cubeide_${_pkgver_ext}_amd64.sh.zip
 pkgrel=1
 pkgdesc="Integrated Development Environment for STM32"
@@ -30,56 +30,59 @@ fi
 
 source=("local://${_pkg_file_name}"
 	$pkgname.desktop)
-sha256sums=('cc4d5eba6d6de747f0b3c85164ab10e49478efa06e2a59183434efedb472f251'
-	'415d652cfe852206036af695168b5764e02d048f2026e81da536d8d3f0cc2980')
+sha256sums=('7ee5b50075d178cc84530b4eed353cba55c894bce619800462e5238f042a38c4'
+	'1f8684115576ba36cd8019810cc1fbb027197bb866c1b448aa2e3a0f174b3c3a')
 
 prepare(){
 	cd "$srcdir"
 	mkdir build
-        sh st-stm32cubeide_${_pkgver_ext}_amd64.sh --quiet --noexec --target ./build  
+        sh st-stm32cubeide_${_pkgver_ext}_amd64.sh --quiet --noexec --nox11 --target ./build  
         
 	cd build
 	mkdir stlink-server
-	sh st-stlink-server.*.install.sh --quiet --noexec --target ./stlink-server
+	sh st-stlink-server.*.install.sh --quiet --noexec --nox11 --target ./stlink-server
         
 	mkdir stlink-udev
-	sh st-stlink-udev-rules-*-linux-noarch.sh --quiet --noexec --target ./stlink-udev
+	sh st-stlink-udev-rules-*-linux-noarch.sh --quiet --noexec --nox11 --target ./stlink-udev
 
 	mkdir jlink-udev
-	sh segger-jlink-udev-rules-*-linux-noarch.sh --quiet --noexec --target ./jlink-udev
+	sh segger-jlink-udev-rules-*-linux-noarch.sh --quiet --noexec --nox11 --target ./jlink-udev
 }
 
 package() {
 	cd "$srcdir"
+	
+	msg2 'Installing STM32CubeIDE'
 	mkdir -p "${pkgdir}/opt/${pkgname}"
-	tar zxvf "./build/st-stm32cubeide_${_pkgver_ext}_amd64.tar.gz" -C "${pkgdir}/opt/${pkgname}"
+	tar zxf "./build/st-stm32cubeide_${_pkgver_ext}_amd64.tar.gz" -C "${pkgdir}/opt/${pkgname}"
 	
 	msg2 'Installing stlink server'
 	install -d -m755 "${pkgdir}/usr/bin/"
 	cp "${srcdir}/build/stlink-server/stlink-server" "${pkgdir}/usr/bin/"
 	chmod 0755 "${pkgdir}/usr/bin/stlink-server"
+	chown root:root "${pkgdir}/usr/bin/stlink-server"
 	
-	msg2 'Instalation of STlink udev rules skipped'
-	#msg2 'Installing STlink udev rules'
-	#cd "$srcdir/build/stlink-udev"
-        #tar zxf st-stlink-udev-rules-*-linux-all.tar.gz
-        #cd "${pkgdir}/"
-        #gzip -dc "$srcdir/build/stlink-udev/st-stlink-udev-rules.sw" | tar -xpf -
+	#msg2 'Instalation of STlink udev rules skipped'
+	msg2 'Installing STlink udev rules'
+	install -d -m755 "${pkgdir}/etc/udev/rules.d/"
+	cd "$srcdir/build/stlink-udev"
+        tar zxf st-stlink-udev-rules-*-linux-all.tar.gz
+        cd "${pkgdir}/"
+        gzip -dc "$srcdir/build/stlink-udev/st-stlink-udev-rules.sw" | tar -xpf -
         
-        msg2 'Instalation of JLink udev rules skipped'
-        #msg2 'Installing JLink udev rules'
-	#cd "$srcdir/build/jlink-udev"
-        #tar zxf segger-jlink-udev-rules-*-linux-noarch.tar.gz
-        #cd "${pkgdir}/"
-        #gzip -dc "$srcdir/build/jlink-udev/segger-jlink-udev-rules.sw" | tar -xpf -
+        #msg2 'Instalation of JLink udev rules skipped'
+        msg2 'Installing JLink udev rules'
+        cd "${pkgdir}/etc/udev/rules.d/"
+	tar zxf "$srcdir/build/jlink-udev/makeself_payload.tar.gz" "./etc/udev/rules.d/99-jlink.rules"
         
         msg2 'Installing desktop shortcuts'
+        cd "$srcdir"
 	install -Dm644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
 	
 	#msg2 'Cleaning build folder'
 	#rm -rf "${srcdir}/build"
 	
-	msg2 'Prevent automatical *.desktop file replacement by not functional one'
+	msg2 'Prevent automatical ${pkgname}.desktop file replacement by not functional one'
 	rm ${pkgdir}/opt/stm32cubeide/plugins/com.st.stm32cube.ide.mcu.ide_*/resources/project_importer/linux/mimetype/stm32cubeide.desktop.template
 }
 
diff --git a/stm32cubeide.desktop b/stm32cubeide.desktop
index cb41068422c2..07add1e67afe 100644
--- a/stm32cubeide.desktop
+++ b/stm32cubeide.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=STM32CubeIDE
-Comment=STM32CubeIDE 1.2.0
+Comment=STM32CubeIDE 1.3.0
 GenericName=STM32CubeIDE
-Exec=/opt/stm32cubeide/stm32cubeide %F
+Exec=env GDK_BACKEND=x11 /opt/stm32cubeide/stm32cubeide %F
 Icon=/opt/stm32cubeide/icon.xpm
 Path=/opt/stm32cubeide/
 Terminal=false