upgpkg: simplicitystudio 4-5

Don't use patch for a one-liner

3 files changed, 3 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d2738681e726..524e359db878 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = simplicitystudio
 	pkgdesc = Design tools, documentation, software and support resources for EFM32™, EFM8™, 8051, Wireless MCUs and Wireless SoCs.
 	pkgver = 4
-	pkgrel = 4
+	pkgrel = 5
 	url = https://www.silabs.com/products/development-tools/software/simplicity-studio
 	arch = x86_64
 	license = unknown
@@ -12,11 +12,9 @@ pkgbase = simplicitystudio
 	options = !strip
 	backup = opt/simplicitystudio/studio.ini
 	source = https://www.silabs.com/documents/login/software/SimplicityStudio-v4.tgz
-	source = gtk-version-2.patch
 	source = simplicitystudio.sh
 	source = simplicitystudio.desktop
 	sha256sums = ff58b0a78e9fb63cb12ce784b58c83ea62096981f21187c9b200edc0898216f9
-	sha256sums = 55445982b1940d3d6eb51ee5034313845c56d1540045ddd435649d51532eee66
 	sha256sums = bc844e45b04bd73f684206de38b67be186634b63a850cacd1e6ed374ae9c0579
 	sha256sums = c29c27fa0182b3c38e5be0830d634aca6ed6d88109695226471a5ef40165a622
 
diff --git a/PKGBUILD b/PKGBUILD
index 35dd69dd8fb7..e816af075f54 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=simplicitystudio
 pkgver=4
-pkgrel=4
+pkgrel=5
 pkgdesc='Design tools, documentation, software and support resources for EFM32™, EFM8™, 8051, Wireless MCUs and Wireless SoCs.'
 arch=(x86_64)
 url=https://www.silabs.com/products/development-tools/software/simplicity-studio
@@ -11,17 +11,15 @@ backup=("opt/$pkgname/studio.ini")
 depends=(lib32-gtk2 lib32-libxtst lib32-qt4 webkitgtk2)
 options=('!strip')
 source=(https://www.silabs.com/documents/login/software/SimplicityStudio-v4.tgz
-        gtk-version-2.patch
         simplicitystudio.sh
         simplicitystudio.desktop)
 sha256sums=('ff58b0a78e9fb63cb12ce784b58c83ea62096981f21187c9b200edc0898216f9'
-            '55445982b1940d3d6eb51ee5034313845c56d1540045ddd435649d51532eee66'
             'bc844e45b04bd73f684206de38b67be186634b63a850cacd1e6ed374ae9c0579'
             'c29c27fa0182b3c38e5be0830d634aca6ed6d88109695226471a5ef40165a622')
 
 prepare() {
   cd "$srcdir/SimplicityStudio_v4"
-  patch -p1 -i "$srcdir/gtk-version-2.patch"
+  sed -i '/^-vm$/i --launcher.GTK_version 2' studio.ini
 }
 
 package() {
diff --git a/gtk-version-2.patch b/gtk-version-2.patch
deleted file mode 100644
index bc1e85366690..000000000000
--- a/gtk-version-2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur SimplicityStudio_v4/studio.ini SimplicityStudio_v4_patched/studio.ini
---- SimplicityStudio_v4/studio.ini	2018-10-20 21:01:36.000000000 +0200
-+++ SimplicityStudio_v4_patched/studio.ini	2018-11-10 19:20:37.650842382 +0100
-@@ -2,6 +2,8 @@
- plugins/org.eclipse.equinox.launcher_1.3.100.v20150511-1540.jar
- --launcher.library
- plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.300.v20150602-1417
-+--launcher.GTK_version
-+2
- -vm
- jre/bin/java
- -vmargs