projects / scm / bb / tizen-distro.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c98049d)
xfce4-settings: Install cursors from srcdir
authorAsh Charles <ashcharles@gmail.com>
Mon, 26 May 2014 17:21:12 +0000 (10:21 -0700)
committerPatrick Ohly <patrick.ohly@intel.com>
Fri, 9 Jan 2015 16:38:34 +0000 (08:38 -0800)
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

(From meta-openembedded rev: df58431f76f7d3aadc5e8204d6fe8aa3c2bfc423)

Signed-off-by: Ash Charles <ashcharles@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch patch | blob | history

diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch
index 4d8e01d..5de14fc 100644 (file)
--- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch
+++ b/meta-openembedded/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
Domain: SCM / BB;