diff options
Diffstat (limited to 'deb_patches')
| -rw-r--r-- | deb_patches/lower-python3-requirement.patch | 4 | ||||
| -rw-r--r-- | deb_patches/silence-gtk-style-assertions.patch | 34 |
2 files changed, 36 insertions, 2 deletions
diff --git a/deb_patches/lower-python3-requirement.patch b/deb_patches/lower-python3-requirement.patch index 94f8d91..e60bf71 100644 --- a/deb_patches/lower-python3-requirement.patch +++ b/deb_patches/lower-python3-requirement.patch @@ -14,8 +14,8 @@ diff -r ede1c973aa85 build/moz.configure/init.configure -option(env='PYTHON3', nargs=1, help='Python 3 interpreter (3.6 or later)') +option(env='PYTHON3', nargs=1, help='Python 3 interpreter (3.5 or later)') - - @depends('PYTHON3', check_build_environment, mozconfig, '--help') + option(env='VIRTUALENV_NAME', nargs=1, default='init_py3', + help='Name of the in-objdir virtualenv') @@ -334,20 +334,20 @@ '(%s): %s' % (python, e)) else: diff --git a/deb_patches/silence-gtk-style-assertions.patch b/deb_patches/silence-gtk-style-assertions.patch new file mode 100644 index 0000000..bfad1cc --- /dev/null +++ b/deb_patches/silence-gtk-style-assertions.patch @@ -0,0 +1,34 @@ +Description: silence GTK style-related assertions caused by the lack of a "selection" CSS node on GtkTextView in the version of gtk3 in xenial. + These assertions were caused by the fix for https://bugzilla.mozilla.org/1654323. +Author: Olivier Tilloy <olivier.tilloy@canonical.com> + +--- a/widget/gtk/nsLookAndFeel.cpp ++++ b/widget/gtk/nsLookAndFeel.cpp +@@ -1142,7 +1142,7 @@ void nsLookAndFeel::EnsureInit() { + &color); + mTextSelectedText = GDK_RGBA_TO_NS_RGBA(color); + }; +- GrabSelectionColors(selectionStyle); ++ GrabSelectionColors(selectionStyle ? selectionStyle : style); + if (mTextSelectedBackground == mTextSelectedText) { + // Some old distros/themes don't properly use the .selection style, so + // fall back to the regular text view style. +--- a/widget/gtk/WidgetStyleCache.cpp ++++ b/widget/gtk/WidgetStyleCache.cpp +@@ -933,7 +933,7 @@ static GtkStyleContext* GetWidgetRootSty + default: + GtkWidget* widget = GetWidget(aNodeType); + MOZ_ASSERT(widget); +- return gtk_widget_get_style_context(widget); ++ return (widget ? gtk_widget_get_style_context(widget) : nullptr); + } + + MOZ_ASSERT(style); +@@ -1356,6 +1356,7 @@ GtkStyleContext* GetStyleContext(WidgetN + style = GetCssNodeStyleInternal(aNodeType); + StyleContextSetScale(style, aScale); + } ++ if (!style) return nullptr; + bool stateChanged = false; + bool stateHasDirection = gtk_get_minor_version() >= 8; + GtkStateFlags oldState = gtk_style_context_get_state(style); |