From 6a50424f2ef11ebbe9caa31fdf345e405fd27baf Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Mon, 3 Oct 2011 13:49:32 +0000 Subject: [PATCH] Align the example dates in the display panel, from upstream. --- x11/gnome/controlcenter/Makefile | 4 +-- ...panels_region_gnome-region-panel-formats_c | 26 +++++++++++++++---- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/x11/gnome/controlcenter/Makefile b/x11/gnome/controlcenter/Makefile index 465df807ed0..30b376f3878 100644 --- a/x11/gnome/controlcenter/Makefile +++ b/x11/gnome/controlcenter/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.41 2011/10/03 12:11:30 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.42 2011/10/03 13:49:32 ajacoutot Exp $ # XXX Binary files patch-panels_info_hostnames-test_txt and # patch-panels_info_hostnames-test_txt.new differ @@ -10,7 +10,7 @@ COMMENT= GNOME control center GNOME_PROJECT= gnome-control-center GNOME_VERSION= 3.2.0 -REVISION= 2 +REVISION= 3 SHARED_LIBS += gnome-control-center 0.0 # 1.0 diff --git a/x11/gnome/controlcenter/patches/patch-panels_region_gnome-region-panel-formats_c b/x11/gnome/controlcenter/patches/patch-panels_region_gnome-region-panel-formats_c index 6629b8f8f62..d021a08a9af 100644 --- a/x11/gnome/controlcenter/patches/patch-panels_region_gnome-region-panel-formats_c +++ b/x11/gnome/controlcenter/patches/patch-panels_region_gnome-region-panel-formats_c @@ -1,10 +1,26 @@ -$OpenBSD: patch-panels_region_gnome-region-panel-formats_c,v 1.3 2011/10/03 13:21:29 ajacoutot Exp $ +$OpenBSD: patch-panels_region_gnome-region-panel-formats_c,v 1.4 2011/10/03 13:49:32 ajacoutot Exp $ -https://bugzilla.gnome.org/show_bug.cgi?id=660787 +From 8a0c2e1b27171968974c51ee449b5d6119eb271a Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Mon, 03 Oct 2011 13:32:23 +0000 +Subject: region: Align the example dates + +From 7b8b773cf33c638af3ccd3ec365c5f84487afa88 Mon Sep 17 00:00:00 2001 +From: Antoine Jacoutot +Date: Mon, 03 Oct 2011 13:15:15 +0000 +Subject: region: Fix build on systems without LC_MEASUREMENT --- panels/region/gnome-region-panel-formats.c.orig Tue Aug 23 10:23:42 2011 -+++ panels/region/gnome-region-panel-formats.c Sun Oct 2 15:13:45 2011 -@@ -132,6 +132,7 @@ update_examples_cb (GtkTreeSelection *selection, gpoin ++++ panels/region/gnome-region-panel-formats.c Mon Oct 3 15:36:20 2011 +@@ -38,6 +38,7 @@ display_date (GtkLabel *label, GDateTime *dt, const gc + gchar *s; + + s = g_date_time_format (dt, format); ++ s = g_strstrip (s); + gtk_label_set_text (label, s); + g_free (s); + } +@@ -132,6 +133,7 @@ update_examples_cb (GtkTreeSelection *selection, gpoin g_free (locale); /* Display measurement */ @@ -12,7 +28,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=660787 locale = g_strdup (setlocale (LC_MEASUREMENT, NULL)); setlocale (LC_MEASUREMENT, active_id); -@@ -143,6 +144,7 @@ update_examples_cb (GtkTreeSelection *selection, gpoin +@@ -143,6 +145,7 @@ update_examples_cb (GtkTreeSelection *selection, gpoin setlocale (LC_MEASUREMENT, locale); g_free (locale);