diff options
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | NEWS | 20 | ||||
| -rw-r--r-- | data/initial-setup.json | 2 | ||||
| -rw-r--r-- | gnome-initial-setup/gis-driver.c | 5 | ||||
| -rw-r--r-- | gnome-initial-setup/meson.build | 2 | ||||
| -rw-r--r-- | gnome-initial-setup/pages/account/gis-account-page-enterprise.c | 3 | ||||
| -rw-r--r-- | gnome-initial-setup/pages/privacy/gis-privacy-page.c | 4 | ||||
| -rw-r--r-- | meson.build | 9 | ||||
| -rw-r--r-- | subprojects/libadwaita.wrap | 2 |
10 files changed, 47 insertions, 12 deletions
@@ -4,10 +4,3 @@ # GNOME Builder litter /.buildconfig - -# Build directories -/build -/_build-* -/subprojects/gnome-desktop -/subprojects/libgweather -/subprojects/libhandy diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9b9eacc..c2d5aba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ stages: # to the release number/branch to ensure that # a new image will be created, tailored for the # stable branch. - FDO_DISTRIBUTION_TAG: '2022-11-11.0-43' + FDO_DISTRIBUTION_TAG: '2022-12-02.0-43' # See also https://gitlab.freedesktop.org/freedesktop/ci-templates build.container.arch@x86_64: @@ -56,6 +56,7 @@ build.container.arch@x86_64: libpwquality librest libsecret + malcontent meson polkit sassc @@ -74,6 +75,8 @@ build.container.arch@x86_64: # gnome-control-center uses many deprecated functions. Until we have a good # answer to sharing that code (#68), make those warnings non-fatal. - meson setup + --wrap-mode=nofallback + --fatal-meson-warnings -Dsystemd=${EXPLICIT_FEATURES} --auto-features ${AUTO_FEATURES} ${OPTIONS} @@ -1,3 +1,23 @@ +43.2 +---- + +* The webkitgtk-6.0 API version is now supported, in addition to the previous + webkit2gtk-5.0 API version. + +* Bugs fixed: + - The Shell quick settings menu will now be shown in the Initial Setup session. + This regressed when the previous menu was renamed in gnome-shell during the + 43 cycle. (!166) + + - Error messages shown during enterprise account setup can now be closed by + clicking the Close button. (!169) + +* Translation updates: + - Abkhazian + - Dutch + - Greek, Modern (1453-) + - Icelandic + 43.1 ---- diff --git a/data/initial-setup.json b/data/initial-setup.json index d56b03a..35fae95 100644 --- a/data/initial-setup.json +++ b/data/initial-setup.json @@ -3,6 +3,6 @@ "components": ["networkAgent"], "panel": { "left": [], "center": [], - "right": ["a11y", "keyboard", "aggregateMenu"] + "right": ["a11y", "keyboard", "quickSettings"] } } diff --git a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c index 1fbf636..1ddf3c6 100644 --- a/gnome-initial-setup/gis-driver.c +++ b/gnome-initial-setup/gis-driver.c @@ -26,7 +26,12 @@ #include <errno.h> #include <locale.h> #include <stdlib.h> + +#ifdef HAVE_WEBKITGTK_6_0 +#include <webkit/webkit.h> +#else #include <webkit2/webkit2.h> +#endif #include "cc-common-language.h" #include "gis-assistant.h" diff --git a/gnome-initial-setup/meson.build b/gnome-initial-setup/meson.build index 3127803..a3dd513 100644 --- a/gnome-initial-setup/meson.build +++ b/gnome-initial-setup/meson.build @@ -63,11 +63,11 @@ dependencies = [ dependency ('libsecret-1', version: '>= 0.18.8'), dependency ('pwquality'), dependency ('rest-1.0'), - dependency ('webkit2gtk-5.0'), ibus_dep, libmalcontent_dep, libmalcontent_ui_dep, libadwaita_dep, + webkitgtk_dep ] executable( diff --git a/gnome-initial-setup/pages/account/gis-account-page-enterprise.c b/gnome-initial-setup/pages/account/gis-account-page-enterprise.c index 39976da..02a4f3b 100644 --- a/gnome-initial-setup/pages/account/gis-account-page-enterprise.c +++ b/gnome-initial-setup/pages/account/gis-account-page-enterprise.c @@ -138,6 +138,9 @@ show_error_dialog (GisAccountPageEnterprise *page, "%s", error->message); } + g_signal_connect (dialog, "response", + G_CALLBACK (gtk_window_destroy), + NULL); gtk_window_present (GTK_WINDOW (dialog)); } diff --git a/gnome-initial-setup/pages/privacy/gis-privacy-page.c b/gnome-initial-setup/pages/privacy/gis-privacy-page.c index 40cfd88..3632142 100644 --- a/gnome-initial-setup/pages/privacy/gis-privacy-page.c +++ b/gnome-initial-setup/pages/privacy/gis-privacy-page.c @@ -27,7 +27,11 @@ #include "privacy-resources.h" #include "gis-privacy-page.h" +#ifdef HAVE_WEBKITGTK_6_0 +#include <webkit/webkit.h> +#else #include <webkit2/webkit2.h> +#endif #include <locale.h> #include <gtk/gtk.h> diff --git a/meson.build b/meson.build index d88d413..f1de4ab 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('gnome-initial-setup', ['c'], - version: '43.1.1', + version: '43.2', license: 'GPL-2.0-or-later', meson_version: '>= 0.53.0', ) @@ -77,6 +77,13 @@ libmalcontent_ui_dep = dependency ('malcontent-ui-1', have_parental_controls = libmalcontent_dep.found() and libmalcontent_ui_dep.found() conf.set('HAVE_PARENTAL_CONTROLS', have_parental_controls) +webkitgtk_dep = dependency('webkitgtk-6.0', required: false) +if webkitgtk_dep.found() + conf.set10('HAVE_WEBKITGTK_6_0', true) +else + webkitgtk_dep = dependency('webkit2gtk-5.0') +endif + configure_file(output: 'config.h', configuration: conf) config_h_dir = include_directories('.') diff --git a/subprojects/libadwaita.wrap b/subprojects/libadwaita.wrap index 7f0376c..73a2a9a 100644 --- a/subprojects/libadwaita.wrap +++ b/subprojects/libadwaita.wrap @@ -1,3 +1,3 @@ [wrap-git] url = https://gitlab.gnome.org/GNOME/libadwaita.git -revision = main
\ No newline at end of file +revision = libadwaita-1-2 |