From c6820153ffa8f995021f49ab83958e1f78a038a3 Mon Sep 17 00:00:00 2001 From: fufesou Date: Fri, 14 Apr 2023 09:53:51 +0800 Subject: [PATCH 1/3] fix build archlinux Signed-off-by: fufesou --- res/PKGBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/res/PKGBUILD b/res/PKGBUILD index 559f1c025..4ffbc4eb2 100644 --- a/res/PKGBUILD +++ b/res/PKGBUILD @@ -7,7 +7,7 @@ arch=('x86_64') url="" license=('AGPL-3.0') groups=() -depends=('gtk3' 'xdotool' 'libxcb' 'libxfixes' 'alsa-lib' 'curl' 'libva' 'libvdpau' 'libappindicator-gtk3' 'pam' 'gst-plugins-base' 'gst-plugin-pipewire') +depends=('gtk3' 'xdotool' 'libxcb' 'libxfixes' 'alsa-lib' 'curl' 'libva' 'libvdpau' 'libappindicator-gtk3') makedepends=() checkdepends=() optdepends=() @@ -22,6 +22,7 @@ noextract=() md5sums=() #generate with 'makepkg -g' package() { + pacman -S --noconfirm pam gst-plugins-base gst-plugin-pipewire if [[ ${FLUTTER} ]]; then mkdir -p "${pkgdir}/usr/lib/rustdesk" && cp -r ${HBB}/flutter/build/linux/x64/release/bundle/* -t "${pkgdir}/usr/lib/rustdesk" fi From 9e3b76b399202b7fd5158a64b6dcfa16baf89604 Mon Sep 17 00:00:00 2001 From: fufesou Date: Fri, 14 Apr 2023 11:03:39 +0800 Subject: [PATCH 2/3] ignore errors on installing gst Signed-off-by: fufesou --- res/PKGBUILD | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/res/PKGBUILD b/res/PKGBUILD index 4ffbc4eb2..338ba5b77 100644 --- a/res/PKGBUILD +++ b/res/PKGBUILD @@ -22,7 +22,9 @@ noextract=() md5sums=() #generate with 'makepkg -g' package() { - pacman -S --noconfirm pam gst-plugins-base gst-plugin-pipewire + pacman -S --noconfirm gst-plugins-base || true + pacman -S --noconfirm gst-plugin-pipewire || true + pacman -S --noconfirm pam if [[ ${FLUTTER} ]]; then mkdir -p "${pkgdir}/usr/lib/rustdesk" && cp -r ${HBB}/flutter/build/linux/x64/release/bundle/* -t "${pkgdir}/usr/lib/rustdesk" fi From e83a24eb994b87f853d48ae732050de5fc31d561 Mon Sep 17 00:00:00 2001 From: fufesou Date: Fri, 14 Apr 2023 11:07:27 +0800 Subject: [PATCH 3/3] fix archlinux deps Signed-off-by: fufesou --- .github/workflows/flutter-build.yml | 3 +++ res/PKGBUILD | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/flutter-build.yml b/.github/workflows/flutter-build.yml index b1c4c577c..7ea06ba8e 100644 --- a/.github/workflows/flutter-build.yml +++ b/.github/workflows/flutter-build.yml @@ -1447,6 +1447,9 @@ jobs: python ttf-arphic-uming libappindicator-gtk3 + pam + gst-plugins-base + gst-plugin-pipewire scripts: | cd res && HBB=`pwd`/.. FLUTTER=1 makepkg -f diff --git a/res/PKGBUILD b/res/PKGBUILD index 338ba5b77..559f1c025 100644 --- a/res/PKGBUILD +++ b/res/PKGBUILD @@ -7,7 +7,7 @@ arch=('x86_64') url="" license=('AGPL-3.0') groups=() -depends=('gtk3' 'xdotool' 'libxcb' 'libxfixes' 'alsa-lib' 'curl' 'libva' 'libvdpau' 'libappindicator-gtk3') +depends=('gtk3' 'xdotool' 'libxcb' 'libxfixes' 'alsa-lib' 'curl' 'libva' 'libvdpau' 'libappindicator-gtk3' 'pam' 'gst-plugins-base' 'gst-plugin-pipewire') makedepends=() checkdepends=() optdepends=() @@ -22,9 +22,6 @@ noextract=() md5sums=() #generate with 'makepkg -g' package() { - pacman -S --noconfirm gst-plugins-base || true - pacman -S --noconfirm gst-plugin-pipewire || true - pacman -S --noconfirm pam if [[ ${FLUTTER} ]]; then mkdir -p "${pkgdir}/usr/lib/rustdesk" && cp -r ${HBB}/flutter/build/linux/x64/release/bundle/* -t "${pkgdir}/usr/lib/rustdesk" fi