Update 1.2.2-3

2 files changed, 29 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6683c4b8f32c..f4b141260b56 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,10 @@
 pkgbase = rustdesk-bin
 	pkgdesc = Yet another remote desktop software, written in Rust. Works out of the box, no configuration required. Great alternative to TeamViewer and AnyDesk!
 	pkgver = 1.2.2
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/rustdesk/rustdesk
-	license = GPL3
-	optdepends = libappindicator-gtk3: tray icon
-	optdepends = libayatana-appindicator: tray icon
-	options = !strip
-	source = rustdesk-1.2.2-x86_64.pkg.tar.zst::https://github.com/rustdesk/rustdesk/releases/download/1.2.2/rustdesk-1.2.2-0-x86_64.pkg.tar.zst
-	source = rustdesk-1.2.2-x86_64.AppImage::https://github.com/rustdesk/rustdesk/releases/download/1.2.2/rustdesk-1.2.2-x86_64.AppImage
-	source = rustdesk-1.2.2-aarch64.AppImage::https://github.com/rustdesk/rustdesk/releases/download/1.2.2/rustdesk-1.2.2-aarch64.AppImage
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-
-pkgname = rustdesk-bin
 	arch = x86_64
+	license = GPL3
 	depends = gstreamer
 	depends = gst-plugins-base-libs
 	depends = gtk3
@@ -27,12 +16,12 @@ pkgname = rustdesk-bin
 	depends = xdg-utils
 	depends = xdotool
 	depends = hicolor-icon-theme
+	optdepends = libappindicator-gtk3: tray icon
+	optdepends = libayatana-appindicator: tray icon
 	provides = rustdesk
 	conflicts = rustdesk
+	options = !strip
+	source = rustdesk-1.2.2-x86_64.pkg.tar.zst::https://github.com/rustdesk/rustdesk/releases/download/1.2.2/rustdesk-1.2.2-0-x86_64.pkg.tar.zst
+	sha256sums = SKIP
 
-pkgname = rustdesk-appimage
-	pkgdesc = Yet another remote desktop software, written in Rust. Works out of the box, no configuration required. Great alternative to TeamViewer and AnyDesk! (AppImage)
-	arch = x86_64
-	arch = aarch64
-	provides = rustdesk
-	conflicts = rustdesk
+pkgname = rustdesk-bin
diff --git a/PKGBUILD b/PKGBUILD
index 250113b9abe6..c934003316e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,51 +2,41 @@
 # Co-Maintainer: Leon Möller <jkhsjdhjs at totally dot rip>
 
 pkgbase=rustdesk-bin
-pkgname=(rustdesk-{bin,appimage})
+pkgname=(rustdesk-bin)
 pkgver=1.2.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Yet another remote desktop software, written in Rust. Works out of the box, no configuration required. Great alternative to TeamViewer and AnyDesk!"
 url="https://github.com/rustdesk/rustdesk"
 license=('GPL3')
+arch=('x86_64')
+provides=("${pkgname%-bin}")
+conflicts=("${pkgname%-bin}")
+depends=(
+    'gstreamer'
+    'gst-plugins-base-libs'
+    'gtk3'
+    'libpulse'
+    'libva'
+    'libvdpau'
+    'libxcb'
+    'libxfixes'
+    'xdg-utils'
+    'xdotool'
+    'hicolor-icon-theme'
+)
 optdepends=(
     'libappindicator-gtk3: tray icon'
     'libayatana-appindicator: tray icon'
 )
 options=('!strip')
-source=("${pkgbase%-bin}-${pkgver}-$CARCH.pkg.tar.zst::$url/releases/download/${pkgver}/rustdesk-${pkgver}-0-$CARCH.pkg.tar.zst"
-    "${pkgbase%-bin}-${pkgver}-x86_64.AppImage::${url}/releases/download/${pkgver}/${pkgbase%-bin}-${pkgver}-x86_64.AppImage"
-    "${pkgbase%-bin}-${pkgver}-aarch64.AppImage::${url}/releases/download/${pkgver}/${pkgbase%-bin}-${pkgver}-aarch64.AppImage")
-sha256sums=('SKIP'
-            'SKIP'
-            'SKIP')
-_install_path="/opt/appimages"
+source=("${pkgbase%-bin}-${pkgver}-$CARCH.pkg.tar.zst::$url/releases/download/${pkgver}/rustdesk-${pkgver}-0-$CARCH.pkg.tar.zst")
+sha256sums=('SKIP')
 
 prepare() {
     sed -i "s/^\(Icon=\).*$/\1rustdesk/" "$srcdir/usr/share/rustdesk/files/rustdesk.desktop"
-    cd ${srcdir}
-    chmod a+x ${pkgbase%-bin}-${pkgver}-${CARCH}.AppImage
-    "./${pkgbase%-bin}-${pkgver}-${CARCH}.AppImage" --appimage-extract > /dev/null
-    sed 's|usr/lib/rustdesk/rustdesk|/opt/appimages/rustdesk.AppImage|g' -i "${srcdir}/squashfs-root/${pkgbase%-bin}.desktop"
 }
 
-package_rustdesk-bin() {
-    arch=('x86_64')
-    provides=("${pkgname%-bin}")
-    conflicts=("${pkgname%-bin}")
-    depends=(
-        'gstreamer'
-        'gst-plugins-base-libs'
-        'gtk3'
-        'libpulse'
-        'libva'
-        'libvdpau'
-        'libxcb'
-        'libxfixes'
-        'xdg-utils'
-        'xdotool'
-        'hicolor-icon-theme'
-    )
-
+package() {
 # TODO: add dep on libsciter-gtk, remove libsciter-gtk.so from this package
 
     mkdir -p "$pkgdir/usr/bin/"
@@ -61,20 +51,3 @@ package_rustdesk-bin() {
     install -Dm644 "$srcdir/usr/share/rustdesk/files/rustdesk-link.desktop" "$pkgdir/usr/share/applications/rustdesk-link.desktop"
     install -Dm644 "$srcdir/usr/share/rustdesk/files/rustdesk.service" "$pkgdir/usr/lib/systemd/system/rustdesk.service"
 }
-
-package_rustdesk-appimage() {
-    pkgdesc+=" (AppImage)"
-    arch=('x86_64' 'aarch64')
-    provides=("${pkgname%-appimage}")
-    conflicts=("${pkgname%-appimage}")
-
-    install -Dm755 "${srcdir}"/${pkgbase%-bin}-${pkgver}-${CARCH}.AppImage "${pkgdir}"/${_install_path}/${pkgbase%-bin}.AppImage
-
-    local _icon
-    for _icon in 32 64 128 ; do
-        install -Dm0644 "${srcdir}/squashfs-root/usr/share/icons/hicolor/${_icon}x${_icon}/apps/${pkgbase%-bin}.png" \
-                    -t  "${pkgdir}/usr/share/icons/hicolor/${_icon}x${_icon}/apps"
-    done
-
-    install -Dm644 "${srcdir}/squashfs-root/${pkgbase%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
-}