Hello community,
here is the log from the commit of package libslab for openSUSE:11.4
checked in at Mon Jun 6 21:52:17 CEST 2011.
--------
--- old-versions/11.4/all/libslab/libslab.changes 2010-09-08
01:19:04.000000000 +0200
+++ 11.4/libslab/libslab.changes 2011-06-03 01:17:26.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Jun 2 23:17:24 UTC 2011 - ss...@decriptor.com
+
+- Fixes yast2 segfault in certain locales bnc#650196
+
+-------------------------------------------------------------------
Package does not exist at destination yet. Using Fallback
old-versions/11.4/all/libslab
Destination is old-versions/11.4/UPDATES/all/libslab
calling whatdependson for 11.4-i586
New:
----
libslab-bnc650196-fix-i18n.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libslab.spec ++++++
--- /var/tmp/diff_new_pack.ScohAz/_old 2011-06-06 21:51:17.000000000 +0200
+++ /var/tmp/diff_new_pack.ScohAz/_new 2011-06-06 21:51:17.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package libslab (Version 2.30.0)
+# spec file for package libslab
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
Name: libslab
Version: 2.30.0
-Release: 5
+Release: 12.<RELEASE2>
License: GPLv2+
Summary: Library to create tile-based UI for GNOME
Group: Development/Libraries/GNOME
@@ -28,6 +28,8 @@
Patch1: libslab-bnc536778-fix-libslab-split.patch
# PATCH-FIX-UPSTREAM libslab-document-icon-missing.patch bnc#538917
dli...@novell.com -- Fix display of icons in document tab of the main menu.
Note that the image_is_broken variable is actually useless (we just set it to
be consistent)
Patch2: libslab-document-icon-missing.patch
+# PATCH-FIX-UPSTREAM libslab-bnc650196-fix-i18n.patch bnc#650196 bgo411586
ss...@decriptor.com -- Fixes issues where environment isn't set to UTF-8
+Patch3: libslab-bnc650196-fix-i18n.patch
BuildRequires: intltool
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(glib-2.0)
@@ -80,8 +82,10 @@
%setup -q
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
+autoreconf -f -i
%configure --disable-static
%__make %{?jobs:-j%jobs}
++++++ libslab-bnc650196-fix-i18n.patch ++++++
>From 18ad171493d0f8f53388e7c9acf482aef743abf5 Mon Sep 17 00:00:00 2001
From: Stephen Shaw <ss...@decriptor.com>
Date: Thu, 2 Jun 2011 12:22:50 -0600
Subject: [PATCH] Fixes bgo411586 and bnc650196
---
libslab/Makefile.am | 1 +
libslab/app-shell.c | 15 +++++++++++++++
libslab/app-shell.h | 2 ++
3 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/libslab/Makefile.am b/libslab/Makefile.am
index 3506016..1eca8b6 100644
--- a/libslab/Makefile.am
+++ b/libslab/Makefile.am
@@ -1,5 +1,6 @@
INCLUDES = \
-I$(top_srcdir) \
+ -DLOCALE_DIR=\""$(localedir)"\" \
$(LIBSLAB_CFLAGS) \
$(WARN_CFLAGS)
diff --git a/libslab/app-shell.c b/libslab/app-shell.c
index a7a91ef..e0fa67e 100644
--- a/libslab/app-shell.c
+++ b/libslab/app-shell.c
@@ -847,6 +847,8 @@ AppShellData *
appshelldata_new (const gchar * menu_name, NewAppConfig * new_apps, const
gchar * gconf_keys_prefix,
GtkIconSize icon_size, gboolean show_tile_generic_name, gboolean
exit_on_close)
{
+ initialize_i18n ();
+
AppShellData *app_data = g_new0 (AppShellData, 1);
app_data->gconf_prefix = gconf_keys_prefix;
app_data->new_apps = new_apps;
@@ -1413,3 +1415,16 @@ handle_menu_action_performed (Tile * launcher, TileEvent
* event, TileAction * a
else
g_warning ("Unknown Action");
}
+
+void
+initialize_i18n (void)
+{
+ static gboolean initialized = FALSE;
+
+ if (!initialized)
+ {
+ bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ initialized = TRUE;
+ }
+}
diff --git a/libslab/app-shell.h b/libslab/app-shell.h
index 0be9a8b..7608206 100644
--- a/libslab/app-shell.h
+++ b/libslab/app-shell.h
@@ -137,5 +137,7 @@ void hide_shell (AppShellData * app_data);
void show_shell (AppShellData * app_data);
+void initialize_i18n (void);
+
G_END_DECLS
#endif /* __APP_SHELL_H__ */
--
1.7.5.3
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
