[ostree] 3.4: Fix accountsservice srcdir != builddir
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] 3.4: Fix accountsservice srcdir != builddir
- Date: Thu, 23 Feb 2012 03:54:06 +0000 (UTC)
commit 50ed95dde3939ff09baf131ce6f33c914d200f05
Author: Colin Walters <walters verbum org>
Date: Wed Feb 22 22:53:24 2012 -0500
3.4: Fix accountsservice srcdir != builddir
gnomeos/3.4/accountsservice-builddir.patch | 34 ++++++++++++++++++++++++++++
gnomeos/3.4/manifest.json | 3 +-
2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/gnomeos/3.4/accountsservice-builddir.patch b/gnomeos/3.4/accountsservice-builddir.patch
new file mode 100644
index 0000000..f9e4311
--- /dev/null
+++ b/gnomeos/3.4/accountsservice-builddir.patch
@@ -0,0 +1,34 @@
+From e866eaadcfe11f36265de4f9088a6958b9d64753 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Wed, 22 Feb 2012 22:50:51 -0500
+Subject: [PATCH] libaccountsservice: Fix srcdir != builddir for generated
+ files
+
+---
+ src/libaccountsservice/Makefile.am | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/libaccountsservice/Makefile.am b/src/libaccountsservice/Makefile.am
+index 922464a..0bce6a4 100644
+--- a/src/libaccountsservice/Makefile.am
++++ b/src/libaccountsservice/Makefile.am
+@@ -42,13 +42,13 @@ accounts-user-generated.c accounts-user-generated.h: $(top_srcdir)/data/org.free
+ gdbus-codegen --generate-c-code accounts-user-generated --c-namespace Accounts --interface-prefix=org.freedesktop.Accounts. $(top_srcdir)/data/org.freedesktop.Accounts.User.xml
+
+ ck-manager-generated.c ck-manager-generated.h: org.freedesktop.ConsoleKit.Manager.xml Makefile
+- gdbus-codegen --generate-c-code ck-manager-generated --c-namespace ConsoleKit --interface-prefix=org.freedesktop.ConsoleKit org.freedesktop.ConsoleKit.Manager.xml
++ gdbus-codegen --generate-c-code ck-manager-generated --c-namespace ConsoleKit --interface-prefix=org.freedesktop.ConsoleKit $(srcdir)/org.freedesktop.ConsoleKit.Manager.xml
+
+ ck-seat-generated.c ck-seat-generated.h: org.freedesktop.ConsoleKit.Seat.xml Makefile
+- gdbus-codegen --generate-c-code ck-seat-generated --c-namespace ConsoleKit --interface-prefix=org.freedesktop.ConsoleKit org.freedesktop.ConsoleKit.Seat.xml
++ gdbus-codegen --generate-c-code ck-seat-generated --c-namespace ConsoleKit --interface-prefix=org.freedesktop.ConsoleKit $(srcdir)/org.freedesktop.ConsoleKit.Seat.xml
+
+ ck-session-generated.c ck-session-generated.h: org.freedesktop.ConsoleKit.Session.xml Makefile
+- gdbus-codegen --generate-c-code ck-session-generated --c-namespace ConsoleKit --interface-prefix=org.freedesktop.ConsoleKit org.freedesktop.ConsoleKit.Session.xml
++ gdbus-codegen --generate-c-code ck-session-generated --c-namespace ConsoleKit --interface-prefix=org.freedesktop.ConsoleKit $(srcdir)/org.freedesktop.ConsoleKit.Session.xml
+
+ BUILT_SOURCES += \
+ accounts-generated.c \
+--
+1.7.6.5
+
diff --git a/gnomeos/3.4/manifest.json b/gnomeos/3.4/manifest.json
index ae41a4f..0f8e6bc 100644
--- a/gnomeos/3.4/manifest.json
+++ b/gnomeos/3.4/manifest.json
@@ -673,7 +673,8 @@
{"src": "gnome:cantarell-fonts"},
- {"src": "fd:accountsservice"},
+ {"src": "fd:accountsservice",
+ "patches": ["accountsservice-builddir.patch"]},
{"src": "gnome:gdm",
"config-opts": ["--disable-documentation"],
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]