diff --git a/.gitignore b/.gitignore index 91bbe6a..67f5549 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ *.deb +*.flatpak build/ +repo/ .flatpak-builder/ diff --git a/README.md b/README.md index 2d32604..6033502 100644 --- a/README.md +++ b/README.md @@ -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 + # or flatpak install \ org.kde.Sdk/x86_64/5.15-22.08 \ io.qt.qtwebengine.BaseApp/x86_64/5.15-22.08 diff --git a/com.cisco.PacketTracer.yml b/com.cisco.PacketTracer.yml index f58858a..24453db 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: '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 @@ -11,14 +11,19 @@ tags: - proprietary finish-args: - - --share=ipc - - --share=network + # - --share=ipc + # - --share=network - --socket=x11 - - --socket=pulseaudio + # - --socket=pulseaudio - --device=dri - - --filesystem=xdg-download + # - --filesystem=xdg-download - --persist=. - --env=TZ= + - --nofilesystem=xdg-config/kdeglobals + - --no-talk-name=com.canonical.AppMenu.Registrar + - --no-talk-name=org.kde.kconfig.notify + - --no-talk-name=org.kde.kdeconnect + - --no-talk-name=org.kde.KGlobalSettings modules: - name: packettracer @@ -35,6 +40,7 @@ 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 @@ -42,6 +48,8 @@ modules: - 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 diff --git a/packettracer.patch b/packettracer.patch new file mode 100644 index 0000000..71e95f9 --- /dev/null +++ b/packettracer.patch @@ -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