Issue #212: Update Flatpak

JakubMelka · Dec 7, 2024 · e2c3f88 · e2c3f88
1 parent c70063e
commit e2c3f88
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 40 deletions.
diff --git a/.github/workflows/LinuxFlatpak.yml b/.github/workflows/LinuxFlatpak.yml
@@ -5,24 +5,52 @@ on:
 
 jobs:
   build_ubuntu:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
+      - name: Install Dependencies
+        run: |
+           sudo apt update
+           sudo apt install -y ninja-build libglib2.0-dev libxml2-dev libyaml-dev gettext libarchive-dev gperf pkg-config libstemmer-dev python3-dev python3-pip libcurl4-openssl-dev libsystemd-dev gobject-introspection libgirepository1.0-dev itstool xsltproc
+           sudo pip3 install meson
+    
+      - name: Install AppStream
+        run: |
+           git clone https://github.com/ximion/appstream.git
+           cd appstream
+           meson build
+           ninja -C build
+           sudo ninja -C build install
+           
+      - name: Verify AppStream Version
+        run: |
+           appstreamcli --version
+    
       - name: Setup Flatpak
         run: |
           sudo apt update
           sudo apt install -y flatpak-builder flatpak
 
       - name: Add Flatpak repository
         run: |
-          flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+          sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
           
+      - name: Install KDE SDK and Runtime
+        run: |
+          sudo flatpak install -y flathub org.kde.Sdk/x86_64/6.8 org.kde.Platform/x86_64/6.8
+          
+      - name: List Flatpak Installed Packages and Version
+        run: |
+          flatpak --version
+          appstreamcli --version
+          flatpak list
+
       - name: Checkout repository
         uses: actions/checkout@v3
 
       - name: Build Flatpak
         run: |
-          flatpak-builder --repo=repo --sandbox --force-clean  build-dir ./pdf4qt/Flatpak/io.github.JakubMelka.Pdf4qt.json 
+          flatpak-builder --repo=repo --sandbox --force-clean  build-dir ./Flatpak/io.github.JakubMelka.Pdf4qt.json 
 
       - name: Build Flatpak Package
         run: |

diff --git a/Desktop/io.github.JakubMelka.Pdf4qt.appdata.xml b/Desktop/io.github.JakubMelka.Pdf4qt.appdata.xml
@@ -38,10 +38,12 @@
     <release version="1.0.0" date="2021-09-19"/>
   </releases>
   <screenshots>
-    <screenshot><caption>Browse PDF files easily and efficiently</caption><image>https://jakubmelka.github.io/assets/flatpak/profi-default.png</image></screenshot>
+    <screenshot default="true"><caption>Edit content of PDF documents</caption><image>https://jakubmelka.github.io/assets/flatpak/profi-editor.png</image></screenshot>
+	<screenshot><caption>Browse PDF files easily and efficiently</caption><image>https://jakubmelka.github.io/assets/flatpak/profi-default.png</image></screenshot>
     <screenshot><caption>Utilize the 'magnifying glass' feature to zoom in on specific sections of the page</caption><image>https://jakubmelka.github.io/assets/flatpak/profi-magnifier.png</image></screenshot>
     <screenshot><caption>Display statistics for various content types within the PDF file</caption><image>https://jakubmelka.github.io/assets/flatpak/profi-object-statistics.png</image></screenshot>
     <screenshot><caption>View the document details</caption><image>https://jakubmelka.github.io/assets/flatpak/profi-properties.png</image></screenshot>
     <screenshot><caption>List of add-ons available for the PDF editor</caption><image>https://jakubmelka.github.io/assets/flatpak/profi-addons.png</image></screenshot>
+	<screenshot><caption>Search PDF documents using regular expressions</caption><image>https://jakubmelka.github.io/assets/flatpak/profi-search-regex.png</image></screenshot>
   </screenshots>
 </component>
diff --git a/Flatpak/io.github.JakubMelka.Pdf4qt.json b/Flatpak/io.github.JakubMelka.Pdf4qt.json
@@ -3,16 +3,14 @@
     "runtime": "org.kde.Sdk",
     "runtime-version": "6.8",
     "sdk": "org.kde.Sdk",
-    "command": "Pdf4QtLaunchPad",
+    "command": "Pdf4QtEditor",
     "finish-args": [
         "--socket=fallback-x11",
         "--socket=wayland",
         "--device=dri",
         "--share=ipc"
     ],
     "cleanup": [
-        "/pdf4qt",
-        "/vcpkg"
     ],
     "build-options": {
       "env": {
@@ -71,7 +69,8 @@
             "name": "openjpeg",
             "buildsystem": "cmake-ninja",
             "config-opts": [
-                "-DCMAKE_BUILD_TYPE=Release"
+                "-DCMAKE_BUILD_TYPE=Release",
+                "-DBUILD_CODEC=OFF"
             ],
             "sources": [
                 {
@@ -82,38 +81,6 @@
                 }
             ]
         },
-        {
-            "name": "freetype",
-            "buildsystem": "cmake-ninja",
-            "builddir": true,
-            "config-opts": [
-                "-DCMAKE_BUILD_TYPE=Release",
-                "-DBUILD_SHARED_LIBS=true"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://github.com/freetype/freetype.git",
-                    "tag": "VER-2-13-3",
-                    "commit": "42608f77f20749dd6ddc9e0536788eaad70ea4b5"
-                }
-            ]
-        },
-        {
-            "name": "libjpegturbo",
-            "buildsystem": "cmake-ninja",
-            "config-opts": [
-                "-DCMAKE_BUILD_TYPE=Release"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://github.com/libjpeg-turbo/libjpeg-turbo.git",
-                    "tag": "3.0.90",
-                    "commit": "a9f7490cda6f6840ff3662b4d67ce0a91de5c9a5"
-                }
-            ]
-        },
         {
             "name": "asmjit",
             "buildsystem": "cmake-ninja",