[gnome-continuous] manifest: Patch xdg-app
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous] manifest: Patch xdg-app
- Date: Tue, 29 Sep 2015 19:15:28 +0000 (UTC)
commit 7d1ed86a4e8333e9f90ee151f0f884258136c71b
Author: Colin Walters <walters verbum org>
Date: Tue Sep 29 15:15:18 2015 -0400
manifest: Patch xdg-app
manifest.json | 2 +-
...dg-app-build-Fix-srcdir-builddir-from-git.patch | 24 ++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index ad26366..8def8b8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -102,7 +102,6 @@
{"src": "git:https://github.com/systemd/systemd";,
"component": "minimal",
"initramfs-depends": true,
- "patches": ["systemd-Revert-core-mount-add-dependencies-to-dynamically-mo.patch"],
"cflags": {
"x86_64": "-O0 -g -m64 -mtune=generic",
"i686": "-O0 -g -m32 -march=i686 -mtune=atom -fasynchronous-unwind-tables"},
@@ -871,6 +870,7 @@
"--enable-installed-tests"]},
{"src": "git:git://github.com/alexlarsson/xdg-app",
+ "patches": ["xdg-app-build-Fix-srcdir-builddir-from-git.patch"],
"config-opts": ["--disable-documentation",
"--with-priv-mode=none"],
"setuid": ["/runtime/usr/bin/xdg-app-helper"]},
diff --git a/patches/xdg-app-build-Fix-srcdir-builddir-from-git.patch
b/patches/xdg-app-build-Fix-srcdir-builddir-from-git.patch
new file mode 100644
index 0000000..dbbd6d4
--- /dev/null
+++ b/patches/xdg-app-build-Fix-srcdir-builddir-from-git.patch
@@ -0,0 +1,24 @@
+From 821f68ff1524f7a3cb83169b09dcbf431ca051be Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Tue, 29 Sep 2015 15:01:12 -0400
+Subject: [PATCH] build: Fix srcdir != builddir from git
+
+Was hitting this in gnome-continuous, which does srcdir != builddir by
+default.
+---
+ document-portal/Makefile.am.inc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/document-portal/Makefile.am.inc b/document-portal/Makefile.am.inc
+index dd261e9..13ef3bf 100644
+--- a/document-portal/Makefile.am.inc
++++ b/document-portal/Makefile.am.inc
+@@ -42,4 +42,4 @@ xdg_document_portal_SOURCES = \
+ $(NULL)
+
+ xdg_document_portal_LDADD = $(BASE_LIBS) $(FUSE_LIBS) libxdgapp.la
+-xdg_document_portal_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(SOUP_CFLAGS) $(FUSE_CFLAGS)
-I$(src)/document-portal
++xdg_document_portal_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(SOUP_CFLAGS) $(FUSE_CFLAGS)
-I$(srcdir)/document-portal -I$(builddir)/document-portal
+--
+1.8.3.1
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]