From 286c3682ecc3786b834cf8e0bba50b4a9cec2582 Mon Sep 17 00:00:00 2001 From: Xiao YiFang Date: Fri, 17 Jun 2022 20:45:53 +0800 Subject: [PATCH 1/4] linux appimage build with qt6.x --- .github/workflows/ubuntu-6.2.yml | 43 +++++++++++++++++--------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ubuntu-6.2.yml b/.github/workflows/ubuntu-6.2.yml index 22061823..a58f0e46 100644 --- a/.github/workflows/ubuntu-6.2.yml +++ b/.github/workflows/ubuntu-6.2.yml @@ -8,17 +8,17 @@ on: # workflows: [AutoTag] # types: [completed] workflow_dispatch: - # push: - # branches: - # - dev - # - master - # # - staged - # paths-ignore: - # - 'docs/**' - # - ".github/**" - # - "howto/**" - # - "*.md" - # - ".clang-format" + push: + branches: + - dev + - master + # - staged + paths-ignore: + - 'docs/**' + - ".github/**" + - "howto/**" + - "*.md" + - ".clang-format" jobs: build: @@ -34,13 +34,19 @@ jobs: version-suffix: alpha prerelease: true steps: + - uses: actions/setup-python@v3 + with: + python-version: '3.9' - name: Install Qt uses: xiaoyifang/install-qt-action@v3 with: version: ${{ matrix.qt_ver }} arch: ${{ matrix.qt_arch }} cached: 'false' - modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats + #serialport linuxdeploy need serialport to work. + modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtserialport + setup-python: 'false' + py7zrversion: '==0.18.1' - name: ubuntu install thirdparty dependencies run: | sudo apt-get install git pkg-config build-essential @@ -66,16 +72,13 @@ jobs: make INSTALL_ROOT=appdir -j`nproc` install; find appdir/ ls -al appdir - #copy missing shared dll to appdir. - # mkdir -p appdir/usr/lib - # cp $(ldd appdir/usr/bin/goldendict | grep -o '\W/[^ ]*' |grep gobject ) appdir/usr/lib - # cp $(ldd appdir/usr/bin/goldendict | grep -o '\W/[^ ]*' |grep libpango ) appdir/usr/lib - name: Build AppImage run: | - wget -c https://github.com/$(wget -q https://github.com/probonopd/go-appimage/releases -O - | grep "appimagetool-.*-x86_64.AppImage" | head -n 1 | cut -d '"' -f 2) - chmod +x appimagetool-*.AppImage - ./appimagetool-*.AppImage -s deploy appdir/usr/share/applications/*.desktop # Bundle EVERYTHING - # ./linuxdeploy-x86_64.AppImage --appdir appdir --output appimage --plugin qt -i redist/icons/goldendict.png -d redist/org.goldendict.GoldenDict.desktop + wget -c -nv "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage" + chmod a+x linuxdeploy-plugin-qt-x86_64.AppImage + wget -c -nv "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage" + chmod a+x linuxdeploy-x86_64.AppImage + ./linuxdeploy-x86_64.AppImage --appdir appdir --output appimage --plugin qt -i redist/icons/goldendict.png -d redist/org.goldendict.GoldenDict.desktop - name: Generate changelog if: ${{!env.prerelease}} From a24a0a713fa5db8e2e91ee49eb733ee30febb24e Mon Sep 17 00:00:00 2001 From: xiaoyifang Date: Fri, 28 Oct 2022 14:34:09 +0800 Subject: [PATCH 2/4] change msvc lib readme --- winlibs/lib/msvc/README.md | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/winlibs/lib/msvc/README.md b/winlibs/lib/msvc/README.md index 89affecc..6b3e359c 100644 --- a/winlibs/lib/msvc/README.md +++ b/winlibs/lib/msvc/README.md @@ -1,16 +1,5 @@ -## Prebuilt Libs for GoldenDict's MSVC++ 2012 build +## Prebuilt Libs for GoldenDict's -### Prerequisites +almost all of these are found in the vcpkg -* Visual Studio 2012 (Express Edition should be OK too). - -### Libraries - -The libraries are built with the **/MD** switch and that's what GoldenDict build expects. -Some libs are dynamic and some are static, whichever makes more sense. -Both **x86** and **x64** versions are provided. - -### Build - -Use the following repository to build these libs yourself: -[Tvangeste/goldendict-winlibs](https://github.com/Tvangeste/goldendict-winlibs). +use vcpkg install [lib] and copy the packages into this directory. \ No newline at end of file From afdaf19ef960612798e469c544513c745a3217eb Mon Sep 17 00:00:00 2001 From: Xiao YiFang Date: Fri, 28 Oct 2022 19:46:26 +0800 Subject: [PATCH 3/4] [action] disable macos6.4.0 homebrew action --- .github/workflows/macos-homebrew.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/macos-homebrew.yml b/.github/workflows/macos-homebrew.yml index 773c8eea..5e8ab5fc 100644 --- a/.github/workflows/macos-homebrew.yml +++ b/.github/workflows/macos-homebrew.yml @@ -4,17 +4,17 @@ concurrency: cancel-in-progress: true on: workflow_dispatch: - push: - branches: - - dev - - master - # - staged - paths-ignore: - - 'docs/**' - - ".github/**" - - "howto/**" - - "*.md" - - ".clang-format" + # push: + # branches: + # - dev + # - master + # # - staged + # paths-ignore: + # - 'docs/**' + # - ".github/**" + # - "howto/**" + # - "*.md" + # - ".clang-format" jobs: build: name: Build From 988951aa6ce7797ad18891899bedcc305ebdf166 Mon Sep 17 00:00:00 2001 From: Xiao YiFang Date: Sat, 29 Oct 2022 13:23:17 +0800 Subject: [PATCH 4/4] [reg]: unicode-bidi cause the welcome title aligned left --- article-style.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/article-style.css b/article-style.css index 5d42e4c5..99e88dff 100644 --- a/article-style.css +++ b/article-style.css @@ -11,7 +11,6 @@ body h1,h2,h3,h4,h5,h6 { unicode-bidi: plaintext; - text-align: start; } /* This stylesheet is used to highligh current selection when doing a search. It changes the default selection color (e.g. blue under Windows, orange under Ubuntu) */ @@ -137,7 +136,6 @@ pre div.sdct_h { unicode-bidi: plaintext; - text-align: start; } .sdict_h_wav img