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 00000000..2fd2c4b4 Binary files /dev/null and b/src/jyut-dict/resources/icon/icon.iconset/icon_64x64.png differ