[arch-commits] Commit in colord/repos (6 files)
Ionut Biru
ibiru at archlinux.org
Thu Feb 23 11:03:35 UTC 2012
Date: Thursday, February 23, 2012 @ 06:03:34
Author: ibiru
Revision: 150827
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
colord/repos/extra-i686/PKGBUILD
(from rev 150826, colord/trunk/PKGBUILD)
colord/repos/extra-i686/fix-compilation.patch
(from rev 150826, colord/trunk/fix-compilation.patch)
colord/repos/extra-x86_64/PKGBUILD
(from rev 150826, colord/trunk/PKGBUILD)
colord/repos/extra-x86_64/fix-compilation.patch
(from rev 150826, colord/trunk/fix-compilation.patch)
Deleted:
colord/repos/extra-i686/PKGBUILD
colord/repos/extra-x86_64/PKGBUILD
------------------------------------+
extra-i686/PKGBUILD | 66 ++++++++++++++++++-----------------
extra-i686/fix-compilation.patch | 38 ++++++++++++++++++++
extra-x86_64/PKGBUILD | 66 ++++++++++++++++++-----------------
extra-x86_64/fix-compilation.patch | 38 ++++++++++++++++++++
4 files changed, 146 insertions(+), 62 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-02-23 10:52:38 UTC (rev 150826)
+++ extra-i686/PKGBUILD 2012-02-23 11:03:34 UTC (rev 150827)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=colord
-pkgver=0.1.16
-pkgrel=1
-pkgdesc="Color daemon"
-arch=('i686' 'x86_64')
-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)
-options=('!libtool')
-sha1sums=('bd2fbad0043d2c1f55ab7ff8cb5e261b684e699c')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr \
- --sysconfdir=/etc --libexecdir=/usr/lib/colord \
- --localstatedir=/var --disable-static
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: colord/repos/extra-i686/PKGBUILD (from rev 150826, colord/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-23 11:03:34 UTC (rev 150827)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=colord
+pkgver=0.1.17
+pkgrel=1
+pkgdesc="Color daemon"
+arch=('i686' 'x86_64')
+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
+ fix-compilation.patch)
+options=('!libtool')
+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 \
+ --with-systemdsystemunitdir=/lib/systemd/system
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: colord/repos/extra-i686/fix-compilation.patch (from rev 150826, colord/trunk/fix-compilation.patch)
===================================================================
--- extra-i686/fix-compilation.patch (rev 0)
+++ extra-i686/fix-compilation.patch 2012-02-23 11:03:34 UTC (rev 150827)
@@ -0,0 +1,38 @@
+From 638a98fef16fa15946522d4112660b4b20c0d630 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard at 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
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-02-23 10:52:38 UTC (rev 150826)
+++ extra-x86_64/PKGBUILD 2012-02-23 11:03:34 UTC (rev 150827)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=colord
-pkgver=0.1.16
-pkgrel=1
-pkgdesc="Color daemon"
-arch=('i686' 'x86_64')
-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)
-options=('!libtool')
-sha1sums=('bd2fbad0043d2c1f55ab7ff8cb5e261b684e699c')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr \
- --sysconfdir=/etc --libexecdir=/usr/lib/colord \
- --localstatedir=/var --disable-static
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: colord/repos/extra-x86_64/PKGBUILD (from rev 150826, colord/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-02-23 11:03:34 UTC (rev 150827)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=colord
+pkgver=0.1.17
+pkgrel=1
+pkgdesc="Color daemon"
+arch=('i686' 'x86_64')
+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
+ fix-compilation.patch)
+options=('!libtool')
+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 \
+ --with-systemdsystemunitdir=/lib/systemd/system
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: colord/repos/extra-x86_64/fix-compilation.patch (from rev 150826, colord/trunk/fix-compilation.patch)
===================================================================
--- extra-x86_64/fix-compilation.patch (rev 0)
+++ extra-x86_64/fix-compilation.patch 2012-02-23 11:03:34 UTC (rev 150827)
@@ -0,0 +1,38 @@
+From 638a98fef16fa15946522d4112660b4b20c0d630 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard at 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
+
More information about the arch-commits
mailing list