Skip to content

Commit daa23b7

Browse files
committed
Fix Linux release packaging and document Flatpak (#64, #105)
- release.yml: bundle Qt via linuxdeploy --plugin qt for AppImage xcb - build-deb.sh: point Maintainer, Homepage, Bugs at ScanTailor-Advanced fork - flatpak: KDE runtime 5.15-23.08, drop redundant base/base-version - README: Flatpak/Flathub scope, local build steps, Releases pointer for #64
1 parent cc5b626 commit daa23b7

4 files changed

Lines changed: 22 additions & 7 deletions

File tree

.github/workflows/release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ jobs:
8181
run: |
8282
cd build-appimage
8383
export QMAKE=/usr/bin/qmake
84-
../linuxdeploy-x86_64.AppImage --appdir AppDir -e AppDir/usr/bin/scantailor --output appimage
84+
# Bundle Qt platform plugins (e.g. xcb) via linuxdeploy-plugin-qt; same-dir discovery.
85+
../linuxdeploy-x86_64.AppImage --appdir AppDir --plugin qt -e AppDir/usr/bin/scantailor --output appimage
8586
OUT=$(ls -1 *.AppImage 2>/dev/null | head -1)
8687
mv "$OUT" "../scantailor-advanced-${{ github.ref_name }}-x86_64.AppImage"
8788

README.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,22 @@ Go to [this repository](https://github.com/ScanTailor-Advanced/scantailor-libs-b
7676

7777
**Linux – Wayland (issue #97):** If you see rendering issues (blank or corrupted windows) when running under Wayland, try starting the application with `QT_QPA_PLATFORM=xcb` to use the X11 compatibility layer.
7878

79-
**Linux – Flatpak / Flathub (issue #105):** A Flatpak manifest is provided in `flatpak/org.scantailor.Advanced.json`. To build locally: `flatpak-builder --user --force-clean build flatpak/org.scantailor.Advanced.json` (requires `flatpak` and `flatpak-builder`). To publish on Flathub, use a distinct application ID (e.g. `org.scantailor.Advanced`) so it does not conflict with the original ScanTailor package.
79+
**Linux – Flatpak / Flathub (issue #105):**
80+
81+
- **This repository:** a Flatpak manifest lives at [`flatpak/org.scantailor.Advanced.json`](flatpak/org.scantailor.Advanced.json) (application ID `org.scantailor.Advanced`). Install the KDE 5.15 runtime and SDK branch **`5.15-23.08`** from Flathub, then build (and optionally install) with `flatpak-builder` (requires `flatpak` and `flatpak-builder`):
82+
83+
```bash
84+
flatpak install flathub org.kde.Platform//5.15-23.08 org.kde.Sdk//5.15-23.08
85+
flatpak-builder --user --install-deps-from=flathub --install --force-clean build-dir flatpak/org.scantailor.Advanced.json
86+
```
87+
88+
To build without installing, omit `--install`. If your `flatpak-builder` is too old for `--install`, use a local directory repository (see the [flatpak-builder documentation](https://docs.flatpak.org/en/latest/flatpak-builder.html)).
89+
90+
- **Flathub today:** the published Flatpak still tracks the **original** repository ([`com.github._4lex4.ScanTailor-Advanced`](https://flathub.org/apps/com.github._4lex4.ScanTailor-Advanced) on Flathub). Building from this manifest does **not** change that listing.
91+
92+
- **Future work:** listing **this** fork on Flathub needs a **separate** submission under the Flathub process (application ID, new or migrated package on `github.com/flathub`, maintainer agreement). Track that in [issue #105](https://github.com/ScanTailor-Advanced/scantailor-advanced/issues/105).
93+
94+
**Linux – GitHub Releases (.deb / AppImage, issue #64):** Version tags matching `v*` run [`.github/workflows/release.yml`](.github/workflows/release.yml), which produces a `.deb` ([`build-deb.sh`](build-deb.sh)) and an AppImage attached to the GitHub Release. Report problems with those binaries in [issue #64](https://github.com/ScanTailor-Advanced/scantailor-advanced/issues/64).
8095

8196
## About this fork
8297

build-deb.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,14 @@ Section: graphics
5656
Priority: optional
5757
Architecture: ${ARCH}
5858
Depends: ${DEPS}
59-
Maintainer: 4lex4 <4lex49@zoho.com>
59+
Maintainer: ScanTailor-Advanced <https://github.com/ScanTailor-Advanced/scantailor-advanced>
6060
Description: Interactive post-processing tool for scanned pages
6161
ScanTailor Advanced merges features from ScanTailor Featured and Enhanced,
6262
with improvements for page splitting, deskewing, content selection,
6363
margins, dewarping and output. Supports batch processing and multiple
6464
output formats.
65-
Homepage: https://github.com/4lex4/scantailor-advanced
65+
Homepage: https://github.com/ScanTailor-Advanced/scantailor-advanced
66+
Bugs: https://github.com/ScanTailor-Advanced/scantailor-advanced/issues
6667
EOF
6768

6869
# Optional: refresh icon and desktop caches after install

flatpak/org.scantailor.Advanced.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
{
22
"id": "org.scantailor.Advanced",
33
"runtime": "org.kde.Platform",
4-
"runtime-version": "5.15-22.08",
4+
"runtime-version": "5.15-23.08",
55
"sdk": "org.kde.Sdk",
6-
"base": "org.kde.Sdk",
7-
"base-version": "5.15-22.08",
86
"command": "scantailor",
97
"finish-args": [
108
"--share=ipc",

0 commit comments

Comments
 (0)