Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gajim
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mesonium
gajim
Commits
ca38dd5e
Commit
ca38dd5e
authored
2 years ago
by
Philipp Hörist
Browse files
Options
Downloads
Patches
Plain Diff
chore: Raise dependency versions
- Show pango version in About dialog - Renamy python-cairo to pycairo
parent
6e7c3c63
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
README.md
+3
-1
3 additions, 1 deletion
README.md
debian/control
+3
-2
3 additions, 2 deletions
debian/control
gajim/gajim.py
+7
-3
7 additions, 3 deletions
gajim/gajim.py
gajim/gtk/about.py
+4
-2
4 additions, 2 deletions
gajim/gtk/about.py
with
17 additions
and
8 deletions
README.md
+
3
−
1
View file @
ca38dd5e
...
@@ -5,6 +5,7 @@ ### Runtime Requirements
...
@@ -5,6 +5,7 @@ ### Runtime Requirements
-
[
Python
](
https://www.python.org/
)
(
>=3.9
)
-
[
Python
](
https://www.python.org/
)
(
>=3.9
)
-
[
PyGObject
](
https://pypi.org/project/PyGObject/
)
-
[
PyGObject
](
https://pypi.org/project/PyGObject/
)
-
[
pycairo
](
https://pypi.org/project/pycairo/
)
-
[
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
)
-
[
nbxmpp
](
https://pypi.org/project/nbxmpp/
)
(
>=3.1.1
)
-
[
pyOpenSSL
](
https://pypi.org/project/pyOpenSSL/
)
(
>=16.2
)
-
[
pyOpenSSL
](
https://pypi.org/project/pyOpenSSL/
)
(
>=16.2
)
-
[
css-parser
](
https://pypi.org/project/css-parser/
)
-
[
css-parser
](
https://pypi.org/project/css-parser/
)
...
@@ -13,9 +14,10 @@ ### Runtime Requirements
...
@@ -13,9 +14,10 @@ ### Runtime Requirements
-
[
packaging
](
https://pypi.org/project/packaging/
)
-
[
packaging
](
https://pypi.org/project/packaging/
)
-
[
Pillow
](
https://pypi.org/project/Pillow/
)
-
[
Pillow
](
https://pypi.org/project/Pillow/
)
-
[
setuptools
](
https://pypi.org/project/setuptools/
)
-
[
setuptools
](
https://pypi.org/project/setuptools/
)
-
[
Gtk3
](
https://gitlab.com/gnome/gtk
)
(
>=3.2
2
)
-
[
Gtk3
](
https://gitlab.com/gnome/gtk
)
(
>=3.2
4.30
)
-
[
GLib
](
https://gitlab.com/gnome/glib
)
(
>=2.60.0
)
-
[
GLib
](
https://gitlab.com/gnome/glib
)
(
>=2.60.0
)
-
[
GtkSourceView
](
https://gitlab.gnome.org/GNOME/gtksourceview
)
-
[
GtkSourceView
](
https://gitlab.gnome.org/GNOME/gtksourceview
)
-
[
Pango
](
https://gitlab.gnome.org/GNOME/pango
)
(
>=1.50.0
)
-
[
libsoup
](
https://gitlab.gnome.org/GNOME/libsoup/
)
-
[
libsoup
](
https://gitlab.gnome.org/GNOME/libsoup/
)
### Optional Runtime Requirements
### Optional Runtime Requirements
...
...
This diff is collapsed.
Click to expand it.
debian/control
+
3
−
2
View file @
ca38dd5e
...
@@ -14,7 +14,7 @@ Build-Depends:
...
@@ -14,7 +14,7 @@ Build-Depends:
python3-nbxmpp-nightly (>=20220727),
python3-nbxmpp-nightly (>=20220727),
python3-setuptools,
python3-setuptools,
python3-pil,
python3-pil,
gir1.2-gtk-3.0,
gir1.2-gtk-3.0
(>=3.24.30)
,
Rules-Requires-Root: no
Rules-Requires-Root: no
Standards-Version: 4.1.4
Standards-Version: 4.1.4
Homepage: https://gajim.org/
Homepage: https://gajim.org/
...
@@ -40,7 +40,8 @@ Depends:
...
@@ -40,7 +40,8 @@ Depends:
python3-pil,
python3-pil,
python3-setuptools,
python3-setuptools,
python3-css-parser,
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,
gir1.2-gtksource-4,
Recommends:
Recommends:
aspell-en | aspell-dictionary,
aspell-en | aspell-dictionary,
...
...
This diff is collapsed.
Click to expand it.
gajim/gajim.py
+
7
−
3
View file @
ca38dd5e
...
@@ -31,10 +31,11 @@
...
@@ -31,10 +31,11 @@
_MIN_NBXMPP_VER
=
'
3.1.1
'
_MIN_NBXMPP_VER
=
'
3.1.1
'
_MIN_GTK_VER
=
'
3.2
2.27
'
_MIN_GTK_VER
=
'
3.2
4.30
'
_MIN_CAIRO_VER
=
'
1.16.0
'
_MIN_CAIRO_VER
=
'
1.16.0
'
_MIN_PYGOBJECT_VER
=
'
3.32.0
'
_MIN_PYGOBJECT_VER
=
'
3.32.0
'
_MIN_GLIB_VER
=
'
2.60.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
:
def
check_version
(
dep_name
:
str
,
current_ver
:
str
,
min_ver
:
str
)
->
None
:
...
@@ -70,7 +71,7 @@ def _check_required_deps() -> None:
...
@@ -70,7 +71,7 @@ def _check_required_deps() -> None:
try
:
try
:
import
cairo
import
cairo
except
ImportError
as
error
:
except
ImportError
as
error
:
sys
.
exit
(
error_message
%
(
'
py
thon-
cairo
'
,
error
))
sys
.
exit
(
error_message
%
(
'
pycairo
'
,
error
))
from
gi.repository
import
Gtk
from
gi.repository
import
Gtk
gtk_ver
=
'
%s.%s.%s
'
%
(
Gtk
.
get_major_version
(),
gtk_ver
=
'
%s.%s.%s
'
%
(
Gtk
.
get_major_version
(),
...
@@ -82,12 +83,15 @@ def _check_required_deps() -> None:
...
@@ -82,12 +83,15 @@ def _check_required_deps() -> None:
GLib
.
MINOR_VERSION
,
GLib
.
MINOR_VERSION
,
GLib
.
MICRO_VERSION
]))
GLib
.
MICRO_VERSION
]))
from
gi.repository
import
Pango
check_version
(
'
python-nbxmpp
'
,
nbxmpp
.
__version__
,
_MIN_NBXMPP_VER
)
check_version
(
'
python-nbxmpp
'
,
nbxmpp
.
__version__
,
_MIN_NBXMPP_VER
)
check_version
(
'
pygobject
'
,
gi
.
__version__
,
_MIN_PYGOBJECT_VER
)
check_version
(
'
pygobject
'
,
gi
.
__version__
,
_MIN_PYGOBJECT_VER
)
check_version
(
'
libcairo
'
,
cairo
.
cairo_version_string
(),
_MIN_CAIRO_VER
)
check_version
(
'
libcairo
'
,
cairo
.
cairo_version_string
(),
_MIN_CAIRO_VER
)
check_version
(
'
py
thon-
cairo
'
,
cairo
.
version
,
_MIN_CAIRO_VER
)
check_version
(
'
pycairo
'
,
cairo
.
version
,
_MIN_CAIRO_VER
)
check_version
(
'
gtk3
'
,
gtk_ver
,
_MIN_GTK_VER
)
check_version
(
'
gtk3
'
,
gtk_ver
,
_MIN_GTK_VER
)
check_version
(
'
glib
'
,
glib_ver
,
_MIN_GLIB_VER
)
check_version
(
'
glib
'
,
glib_ver
,
_MIN_GLIB_VER
)
check_version
(
'
pango
'
,
Pango
.
version_string
(),
_MIN_PANGO_VER
)
def
_init_gui
(
gui
:
str
)
->
None
:
def
_init_gui
(
gui
:
str
)
->
None
:
...
...
This diff is collapsed.
Click to expand it.
gajim/gtk/about.py
+
4
−
2
View file @
ca38dd5e
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
from
gi.repository
import
Gtk
from
gi.repository
import
Gtk
from
gi.repository
import
GLib
from
gi.repository
import
GLib
from
gi.repository
import
GObject
from
gi.repository
import
GObject
from
gi.repository
import
Pango
import
cairo
import
cairo
...
@@ -56,9 +57,10 @@ def __init__(self):
...
@@ -56,9 +57,10 @@ def __init__(self):
comments
.
append
(
''
)
comments
.
append
(
''
)
comments
.
append
(
_
(
'
GTK Version: %s
'
)
%
gtk_ver
)
comments
.
append
(
_
(
'
GTK Version: %s
'
)
%
gtk_ver
)
comments
.
append
(
_
(
'
GLib Version: %s
'
)
%
glib_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
(
_
(
'
PyGObject Version: %s
'
)
%
gobject_ver
)
comments
.
append
(
_
(
'
C
airo Version: %s
'
)
%
cairo_ver
)
comments
.
append
(
_
(
'
c
airo Version: %s
'
)
%
cairo_ver
)
comments
.
append
(
_
(
'
py
thon-
cairo Version: %s
'
)
%
python_cairo_ver
)
comments
.
append
(
_
(
'
pycairo Version: %s
'
)
%
python_cairo_ver
)
comments
.
append
(
_
(
'
python-nbxmpp Version: %s
'
)
%
nbxmpp
.
__version__
)
comments
.
append
(
_
(
'
python-nbxmpp Version: %s
'
)
%
nbxmpp
.
__version__
)
self
.
set_comments
(
'
\n
'
.
join
(
comments
))
self
.
set_comments
(
'
\n
'
.
join
(
comments
))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment