aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2020-09-07 01:24:59 -0300
committerLeo <thinkabit.ukim@gmail.com>2020-09-07 01:25:06 -0300
commit80e8908f034a57a4ed5b581b694cd0a24025ba07 (patch)
tree21a4b870c9f45622af7348beb22c4683e37db368
parent3677993a739971f657fbf0945a59511e222ad59e (diff)
downloadaports-80e8908f034a57a4ed5b581b694cd0a24025ba07.tar.gz
aports-80e8908f034a57a4ed5b581b694cd0a24025ba07.tar.bz2
aports-80e8908f034a57a4ed5b581b694cd0a24025ba07.tar.xz
community/libwacom: upgrade to 1.5
-rw-r--r--community/libwacom/APKBUILD12
-rw-r--r--community/libwacom/disable-tests.patch12
2 files changed, 15 insertions, 9 deletions
diff --git a/community/libwacom/APKBUILD b/community/libwacom/APKBUILD
index 97929626c0..f4a620970b 100644
--- a/community/libwacom/APKBUILD
+++ b/community/libwacom/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Ivan Tham <pickfire@riseup.net>
# Maintainer: Ivan Tham <pickfire@riseup.net>
pkgname=libwacom
-pkgver=1.4.1
+pkgver=1.5
pkgrel=0
pkgdesc="Library to help implement Wacom tablet settings"
url="https://github.com/linuxwacom/libwacom/wiki"
@@ -16,16 +16,16 @@ source="https://github.com/linuxwacom/libwacom/releases/download/libwacom-$pkgve
build() {
abuild-meson . output
- ninja -C output
+ meson compile ${JOBS:+-j ${JOBS}} -C output
}
check() {
- ninja -C output test
+ meson test --no-rebuild -v -C output
}
package() {
- DESTDIR="$pkgdir" ninja -C output install
+ DESTDIR="$pkgdir" meson install --no-rebuild -C output
}
-sha512sums="bad8bbb8d3b98c1f9c3661ca60f72319e2f06acab5cb128a5b7a2e02da20f249d094a0b4b0ed4e5c67eb696973f23d8c9cd5f432a8e9d37df55c9f23de949fb9 libwacom-1.4.1.tar.bz2
-bf559a95331c3ad791b6c6d0ce935ae45dd8d252fe06c29a34ce94284808daf4f341f0f6570f7ee69a0e1c6a44f86f44b5cc06fd1cc1017a51a777d776ea222c disable-tests.patch"
+sha512sums="d3aa6ea1d574f753490818092b3128171f11a4af4716681d156b831cae5c70e96281033a523eb7d2e263acbd95ea9407948d1583191bdb121aff2886571c1cd0 libwacom-1.5.tar.bz2
+dd5a2b9b4a1e999a7b91da01d8a2f0127d98ccb50802f4286737007341dd16fe25a99db2484e592edecc6d0edeb93953030831ac15909dbfb9cbfd3063a02e40 disable-tests.patch"
diff --git a/community/libwacom/disable-tests.patch b/community/libwacom/disable-tests.patch
index fe1090c1d5..ac6afca382 100644
--- a/community/libwacom/disable-tests.patch
+++ b/community/libwacom/disable-tests.patch
@@ -1,8 +1,11 @@
+Upstream: Not Applicable
+Reason: Remove test that fails
+
diff --git a/meson.build b/meson.build
-index 7453256..4aa78e3 100644
+index 1482fa5..86c665b 100644
--- a/meson.build
+++ b/meson.build
-@@ -251,19 +251,6 @@ if get_option('tests').enabled()
+@@ -253,22 +253,6 @@ if get_option('tests').enabled()
else
message('valgrind not found, disabling valgrind test suite')
endif
@@ -17,7 +20,10 @@ index 7453256..4aa78e3 100644
- include_directories: [includes_src],
- c_args: tests_cflags,
- install: false)
-- test('test-deprecated', test_deprecated, suite: ['all'])
+- test('test-deprecated',
+- test_deprecated,
+- env:['LD_LIBRARY_PATH=@0@'.format(meson.build_root())],
+- suite: ['all'])
- endif
endif