diff options
author | lovetox <philipp@hoerist.com> | 2022-08-22 18:51:02 +0300 |
---|---|---|
committer | lovetox <philipp@hoerist.com> | 2022-08-22 19:04:20 +0300 |
commit | ca38dd5ec54dc0134cc25d969e92fadac141c1a9 (patch) | |
tree | b4127b3dea6586c5461577f1f616e4a3224f1226 | |
parent | 6e7c3c63262eb85423e3d4275eba5240af3f2351 (diff) |
chore: Raise dependency versions
- Show pango version in About dialog
- Renamy python-cairo to pycairo
-rw-r--r-- | README.md | 4 | ||||
-rw-r--r-- | debian/control | 5 | ||||
-rw-r--r-- | gajim/gajim.py | 10 | ||||
-rw-r--r-- | gajim/gtk/about.py | 6 |
4 files changed, 17 insertions, 8 deletions
@@ -5,6 +5,7 @@ - [Python](https://www.python.org/) (>=3.9) - [PyGObject](https://pypi.org/project/PyGObject/) - [pycairo](https://pypi.org/project/pycairo/) +- [cairo](https://gitlab.freedesktop.org/cairo/cairo) (>=1.16.0) - [nbxmpp](https://pypi.org/project/nbxmpp/) (>=3.1.1) - [pyOpenSSL](https://pypi.org/project/pyOpenSSL/) (>=16.2) - [css-parser](https://pypi.org/project/css-parser/) @@ -13,9 +14,10 @@ - [packaging](https://pypi.org/project/packaging/) - [Pillow](https://pypi.org/project/Pillow/) - [setuptools](https://pypi.org/project/setuptools/) -- [Gtk3](https://gitlab.com/gnome/gtk) (>=3.22) +- [Gtk3](https://gitlab.com/gnome/gtk) (>=3.24.30) - [GLib](https://gitlab.com/gnome/glib) (>=2.60.0) - [GtkSourceView](https://gitlab.gnome.org/GNOME/gtksourceview) +- [Pango](https://gitlab.gnome.org/GNOME/pango) (>=1.50.0) - [libsoup](https://gitlab.gnome.org/GNOME/libsoup/) ### Optional Runtime Requirements diff --git a/debian/control b/debian/control index 95a5414b1..e835c0b1e 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: python3-nbxmpp-nightly (>=20220727), python3-setuptools, python3-pil, - gir1.2-gtk-3.0, + gir1.2-gtk-3.0 (>=3.24.30), Rules-Requires-Root: no Standards-Version: 4.1.4 Homepage: https://gajim.org/ @@ -40,7 +40,8 @@ Depends: python3-pil, python3-setuptools, python3-css-parser, - gir1.2-gtk-3.0 (>= 3.22.27~), + gir1.2-pango-1.0 (>= 1.50.0), + gir1.2-gtk-3.0 (>= 3.24.30), gir1.2-gtksource-4, Recommends: aspell-en | aspell-dictionary, diff --git a/gajim/gajim.py b/gajim/gajim.py index f2422ff26..c5025c4d6 100644 --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -31,10 +31,11 @@ from gajim.common import i18n _MIN_NBXMPP_VER = '3.1.1' -_MIN_GTK_VER = '3.22.27' +_MIN_GTK_VER = '3.24.30' _MIN_CAIRO_VER = '1.16.0' _MIN_PYGOBJECT_VER = '3.32.0' _MIN_GLIB_VER = '2.60.0' +_MIN_PANGO_VER = '1.50.0' def check_version(dep_name: str, current_ver: str, min_ver: str) -> None: @@ -70,7 +71,7 @@ def _check_required_deps() -> None: try: import cairo except ImportError as error: - sys.exit(error_message % ('python-cairo', error)) + sys.exit(error_message % ('pycairo', error)) from gi.repository import Gtk gtk_ver = '%s.%s.%s' % (Gtk.get_major_version(), @@ -82,12 +83,15 @@ def _check_required_deps() -> None: GLib.MINOR_VERSION, GLib.MICRO_VERSION])) + from gi.repository import Pango + check_version('python-nbxmpp', nbxmpp.__version__, _MIN_NBXMPP_VER) check_version('pygobject', gi.__version__, _MIN_PYGOBJECT_VER) check_version('libcairo', cairo.cairo_version_string(), _MIN_CAIRO_VER) - check_version('python-cairo', cairo.version, _MIN_CAIRO_VER) + check_version('pycairo', cairo.version, _MIN_CAIRO_VER) check_version('gtk3', gtk_ver, _MIN_GTK_VER) check_version('glib', glib_ver, _MIN_GLIB_VER) + check_version('pango', Pango.version_string(), _MIN_PANGO_VER) def _init_gui(gui: str) -> None: diff --git a/gajim/gtk/about.py b/gajim/gtk/about.py index c33307603..507284dc5 100644 --- a/gajim/gtk/about.py +++ b/gajim/gtk/about.py @@ -18,6 +18,7 @@ from gi.repository import Gdk from gi.repository import Gtk from gi.repository import GLib from gi.repository import GObject +from gi.repository import Pango import cairo @@ -56,9 +57,10 @@ class AboutDialog(Gtk.AboutDialog): comments.append('') comments.append(_('GTK Version: %s') % gtk_ver) comments.append(_('GLib Version: %s') % glib_ver) + comments.append(_('Pango Version: %s') % Pango.version_string()) comments.append(_('PyGObject Version: %s') % gobject_ver) - comments.append(_('Cairo Version: %s') % cairo_ver) - comments.append(_('python-cairo Version: %s') % python_cairo_ver) + comments.append(_('cairo Version: %s') % cairo_ver) + comments.append(_('pycairo Version: %s') % python_cairo_ver) comments.append(_('python-nbxmpp Version: %s') % nbxmpp.__version__) self.set_comments('\n'.join(comments)) |