It's 3.30.2 release day, upload a tarball and fix that hidden pesky bug that you missed in .1 🦛

Commit f5363fed authored by Kai Willadsen's avatar Kai Willadsen

Merge branch 'win32-remove-font-backend-workaround' into 'master'

win32: remove workaround for font backend

See merge request !6
parents 4b66b5ca 08dca620
Pipeline #14862 failed with stages
in 7 minutes and 46 seconds
......@@ -184,7 +184,6 @@ def check_requirements():
gtk_requirement = (3, 20)
glib_requirement = (2, 48)
gtksourceview_requirement = (3, 20, 0)
pangocairo_requirement = (1, 34)
def missing_reqs(mod, ver, exc=None):
if isinstance(exc, ImportError):
......@@ -222,13 +221,6 @@ def check_requirements():
except (ImportError, AssertionError, ValueError) as e:
missing_reqs("GtkSourceView", gtksourceview_requirement, e)
try:
gi.require_version("PangoCairo", "1.0")
from gi.repository import PangoCairo # noqa: F401
# Only check that imports ok; the version is fine since Gtk loaded fine
except (ImportError, ValueError) as e:
missing_reqs("PangoCairo", pangocairo_requirement, e)
def setup_resources():
from gi.repository import GLib
......@@ -367,10 +359,5 @@ if __name__ == '__main__':
from gi.repository import GLib
GLib.unix_signal_add(GLib.PRIORITY_DEFAULT, signal.SIGINT,
lambda *args: meld.meldapp.app.quit(), None)
if sys.platform == 'win32':
# FontConfig on win32 at least with version <= 2.12.6 can cause several
# minutes 'hang' during first startup. So use native fonts backend.
from gi.repository import PangoCairo
PangoCairo.FontMap.set_default(PangoCairo.Win32FontMap())
status = meld.meldapp.app.run(sys.argv)
sys.exit(status)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment