com.cisco.PacketTracer.yml: update

README.md: update
Makefile: add install-deps

Signed-off-by: unexplrd <unexplrd@linerds.us>

Makefile

@@ -1,4 +1,10 @@
-install:
+install-deps:
+	flatpak install \
+	--user --assumeyes --noninteractive \
+    org.kde.Sdk/x86_64/5.15-24.08 \
+    io.qt.qtwebengine.BaseApp/x86_64/5.15-24.08
+
+install: install-deps
 	flatpak-builder --delete-build-dirs --force-clean --user --install build com.cisco.PacketTracer.yml
 
 uninstall:

README.md

@@ -11,7 +11,16 @@
 
 ## About
 
-This is a Flatpak manifest for [Cisco's Packet Tracer](https://www.netacad.com/courses/packet-tracer). The Deb package in which Cisco distributes their binary build of Packet Tracer is not included as the download link for and use of Packet Tracer itself requires a Netacad account.
+This is a fork of [Flatpak manifest](https://github.com/losuler/com.cisco.PacketTracer) for [Cisco's Packet Tracer](https://www.netacad.com/courses/packet-tracer). The Deb package in which Cisco distributes their binary build of Packet Tracer is not included as the download link for and use of Packet Tracer itself requires a Netacad account, which can be bypassed with disabled networking.
+
+## Changes from upstream
+- Manifest changes:
+    - Updated platforms (from 22.08 to 24.08)
+    - Restricted permissions on network and filesystem (xdg-download/packettracer instead of xdg-download)
+    - Added `QT_QPA_PLATFORM=xcb` envvar
+- Makefile changes:
+    - Added `install-deps` option
+
 
 This is currently based on Packet Tracer 8.2.1 and is intended to track the latest release. For previous releases see [janymal/PacketTracer7-flatpak](https://github.com/janymal/PacketTracer7-flatpak) and [rpallai/flatpak-pt](https://github.com/rpallai/flatpak-pt).
 
@@ -20,32 +29,21 @@ This is currently based on Packet Tracer 8.2.1 and is intended to track the late
 1. Clone this repository.
 
     ```bash
-    git clone https://github.com/losuler/com.cisco.PacketTracer
+    git clone https://gitea.linerds.us/unexplrd/com.cisco.PacketTracer
     ```
 
-2. Install build dependencies (using your preferred package manager).
+2. Download the official Deb package to the cloned repository (don't rename it).
+
+    https://skillsforall.com/resources/lab-downloads
+
+3. Pull dependencies and run build with Nix:
 
     ```bash
-    dnf install flatpak-builder
+    nix-shell -p flatpak-builder appstream gnumake --run 'make install'
     ```
-
+    or
-3. Install Flatpak runtime dependencies.
-
     ```bash
-    flatpak install \
+    nix shell nixpkgs#{flatpak-builder,appstream,gnumake} -c make install
-        org.freedesktop.Platform/x86_64/21.08 \
-        org.freedesktop.Sdk/x86_64/21.08
-    ```
-
-4. Download the official Deb package to the cloned repository (don't rename it).
-
-    https://www.netacad.com/portal/resources/packet-tracer
-
-5. Build and install the Flatpak.
-
-    ```bash
-    cd com.cisco.PacketTracer
-    flatpak-builder --install --user build com.cisco.PacketTracer.yml
     ```
 
 ## Notes

com.cisco.PacketTracer.desktop

@@ -8,5 +8,5 @@ Icon=com.cisco.PacketTracer
 Name=Packet Tracer
 Categories=Application;Network;
 
-MimeType=application/x-pkt;application/x-pka;application/x-pkz;
+MimeType=application/x-pkt;application/x-pka;application/x-pkz;application/x-pks;application/x-pksz;
 StartupWMClass=PacketTracer

com.cisco.PacketTracer.url.desktop

@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+
+Exec=/app/pt/packettracer -uri=%u
+Icon=com.cisco.PacketTracer
+
+Name=Packet Tracer
+Categories=Application;Network;
+NoDisplay=true
+
+MimeType=x-scheme-handler/pttp;
+StartupWMClass=PacketTracer

com.cisco.PacketTracer.yml

@@ -1,9 +1,9 @@
 app-id: com.cisco.PacketTracer
 runtime: org.kde.Platform
-runtime-version: '5.15-22.08'
+runtime-version: '5.15-24.08'
 sdk: org.kde.Sdk
 base: io.qt.qtwebengine.BaseApp
-base-version: '5.15-22.08'
+base-version: '5.15-24.08'
 command: /app/pt/packettracer
 separate-locales: false
 
@@ -12,12 +12,13 @@ tags:
 
 finish-args:
   - --share=ipc
-  - --share=network
+  # - --share=network
   - --socket=x11
   - --socket=pulseaudio
   - --device=dri
-  - --filesystem=xdg-download
+  - --filesystem=xdg-download/packettracer
   - --persist=.
+  - --env=QT_QPA_PLATFORM=xcb
   - --env=TZ=
 
 modules:
@@ -25,22 +26,28 @@ modules:
     buildsystem: simple
     build-commands:
       - install -D com.cisco.PacketTracer.appdata.xml /app/share/metainfo/com.cisco.PacketTracer.appdata.xml
-      - ar x CiscoPacketTracer_821_Ubuntu_64bit.deb
+      - ar x Packet_Tracer822_amd64_signed.deb
       - xz -d data.tar.xz
       - tar -xf data.tar
       - find opt/pt/saves opt/pt/templates opt/pt/templates/environments -type d -exec chmod 755 {} +
       - find opt/pt/saves opt/pt/templates opt/pt/templates/environments -type f -exec chmod 644 {} +
       - mv opt/pt /app
       - install -D /app/pt/art/app.png /app/share/icons/hicolor/48x48/apps/com.cisco.PacketTracer.png
+      - install -D com.cisco.PacketTracer.png /app/share/icons/hicolor/128x128/apps/com.cisco.PacketTracer.png
       - install -D com.cisco.PacketTracer.desktop /app/share/applications/com.cisco.PacketTracer.desktop
+      - install -D com.cisco.PacketTracer.url.desktop /app/share/applications/com.cisco.PacketTracer.url.desktop
       - sed -i -e 's\/opt/\/app/\g' /app/pt/packettracer /app/pt/linguist
       - sed -i -e 's\"$@"\-style windows "$@"\;' /app/pt/packettracer /app/pt/linguist
 
     sources:
       - type: file
-        path: CiscoPacketTracer_821_Ubuntu_64bit.deb
+        path: Packet_Tracer822_amd64_signed.deb
-        sha256: 428338ac32a474d4c9e930433c202cfa5d7b24b9eca50165972f41eb484e07ba
+        sha256: 6cd2b8891df92d2cad8b6fdc47480fc089de085c4f3fe95eb80d5450a2a7f72d
       - type: file
         path: com.cisco.PacketTracer.appdata.xml
       - type: file
         path: com.cisco.PacketTracer.desktop
+      - type: file
+        path: com.cisco.PacketTracer.url.desktop
+      - type: file
+        path: com.cisco.PacketTracer.png