From 7a5dfb6552080c724669c0e8bb8fefdd8e954bb0 Mon Sep 17 00:00:00 2001 From: Aaron Tan Date: Mon, 7 Feb 2022 07:46:29 -0500 Subject: [PATCH] Remove support for Flatpak - I can't get it to run in the KDE runtime (likely something to do with the SQLite JSON1 extension support), and the entire Flatpak experiment with this program has been far too much of a headache than it's worth. - Also added a 64x64 icon so that the .deb builds properly. --- src/jyut-dict/platform/linux/README.md | 3 -- .../com.aaronhktan.cantonesedictionary.json | 50 ------------------ .../platform/linux/flatpak/create-flatpak.sh | 24 --------- .../platform/linux/flatpak/flatpak.desktop | 20 ------- .../icon/icon.iconset/icon_64x64.png | Bin 0 -> 5306 bytes 5 files changed, 97 deletions(-) delete mode 100644 src/jyut-dict/platform/linux/flatpak/com.aaronhktan.cantonesedictionary.json delete mode 100755 src/jyut-dict/platform/linux/flatpak/create-flatpak.sh delete mode 100644 src/jyut-dict/platform/linux/flatpak/flatpak.desktop create mode 100644 src/jyut-dict/resources/icon/icon.iconset/icon_64x64.png diff --git a/src/jyut-dict/platform/linux/README.md b/src/jyut-dict/platform/linux/README.md index e271feaa..413cb880 100644 --- a/src/jyut-dict/platform/linux/README.md +++ b/src/jyut-dict/platform/linux/README.md @@ -10,9 +10,6 @@ To build for Linux: - Run `linuxdeployqt /usr/share/applications/jyut-dict.desktop -appimage`. - You should have an AppImage that works now. -- Build the **flatpak** using Ubuntu 18.04. - - Run `create-flatpak.sh` in the flatpak subdirectory. - - Build the **.deb** using Ubuntu 18.04. - Add repository to install Qt 5.15: `sudo add-apt-repository ppa:beineri/opt-qt-5.15.2-bionic; sudo apt-get update` - Install dependencies: `sudo apt install qt515base qt515speech qt515svg` diff --git a/src/jyut-dict/platform/linux/flatpak/com.aaronhktan.cantonesedictionary.json b/src/jyut-dict/platform/linux/flatpak/com.aaronhktan.cantonesedictionary.json deleted file mode 100644 index 75efe0bd..00000000 --- a/src/jyut-dict/platform/linux/flatpak/com.aaronhktan.cantonesedictionary.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "app-id": "com.aaronhktan.cantonesedictionary", - "runtime": "org.kde.Platform", - "runtime-version": "5.12", - "sdk": "org.kde.Sdk", - "rename-icon": "jyut-dict", - "finish-args": [ - "--share=network", - "--socket=x11", - "--socket=wayland", - "--filesystem=host:ro" - ], - "command": "/app/bin/jyut-dict", - "modules": [ - { - "name": "jyut-dict", - "post-install": [ - "install -dm755 \"/app/bin\"", - "install -m755 \"Jyut Dictionary\" \"/app/bin/jyut-dict\"", - - "install -d \"/app/share/jyut-dict/dictionaries\"", - "install -m755 \"dict.db\" \"/app/share/jyut-dict/dictionaries/dict.db\"", - "install -m755 \"user.db\" \"/app/share/jyut-dict/dictionaries/user.db\"", - - "install -d \"/app/share/applications\"", - "install -m644 \"flatpak.desktop\" \"/app/share/applications/com.aaronhktan.cantonesedictionary.desktop\"", - - "for icon_size in 16 32 64 128 256 512; do - install -d \"/app/share/icons/hicolor/${icon_size}x${icon_size}/apps\" - install -m644 \"icon_${icon_size}x${icon_size}.png\" \"/app/share/icons/hicolor/${icon_size}x${icon_size}/apps/jyut-dict.png\" - done", - - "install -d \"/app/share/icons/hicolor/scalable/apps\"", - "install -m644 \"icon.svg\" \"/app/share/icons/hicolor/scalable/apps/jyut-dict.svg\"" - ], - "buildsystem": "simple", - "build-commands": [ - "qmake jyut-dict.pro DEFINES+=\"FLATPAK\" CONFIG+=\"FLATPAK\"", - "make -j4", - "make install" - ], - "sources": [ - { - "type": "dir", - "path": "../jyut-dict/" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/jyut-dict/platform/linux/flatpak/create-flatpak.sh b/src/jyut-dict/platform/linux/flatpak/create-flatpak.sh deleted file mode 100755 index 267fe208..00000000 --- a/src/jyut-dict/platform/linux/flatpak/create-flatpak.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# Requires root to clean the build-dir -# Snippet from https://serverfault.com/questions/37829/bash-scripting-require-script-to-be-run-as-root-or-with-sudo -if [[ $(/usr/bin/id -u) -ne 0 ]]; then - echo "Not running as root" - exit -fi - -# Create directory to build in -rm -rf ../../../../jyut-dict-flatpak -mkdir ../../../../jyut-dict-flatpak - -# Copy manifest into that directory -cp com.aaronhktan.cantonesedictionary.json ../../../../jyut-dict-flatpak - -# Switch into that directory -cd ../../../../jyut-dict-flatpak - -# Build according to manifest, putting output repository into repo/ -flatpak-builder --repo=repo build-dir com.aaronhktan.cantonesedictionary.json --force-clean --user - -# Build a bundle from the repo/ directory -flatpak build-bundle ./repo jyut-dict.flatpak com.aaronhktan.cantonesedictionary \ No newline at end of file diff --git a/src/jyut-dict/platform/linux/flatpak/flatpak.desktop b/src/jyut-dict/platform/linux/flatpak/flatpak.desktop deleted file mode 100644 index a2617cc1..00000000 --- a/src/jyut-dict/platform/linux/flatpak/flatpak.desktop +++ /dev/null @@ -1,20 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Jyut Dictionary -Name[fr]=Dictionnaire Jyut -Name[zh_CN]=粤语字典 -Name[zh_TW]=粵語字典 -Name[zh_HK]=粵語字典 -GenericName=Cantonese Dictionary -Comment=Look up definitions for words in Cantonese or Mandarin -Comment[fr]=Cherchez des mots en cantonais ou en mandarin -Comment[zh_CN]=搜索粤语字的定义 -Comment[zh_TW]=搜索粵語字的定義 -Comment[zh_HK]=揾粤语字嘅定義 -Exec=jyut-dict -StartupWMClass=CantoneseDictionary -Terminal=false -Icon=com.aaronhktan.cantonesedictionary -Keywords=Jyut;Dictionary;Cantonese;Mandarin;Chinese;Words; -Categories=Dictionary;Office;TextTools;Education;Utility -StartupNotify=true diff --git a/src/jyut-dict/resources/icon/icon.iconset/icon_64x64.png b/src/jyut-dict/resources/icon/icon.iconset/icon_64x64.png new file mode 100644 index 0000000000000000000000000000000000000000..2fd2c4b40ac01d1eada6fefb877caa42ea0e1634 GIT binary patch literal 5306 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 M07*qoM6N<$f&nNOng9R* literal 0 HcmV?d00001