diff --git a/README.md b/README.md index 7b91599..708330a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Pugaizai's Flatpaks -## Use My Repo (X86_64 Only) +## Use My Repo ### Add Repo diff --git a/manifests/cn.wps.office/apply_extra b/manifests/cn.wps.office/apply_extra.sh similarity index 84% rename from manifests/cn.wps.office/apply_extra rename to manifests/cn.wps.office/apply_extra.sh index 03bd691..abf157a 100755 --- a/manifests/cn.wps.office/apply_extra +++ b/manifests/cn.wps.office/apply_extra.sh @@ -11,7 +11,7 @@ mv deb-package/opt/kingsoft/wps-office . mv deb-package/usr/bin/{wps,wpp,et,wpspdf} wps-office/ mv deb-package/usr/share/{icons,applications,mime} export/share/ -YEAR_SUFFIX=2019 +YEAR_SUFFIX=2023 rename --no-overwrite "wps-office-" "${FLATPAK_ID}." export/share/{icons/hicolor/*/*,applications,mime/packages}/wps-office-*.* rename --no-overwrite "wps-office${YEAR_SUFFIX}-" "${FLATPAK_ID}." export/share/icons/hicolor/*/*/wps-office${YEAR_SUFFIX}-*.* @@ -41,7 +41,7 @@ for a in wps wpp et pdf prometheus; do done sed -i "s/generic-icon name=\"wps-office-/icon name=\"${FLATPAK_ID}./g" "export/share/mime/packages/${FLATPAK_ID}".*.xml -# Just use libstdc++.so.6 from the runtime; allows working with runtime 22.08+ +# Just use libstdc++.so.6 from the runtime; allows working with runtime 23.08+ rm wps-office/office6/libstdc++.so.6 rm -r wps-office.deb deb-package @@ -49,7 +49,3 @@ rm -r wps-office.deb deb-package # Remove plugin path so we can override the default path with based on QT_PLUGIN_PATH sed -i 's|^Plugins=.*||g' wps-office/office6/qt.conf -# Fix wps deprecated python2 command -# https://aur.archlinux.org/cgit/aur.git/tree/fix-wps-python-parse.patch?h=wps-office-cn -sed -i 's/python -c '\''import sys, urllib; print urllib.unquote(sys.argv\[1\])'\''/python -c '\''import sys, urllib.parse; print(urllib.parse.unquote(sys.argv[1]))'\''/' wps-office/wps - diff --git a/manifests/cn.wps.office/cn.wps.office.desktop b/manifests/cn.wps.office/cn.wps.office.desktop index f37a8da..6b80622 100644 --- a/manifests/cn.wps.office/cn.wps.office.desktop +++ b/manifests/cn.wps.office/cn.wps.office.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Comment=Use WPS Writer to office work. -Comment[zh_CN]=使用 WPS 2019进行办公 +Comment[zh_CN]=使用 WPS 2023进行办公 Exec=wps %f GenericName=WPS GenericName[zh_CN]=WPS 2019 diff --git a/manifests/cn.wps.office/cn.wps.office.svg b/manifests/cn.wps.office/cn.wps.office.svg new file mode 100644 index 0000000..52c5543 --- /dev/null +++ b/manifests/cn.wps.office/cn.wps.office.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/manifests/cn.wps.office/cn.wps.office.yaml b/manifests/cn.wps.office/cn.wps.office.yaml index 239b83a..f88e772 100644 --- a/manifests/cn.wps.office/cn.wps.office.yaml +++ b/manifests/cn.wps.office/cn.wps.office.yaml @@ -35,60 +35,33 @@ modules: - shared-modules/glu/glu-9.json - # Needed by wpspdf - - name: libtiff5 - buildsystem: cmake - sources: - - type: archive - url: https://download.osgeo.org/libtiff/tiff-4.4.0.tar.gz - sha256: 917223b37538959aca3b790d2d73aa6e626b688e02dcda272aec24c2f498abed - - # https://github.com/flathub/cn.wps.office/issues/150 - - name: freetype - buildsystem: meson - sources: - - type: archive - url: https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.13.0.tar.xz - sha256: 5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c - - name: wps buildsystem: simple build-commands: - - install -Dm755 apply_extra /app/bin + - install -Dm755 apply_extra.sh /app/bin/apply_extra - install -Dm755 wps.sh /app/bin/wps - ln -s wps /app/bin/et - ln -s wps /app/bin/wpp - ln -s wps /app/bin/wpspdf - install -Dm755 /usr/bin/desktop-file-edit -t /app/bin/ - install -Dm644 ${FLATPAK_ID}.metainfo.xml -t /app/share/metainfo/ - - install -Dm644 cn.wps.office.desktop -t /app/share/applications - - for icon_size in 64 128 256 512; do install -Dm644 wps_office_${icon_size}.png - /app/share/icons/hicolor/${icon_size}x${icon_size}/apps/cn.wps.office.png; - done + - install -Dm644 cn.wps.office.desktop -t /app/share/applications/ + - install -Dm644 cn.wps.office.svg -t /app/share/icons/hicolor/scalable/apps/ sources: - type: file - path: apply_extra + path: apply_extra.sh - type: file path: cn.wps.office.metainfo.xml - type: file - path: wps.sh - - - type: file - path: icons/wps_office_64.png - - - type: file - path: icons/wps_office_128.png - - - type: file - path: icons/wps_office_256.png + path: cn.wps.office.desktop - type: file - path: icons/wps_office_512.png + path: cn.wps.office.svg - type: file - path: cn.wps.office.desktop + path: wps.sh - type: extra-data filename: wps-office.deb diff --git a/manifests/cn.wps.office/icons/wps_office_128.png b/manifests/cn.wps.office/icons/wps_office_128.png deleted file mode 100644 index 67ca500..0000000 Binary files a/manifests/cn.wps.office/icons/wps_office_128.png and /dev/null differ diff --git a/manifests/cn.wps.office/icons/wps_office_256.png b/manifests/cn.wps.office/icons/wps_office_256.png deleted file mode 100644 index bf0a35e..0000000 Binary files a/manifests/cn.wps.office/icons/wps_office_256.png and /dev/null differ diff --git a/manifests/cn.wps.office/icons/wps_office_512.png b/manifests/cn.wps.office/icons/wps_office_512.png deleted file mode 100644 index 7b0c683..0000000 Binary files a/manifests/cn.wps.office/icons/wps_office_512.png and /dev/null differ diff --git a/manifests/cn.wps.office/icons/wps_office_64.png b/manifests/cn.wps.office/icons/wps_office_64.png deleted file mode 100644 index 9bd9e80..0000000 Binary files a/manifests/cn.wps.office/icons/wps_office_64.png and /dev/null differ