Philipp Hörist pushed to branch master at gajim / gajim

Commits: 9da073b9 by lovetox at 2022-06-01T09:09:47+02:00 fix: CoreApplication: Import modules after dependency check

- - - - - 7d76372d by lovetox at 2022-06-01T09:09:47+02:00 fix: Make GStreamer an optional dependency again

- - - - - ebd3da5f by lovetox at 2022-06-01T09:09:47+02:00 chore: Update runtime requirements

- - - - -

6 changed files:

- README.md - debian/control - gajim/common/application.py - gajim/common/preview_helpers.py - gajim/gtk/gstreamer.py - gajim/gtk/preview_audio.py

Changes:

===================================== README.md ===================================== @@ -16,11 +16,6 @@ ### Runtime Requirements - GLib (>=2.60.0) - gir1.2-gtksource-4 - gir1.2-soup-2.4 -- gir1.2-gstreamer-1.0 -- gir1.2-gst-plugins-base-1.0 -- gstreamer1.0-plugins-ugly -- gstreamer1.0-libav -- gstreamer1.0-gtk3

### Optional Runtime Requirements

@@ -33,7 +28,15 @@ ### Optional Runtime Requirements - gir1.2-networkmanager-1.0 for network lose detection - gir1.2-geoclue-2.0 for sharing your location - gir1.2-gsound-1.0 for sound on Linux + +#### For Video and Audio Calls + - gir1.2-farstream-0.2 for video calls +- gir1.2-gstreamer-1.0 for video and audio calls +- gir1.2-gst-plugins-base-1.0 for video and audio calls +- gstreamer1.0-plugins-ugly for video and audio calls +- gstreamer1.0-libav for video and audio calls +- gstreamer1.0-gtk3

### Compile-time Requirements

===================================== debian/control ===================================== @@ -40,21 +40,21 @@ Depends: python3-css-parser, gir1.2-gtk-3.0 (>= 3.22.27~), gir1.2-gtksource-4, - gir1.2-gstreamer-1.0 - gir1.2-gst-plugins-base-1.0 - gstreamer1.0-plugins-ugly - gstreamer1.0-libav - gstreamer1.0-gtk3 Recommends: aspell-en | aspell-dictionary, ca-certificates, dbus, fonts-noto-color-emoji, - gir1.2-farstream-0.2, gir1.2-gsound-1.0, gir1.2-gspell-1, gir1.2-gupnpigd-1.0, gir1.2-secret-1, + gir1.2-farstream-0.2, + gir1.2-gstreamer-1.0, + gir1.2-gst-plugins-base-1.0, + gstreamer1.0-plugins-ugly, + gstreamer1.0-libav, + gstreamer1.0-gtk3, notification-daemon, pulseaudio-utils | alsa-utils | sox | oss4-base, python3-dbus (>=0.81),

===================================== gajim/common/application.py ===================================== @@ -35,10 +35,8 @@ from gajim.common.events import AccountDisonnected from gajim.common.events import AllowGajimUpdateCheck from gajim.common.events import GajimUpdateAvailable -from gajim.common.call_manager import CallManager from gajim.common.client import Client from gajim.common.helpers import make_http_request -from gajim.common.preview import PreviewManager from gajim.common.task_manager import TaskManager from gajim.common.settings import Settings from gajim.common.settings import LegacyConfig @@ -69,8 +67,10 @@ def _init_core(self) -> None: app.cert_store = CertificateStore() app.task_manager = TaskManager()

+ from gajim.common.call_manager import CallManager app.call_manager = CallManager()

+ from gajim.common.preview import PreviewManager app.preview_manager = PreviewManager()

self._network_monitor = Gio.NetworkMonitor.get_default()

===================================== gajim/common/preview_helpers.py ===================================== @@ -31,7 +31,11 @@ from gi.repository import GdkPixbuf from gi.repository import GLib from gi.repository import Gio -from gi.repository import GstPbutils + +try: + from gi.repository import GstPbutils +except Exception: + pass

from PIL import Image from PIL import ImageFile

===================================== gajim/gtk/gstreamer.py ===================================== @@ -12,6 +12,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see http://www.gnu.org/licenses/.

+from __future__ import annotations + from typing import Optional from typing import Tuple

===================================== gajim/gtk/preview_audio.py ===================================== @@ -12,6 +12,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see http://www.gnu.org/licenses/.

+from __future__ import annotations + from typing import Optional

import logging @@ -19,7 +21,10 @@

from gi.repository import GLib from gi.repository import Gtk -from gi.repository import Gst +try: + from gi.repository import Gst +except Exception: + pass

from gajim.common.i18n import _

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f18820a12f46335f61702cdc0774434d...