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

Commits:

4 changed files:

Changes:

  • README.md
    ... ... @@ -5,6 +5,7 @@ ### Runtime Requirements
    5 5 
     - [Python](https://www.python.org/) (>=3.9)
    6 6 
     - [PyGObject](https://pypi.org/project/PyGObject/)
    7 7 
     - [pycairo](https://pypi.org/project/pycairo/)
    8 
    +- [cairo](https://gitlab.freedesktop.org/cairo/cairo) (>=1.16.0)
    8 9 
     - [nbxmpp](https://pypi.org/project/nbxmpp/) (>=3.1.1)
    9 10 
     - [pyOpenSSL](https://pypi.org/project/pyOpenSSL/) (>=16.2)
    10 11 
     - [css-parser](https://pypi.org/project/css-parser/)
    ... ... @@ -13,9 +14,10 @@ ### Runtime Requirements
    13 14 
     - [packaging](https://pypi.org/project/packaging/)
    14 15 
     - [Pillow](https://pypi.org/project/Pillow/)
    15 16 
     - [setuptools](https://pypi.org/project/setuptools/)
    16 
    -- [Gtk3](https://gitlab.com/gnome/gtk) (>=3.22)
    17 
    +- [Gtk3](https://gitlab.com/gnome/gtk) (>=3.24.30)
    17 18 
     - [GLib](https://gitlab.com/gnome/glib) (>=2.60.0)
    18 19 
     - [GtkSourceView](https://gitlab.gnome.org/GNOME/gtksourceview)
    20 
    +- [Pango](https://gitlab.gnome.org/GNOME/pango) (>=1.50.0)
    19 21 
     - [libsoup](https://gitlab.gnome.org/GNOME/libsoup/)
    20 22
    21 23 
     ### Optional Runtime Requirements

  • debian/control
    ... ... @@ -14,7 +14,7 @@ Build-Depends:
    14 14 
         python3-nbxmpp-nightly (>=20220727),
    15 15 
         python3-setuptools,
    16 16 
         python3-pil,
    17 
    -    gir1.2-gtk-3.0,
    17 
    +    gir1.2-gtk-3.0 (>=3.24.30),
    18 18 
     Rules-Requires-Root: no
    19 19 
     Standards-Version: 4.1.4
    20 20 
     Homepage: https://gajim.org/
    ... ... @@ -40,7 +40,8 @@ Depends:
    40 40 
         python3-pil,
    41 41 
         python3-setuptools,
    42 42 
         python3-css-parser,
    43 
    -    gir1.2-gtk-3.0 (>= 3.22.27~),
    43 
    +    gir1.2-pango-1.0 (>= 1.50.0),
    44 
    +    gir1.2-gtk-3.0 (>= 3.24.30),
    44 45 
         gir1.2-gtksource-4,
    45 46 
     Recommends:
    46 47 
         aspell-en | aspell-dictionary,

  • gajim/gajim.py
    ... ... @@ -31,10 +31,11 @@
    31 31
    32 32
    33 33 
     _MIN_NBXMPP_VER = '3.1.1'
    34 
    -_MIN_GTK_VER = '3.22.27'
    34 
    +_MIN_GTK_VER = '3.24.30'
    35 35 
     _MIN_CAIRO_VER = '1.16.0'
    36 36 
     _MIN_PYGOBJECT_VER = '3.32.0'
    37 37 
     _MIN_GLIB_VER = '2.60.0'
    38 
    +_MIN_PANGO_VER = '1.50.0'
    38 39
    39 40
    40 41 
     def check_version(dep_name: str, current_ver: str, min_ver: str) -> None:
    ... ... @@ -70,7 +71,7 @@ def _check_required_deps() -> None:
    70 71 
         try:
    71 72 
             import cairo
    72 73 
         except ImportError as error:
    73 
    -        sys.exit(error_message % ('python-cairo', error))
    74 
    +        sys.exit(error_message % ('pycairo', error))
    74 75
    75 76 
         from gi.repository import Gtk
    76 77 
         gtk_ver = '%s.%s.%s' % (Gtk.get_major_version(),
    ... ... @@ -82,12 +83,15 @@ def _check_required_deps() -> None:
    82 83 
                                       GLib.MINOR_VERSION,
    83 84 
                                       GLib.MICRO_VERSION]))
    84 85
    86 
    +    from gi.repository import Pango
    87 
    +
    85 88 
         check_version('python-nbxmpp', nbxmpp.__version__, _MIN_NBXMPP_VER)
    86 89 
         check_version('pygobject', gi.__version__, _MIN_PYGOBJECT_VER)
    87 90 
         check_version('libcairo', cairo.cairo_version_string(), _MIN_CAIRO_VER)
    88 
    -    check_version('python-cairo', cairo.version, _MIN_CAIRO_VER)
    91 
    +    check_version('pycairo', cairo.version, _MIN_CAIRO_VER)
    89 92 
         check_version('gtk3', gtk_ver, _MIN_GTK_VER)
    90 93 
         check_version('glib', glib_ver, _MIN_GLIB_VER)
    94 
    +    check_version('pango', Pango.version_string(), _MIN_PANGO_VER)
    91 95
    92 96
    93 97 
     def _init_gui(gui: str) -> None:

  • gajim/gtk/about.py
    ... ... @@ -18,6 +18,7 @@
    18 18 
     from gi.repository import Gtk
    19 19 
     from gi.repository import GLib
    20 20 
     from gi.repository import GObject
    21 
    +from gi.repository import Pango
    21 22
    22 23 
     import cairo
    23 24
    ... ... @@ -56,9 +57,10 @@ def __init__(self):
    56 57 
             comments.append('')
    57 58 
             comments.append(_('GTK Version: %s') % gtk_ver)
    58 59 
             comments.append(_('GLib Version: %s') % glib_ver)
    60 
    +        comments.append(_('Pango Version: %s') % Pango.version_string())
    59 61 
             comments.append(_('PyGObject Version: %s') % gobject_ver)
    60 
    -        comments.append(_('Cairo Version: %s') % cairo_ver)
    61 
    -        comments.append(_('python-cairo Version: %s') % python_cairo_ver)
    62 
    +        comments.append(_('cairo Version: %s') % cairo_ver)
    63 
    +        comments.append(_('pycairo Version: %s') % python_cairo_ver)
    62 64 
             comments.append(_('python-nbxmpp Version: %s') % nbxmpp.__version__)
    63 65
    64 66 
             self.set_comments('\n'.join(comments))

    • —
    View it on GitLab.
    You're receiving this email because of your account on dev.gajim.org. If you'd like to receive fewer emails, you can adjust your notification settings.