From 7c5bc03fa3ed59c2d81babe1f8711f76b73d32d1 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 2 Dec 2014 22:32:47 +0100 Subject: lxde-common: move version to % placeholder remove consistent_defconfig_dirs.patch as it is no longer needed starting with 0.5.6 consistent_defconfig_dirs.patch is no longer needed. change bbappend to contain % instead of the version --- .../lxde-common-0.5.5/Wallpaper_ApalisT30.png | Bin 2875 -> 0 bytes .../lxde-common-0.5.5/Wallpaper_ApalisiMX6D.png | Bin 9000 -> 0 bytes .../lxde-common-0.5.5/Wallpaper_ApalisiMX6Q.png | Bin 9086 -> 0 bytes .../lxde-common-0.5.5/Wallpaper_ColibriT20.png | Bin 2907 -> 0 bytes .../lxde-common-0.5.5/Wallpaper_ColibriT30.png | Bin 2900 -> 0 bytes .../lxde-common-0.5.5/Wallpaper_ColibriVF50.png | Bin 3099 -> 0 bytes .../lxde-common-0.5.5/Wallpaper_ColibriVF61.png | Bin 3083 -> 0 bytes .../lxde-common-0.5.5/Wallpaper_ColibriiMX6DL.png | Bin 3147 -> 0 bytes .../lxde-common-0.5.5/Wallpaper_ColibriiMX6S.png | Bin 3089 -> 0 bytes .../lxde-common-0.5.5/Wallpaper_Toradex.png | Bin 2313 -> 0 bytes .../consistent_defconfig_dirs.patch | 12 --- .../lxde-common/lxde-common-0.5.5/defaults.list | 19 ----- .../lxde-common/lxde-common-0.5.5/desktop.conf | 30 -------- .../lxde-common-0.5.5/mx6/panel-buttons.patch | 14 ---- .../lxde-common-0.5.5/tegra/panel-buttons.patch | 14 ---- .../lxde-common-0.5.5/vf60/panel-buttons.patch | 14 ---- .../lxde-common/lxde-common-0.5.5/wallpaper.patch | 16 ---- .../lxde-common/Wallpaper_ApalisT30.png | Bin 0 -> 2875 bytes .../lxde-common/Wallpaper_ApalisiMX6D.png | Bin 0 -> 9000 bytes .../lxde-common/Wallpaper_ApalisiMX6Q.png | Bin 0 -> 9086 bytes .../lxde-common/Wallpaper_ColibriT20.png | Bin 0 -> 2907 bytes .../lxde-common/Wallpaper_ColibriT30.png | Bin 0 -> 2900 bytes .../lxde-common/Wallpaper_ColibriVF50.png | Bin 0 -> 3099 bytes .../lxde-common/Wallpaper_ColibriVF61.png | Bin 0 -> 3083 bytes .../lxde-common/Wallpaper_ColibriiMX6DL.png | Bin 0 -> 3147 bytes .../lxde-common/Wallpaper_ColibriiMX6S.png | Bin 0 -> 3089 bytes .../lxde-common/lxde-common/Wallpaper_Toradex.png | Bin 0 -> 2313 bytes recipes-lxde/lxde-common/lxde-common/defaults.list | 19 +++++ recipes-lxde/lxde-common/lxde-common/desktop.conf | 30 ++++++++ .../lxde-common/mx6/panel-buttons.patch | 14 ++++ .../lxde-common/tegra/panel-buttons.patch | 14 ++++ .../lxde-common/vf60/panel-buttons.patch | 14 ++++ .../lxde-common/lxde-common/wallpaper.patch | 16 ++++ recipes-lxde/lxde-common/lxde-common_%.bbappend | 83 ++++++++++++++++++++ .../lxde-common/lxde-common_0.5.5.bbappend | 84 --------------------- 35 files changed, 190 insertions(+), 203 deletions(-) delete mode 100644 recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ApalisT30.png delete mode 100755 recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ApalisiMX6D.png delete mode 100755 recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ApalisiMX6Q.png delete mode 100644 recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriT20.png delete mode 100644 recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriT30.png delete mode 100644 recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriVF50.png delete mode 100644 recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriVF61.png delete mode 100644 recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriiMX6DL.png delete mode 100644 recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriiMX6S.png delete mode 100644 recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_Toradex.png delete mode 100644 recipes-lxde/lxde-common/lxde-common-0.5.5/consistent_defconfig_dirs.patch delete mode 100644 recipes-lxde/lxde-common/lxde-common-0.5.5/defaults.list delete mode 100644 recipes-lxde/lxde-common/lxde-common-0.5.5/desktop.conf delete mode 100644 recipes-lxde/lxde-common/lxde-common-0.5.5/mx6/panel-buttons.patch delete mode 100644 recipes-lxde/lxde-common/lxde-common-0.5.5/tegra/panel-buttons.patch delete mode 100644 recipes-lxde/lxde-common/lxde-common-0.5.5/vf60/panel-buttons.patch delete mode 100644 recipes-lxde/lxde-common/lxde-common-0.5.5/wallpaper.patch create mode 100644 recipes-lxde/lxde-common/lxde-common/Wallpaper_ApalisT30.png create mode 100755 recipes-lxde/lxde-common/lxde-common/Wallpaper_ApalisiMX6D.png create mode 100755 recipes-lxde/lxde-common/lxde-common/Wallpaper_ApalisiMX6Q.png create mode 100644 recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriT20.png create mode 100644 recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriT30.png create mode 100644 recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriVF50.png create mode 100644 recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriVF61.png create mode 100644 recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriiMX6DL.png create mode 100644 recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriiMX6S.png create mode 100644 recipes-lxde/lxde-common/lxde-common/Wallpaper_Toradex.png create mode 100644 recipes-lxde/lxde-common/lxde-common/defaults.list create mode 100644 recipes-lxde/lxde-common/lxde-common/desktop.conf create mode 100644 recipes-lxde/lxde-common/lxde-common/mx6/panel-buttons.patch create mode 100644 recipes-lxde/lxde-common/lxde-common/tegra/panel-buttons.patch create mode 100644 recipes-lxde/lxde-common/lxde-common/vf60/panel-buttons.patch create mode 100644 recipes-lxde/lxde-common/lxde-common/wallpaper.patch create mode 100644 recipes-lxde/lxde-common/lxde-common_%.bbappend delete mode 100644 recipes-lxde/lxde-common/lxde-common_0.5.5.bbappend (limited to 'recipes-lxde/lxde-common') diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ApalisT30.png b/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ApalisT30.png deleted file mode 100644 index 50473a4..0000000 Binary files a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ApalisT30.png and /dev/null differ diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ApalisiMX6D.png b/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ApalisiMX6D.png deleted file mode 100755 index 5f145d3..0000000 Binary files a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ApalisiMX6D.png and /dev/null differ diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ApalisiMX6Q.png b/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ApalisiMX6Q.png deleted file mode 100755 index 72623c1..0000000 Binary files a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ApalisiMX6Q.png and /dev/null differ diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriT20.png b/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriT20.png deleted file mode 100644 index e91c869..0000000 Binary files a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriT20.png and /dev/null differ diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriT30.png b/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriT30.png deleted file mode 100644 index 6af72d5..0000000 Binary files a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriT30.png and /dev/null differ diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriVF50.png b/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriVF50.png deleted file mode 100644 index d28e967..0000000 Binary files a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriVF50.png and /dev/null differ diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriVF61.png b/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriVF61.png deleted file mode 100644 index 404ae0f..0000000 Binary files a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriVF61.png and /dev/null differ diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriiMX6DL.png b/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriiMX6DL.png deleted file mode 100644 index 37e8c2f..0000000 Binary files a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriiMX6DL.png and /dev/null differ diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriiMX6S.png b/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriiMX6S.png deleted file mode 100644 index faca0ad..0000000 Binary files a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriiMX6S.png and /dev/null differ diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_Toradex.png b/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_Toradex.png deleted file mode 100644 index dc56b11..0000000 Binary files a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_Toradex.png and /dev/null differ diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/consistent_defconfig_dirs.patch b/recipes-lxde/lxde-common/lxde-common-0.5.5/consistent_defconfig_dirs.patch deleted file mode 100644 index 1eff17b..0000000 --- a/recipes-lxde/lxde-common/lxde-common-0.5.5/consistent_defconfig_dirs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urNdb lxde-common-0.5.5.orig//startlxde.in lxde-common-0.5.5//startlxde.in ---- lxde-common-0.5.5.orig//startlxde.in 2011-12-17 22:39:41.000000000 +0100 -+++ lxde-common-0.5.5//startlxde.in 2011-12-17 22:40:22.000000000 +0100 -@@ -8,7 +8,7 @@ - PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm/LXDE" - if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then - mkdir -p "$PCMANFM_CONF_DIR" -- cp @prefix@/share/lxde/pcmanfm/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf" -+ cp /etc/xdg/pcmanfm/LXDE/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf" - fi - - # Ensure the existance of openbox config file diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/defaults.list b/recipes-lxde/lxde-common/lxde-common-0.5.5/defaults.list deleted file mode 100644 index c683923..0000000 --- a/recipes-lxde/lxde-common/lxde-common-0.5.5/defaults.list +++ /dev/null @@ -1,19 +0,0 @@ -[Default Applications] -x-scheme-handler/http=firefox.desktop -text/plain=leafpad.desktop -image/bmp=gpicview.desktop -image/gif=gpicview.desktop -image/jpeg=gpicview.desktop -image/jpg=gpicview.desktop -image/png=gpicview.desktop -image/tiff=gpicview.desktop -image/x-bmp=gpicview.desktop -image/x-pcx=gpicview.desktop -image/x-tga=gpicview.desktop -image/x-portable-pixmap=gpicview.desktop -image/x-portable-bitmap=gpicview.desktop -image/x-targa=gpicview.desktop -image/x-portable-greymap=gpicview.desktop -application/pcx=gpicview.desktop -image/svg+xml=gpicview.desktop -image/svg-xml=gpicview.desktop diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/desktop.conf b/recipes-lxde/lxde-common/lxde-common-0.5.5/desktop.conf deleted file mode 100644 index 7e9862c..0000000 --- a/recipes-lxde/lxde-common/lxde-common-0.5.5/desktop.conf +++ /dev/null @@ -1,30 +0,0 @@ -[Session] -window_manager=openbox-lxde - -[GTK] -sNet/ThemeName=Clearlooks -sNet/IconThemeName=nuoveXT2 -sGtk/FontName=Sans 10 -iGtk/ToolbarStyle=3 -iGtk/ButtonImages=1 -iGtk/MenuImages=1 -iGtk/CursorThemeSize=18 -iXft/Antialias=1 - -sGtk/ColorScheme= -sGtk/CursorThemeName=whiteglass -iGtk/ToolbarIconSize=3 -iNet/EnableEventSounds=1 -iNet/EnableInputFeedbackSounds=1 -iXft/Hinting=1 -sXft/HintStyle=hintfull -sXft/RGBA=rgb - -[Mouse] -AccFactor=20 -AccThreshold=10 -LeftHanded=0 - -[Keyboard] -Delay=500 -Interval=30 diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/mx6/panel-buttons.patch b/recipes-lxde/lxde-common/lxde-common-0.5.5/mx6/panel-buttons.patch deleted file mode 100644 index 45bd988..0000000 --- a/recipes-lxde/lxde-common/lxde-common-0.5.5/mx6/panel-buttons.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- lxde-common-0.5.5/lxpanel/panel.in~ 2011-07-29 16:04:03.000000000 +0200 -+++ lxde-common-0.5.5/lxpanel/panel.in 2012-07-27 14:19:20.661190542 +0200 -@@ -53,7 +53,10 @@ - id=pcmanfm.desktop - } - Button { -- id=firefox.desktop -+ id=mozilla-firefox.desktop -+ } -+ Button { -+ id=lxterminal.desktop - } - } - } diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/tegra/panel-buttons.patch b/recipes-lxde/lxde-common/lxde-common-0.5.5/tegra/panel-buttons.patch deleted file mode 100644 index 45bd988..0000000 --- a/recipes-lxde/lxde-common/lxde-common-0.5.5/tegra/panel-buttons.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- lxde-common-0.5.5/lxpanel/panel.in~ 2011-07-29 16:04:03.000000000 +0200 -+++ lxde-common-0.5.5/lxpanel/panel.in 2012-07-27 14:19:20.661190542 +0200 -@@ -53,7 +53,10 @@ - id=pcmanfm.desktop - } - Button { -- id=firefox.desktop -+ id=mozilla-firefox.desktop -+ } -+ Button { -+ id=lxterminal.desktop - } - } - } diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/vf60/panel-buttons.patch b/recipes-lxde/lxde-common/lxde-common-0.5.5/vf60/panel-buttons.patch deleted file mode 100644 index ceba7f3..0000000 --- a/recipes-lxde/lxde-common/lxde-common-0.5.5/vf60/panel-buttons.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- lxde-common-0.5.5/lxpanel/panel.in~ 2011-07-29 16:04:03.000000000 +0200 -+++ lxde-common-0.5.5/lxpanel/panel.in 2012-07-27 14:19:20.661190542 +0200 -@@ -53,7 +53,10 @@ - id=pcmanfm.desktop - } - Button { -- id=firefox.desktop -+ id=midori.desktop -+ } -+ Button { -+ id=lxterminal.desktop - } - } - } diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/wallpaper.patch b/recipes-lxde/lxde-common/lxde-common-0.5.5/wallpaper.patch deleted file mode 100644 index 0323ca8..0000000 --- a/recipes-lxde/lxde-common/lxde-common-0.5.5/wallpaper.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Naur lxde-common-0.5.5.orig/pcmanfm/pcmanfm.conf.in lxde-common-0.5.5/pcmanfm/pcmanfm.conf.in ---- lxde-common-0.5.5.orig/pcmanfm/pcmanfm.conf.in 2012-01-04 12:57:31.904011602 +0100 -+++ lxde-common-0.5.5/pcmanfm/pcmanfm.conf.in 2012-01-04 12:58:35.854063347 +0100 -@@ -3,9 +3,9 @@ - su_cmd=xdg-su -c '%s' - - [desktop] --wallpaper_mode=1 --wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg --desktop_bg=#000000 -+wallpaper_mode=3 -+wallpaper=@prefix@/share/lxde/wallpapers/toradex.png -+desktop_bg=#00508c - desktop_fg=#ffffff - desktop_shadow=#000000 - diff --git a/recipes-lxde/lxde-common/lxde-common/Wallpaper_ApalisT30.png b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ApalisT30.png new file mode 100644 index 0000000..50473a4 Binary files /dev/null and b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ApalisT30.png differ diff --git a/recipes-lxde/lxde-common/lxde-common/Wallpaper_ApalisiMX6D.png b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ApalisiMX6D.png new file mode 100755 index 0000000..5f145d3 Binary files /dev/null and b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ApalisiMX6D.png differ diff --git a/recipes-lxde/lxde-common/lxde-common/Wallpaper_ApalisiMX6Q.png b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ApalisiMX6Q.png new file mode 100755 index 0000000..72623c1 Binary files /dev/null and b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ApalisiMX6Q.png differ diff --git a/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriT20.png b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriT20.png new file mode 100644 index 0000000..e91c869 Binary files /dev/null and b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriT20.png differ diff --git a/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriT30.png b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriT30.png new file mode 100644 index 0000000..6af72d5 Binary files /dev/null and b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriT30.png differ diff --git a/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriVF50.png b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriVF50.png new file mode 100644 index 0000000..d28e967 Binary files /dev/null and b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriVF50.png differ diff --git a/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriVF61.png b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriVF61.png new file mode 100644 index 0000000..404ae0f Binary files /dev/null and b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriVF61.png differ diff --git a/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriiMX6DL.png b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriiMX6DL.png new file mode 100644 index 0000000..37e8c2f Binary files /dev/null and b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriiMX6DL.png differ diff --git a/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriiMX6S.png b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriiMX6S.png new file mode 100644 index 0000000..faca0ad Binary files /dev/null and b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriiMX6S.png differ diff --git a/recipes-lxde/lxde-common/lxde-common/Wallpaper_Toradex.png b/recipes-lxde/lxde-common/lxde-common/Wallpaper_Toradex.png new file mode 100644 index 0000000..dc56b11 Binary files /dev/null and b/recipes-lxde/lxde-common/lxde-common/Wallpaper_Toradex.png differ diff --git a/recipes-lxde/lxde-common/lxde-common/defaults.list b/recipes-lxde/lxde-common/lxde-common/defaults.list new file mode 100644 index 0000000..c683923 --- /dev/null +++ b/recipes-lxde/lxde-common/lxde-common/defaults.list @@ -0,0 +1,19 @@ +[Default Applications] +x-scheme-handler/http=firefox.desktop +text/plain=leafpad.desktop +image/bmp=gpicview.desktop +image/gif=gpicview.desktop +image/jpeg=gpicview.desktop +image/jpg=gpicview.desktop +image/png=gpicview.desktop +image/tiff=gpicview.desktop +image/x-bmp=gpicview.desktop +image/x-pcx=gpicview.desktop +image/x-tga=gpicview.desktop +image/x-portable-pixmap=gpicview.desktop +image/x-portable-bitmap=gpicview.desktop +image/x-targa=gpicview.desktop +image/x-portable-greymap=gpicview.desktop +application/pcx=gpicview.desktop +image/svg+xml=gpicview.desktop +image/svg-xml=gpicview.desktop diff --git a/recipes-lxde/lxde-common/lxde-common/desktop.conf b/recipes-lxde/lxde-common/lxde-common/desktop.conf new file mode 100644 index 0000000..7e9862c --- /dev/null +++ b/recipes-lxde/lxde-common/lxde-common/desktop.conf @@ -0,0 +1,30 @@ +[Session] +window_manager=openbox-lxde + +[GTK] +sNet/ThemeName=Clearlooks +sNet/IconThemeName=nuoveXT2 +sGtk/FontName=Sans 10 +iGtk/ToolbarStyle=3 +iGtk/ButtonImages=1 +iGtk/MenuImages=1 +iGtk/CursorThemeSize=18 +iXft/Antialias=1 + +sGtk/ColorScheme= +sGtk/CursorThemeName=whiteglass +iGtk/ToolbarIconSize=3 +iNet/EnableEventSounds=1 +iNet/EnableInputFeedbackSounds=1 +iXft/Hinting=1 +sXft/HintStyle=hintfull +sXft/RGBA=rgb + +[Mouse] +AccFactor=20 +AccThreshold=10 +LeftHanded=0 + +[Keyboard] +Delay=500 +Interval=30 diff --git a/recipes-lxde/lxde-common/lxde-common/mx6/panel-buttons.patch b/recipes-lxde/lxde-common/lxde-common/mx6/panel-buttons.patch new file mode 100644 index 0000000..45bd988 --- /dev/null +++ b/recipes-lxde/lxde-common/lxde-common/mx6/panel-buttons.patch @@ -0,0 +1,14 @@ +--- lxde-common-0.5.5/lxpanel/panel.in~ 2011-07-29 16:04:03.000000000 +0200 ++++ lxde-common-0.5.5/lxpanel/panel.in 2012-07-27 14:19:20.661190542 +0200 +@@ -53,7 +53,10 @@ + id=pcmanfm.desktop + } + Button { +- id=firefox.desktop ++ id=mozilla-firefox.desktop ++ } ++ Button { ++ id=lxterminal.desktop + } + } + } diff --git a/recipes-lxde/lxde-common/lxde-common/tegra/panel-buttons.patch b/recipes-lxde/lxde-common/lxde-common/tegra/panel-buttons.patch new file mode 100644 index 0000000..45bd988 --- /dev/null +++ b/recipes-lxde/lxde-common/lxde-common/tegra/panel-buttons.patch @@ -0,0 +1,14 @@ +--- lxde-common-0.5.5/lxpanel/panel.in~ 2011-07-29 16:04:03.000000000 +0200 ++++ lxde-common-0.5.5/lxpanel/panel.in 2012-07-27 14:19:20.661190542 +0200 +@@ -53,7 +53,10 @@ + id=pcmanfm.desktop + } + Button { +- id=firefox.desktop ++ id=mozilla-firefox.desktop ++ } ++ Button { ++ id=lxterminal.desktop + } + } + } diff --git a/recipes-lxde/lxde-common/lxde-common/vf60/panel-buttons.patch b/recipes-lxde/lxde-common/lxde-common/vf60/panel-buttons.patch new file mode 100644 index 0000000..ceba7f3 --- /dev/null +++ b/recipes-lxde/lxde-common/lxde-common/vf60/panel-buttons.patch @@ -0,0 +1,14 @@ +--- lxde-common-0.5.5/lxpanel/panel.in~ 2011-07-29 16:04:03.000000000 +0200 ++++ lxde-common-0.5.5/lxpanel/panel.in 2012-07-27 14:19:20.661190542 +0200 +@@ -53,7 +53,10 @@ + id=pcmanfm.desktop + } + Button { +- id=firefox.desktop ++ id=midori.desktop ++ } ++ Button { ++ id=lxterminal.desktop + } + } + } diff --git a/recipes-lxde/lxde-common/lxde-common/wallpaper.patch b/recipes-lxde/lxde-common/lxde-common/wallpaper.patch new file mode 100644 index 0000000..0323ca8 --- /dev/null +++ b/recipes-lxde/lxde-common/lxde-common/wallpaper.patch @@ -0,0 +1,16 @@ +diff -Naur lxde-common-0.5.5.orig/pcmanfm/pcmanfm.conf.in lxde-common-0.5.5/pcmanfm/pcmanfm.conf.in +--- lxde-common-0.5.5.orig/pcmanfm/pcmanfm.conf.in 2012-01-04 12:57:31.904011602 +0100 ++++ lxde-common-0.5.5/pcmanfm/pcmanfm.conf.in 2012-01-04 12:58:35.854063347 +0100 +@@ -3,9 +3,9 @@ + su_cmd=xdg-su -c '%s' + + [desktop] +-wallpaper_mode=1 +-wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg +-desktop_bg=#000000 ++wallpaper_mode=3 ++wallpaper=@prefix@/share/lxde/wallpapers/toradex.png ++desktop_bg=#00508c + desktop_fg=#ffffff + desktop_shadow=#000000 + diff --git a/recipes-lxde/lxde-common/lxde-common_%.bbappend b/recipes-lxde/lxde-common/lxde-common_%.bbappend new file mode 100644 index 0000000..16ef21c --- /dev/null +++ b/recipes-lxde/lxde-common/lxde-common_%.bbappend @@ -0,0 +1,83 @@ +WALLPAPER-MACHINE = "Wallpaper_Toradex.png" +WALLPAPER-MACHINE_colibri-t20 = "Wallpaper_ColibriT20.png" +WALLPAPER-MACHINE_colibri-t30 = "Wallpaper_ColibriT30.png" +WALLPAPER-MACHINE_apalis-t30 = "Wallpaper_ApalisT30.png" + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +SRC_URI += " \ + file://Wallpaper_Toradex.png \ + file://${WALLPAPER-MACHINE} \ + file://wallpaper.patch \ + file://desktop.conf \ + file://defaults.list \ + file://panel-buttons.patch \ +" + +# for colibri-vf50, colibri-vf61 we decide on the target during postinst +SRC_URI_append_vf += " \ + file://Wallpaper_ColibriVF50.png \ + file://Wallpaper_ColibriVF61.png \ +" +# for apalis-imx6, we decide on the target during postinst +SRC_URI_append_mx6 += " \ + file://Wallpaper_ApalisiMX6D.png \ + file://Wallpaper_ApalisiMX6Q.png \ + file://Wallpaper_ColibriiMX6DL.png \ + file://Wallpaper_ColibriiMX6S.png \ +" + +do_install_append () { + install -m 0755 -d ${D}/${datadir}/lxde/wallpapers + install -m 0644 ${WORKDIR}/Wallpaper*.png ${D}/${datadir}/lxde/wallpapers/ + ln -sf ${WALLPAPER-MACHINE} ${D}/${datadir}/lxde/wallpapers/toradex.png + rm ${D}/etc/xdg/lxsession/LXDE/desktop.conf + install -m 0644 ${WORKDIR}/desktop.conf ${D}/etc/xdg/lxsession/LXDE/ + install -m 0755 -d ${D}/${datadir}/applications/ + install -m 0644 ${WORKDIR}/defaults.list ${D}/${datadir}/applications/ +} + +pkg_postinst_${PN}_vf () { + # can't do this offline + if [ "x$D" != "x" ]; then + exit 1 + fi + IS_VF50=`grep -c VF50 /proc/cpuinfo` + IS_VF50_DTB=`grep -c toradex,vf500-colibri_vf50 /proc/device-tree/compatible` + IS_VF61=`grep -c VF61 /proc/cpuinfo` + IS_VF61_DTB=`grep -c toradex,vf610-colibri_vf61 /proc/device-tree/compatible` + if [ $IS_VF50 -gt 0 ] || [ $IS_VF50_DTB -gt 0 ]; then + ln -sf Wallpaper_ColibriVF50.png ${datadir}/lxde/wallpapers/toradex.png + elif [ $IS_VF61 -gt 0 ] || [ $IS_VF61_DTB -gt 0 ]; then + ln -sf Wallpaper_ColibriVF61.png ${datadir}/lxde/wallpapers/toradex.png + fi +} + +pkg_postinst_${PN}_mx6 () { + # can't do this offline + if [ "x$D" != "x" ]; then + exit 1 + fi + SOC_TYPE=`cat /sys/bus/soc/devices/soc0/soc_id` + CORES=`grep -c processor /proc/cpuinfo` + case $CORES in + 4) + ln -sf Wallpaper_ApalisiMX6Q.png ${datadir}/lxde/wallpapers/toradex.png + ;; + 2) + if [ "x$SOC_TYPE" = "xi.MX6DL" ]; then + ln -sf Wallpaper_ColibriiMX6DL.png ${datadir}/lxde/wallpapers/toradex.png + else + ln -sf Wallpaper_ApalisiMX6D.png ${datadir}/lxde/wallpapers/toradex.png + fi + ;; + 1) + ln -sf Wallpaper_ColibriiMX6S.png ${datadir}/lxde/wallpapers/toradex.png + ;; + *) + ln -sf Wallpaper_Toradex.png ${datadir}/lxde/wallpapers/toradex.png + ;; + esac +} diff --git a/recipes-lxde/lxde-common/lxde-common_0.5.5.bbappend b/recipes-lxde/lxde-common/lxde-common_0.5.5.bbappend deleted file mode 100644 index 5422bed..0000000 --- a/recipes-lxde/lxde-common/lxde-common_0.5.5.bbappend +++ /dev/null @@ -1,84 +0,0 @@ -WALLPAPER-MACHINE = "Wallpaper_Toradex.png" -WALLPAPER-MACHINE_colibri-t20 = "Wallpaper_ColibriT20.png" -WALLPAPER-MACHINE_colibri-t30 = "Wallpaper_ColibriT30.png" -WALLPAPER-MACHINE_apalis-t30 = "Wallpaper_ApalisT30.png" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -SRC_URI += " \ - file://consistent_defconfig_dirs.patch \ - file://Wallpaper_Toradex.png \ - file://${WALLPAPER-MACHINE} \ - file://wallpaper.patch \ - file://desktop.conf \ - file://defaults.list \ - file://panel-buttons.patch \ -" - -# for colibri-vf50, colibri-vf61 we decide on the target during postinst -SRC_URI_append_vf += " \ - file://Wallpaper_ColibriVF50.png \ - file://Wallpaper_ColibriVF61.png \ -" -# for apalis-imx6, we decide on the target during postinst -SRC_URI_append_mx6 += " \ - file://Wallpaper_ApalisiMX6D.png \ - file://Wallpaper_ApalisiMX6Q.png \ - file://Wallpaper_ColibriiMX6DL.png \ - file://Wallpaper_ColibriiMX6S.png \ -" - -do_install_append () { - install -m 0755 -d ${D}/${datadir}/lxde/wallpapers - install -m 0644 ${WORKDIR}/Wallpaper*.png ${D}/${datadir}/lxde/wallpapers/ - ln -sf ${WALLPAPER-MACHINE} ${D}/${datadir}/lxde/wallpapers/toradex.png - rm ${D}/etc/xdg/lxsession/LXDE/desktop.conf - install -m 0644 ${WORKDIR}/desktop.conf ${D}/etc/xdg/lxsession/LXDE/ - install -m 0755 -d ${D}/${datadir}/applications/ - install -m 0644 ${WORKDIR}/defaults.list ${D}/${datadir}/applications/ -} - -pkg_postinst_${PN}_vf () { - # can't do this offline - if [ "x$D" != "x" ]; then - exit 1 - fi - IS_VF50=`grep -c VF50 /proc/cpuinfo` - IS_VF50_DTB=`grep -c toradex,vf500-colibri_vf50 /proc/device-tree/compatible` - IS_VF61=`grep -c VF61 /proc/cpuinfo` - IS_VF61_DTB=`grep -c toradex,vf610-colibri_vf61 /proc/device-tree/compatible` - if [ $IS_VF50 -gt 0 ] || [ $IS_VF50_DTB -gt 0 ]; then - ln -sf Wallpaper_ColibriVF50.png ${datadir}/lxde/wallpapers/toradex.png - elif [ $IS_VF61 -gt 0 ] || [ $IS_VF61_DTB -gt 0 ]; then - ln -sf Wallpaper_ColibriVF61.png ${datadir}/lxde/wallpapers/toradex.png - fi -} - -pkg_postinst_${PN}_mx6 () { - # can't do this offline - if [ "x$D" != "x" ]; then - exit 1 - fi - SOC_TYPE=`cat /sys/bus/soc/devices/soc0/soc_id` - CORES=`grep -c processor /proc/cpuinfo` - case $CORES in - 4) - ln -sf Wallpaper_ApalisiMX6Q.png ${datadir}/lxde/wallpapers/toradex.png - ;; - 2) - if [ "x$SOC_TYPE" = "xi.MX6DL" ]; then - ln -sf Wallpaper_ColibriiMX6DL.png ${datadir}/lxde/wallpapers/toradex.png - else - ln -sf Wallpaper_ApalisiMX6D.png ${datadir}/lxde/wallpapers/toradex.png - fi - ;; - 1) - ln -sf Wallpaper_ColibriiMX6S.png ${datadir}/lxde/wallpapers/toradex.png - ;; - *) - ln -sf Wallpaper_Toradex.png ${datadir}/lxde/wallpapers/toradex.png - ;; - esac -} -- cgit v1.2.3