This commit is contained in:
ohfp 2021-02-27 00:02:29 +01:00
parent 7b40f2a460
commit 9320f90606
No known key found for this signature in database
GPG key ID: 2954CC8585E27A3F
4 changed files with 7 additions and 6 deletions

View file

@ -414,8 +414,8 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
""" """
The metric's unique identifier, including the category and name The metric's unique identifier, including the category and name
""" """
- return f"{category}.{metric_name}" - return f"{category}.{util.camelize(metric_name)}"
+ return "{}.{}".format(category, metric_name) + return "{}.{}".format(category, util.camelize(metric_name))
def type_name(type): def type_name(type):

View file

@ -33,6 +33,7 @@ _DEPENDENCIES="wget git xvfb \
libnotify-dev \ libnotify-dev \
libxrender-dev \ libxrender-dev \
libpulse-dev \ libpulse-dev \
libssl-dev \
yasm \ yasm \
unzip \ unzip \
dbus-x11 \ dbus-x11 \

View file

@ -11,7 +11,7 @@ LAUNCHER_SCRIPT=$3;
CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)} CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)}
_SCRIPT_FOLDER=$(realpath $(dirname $0)); _SCRIPT_FOLDER=$(realpath $(dirname $0));
_EXTRACTED_TARBALL_FOLDER=$_SCRIPT_FOLDER/librewolf; _EXTRACTED_TARBALL_FOLDER=$_SCRIPT_FOLDER/librewolf;
_SETTINGS_COMMIT=3feb12464aa81df2f4ff162fce69890614c0ac8f _SETTINGS_COMMIT=c5c75a39dd91a8772255a78493853be6553262b2
_SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git'; _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git';
# Extracts the binary tarball # Extracts the binary tarball

View file

@ -5153,9 +5153,9 @@
# END ATOMS # END ATOMS
-] + HTML_PARSER_ATOMS -] + HTML_PARSER_ATOMS
+] + HTML_PARSER_ATOMS + NATIVE_MENU_ATOMS +] + HTML_PARSER_ATOMS + NATIVE_MENU_ATOMS
# fmt: on
def verify():
--- a/widget/gtk/components.conf --- a/widget/gtk/components.conf
+++ b/widget/gtk/components.conf +++ b/widget/gtk/components.conf
@@ -82,6 +82,14 @@ Classes = [ @@ -82,6 +82,14 @@ Classes = [
@ -5176,8 +5176,8 @@
--- a/xpfe/appshell/AppWindow.cpp --- a/xpfe/appshell/AppWindow.cpp
+++ b/xpfe/appshell/AppWindow.cpp +++ b/xpfe/appshell/AppWindow.cpp
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
# include "mozilla/XULStore.h"
#endif #include "mozilla/dom/DocumentL10n.h"
-#ifdef XP_MACOSX -#ifdef XP_MACOSX
+#if defined(XP_MACOSX) || defined(MOZ_WIDGET_GTK) +#if defined(XP_MACOSX) || defined(MOZ_WIDGET_GTK)