Philipp Hörist pushed to branch master at gajim / gajim
Commits:
694aa25e by Philipp Hörist at 2024-09-13T20:32:22+02:00
cq: Fix typos
- - - - -
15901956 by Philipp Hörist at 2024-09-13T20:32:46+02:00
cfix: Build: Don’t build and install in the same step
- - - - -
8 changed files:
- ChangeLog
- README.md
- build.py
- flatpak/org.gajim.Gajim.Devel.yaml
- flatpak/org.gajim.Gajim.yaml
- gajim/gtk/discovery.py
- pyproject.toml
- win/_base.sh
Changes:
=====================================
ChangeLog
=====================================
@@ -609,7 +609,7 @@ Gajim 1.5.4 (04 Dec 2022)
* DataFormWidget: Set min width on right box (#11222)
* MUC: Add method for aborting join
- * Message selection: Imrpove wording for deselecting messages
+ * Message selection: Improve wording for deselecting messages
* Message selection: Improve styling
* Features: Add entry for Audio Preview
* Styling: Introduce URI scheme whitelisting (#11266)
@@ -820,7 +820,7 @@ Gajim 1.5.0 (19 Sep 2022)
* Preview: Show left click action tooltip on icon (#11138)
* ACE: Highlight non-default values (#11120)
* XMLConsole: Use SourceView for XML input (#11121)
- * Migration: Make archive migation more resilient
+ * Migration: Make archive migration more resilient
* Workspaces: Move chats when removing workspace (#11098)
* ChatList: Always show when switching workspace (#11108)
* MessageActionsBox: Disable encryption button if MUC is public (#10959)
=====================================
README.md
=====================================
@@ -81,7 +81,7 @@ ### Building the metadata files and translation
```
-Afterwards metadata files can be found in the `dist` folder.
+Afterwards metadata files can be found in `dist/metadata` folder.
### Building the wheel
=====================================
build.py
=====================================
@@ -7,6 +7,7 @@
import logging
import shutil
import subprocess
+import sys
from pathlib import Path
logging.basicConfig(level='INFO', format='%(message)s')
@@ -159,6 +160,10 @@ def install(*, prefix: Path) -> None:
args = parser.parse_args()
METADATA.mkdir(parents=True, exist_ok=True)
+ if args.install:
+ install(prefix=args.prefix)
+ sys.exit()
+
if args.dist == 'flatpak':
configure_flatpak()
elif args.dist == 'flatpak-nightly':
@@ -172,6 +177,3 @@ def install(*, prefix: Path) -> None:
build_meta()
build_app_icons()
build_translations()
-
- if args.install:
- install(prefix=args.prefix)
=====================================
flatpak/org.gajim.Gajim.Devel.yaml
=====================================
@@ -402,7 +402,8 @@ modules:
- name: gajim
buildsystem: simple
build-commands:
- - ./build.py --dist=flatpak-nightly --install --prefix=/app
+ - ./build.py --dist=flatpak-nightly
+ - ./build.py --install --prefix=/app
- pip3 install --no-build-isolation .
- cp -t ${FLATPAK_DEST} app-overrides.json
sources:
=====================================
flatpak/org.gajim.Gajim.yaml
=====================================
@@ -397,7 +397,8 @@ modules:
- name: gajim
buildsystem: simple
build-commands:
- - ./build.py --dist=flatpak --install --prefix=/app
+ - ./build.py --dist=flatpak
+ - ./build.py --install --prefix=/app
- pip3 install --no-build-isolation .
- cp -t ${FLATPAK_DEST} app-overrides.json
sources:
=====================================
gajim/gtk/discovery.py
=====================================
@@ -2043,7 +2043,7 @@ def _on_post_button_clicked(self, widget):
def _on_subscribe_button_clicked(self, widget):
'''
- Called when 'subscribe' button is pressed. Send subscribtion request
+ Called when 'subscribe' button is pressed. Send subscription request
'''
model, iter_ = \
self.window.services_treeview.get_selection().get_selected()
=====================================
pyproject.toml
=====================================
@@ -82,7 +82,7 @@ skip-string-normalization = true
target-version = ["py310", "py311", "py312"]
[tool.codespell]
-skip =
"*__pycache__*,_build_root,build,dist,test,*.egg-info,.git,*.po,*.pot,*.nsi,*.spec"
+skip =
"*__pycache__*,_build_root,build,dist,shared-modules,test,*.egg-info,.git,*.po,*.pot,*.nsi,*.spec"
ignore-words-list = "claus,pres,ser,trough"
[tool.pyright]
=====================================
win/_base.sh
=====================================
@@ -269,7 +269,7 @@ function cleanup_install {
rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstfaac.dll
rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstschro.dll
rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstcacasink.dll
- # Crashes often on Windows maschines
+ # Crashes often on Windows machines
rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstamfcodec.dll
rm -f "${MINGW_ROOT}"/bin/libBulletCollision.dll
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/f9a1e9c28d211710d788776c60ff6770a7d872ac...15901956964562728650d8679ca04a5b073bb0b7
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/f9a1e9c28d211710d788776c60ff6770a7d872ac...15901956964562728650d8679ca04a5b073bb0b7
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
