diff options
author | Johannes Pointner <h4nn35.work@gmail.com> | 2016-03-03 21:41:38 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-28 15:55:50 +0100 |
commit | 71304d8ec7cd68ea98f2b195f181455263aa2358 (patch) | |
tree | 06f9f3ae28f6db60f98c4413846d26635d77de90 /meta/recipes-graphics | |
parent | 7c5343abf0cbfa3b18b9142c0755264160d120c1 (diff) | |
download | poky-71304d8ec7cd68ea98f2b195f181455263aa2358.tar.gz |
xcursor-transparent-theme: upgrade to latest git revision
Incorporates the patches we were carrying, and adds some icon names that were
not handled.
(From OE-Core rev: 8ec6e1f57cb4d0594b96d317e89851630c984087)
(From OE-Core rev: 43d8006c51b09ce4b158965a73433101186929f4)
(From OE-Core rev: ae81abb3f5ec247114f7ba904d0b31fad5b16599)
Signed-off-by: Johannes Pointner <johannes.pointner@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r-- | meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch | 17 | ||||
-rw-r--r-- | meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch | 25 | ||||
-rw-r--r-- | meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb (renamed from meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb) | 14 |
3 files changed, 7 insertions, 49 deletions
diff --git a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch deleted file mode 100644 index cfac55c7ba..0000000000 --- a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | Fix typo in Makefile | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Index: xcursor-transparent-theme-0.1.1/cursors/Makefile.am | ||
6 | =================================================================== | ||
7 | --- xcursor-transparent-theme-0.1.1.orig/cursors/Makefile.am 2013-03-07 22:25:04.001435305 +0000 | ||
8 | +++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am 2013-03-07 22:25:04.061435302 +0000 | ||
9 | @@ -79,7 +79,7 @@ | ||
10 | ul_angle \ | ||
11 | ur_angle \ | ||
12 | v_double_arrow \ | ||
13 | - watcha \ | ||
14 | + watch \ | ||
15 | xterm | ||
16 | |||
17 | CURSOR_DIR = $(datadir)/icons/xcursor-transparent/cursors | ||
diff --git a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch deleted file mode 100644 index 5028fd6bf1..0000000000 --- a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | Use relative symlink for link rather than absolute path which | ||
2 | doesn't work well in DESTDIR setting. | ||
3 | |||
4 | Also fix out of tree builds to use correct srcdir. | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | RP 2013/3/8 | ||
9 | |||
10 | Index: xcursor-transparent-theme-0.1.1/cursors/Makefile.am | ||
11 | =================================================================== | ||
12 | --- xcursor-transparent-theme-0.1.1.orig/cursors/Makefile.am 2013-03-07 22:25:03.933435307 +0000 | ||
13 | +++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am 2013-03-07 22:25:27.293434755 +0000 | ||
14 | @@ -88,9 +88,9 @@ | ||
15 | |||
16 | install-data-local: | ||
17 | $(mkinstalldirs) $(DESTDIR)$(CURSOR_DIR); | ||
18 | - $(INSTALL_DATA) $(CURSOR_REAL) $(DESTDIR)$(CURSOR_DIR)/ | ||
19 | + $(INSTALL_DATA) $(srcdir)/$(CURSOR_REAL) $(DESTDIR)$(CURSOR_DIR)/ | ||
20 | for CURSOR in $(CURSOR_NAMES); do \ | ||
21 | echo '-- Installing cursor '$$CURSOR; \ | ||
22 | - ln -s $(DESTDIR)$(CURSOR_DIR)/transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \ | ||
23 | + ln -s transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \ | ||
24 | done | ||
25 | |||
diff --git a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb index 5e668abd40..b871d89f9f 100644 --- a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb +++ b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb | |||
@@ -6,14 +6,14 @@ LICENSE = "GPLv2" | |||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" |
7 | 7 | ||
8 | SECTION = "x11/base" | 8 | SECTION = "x11/base" |
9 | PR = "r4" | ||
10 | 9 | ||
11 | SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/utils/xcursor-transparent-theme-${PV}.tar.gz \ | 10 | SRCREV = "23c8af5ba4a1b7efbaf0bbca59a65ff7e10a1a06" |
12 | file://use-relative-symlinks.patch \ | 11 | PV = "0.1.1+git${SRCPV}" |
13 | file://fix_watch_cursor.patch" | ||
14 | 12 | ||
15 | SRC_URI[md5sum] = "7b0c623049d4aab20600d6473f8aab23" | 13 | SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master" |
16 | SRC_URI[sha256sum] = "b26adf2d503d01299718390ae39dab4691a67220de09423be0364e9a060bf7e4" | 14 | |
17 | FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*" | 15 | S = "${WORKDIR}/git" |
18 | 16 | ||
19 | inherit autotools allarch | 17 | inherit autotools allarch |
18 | |||
19 | FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*" | ||