diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-05 02:43:51 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-05 02:43:51 -0300 |
commit | 61b68fb9fca39dda7e4b48c5af9567dc60ea3dd2 (patch) | |
tree | 6b8b6fb14ede5aae651e92f593252dba143cee74 /extra/colord | |
parent | ca998b4c054452abed4e01be1d2b28fee0ca904f (diff) | |
parent | 5801c5acd80d30d17aaef76b8bc401c61b3ef3c9 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/camlp5/PKGBUILD
community/coq/PKGBUILD
community/ldns/PKGBUILD
community/luxrays/PKGBUILD
community/luxrender/PKGBUILD
community/nut/PKGBUILD
community/root/PKGBUILD
community/swi-prolog/PKGBUILD
community/vtk/PKGBUILD
community/wings3d/wings3d.sh
core/sqlite3/PKGBUILD
core/tzdata/PKGBUILD
extra/cmus/PKGBUILD
extra/dcron/PKGBUILD
extra/farsight2/PKGBUILD
extra/foomatic/PKGBUILD
extra/fwbuilder/PKGBUILD
extra/gnome-utils/PKGBUILD
extra/ivtv-utils/PKGBUILD
extra/kdebase-konsole/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/kdesdk/PKGBUILD
extra/koffice/PKGBUILD
extra/libxfce4menu/PKGBUILD
extra/openmpi/PKGBUILD
extra/telepathy-butterfly/PKGBUILD
extra/telepathy-farsight/PKGBUILD
extra/telepathy-kde-presence-dataengine/PKGBUILD
extra/telepathy-qt4/PKGBUILD
extra/xfce-utils/PKGBUILD
extra/xulrunner/PKGBUILD
multilib/lib32-zlib/PKGBUILD
staging/gimp-devel/gimp-devel.install
testing/gtk3/PKGBUILD
testing/php/PKGBUILD
~xihh/couchdb-git/couchdb.install
~xihh/couchdb-git/rc-script.patch
~xihh/gmime24/PKGBUILD
Diffstat (limited to 'extra/colord')
-rw-r--r-- | extra/colord/fix-compilation.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/extra/colord/fix-compilation.patch b/extra/colord/fix-compilation.patch deleted file mode 100644 index b956cb9f6..000000000 --- a/extra/colord/fix-compilation.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 - |