diff options
Diffstat (limited to 'extra/colord')
| -rw-r--r-- | extra/colord/PKGBUILD | 14 | ||||
| -rw-r--r-- | extra/colord/fix-compilation.patch | 38 |
2 files changed, 47 insertions, 5 deletions
diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD index 873778ad0..97d3c91ad 100644 --- a/extra/colord/PKGBUILD +++ b/extra/colord/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146778 2012-01-17 13:36:48Z ibiru $ +# $Id: PKGBUILD 150827 2012-02-23 11:03:34Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=colord -pkgver=0.1.16 +pkgver=0.1.17 pkgrel=1 pkgdesc="Color daemon" arch=('i686' 'x86_64') @@ -11,15 +11,19 @@ url="http://www.freedesktop.org/software/colord" license=('GPL2') depends=('lcms2' 'libgusb' 'polkit' 'sane' 'shared-color-profiles' 'sqlite3' 'udev') makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x') -source=($url/releases/$pkgname-$pkgver.tar.xz) +source=($url/releases/$pkgname-$pkgver.tar.xz + fix-compilation.patch) options=('!libtool') -sha1sums=('bd2fbad0043d2c1f55ab7ff8cb5e261b684e699c') +sha1sums=('7716c58a7ab85029637c7e88bdb77e48b6cd5ce9' + 'b77dd47f623a05055e8988dd568695fcbf457500') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/fix-compilation.patch" ./configure --prefix=/usr \ --sysconfdir=/etc --libexecdir=/usr/lib/colord \ - --localstatedir=/var --disable-static + --localstatedir=/var --disable-static \ + --with-systemdsystemunitdir=/lib/systemd/system make } diff --git a/extra/colord/fix-compilation.patch b/extra/colord/fix-compilation.patch new file mode 100644 index 000000000..b956cb9f6 --- /dev/null +++ b/extra/colord/fix-compilation.patch @@ -0,0 +1,38 @@ +From 638a98fef16fa15946522d4112660b4b20c0d630 Mon Sep 17 00:00:00 2001 +From: Richard Hughes <richard@hughsie.com> +Date: Thu, 23 Feb 2012 10:43:37 +0000 +Subject: [PATCH] trivial: Fix compile with older versions of GLib + +g_mapped_file_new_from_fd() was introduced in 2.31.0 not 2.30.0 as the +docs suggested. + +Resoves https://bugs.freedesktop.org/show_bug.cgi?id=46481 +--- + src/cd-profile.c | 10 ++++++++++ + 1 files changed, 10 insertions(+), 0 deletions(-) + +diff --git a/src/cd-profile.c b/src/cd-profile.c +index a292616..323588b 100644 +--- a/src/cd-profile.c ++++ b/src/cd-profile.c +@@ -1066,7 +1066,17 @@ cd_profile_set_fd (CdProfile *profile, + } + + /* create a mapped file */ ++#if GLIB_CHECK_VERSION(2,31,0) + priv->mapped_file = g_mapped_file_new_from_fd (fd, FALSE, error); ++ if (priv->mapped_file == NULL) { ++ g_set_error (error, ++ CD_MAIN_ERROR, ++ CD_MAIN_ERROR_FAILED, ++ "failed to create mapped file from fd %i", ++ fd); ++ goto out; ++ } ++#endif + + /* parse the ICC file */ + lcms_profile = cmsOpenProfileFromStream (stream, "r"); +-- +1.7.6 + |