pool/libgnomekbd
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 999122 from GNOME:Next

Browse Source 
- Rebase patches with quilt.
- Use ldconfig_scriptlets macro for post(un) handling.

- Update to version 3.28.0:
  + Require GLib 2.44
  + Modernize the codebase
  + Avoid several crashes
  + Fix RTL issues
  + Add meson build system
  + Updated translations.
- Add libtool BuildRequires and call autgen.sh in build phase: the
  tarball was geneated using meson and does not contain configure.
  It is not possible (yet) to use meson as build system though, as
  the installation turns out to be incomplete.
- Drop libgnomekbd_avoid_implicit_definition.patch: Fixed upstream.

  (bnc#1034390).

OBS-URL: https://build.opensuse.org/request/show/999122
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libgnomekbd?expand=0&rev=89
This commit is contained in:
Bjørn Lie 2022-08-27 10:02:56 +00:00 committed by Git OBS Bridge
parent 6e5bd2efb9
commit 27b62d8d42
7 changed files with 46 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libgnomekbd-3.26.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f7ca02631576e9b88aee1b1bae37ac1488b80ee7975f20a97f29e761a7172679
size 450636

3
libgnomekbd-3.28.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b3057a443e4c26f91fe352dcd1154a56cdd51f1cfd7cb6ace300c3cc128659c9
size 155416

9
libgnomekbd-avoid-coredump-on-ibus-engines.patch
View File

@ -1,7 +1,8 @@
diff -Nura libgnomekbd-3.26.1/libgnomekbd/gkbd-keyboard-display.c libgnomekbd-3.26.1_new/libgnomekbd/gkbd-keyboard-display.c
--- libgnomekbd-3.26.1/libgnomekbd/gkbd-keyboard-display.c 2019-02-07 06:18:56.000000000 +0800
+++ libgnomekbd-3.26.1_new/libgnomekbd/gkbd-keyboard-display.c 2021-04-02 19:56:19.587280314 +0800
@@ -81,7 +81,7 @@
Index: libgnomekbd-3.28.0/libgnomekbd/gkbd-keyboard-display.c
===================================================================
--- libgnomekbd-3.28.0.orig/libgnomekbd/gkbd-keyboard-display.c
+++ libgnomekbd-3.28.0/libgnomekbd/gkbd-keyboard-display.c
@@ -82,7 +82,7 @@ main (int argc, char **argv)
dlg = gkbd_keyboard_drawing_dialog_new ();
registry = xkl_config_registry_get_instance (engine);
xkl_config_registry_load (registry, TRUE);

9
libgnomekbd-set-default-indicator.patch
View File

@ -1,7 +1,8 @@
diff -Nura libgnomekbd-3.26.1/libgnomekbd/gkbd-keyboard-drawing.c libgnomekbd-3.26.1_new/libgnomekbd/gkbd-keyboard-drawing.c
--- libgnomekbd-3.26.1/libgnomekbd/gkbd-keyboard-drawing.c 2021-06-03 11:27:52.595837755 +0800
+++ libgnomekbd-3.26.1_new/libgnomekbd/gkbd-keyboard-drawing.c 2021-06-03 11:29:45.775631415 +0800
@@ -2748,7 +2748,7 @@
Index: libgnomekbd-3.28.0/libgnomekbd/gkbd-keyboard-drawing.c
===================================================================
--- libgnomekbd-3.28.0.orig/libgnomekbd/gkbd-keyboard-drawing.c
+++ libgnomekbd-3.28.0/libgnomekbd/gkbd-keyboard-drawing.c
@@ -2734,7 +2734,7 @@ gkbd_keyboard_drawing_dialog_set_layout
XklConfigRegistry * registry,
const gchar * full_layout)
{

24
libgnomekbd.changes
View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Wed Aug 24 20:34:30 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Rebase patches with quilt.
- Use ldconfig_scriptlets macro for post(un) handling.
-------------------------------------------------------------------
Fri Aug 19 08:56:58 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 3.28.0:
+ Require GLib 2.44
+ Modernize the codebase
+ Avoid several crashes
+ Fix RTL issues
+ Add meson build system
+ Updated translations.
- Add libtool BuildRequires and call autgen.sh in build phase: the
tarball was geneated using meson and does not contain configure.
It is not possible (yet) to use meson as build system though, as
the installation turns out to be incomplete.
- Drop libgnomekbd_avoid_implicit_definition.patch: Fixed upstream.
-------------------------------------------------------------------
Thu Sep 16 01:58:47 UTC 2021 - Stanislav Brabec <sbrabec@suse.com>
@ -18,7 +40,7 @@ Mon May 24 15:13:24 UTC 2021 - Cliff Zhao <qzhao@suse.com>
- Add libgnomekbd-set-default-indicator.patch: set the common
keyboard layout indicator as "default" to avoid misleading
(bnc#1034390).
(bnc#1034390).
-------------------------------------------------------------------
Fri Apr 2 12:03:02 UTC 2021 - Cliff Zhao <qzhao@suse.com>

19
libgnomekbd.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package libgnomekbd
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,24 +18,25 @@
%define sover 8
Name: libgnomekbd
Version: 3.26.1
Version: 3.28.0
Release: 0
Summary: GNOME Keyboard Library
License: LGPL-2.1-or-later
Group: System/GUI/GNOME
URL: https://gitlab.gnome.org/GNOME/libgnomekbd
Source0: https://download.gnome.org/sources/libgnomekbd/3.26/%{name}-%{version}.tar.xz
Source0: https://download.gnome.org/sources/libgnomekbd/3.28/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM libgnomekbd-avoid-coredump-on-ibus-engines.patch bnc#1160963, glgo#GNOME/libgnomekbd!6 qzhao@suse.com -- To avoid crash when working with ibus.
Patch0: libgnomekbd-avoid-coredump-on-ibus-engines.patch
# PATCH-FIX-OPENSUSE libgnomekbd-set-default-indicator.patch bnc#1034390 qzhao@suse.com -- set the common keyboard layout indicator as default to avoid misleading.
Patch1: libgnomekbd-set-default-indicator.patch
# PATCH-FIX-UPSTREAM libgnomekbd_avoid_implicit_definition.patch bnc#1160963 bnc#1034390 glgo#GNOME/libgnomekbd!7 qzhao@suse.com -- To avoid inplicit definition warning in building.
Patch2: libgnomekbd_avoid_implicit_definition.patch
BuildRequires: desktop-file-utils
BuildRequires: fdupes
BuildRequires: intltool
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(glib-2.0) >= 2.44
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(libxklavier) >= 5.2
@ -94,10 +95,11 @@ applications that want to make use of libgnomekbd.
%autosetup -p1
%build
NOCONFIGURE=1 ./autogen.sh
%configure \
--disable-static \
%{nil}
%make_build V=1
%make_build
%install
%make_install
@ -106,8 +108,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
%find_lang %{name} %{?no_lang_C}
%fdupes %{buildroot}/%{_prefix}
%post -n libgnomekbd%{sover} -p /sbin/ldconfig
%postun -n libgnomekbd%{sover} -p /sbin/ldconfig
%ldconfig_scriptlets -n libgnomekbd%{sover}
%files -n gnomekbd-tools
%{_bindir}/gkbd-keyboard-display

11
libgnomekbd_avoid_implicit_definition.patch
View File

@ -1,11 +0,0 @@
diff -Nura libgnomekbd-3.26.1/libgnomekbd/gkbd-keyboard-display.c libgnomekbd-3.26.1_new/libgnomekbd/gkbd-keyboard-display.c
--- libgnomekbd-3.26.1/libgnomekbd/gkbd-keyboard-display.c 2021-06-04 01:33:53.695366014 +0800
+++ libgnomekbd-3.26.1_new/libgnomekbd/gkbd-keyboard-display.c 2021-06-04 01:35:00.459249300 +0800
@@ -18,6 +18,7 @@
*/
#include <stdlib.h>
+#include <string.h>
#include <libintl.h>
#include <config.h>