feat: automatically detect if executed under Wayland

4 files changed, 54 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7a81f9dae0bf..2ff835ca1f0d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = camunda-modeler-bin
 	pkgdesc = An integrated modeling solution for BPMN, DMN and Forms based on bpmn.io
 	pkgver = 4.8.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/camunda/camunda-modeler
 	install = camunda-modeler.install
 	arch = x86_64
@@ -11,8 +11,12 @@ pkgbase = camunda-modeler-bin
 	depends = nss
 	source = https://github.com/camunda/camunda-modeler/releases/download/v4.8.1/camunda-modeler-4.8.1-linux-x64.tar.gz
 	source = camunda-modeler.install
+	source = camunda-modeler.sh
+	source = xdg_register.patch
 	b2sums = 7ee38e4608f0fae6e4e322b4f30955176e4cb5ade111d1db1cbeda2a066f45427af2aff6a878c286d1dc47690531bae3e7b5cdf9c2abbc975882421a6beb7d78
 	b2sums = 67491c423c4513c78a01c47cffd0e28287a18913fd7c7b39278d0eeba6203432a84f5db221e9d3c2e755b42fa9a5063c246644c07dcaedc0b0c3f0af2777d604
+	b2sums = e2d15fa4996ba95fb29fabaafb57efc0bca02d5d073b25bd453e9f72aa4ca7f02ebe4454c711e26559940ca3e24422c2361a900a9b39c9c42e6cb22547a042a2
+	b2sums = c9b99a7168ab80fd5142a4c27159307f98398ed654c50bc2ff566e6134fc8401a3fe8efa5906bce4e6053bb3c04ce59f51e7cd1146fbcef3b11919057926d87c
 
 pkgname = camunda-modeler-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index fc844513caf1..5a9855bc2a83 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ _pkgorg=camunda
 _pkgname=$_pkgorg-modeler
 pkgname=$_pkgname-bin
 pkgver=4.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An integrated modeling solution for BPMN, DMN and Forms based on bpmn.io"
 arch=('x86_64')
 url="https://github.com/$_pkgorg/$_pkgname"
@@ -11,14 +11,23 @@ license=('MIT')
 depends=('xdg-utils' 'gtk3' 'nss')
 install=$_pkgname.install
 source=(
-    "https://github.com/$_pkgorg/$_pkgname/releases/download/v$pkgver/$_pkgname-$pkgver-linux-x64.tar.gz"
-    "$_pkgname.install")
+	"https://github.com/$_pkgorg/$_pkgname/releases/download/v$pkgver/$_pkgname-$pkgver-linux-x64.tar.gz"
+	"$_pkgname.install"
+	"$_pkgname.sh"
+	"xdg_register.patch")
 b2sums=('7ee38e4608f0fae6e4e322b4f30955176e4cb5ade111d1db1cbeda2a066f45427af2aff6a878c286d1dc47690531bae3e7b5cdf9c2abbc975882421a6beb7d78'
-        '67491c423c4513c78a01c47cffd0e28287a18913fd7c7b39278d0eeba6203432a84f5db221e9d3c2e755b42fa9a5063c246644c07dcaedc0b0c3f0af2777d604')
+        '67491c423c4513c78a01c47cffd0e28287a18913fd7c7b39278d0eeba6203432a84f5db221e9d3c2e755b42fa9a5063c246644c07dcaedc0b0c3f0af2777d604'
+        'e2d15fa4996ba95fb29fabaafb57efc0bca02d5d073b25bd453e9f72aa4ca7f02ebe4454c711e26559940ca3e24422c2361a900a9b39c9c42e6cb22547a042a2'
+        'c9b99a7168ab80fd5142a4c27159307f98398ed654c50bc2ff566e6134fc8401a3fe8efa5906bce4e6053bb3c04ce59f51e7cd1146fbcef3b11919057926d87c')
+
+build() {
+	patch -u "$srcdir/$_pkgname-$pkgver-linux-x64/support/xdg_register.sh" -i "$srcdir/xdg_register.patch"
+}
 
 package() {
-    install -d $pkgdir/opt/$_pkgname
-    cp -R $srcdir/$_pkgname-$pkgver-linux-x64/* $pkgdir/opt/$_pkgname
-    install -dm755 "${pkgdir}/usr/bin"
-    ln -s /opt/$_pkgname/$_pkgname $pkgdir/usr/bin/$_pkgname
+	install -d $pkgdir/opt/$_pkgname
+	cp -R $srcdir/$_pkgname-$pkgver-linux-x64/* $pkgdir/opt/$_pkgname
+	install -Dm755 "$srcdir/$_pkgname.sh" "$pkgdir/opt/$_pkgname/$_pkgname.sh"
+	install -dm755 "$pkgdir/usr/bin"
+	ln -s "$pkgdir/opt/$_pkgname/$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname"
 }
diff --git a/camunda-modeler.sh b/camunda-modeler.sh
new file mode 100755
index 000000000000..0dfcf4270e92
--- /dev/null
+++ b/camunda-modeler.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+PRG=$0
+while [ -h "$PRG" ]; do
+    ls=$(ls -ld "$PRG")
+    link=$(expr "$ls" : '^.*-> \(.*\)$' 2>/dev/null)
+    if expr "$link" : '^/' 2> /dev/null >/dev/null; then
+        PRG="$link"
+    else
+        PRG="$(dirname "$PRG")/$link"
+    fi
+done
+
+PRG="$(dirname "$PRG")/camunda-modeler"
+session_type="${XDG_SESSION_TYPE:-x11}"
+if [ "$session_type" = "wayland" ]
+then
+    "$PRG" --enable-features=UseOzonePlatform --ozone-platform=wayland "$@"
+else
+    "$PRG" "$@"
+fi
diff --git a/xdg_register.patch b/xdg_register.patch
new file mode 100644
index 000000000000..0c33ad7a1b03
--- /dev/null
+++ b/xdg_register.patch
@@ -0,0 +1,11 @@
+--- src/camunda-modeler-4.8.1-linux-x64/support/xdg_register.sh	2021-05-12 17:39:59.000000000 +0600
++++ xdg_register.sh	2021-05-13 05:59:16.805066860 +0600
+@@ -38,7 +38,7 @@
+ Terminal=false
+ StartupNotify=true
+ Path=$CAMUNDA_MODELER_BIN
+-Exec="$CAMUNDA_MODELER_BIN/camunda-modeler" %F
++Exec="$CAMUNDA_MODELER_BIN/camunda-modeler.sh" %F
+ MimeType=application/bpmn;application/cmmn;application/dmn;application/camunda-form
+ Icon=$ICON_NAME.png
+ X-Ayatana-Desktop-Shortcuts=NewWindow;RepositoryBrowser