diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-01-12 16:58:08 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-01-12 16:58:08 +0000 |
| commit | c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (patch) | |
| tree | 9ea78393bc3ecd6ab4de449383d4e97e5f3648ae /gnome-base/libgnomekbd | |
| parent | 2891d29af8907ce881662f4a02844926d7a293c7 (diff) | |
gentoo resync : 12.01.2019
Diffstat (limited to 'gnome-base/libgnomekbd')
| -rw-r--r-- | gnome-base/libgnomekbd/Manifest | 3 | ||||
| -rw-r--r-- | gnome-base/libgnomekbd/files/3.26.0-glib-2.60-compat.patch | 35 | ||||
| -rw-r--r-- | gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild | 6 |
3 files changed, 42 insertions, 2 deletions
diff --git a/gnome-base/libgnomekbd/Manifest b/gnome-base/libgnomekbd/Manifest index ba49f20fb16a..1a127b4991cf 100644 --- a/gnome-base/libgnomekbd/Manifest +++ b/gnome-base/libgnomekbd/Manifest @@ -1,3 +1,4 @@ +AUX 3.26.0-glib-2.60-compat.patch 1154 BLAKE2B a513831c02906d83f93c6864d18dc176e9453ea417d22423e3823e2f2b692fa472bd5492fe6403dbbbb8e87f7010a555ba29090614b6cad2b9bd1090e72ddeda SHA512 54ba7e58820eadcfcb9e3568be09ac389274a1088d7113548c6abc534136261fa30455e701f047a547ee310234cc4fcc26c6051902f0988ea4c09c69b4b8ccd7 DIST libgnomekbd-3.26.0.tar.xz 449204 BLAKE2B 360f6da6ea7ad2850ecba062e0825cadcbc62ab9fdd432ad1fd4f38d32230e9eb6da1b7eb50116302b39be76565da7554df2c96e3a348e5130c428158bfa7792 SHA512 dc3ee91468e570d038bc91c4458ddb49dc097639c671815eecc4308efea85e29c1121cfd959e62f970a2e8112f818296802be804e99b96ee89fd5de8136645d9 -EBUILD libgnomekbd-3.26.0.ebuild 787 BLAKE2B 367e2a745e6a8127738df87127a08b9cadf19ddcacf691ebff875d3c1f7ae9fbaa0583158abfc94649d516aaca567350a7094672825b945f5395ab0f293ecd23 SHA512 90b8bd48ecd21b71f88adff154383601cf6a14fdcfafee9a35bcc1e785f733c81b456db6951051be4a07688ef66585642d0df2a3e39e8a25c2aacc2d90f7f0c8 +EBUILD libgnomekbd-3.26.0.ebuild 844 BLAKE2B b3da8f610a5c4f5c554abc10f6f3342fdee60f4b88ee09e20867f70af501bb9792bee031109f3eedfc9cd5d2e9360185526407147bfc407a2d46e52d39009032 SHA512 09e7286cfa12e556f595f3f118a69325fdc9900bede6bc6f68165f5b40bfbd8c317c3369ec47911cce4e5ebb808758de5b1c44d6bd01c345ba9dcbb1911a1edc MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-base/libgnomekbd/files/3.26.0-glib-2.60-compat.patch b/gnome-base/libgnomekbd/files/3.26.0-glib-2.60-compat.patch new file mode 100644 index 000000000000..c6bcf66160f9 --- /dev/null +++ b/gnome-base/libgnomekbd/files/3.26.0-glib-2.60-compat.patch @@ -0,0 +1,35 @@ +From 7e0b6f0a96477c5d12434231ea413d3a16658ed0 Mon Sep 17 00:00:00 2001 +From: Abderrahim Kitouni <akitouni@gnome.org> +Date: Tue, 18 Dec 2018 10:54:06 +0100 +Subject: [PATCH] rename g_strv_equal to gkbd_strv_equal + +it conflicts with the newly added g_strv_equal in glib +--- + libgnomekbd/gkbd-keyboard-config.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libgnomekbd/gkbd-keyboard-config.c b/libgnomekbd/gkbd-keyboard-config.c +index bbe6904..00dc429 100644 +--- a/libgnomekbd/gkbd-keyboard-config.c ++++ b/libgnomekbd/gkbd-keyboard-config.c +@@ -52,7 +52,7 @@ const gchar *GKBD_KEYBOARD_CONFIG_ACTIVE[] = { + */ + + static gboolean +-g_strv_equal (gchar ** l1, gchar ** l2) ++gkbd_strv_equal (gchar ** l1, gchar ** l2) + { + if (l1 == l2) + return TRUE; +@@ -555,7 +555,7 @@ gkbd_keyboard_config_equals (GkbdKeyboardConfig * kbd_config1, + (kbd_config2->model != NULL) && + g_ascii_strcasecmp (kbd_config1->model, kbd_config2->model)) + return False; +- if (!g_strv_equal (kbd_config1->layouts_variants, ++ if (!gkbd_strv_equal (kbd_config1->layouts_variants, + kbd_config2->layouts_variants)) + return False; + +-- +2.17.0 + diff --git a/gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild b/gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild index 9bc10e4ce687..d07c943fef68 100644 --- a/gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild +++ b/gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -26,6 +26,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${PV}-glib-2.60-compat.patch +) + src_configure() { gnome2_src_configure \ --disable-static \ |