From ae81abb3f5ec247114f7ba904d0b31fad5b16599 Mon Sep 17 00:00:00 2001 From: Johannes Pointner Date: Thu, 3 Mar 2016 21:41:38 +0100 Subject: [PATCH] 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) Signed-off-by: Johannes Pointner Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../fix_watch_cursor.patch | 17 ------------- .../use-relative-symlinks.patch | 25 ------------------- ....1.bb => xcursor-transparent-theme_git.bb} | 14 +++++------ 3 files changed, 7 insertions(+), 49 deletions(-) delete mode 100644 meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch delete mode 100644 meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch rename meta/recipes-graphics/xcursor-transparent-theme/{xcursor-transparent-theme_0.1.1.bb => xcursor-transparent-theme_git.bb} (51%) 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 @@ -Fix typo in Makefile - -Upstream-Status: Pending - -Index: xcursor-transparent-theme-0.1.1/cursors/Makefile.am -=================================================================== ---- xcursor-transparent-theme-0.1.1.orig/cursors/Makefile.am 2013-03-07 22:25:04.001435305 +0000 -+++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am 2013-03-07 22:25:04.061435302 +0000 -@@ -79,7 +79,7 @@ - ul_angle \ - ur_angle \ - v_double_arrow \ -- watcha \ -+ watch \ - xterm - - 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 @@ -Use relative symlink for link rather than absolute path which -doesn't work well in DESTDIR setting. - -Also fix out of tree builds to use correct srcdir. - -Upstream-Status: Pending - -RP 2013/3/8 - -Index: xcursor-transparent-theme-0.1.1/cursors/Makefile.am -=================================================================== ---- xcursor-transparent-theme-0.1.1.orig/cursors/Makefile.am 2013-03-07 22:25:03.933435307 +0000 -+++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am 2013-03-07 22:25:27.293434755 +0000 -@@ -88,9 +88,9 @@ - - install-data-local: - $(mkinstalldirs) $(DESTDIR)$(CURSOR_DIR); -- $(INSTALL_DATA) $(CURSOR_REAL) $(DESTDIR)$(CURSOR_DIR)/ -+ $(INSTALL_DATA) $(srcdir)/$(CURSOR_REAL) $(DESTDIR)$(CURSOR_DIR)/ - for CURSOR in $(CURSOR_NAMES); do \ - echo '-- Installing cursor '$$CURSOR; \ -- ln -s $(DESTDIR)$(CURSOR_DIR)/transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \ -+ ln -s transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \ - done - 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 similarity index 51% rename from meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb rename to 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" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SECTION = "x11/base" -PR = "r4" -SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/utils/xcursor-transparent-theme-${PV}.tar.gz \ - file://use-relative-symlinks.patch \ - file://fix_watch_cursor.patch" +SRCREV = "23c8af5ba4a1b7efbaf0bbca59a65ff7e10a1a06" +PV = "0.1.1+git${SRCPV}" -SRC_URI[md5sum] = "7b0c623049d4aab20600d6473f8aab23" -SRC_URI[sha256sum] = "b26adf2d503d01299718390ae39dab4691a67220de09423be0364e9a060bf7e4" -FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*" +SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master" + +S = "${WORKDIR}/git" inherit autotools allarch + +FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*" -- 2.40.1