Date: Thursday, March 15, 2012 @ 14:01:06 Author: ibiru Revision: 153537
update to 0.1.18 Modified: colord/trunk/PKGBUILD Deleted: colord/trunk/fix-compilation.patch -----------------------+ PKGBUILD | 13 +++++-------- fix-compilation.patch | 38 -------------------------------------- 2 files changed, 5 insertions(+), 46 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-03-15 18:00:24 UTC (rev 153536) +++ PKGBUILD 2012-03-15 18:01:06 UTC (rev 153537) @@ -3,7 +3,7 @@ # Contributor: Ionut Biru <ib...@archlinux.org> pkgname=colord -pkgver=0.1.17 +pkgver=0.1.18 pkgrel=1 pkgdesc="Color daemon" arch=('i686' 'x86_64') @@ -11,15 +11,12 @@ 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 - fix-compilation.patch) +source=($url/releases/$pkgname-$pkgver.tar.xz) options=('!libtool') -sha1sums=('7716c58a7ab85029637c7e88bdb77e48b6cd5ce9' - 'b77dd47f623a05055e8988dd568695fcbf457500') +sha1sums=('6127e723a9beb932aae7a43b6e6b5fdb84c39611') build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/fix-compilation.patch" + cd "$pkgname-$pkgver" ./configure --prefix=/usr \ --sysconfdir=/etc --libexecdir=/usr/lib/colord \ --localstatedir=/var --disable-static \ @@ -28,7 +25,7 @@ } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } Deleted: fix-compilation.patch =================================================================== --- fix-compilation.patch 2012-03-15 18:00:24 UTC (rev 153536) +++ fix-compilation.patch 2012-03-15 18:01:06 UTC (rev 153537) @@ -1,38 +0,0 @@ -From 638a98fef16fa15946522d4112660b4b20c0d630 Mon Sep 17 00:00:00 2001 -From: Richard Hughes <rich...@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 -