aboutsummaryrefslogtreecommitdiffstats
path: root/community
diff options
context:
space:
mode:
authorKevin Daudt <kdaudt@alpinelinux.org>2019-03-19 22:21:07 +0000
committerKevin Daudt <kdaudt@alpinelinux.org>2019-03-19 22:58:07 +0000
commit4c697af5553c698bf71421c9c5f00071e8d188c0 (patch)
tree1cf645a4e95a2e1a0a1e2a9a948dac41015a7b84 /community
parent4acb00d9aa1e3154a1245d299edef798cc34a1dc (diff)
downloadaports-4c697af5553c698bf71421c9c5f00071e8d188c0.tar.bz2
aports-4c697af5553c698bf71421c9c5f00071e8d188c0.tar.xz
community/colord: update to 1.4.4
Diffstat (limited to 'community')
-rw-r--r--community/colord/APKBUILD22
-rw-r--r--community/colord/disable-udev-hwdb-tests.patch22
2 files changed, 38 insertions, 6 deletions
diff --git a/community/colord/APKBUILD b/community/colord/APKBUILD
index bc4f252f1b..5794aa6985 100644
--- a/community/colord/APKBUILD
+++ b/community/colord/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
pkgname=colord
-pkgver=1.4.3
+pkgver=1.4.4
pkgrel=0
pkgdesc="System daemon for managing color devices"
url="http://www.freedesktop.org/software/colord"
@@ -9,16 +9,15 @@ arch="all"
license="GPL-2.0"
pkgusers="colord"
pkggroups="colord"
-depends=""
depends_dev="dconf-dev dbus-dev gobject-introspection-dev sqlite-dev
polkit-dev eudev-dev libgudev-dev"
makedepends="$depends_dev meson ninja intltool bash-completion libgusb-dev lcms2-dev"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://www.freedesktop.org/software/colord/releases/colord-$pkgver.tar.xz"
+source="https://www.freedesktop.org/software/colord/releases/colord-$pkgver.tar.xz
+ disable-udev-hwdb-tests.patch"
builddir="$srcdir/$pkgname-$pkgver"
build() {
- cd "$builddir"
mkdir build && cd build
meson --prefix=/usr \
--sysconfdir=/etc \
@@ -35,9 +34,20 @@ build() {
ninja
}
+check() {
+ cd build
+
+ # cd-private-test is broken atm
+ # meson test
+
+ src/cd-self-test
+}
+
package() {
- cd "$builddir/build"
+ cd build
+
DESTDIR="$pkgdir" ninja install
}
-sha512sums="8a4dc9c6c480cff0a3a9d9187e087cc07e1c8c262edd45cbb69e51d384fab4331b1115c354ee2160ab36137b7d342fb450672acd29066dd45e7878562197dce2 colord-1.4.3.tar.xz"
+sha512sums="0187a363c41ae5102dc3b454fcd84df83d71ac0dc32d88b33651edc1df15cbf1f47218caee3037c876e892613a2301226886a73b39759cfb709d0fef8e168628 colord-1.4.4.tar.xz
+4e306254902658ffe0904b4ee3fdc10c473af909662c08fc66b9070fd698e07e1f804e53ccd94160ac57d268269132683808ff8f2bae64fd2a9070d6f024b800 disable-udev-hwdb-tests.patch"
diff --git a/community/colord/disable-udev-hwdb-tests.patch b/community/colord/disable-udev-hwdb-tests.patch
new file mode 100644
index 0000000000..cc75034ba9
--- /dev/null
+++ b/community/colord/disable-udev-hwdb-tests.patch
@@ -0,0 +1,22 @@
+diff --git a/lib/colord/cd-test-private.c b/lib/colord/cd-test-private.c.new
+index 4b16ca533f..4f01ccb3a3 100644
+--- a/lib/colord/cd-test-private.c
++++ b/lib/colord/cd-test-private.c.new
+@@ -2170,7 +2170,7 @@ colord_edid_func (void)
+ g_bytes_unref (data_edid);
+
+ g_assert_cmpstr (cd_edid_get_monitor_name (edid), ==, "L225W");
+- g_assert_cmpstr (cd_edid_get_vendor_name (edid), ==, "LG");
++ /* g_assert_cmpstr (cd_edid_get_vendor_name (edid), ==, "LG"); */
+ g_assert_cmpstr (cd_edid_get_serial_number (edid), ==, "34398");
+ g_assert_cmpstr (cd_edid_get_eisa_id (edid), ==, NULL);
+ g_assert_cmpstr (cd_edid_get_checksum (edid), ==, "0bb44865bb29984a4bae620656c31368");
+@@ -2219,7 +2219,7 @@ colord_edid_func (void)
+ g_free (filename);
+ g_bytes_unref (data_edid);
+ g_assert_cmpstr (cd_edid_get_monitor_name (edid), ==, "DELL U2713H");
+- g_assert_cmpstr (cd_edid_get_vendor_name (edid), ==, "Dell");
++ /* g_assert_cmpstr (cd_edid_get_vendor_name (edid), ==, "Dell");:*/
+ g_assert_cmpstr (cd_edid_get_serial_number (edid), ==, "C6F0K34T1CWL");
+ g_assert_cmpstr (cd_edid_get_eisa_id (edid), ==, NULL);
+ g_assert_cmpstr (cd_edid_get_checksum (edid), ==, "ac6dab5272cfbd2e87dd9c635f4c0e9d");