hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-27 19:24:08 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

action:modify action to support iconv

Browse source
This commit is contained in:
Xiao YiFang 2023-02-01 23:23:23 +08:00
parent 859def7ae0
commit c5112a3120
7 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/macos-homebrew-PR-check.yml vendored
View file

@ -73,9 +73,10 @@ jobs:
#brew install qt # or use official offline installer #brew install qt # or use official offline installer
brew install xz lzo brew install xz lzo
brew install pkg-config brew install pkg-config
brew install libiconv
- name: compile - name: compile
run: | run: |
qmake CONFIG+=release CONFIG+=no_macos_universal CONFIG+=zim_support CONFIG+=no_extra_tiff_handler #CONFIG+=no_epwing_support # CONFIG+=no_ffmpeg_player #CONFIG+=no_qtmultimedia_player qmake CONFIG+=release CONFIG+=no_macos_universal CONFIG+=zim_support CONFIG+=no_extra_tiff_handler CONFIG+=use_iconv #CONFIG+=no_epwing_support # CONFIG+=no_ffmpeg_player #CONFIG+=no_qtmultimedia_player
make make

4
.github/workflows/ubuntu-PR-check.yml vendored
View file

@ -57,7 +57,7 @@ jobs:
sudo apt-get install libao-dev libavutil-dev libavformat-dev libtiff5-dev libeb16-dev sudo apt-get install libao-dev libavutil-dev libavformat-dev libtiff5-dev libeb16-dev
sudo apt-get install libqt5webkit5-dev libqt5svg5-dev libqt5x11extras5-dev qttools5-dev sudo apt-get install libqt5webkit5-dev libqt5svg5-dev libqt5x11extras5-dev qttools5-dev
sudo apt-get install qttools5-dev-tools qtmultimedia5-dev libqt5multimedia5-plugins doxygen libzstd-dev #libopencc-dev sudo apt-get install qttools5-dev-tools qtmultimedia5-dev libqt5multimedia5-plugins doxygen libzstd-dev #libopencc-dev
sudo apt-get install libxkbcommon-dev sudo apt-get install libxkbcommon-dev libc6-dev
sudo ln -sf /usr/bin/x86_64-linux-gnu-ld.gold /usr/bin/ld sudo ln -sf /usr/bin/x86_64-linux-gnu-ld.gold /usr/bin/ld
git clone https://github.com/BYVoid/OpenCC git clone https://github.com/BYVoid/OpenCC
pwd pwd
@ -71,7 +71,7 @@ jobs:
- name: build goldendict - name: build goldendict
run: | run: |
qmake CONFIG+=release CONFIG+=no_extra_tiff_handler PREFIX=/usr CONFIG+=zim_support CONFIG+=chinese_conversion_support qmake CONFIG+=release CONFIG+=no_extra_tiff_handler PREFIX=/usr CONFIG+=zim_support CONFIG+=chinese_conversion_support CONFIG+=use_iconv
make INSTALL_ROOT=appdir -j`nproc` install; find appdir/ make INSTALL_ROOT=appdir -j`nproc` install; find appdir/
#copy missing shared dll to appdir. #copy missing shared dll to appdir.

2
.github/workflows/windows-6.x-xapian.yml vendored
View file

@ -90,7 +90,7 @@ jobs:
id: build id: build
shell: cmd shell: cmd
run: | run: |
qmake "CONFIG+=zim_support" CONFIG+=release CONFIG+=use_xapian qmake "CONFIG+=zim_support" CONFIG+=release CONFIG+=use_xapian CONFIG+=use_iconv
nmake nmake
echo winSdkDir=%WindowsSdkDir% >> %GITHUB_ENV% echo winSdkDir=%WindowsSdkDir% >> %GITHUB_ENV%

2
.github/workflows/windows-6.x.yml vendored
View file

@ -91,7 +91,7 @@ jobs:
id: build id: build
shell: cmd shell: cmd
run: | run: |
qmake "CONFIG+=zim_support" CONFIG+=release qmake "CONFIG+=zim_support" CONFIG+=release CONFIG+=use_iconv
nmake nmake
echo winSdkDir=%WindowsSdkDir% >> %GITHUB_ENV% echo winSdkDir=%WindowsSdkDir% >> %GITHUB_ENV%

2
.github/workflows/windows-PR-check.yml vendored
View file

@ -60,5 +60,5 @@ jobs:
id: build id: build
shell: cmd shell: cmd
run: | run: |
qmake "CONFIG+=zim_support" CONFIG+=release qmake "CONFIG+=zim_support" CONFIG+=release CONFIG+=use_iconv
nmake nmake

2
.github/workflows/windows.yml vendored
View file

@ -92,7 +92,7 @@ jobs:
shell: cmd shell: cmd
run: | run: |
# call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.msvc_arch }} # call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.msvc_arch }}
qmake "CONFIG+=zim_support" CONFIG+=release qmake "CONFIG+=zim_support" CONFIG+=release CONFIG+=use_iconv
nmake nmake
echo winSdkDir=%WindowsSdkDir% >> %GITHUB_ENV% echo winSdkDir=%WindowsSdkDir% >> %GITHUB_ENV%

9
README.md
View file

@ -156,6 +156,15 @@ use `CONFIG+=use_xapian` to enable this feature. when enabled ,xapian will be us
qmake "CONFIG+=use_xapian" qmake "CONFIG+=use_xapian"
``` ```
use `CONFIG+=use_iconv` to enable this feature. when enabled ,iconv will be used to convert encoding other than the QTextCodec(which will be deprecated in future Qt version)
```
qmake "CONFIG+=use_iconv"
```
when enabled ,iconv should be installed on the platform at the same time.
## Contributing ## Contributing
All kinds of help like answering questions, bug reporting, testing translation and coding are welcomed. All kinds of help like answering questions, bug reporting, testing translation and coding are welcomed.