aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--community/feedbackd/APKBUILD12
-rw-r--r--community/feedbackd/fix-32bit-build.patch13
2 files changed, 5 insertions, 20 deletions
diff --git a/community/feedbackd/APKBUILD b/community/feedbackd/APKBUILD
index 1f72e8148a..1fe5dedcac 100644
--- a/community/feedbackd/APKBUILD
+++ b/community/feedbackd/APKBUILD
@@ -1,9 +1,8 @@
# Contributor: Rasmus Thomsen <oss@cogitri.dev>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=feedbackd
-pkgver=0_git20200225
+pkgver=0_git20200304
pkgrel=0
-_sha=524ed476a27504f524211d3387727811d105e0b5
pkgdesc="A daemon to provide haptic (and later more) feedback on events"
url="https://source.puri.sm/Librem5/feedbackd"
arch="all"
@@ -12,9 +11,8 @@ depends="dbus"
makedepends="meson glib-dev gsound-dev libgudev-dev json-glib-dev gtk-doc
vala gobject-introspection-dev"
subpackages="$pkgname-dev $pkgname-doc"
-source="https://source.puri.sm/Librem5/feedbackd/-/archive/$_sha.tar.gz
- fix-32bit-build.patch"
-builddir="$srcdir/$pkgname-$_sha"
+source="https://source.puri.sm/Librem5/feedbackd/-/archive/v0.0.0+${pkgver#0_}/feedbackd-v0.0.0+${pkgver#0_}.tar.gz"
+builddir="$srcdir/$pkgname-v0.0.0+${pkgver#0_}"
build() {
meson \
@@ -25,6 +23,7 @@ build() {
--buildtype=plain \
-Dgtk_doc=true \
. output
+ # https://source.puri.sm/Librem5/feedbackd/issues/14
ninja -C output data/lfb-gdbus.h
ninja -C output
}
@@ -37,5 +36,4 @@ package() {
DESTDIR="$pkgdir" ninja -C output install
}
-sha512sums="bdbed0395be54d1a21c38a4153b24f07c8beb08965f1d4a0b36fb45f6b5b874be974128505d85496ce892714c2b28adcb07ec24f47bcb0a4e9ba70581857f860 524ed476a27504f524211d3387727811d105e0b5.tar.gz
-49b40b6de46f46737401fc71c6b5697e951cde4c461e42234d646d8dc013450828212bc4ee4f23c8ad3c524f2fce9104836cae2a563ffca20b28197844103759 fix-32bit-build.patch"
+sha512sums="eb973b01acb20fe478e1697de7b6d8da2930542af41d909f3c4e62828b64e8700348adae8989669f14e51d6382c55f94fc960b87c2890862e6a2ab76304579f2 feedbackd-v0.0.0+git20200304.tar.gz"
diff --git a/community/feedbackd/fix-32bit-build.patch b/community/feedbackd/fix-32bit-build.patch
deleted file mode 100644
index beda91b1c2..0000000000
--- a/community/feedbackd/fix-32bit-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/fbd-feedback-profile.c b/src/fbd-feedback-profile.c
-index 21a53fa..6909ebb 100644
---- a/src/fbd-feedback-profile.c
-+++ b/src/fbd-feedback-profile.c
-@@ -95,7 +95,7 @@ feedback_get_type (JsonNode *feedback_node)
- g_ascii_toupper (type_name[strlen(FBD_FEEDBACK_CLS_PREFIX)]);
- gtype = g_type_from_name (type_name);
-
-- g_debug ("Feedback %s, type %lu", type_name, gtype);
-+ g_debug ("Feedback %s, type %" G_GSIZE_FORMAT, type_name, gtype);
- g_return_val_if_fail (gtype, FBD_TYPE_FEEDBACK_DUMMY);
- return gtype;
- }