From d39ef0deb859e3746647f8afd6e41e8d7ab46c23 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 9 Aug 2016 16:10:08 +0200 Subject: lxde layer bbappends Move the appends on recipe's which are not in an essential required layer into a target layer specific directory and add them only if said layer is active in build/conf/bblayers.conf. Signed-off-by: Max Krummenacher Acked-by: Stefan Agner --- .../recipes-lxde/lxterminal/files/fix_garbled_titlebar.patch | 11 +++++++++++ lxde-layer/recipes-lxde/lxterminal/lxterminal_%.bbappend | 5 +++++ recipes-lxde/lxterminal/files/fix_garbled_titlebar.patch | 11 ----------- recipes-lxde/lxterminal/lxterminal_%.bbappend | 5 ----- 4 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 lxde-layer/recipes-lxde/lxterminal/files/fix_garbled_titlebar.patch create mode 100644 lxde-layer/recipes-lxde/lxterminal/lxterminal_%.bbappend delete mode 100644 recipes-lxde/lxterminal/files/fix_garbled_titlebar.patch delete mode 100644 recipes-lxde/lxterminal/lxterminal_%.bbappend diff --git a/lxde-layer/recipes-lxde/lxterminal/files/fix_garbled_titlebar.patch b/lxde-layer/recipes-lxde/lxterminal/files/fix_garbled_titlebar.patch new file mode 100644 index 0000000..5dcd195 --- /dev/null +++ b/lxde-layer/recipes-lxde/lxterminal/files/fix_garbled_titlebar.patch @@ -0,0 +1,11 @@ +--- lxterminal-0.1.11/src/lxterminal.c.orig 2013-04-02 12:58:03.985684096 +0200 ++++ lxterminal-0.1.11/src/lxterminal.c 2013-04-02 12:56:58.336136155 +0200 +@@ -1220,7 +1220,7 @@ + if (visual != NULL) + gtk_widget_set_visual(terminal->window, visual); + #else +- GdkColormap *colormap = gdk_screen_get_rgba_colormap(gtk_widget_get_screen(GTK_WIDGET(terminal->window))); ++ GdkColormap *colormap = gdk_colormap_get_system(); + if (colormap != NULL) + gtk_widget_set_colormap(terminal->window, colormap); + #endif diff --git a/lxde-layer/recipes-lxde/lxterminal/lxterminal_%.bbappend b/lxde-layer/recipes-lxde/lxterminal/lxterminal_%.bbappend new file mode 100644 index 0000000..1cc9cf1 --- /dev/null +++ b/lxde-layer/recipes-lxde/lxterminal/lxterminal_%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +SRC_URI += " \ + file://fix_garbled_titlebar.patch \ +" diff --git a/recipes-lxde/lxterminal/files/fix_garbled_titlebar.patch b/recipes-lxde/lxterminal/files/fix_garbled_titlebar.patch deleted file mode 100644 index 5dcd195..0000000 --- a/recipes-lxde/lxterminal/files/fix_garbled_titlebar.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lxterminal-0.1.11/src/lxterminal.c.orig 2013-04-02 12:58:03.985684096 +0200 -+++ lxterminal-0.1.11/src/lxterminal.c 2013-04-02 12:56:58.336136155 +0200 -@@ -1220,7 +1220,7 @@ - if (visual != NULL) - gtk_widget_set_visual(terminal->window, visual); - #else -- GdkColormap *colormap = gdk_screen_get_rgba_colormap(gtk_widget_get_screen(GTK_WIDGET(terminal->window))); -+ GdkColormap *colormap = gdk_colormap_get_system(); - if (colormap != NULL) - gtk_widget_set_colormap(terminal->window, colormap); - #endif diff --git a/recipes-lxde/lxterminal/lxterminal_%.bbappend b/recipes-lxde/lxterminal/lxterminal_%.bbappend deleted file mode 100644 index 1cc9cf1..0000000 --- a/recipes-lxde/lxterminal/lxterminal_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI += " \ - file://fix_garbled_titlebar.patch \ -" -- cgit v1.2.3