Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
-
2a22d65d
by wurstsalat at 2022-09-26T10:26:21+02:00
-
b418a1a8
by wurstsalat at 2022-09-26T10:26:31+02:00
-
eb1e5903
by wurstsalat at 2022-09-26T10:26:31+02:00
3 changed files:
Changes:
| ... | ... | @@ -124,7 +124,7 @@ def _set_sink_text(self, sink_name: str) -> None: |
| 124 | 124 | 'OpenGL</span> accelerated')
|
| 125 | 125 | |
| 126 | 126 | elif sink_name == 'gtksink':
|
| 127 | - text = _('<span color="yellow" font-weight="bold">'
|
|
| 127 | + text = _('<span color="orange" font-weight="bold">'
|
|
| 128 | 128 | 'Not accelerated</span>')
|
| 129 | 129 | |
| 130 | 130 | self._ui.video_source_label.set_markup(text)
|
| 1 | 1 | # Windows Installer
|
| 2 | 2 | |
| 3 | -We use [msys2](https://www.msys2.org/) for creating the Windows installer
|
|
| 4 | -and development on Windows.
|
|
| 3 | +We use [msys2](https://www.msys2.org/) for creating the Windows installer and development on Windows.
|
|
| 5 | 4 | |
| 6 | 5 | Please note that Windows 7 support has been dropped.
|
| 7 | 6 | |
| 8 | 7 | ## Development
|
| 9 | 8 | |
| 10 | -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!**)
|
|
| 9 | +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!**)
|
|
| 11 | 10 | |
| 12 | 11 | * Fork the master branch on dev.gajim.org
|
| 13 | 12 | * Execute `C:\msys64\msys2_shell.cmd -mingw64`
|
| ... | ... | @@ -21,6 +20,7 @@ ## Development |
| 21 | 20 | ### GtkInspector
|
| 22 | 21 | |
| 23 | 22 | For Gtk Inspector to work, add the following registry key
|
| 23 | + |
|
| 24 | 24 | ```
|
| 25 | 25 | HKEY_CURRENT_USER\Software\GSettings\org\gtk\settings\debug
|
| 26 | 26 | DWORD enable-inspector-keybinding = 1
|
| ... | ... | @@ -32,5 +32,4 @@ ## Build Gajim / Create an Installer |
| 32 | 32 | |
| 33 | 33 | Follow the steps in the Development section, but instead of `./dev_env.sh` execute `./build.sh i686` or `./build.sh x86_64`.
|
| 34 | 34 | |
| 35 | -Both the installer and the portable installer should appear in ``C:\msys64\home\USER\gajim\win\_build_root``.
|
|
| 36 | - |
|
| 35 | +Both the installer and the portable installer should appear in `C:\msys64\home\USER\gajim\win\_build_root`. |
| ... | ... | @@ -149,7 +149,7 @@ function install_gajim { |
| 149 | 149 | "${QL_VERSION}" "${MINGW_ROOT}"/bin
|
| 150 | 150 | |
| 151 | 151 | # Install omemo plugin
|
| 152 | - curl -o "${BUILD_ROOT}"/omemo.zip https://ftp.gajim.org/plugins/master/omemo/omemo_2.8.15.zip
|
|
| 152 | + curl -o "${BUILD_ROOT}"/omemo.zip https://ftp.gajim.org/plugins/master/omemo/omemo_2.8.16.zip
|
|
| 153 | 153 | 7z x -o"${PACKAGE_DIR}"/gajim/data/plugins/omemo "${BUILD_ROOT}"/omemo.zip
|
| 154 | 154 | |
| 155 | 155 | # Install language dicts
|
| ... | ... | @@ -224,6 +224,7 @@ function cleanup_install { |
| 224 | 224 | rm -Rf "${MINGW_ROOT}"/share/fontconfig
|
| 225 | 225 | rm -Rf "${MINGW_ROOT}"/share/gettext-*
|
| 226 | 226 | rm -Rf "${MINGW_ROOT}"/share/terminfo
|
| 227 | + rm -Rf "${MINGW_ROOT}"/share/bullet
|
|
| 227 | 228 | rm -Rf "${MINGW_ROOT}"/share/OGRE
|
| 228 | 229 | rm -Rf "${MINGW_ROOT}"/share/opencv4
|
| 229 | 230 | |
| ... | ... | @@ -231,6 +232,7 @@ function cleanup_install { |
| 231 | 232 | -name "*.compiled" -exec rm -f {} \;
|
| 232 | 233 | |
| 233 | 234 | rm -Rf "${MINGW_ROOT}"/lib/"${PYTHON_ID}".*/test
|
| 235 | + rm -Rf "${MINGW_ROOT}"/lib/"${PYTHON_ID}"/dist-packages/Ogre
|
|
| 234 | 236 | rm -Rf "${MINGW_ROOT}"/lib/cmake
|
| 235 | 237 | rm -Rf "${MINGW_ROOT}"/lib/gettext
|
| 236 | 238 | rm -Rf "${MINGW_ROOT}"/lib/gtk-3.0
|
| ... | ... | @@ -257,12 +259,11 @@ function cleanup_install { |
| 257 | 259 | rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstschro.dll
|
| 258 | 260 | rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstcacasink.dll
|
| 259 | 261 | |
| 262 | + rm -f "${MINGW_ROOT}"/bin/libBulletCollision.dll
|
|
| 263 | + rm -f "${MINGW_ROOT}"/bin/libBulletDynamics.dll
|
|
| 260 | 264 | rm -f "${MINGW_ROOT}"/bin/libharfbuzz-icu-0.dll
|
| 261 | - rm -f "${MINGW_ROOT}"/bin/libopencv_wechat_qrcode455.dll
|
|
| 262 | - rm -f "${MINGW_ROOT}"/bin/OgreMain.dll
|
|
| 263 | - rm -f "${MINGW_ROOT}"/bin/OgreOverlay.dll
|
|
| 264 | - rm -f "${MINGW_ROOT}"/bin/OgreRTShaderSystem.dll
|
|
| 265 | - rm -f "${MINGW_ROOT}"/bin/OgreBites.dll
|
|
| 265 | + rm -f "${MINGW_ROOT}"/bin/libopencv_*
|
|
| 266 | + rm -f "${MINGW_ROOT}"/bin/Ogre*
|
|
| 266 | 267 | rm -f "${MINGW_ROOT}"/bin/xvidcore.dll
|
| 267 | 268 | |
| 268 | 269 | rm -f "${MINGW_ROOT}"/lib/"${PYTHON_ID}".*/lib-dynload/_tkinter*
|
| ... | ... | @@ -320,5 +321,5 @@ function cleanup_install { |
| 320 | 321 | |
| 321 | 322 | function build_installer {
|
| 322 | 323 | (cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" -DARCH="${MINGW}" "${MISC}"/gajim.nsi)
|
| 323 | - (cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" -DARCH="${MINGW}" "${MISC}"/gajim-portable.nsi)
|
|
| 324 | + #(cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" -DARCH="${MINGW}" "${MISC}"/gajim-portable.nsi)
|
|
| 324 | 325 | } |