diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-25 10:25:19 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-25 10:25:19 +0100 |
commit | d8eb584da3a24a7b4cccf1b4b39b19ca8fc19495 (patch) | |
tree | 8e5ea3b068852a348646a0543fdacbd7de7a937e /extra/colord/fix-compilation.patch | |
parent | 82e1a8e4caf3318dbb60adda8c2649ae7ac15661 (diff) | |
parent | 299e917c17619f800f0c21cf43209065b608223f (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/pigeonhole/PKGBUILD
community/mingw32-pthreads/PKGBUILD
community/openbsd-netcat/PKGBUILD
community/remmina/PKGBUILD
core/crda/PKGBUILD
core/libnl/PKGBUILD
core/wpa_supplicant/PKGBUILD
extra/fontconfig/PKGBUILD
extra/gnome-python-extras/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gvfs/PKGBUILD
extra/libcdio/PKGBUILD
extra/maxima/PKGBUILD
extra/vcdimager/PKGBUILD
extra/vlc/PKGBUILD
extra/xfdesktop/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/q4wine/PKGBUILD
testing/dovecot/PKGBUILD
Diffstat (limited to 'extra/colord/fix-compilation.patch')
-rw-r--r-- | extra/colord/fix-compilation.patch | 38 |
1 files changed, 38 insertions, 0 deletions
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 + |