From d939a5ebc66cbbfa81f536e64fe869cf7c50e891 Mon Sep 17 00:00:00 2001
From: rustdesk <info@rustdesk.com>
Date: Mon, 12 Sep 2022 19:17:46 +0800
Subject: [PATCH] remove flutter/PKGBUILD, and modify build.py, not tested yet

---
 PKGBUILD               | 14 +++++++++-----
 build.py               | 21 ++++++++-------------
 flatpak/shared-modules |  1 -
 flutter/PKGBUILD       | 33 ---------------------------------
 4 files changed, 17 insertions(+), 52 deletions(-)
 delete mode 160000 flatpak/shared-modules
 delete mode 100644 flutter/PKGBUILD

diff --git a/PKGBUILD b/PKGBUILD
index 1d1956ede..38004f66c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 pkgname=rustdesk
-pkgver=1.1.10
+pkgver=1.2.0
 pkgrel=0
 epoch=
 pkgdesc=""
 arch=('x86_64')
 url=""
-license=('GPL-3.0')
+license=('AGPL-3.0')
 groups=()
-depends=('gtk3' 'xdotool' 'libxcb' 'libxfixes' 'alsa-lib' 'pulseaudio' 'ttf-arphic-uming' 'python-pip' 'curl')
+depends=('gtk3' 'xdotool' 'libxcb' 'libxfixes' 'alsa-lib' 'pulseaudio' 'ttf-arphic-uming' 'python-pip' 'curl' 'libappindicator-gtk3')
 makedepends=()
 checkdepends=()
 optdepends=()
@@ -22,8 +22,12 @@ noextract=()
 md5sums=() #generate with 'makepkg -g'
 
 package() {
-	install -Dm 755 ${HBB}/target/release/${pkgname} -t "${pkgdir}/usr/bin"
-	install -Dm 644 ${HBB}/libsciter-gtk.so -t "${pkgdir}/usr/lib/rustdesk"
+  if [[ ${FLUTTER} ]]; then
+	  mkdir -p "${pkgdir}/usr/lib/rustdesk" && cp -r ${HBB}/flutter/build/linux/x64/release/bundle/* -t "${pkgdir}/usr/lib/rustdesk"
+	  cp ${HBB}/flutter/build/linux/x64/release/liblibrustdesk.so  "${pkgdir}/usr/lib/rustdesk/librustdesk.so"
+  fi
+  mkdir -p "${pkgdir}/usr/bin"
+  pushd ${pkgdir} && ln -s /usr/lib/rustdesk/flutter_hbb usr/bin/rustdesk && popd
   install -Dm 644 $HBB/rustdesk.service -t "${pkgdir}/usr/share/rustdesk/files"
   install -Dm 644 $HBB/rustdesk.desktop -t "${pkgdir}/usr/share/rustdesk/files"
   install -Dm 644 $HBB/128x128@2x.png "${pkgdir}/usr/share/rustdesk/files/rustdesk.png"
diff --git a/build.py b/build.py
index 095f8b7f1..cdca16645 100755
--- a/build.py
+++ b/build.py
@@ -153,16 +153,12 @@ def build_flutter_deb(version):
     os.chdir("..")
 
 
-def build_flutter_arch_manjaro(version):
+def build_flutter_arch_manjaro():
     os.chdir('flutter')
     os.system('flutter build linux --release')
     os.system('strip build/linux/x64/release/liblibrustdesk.so')
-    os.system("sed -i 's/pkgver=.*/pkgver=%s/g' PKGBUILD" % version)
-    # pacman -S -needed base-devel
-    os.system('HBB=`pwd` makepkg -f')
-    os.system(
-        'mv rustdesk-%s-0-x86_64.pkg.tar.zst ../rustdesk-%s-manjaro-arch.pkg.tar.zst' % (version, version))
     os.chdir('..')
+    os.system('HBB=`pwd` FLUTTER=1 makepkg -f')
 
 
 def main():
@@ -196,18 +192,17 @@ def main():
             print('Not signed')
         os.system(f'cp -rf target/release/RustDesk.exe rustdesk-{version}-setdown.exe')
     elif os.path.isfile('/usr/bin/pacman1'):
+        # pacman -S -needed base-devel
+        os.system("sed -i 's/pkgver=.*/pkgver=%s/g' PKGBUILD" % version)
         if flutter:
-            build_flutter_arch_manjaro(version)
+            build_flutter_arch_manjaro()
         else:
-            # os.system('cargo build --release --features ' + features)
+            os.system('cargo build --release --features ' + features)
             os.system('git checkout src/ui/common.tis')
             os.system('strip target/release/rustdesk')
-            os.system("sed -i 's/pkgver=.*/pkgver=%s/g' PKGBUILD" % version)
-            # pacman -S -needed base-devel
             os.system('HBB=`pwd` makepkg -f')
-            os.system(
-                'mv rustdesk-%s-0-x86_64.pkg.tar.zst rustdesk-%s-manjaro-arch.pkg.tar.zst' % (version, version))
-            # pacman -U ./rustdesk.pkg.tar.zst
+        os.system('mv rustdesk-%s-0-x86_64.pkg.tar.zst rustdesk-%s-manjaro-arch.pkg.tar.zst' % (version, version))
+        # pacman -U ./rustdesk.pkg.tar.zst
     elif os.path.isfile('/usr/bin/yum'):
         os.system('cargo build --release --features ' + features)
         os.system('strip target/release/rustdesk')
diff --git a/flatpak/shared-modules b/flatpak/shared-modules
deleted file mode 160000
index cecc93886..000000000
--- a/flatpak/shared-modules
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cecc93886ce839ec49b0041f072a573327acdf08
diff --git a/flutter/PKGBUILD b/flutter/PKGBUILD
deleted file mode 100644
index 3d2981283..000000000
--- a/flutter/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-pkgname=rustdesk
-pkgver=1.2.0
-pkgrel=0
-epoch=
-pkgdesc=""
-arch=('x86_64')
-url=""
-license=('GPL-3.0')
-groups=()
-depends=('gtk3' 'xdotool' 'libxcb' 'libxfixes' 'alsa-lib' 'pulseaudio' 'ttf-arphic-uming' 'python-pip' 'curl' 'libappindicator-gtk3')
-makedepends=()
-checkdepends=()
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
-install=../pacman_install
-changelog=
-noextract=()
-md5sums=() #generate with 'makepkg -g'
-
-package() {
-	mkdir -p "${pkgdir}/usr/lib/rustdesk" && cp -r ${HBB}/build/linux/x64/release/bundle/* -t "${pkgdir}/usr/lib/rustdesk"
-	cp ${HBB}/build/linux/x64/release/liblibrustdesk.so  "${pkgdir}/usr/lib/rustdesk/librustdesk.so"
-  mkdir -p "${pkgdir}/usr/bin"
-  pushd ${pkgdir} && ln -s /usr/lib/rustdesk/flutter_hbb usr/bin/rustdesk && popd
-  install -Dm 644 $HBB/rustdesk.service -t "${pkgdir}/usr/share/rustdesk/files"
-  install -Dm 644 $HBB/rustdesk.desktop -t "${pkgdir}/usr/share/rustdesk/files"
-  # install -Dm 644 $HBB/../pynput_service.py -t "${pkgdir}/usr/share/rustdesk/files"
-  install -Dm 644 $HBB/../128x128@2x.png "${pkgdir}/usr/share/rustdesk/files/rustdesk.png"
-}