Accepting request 43300 from home:dimstar:branches:GNOME:Factory
Copy from home:dimstar:branches:GNOME:Factory/libgnomekbd via accept of submit request 43300 revision 2. Request was accepted with message: thanks OBS-URL: https://build.opensuse.org/request/show/43300 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libgnomekbd?expand=0&rev=37
This commit is contained in:
Vincent Untz
Git OBS Bridge
parent
beb2cbad9b
commit
b6ae228ead
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:828faade8ef36f89cc27ca4f71e83630aa611ccb4745cb6687cdedddd461b293
|
||||
size 404828
|
||||
3
libgnomekbd-2.31.2.tar.bz2
Normal file
3
libgnomekbd-2.31.2.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:08636ff9f289e6dabe7994fadb03a550170a22182ba6a9586dc4e5710ee47e9d
|
||||
size 385882
|
||||
@ -1,45 +0,0 @@
|
||||
commit 4f9c7b401e948756fbe76a56a7619052f8acae42
|
||||
Author: Sergey V. Udaltsov <svu@gnome.org>
|
||||
Date: Wed May 5 00:36:04 2010 +0100
|
||||
|
||||
Do not crash on kbd plug in
|
||||
|
||||
There is funny race condition in X - when _XKB_RULES_NAMES is already
|
||||
loaded from sysconfig while actual XKB config is still not changed (from
|
||||
user config). This commit should fix
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=617643
|
||||
|
||||
diff --git a/libgnomekbd/gkbd-indicator.c b/libgnomekbd/gkbd-indicator.c
|
||||
index 5def369..f6064fa 100644
|
||||
--- a/libgnomekbd/gkbd-indicator.c
|
||||
+++ b/libgnomekbd/gkbd-indicator.c
|
||||
@@ -318,7 +318,7 @@ gkbd_indicator_extract_layout_name (int group, XklEngine * engine,
|
||||
gchar ** short_group_names,
|
||||
gchar ** full_group_names)
|
||||
{
|
||||
- char *layout_name;
|
||||
+ char *layout_name = NULL;
|
||||
if (group < g_strv_length (short_group_names)) {
|
||||
if (xkl_engine_get_features (engine) &
|
||||
XKLF_MULTIPLE_LAYOUTS_SUPPORTED) {
|
||||
@@ -352,7 +352,7 @@ gkbd_indicator_extract_layout_name (int group, XklEngine * engine,
|
||||
}
|
||||
|
||||
if (layout_name == NULL)
|
||||
- layout_name = g_strdup ("??");
|
||||
+ layout_name = g_strdup ("");
|
||||
|
||||
return layout_name;
|
||||
}
|
||||
diff --git a/libgnomekbd/gkbd-status.c b/libgnomekbd/gkbd-status.c
|
||||
index 90731af..efcad6a 100644
|
||||
--- a/libgnomekbd/gkbd-status.c
|
||||
+++ b/libgnomekbd/gkbd-status.c
|
||||
@@ -152,6 +152,7 @@ gkbd_status_render_cairo (cairo_t * cr, int group)
|
||||
cairo_font_options_t *fo;
|
||||
static GHashTable *ln2cnt_map = NULL;
|
||||
|
||||
+ xkl_debug (160, "Rendering cairo for group %d\n", group);
|
||||
if (globals.ind_cfg.background_color != NULL &&
|
||||
globals.ind_cfg.background_color[0] != 0) {
|
||||
if (sscanf
|
||||
@ -7,13 +7,13 @@ Date: Sun Apr 25 23:59:53 2010 +0100
|
||||
The name "keyboard" is known to the NA applet - so it positions the icon
|
||||
properly, on the right side, after all apps
|
||||
|
||||
diff --git a/libgnomekbd/gkbd-status.c b/libgnomekbd/gkbd-status.c
|
||||
index efcad6a..5e62ae9 100644
|
||||
--- a/libgnomekbd/gkbd-status.c
|
||||
+++ b/libgnomekbd/gkbd-status.c
|
||||
@@ -632,6 +632,9 @@ gkbd_status_init (GkbdStatus * gki)
|
||||
|
||||
gki->priv = g_new0 (GkbdStatusPrivate, 1);
|
||||
Index: libgnomekbd-2.31.2/libgnomekbd/gkbd-status.c
|
||||
===================================================================
|
||||
--- libgnomekbd-2.31.2.orig/libgnomekbd/gkbd-status.c
|
||||
+++ libgnomekbd-2.31.2/libgnomekbd/gkbd-status.c
|
||||
@@ -635,6 +635,9 @@ gkbd_status_init (GkbdStatus * gki)
|
||||
/* This should give NA a hint about the order */
|
||||
gtk_status_icon_set_name (GTK_STATUS_ICON(gki), "keyboard");
|
||||
|
||||
+ /* This should give NA a hint about the order */
|
||||
+ gtk_status_icon_set_name (GTK_STATUS_ICON(gki), "keyboard");
|
||||
|
||||
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 14 09:50:00 CEST 2010 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 2.31.2:
|
||||
+ Seriously improved status icon rendering
|
||||
+ Several crashers fixed
|
||||
+ Provided API for handling the default group switcher. Changed
|
||||
the default value to be "grp:shift_caps_toggle"
|
||||
+ Updated translations.
|
||||
- Drop upstream included patches libgnomekbd-fix-crash.patch and
|
||||
libgnomekbd-proper-notification-name.patch.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 17 14:07:08 CEST 2010 - vuntz@opensuse.org
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package libgnomekbd (Version 2.30.1)
|
||||
# spec file for package libgnomekbd (Version 2.31.2)
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -18,17 +18,13 @@
|
||||
|
||||
|
||||
Name: libgnomekbd
|
||||
Version: 2.30.1
|
||||
Release: 2
|
||||
Version: 2.31.2
|
||||
Release: 1
|
||||
License: LGPLv2.1+
|
||||
Summary: GNOME Keyboard Library
|
||||
Url: http://www.gnome.org/
|
||||
Group: System/GUI/GNOME
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
# PATCH-FIX-UPSTREAM libgnomekbd-fix-crash.patch bgo617643 vuntz@opensuse.org -- Fix a crash that can kill gnome-settings-daemon, taken from git
|
||||
Patch0: libgnomekbd-fix-crash.patch
|
||||
# PATCH-FIX-UPSTREAM libgnomekbd-proper-notification-name.patch vuntz@opensuse.org -- Make sure the notification icon is properly sorted
|
||||
Patch1: libgnomekbd-proper-notification-name.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gconf2-devel
|
||||
BuildRequires: gtk2-devel
|
||||
@ -60,8 +56,6 @@ GNOME keyboard library, utility and applet.
|
||||
%prep
|
||||
%setup -q
|
||||
translation-update-upstream
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
%configure --disable-static --with-pic
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user