diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-29 18:03:51 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-29 18:03:51 +0000 |
commit | d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 (patch) | |
tree | 1814dd2b5bbf2e7639fdafbeef48d228cfaf5e9b /app-accessibility/caribou | |
parent | abaa75b10f899ada8dd05b23cc03205064394bc6 (diff) |
gentoo resync : 29.01.2021
Diffstat (limited to 'app-accessibility/caribou')
7 files changed, 248 insertions, 7 deletions
diff --git a/app-accessibility/caribou/Manifest b/app-accessibility/caribou/Manifest index 12ea8d850830..81395c1151dc 100644 --- a/app-accessibility/caribou/Manifest +++ b/app-accessibility/caribou/Manifest @@ -1,3 +1,8 @@ +AUX caribou-fix-antler-style-css.patch 857 BLAKE2B e909c15b5907f80d24a719c9533cedf1edb5abac49d5e7b56ddadcd93a49ba6a23a27f99ca0a34983e4d4a62bef0ec2ff0c4200deb19241978acdb9562abe04f SHA512 d4129de776b424522e6df7f88858630fe130b805f705f41ad8e993fb57aa99c0b3a35f1cfb6d7d184540331aeb2f78abf05bd44257ae87f61bd0bb8ed40afbed +AUX caribou-fix-compilation-error.patch 890 BLAKE2B 5e86e73326ba924d8f73121a031b57beed1fafcf53f0f09793ce61e1d6251b5ab3bcf19f791085ef141f4417d6df6f9d04ad5d0506779991f1af40942d06ccc2 SHA512 99e199361a9c50c65eec98a887734df3cbf3bfee3da588f24a76088c335e5f7ef3d750f223524c305360a4155b4812e512895301fdaf2b820f8568b72ef7bcb7 +AUX caribou-fix-subkey-popmenu.patch 916 BLAKE2B 5f833fded2a5d1dedf613aecd1e473f80954a730174f9509e2a3c846b790f8abe861fb65ddf683bee87b0cd99b8d18c4c6eab6413f978a295190cc5d9a355c51 SHA512 8ce9b33c09e19a24e2e8366674437afa03743637d0d1854e8c5b4f73cbd69148b8c4d59d65212c509146fd051015d7a20f9d8ff92e9c835b4d805ca6c564b5c2 +AUX caribou-fix-xadapter-xkb-calls.patch 1840 BLAKE2B c752a1e7f9cee33ed8ecdb5c9d72267e11b3881c6c1e4e7576b070088ecbe7893c9d5ef1dce8483b062ef31083441072a3b88309db523832a8b06e2254e65a82 SHA512 122b1004e601f3c669d8f8d33d4fd167d662086f54e0376f4cc6147e470b07a1345af99581313facb286c4392a2ae17b39565d36cca32fd5eeb7a44a49807999 DIST caribou-0.4.21.tar.xz 426516 BLAKE2B bd5e27bbbdb08fc31edce3b65124177e30b6d51e0071601bcd84c325b5794ce936b3f782ac8639dca332c246e329773f462dcecc0f236f52aeb0dcc7c5607a24 SHA512 5fc0cf54a1cad50d41e659adbbb932b51d69d18951562f87497e99aaae17ac72b453b759dd7289ff8f68a79574dfce510b9de6bedc61408c14cb48b83eaf08da EBUILD caribou-0.4.21-r1.ebuild 2405 BLAKE2B 68724aee9ce59e22b4f352f4353bfc9e8e19f1e1caa15afabf51fcc26e1b8359223d6ed732d661a3839513a027a3d64af349cf9a388039035de56cc6b6ac0ee5 SHA512 7998924380de3cc98ffead892849ae4142d04133c5605e3ad2f931bb8239f7b7528516faa2e1a547ed357a8221392327ed5cec8ef1c7c4f97d648ed67db7e069 -MISC metadata.xml 682 BLAKE2B 4ff796697db62d8c6a21ff62794c5fef391691685cece76ee7b8c38178f775a145b9a457df9bf959ab6af03559ceb4d9ad97a2ab835d63b70e58b4894f71fa5d SHA512 bec00e1cbb64bfec610e3f4e724e8afb8539a4b676b1e443a17b7eaf2263bef1fbf5787d77de253d84ebb0a54b3ca4bd386ba421826c0bb903164bb7ecf5223d +EBUILD caribou-0.4.21-r2.ebuild 2583 BLAKE2B 56f339f5e1a9e752b461342a473a3f63f3892765c32bc25b1f7583d9b0ceb3227ece60eba1cbe5cd5b1b4bfa0e5c99f4596fb2da48507769a592d4c8dcd4cf73 SHA512 6a5250db11c0a9ee2b0cabcf4038f8a7fa316b46aee7c09d6a88bf70324f107f455cc4677d4aad272cb00b4f9a9034fdddc070355f9f01fc6a5849040d87b440 +MISC metadata.xml 809 BLAKE2B c09e4f2616b808ebd600f0d9cd6251c08eff8e2c6b03251469e20c75f8aabb0d0d1058951ad14c48aa6e9072e9e61ce95dad8e6da8ea1a9eadbad775c8864390 SHA512 70a858f1ce80ad2dde3f688ef00803be1716bcd2d0e9900e497e1691d3eadbb414756a4c64966be6697cf9b76c9c5298732bb0ab5e2b9ea4309bc8a8726eef04 diff --git a/app-accessibility/caribou/caribou-0.4.21-r2.ebuild b/app-accessibility/caribou/caribou-0.4.21-r2.ebuild new file mode 100644 index 000000000000..cf8891751973 --- /dev/null +++ b/app-accessibility/caribou/caribou-0.4.21-r2.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +GNOME2_LA_PUNT="yes" + +PYTHON_COMPAT=( python3_{6..9} ) + +PYTHON_REQ_USE="xml" + +inherit gnome2 python-r1 vala + +DESCRIPTION="Input assistive technology intended for switch and pointer users" +HOMEPAGE="https://wiki.gnome.org/Projects/Caribou" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +COMMON_DEPEND=" + app-accessibility/at-spi2-core + >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] + >=x11-libs/gtk+-3:3[introspection] + x11-libs/gtk+:2 + >=dev-libs/gobject-introspection-0.10.7:= + dev-libs/libgee:0.8 + dev-libs/libxml2 + >=media-libs/clutter-1.5.11:1.0[introspection] + x11-libs/libX11 + x11-libs/libxklavier + x11-libs/libXtst + ${PYTHON_DEPS} + $(vala_depend) +" +# gsettings-desktop-schemas is needed for the 'toolkit-accessibility' key +# pyatspi-2.1.90 needed to run caribou if pygobject:3 is installed +# librsvg needed to load svg images in css styles +RDEPEND="${COMMON_DEPEND} + dev-libs/glib[dbus] + >=dev-python/pyatspi-2.1.90[${PYTHON_USEDEP}] + >=gnome-base/gsettings-desktop-schemas-3 + gnome-base/librsvg:2 + sys-apps/dbus + !<x11-base/xorg-server-1.20.10 +" +DEPEND="${COMMON_DEPEND} + dev-libs/libxslt + >=dev-util/intltool-0.35.5 + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/${PN}-fix-compilation-error.patch" + "${FILESDIR}/${PN}-fix-subkey-popmenu.patch" + "${FILESDIR}/${PN}-fix-xadapter-xkb-calls.patch" + "${FILESDIR}/${PN}-fix-antler-style-css.patch" +) + +src_prepare() { + # FIXME: Now this supports python3 too... + # delete custom PYTHONPATH, useless on Gentoo and potential bug source + # + caribou is python2 only so fix the shell scripts +# sed -e '/export PYTHONPATH=.*python/ d' \ +# -e "s:@PYTHON@:${EPREFIX}/usr/bin/python2:" \ +# -i bin/{antler-keyboard,caribou-preferences}.in || +# die "sed failed" + + vala_src_prepare + gnome2_src_prepare + + prepare_caribou() { + mkdir -p "${BUILD_DIR}" || die + } + python_foreach_impl prepare_caribou +} + +src_configure() { + ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir \ + gnome2_src_configure \ + --disable-docs \ + --disable-static \ + --enable-gtk3-module \ + --enable-gtk2-module +} + +src_compile() { + python_foreach_impl run_in_build_dir gnome2_src_compile +} + +src_test() { + python_foreach_impl run_in_build_dir default +} + +src_install() { + python_foreach_impl run_in_build_dir gnome2_src_install + + # https://bugzilla.gnome.org/show_bug.cgi?id=769323 + dodoc AUTHORS NEWS README # ChangeLog simply points to git log +} diff --git a/app-accessibility/caribou/files/caribou-fix-antler-style-css.patch b/app-accessibility/caribou/files/caribou-fix-antler-style-css.patch new file mode 100644 index 000000000000..4c4486bb7889 --- /dev/null +++ b/app-accessibility/caribou/files/caribou-fix-antler-style-css.patch @@ -0,0 +1,26 @@ +From 13df8b92ae89c796238e669ee6ef4447a42d6355 Mon Sep 17 00:00:00 2001 +From: Jeremy Bicha <jbicha@ubuntu.com> +Date: Fri, 1 Dec 2017 12:11:35 -0500 +Subject: [PATCH] style.css: Fix failure to start in GNOME Flashback + +The order for 'font' properties matters +https://developer.gnome.org/gtk3/stable/chap-css-properties.html + +https://bugzilla.gnome.org/show_bug.cgi?id=791001 +--- + data/antler/style.css | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/antler/style.css b/data/antler/style.css +index 5ab6f71..4d84904 100644 +--- a/data/antler/style.css ++++ b/data/antler/style.css +@@ -13,7 +13,7 @@ + border-width: 0px; + border-radius: 2px; + border-image: url("dark-key-border.svg") 2 2 2 2 repeat stretch; +- font: Sans 14px; ++ font: 14px Sans; + background-image: -gtk-gradient (linear, + left top, + left bottom, diff --git a/app-accessibility/caribou/files/caribou-fix-compilation-error.patch b/app-accessibility/caribou/files/caribou-fix-compilation-error.patch new file mode 100644 index 000000000000..d427cd35a111 --- /dev/null +++ b/app-accessibility/caribou/files/caribou-fix-compilation-error.patch @@ -0,0 +1,25 @@ +From bc6f3e7ca0921b50a3ff836d08ce264a4f114224 Mon Sep 17 00:00:00 2001 +From: Clement Lefebvre <clement.lefebvre@linuxmint.com> +Date: Tue, 12 Jan 2021 17:29:16 +0000 +Subject: [PATCH 1/4] Fix compilation error + +--- + libcaribou/key-model.vala | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libcaribou/key-model.vala b/libcaribou/key-model.vala +index 89015bc..e88342e 100644 +--- a/libcaribou/key-model.vala ++++ b/libcaribou/key-model.vala +@@ -101,7 +101,7 @@ namespace Caribou { + unichar uc; + while (text.get_next_char (ref index, out uc)) { + uint keyval = Gdk.unicode_to_keyval (uc); +- if (keyval != uc | 0x01000000) ++ if (keyval != (uc | 0x01000000)) + _keyvals += keyval; + } + } else { +-- +2.29.2 + diff --git a/app-accessibility/caribou/files/caribou-fix-subkey-popmenu.patch b/app-accessibility/caribou/files/caribou-fix-subkey-popmenu.patch new file mode 100644 index 000000000000..ffd4423c2986 --- /dev/null +++ b/app-accessibility/caribou/files/caribou-fix-subkey-popmenu.patch @@ -0,0 +1,32 @@ +From 85ac8f9e210243d95163cf8b1013470a6d9c7eaa Mon Sep 17 00:00:00 2001 +From: Clement Lefebvre <clement.lefebvre@linuxmint.com> +Date: Tue, 12 Jan 2021 17:30:25 +0000 +Subject: [PATCH 2/4] Fix subkey popmenu not showing after being dismissed + +To reproduce the issue: + +- long-press the "e" button +- don't select any sub button.. just select "e" again to close the menu + +After this the menu no long appears when long-pressing "e". + +This commit fixes that. +--- + libcaribou/key-model.vala | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libcaribou/key-model.vala b/libcaribou/key-model.vala +index e88342e..2f640f2 100644 +--- a/libcaribou/key-model.vala ++++ b/libcaribou/key-model.vala +@@ -179,6 +179,7 @@ namespace Caribou { + hold_tid = GLib.Timeout.add (1000, on_key_held); + + key_pressed(this); ++ show_subkeys = false; + } + + public void release () { +-- +2.29.2 + diff --git a/app-accessibility/caribou/files/caribou-fix-xadapter-xkb-calls.patch b/app-accessibility/caribou/files/caribou-fix-xadapter-xkb-calls.patch new file mode 100644 index 000000000000..bcb2a19c3d07 --- /dev/null +++ b/app-accessibility/caribou/files/caribou-fix-xadapter-xkb-calls.patch @@ -0,0 +1,46 @@ +From 00653c5dcc4be5e983b670d00d5724fc21da2e82 Mon Sep 17 00:00:00 2001 +From: Clement Lefebvre <clement.lefebvre@linuxmint.com> +Date: Tue, 12 Jan 2021 18:01:47 +0000 +Subject: [PATCH 3/4] [mtwebster] xadapter.vala: Remove XkbKeyTypesMask and + fields from XKbChangeMap call. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This was originally a workaround for xFree86 4.3 - see: +https://bugzilla.gnome.org/show_bug.cgi?id=673547 + +As of https://gitlab.freedesktop.org/xorg/xserver/-/commit/87c64fc5b0 this +causes a BadLength error when attempting to use shifted characters. + +Ref: +https://www.x.org/releases/X11R7.7/doc/libX11/XKB/xkblib.html#Changing_Map_Components_in_the_Server +--- + libcaribou/xadapter.vala | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +diff --git a/libcaribou/xadapter.vala b/libcaribou/xadapter.vala +index 22858b7..1da5a78 100644 +--- a/libcaribou/xadapter.vala ++++ b/libcaribou/xadapter.vala +@@ -195,15 +195,10 @@ namespace Caribou { + + Xkb.MapChanges changes = Xkb.MapChanges (); + +- // We don't touch key types here but include the +- // information in XkbSetMap request to the server, because +- // some X servers need the information to check the sanity +- // of the keysyms change. +- changes.changed = (ushort) (Xkb.KeySymsMask | Xkb.KeyTypesMask); ++ changes.changed = (ushort) Xkb.KeySymsMask; + changes.first_key_sym = (char) this.reserved_keycode; + changes.num_key_syms = this.xkbdesc.map.key_sym_map[this.reserved_keycode].width; +- changes.first_type = 0; +- changes.num_types = this.xkbdesc.map.num_types; ++ + Xkb.change_map (this.xdisplay, this.xkbdesc, changes); + + this.xdisplay.flush (); +-- +2.29.2 + diff --git a/app-accessibility/caribou/metadata.xml b/app-accessibility/caribou/metadata.xml index 3a82b0ba211a..5f5d428f0a7f 100644 --- a/app-accessibility/caribou/metadata.xml +++ b/app-accessibility/caribou/metadata.xml @@ -1,15 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -<longdescription lang="en"> + <maintainer type="person"> + <email>sparky@bluefang-logic.com</email> + <name>Matthew Turnbull</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription lang="en"> Caribou is a text entry and UI navigation application being developed as an alternative to the Gnome On-screen Keyboard. The overarching goal for Caribou is to create a usable solution for people whose primary way of accessing a computer is a switch device. The initial goal is to make an in-place on-screen keyboard suitable for people who can use a mouse but not a hardware keyboard. -</longdescription> + </longdescription> </pkgmetadata> |