From fcb71f86244936d2c35d008f6f1092a1df5ee646 Mon Sep 17 00:00:00 2001 From: LI Daobing Date: Sun, 25 Jan 2026 15:17:04 -0800 Subject: [PATCH 01/18] 1 --- .github/workflows/flatpak-snapshot.yml | 58 ++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 .github/workflows/flatpak-snapshot.yml diff --git a/.github/workflows/flatpak-snapshot.yml b/.github/workflows/flatpak-snapshot.yml new file mode 100644 index 00000000..6ee3129d --- /dev/null +++ b/.github/workflows/flatpak-snapshot.yml @@ -0,0 +1,58 @@ +name: Build Flatpak Snapshot + +on: + push: + branches: + - flatpak-snapshot + workflow_dispatch: + +jobs: + build-and-deploy: + runs-on: ubuntu-latest + permissions: + contents: write + steps: + # 1. Checkout repo + - name: Checkout + uses: actions/checkout@v4 + + # 2. Set up Flatpak + - name: Install Flatpak + run: | + sudo apt update + sudo apt install -y flatpak flatpak-builder git wget xz-utils + + # 3. Install GNOME SDK runtime + - name: Install GNOME SDK + run: | + flatpak install --noninteractive flathub org.gnome.Sdk//46 org.gnome.Platform//46 + + # 4. Determine snapshot version from Git + - name: Set snapshot version + id: vars + run: | + SHORT_HASH=$(git rev-parse --short HEAD) + VERSION="0.9.3~git${SHORT_HASH}" + echo "VERSION=${VERSION}" >> $GITHUB_ENV + echo "Snapshot version set to ${VERSION}" + + # 5. Build Flatpak + - name: Build Flatpak + run: | + flatpak-builder --force-clean build-dir iptux.flatpak.yaml + + # 6. Export repository to repo/ + - name: Export Flatpak repo + run: | + flatpak build-export repo build-dir --collection-id=io.github.iptux + + # 7. Commit & push to gh-pages + - name: Deploy to GitHub Pages + uses: peaceiris/actions-gh-pages@v4 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: repo + publish_branch: gh-pages + user_name: "GitHub Actions" + user_email: "actions@github.com" + commit_message: "Update Flatpak snapshot: ${{ env.VERSION }}" From e8da57f13f8e8bd60a3638c6d613252a4d7b5ed7 Mon Sep 17 00:00:00 2001 From: LI Daobing Date: Sun, 25 Jan 2026 15:19:24 -0800 Subject: [PATCH 02/18] 1 --- .github/workflows/flatpak-snapshot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/flatpak-snapshot.yml b/.github/workflows/flatpak-snapshot.yml index 6ee3129d..6da7c84f 100644 --- a/.github/workflows/flatpak-snapshot.yml +++ b/.github/workflows/flatpak-snapshot.yml @@ -25,6 +25,7 @@ jobs: # 3. Install GNOME SDK runtime - name: Install GNOME SDK run: | + flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo flatpak install --noninteractive flathub org.gnome.Sdk//46 org.gnome.Platform//46 # 4. Determine snapshot version from Git From 59666d9f6ca0fb53b7c07f8b656e0c97bd475d8b Mon Sep 17 00:00:00 2001 From: LI Daobing Date: Sun, 25 Jan 2026 15:22:15 -0800 Subject: [PATCH 03/18] 1 --- .github/workflows/flatpak-snapshot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/flatpak-snapshot.yml b/.github/workflows/flatpak-snapshot.yml index 6da7c84f..7b048cd2 100644 --- a/.github/workflows/flatpak-snapshot.yml +++ b/.github/workflows/flatpak-snapshot.yml @@ -25,8 +25,8 @@ jobs: # 3. Install GNOME SDK runtime - name: Install GNOME SDK run: | - flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - flatpak install --noninteractive flathub org.gnome.Sdk//46 org.gnome.Platform//46 + sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + sudo flatpak install --noninteractive flathub org.gnome.Sdk//46 org.gnome.Platform//46 # 4. Determine snapshot version from Git - name: Set snapshot version From 7868e6cbdd2baa982dc37a7412d10cf40e624f66 Mon Sep 17 00:00:00 2001 From: LI Daobing Date: Sun, 25 Jan 2026 15:27:05 -0800 Subject: [PATCH 04/18] 1 --- .github/workflows/flatpak-snapshot.yml | 6 +- .../io.github.iptux_src.iptux.snapshot.yml | 58 +++++++++++++++++++ 2 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml diff --git a/.github/workflows/flatpak-snapshot.yml b/.github/workflows/flatpak-snapshot.yml index 7b048cd2..a59b1963 100644 --- a/.github/workflows/flatpak-snapshot.yml +++ b/.github/workflows/flatpak-snapshot.yml @@ -26,21 +26,21 @@ jobs: - name: Install GNOME SDK run: | sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - sudo flatpak install --noninteractive flathub org.gnome.Sdk//46 org.gnome.Platform//46 + sudo flatpak install --noninteractive flathub org.gnome.Sdk//48 org.gnome.Platform//48 # 4. Determine snapshot version from Git - name: Set snapshot version id: vars run: | SHORT_HASH=$(git rev-parse --short HEAD) - VERSION="0.9.3~git${SHORT_HASH}" + VERSION="0.10.0~git${SHORT_HASH}" echo "VERSION=${VERSION}" >> $GITHUB_ENV echo "Snapshot version set to ${VERSION}" # 5. Build Flatpak - name: Build Flatpak run: | - flatpak-builder --force-clean build-dir iptux.flatpak.yaml + flatpak-builder --force-clean build-dir scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml # 6. Export repository to repo/ - name: Export Flatpak repo diff --git a/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml b/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml new file mode 100644 index 00000000..be5a85ed --- /dev/null +++ b/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml @@ -0,0 +1,58 @@ +# snapcraft.yaml +name: iptux +version: 0.10.0 +app-id: io.github.iptux_src.iptux +runtime: org.gnome.Platform +runtime-version: '46' +sdk: org.gnome.Sdk +command: iptux +finish-args: + - --share=network + - --share=ipc + - --socket=fallback-x11 + - --socket=wayland + - --filesystem=home + +modules: + - name: libsigc++ + buildsystem: meson + sources: + - type: archive + url: https://download.gnome.org/sources/libsigc++/2.10/libsigc++-2.10.8.tar.xz + sha256: 235a40bec7346c7b82b6a8caae0456353dc06e71f14bc414bcc858af1838719a + + - name: gflags + buildsystem: cmake-ninja + config-opts: + - -DCMAKE_BUILD_TYPE=Release + - -DBUILD_SHARED_LIBS=ON + sources: + - type: archive + url: https://github.com/gflags/gflags/archive/v2.2.2.tar.gz + sha256: 34af2f15cf7367513b352bdcd2493ab14ce43692d2dcd9dfc499492966c64dcf + + - name: glog + buildsystem: cmake-ninja + config-opts: + - -DCMAKE_BUILD_TYPE=Release + - -DBUILD_SHARED_LIBS=ON + sources: + - type: archive + url: https://github.com/google/glog/archive/v0.6.0.tar.gz + sha256: 8a83bf982f37bb70825df71a9709fa90ea9f4447fb3c099e1d720a439d88bad6 + + - name: jsoncpp + buildsystem: meson + sources: + - type: archive + url: https://github.com/open-source-parsers/jsoncpp/archive/1.9.5.tar.gz + sha256: f409856e5920c18d0c2fb85276e24ee607d2a09b5e7d5f0a371368903c275da2 + + - name: iptux + buildsystem: meson + sources: + - type: git + url: https://github.com/iptux-src/iptux.git + commit: 7a32e3bd19b7c2a6dd8caa6ca42588c65a7c1deb + config-opts: + - --buildtype=release From abceb04f9b1efd59b66eb92d1ca19a8b581bedcb Mon Sep 17 00:00:00 2001 From: LI Daobing Date: Sun, 25 Jan 2026 15:29:52 -0800 Subject: [PATCH 05/18] 1 --- scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml b/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml index be5a85ed..c6a9ff50 100644 --- a/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml +++ b/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml @@ -3,7 +3,7 @@ name: iptux version: 0.10.0 app-id: io.github.iptux_src.iptux runtime: org.gnome.Platform -runtime-version: '46' +runtime-version: '48' sdk: org.gnome.Sdk command: iptux finish-args: From d7a8177de18259250f91d136e00ea5c3a1db262e Mon Sep 17 00:00:00 2001 From: LI Daobing Date: Sun, 25 Jan 2026 15:35:10 -0800 Subject: [PATCH 06/18] 1 --- .../io.github.iptux_src.iptux.snapshot.yml | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml b/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml index c6a9ff50..cf842c20 100644 --- a/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml +++ b/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml @@ -1,4 +1,3 @@ -# snapcraft.yaml name: iptux version: 0.10.0 app-id: io.github.iptux_src.iptux @@ -21,26 +20,6 @@ modules: url: https://download.gnome.org/sources/libsigc++/2.10/libsigc++-2.10.8.tar.xz sha256: 235a40bec7346c7b82b6a8caae0456353dc06e71f14bc414bcc858af1838719a - - name: gflags - buildsystem: cmake-ninja - config-opts: - - -DCMAKE_BUILD_TYPE=Release - - -DBUILD_SHARED_LIBS=ON - sources: - - type: archive - url: https://github.com/gflags/gflags/archive/v2.2.2.tar.gz - sha256: 34af2f15cf7367513b352bdcd2493ab14ce43692d2dcd9dfc499492966c64dcf - - - name: glog - buildsystem: cmake-ninja - config-opts: - - -DCMAKE_BUILD_TYPE=Release - - -DBUILD_SHARED_LIBS=ON - sources: - - type: archive - url: https://github.com/google/glog/archive/v0.6.0.tar.gz - sha256: 8a83bf982f37bb70825df71a9709fa90ea9f4447fb3c099e1d720a439d88bad6 - - name: jsoncpp buildsystem: meson sources: From 87371d5ff0e2237f59d9aaaf02904c2039c8b87f Mon Sep 17 00:00:00 2001 From: LI Daobing Date: Sun, 25 Jan 2026 15:39:08 -0800 Subject: [PATCH 07/18] 1 --- scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml b/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml index cf842c20..1c2492e0 100644 --- a/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml +++ b/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml @@ -32,6 +32,6 @@ modules: sources: - type: git url: https://github.com/iptux-src/iptux.git - commit: 7a32e3bd19b7c2a6dd8caa6ca42588c65a7c1deb + branch: main config-opts: - --buildtype=release From 394b2aa00c15cfc8bb843347b459ef47900a9bed Mon Sep 17 00:00:00 2001 From: LI Daobing Date: Sun, 25 Jan 2026 15:43:06 -0800 Subject: [PATCH 08/18] 1 --- scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml b/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml index 1c2492e0..fb05d6e0 100644 --- a/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml +++ b/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml @@ -35,3 +35,5 @@ modules: branch: main config-opts: - --buildtype=release + build-environment: + PKG_CONFIG_PATH: "/app/lib/pkgconfig:/app/lib/x86_64-linux-gnu/pkgconfig" From 7af2920de9293fad58a573095b0e6fa7e81d9654 Mon Sep 17 00:00:00 2001 From: LI Daobing Date: Sun, 25 Jan 2026 15:49:06 -0800 Subject: [PATCH 09/18] 1 --- .github/workflows/flatpak-snapshot.yml | 6 ++++++ scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/flatpak-snapshot.yml b/.github/workflows/flatpak-snapshot.yml index a59b1963..213e0246 100644 --- a/.github/workflows/flatpak-snapshot.yml +++ b/.github/workflows/flatpak-snapshot.yml @@ -22,6 +22,12 @@ jobs: sudo apt update sudo apt install -y flatpak flatpak-builder git wget xz-utils + - name: Cache Flatpak SDK + uses: actions/cache@v3 + with: + path: ~/.local/share/flatpak + key: flatpak-sdk-48-${{ runner.os }} + # 3. Install GNOME SDK runtime - name: Install GNOME SDK run: | diff --git a/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml b/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml index fb05d6e0..8b38c6bf 100644 --- a/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml +++ b/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml @@ -36,4 +36,4 @@ modules: config-opts: - --buildtype=release build-environment: - PKG_CONFIG_PATH: "/app/lib/pkgconfig:/app/lib/x86_64-linux-gnu/pkgconfig" + PKG_CONFIG_PATH: "/app/lib/pkgconfig:/app/lib64/pkgconfig" From 295ec5563c882d4a479ce6e7b751a46b49ebaf1c Mon Sep 17 00:00:00 2001 From: LI Daobing Date: Sun, 25 Jan 2026 15:54:04 -0800 Subject: [PATCH 10/18] 1 --- scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml b/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml index 8b38c6bf..d6b5e0e2 100644 --- a/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml +++ b/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml @@ -35,5 +35,6 @@ modules: branch: main config-opts: - --buildtype=release + - --pkg-config-path=/app/lib/pkgconfig:/app/lib64/pkgconfig build-environment: PKG_CONFIG_PATH: "/app/lib/pkgconfig:/app/lib64/pkgconfig" From 08b1c4b04484dc864453d58c395bf68394359d00 Mon Sep 17 00:00:00 2001 From: LI Daobing Date: Sun, 25 Jan 2026 16:00:58 -0800 Subject: [PATCH 11/18] 1 --- scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml | 9 ++++++++- src/iptux/LogSystem.cpp | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml b/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml index d6b5e0e2..1663fcc7 100644 --- a/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml +++ b/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml @@ -27,12 +27,19 @@ modules: url: https://github.com/open-source-parsers/jsoncpp/archive/1.9.5.tar.gz sha256: f409856e5920c18d0c2fb85276e24ee607d2a09b5e7d5f0a371368903c275da2 + - name: libayatana-appindicator + buildsystem: cmake + sources: + - type: archive + url: https://github.com/AyatanaIndicators/libayatana-appindicator/archive/refs/tags/0.5.93.tar.gz + sha256: cbefed7a918a227bf71286246e237fcd3a9c8499b3eaac4897811a869409edf0 + - name: iptux buildsystem: meson sources: - type: git url: https://github.com/iptux-src/iptux.git - branch: main + branch: flatpak-snapshot config-opts: - --buildtype=release - --pkg-config-path=/app/lib/pkgconfig:/app/lib64/pkgconfig diff --git a/src/iptux/LogSystem.cpp b/src/iptux/LogSystem.cpp index e6afd88a..3e87de48 100644 --- a/src/iptux/LogSystem.cpp +++ b/src/iptux/LogSystem.cpp @@ -84,7 +84,7 @@ void LogSystem::communicateLogv(const MsgPara* msgpara, msg = g_strdup_vprintf(fmt, ap); log = g_strdup_printf("%s\n%s\n%s\n%s\n\n", LOG_START_HEADER, ptr, msg, LOG_END_HEADER); - write(fdc, log, strlen(log)); + (void)write(fdc, log, strlen(log)); g_free(log); g_free(ptr); g_free(msg); @@ -104,7 +104,7 @@ void LogSystem::systemLogv(const char* fmt, va_list ap) { g_free(ptr); g_free(msg); - write(fds, log, strlen(log)); + (void)write(fds, log, strlen(log)); g_free(log); } From 92e692f6496a3911fa3309acccfaa114a99b5130 Mon Sep 17 00:00:00 2001 From: LI Daobing Date: Sun, 25 Jan 2026 16:05:39 -0800 Subject: [PATCH 12/18] 1 --- .github/workflows/flatpak-snapshot.yml | 1 + .../flatpak/io.github.iptux_src.iptux.snapshot.yml | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/flatpak-snapshot.yml b/.github/workflows/flatpak-snapshot.yml index 213e0246..a6099aee 100644 --- a/.github/workflows/flatpak-snapshot.yml +++ b/.github/workflows/flatpak-snapshot.yml @@ -23,6 +23,7 @@ jobs: sudo apt install -y flatpak flatpak-builder git wget xz-utils - name: Cache Flatpak SDK + if: always() uses: actions/cache@v3 with: path: ~/.local/share/flatpak diff --git a/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml b/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml index 1663fcc7..12b263ee 100644 --- a/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml +++ b/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml @@ -27,12 +27,12 @@ modules: url: https://github.com/open-source-parsers/jsoncpp/archive/1.9.5.tar.gz sha256: f409856e5920c18d0c2fb85276e24ee607d2a09b5e7d5f0a371368903c275da2 - - name: libayatana-appindicator - buildsystem: cmake - sources: - - type: archive - url: https://github.com/AyatanaIndicators/libayatana-appindicator/archive/refs/tags/0.5.93.tar.gz - sha256: cbefed7a918a227bf71286246e237fcd3a9c8499b3eaac4897811a869409edf0 + # - name: libayatana-appindicator + # buildsystem: cmake + # sources: + # - type: archive + # url: https://github.com/AyatanaIndicators/libayatana-appindicator/archive/refs/tags/0.5.93.tar.gz + # sha256: cbefed7a918a227bf71286246e237fcd3a9c8499b3eaac4897811a869409edf0 - name: iptux buildsystem: meson From 76f94f16a00512e589a91e62190d60b1077386ca Mon Sep 17 00:00:00 2001 From: LI Daobing Date: Sun, 25 Jan 2026 16:10:38 -0800 Subject: [PATCH 13/18] 1 --- src/iptux/LogSystem.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/iptux/LogSystem.cpp b/src/iptux/LogSystem.cpp index 3e87de48..3fd703a5 100644 --- a/src/iptux/LogSystem.cpp +++ b/src/iptux/LogSystem.cpp @@ -12,6 +12,7 @@ #include "config.h" #include "LogSystem.h" +#include "iptux-utils/output.h" #include #include @@ -84,7 +85,9 @@ void LogSystem::communicateLogv(const MsgPara* msgpara, msg = g_strdup_vprintf(fmt, ap); log = g_strdup_printf("%s\n%s\n%s\n%s\n\n", LOG_START_HEADER, ptr, msg, LOG_END_HEADER); - (void)write(fdc, log, strlen(log)); + if (write(fdc, log, strlen(log)) < 0) { + LOG_WARN("Write communicate log failed!"); + } g_free(log); g_free(ptr); g_free(msg); @@ -104,7 +107,9 @@ void LogSystem::systemLogv(const char* fmt, va_list ap) { g_free(ptr); g_free(msg); - (void)write(fds, log, strlen(log)); + if (write(fds, log, strlen(log)) < 0) { + LOG_WARN("Write system log failed!"); + } g_free(log); } From f6b0c2d446de9083022fa32a892efc9bf33a85db Mon Sep 17 00:00:00 2001 From: LI Daobing Date: Sun, 25 Jan 2026 16:25:56 -0800 Subject: [PATCH 14/18] 1 --- .github/workflows/flatpak-snapshot.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/flatpak-snapshot.yml b/.github/workflows/flatpak-snapshot.yml index a6099aee..b542e11d 100644 --- a/.github/workflows/flatpak-snapshot.yml +++ b/.github/workflows/flatpak-snapshot.yml @@ -16,26 +16,26 @@ jobs: - name: Checkout uses: actions/checkout@v4 - # 2. Set up Flatpak + # 2. Install Flatpak and dependencies - name: Install Flatpak run: | sudo apt update sudo apt install -y flatpak flatpak-builder git wget xz-utils + # 3. Cache GNOME SDK/runtime - name: Cache Flatpak SDK - if: always() uses: actions/cache@v3 with: path: ~/.local/share/flatpak key: flatpak-sdk-48-${{ runner.os }} - # 3. Install GNOME SDK runtime + # 4. Install GNOME SDK 48 runtime - name: Install GNOME SDK run: | sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - sudo flatpak install --noninteractive flathub org.gnome.Sdk//48 org.gnome.Platform//48 + sudo flatpak install --noninteractive flathub org.gnome.Sdk//48 org.gnome.Platform//48 || true - # 4. Determine snapshot version from Git + # 5. Determine snapshot version from Git - name: Set snapshot version id: vars run: | @@ -44,17 +44,18 @@ jobs: echo "VERSION=${VERSION}" >> $GITHUB_ENV echo "Snapshot version set to ${VERSION}" - # 5. Build Flatpak + # 6. Build Flatpak - name: Build Flatpak run: | flatpak-builder --force-clean build-dir scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml - # 6. Export repository to repo/ + # 7. Export repository to repo/ with summary - name: Export Flatpak repo run: | - flatpak build-export repo build-dir --collection-id=io.github.iptux + flatpak build-export repo build-dir + flatpak build-summary repo - # 7. Commit & push to gh-pages + # 8. Commit & push to gh-pages - name: Deploy to GitHub Pages uses: peaceiris/actions-gh-pages@v4 with: From 5c8437d9e2c9b86ea3cefcaff7d7b1e253ec5a92 Mon Sep 17 00:00:00 2001 From: LI Daobing Date: Sun, 25 Jan 2026 16:59:21 -0800 Subject: [PATCH 15/18] 1 --- .../io.github.iptux_src.iptux.snapshot.yml | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml b/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml index 12b263ee..aac0ae28 100644 --- a/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml +++ b/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml @@ -1,9 +1,7 @@ -name: iptux -version: 0.10.0 app-id: io.github.iptux_src.iptux -runtime: org.gnome.Platform -runtime-version: '48' -sdk: org.gnome.Sdk +runtime: org.freedesktop.Platform +runtime-version: '25.08' +sdk: org.freedesktop.Sdk command: iptux finish-args: - --share=network @@ -27,12 +25,7 @@ modules: url: https://github.com/open-source-parsers/jsoncpp/archive/1.9.5.tar.gz sha256: f409856e5920c18d0c2fb85276e24ee607d2a09b5e7d5f0a371368903c275da2 - # - name: libayatana-appindicator - # buildsystem: cmake - # sources: - # - type: archive - # url: https://github.com/AyatanaIndicators/libayatana-appindicator/archive/refs/tags/0.5.93.tar.gz - # sha256: cbefed7a918a227bf71286246e237fcd3a9c8499b3eaac4897811a869409edf0 + - "shared-modules/libayatana-appindicator/libayatana-appindicator-gtk3.json" - name: iptux buildsystem: meson @@ -41,7 +34,4 @@ modules: url: https://github.com/iptux-src/iptux.git branch: flatpak-snapshot config-opts: - - --buildtype=release - - --pkg-config-path=/app/lib/pkgconfig:/app/lib64/pkgconfig - build-environment: - PKG_CONFIG_PATH: "/app/lib/pkgconfig:/app/lib64/pkgconfig" + - --buildtype=release \ No newline at end of file From f207b6236cd9f9b74f8355f903dbed8e093d2171 Mon Sep 17 00:00:00 2001 From: LI Daobing Date: Sun, 25 Jan 2026 17:00:20 -0800 Subject: [PATCH 16/18] Revert "1" This reverts commit f6b0c2d446de9083022fa32a892efc9bf33a85db. --- .github/workflows/flatpak-snapshot.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/flatpak-snapshot.yml b/.github/workflows/flatpak-snapshot.yml index b542e11d..a6099aee 100644 --- a/.github/workflows/flatpak-snapshot.yml +++ b/.github/workflows/flatpak-snapshot.yml @@ -16,26 +16,26 @@ jobs: - name: Checkout uses: actions/checkout@v4 - # 2. Install Flatpak and dependencies + # 2. Set up Flatpak - name: Install Flatpak run: | sudo apt update sudo apt install -y flatpak flatpak-builder git wget xz-utils - # 3. Cache GNOME SDK/runtime - name: Cache Flatpak SDK + if: always() uses: actions/cache@v3 with: path: ~/.local/share/flatpak key: flatpak-sdk-48-${{ runner.os }} - # 4. Install GNOME SDK 48 runtime + # 3. Install GNOME SDK runtime - name: Install GNOME SDK run: | sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - sudo flatpak install --noninteractive flathub org.gnome.Sdk//48 org.gnome.Platform//48 || true + sudo flatpak install --noninteractive flathub org.gnome.Sdk//48 org.gnome.Platform//48 - # 5. Determine snapshot version from Git + # 4. Determine snapshot version from Git - name: Set snapshot version id: vars run: | @@ -44,18 +44,17 @@ jobs: echo "VERSION=${VERSION}" >> $GITHUB_ENV echo "Snapshot version set to ${VERSION}" - # 6. Build Flatpak + # 5. Build Flatpak - name: Build Flatpak run: | flatpak-builder --force-clean build-dir scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml - # 7. Export repository to repo/ with summary + # 6. Export repository to repo/ - name: Export Flatpak repo run: | - flatpak build-export repo build-dir - flatpak build-summary repo + flatpak build-export repo build-dir --collection-id=io.github.iptux - # 8. Commit & push to gh-pages + # 7. Commit & push to gh-pages - name: Deploy to GitHub Pages uses: peaceiris/actions-gh-pages@v4 with: From 1e1576a054315ea01b4722b00d962f7bd579af2d Mon Sep 17 00:00:00 2001 From: LI Daobing Date: Sun, 25 Jan 2026 17:02:42 -0800 Subject: [PATCH 17/18] 1 --- scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml b/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml index aac0ae28..9b88ec50 100644 --- a/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml +++ b/scripts/flatpak/io.github.iptux_src.iptux.snapshot.yml @@ -25,7 +25,7 @@ modules: url: https://github.com/open-source-parsers/jsoncpp/archive/1.9.5.tar.gz sha256: f409856e5920c18d0c2fb85276e24ee607d2a09b5e7d5f0a371368903c275da2 - - "shared-modules/libayatana-appindicator/libayatana-appindicator-gtk3.json" + # - "shared-modules/libayatana-appindicator/libayatana-appindicator-gtk3.json" - name: iptux buildsystem: meson From 3f0c134162e28aad302ac5ddb619ace27e628b5e Mon Sep 17 00:00:00 2001 From: LI Daobing Date: Sun, 25 Jan 2026 17:03:45 -0800 Subject: [PATCH 18/18] 1 --- .github/workflows/flatpak-snapshot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flatpak-snapshot.yml b/.github/workflows/flatpak-snapshot.yml index a6099aee..37e0eacc 100644 --- a/.github/workflows/flatpak-snapshot.yml +++ b/.github/workflows/flatpak-snapshot.yml @@ -33,7 +33,7 @@ jobs: - name: Install GNOME SDK run: | sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - sudo flatpak install --noninteractive flathub org.gnome.Sdk//48 org.gnome.Platform//48 + sudo flatpak install --noninteractive flathub org.freedesktop.Sdk//25.08 org.freedesktop.Platform//25.08 # 4. Determine snapshot version from Git - name: Set snapshot version