Fix for our broken locales.

This commit is contained in:
ajacoutot 2014-09-21 13:03:56 +00:00
parent 7d39796319
commit a49c3f1c90
5 changed files with 63 additions and 14 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.10 2014/08/15 09:28:17 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.11 2014/09/21 13:03:56 ajacoutot Exp $
COMMENT= initial-setup firstboot-like tool
GNOME_PROJECT= gnome-initial-setup
GNOME_VERSION= 3.12.1
REVISION= 0
REVISION= 1
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
@ -12,18 +12,19 @@ PERMIT_PACKAGE_CDROM= Yes
WANTLIB += EGL GL ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender Xt accountsservice atk-1.0
WANTLIB += atk-bridge-2.0 atspi c cairo cairo-gobject crack dbus-1
WANTLIB += dbus-glib-1 enchant expat ffi fontconfig freetype gcrypt
WANTLIB += gdk-3 gdk_pixbuf-2.0 gdm geoclue gio-2.0 glib-2.0 gmodule-2.0
WANTLIB += gnome-desktop-3 goa-1.0 goa-backend-1.0 gobject-2.0
WANTLIB += gpg-error graphite2 gstapp-1.0 gstaudio-1.0 gstbase-1.0
WANTLIB += gstfft-1.0 gstpbutils-1.0 gstreamer-1.0 gsttag-1.0
WANTLIB += gstvideo-1.0 gthread-2.0 gtk-3 gweather-3 harfbuzz
WANTLIB += harfbuzz-icu ibus-1.0 icudata icui18n icuuc javascriptcoregtk-3.0
WANTLIB += jpeg json-glib-1.0 m orc-0.4 pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png polkit-gobject-1 pthread
WANTLIB += pthread-stubs pwquality rest-0.7 secret-1 soup-2.4
WANTLIB += soup-gnome-2.4 sqlite3 stdc++ telepathy-glib webkitgtk-3.0
WANTLIB += webp xcb xcb-render xcb-shm xml2 xslt z gbm
WANTLIB += dbus-glib-1 enchant expat ffi fontconfig freetype gbm
WANTLIB += gcrypt gdk-3 gdk_pixbuf-2.0 gdm geoclue gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gnome-desktop-3 goa-1.0 goa-backend-1.0
WANTLIB += gobject-2.0 gpg-error graphite2 gstapp-1.0 gstaudio-1.0
WANTLIB += gstbase-1.0 gstfft-1.0 gstpbutils-1.0 gstreamer-1.0
WANTLIB += gsttag-1.0 gstvideo-1.0 gthread-2.0 gtk-3 gweather-3
WANTLIB += harfbuzz harfbuzz-icu ibus-1.0 icudata icui18n icuuc
WANTLIB += javascriptcoregtk-3.0 jpeg json-glib-1.0 m orc-0.4
WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
WANTLIB += png polkit-gobject-1 pthread pthread-stubs pwquality
WANTLIB += rest-0.7 secret-1 soup-2.4 soup-gnome-2.4 sqlite3 stdc++
WANTLIB += telepathy-glib webkitgtk-3.0 webp xcb xcb-render xcb-shm
WANTLIB += xml2 xslt z
MODULES= devel/dconf \
devel/gettext \

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-gnome-initial-setup_pages_keyboard_cc-common-language_c,v 1.1 2014/09/21 13:03:56 ajacoutot Exp $
--- gnome-initial-setup/pages/keyboard/cc-common-language.c.orig Sun Sep 21 14:24:46 2014
+++ gnome-initial-setup/pages/keyboard/cc-common-language.c Sun Sep 21 14:24:55 2014
@@ -277,7 +277,7 @@ static void
insert_language (GHashTable *ht,
const char *lang)
{
- char *utf8_variant = g_strconcat (lang, ".utf8", NULL);
+ char *utf8_variant = g_strconcat (lang, ".UTF-8", NULL);
insert_language_internal (ht, lang);
insert_language_internal (ht, utf8_variant);
g_free (utf8_variant);

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-gnome-initial-setup_pages_language_cc-common-language_c,v 1.1 2014/09/21 13:03:56 ajacoutot Exp $
--- gnome-initial-setup/pages/language/cc-common-language.c.orig Sun Sep 21 14:25:16 2014
+++ gnome-initial-setup/pages/language/cc-common-language.c Sun Sep 21 14:25:24 2014
@@ -277,7 +277,7 @@ static void
insert_language (GHashTable *ht,
const char *lang)
{
- char *utf8_variant = g_strconcat (lang, ".utf8", NULL);
+ char *utf8_variant = g_strconcat (lang, ".UTF-8", NULL);
insert_language_internal (ht, lang);
insert_language_internal (ht, utf8_variant);
g_free (utf8_variant);

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-gnome-initial-setup_pages_language_cc-language-chooser_c,v 1.1 2014/09/21 13:03:56 ajacoutot Exp $
--- gnome-initial-setup/pages/language/cc-language-chooser.c.orig Sun Sep 21 14:25:29 2014
+++ gnome-initial-setup/pages/language/cc-language-chooser.c Sun Sep 21 14:25:59 2014
@@ -212,7 +212,7 @@ add_one_language (CcLanguageChooser *chooser,
GtkWidget *widget;
gchar *lang;
- if (!g_str_has_suffix (locale_id, "utf8")) {
+ if (!g_str_has_suffix (locale_id, "UTF-8")) {
return;
}

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-gnome-initial-setup_pages_region_cc-common-language_c,v 1.1 2014/09/21 13:03:56 ajacoutot Exp $
--- gnome-initial-setup/pages/region/cc-common-language.c.orig Sun Sep 21 14:25:02 2014
+++ gnome-initial-setup/pages/region/cc-common-language.c Sun Sep 21 14:25:10 2014
@@ -277,7 +277,7 @@ static void
insert_language (GHashTable *ht,
const char *lang)
{
- char *utf8_variant = g_strconcat (lang, ".utf8", NULL);
+ char *utf8_variant = g_strconcat (lang, ".UTF-8", NULL);
insert_language_internal (ht, lang);
insert_language_internal (ht, utf8_variant);
g_free (utf8_variant);