libmatekbd: fix build w/ glib-2.60.0
Also move usr/share/gir-1.0 to -devel subpackage. Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
This commit is contained in:
parent
55c88f93c4
commit
37e7f19d2b
40
srcpkgs/libmatekbd/patches/glib-2.60.patch
Normal file
40
srcpkgs/libmatekbd/patches/glib-2.60.patch
Normal file
@ -0,0 +1,40 @@
|
||||
This function is now defined in glib-2.60
|
||||
|
||||
--- libmatekbd/matekbd-keyboard-config.c 2018-06-13 10:50:49.000000000 +0200
|
||||
+++ libmatekbd/matekbd-keyboard-config.c 2019-04-11 15:47:04.968640566 +0200
|
||||
@@ -48,35 +48,6 @@
|
||||
MATEKBD_KEYBOARD_CONFIG_KEY_OPTIONS
|
||||
};
|
||||
|
||||
-/*
|
||||
- * static common functions
|
||||
- */
|
||||
-
|
||||
-static gboolean
|
||||
-g_strv_equal (gchar ** l1, gchar ** l2)
|
||||
-{
|
||||
- if (l1 == l2)
|
||||
- return TRUE;
|
||||
- if (l1 == NULL)
|
||||
- return g_strv_length (l2) == 0;
|
||||
- if (l2 == NULL)
|
||||
- return g_strv_length (l1) == 0;
|
||||
-
|
||||
- while ((*l1 != NULL) && (*l2 != NULL)) {
|
||||
- if (*l1 != *l2) {
|
||||
- if (*l1 && *l2) {
|
||||
- if (g_ascii_strcasecmp (*l1, *l2))
|
||||
- return FALSE;
|
||||
- } else
|
||||
- return FALSE;
|
||||
- }
|
||||
-
|
||||
- l1++;
|
||||
- l2++;
|
||||
- }
|
||||
- return (*l1 == NULL) && (*l2 == NULL);
|
||||
-}
|
||||
-
|
||||
gboolean
|
||||
matekbd_keyboard_config_get_lv_descriptions (XklConfigRegistry *
|
||||
config_registry,
|
@ -1,7 +1,7 @@
|
||||
# Template file for 'libmatekbd'
|
||||
pkgname=libmatekbd
|
||||
version=1.20.2
|
||||
revision=1
|
||||
revision=2
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-static $(vopt_enable gir introspection)"
|
||||
hostmakedepends="mate-common pkg-config intltool itstool glib-devel gobject-introspection"
|
||||
@ -30,5 +30,6 @@ libmatekbd-devel_package() {
|
||||
vmove usr/include
|
||||
vmove "usr/lib/*.so"
|
||||
vmove usr/lib/pkgconfig
|
||||
vmove usr/share/gir-1.0
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user