Skip to content
Commits on Source (30)
......@@ -4,10 +4,3 @@
# GNOME Builder litter
/.buildconfig
# Build directories
/build
/_build-*
/subprojects/gnome-desktop
/subprojects/libgweather
/subprojects/libhandy
......@@ -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-07-25.10-main'
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}
......
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
----
......
......@@ -3,6 +3,6 @@
"components": ["networkAgent"],
"panel": { "left": [],
"center": [],
"right": ["a11y", "keyboard", "aggregateMenu"]
"right": ["a11y", "keyboard", "quickSettings"]
}
}
gnome-initial-setup (43.2-1ubuntu1) lunar; urgency=medium
* Merge with Debian. Remaining changes:
+ debian/control.in:
- Build-Depends on libsnapd-glib-dev and libsysmetrics-dev
+ Add Ubuntu-specific patches:
- 0001-Make-summary-page-explicitly-request-navigation-butt.patch
- 0001-Ensure-stamp-file-if-the-user-quit-the-wizard.patch
- 0001-Add-Ubuntu-mode-with-special-pages.patch
- 0001-Display-the-ubuntu-welcome-wizard-in-Unity.patch
- 0006-goa-Add-Ubuntu-Single-Sign-On-to-the-list.patch
- 0007-goa-adjust-description-to-not-mention-email-or-conta.patch
- Don-t-show-Facebook-in-Ubuntu.patch
- 0008-Ubuntu-location-default.patch
-- Jeremy Bicha <jbicha@ubuntu.com> Tue, 06 Dec 2022 13:27:56 -0500
gnome-initial-setup (43.2-1) unstable; urgency=medium
* New upstream release
-- Jeremy Bicha <jbicha@ubuntu.com> Tue, 06 Dec 2022 09:27:10 -0500
gnome-initial-setup (43.1-2ubuntu1) lunar; urgency=medium
* Merge with Debian. Remaining changes:
......@@ -931,7 +954,7 @@ gnome-initial-setup (3.28.0-2ubuntu7) cosmic; urgency=medium
[ Andrea Azzarone ]
* Don't autostart if user quits the wizard before completing it
(LP: #1768929)
(LP: #1768929)
[ Jeremy Bicha ]
* Drop debian/ubuntu-changes.png to use the version included in
......@@ -991,7 +1014,7 @@ gnome-initial-setup (3.28.0-2ubuntu1) bionic; urgency=medium
* debian/ubuntu-changes.png:
- Show Ubuntu welcome pages (LP: #1755456)
* debian/control:
- Build-Depends on libsnapd-glib-dev, libsoupd2.4-dev,
- Build-Depends on libsnapd-glib-dev, libsoupd2.4-dev,
libsysmetrics-dev
- Enable langpack usage
......
......@@ -22,12 +22,12 @@ Subject: Add Ubuntu mode with special pages
.../pages/summary/gis-summary-page.c | 2 +-
.../pages/ubuntu-report/gis-ubuntu-report-page.c | 249 ++++++++
.../pages/ubuntu-report/gis-ubuntu-report-page.h | 52 ++
.../pages/ubuntu-report/gis-ubuntu-report-page.ui | 96 +++
.../pages/ubuntu-report/gis-ubuntu-report-page.ui | 97 +++
.../pages/ubuntu-report/meson.build | 10 +
.../ubuntu-report/ubuntu-report.gresource.xml | 8 +
.../pages/ubuntu-report/ubuntu-report.svg | 1 +
po/POTFILES.in | 5 +
24 files changed, 1391 insertions(+), 5 deletions(-)
24 files changed, 1392 insertions(+), 5 deletions(-)
create mode 100644 data/its/polkit.its
create mode 100644 data/its/polkit.loc
create mode 100644 gnome-initial-setup/pages/apps/apps.gresource.xml
......@@ -84,10 +84,10 @@ index ba8d78e..578ac13 100644
configure_file(
input: '20-gnome-initial-setup.rules.in',
diff --git a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c
index b24644b..57eb9dc 100644
index 0ff94af..53aa6b7 100644
--- a/gnome-initial-setup/gis-driver.c
+++ b/gnome-initial-setup/gis-driver.c
@@ -101,6 +101,9 @@ struct _GisDriver {
@@ -106,6 +106,9 @@ struct _GisDriver {
const gchar *vendor_conf_file_path;
GKeyFile *vendor_conf_file;
......@@ -97,7 +97,7 @@ index b24644b..57eb9dc 100644
};
G_DEFINE_TYPE (GisDriver, gis_driver, ADW_TYPE_APPLICATION)
@@ -933,6 +936,33 @@ gis_driver_save_data (GisDriver *driver,
@@ -938,6 +941,33 @@ gis_driver_save_data (GisDriver *driver,
return gis_assistant_save_data (driver->assistant, error);
}
......@@ -227,13 +227,13 @@ index 4d14fea..c98ad18 100644
break;
diff --git a/gnome-initial-setup/meson.build b/gnome-initial-setup/meson.build
index 3127803..77d03de 100644
index a3dd513..4eb365e 100644
--- a/gnome-initial-setup/meson.build
+++ b/gnome-initial-setup/meson.build
@@ -64,6 +64,9 @@ dependencies = [
@@ -63,6 +63,9 @@ dependencies = [
dependency ('libsecret-1', version: '>= 0.18.8'),
dependency ('pwquality'),
dependency ('rest-1.0'),
dependency ('webkit2gtk-5.0'),
+ dependency ('snapd-glib-2'),
+ dependency ('libsoup-3.0'),
+ dependency ('sysmetrics'),
......@@ -1178,10 +1178,10 @@ index 3230501..9654a7c 100644
if libmalcontent_dep.found() and libmalcontent_ui_dep.found()
diff --git a/gnome-initial-setup/pages/privacy/gis-privacy-page.c b/gnome-initial-setup/pages/privacy/gis-privacy-page.c
index 40cfd88..af674cd 100644
index 3632142..a64bd81 100644
--- a/gnome-initial-setup/pages/privacy/gis-privacy-page.c
+++ b/gnome-initial-setup/pages/privacy/gis-privacy-page.c
@@ -228,7 +228,7 @@ activate_link (GtkLabel *label,
@@ -232,7 +232,7 @@ activate_link (GtkLabel *label,
static void
gis_privacy_page_locale_changed (GisPage *page)
{
......@@ -1518,7 +1518,7 @@ index 0000000..9ba7500
+#endif /* __GIS_UBUNTU_REPORT_PAGE_H__ */
diff --git a/gnome-initial-setup/pages/ubuntu-report/gis-ubuntu-report-page.ui b/gnome-initial-setup/pages/ubuntu-report/gis-ubuntu-report-page.ui
new file mode 100644
index 0000000..fc77f8a
index 0000000..bec8f3f
--- /dev/null
+++ b/gnome-initial-setup/pages/ubuntu-report/gis-ubuntu-report-page.ui
@@ -0,0 +1,97 @@
......
......@@ -7,10 +7,10 @@ Subject: Ensure stamp file if the user quit the wizard
1 file changed, 12 insertions(+)
diff --git a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c
index 1fbf636..b24644b 100644
index 1ddf3c6..0ff94af 100644
--- a/gnome-initial-setup/gis-driver.c
+++ b/gnome-initial-setup/gis-driver.c
@@ -589,6 +589,17 @@ gis_driver_is_small_screen (GisDriver *driver)
@@ -594,6 +594,17 @@ gis_driver_is_small_screen (GisDriver *driver)
return driver->small_screen;
}
......@@ -28,7 +28,7 @@ index 1fbf636..b24644b 100644
static gboolean
monitor_is_small (GdkMonitor *monitor)
{
@@ -827,6 +838,7 @@ gis_driver_class_init (GisDriverClass *klass)
@@ -832,6 +843,7 @@ gis_driver_class_init (GisDriverClass *klass)
gobject_class->finalize = gis_driver_finalize;
application_class->startup = gis_driver_startup;
application_class->activate = gis_driver_activate;
......
......@@ -14,10 +14,10 @@ Subject: Ubuntu-location-default
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnome-initial-setup/pages/privacy/gis-privacy-page.c b/gnome-initial-setup/pages/privacy/gis-privacy-page.c
index af674cd..37a1856 100644
index a64bd81..9304762 100644
--- a/gnome-initial-setup/pages/privacy/gis-privacy-page.c
+++ b/gnome-initial-setup/pages/privacy/gis-privacy-page.c
@@ -117,7 +117,7 @@ gis_privacy_page_constructed (GObject *object)
@@ -121,7 +121,7 @@ gis_privacy_page_constructed (GObject *object)
priv->location_settings = g_settings_new ("org.gnome.system.location");
priv->privacy_settings = g_settings_new ("org.gnome.desktop.privacy");
......
......@@ -8,10 +8,10 @@ Forwarded: not-needed
1 file changed, 14 deletions(-)
diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c
index fd74bad..dba16e1 100644
index 113ded3..4d14fea 100644
--- a/gnome-initial-setup/gnome-initial-setup.c
+++ b/gnome-initial-setup/gnome-initial-setup.c
@@ -374,20 +374,6 @@ main (int argc, char *argv[])
@@ -323,20 +323,6 @@ main (int argc, char *argv[])
adw_style_manager_set_color_scheme (adw_style_manager_get_default (),
ADW_COLOR_SCHEME_PREFER_LIGHT);
......
......@@ -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"
......
......@@ -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(
......
......@@ -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));
}
......
......@@ -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>
......
project('gnome-initial-setup',
['c'],
version: '43.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('.')
......
......@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-initial-setup/"
"issues\n"
"POT-Creation-Date: 2022-08-26 20:46+0000\n"
"POT-Creation-Date: 2022-10-03 08:33+0000\n"
"Last-Translator: Нанба Наала <naala-nanba@rambler.ru>\n"
"Language-Team: Abkhazian <daniel.abzakh@gmail.com>\n"
"Language: ab\n"
......@@ -10,6 +10,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-DamnedLies-Scope: partial\n"
#: data/gnome-initial-setup-first-login.desktop.in.in:3
#: data/gnome-initial-setup.desktop.in.in:3
......@@ -26,7 +27,7 @@ msgstr ""
#: gnome-initial-setup/gis-assistant.c:405
msgid "_Skip"
msgstr ""
msgstr "_Абжьажьра"
#: gnome-initial-setup/gis-assistant.c:406
msgid "_Previous"
......@@ -48,19 +49,19 @@ msgstr ""
msgid "Take a Picture…"
msgstr ""
#: gnome-initial-setup/pages/account/gis-account-page-enterprise.c:182
#: gnome-initial-setup/pages/account/gis-account-page-enterprise.c:197
msgid "Failed to register account"
msgstr ""
#: gnome-initial-setup/pages/account/gis-account-page-enterprise.c:371
#: gnome-initial-setup/pages/account/gis-account-page-enterprise.c:386
msgid "No supported way to authenticate with this domain"
msgstr ""
#: gnome-initial-setup/pages/account/gis-account-page-enterprise.c:410
#: gnome-initial-setup/pages/account/gis-account-page-enterprise.c:425
msgid "Failed to join domain"
msgstr ""
#: gnome-initial-setup/pages/account/gis-account-page-enterprise.c:477
#: gnome-initial-setup/pages/account/gis-account-page-enterprise.c:492
msgid "Failed to log into domain"
msgstr ""
......@@ -76,7 +77,7 @@ msgid ""
msgstr ""
#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:27
#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:162
#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:153
msgid "_Domain"
msgstr "_Адомен"
......@@ -94,30 +95,30 @@ msgstr "_Ажәамаӡа"
msgid "Enterprise domain or realm name"
msgstr ""
#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:137
#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:126
msgid "Domain Administrator Login"
msgstr ""
#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:150
#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:141
msgid ""
"In order to use enterprise logins, this computer needs to be enrolled in a "
"domain. Please have your network administrator type the domain password "
"here, and choose a unique computer name for your computer."
msgstr ""
#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:188
#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:179
msgid "_Computer"
msgstr ""
#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:212
#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:203
msgid "Administrator _Name"
msgstr ""
#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:236
#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:227
msgid "Administrator Password"
msgstr ""
#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:268
#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:260
msgid "C_ontinue"
msgstr ""
......@@ -327,7 +328,7 @@ msgstr "Иҭелдоу аҳақәа ԥшааӡам"
#: gnome-initial-setup/pages/network/gis-network-page.ui:69
msgid "Turn On"
msgstr ""
msgstr "Аҿакра"
#. Translators: The placeholder is the user’s full name.
#: gnome-initial-setup/pages/parental-controls/gis-parental-controls-page.c:102
......@@ -889,260 +890,6 @@ msgstr ""
#, fuzzy
#, fuzzy
#, fuzzy
......@@ -1767,2801 +1514,6 @@ msgstr ""
#, fuzzy
#, fuzzy
#, fuzzy
#, fuzzy
#, fuzzy
#, fuzzy
#, fuzzy
#, fuzzy
#, fuzzy
#, fuzzy
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
[wrap-git]
url = https://gitlab.gnome.org/GNOME/libadwaita.git
revision = main
\ No newline at end of file
revision = libadwaita-1-2