Patchwork [meta-xfce] xfce4-settings: Install cursors from srcdir

login
register
mail settings
Submitter Ash Charles
Date May 26, 2014, 5:21 p.m.
Message ID <1401124872-11554-1-git-send-email-ashcharles@gmail.com>
Download mbox | patch
Permalink /patch/72717/
State Accepted, archived
Headers show

Comments

Ash Charles - May 26, 2014, 5:21 p.m.
Cursors patched into the install by 0001-add-cursor-theme-xfce-invisible.patch
are located in the source directory.  To install during an out-of-tree build,
we need to copy them from the source directory, not the current build
directory. See [1] for discussion.

Upstream-Status: Submitted

[1] https://bugzilla.xfce.org/show_bug.cgi?id=9474

Signed-off-by: Ash Charles <ashcharles@gmail.com>
---
 .../touchscreen/0001-add-cursor-theme-xfce-invisible.patch        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch
index 4d8e01d..5de14fc 100644
--- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch
+++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch
@@ -223,15 +223,15 @@  index 0000000..c9e5a9f
 +
 +install-data-local:
 +	$(mkinstalldirs) $(DESTDIR)@cursordir@;
-+	$(INSTALL_DATA) index.theme $(DESTDIR)/@cursordir@/..
-+	$(INSTALL_DATA) invisible wait $(DESTDIR)@cursordir@/
++	$(INSTALL_DATA) $(srcdir)/index.theme $(DESTDIR)/@cursordir@/..
++	$(INSTALL_DATA) $(srcdir)/invisible $(srcdir)/wait $(DESTDIR)@cursordir@/
 +	for CURSOR in $(CURSOR_NAMES_INVISIBLE); do \
 +		echo '-- Installing invisible cursor '$$CURSOR; \
-+		ln -s invisible $(DESTDIR)@cursordir@/$$CURSOR; \
++		ln -s $(srcdir)/invisible $(DESTDIR)@cursordir@/$$CURSOR; \
 +	done
 +	for CURSOR in $(CURSOR_NAMES); do \
 +		echo '-- Installing visible cursor '$$CURSOR; \
-+		ln -s wait $(DESTDIR)@cursordir@/$$CURSOR; \
++		ln -s $(srcdir)/wait $(DESTDIR)@cursordir@/$$CURSOR; \
 +	done
 +
 diff --git a/cursors/index.theme b/cursors/index.theme