Daniel Brötzmann pushed to branch master at gajim / gajim
Commits: 2a22d65d by wurstsalat at 2022-09-26T10:26:21+02:00 ci: Windows: Update shipped OMEMO version
- - - - - b418a1a8 by wurstsalat at 2022-09-26T10:26:31+02:00 ci: Windows: Remove unnecessary files from installer
This saves ~175 MB of disk space and reduces installer size by 42 MB
Fixes #11166
- - - - - eb1e5903 by wurstsalat at 2022-09-26T10:26:31+02:00 cfix: Preferences: Use orange color for video acceleration hint
- - - - -
3 changed files:
- gajim/gtk/video_preview.py - win/README.md - win/_base.sh
Changes:
===================================== gajim/gtk/video_preview.py ===================================== @@ -124,7 +124,7 @@ def _set_sink_text(self, sink_name: str) -> None: 'OpenGL</span> accelerated')
elif sink_name == 'gtksink': - text = _('<span color="yellow" font-weight="bold">' + text = _('<span color="orange" font-weight="bold">' 'Not accelerated</span>')
self._ui.video_source_label.set_markup(text)
===================================== win/README.md ===================================== @@ -1,13 +1,12 @@ # Windows Installer
-We use [msys2](https://www.msys2.org/) for creating the Windows installer -and development on Windows. +We use [msys2](https://www.msys2.org/) for creating the Windows installer and development on Windows.
Please note that Windows 7 support has been dropped.
## Development
-Download [msys2](https://www.msys2.org/) (msys2-x86_64-xxx.exe) and follow the install instructions on the [msys2](https://www.msys2.org/) startpage (**Important!**) +Download [msys2](https://www.msys2.org/) (`msys2-x86_64-xxx.exe`) and follow the install instructions on the [msys2](https://www.msys2.org/) startpage (**Important!**)
* Fork the master branch on dev.gajim.org * Execute `C:\msys64\msys2_shell.cmd -mingw64` @@ -21,6 +20,7 @@ ## Development ### GtkInspector
For Gtk Inspector to work, add the following registry key + ``` HKEY_CURRENT_USER\Software\GSettings\org\gtk\settings\debug DWORD enable-inspector-keybinding = 1 @@ -32,5 +32,4 @@ ## Build Gajim / Create an Installer
Follow the steps in the Development section, but instead of `./dev_env.sh` execute `./build.sh i686` or `./build.sh x86_64`.
-Both the installer and the portable installer should appear in ``C:\msys64\home\USER\gajim\win_build_root``. - +Both the installer and the portable installer should appear in `C:\msys64\home\USER\gajim\win_build_root`.
===================================== win/_base.sh ===================================== @@ -149,7 +149,7 @@ function install_gajim { "${QL_VERSION}" "${MINGW_ROOT}"/bin
# Install omemo plugin - curl -o "${BUILD_ROOT}"/omemo.zip https://ftp.gajim.org/plugins/master/omemo/omemo_2.8.15.zip + curl -o "${BUILD_ROOT}"/omemo.zip https://ftp.gajim.org/plugins/master/omemo/omemo_2.8.16.zip 7z x -o"${PACKAGE_DIR}"/gajim/data/plugins/omemo "${BUILD_ROOT}"/omemo.zip
# Install language dicts @@ -224,6 +224,7 @@ function cleanup_install { rm -Rf "${MINGW_ROOT}"/share/fontconfig rm -Rf "${MINGW_ROOT}"/share/gettext-* rm -Rf "${MINGW_ROOT}"/share/terminfo + rm -Rf "${MINGW_ROOT}"/share/bullet rm -Rf "${MINGW_ROOT}"/share/OGRE rm -Rf "${MINGW_ROOT}"/share/opencv4
@@ -231,6 +232,7 @@ function cleanup_install { -name "*.compiled" -exec rm -f {} ;
rm -Rf "${MINGW_ROOT}"/lib/"${PYTHON_ID}".*/test + rm -Rf "${MINGW_ROOT}"/lib/"${PYTHON_ID}"/dist-packages/Ogre rm -Rf "${MINGW_ROOT}"/lib/cmake rm -Rf "${MINGW_ROOT}"/lib/gettext rm -Rf "${MINGW_ROOT}"/lib/gtk-3.0 @@ -257,12 +259,11 @@ function cleanup_install { rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstschro.dll rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstcacasink.dll
+ rm -f "${MINGW_ROOT}"/bin/libBulletCollision.dll + rm -f "${MINGW_ROOT}"/bin/libBulletDynamics.dll rm -f "${MINGW_ROOT}"/bin/libharfbuzz-icu-0.dll - rm -f "${MINGW_ROOT}"/bin/libopencv_wechat_qrcode455.dll - rm -f "${MINGW_ROOT}"/bin/OgreMain.dll - rm -f "${MINGW_ROOT}"/bin/OgreOverlay.dll - rm -f "${MINGW_ROOT}"/bin/OgreRTShaderSystem.dll - rm -f "${MINGW_ROOT}"/bin/OgreBites.dll + rm -f "${MINGW_ROOT}"/bin/libopencv_* + rm -f "${MINGW_ROOT}"/bin/Ogre* rm -f "${MINGW_ROOT}"/bin/xvidcore.dll
rm -f "${MINGW_ROOT}"/lib/"${PYTHON_ID}".*/lib-dynload/_tkinter* @@ -320,5 +321,5 @@ function cleanup_install {
function build_installer { (cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" -DARCH="${MINGW}" "${MISC}"/gajim.nsi) - (cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" -DARCH="${MINGW}" "${MISC}"/gajim-portable.nsi) + #(cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" -DARCH="${MINGW}" "${MISC}"/gajim-portable.nsi) }
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/83d90cf2434a5b8d2ab5a6b1152d0d7c...