소스 검색

[FIX] Rpm build for Auth (#1466)

## Description

Try to remove missing deps error in auth desktop.
Vishnu Mohandas 1 년 전
부모
커밋
292065a7b5
4개의 변경된 파일7개의 추가작업 그리고 6개의 파일을 삭제
  1. 1 1
      .github/workflows/auth-release.yml
  2. 1 1
      auth/linux/packaging/rpm/make_config.yaml
  3. 3 3
      auth/pubspec.lock
  4. 2 1
      auth/pubspec.yaml

+ 1 - 1
.github/workflows/auth-release.yml

@@ -85,7 +85,7 @@ jobs:
             - name: Install dependencies for desktop build
             - name: Install dependencies for desktop build
               run: |
               run: |
                   sudo apt-get update -y
                   sudo apt-get update -y
-                  sudo apt-get install -y libsecret-1-dev libsodium-dev libwebkit2gtk-4.0-dev libfuse2 ninja-build libgtk-3-dev dpkg-dev pkg-config rpm libsqlite3-dev locate appindicator3-0.1 libappindicator3-dev libffi-dev libtiff5
+                  sudo apt-get install -y libsecret-1-dev libsodium-dev libwebkit2gtk-4.0-dev libfuse2 ninja-build libgtk-3-dev dpkg-dev pkg-config rpm patchelf libsqlite3-dev locate appindicator3-0.1 libappindicator3-dev libffi-dev libtiff5
                   sudo updatedb --localpaths='/usr/lib/x86_64-linux-gnu'
                   sudo updatedb --localpaths='/usr/lib/x86_64-linux-gnu'
 
 
             - name: Install appimagetool
             - name: Install appimagetool

+ 1 - 1
auth/linux/packaging/rpm/make_config.yaml

@@ -11,7 +11,7 @@ display_name: Auth
 
 
 requires:
 requires:
   - libsqlite3x
   - libsqlite3x
-  - webkit2gtk-4.0
+  - webkit2gtk4.0
   - libsodium
   - libsodium
   - libsecret
   - libsecret
   - libappindicator
   - libappindicator

+ 3 - 3
auth/pubspec.lock

@@ -293,9 +293,9 @@ packages:
     dependency: "direct main"
     dependency: "direct main"
     description:
     description:
       path: "packages/desktop_webview_window"
       path: "packages/desktop_webview_window"
-      ref: HEAD
-      resolved-ref: "8cbbf9cd6efcfee5e0f420a36f7f8e7e64b667a1"
-      url: "https://github.com/MixinNetwork/flutter-plugins"
+      ref: fix-webkit-version
+      resolved-ref: fe2223e4edfecdbb3a97bb9e3ced73db4ae9d979
+      url: "https://github.com/ente-io/flutter-desktopwebview-fork"
     source: git
     source: git
     version: "0.2.4"
     version: "0.2.4"
   device_info_plus:
   device_info_plus:

+ 2 - 1
auth/pubspec.yaml

@@ -20,7 +20,8 @@ dependencies:
   convert: ^3.1.1
   convert: ^3.1.1
   desktop_webview_window:
   desktop_webview_window:
     git:
     git:
-      url: https://github.com/MixinNetwork/flutter-plugins
+      url: https://github.com/ente-io/flutter-desktopwebview-fork
+      ref: fix-webkit-version
       path: packages/desktop_webview_window
       path: packages/desktop_webview_window
   device_info_plus: ^9.1.1
   device_info_plus: ^9.1.1
   dio: ^5.4.0
   dio: ^5.4.0