From a069190172cf3c4fafbcf5e078e7acc10ddcd1db Mon Sep 17 00:00:00 2001 From: jasper Date: Sat, 27 May 2017 15:51:36 +0000 Subject: [PATCH] sync with what's been submitted upstream and add BZ urls --- .../patches/patch-src_gr-recipe-formatter_c | 15 +++++---------- .../recipes/patches/patch-src_gr-recipe-store_c | 10 ++-------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/x11/gnome/recipes/patches/patch-src_gr-recipe-formatter_c b/x11/gnome/recipes/patches/patch-src_gr-recipe-formatter_c index 01715543448..2994f0ddef7 100644 --- a/x11/gnome/recipes/patches/patch-src_gr-recipe-formatter_c +++ b/x11/gnome/recipes/patches/patch-src_gr-recipe-formatter_c @@ -1,28 +1,23 @@ -$OpenBSD: patch-src_gr-recipe-formatter_c,v 1.1 2017/05/27 15:08:43 jasper Exp $ +$OpenBSD: patch-src_gr-recipe-formatter_c,v 1.2 2017/05/27 15:51:36 jasper Exp $ No _NL_MEASUREMENT_MEASUREMENT? Then you'll get metric units! +https://bugzilla.gnome.org/show_bug.cgi?id=783153 Index: src/gr-recipe-formatter.c --- src/gr-recipe-formatter.c.orig +++ src/gr-recipe-formatter.c -@@ -48,15 +48,18 @@ get_temperature_unit (void) +@@ -48,12 +48,14 @@ get_temperature_unit (void) GSettings *settings = gr_settings_get (); unit = g_settings_get_enum (settings, "temperature-unit"); if (unit == GR_TEMPERATURE_UNIT_LOCALE) { +#ifdef _NL_MEASUREMENT_MEASUREMENT const gchar *fmt; -- + fmt = nl_langinfo (_NL_MEASUREMENT_MEASUREMENT); if (fmt && *fmt == 2) unit = GR_TEMPERATURE_UNIT_FAHRENHEIT; else - unit = GR_TEMPERATURE_UNIT_CELSIUS; -+#else -+ unit = GR_TEMPERATURE_UNIT_CELSIUS; +#endif + unit = GR_TEMPERATURE_UNIT_CELSIUS; } -- -+ - return unit; - } diff --git a/x11/gnome/recipes/patches/patch-src_gr-recipe-store_c b/x11/gnome/recipes/patches/patch-src_gr-recipe-store_c index b7c2754f832..a5cec1fc7a3 100644 --- a/x11/gnome/recipes/patches/patch-src_gr-recipe-store_c +++ b/x11/gnome/recipes/patches/patch-src_gr-recipe-store_c @@ -1,13 +1,7 @@ -$OpenBSD: patch-src_gr-recipe-store_c,v 1.1 2017/05/27 15:08:43 jasper Exp $ +$OpenBSD: patch-src_gr-recipe-store_c,v 1.2 2017/05/27 15:51:36 jasper Exp $ tar: unknown option -- - -usage: tar {crtux}[014578befHhjLmNOoPpqsvwXZz] - [blocking-factor | archive | replstr] [-C directory] [-I file] - [file ...] - tar {-crtux} [-014578eHhjLmNOoPpqvwXZz] [-b blocking-factor] - [-C directory] [-f archive] [-I file] [-s replstr] [file ...] -zsh: segmentation fault (core dumped) gnome-recipes - +https://bugzilla.gnome.org/show_bug.cgi?id=783154 Index: src/gr-recipe-store.c --- src/gr-recipe-store.c.orig