From 5555ba6b2fead83092e3485b7d71b448efc09b51 Mon Sep 17 00:00:00 2001
From: RustDesk <71636191+rustdesk@users.noreply.github.com>
Date: Mon, 7 Oct 2024 21:50:01 +0800
Subject: [PATCH] Revert "manifest updates from the Flathub's PR (#9581)"
 (#9585)

This reverts commit e06f456bbd3241c20993fa4603a0c8e6ca6c9bdb.
---
 .github/workflows/flutter-build.yml        |  4 +-
 flatpak/com.rustdesk.RustDesk.metainfo.xml | 40 -----------------
 flatpak/rustdesk.json                      | 50 +++++++++-------------
 flatpak/xdotool.json                       | 15 +++++++
 4 files changed, 37 insertions(+), 72 deletions(-)
 delete mode 100644 flatpak/com.rustdesk.RustDesk.metainfo.xml
 create mode 100644 flatpak/xdotool.json

diff --git a/.github/workflows/flutter-build.yml b/.github/workflows/flutter-build.yml
index 989aee65f..dd21515ba 100644
--- a/.github/workflows/flutter-build.yml
+++ b/.github/workflows/flutter-build.yml
@@ -1951,8 +1951,8 @@ jobs:
                wget
             # flatpak deps
             flatpak --user remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-            flatpak --user install -y flathub org.freedesktop.Platform/${{ matrix.job.arch }}/24.08
-            flatpak --user install -y flathub org.freedesktop.Sdk/${{ matrix.job.arch }}/24.08
+            flatpak --user install -y flathub org.freedesktop.Platform/${{ matrix.job.arch }}/23.08
+            flatpak --user install -y flathub org.freedesktop.Sdk/${{ matrix.job.arch }}/23.08
             # package
             pushd flatpak
             git clone https://github.com/flathub/shared-modules.git --depth=1
diff --git a/flatpak/com.rustdesk.RustDesk.metainfo.xml b/flatpak/com.rustdesk.RustDesk.metainfo.xml
deleted file mode 100644
index 12842fb8a..000000000
--- a/flatpak/com.rustdesk.RustDesk.metainfo.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
-  <id>com.rustdesk.RustDesk</id>
-  <developer_name>RustDesk</developer_name>
-  <launchable type="desktop-id">com.rustdesk.RustDesk.desktop</launchable>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>AGPL-3.0-only</project_license>
-  <name>RustDesk</name>
-  <summary>An open-source remote desktop application designed for self-hosting, as an alternative to TeamViewer.</summary>
-  <description>
-    <p>
-        RustDesk is a full-featured open source remote control alternative for self-hosting and security with minimal configuration.
-    </p>
-    <ul>
-      <li> Works on Windows, macOS, Linux, iOS, Android, Web. </li>
-      <li> Supports VP8 / VP9 / AV1 software codecs, and H264 / H265 hardware codecs. </li>
-      <li> Own your data, easily set up self-hosting solution on your infrastructure. </li>
-      <li> P2P connection with end-to-end encryption based on NaCl. </li>
-      <li> No administrative privileges or installation needed for Windows, elevate priviledge locally or from remote on demand. </li>
-      <li> We like to keep things simple and will strive to make simpler where possible. </li>
-    </ul>
-    <p>
-        For self-hosting setup instructions please go to our home page.
-    </p>
-  </description>
-  <categories>
-    <category>Utility</category>
-  </categories>
-  <screenshots>
-    <screenshot type="default">
-      <image>https://user-images.githubusercontent.com/71636191/171661982-430285f0-2e12-4b1d-9957-4a58e375304d.png</image>
-    </screenshot>
-  </screenshots>
-  <url type="homepage">https://rustdesk.com</url>
-  <url type="bugtracker">https://github.com/rustdesk/rustdesk/issues</url>
-  <releases>
-    <release version="v1.3.1" date="2024-09-20"/>
-  </releases>
-  <content_rating type="oars-1.1"/>
-</component>
\ No newline at end of file
diff --git a/flatpak/rustdesk.json b/flatpak/rustdesk.json
index 366f83f5b..6d7acb5b8 100644
--- a/flatpak/rustdesk.json
+++ b/flatpak/rustdesk.json
@@ -1,36 +1,19 @@
 {
   "id": "com.rustdesk.RustDesk",
   "runtime": "org.freedesktop.Platform",
-  "runtime-version": "24.08",
+  "runtime-version": "23.08",
   "sdk": "org.freedesktop.Sdk",
   "command": "rustdesk",
-  "rename-desktop-file": "rustdesk.desktop",
-  "rename-icon": "rustdesk",
-  "cleanup": [
-    "/include",
-    "/lib/pkgconfig",
-    "/share/gtk-doc"
-  ],
+  "icon": "share/icons/hicolor/scalable/apps/rustdesk.svg",
   "modules": [
     "shared-modules/libappindicator/libappindicator-gtk3-12.10.json",
-    {
-      "name": "xdotool",
-      "no-autogen": true,
-      "make-install-args": [
-        "PREFIX=${FLATPAK_DEST}"
-      ],
-      "sources": [
-        {
-          "type": "archive",
-          "url": "https://github.com/jordansissel/xdotool/releases/download/v3.20211022.1/xdotool-3.20211022.1.tar.gz",
-          "sha256": "96f0facfde6d78eacad35b91b0f46fecd0b35e474c03e00e30da3fdd345f9ada"
-        }
-      ]
-    },
+    "xdotool.json",
     {
       "name": "pam",    
-      "buildsystem": "autotools",
-      "config-opts": [ "--disable-selinux" ],
+      "buildsystem": "simple",
+      "build-commands": [
+          "./configure --disable-selinux --prefix=/app && make -j4 install"
+      ],
       "sources": [
         {
           "type": "archive",
@@ -43,25 +26,32 @@
       "name": "rustdesk",
       "buildsystem": "simple",
       "build-commands": [
-        "bsdtar -Oxf rustdesk.deb data.tar.xz | bsdtar -xf -",
-        "cp -r usr/* /app/",
+        "bsdtar -zxvf rustdesk.deb",
+        "tar -xvf ./data.tar.xz",
+        "cp -r ./usr/*  /app/",
         "mkdir -p /app/bin && ln -s /app/lib/rustdesk/rustdesk /app/bin/rustdesk",
-        "install -Dm644 com.rustdesk.RustDesk.metainfo.xml /app/share/metainfo/com.rustdesk.RustDesk.metainfo.xml"
+        "mv /app/share/applications/rustdesk.desktop /app/share/applications/com.rustdesk.RustDesk.desktop",
+        "mv /app/share/applications/rustdesk-link.desktop /app/share/applications/com.rustdesk.RustDesk-link.desktop",
+        "sed -i '/^Icon=/ c\\Icon=com.rustdesk.RustDesk' /app/share/applications/*.desktop",
+        "mv /app/share/icons/hicolor/scalable/apps/rustdesk.svg /app/share/icons/hicolor/scalable/apps/com.rustdesk.RustDesk.svg",
+        "for size in 16 24 32 48 64 128 256 512; do\n rsvg-convert -w $size -h $size -f png -o $size.png scalable.svg\n install -Dm644 $size.png /app/share/icons/hicolor/${size}x${size}/apps/com.rustdesk.RustDesk.png\n done"
       ],
+      "cleanup": ["/include", "/lib/pkgconfig", "/share/gtk-doc"],
       "sources": [
         {
           "type": "file",
-          "path": "rustdesk.deb"
+          "path": "./rustdesk.deb"
         },
         {
           "type": "file",
-          "path": "com.rustdesk.RustDesk.metainfo.xml"
+          "path": "../res/scalable.svg"
         }
       ]
     }
   ],
   "finish-args": [
     "--share=ipc",
+    "--socket=x11",
     "--socket=fallback-x11",
     "--socket=wayland",
     "--share=network",
@@ -70,4 +60,4 @@
     "--socket=pulseaudio",
     "--talk-name=org.freedesktop.Flatpak"
   ]
-}
\ No newline at end of file
+}
diff --git a/flatpak/xdotool.json b/flatpak/xdotool.json
new file mode 100644
index 000000000..d7f41bf0e
--- /dev/null
+++ b/flatpak/xdotool.json
@@ -0,0 +1,15 @@
+{
+    "name": "xdotool",
+    "buildsystem": "simple",
+    "build-commands": [
+        "make -j4 && PREFIX=./build make install",
+        "cp -r ./build/*  /app/"
+    ],
+    "sources": [
+        {
+            "type": "archive",
+            "url": "https://github.com/jordansissel/xdotool/releases/download/v3.20211022.1/xdotool-3.20211022.1.tar.gz",
+            "sha256": "96f0facfde6d78eacad35b91b0f46fecd0b35e474c03e00e30da3fdd345f9ada"
+        }
+    ]
+}