Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
*.deb
*.flatpak
build/
repo/
.flatpak-builder/
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ This is currently based on Packet Tracer 8.2.1 and is intended to track the late
3. Install Flatpak runtime dependencies.

```bash
flatpak-builder --install-deps-from=flathub --install-deps-only build com.cisco.PacketTracer.yml
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is neat, I didn't realise you could do this! It's probably better if you just remove this step and move this command to replace the existing flatpak-builder build command in step 5.

# or
flatpak install \
org.kde.Sdk/x86_64/5.15-22.08 \
io.qt.qtwebengine.BaseApp/x86_64/5.15-22.08
Expand Down
20 changes: 14 additions & 6 deletions com.cisco.PacketTracer.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,29 @@
app-id: com.cisco.PacketTracer
runtime: org.kde.Platform
runtime-version: '5.15-22.08'
runtime-version: '6.8'
sdk: org.kde.Sdk
base: io.qt.qtwebengine.BaseApp
base-version: '5.15-22.08'
base-version: '6.8'
command: /app/pt/packettracer
separate-locales: false

tags:
- proprietary

finish-args:
- --share=ipc
- --share=network
# - --share=ipc
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think removing this could potentially negatively impact performance1.

Footnotes

  1. https://docs.flatpak.org/en/latest/sandbox-permissions.html#f1

# - --share=network
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should keep this otherwise I don't believe it's possible to login with your Cisco account.

- --socket=x11
- --socket=pulseaudio
# - --socket=pulseaudio
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't remember there being any audio output from Packet Tracer lol, so it's fine to remove this.

- --device=dri
- --filesystem=xdg-download
# - --filesystem=xdg-download
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reason I added was so that I had somewhere I could save the session file. Most Flatpak's are meant to be usable out of the box and if you want it more restricted, I think the best way to do this is to have the user do so from Flatseal before they launch the Flatpak.

- --persist=.
- --env=TZ=
- --nofilesystem=xdg-config/kdeglobals
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fine as long as you can confirm this doesn't break anything on KDE1.

Footnotes

  1. https://gitlab.gnome.org/GNOME/gnome-software/-/merge_requests/1786

- --no-talk-name=com.canonical.AppMenu.Registrar
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fine as long as you can confirm this doesn't remove this functionality.

- --no-talk-name=org.kde.kconfig.notify
- --no-talk-name=org.kde.kdeconnect
- --no-talk-name=org.kde.KGlobalSettings

modules:
- name: packettracer
Expand All @@ -35,13 +40,16 @@ modules:
- 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
- patch /app/pt/packettracer packettracer.patch
- 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: Packet_Tracer822_amd64_signed.deb
sha256: 6cd2b8891df92d2cad8b6fdc47480fc089de085c4f3fe95eb80d5450a2a7f72d
- type: file
path: packettracer.patch
- type: file
path: com.cisco.PacketTracer.appdata.xml
- type: file
Expand Down
7 changes: 7 additions & 0 deletions packettracer.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@@ -5,5 +5,5 @@
PTDIR=/opt/pt
export LD_LIBRARY_PATH=/opt/pt/bin
pushd /opt/pt/bin > /dev/null
-./PacketTracer "$@" > /dev/null 2>&1
+./PacketTracer "$@"
popd > /dev/null