From 08cfac5f70d1b39a7d83b57fa5ed889bc3cd8a12 Mon Sep 17 00:00:00 2001 From: unexplrd Date: Mon, 19 May 2025 14:24:21 +0300 Subject: [PATCH] com.cisco.PacketTracer.yml: update README.md: update Makefile: add install-deps Signed-off-by: unexplrd --- Makefile | 8 +++++++- README.md | 38 ++++++++++++++++++-------------------- com.cisco.PacketTracer.yml | 9 +++++---- 3 files changed, 30 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index 715dd70..b487cfe 100644 --- a/Makefile +++ b/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: diff --git a/README.md b/README.md index 2d32604..f58f572 100644 --- a/README.md +++ b/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). - - ```bash - dnf install flatpak-builder - ``` - -3. Install Flatpak runtime dependencies. - - ```bash - flatpak install \ - org.kde.Sdk/x86_64/5.15-22.08 \ - io.qt.qtwebengine.BaseApp/x86_64/5.15-22.08 - ``` - -4. Download the official Deb package to the cloned repository (don't rename it). +2. Download the official Deb package to the cloned repository (don't rename it). https://skillsforall.com/resources/lab-downloads -5. Build and install the Flatpak. +3. Pull dependencies and run build with Nix: ```bash - cd com.cisco.PacketTracer - flatpak-builder --install --user build com.cisco.PacketTracer.yml + nix-shell -p flatpak-builder appstream gnumake --run 'make install' + ``` + or + ```bash + nix shell nixpkgs#{flatpak-builder,appstream,gnumake} -c make install ``` ## Notes diff --git a/com.cisco.PacketTracer.yml b/com.cisco.PacketTracer.yml index f58858a..2724b66 100644 --- a/com.cisco.PacketTracer.yml +++ b/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: