caribou: switch to python3, split libcaribou
- caribou can run with python 3 just fine. - cinnamon doesn't need all files from caribou for On Screen Keyboard. Split them out to drop unnecessary python dependencies. - Fix broken stylesheet for antler-keyboard
This commit is contained in:
parent
ddb8762274
commit
548dc46261
5 changed files with 70 additions and 8 deletions
|
@ -3799,3 +3799,4 @@ libxmpp-vala.so.0 dino-0.1.0_1
|
||||||
libqlite.so.0 dino-0.1.0_1
|
libqlite.so.0 dino-0.1.0_1
|
||||||
libmpir.so.23 mpir-3.0.0_1
|
libmpir.so.23 mpir-3.0.0_1
|
||||||
libmpirxx.so.8 mpir-3.0.0_1
|
libmpirxx.so.8 mpir-3.0.0_1
|
||||||
|
libcaribou.so.0 libcaribou-0.4.21_3
|
||||||
|
|
21
srcpkgs/caribou/patches/autostart-set-nodisplay.patch
Normal file
21
srcpkgs/caribou/patches/autostart-set-nodisplay.patch
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
From 286582f90fbbc9b3baa6b055bba1141cc30e6e94 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jeremy Bicha <jbicha@ubuntu.com>
|
||||||
|
Date: Thu, 12 Oct 2017 18:14:35 -0400
|
||||||
|
Subject: autostart: Set NoDisplay=true
|
||||||
|
|
||||||
|
https://bugzilla.gnome.org/show_bug.cgi?id=788906
|
||||||
|
https://launchpad.net/bugs/1723266
|
||||||
|
---
|
||||||
|
data/caribou-autostart.desktop.in.in | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/data/caribou-autostart.desktop.in.in b/data/caribou-autostart.desktop.in.in
|
||||||
|
index 4bd1c03..bf73a94 100644
|
||||||
|
--- a/data/caribou-autostart.desktop.in.in
|
||||||
|
+++ b/data/caribou-autostart.desktop.in.in
|
||||||
|
@@ -5,4 +5,5 @@ Exec=@libexecdir@/caribou
|
||||||
|
AutostartCondition=GSettings org.gnome.desktop.a11y.applications screen-keyboard-enabled
|
||||||
|
X-GNOME-AutoRestart=true
|
||||||
|
#X-GNOME-Autostart-Phase=Initialization
|
||||||
|
+NoDisplay=true
|
||||||
|
OnlyShowIn=GNOME;Unity;
|
26
srcpkgs/caribou/patches/fix-font-property-in-style.css.patch
Normal file
26
srcpkgs/caribou/patches/fix-font-property-in-style.css.patch
Normal file
|
@ -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: 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,
|
|
@ -1,16 +1,16 @@
|
||||||
# Template file for 'caribou'
|
# Template file for 'caribou'
|
||||||
pkgname=caribou
|
pkgname=caribou
|
||||||
version=0.4.21
|
version=0.4.21
|
||||||
revision=2
|
revision=3
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
build_helper="gir"
|
build_helper="gir"
|
||||||
pycompile_module="$pkgname"
|
configure_args="--disable-schemas-compile --disable-static --disable-gtk2-module
|
||||||
configure_args="--disable-schemas-compile --disable-static --disable-gtk2-module"
|
PYTHON=/usr/bin/python3"
|
||||||
hostmakedepends="pkg-config intltool gnome-doc-utils python-gobject-devel"
|
hostmakedepends="pkg-config intltool gnome-doc-utils python3-gobject-devel"
|
||||||
makedepends="vala-devel libxklavier-devel libgee08-devel python-gobject-devel
|
makedepends="vala-devel libxklavier-devel libgee08-devel python3-gobject-devel
|
||||||
clutter-devel gtk+3-devel libXtst-devel gir-freedesktop"
|
clutter-devel gtk+3-devel libXtst-devel gir-freedesktop"
|
||||||
depends="python-gobject python-atspi python-dbus gir-freedesktop at-spi2-atk
|
depends="python3-gobject python3-atspi python3-dbus gir-freedesktop at-spi2-atk
|
||||||
desktop-file-utils"
|
desktop-file-utils libcaribou>=${version}_${revision}"
|
||||||
short_desc="Alternative to the Gnome On-screen Keyboard"
|
short_desc="Alternative to the Gnome On-screen Keyboard"
|
||||||
maintainer="Enno Boland <gottox@voidlinux.org>"
|
maintainer="Enno Boland <gottox@voidlinux.org>"
|
||||||
license="LGPL-2.1-only"
|
license="LGPL-2.1-only"
|
||||||
|
@ -18,11 +18,24 @@ homepage="https://wiki.gnome.org/Projects/Caribou"
|
||||||
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
|
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
|
||||||
checksum=9c43d9f4bd30f4fea7f780d4e8b14f7589107c52e9cb6bd202bd0d1c2064de55
|
checksum=9c43d9f4bd30f4fea7f780d4e8b14f7589107c52e9cb6bd202bd0d1c2064de55
|
||||||
lib32disabled=yes
|
lib32disabled=yes
|
||||||
|
patch_args=-Np1
|
||||||
|
|
||||||
|
libcaribou_package() {
|
||||||
|
lib32disabled=yes
|
||||||
|
short_desc+=" - library"
|
||||||
|
pkg_install() {
|
||||||
|
vmove "usr/lib/*.so.*"
|
||||||
|
vmove usr/share/caribou
|
||||||
|
vmove usr/lib/girepository-1.0
|
||||||
|
vmove "usr/lib/gtk*"
|
||||||
|
vmove "usr/lib/gnome-settings-daemon*"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
caribou-devel_package() {
|
caribou-devel_package() {
|
||||||
lib32disabled=yes
|
lib32disabled=yes
|
||||||
depends="libXtst-devel libgee08-devel libxklavier-devel gtk+3-devel
|
depends="libXtst-devel libgee08-devel libxklavier-devel gtk+3-devel
|
||||||
libxml2-devel ${sourcepkg}>=${version}_${revision}"
|
libxml2-devel libcaribou>=${version}_${revision}"
|
||||||
short_desc+=" - development files"
|
short_desc+=" - development files"
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
vmove usr/include
|
vmove usr/include
|
||||||
|
|
1
srcpkgs/libcaribou
Symbolic link
1
srcpkgs/libcaribou
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
caribou
|
Loading…
Reference in a new issue