[gnome-ostree] 3.6: colord: Add patch for srcdir != builddir
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-ostree] 3.6: colord: Add patch for srcdir != builddir
- Date: Wed, 9 May 2012 22:21:01 +0000 (UTC)
commit af0c0b496aea88926671d1e8a352d2729ee3a640
Author: Colin Walters <walters verbum org>
Date: Wed May 9 18:20:08 2012 -0400
3.6: colord: Add patch for srcdir != builddir
gnomeos-3.6.json | 3 ++-
patches/colord-builddir.patch | 29 +++++++++++++++++++++++++++++
2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/gnomeos-3.6.json b/gnomeos-3.6.json
index 48876c1..0ab1355 100644
--- a/gnomeos-3.6.json
+++ b/gnomeos-3.6.json
@@ -534,7 +534,8 @@
"branch": "lcms2.3"},
{"src": "git:git://gitorious.org/colord/master.git",
- "name": "colord"},
+ "name": "colord",
+ "patches": ["colord-builddir.patch"]},
{"src": "linuxwacom:libwacom",
"patches": ["libwacom-autogen.patch"]},
diff --git a/patches/colord-builddir.patch b/patches/colord-builddir.patch
new file mode 100644
index 0000000..fdcf093
--- /dev/null
+++ b/patches/colord-builddir.patch
@@ -0,0 +1,29 @@
+From 6c5688b7b7bdcaea5403b9bc7b7db34edb321085 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Wed, 9 May 2012 18:07:25 -0400
+Subject: [PATCH] build: Fix srcdir != builddir with introspection enabled
+
+---
+ libcolord-gtk/Makefile.am | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/libcolord-gtk/Makefile.am b/libcolord-gtk/Makefile.am
+index a26b800..0a7dffa 100644
+--- a/libcolord-gtk/Makefile.am
++++ b/libcolord-gtk/Makefile.am
+@@ -1,9 +1,10 @@
+ if HAVE_INTROSPECTION
+ -include $(INTROSPECTION_MAKEFILE)
+ INTROSPECTION_GIRS =
+-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
++INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --add-include-path=$(top_builddir)/libcolord
+ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) \
+- --includedir=$(top_srcdir)/libcolord
++ --includedir=$(top_srcdir)/libcolord \
++ --includedir=$(top_builddir)/libcolord
+ endif
+
+ INCLUDES = \
+--
+1.7.7.6
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]