cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some part of this patch is not needed anymore.

Browse Source
This commit is contained in:
ajacoutot 2013-08-28 09:45:12 +00:00
parent 9a23ced5f7
commit 417c7a7a03
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/gnome/desktop/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.108 2013/08/28 09:33:30 stsp Exp $
# $OpenBSD: Makefile,v 1.109 2013/08/28 09:45:12 ajacoutot Exp $
SHARED_ONLY= Yes
@ -8,7 +8,7 @@ GNOME_PROJECT= gnome-desktop
# sync with meta/gnome "V" variable
GNOME_VERSION= 3.8.3
REVISION= 2
REVISION= 3
SHARED_LIBS += gnome-desktop-3 2.0 # 4.0

30
x11/gnome/desktop/patches/patch-libgnome-desktop_gnome-languages_c
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-libgnome-desktop_gnome-languages_c,v 1.2 2013/08/28 09:33:30 stsp Exp $
$OpenBSD: patch-libgnome-desktop_gnome-languages_c,v 1.3 2013/08/28 09:45:12 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=698383
--- libgnome-desktop/gnome-languages.c.orig Sun Mar 17 02:49:53 2013
+++ libgnome-desktop/gnome-languages.c Tue Aug 27 23:51:10 2013
+++ libgnome-desktop/gnome-languages.c Wed Aug 28 10:48:56 2013
@@ -310,11 +310,7 @@ language_name_is_valid (const char *language_name)
{
char *old_locale;
@ -16,20 +16,20 @@ https://bugzilla.gnome.org/show_bug.cgi?id=698383
old_locale = g_strdup (setlocale (lc_type_id, NULL));
is_valid = setlocale (lc_type_id, language_name) != NULL;
@@ -445,7 +441,6 @@ add_locale (const char *language_name,
@@ -445,22 +441,11 @@ add_locale (const char *language_name,
g_free (name);
name = NULL;
-#ifdef WITH_INCOMPLETE_LOCALES
if (utf8_only) {
if (locale->territory_code == NULL || locale->modifier) {
g_debug ("Ignoring '%s' as a locale, since it lacks territory code or modifier", name);
@@ -453,14 +448,12 @@ add_locale (const char *language_name,
return FALSE;
}
}
- if (utf8_only) {
- if (locale->territory_code == NULL || locale->modifier) {
- g_debug ("Ignoring '%s' as a locale, since it lacks territory code or modifier", name);
- gnome_locale_free (locale);
- return FALSE;
- }
- }
-#endif
-
locale->id = construct_language_name (locale->language_code, locale->territory_code,
NULL, locale->modifier);
locale->name = construct_language_name (locale->language_code, locale->territory_code,
@ -39,7 +39,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=698383
if (!gnome_language_has_translations (locale->name) &&
!gnome_language_has_translations (locale->id) &&
!gnome_language_has_translations (locale->language_code) &&
@@ -469,7 +462,6 @@ add_locale (const char *language_name,
@@ -469,7 +454,6 @@ add_locale (const char *language_name,
gnome_locale_free (locale);
return FALSE;
}
@ -47,7 +47,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=698383
if (!utf8_only) {
g_free (locale->id);
@@ -631,6 +623,40 @@ collect_locales_from_directory (void)
@@ -631,6 +615,40 @@ collect_locales_from_directory (void)
return found_locales;
}
@ -88,7 +88,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=698383
static void
count_languages_and_territories (void)
{
@@ -669,6 +695,7 @@ collect_locales (void)
@@ -669,6 +687,7 @@ collect_locales (void)
{
gboolean found_archive_locales = FALSE;
gboolean found_dir_locales = FALSE;
@ -96,7 +96,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=698383
GError *error = NULL;
if (gnome_available_locales_map == NULL) {
@@ -683,12 +710,12 @@ collect_locales (void)
@@ -683,12 +702,12 @@ collect_locales (void)
found_dir_locales = collect_locales_from_directory ();