aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2019-09-22 23:44:03 +0200
committerRasmus Thomsen <oss@cogitri.dev>2019-09-22 23:48:06 +0200
commit796baa5dd9a03bdb27ed78a61e2ee5cf64860df3 (patch)
tree4262e15557eaecacbb103ba0546df18088a244dd
parent51fdc6b25238622ecfb5c29d4a139bd1c4c0efeb (diff)
downloadaports-796baa5dd9a03bdb27ed78a61e2ee5cf64860df3.tar.gz
aports-796baa5dd9a03bdb27ed78a61e2ee5cf64860df3.tar.bz2
aports-796baa5dd9a03bdb27ed78a61e2ee5cf64860df3.tar.xz
community/caribou: fix in GNOME classic with upstream patch
* Adopt maintainership * Cleanup * Fix license
-rw-r--r--community/caribou/13df8b92ae89c796238e669ee6ef4447a42d6355.patch31
-rw-r--r--community/caribou/APKBUILD23
2 files changed, 42 insertions, 12 deletions
diff --git a/community/caribou/13df8b92ae89c796238e669ee6ef4447a42d6355.patch b/community/caribou/13df8b92ae89c796238e669ee6ef4447a42d6355.patch
new file mode 100644
index 0000000000..a5c3e27e82
--- /dev/null
+++ b/community/caribou/13df8b92ae89c796238e669ee6ef4447a42d6355.patch
@@ -0,0 +1,31 @@
+https://gitlab.gnome.org/GNOME/caribou/commit/13df8b92ae89c796238e669ee6ef4447a42d6355
+
+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,
+--
+2.22.0
+
diff --git a/community/caribou/APKBUILD b/community/caribou/APKBUILD
index 230cefc6bd..6c0ba1c0ec 100644
--- a/community/caribou/APKBUILD
+++ b/community/caribou/APKBUILD
@@ -1,21 +1,20 @@
-# Maintainer:
+# Contributor: Rasmus Thomsen <oss@cogitri.dev>
+# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=caribou
pkgver=0.4.21
-pkgrel=2
+pkgrel=3
pkgdesc="on screen keyboard implementation"
url="https://wiki.gnome.org/Projects/Caribou"
arch="all"
-license="LGPL"
-depends=""
-depends_dev="gtk+2.0-dev gtk+3.0-dev py-gobject3-dev clutter-dev libxklavier-dev libgee-dev libxml2-dev"
-makedepends="$depends_dev intltool itstool libxml2-utils libxslt py-gobject3"
-install=""
+license="LGPL-2.1-only"
+makedepends="gtk+2.0-dev gtk+3.0-dev clutter-dev libxklavier-dev libgee-dev
+ intltool itstool libxml2-dev libxslt py-gobject3-dev gobject-introspection-dev
+ py3-gobject3"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.gnome.org/sources/caribou/${pkgver%.*}/caribou-$pkgver.tar.xz"
-builddir="$srcdir/caribou-$pkgver"
+source="https://download.gnome.org/sources/caribou/${pkgver%.*}/caribou-$pkgver.tar.xz
+ 13df8b92ae89c796238e669ee6ef4447a42d6355.patch"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,8 +26,8 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="5fc0cf54a1cad50d41e659adbbb932b51d69d18951562f87497e99aaae17ac72b453b759dd7289ff8f68a79574dfce510b9de6bedc61408c14cb48b83eaf08da caribou-0.4.21.tar.xz"
+sha512sums="5fc0cf54a1cad50d41e659adbbb932b51d69d18951562f87497e99aaae17ac72b453b759dd7289ff8f68a79574dfce510b9de6bedc61408c14cb48b83eaf08da caribou-0.4.21.tar.xz
+5b8f975813b6804e6c90419d44171b745074bd0cb9b0ee969fbb2dc993796af67585358788fb145ff93e18dffa049da05292bcec09359f387b6353adbdb67e39 13df8b92ae89c796238e669ee6ef4447a42d6355.patch"