From 768f1946a5fa4f30448f32d5dae55464eff0c02b Mon Sep 17 00:00:00 2001 From: =?utf8?q?K=C3=A9vin=20THIERRY?= Date: Fri, 30 May 2014 08:56:34 -0700 Subject: [PATCH] meta-tizen: Revert "Add second background" This reverts commit 71e40b62d9cce08b517b641db62fc8c6c4b75c9f. Change-Id: Ida1760d3693ce84b1b66cc78a98110ef09505c67 (From meta-tizen rev: 23937d4b41b0c6c9b8a3665b6d370ef50bca31ee) Signed-off-by: Patrick Ohly --- .../weston-common/weston-common-extraconf.inc | 1 - .../0001-Add-a-second-background.patch | 32 ---------------------- 2 files changed, 33 deletions(-) delete mode 100644 meta-tizen/recipes-tizen/weston-common/weston-common/0001-Add-a-second-background.patch diff --git a/meta-tizen/recipes-tizen/weston-common/weston-common-extraconf.inc b/meta-tizen/recipes-tizen/weston-common/weston-common-extraconf.inc index 4da46ff..e1360a1 100644 --- a/meta-tizen/recipes-tizen/weston-common/weston-common-extraconf.inc +++ b/meta-tizen/recipes-tizen/weston-common/weston-common-extraconf.inc @@ -7,7 +7,6 @@ SRC_URI += "file://0001-Add-a-script-to-export-UID.patch" SRC_URI += "file://0001-Automatically-restart-display-manager.patch" SRC_URI += "file://0001-Modifications-for-yocto-build.patch" SRC_URI += "file://0001-fix_weston_start.patch" -SRC_URI += "file://0001-Add-a-second-background.patch" USERADD_PACKAGES = "${PN}" diff --git a/meta-tizen/recipes-tizen/weston-common/weston-common/0001-Add-a-second-background.patch b/meta-tizen/recipes-tizen/weston-common/weston-common/0001-Add-a-second-background.patch deleted file mode 100644 index 5a75568..0000000 --- a/meta-tizen/recipes-tizen/weston-common/weston-common/0001-Add-a-second-background.patch +++ /dev/null @@ -1,32 +0,0 @@ -From cf662a8d7cd9f70e820d88779ed794426f62f090 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?K=C3=A9vin=20THIERRY?= -Date: Fri, 30 May 2014 17:33:52 +0200 -Subject: [PATCH] meta-tizen: Add a second background -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Change-Id: Ia473562dc399fa5875b646dc0b6ce563c26efb0e -Signed-off-by: Kévin THIERRY ---- - weston.ini | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/weston.ini b/weston.ini -index 4e1f36f..a604b54 100644 ---- a/weston.ini -+++ b/weston.ini -@@ -2,8 +2,8 @@ - modules=desktop-shell.so - - [shell] --#background-image=/usr/share/backgrounds/gnome/Aqua.jpg --background-image=/usr/share/backgrounds/tizen/golfe-morbihan.jpg -+#background-image=/usr/share/backgrounds/tizen/golfe-morbihan.jpg -+background-image=/usr/share/backgrounds/tizen/tizen_common.png - background-color=0xff002244 - background-type=scale-crop - panel-color=0x95333333 --- -1.8.1.4 - -- 2.7.4