Merge branch 'master' of https://github.com/goldendict/goldendict int…

…o add-avoid-auto-scrolling-out-of-top-dictionary-option
goldendict · Jul 9, 2022 · b365bbe · b365bbe
2 parents 036df2b + b73687b
commit b365bbe
Show file tree

Hide file tree

Showing 72 changed files with 8,258 additions and 7,174 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "winlibs/lib/msvc"]
-	path = winlibs/lib/msvc
-	url = git://github.com/Tvangeste/goldendict-winlibs-prebuilt.git

diff --git a/.travis.yml b/.travis.yml
@@ -29,6 +29,11 @@ script:
   - wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
   - chmod a+x linuxdeployqt-continuous-x86_64.AppImage
   - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
+  - # Add ssl libraries to .Appimage
+  - mkdir -p appdir/usr/lib/
+  - cp /lib/x86_64-linux-gnu/libssl.so.1.0.0 appdir/usr/lib/
+  - cp /lib/x86_64-linux-gnu/libcrypto.so.1.0.0 appdir/usr/lib/
+  - #
   - export VERSION=$(git rev-parse --short HEAD) # linuxdeployqt uses this for naming the file
   - ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -appimage