From 27b62d8d42d43e51a5113aa5acee5496a5c28fc054b654fb12c56da6fb109c47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Sat, 27 Aug 2022 10:02:56 +0000 Subject: [PATCH] Accepting request 999122 from GNOME:Next - 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 --- libgnomekbd-3.26.1.tar.xz | 3 --- libgnomekbd-3.28.0.tar.xz | 3 +++ ...mekbd-avoid-coredump-on-ibus-engines.patch | 9 +++---- libgnomekbd-set-default-indicator.patch | 9 +++---- libgnomekbd.changes | 24 ++++++++++++++++++- libgnomekbd.spec | 19 ++++++++------- libgnomekbd_avoid_implicit_definition.patch | 11 --------- 7 files changed, 46 insertions(+), 32 deletions(-) delete mode 100644 libgnomekbd-3.26.1.tar.xz create mode 100644 libgnomekbd-3.28.0.tar.xz delete mode 100644 libgnomekbd_avoid_implicit_definition.patch diff --git a/libgnomekbd-3.26.1.tar.xz b/libgnomekbd-3.26.1.tar.xz deleted file mode 100644 index bffb443..0000000 --- a/libgnomekbd-3.26.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f7ca02631576e9b88aee1b1bae37ac1488b80ee7975f20a97f29e761a7172679 -size 450636 diff --git a/libgnomekbd-3.28.0.tar.xz b/libgnomekbd-3.28.0.tar.xz new file mode 100644 index 0000000..55ef755 --- /dev/null +++ b/libgnomekbd-3.28.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3057a443e4c26f91fe352dcd1154a56cdd51f1cfd7cb6ace300c3cc128659c9 +size 155416 diff --git a/libgnomekbd-avoid-coredump-on-ibus-engines.patch b/libgnomekbd-avoid-coredump-on-ibus-engines.patch index a963c0a..9a8c622 100644 --- a/libgnomekbd-avoid-coredump-on-ibus-engines.patch +++ b/libgnomekbd-avoid-coredump-on-ibus-engines.patch @@ -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); diff --git a/libgnomekbd-set-default-indicator.patch b/libgnomekbd-set-default-indicator.patch index 3b73c54..84f7605 100644 --- a/libgnomekbd-set-default-indicator.patch +++ b/libgnomekbd-set-default-indicator.patch @@ -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) { diff --git a/libgnomekbd.changes b/libgnomekbd.changes index 7af4861..0c6f346 100644 --- a/libgnomekbd.changes +++ b/libgnomekbd.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Wed Aug 24 20:34:30 UTC 2022 - Bjørn Lie + +- Rebase patches with quilt. +- Use ldconfig_scriptlets macro for post(un) handling. + +------------------------------------------------------------------- +Fri Aug 19 08:56:58 UTC 2022 - Dominique Leuenberger + +- 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 @@ -18,7 +40,7 @@ Mon May 24 15:13:24 UTC 2021 - Cliff Zhao - 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 diff --git a/libgnomekbd.spec b/libgnomekbd.spec index 1af983d..4e3113d 100644 --- a/libgnomekbd.spec +++ b/libgnomekbd.spec @@ -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 diff --git a/libgnomekbd_avoid_implicit_definition.patch b/libgnomekbd_avoid_implicit_definition.patch deleted file mode 100644 index d0c0219..0000000 --- a/libgnomekbd_avoid_implicit_definition.patch +++ /dev/null @@ -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 -+#include - #include - #include -