diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-04 10:03:29 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-04 10:03:29 +0100 |
| commit | 188c20297098b706ee2687fe404b0c63eb2600d9 (patch) | |
| tree | 069c4fab3fe7423afdcc360ffeba09900c66a00c /extra/caribou | |
| parent | f104a5865e580d1a5c50f83b6bfac2885f065c92 (diff) | |
| parent | 2030e810a5cfd4d3ff6e0f8930560c96f2990eb2 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ccrypt/PKGBUILD
community/mathomatic/PKGBUILD
community/tuxpaint/PKGBUILD
extra/aisleriot/PKGBUILD
extra/dhcp/PKGBUILD
extra/gnome-applets/PKGBUILD
extra/gnome-shell/PKGBUILD
extra/xdg-user-dirs-gtk/PKGBUILD
Diffstat (limited to 'extra/caribou')
| -rw-r--r-- | extra/caribou/PKGBUILD | 11 | ||||
| -rw-r--r-- | extra/caribou/fix-crash.patch | 25 |
2 files changed, 32 insertions, 4 deletions
diff --git a/extra/caribou/PKGBUILD b/extra/caribou/PKGBUILD index a00df2c22..9379c84a6 100644 --- a/extra/caribou/PKGBUILD +++ b/extra/caribou/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166581 2012-09-12 17:27:00Z jgc $ +# $Id: PKGBUILD 170129 2012-11-03 12:27:12Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Adam Hani Schakaki <krzd@krzd.net> pkgname=caribou pkgver=0.4.4 -pkgrel=1 +pkgrel=2 pkgdesc="A text entry and UI navigation application being developed as an alternative to the Gnome On-screen Keyboard." arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/Caribou" @@ -13,11 +13,14 @@ depends=('at-spi2-atk' 'pyatspi' 'dbus-python' 'python2-gobject' 'gtk3' 'libxkla makedepends=('intltool' 'docbook-xsl') install=caribou.install options=(!libtool !emptydirs) -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz) -sha256sums=('823c53afec88d43f06ddce63e0d1aac79d783f498502a0617d8be0cffc6a7de2') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz + fix-crash.patch) +sha256sums=('823c53afec88d43f06ddce63e0d1aac79d783f498502a0617d8be0cffc6a7de2' + '813229104fcb15ae5d3c197362fa7474a4963eb31d241d4f5354f7000d03f9e1') build() { cd $pkgname-$pkgver + patch -Np1 -i ../fix-crash.patch sed -i s'|#!/usr/bin/python|#!/usr/bin/python2|'g tools/{fix_gir,make_schema}.py export PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ diff --git a/extra/caribou/fix-crash.patch b/extra/caribou/fix-crash.patch new file mode 100644 index 000000000..98e5baab9 --- /dev/null +++ b/extra/caribou/fix-crash.patch @@ -0,0 +1,25 @@ +From a8fb1d8fba1e9557a3370edd62501f0a866c6774 Mon Sep 17 00:00:00 2001 +From: Daiki Ueno <ueno@unixuser.org> +Date: Fri, 02 Nov 2012 06:19:47 +0000 +Subject: Fix border-image slice values in antler's gtk CSS + +According to CSS spec, border-image slice values are not denoted +with length units. + +https://bugzilla.gnome.org/show_bug.cgi?id=687409 +--- +diff --git a/data/antler/style.css b/data/antler/style.css +index 0e830dc..7553cf6 100644 +--- a/data/antler/style.css ++++ b/data/antler/style.css +@@ -12,7 +12,7 @@ + .antler-keyboard-button { + border-width: 0px; + border-radius: 2px; +- border-image: url("dark-key-border.svg") 2px 2px 2px 2px repeat stretch; ++ border-image: url("dark-key-border.svg") 2 2 2 2 repeat stretch; + font: Sans 14px; + background-image: -gtk-gradient (linear, + left top, +-- +cgit v0.9.0.2 |