diff options
Diffstat (limited to 'gnome-base/gnome-desktop/files')
| -rw-r--r-- | gnome-base/gnome-desktop/files/3.32.2-fix-tests-without-locale.patch | 82 | ||||
| -rw-r--r-- | gnome-base/gnome-desktop/files/3.32.2-optional-introspection.patch | 48 |
2 files changed, 130 insertions, 0 deletions
diff --git a/gnome-base/gnome-desktop/files/3.32.2-fix-tests-without-locale.patch b/gnome-base/gnome-desktop/files/3.32.2-fix-tests-without-locale.patch new file mode 100644 index 000000000000..bd4df1ca1a91 --- /dev/null +++ b/gnome-base/gnome-desktop/files/3.32.2-fix-tests-without-locale.patch @@ -0,0 +1,82 @@ +From 9ae847ec875efe443d51d584fa6c61966c7c3c7c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org> +Date: Wed, 4 Sep 2019 22:09:26 +0100 +Subject: [PATCH] tests/wall*: Do not fail if some of the locales is missing + +--- + tests/wall-clock.c | 14 ++++++++++++++ + tests/wallclock-reftest.c | 5 +++++ + 2 files changed, 19 insertions(+) + +diff --git a/tests/wall-clock.c b/tests/wall-clock.c +index 4937ee66..23929ebd 100644 +--- a/tests/wall-clock.c ++++ b/tests/wall-clock.c +@@ -48,6 +48,7 @@ test_utf8_character (const char *utf8_char, + /* In the C locale, make sure the time string is formatted with regular + * colons */ + locale = newlocale (LC_ALL_MASK, "C", (locale_t) 0); ++ g_assert_true (locale != (locale_t)0); + save_locale = uselocale (locale); + clock = gnome_wall_clock_new (); + str = gnome_wall_clock_string_for_datetime (clock, +@@ -60,6 +61,10 @@ test_utf8_character (const char *utf8_char, + + /* In a UTF8 locale, we want ratio characters and no colons. */ + locale = newlocale (LC_ALL_MASK, "en_US.utf8", locale); ++ if (locale == (locale_t)0) { ++ g_test_skip("en_US.utf8 locale not found, skipping"); ++ return; ++ } + uselocale (locale); + clock = gnome_wall_clock_new (); + str = gnome_wall_clock_string_for_datetime (clock, +@@ -73,6 +78,10 @@ test_utf8_character (const char *utf8_char, + /* ... and same thing with an RTL locale: should be formatted with + * ratio characters */ + locale = newlocale (LC_ALL_MASK, "he_IL.utf8", locale); ++ if (locale == (locale_t)0) { ++ g_test_skip("he_IL.utf8 locale not found, skipping"); ++ return; ++ } + uselocale (locale); + clock = gnome_wall_clock_new (); + str = gnome_wall_clock_string_for_datetime (clock, +@@ -112,6 +121,10 @@ test_clock_format_setting (void) + const char *str; + + locale = newlocale (LC_ALL_MASK, "en_US.utf8", (locale_t) 0); ++ if (locale == (locale_t)0) { ++ g_test_skip("en_US.utf8 locale not found, skipping"); ++ return; ++ } + save_locale = uselocale (locale); + + settings = g_settings_new ("org.gnome.desktop.interface"); +@@ -192,6 +205,7 @@ test_weekday_setting (void) + + /* Save current locale */ + locale = newlocale (LC_ALL_MASK, "C", (locale_t) 0); ++ g_assert_true (locale != (locale_t)0); + save_locale = uselocale (locale); + settings = g_settings_new ("org.gnome.desktop.interface"); + +diff --git a/tests/wallclock-reftest.c b/tests/wallclock-reftest.c +index 8ac630f2..0a7e812d 100644 +--- a/tests/wallclock-reftest.c ++++ b/tests/wallclock-reftest.c +@@ -446,6 +446,11 @@ test_ui_file (GFile *file, + locale = get_locale_for_file (ui_file); + g_assert (locale); + loc = newlocale (LC_ALL_MASK, locale, (locale_t) 0); ++ if (loc == (locale_t)0) ++ { ++ g_test_skip("locale not found, skipping"); ++ return; ++ } + previous_locale = uselocale (loc); + g_assert_true (previous_locale != (locale_t) 0); + +-- +2.20.1 + diff --git a/gnome-base/gnome-desktop/files/3.32.2-optional-introspection.patch b/gnome-base/gnome-desktop/files/3.32.2-optional-introspection.patch new file mode 100644 index 000000000000..7471a3e6a2dc --- /dev/null +++ b/gnome-base/gnome-desktop/files/3.32.2-optional-introspection.patch @@ -0,0 +1,48 @@ +From 1b8fb6b0fd155975f64b5e2ef03bece96a5e3340 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Wed, 18 Sep 2019 22:28:21 +0300 +Subject: [PATCH] build: Add optionality for introspection + +--- + libgnome-desktop/meson.build | 2 ++ + meson_options.txt | 4 ++++ + 2 files changed, 6 insertions(+) + +diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build +index c365b448..a7355f31 100644 +--- a/libgnome-desktop/meson.build ++++ b/libgnome-desktop/meson.build +@@ -96,6 +96,7 @@ libgnome_desktop_dep = declare_dependency( + link_with: libgnome_desktop + ) + ++if get_option('introspection') + gnome.generate_gir(libgnome_desktop, + sources: introspection_sources + libgnome_desktop_headers, + export_packages: 'gnome-desktop-3.0', +@@ -107,6 +108,7 @@ gnome.generate_gir(libgnome_desktop, + symbol_prefix: 'gnome', + install: true + ) ++endif + + desktop_pc = pkg.generate( + libraries: libgnome_desktop, +diff --git a/meson_options.txt b/meson_options.txt +index e3402a11..7efe43ce 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -17,6 +17,10 @@ option('debug_tools', + type: 'boolean', value: true, description: 'Build debug tools' + ) + ++option('introspection', ++ type: 'boolean', value: true, description: 'Whether to build introspection files' ++) ++ + option('udev', + type: 'feature', description: 'Udev support' + ) +-- +2.20.1 + |