[PATCHv3 00/30] Port Sato to Gtk+3

[PATCHv3 00/30] Port Sato to Gtk+3

[Jussi Kukkonen]

Latest version of Sato-gtk3 branch. The main problem is with vte
and I'd appreciate input on that: First, it fails to link with
"-pie -fpie". I've added a workaround (see below) but on musl vte
still fails at runtime because /lib/gcc_s.so.1 seems to be missing
symbols?
    # ldd /lib/libgcc_s.so.1 
    ...
    Error relocating /lib/libgcc_s.so.1: __cpu_indicator_init: symbol not found
    Error relocating /lib/libgcc_s.so.1: __cpu_model: symbol not found
Is this a gcc bug?


Changes since v2:
* Rebased
* avahi-ui: Make sure GtkBuilder ui files are installed with GTK+3
* sysprof: Add patch to fix "cast to pointer from integer of
  different size" (on 32bit)
* sysprof: Forward port memory barrier patches for arm & mips
* sysprof: Avoid Werror by setting "--enable-compile-warnings"
* matchbox-desktop: Don't use "install -D --target-directory":
  some versions of install do not like it
* vte: Add SECURITY_NO_PIE_CFLAGS as workaround to avoid linking
  failure in libc_nonshared.a: "undefined reference to 
  __init_array_start" when building with security_flags.inc
* gnome-themes-standard: Add distro feature check


Changes since v1:
* vte: disable vala if gobject-introspection is disabled. This
  fixes build on musl.
* matchbox-desktop: combine the configuration from
  matchbox-desktop-sato into matchbox-desktop recipe
* connman-gnome: Squash two patches that were not supposed to
  be separate


Issues:
* vte link failure worked around with SECURITY_NO_PIE_CFLAGS
* vte on musl fails to work, see discussion above

Original cover letter is included below.

Thanks, 
  Jussi




This patchset updates Sato desktop to Gtk+3. This means some work
on matchbox-* components maintained on yp.org, quite a bit of
integration work, and changes to other recipes to build with Gtk+3
instead of Gtk+2. It's not visually amazing but works in my tests
so I think it's time to get it to master so others can start
improving/complaining on the work so far.


Main changes:
 * Separate panel and window title bars: The combo was clever
   but does not work with client side window decorations.
 * No more green: The Gtk+ theme is Adwaita (upstream default) and
   the window manager theme tries to work with that.
 * gtk+ is no longer part of core-image-sato, gtk+3 is.
 * matchbox-desktop-2 had major refactoring, should function the same
 * Image size seems to increase 3-4% (would have increased more but
   icon packages were split).
 * Leafpad editor was replaced with L3afpad, a GTK+3 fork.
   Suggestions for a better alternative are welcome.

Related To-Do list:
 * Desktop styling could use some work (e.g. panel should probably
   be more distinguishable from the desktop)
 * GTK+3 depends on libepoxy which depends on virtual/egl, there's
   no runtime dependency though (#8643)
 * gst-plugins-bad and gst-player should be updated (#9715)
 * connman-gnome should be replaced at some point (#8606)
 * gtk-engines should be moved to meta-gnome (will send a patch)


The following changes since commit a1a0ce1a0064e29159555011ebd667192132e0ce:

  scripts/lib/bsp/engine.py: Added missing parentheses to string formatting (2016-06-12 23:47:19 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib jku/sato-gtk3
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/sato-gtk3

Jussi Kukkonen (28):
  matchbox-theme-sato: Upgrade to 0.2
  matchbox-desktop: Ugrade to 2.1
  matchbox-panel-2: Upgrade to 2.10
  sato-screenshot: Upgrade to 0.2
  settings-daemon: Upgrade to 0.0.2
  matchbox-wm: Upgrade to 1.2.1
  connman-gnome: Add patch to port to Gtk+3
  matchbox-keyboard: Enable GTK+3 IM module
  packagegroup-core-x11: Use adwaita icons instead of sato
  vte: Upgrade to 0.44.1
  matchbox-terminal: Upgrade to 0.1
  puzzles: Use Gtk+3 by default
  gst-player: Start building with Gtk+3
  matchbox-config-gtk: Upgrade to 0.2
  leafpad: Replace with L3afpad
  libowl: Remove as unused
  packagegroup-core-x11-sato: Remove gtk-sato-engine
  gtk+: RRECOMMEND adwaita theme
  webkitgtk: Disable Gtk2 plugin process by default
  avahi-ui: Build with Gtk+3
  sysprof: Upgrade to git version slightly past 3.20
  matchbox-session-sato: Update session startup
  matchbox-desktop: Add Sato folder configuration
  packagegroup-self-hosted: Remove unused theme, use Adwaita icons
  gtk-sato-engine: Remove as unused
  sato-icon-theme: remove as unused
  gtk-engines: Remove as unused
  gnome-themes-standard: Use distro_features_check for GTK+2

Maxin B. John (2):
  pcmanfm: switch to GTK3 version
  libfm: switch to GTK3 version

 meta/conf/distro/include/security_flags.inc        |   2 +
 meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb |  11 +-
 ...c-install-GtkBuilder-interface-files-for-.patch |  28 +++
 .../connman/connman-gnome/0001-Port-to-Gtk3.patch  | 277 +++++++++++++++++++++
 .../connman/connman-gnome_0.7.bb                   |   5 +-
 .../packagegroups/packagegroup-self-hosted.bb      |   6 +-
 .../gnome/gnome-themes-standard_3.18.0.bb          |   4 +-
 meta/recipes-gnome/gtk+/gtk+.inc                   |   9 +-
 .../gtk-engines/gtk-engines-2.20.2/glib-2.32.patch |  23 --
 .../gtk-engines-2.20.2/substitute-tests.patch      |  37 ---
 .../gtk-engines/gtk-engines_2.20.2.bb              |  55 ----
 .../builder/files/builder_session.sh               |   4 +-
 .../{matchbox-wm_git.bb => matchbox-wm_1.2.1.bb}   |   5 +-
 .../sysprof/files/0001-Avoid-building-docs.patch   |  42 ++++
 .../0001-Disable-check-for-polkit-for-UI.patch     |  32 +++
 ...ward-port-mips-arm-memory-barrier-patches.patch |  38 +++
 .../files/0001-callgraph-Use-U64_TO_POINTER.patch  |  29 +++
 .../sysprof/files/define-NT_GNU_BUILD_ID.patch     |   4 +-
 .../sysprof/files/gui-argument.patch               |  35 ---
 meta/recipes-kernel/sysprof/files/rmb-arm.patch    |  21 --
 meta/recipes-kernel/sysprof/files/rmb-mips.patch   |  22 --
 meta/recipes-kernel/sysprof/sysprof_git.bb         |  34 +--
 .../gstreamer/gst-player/gst-player.desktop        |   2 +-
 .../gstreamer/gst-player/gtk2.patch                |  71 ------
 .../recipes-multimedia/gstreamer/gst-player_git.bb |   5 +-
 meta/recipes-sato/gtk-engines/gtk-sato-engine.inc  |  25 --
 .../gtk-engines/gtk-sato-engine_git.bb             |  14 --
 meta/recipes-sato/l3afpad/l3afpad_git.bb           |  23 ++
 meta/recipes-sato/leafpad/files/leafpad.desktop    |  10 -
 meta/recipes-sato/leafpad/files/owl-menu.patch     |  63 -----
 ...gtkprint-.c-Fix-security-formatting-issue.patch |  81 ------
 meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb      |  37 ---
 meta/recipes-sato/libowl/libowl_git.bb             |  23 --
 .../matchbox-config-gtk/files/no-handed.patch      |  26 +-
 ...onfig-gtk_git.bb => matchbox-config-gtk_0.2.bb} |  11 +-
 .../matchbox-desktop-sato_git.bb                   |  22 --
 .../matchbox-desktop/files/vfolders/All.directory  |   5 +
 .../files/vfolders/Applications.directory          |   6 +
 .../files/vfolders/Games.directory                 |   9 +
 .../matchbox-desktop/files/vfolders/Root.order     |   4 +
 .../files/vfolders/Settings.directory              |   8 +
 ...hbox-desktop_git.bb => matchbox-desktop_2.1.bb} |  16 +-
 .../matchbox-keyboard/matchbox-keyboard_git.bb     |   6 +-
 .../matchbox-panel-2/files/silence-warnings.patch  |  64 -----
 ...box-panel-2_git.bb => matchbox-panel-2_2.10.bb} |  15 +-
 .../matchbox-session-sato/index.theme              |   7 +
 .../matchbox-sato/matchbox-session-sato/session    |   9 +-
 .../matchbox-sato/matchbox-session-sato_0.1.bb     |  11 +-
 ...ox-terminal_git.bb => matchbox-terminal_0.1.bb} |   8 +-
 .../matchbox-theme-sato/matchbox-theme-sato_0.1.bb |   8 -
 .../matchbox-theme-sato/matchbox-theme-sato_0.2.bb |   7 +
 .../matchbox-theme-sato/matchbox-theme-sato_git.bb |  12 -
 .../packagegroups/packagegroup-core-x11-sato.bb    |   5 +-
 meta/recipes-sato/pcmanfm/pcmanfm_1.2.4.bb         |   5 +-
 meta/recipes-sato/puzzles/puzzles_git.bb           |  18 +-
 .../0001-Inherit-the-GNOME-icon-theme.patch        |  31 ---
 .../sato-icon-theme/sato-icon-theme_0.4.1.bb       |  40 ---
 ...to-screenshot_git.bb => sato-screenshot_0.2.bb} |   7 +-
 .../files/dso_linking_change_build_fix.patch       |  31 ---
 ...ings-daemon_git.bb => settings-daemon_0.0.2.bb} |   9 +-
 meta/recipes-sato/webkit/webkitgtk_2.12.3.bb       |   1 -
 meta/recipes-support/libfm/libfm_1.2.4.bb          |   6 +-
 .../vte/vte-0.28.2/cve-2012-2738.patch             | 136 ----------
 .../vte/vte-0.28.2/obsolete_automake_macros.patch  |  14 --
 meta/recipes-support/vte/vte.inc                   |  15 --
 ...-Don-t-enable-stack-protection-by-default.patch |  29 +++
 meta/recipes-support/vte/vte_0.28.2.bb             |  16 --
 meta/recipes-support/vte/vte_0.44.1.bb             |  24 ++
 68 files changed, 708 insertions(+), 1010 deletions(-)
 create mode 100644 meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch
 create mode 100644 meta/recipes-connectivity/connman/connman-gnome/0001-Port-to-Gtk3.patch
 delete mode 100644 meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch
 delete mode 100644 meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch
 delete mode 100644 meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
 rename meta/recipes-graphics/matchbox-wm/{matchbox-wm_git.bb => matchbox-wm_1.2.1.bb} (94%)
 create mode 100644 meta/recipes-kernel/sysprof/files/0001-Avoid-building-docs.patch
 create mode 100644 meta/recipes-kernel/sysprof/files/0001-Disable-check-for-polkit-for-UI.patch
 create mode 100644 meta/recipes-kernel/sysprof/files/0001-Forward-port-mips-arm-memory-barrier-patches.patch
 create mode 100644 meta/recipes-kernel/sysprof/files/0001-callgraph-Use-U64_TO_POINTER.patch
 delete mode 100644 meta/recipes-kernel/sysprof/files/gui-argument.patch
 delete mode 100644 meta/recipes-kernel/sysprof/files/rmb-arm.patch
 delete mode 100644 meta/recipes-kernel/sysprof/files/rmb-mips.patch
 delete mode 100644 meta/recipes-multimedia/gstreamer/gst-player/gtk2.patch
 delete mode 100644 meta/recipes-sato/gtk-engines/gtk-sato-engine.inc
 delete mode 100644 meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb
 create mode 100644 meta/recipes-sato/l3afpad/l3afpad_git.bb
 delete mode 100644 meta/recipes-sato/leafpad/files/leafpad.desktop
 delete mode 100644 meta/recipes-sato/leafpad/files/owl-menu.patch
 delete mode 100644 meta/recipes-sato/leafpad/files/src-dialog-gtkprint-.c-Fix-security-formatting-issue.patch
 delete mode 100644 meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
 delete mode 100644 meta/recipes-sato/libowl/libowl_git.bb
 rename meta/recipes-sato/matchbox-config-gtk/{matchbox-config-gtk_git.bb => matchbox-config-gtk_0.2.bb} (80%)
 delete mode 100644 meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb
 create mode 100644 meta/recipes-sato/matchbox-desktop/files/vfolders/All.directory
 create mode 100644 meta/recipes-sato/matchbox-desktop/files/vfolders/Applications.directory
 create mode 100644 meta/recipes-sato/matchbox-desktop/files/vfolders/Games.directory
 create mode 100644 meta/recipes-sato/matchbox-desktop/files/vfolders/Root.order
 create mode 100644 meta/recipes-sato/matchbox-desktop/files/vfolders/Settings.directory
 rename meta/recipes-sato/matchbox-desktop/{matchbox-desktop_git.bb => matchbox-desktop_2.1.bb} (67%)
 delete mode 100644 meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch
 rename meta/recipes-sato/matchbox-panel-2/{matchbox-panel-2_git.bb => matchbox-panel-2_2.10.bb} (74%)
 create mode 100644 meta/recipes-sato/matchbox-sato/matchbox-session-sato/index.theme
 rename meta/recipes-sato/matchbox-terminal/{matchbox-terminal_git.bb => matchbox-terminal_0.1.bb} (76%)
 delete mode 100644 meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.1.bb
 create mode 100644 meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb
 delete mode 100644 meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb
 delete mode 100644 meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch
 delete mode 100644 meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
 rename meta/recipes-sato/sato-screenshot/{sato-screenshot_git.bb => sato-screenshot_0.2.bb} (86%)
 delete mode 100644 meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch
 rename meta/recipes-sato/settings-daemon/{settings-daemon_git.bb => settings-daemon_0.0.2.bb} (85%)
 delete mode 100644 meta/recipes-support/vte/vte-0.28.2/cve-2012-2738.patch
 delete mode 100644 meta/recipes-support/vte/vte-0.28.2/obsolete_automake_macros.patch
 delete mode 100644 meta/recipes-support/vte/vte.inc
 create mode 100644 meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch
 delete mode 100644 meta/recipes-support/vte/vte_0.28.2.bb
 create mode 100644 meta/recipes-support/vte/vte_0.44.1.bb

-- 
2.1.4

[PATCHv3 01/30] matchbox-theme-sato: Upgrade to 0.2

[Jussi Kukkonen]

New theme is tries to be more compatible with Adwaita: titlebar is
thinner, colors are mostly uniform gray instead of green.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../matchbox-theme-sato/matchbox-theme-sato_0.1.bb           |  8 --------
 .../matchbox-theme-sato/matchbox-theme-sato_0.2.bb           |  7 +++++++
 .../matchbox-theme-sato/matchbox-theme-sato_git.bb           | 12 ------------
 3 files changed, 7 insertions(+), 20 deletions(-)
 delete mode 100644 meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.1.bb
 create mode 100644 meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb
 delete mode 100644 meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb

diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.1.bb b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.1.bb
deleted file mode 100644
index f6786dd..0000000
--- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require matchbox-theme-sato.inc
-
-PR = "r1"
-
-SRC_URI = "http://pokylinux.org/releases/sato/matchbox-theme-sato-0.1.tar.gz"
-
-SRC_URI[md5sum] = "72ae272ef7803141a3dcb69e670cff97"
-SRC_URI[sha256sum] = "5b59f9646edbfb907a309332db3bd6fa7080dc1fe24df549480cfae7d974a3fb"
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb
new file mode 100644
index 0000000..8fc6bb3
--- /dev/null
+++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb
@@ -0,0 +1,7 @@
+require matchbox-theme-sato.inc
+
+# SRCREV tagged 0.2
+SRCREV = "df085ba9cdaeaf2956890b0e29d7ea1779bf6c78"
+SRC_URI = "git://git.yoctoproject.org/matchbox-sato"
+
+S = "${WORKDIR}/git"
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb
deleted file mode 100644
index 0d3569d..0000000
--- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require matchbox-theme-sato.inc
-
-SRCREV = "f72cf4ed7d71ad9e47b0f2d3dbc593bc2f3e76f8"
-PV = "0.2+git${SRCPV}"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "git://git.yoctoproject.org/matchbox-sato"
-
-EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}"
-
-S = "${WORKDIR}/git"
-- 
2.1.4

[PATCHv3 02/30] matchbox-desktop: Ugrade to 2.1

[Jussi Kukkonen]

Changes since 2.0
* Ported to GTK+3
* Removed deprecated API use, started using new
  GTK+ features like FlowBox instead of custom code
* Added --mode for easier debugging

One of the LIC_FILES_CHKSUM files was removed upstream.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../{matchbox-desktop_git.bb => matchbox-desktop_2.1.bb}      | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
 rename meta/recipes-sato/matchbox-desktop/{matchbox-desktop_git.bb => matchbox-desktop_2.1.bb} (65%)

diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.1.bb
similarity index 65%
rename from meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb
rename to meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.1.bb
index dbe8c11..d6c53b0 100644
--- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb
+++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.1.bb
@@ -4,18 +4,15 @@ BUGTRACKER = "http://bugzilla.yoctoproject.org/"
 
 LICENSE = "GPLv2+ & LGPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
-                    file://libtaku/eggsequence.h;endline=20;md5=b91f68f7642a1459fa1f4c9df94a8f15 \
                     file://src/desktop.c;endline=20;md5=36c9bf295e6007f3423095f405af5a2d \
                     file://src/main.c;endline=19;md5=2044244f97a195c25b7dc602ac7e9a00"
 
-DEPENDS = "gtk+ startup-notification dbus"
+DEPENDS = "gtk+3 startup-notification dbus"
 SECTION = "x11/wm"
-SRCREV = "71e3e6e04271e9d5a14f1c231ef100c7f320134d"
-PV = "2.0+git${SRCPV}"
 
-SRC_URI = "git://git.yoctoproject.org/${BPN}-2 \
-           file://0001-Do-nothing-on-delete-event-when-not-STANDALONE.patch \
-           "
+# SRCREV tagged 2.1
+SRCREV = "c8473519a0f37488b8b3e839e275b000cdde0b80"
+SRC_URI = "git://git.yoctoproject.org/${BPN}-2"
 
 EXTRA_OECONF = "--enable-startup-notification --with-dbus"
 
-- 
2.1.4

[PATCHv3 03/30] matchbox-panel-2: Upgrade to 2.10

[Jussi Kukkonen]

* Changes in 2.10:
   - Port to GTK3, avoid all deprecated API
   - Add --mode for easier testing
* Remove a backported patch.
* License checksum changes because copyright years change

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../matchbox-panel-2/files/silence-warnings.patch  | 64 ----------------------
 ...box-panel-2_git.bb => matchbox-panel-2_2.10.bb} | 15 +++--
 2 files changed, 7 insertions(+), 72 deletions(-)
 delete mode 100644 meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch
 rename meta/recipes-sato/matchbox-panel-2/{matchbox-panel-2_git.bb => matchbox-panel-2_2.10.bb} (74%)

diff --git a/meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch b/meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch
deleted file mode 100644
index 45ba9a0..0000000
--- a/meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Don't warn if the machine doesn't actually have a battery, or if the applets
-string contains consecutive separators.
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-diff --git a/applets/battery/battery-acpi.c b/applets/battery/battery-acpi.c
-index 6515cb0..c44dd12 100644
---- a/applets/battery/battery-acpi.c
-+++ b/applets/battery/battery-acpi.c
-@@ -14,8 +14,6 @@ int batt_state, ac_state;
- int pm_support(void)
- {
- 	if(check_acpi_support() == NOT_SUPPORTED){
--		g_warning("No ACPI support\n");
--
- 		return 0;
- 	}
- 
-@@ -32,8 +30,9 @@ const char* pm_battery_icon(void)
- 	const char *icon;
- 	battery_t *binfo;
- 
-+        /* No battery available (not present, disabled, or something
-+           else. Silently do nothing. */
- 	if (batt_state != SUCCESS) {
--		g_warning("Couldnt initialize ACPI battery\n");
- 		return NULL;
- 	}
- 
-diff --git a/applets/battery/battery-apm.c b/applets/battery/battery-apm.c
-index 5467438..2f39cb6 100644
---- a/applets/battery/battery-apm.c
-+++ b/applets/battery/battery-apm.c
-@@ -10,8 +10,6 @@
- int pm_support(void)
- {
- 	if (1 == apm_exists ()) {
--                g_warning ("No APM support");
--
-                 return 0;
-         }
- 
-diff --git a/matchbox-panel/mb-panel.c b/matchbox-panel/mb-panel.c
-index 2d8cafd..828a36d 100644
---- a/matchbox-panel/mb-panel.c
-+++ b/matchbox-panel/mb-panel.c
-@@ -110,10 +110,15 @@ load_applets (const char    *applets_desc,
-         applets = g_strsplit (applets_desc, ",", -1);
- 
-         for (i = 0; applets[i]; i++) {
-+                char *s;
-                 char **bits;
-                 GtkWidget *applet;
- 
--                bits = g_strsplit (applets[i], ":", 2);
-+                s = applets[i];
-+                if (s == NULL || s[0] == '\0')
-+                        continue;
-+
-+                bits = g_strsplit (s, ":", 2);
- 
-                 applet = load_applet (bits[0],
-                                       bits[1],
diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.10.bb
similarity index 74%
rename from meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
rename to meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.10.bb
index ff35b33..3ccd6a26 100644
--- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
+++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.10.bb
@@ -5,25 +5,23 @@ BUGTRACKER = "http://bugzilla.yoctoproject.org/"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://matchbox-panel/mb-panel.h;endline=10;md5=0b7db28f4b6863fb853d0467e590019a \
-                    file://applets/startup/startup.c;endline=22;md5=b0a64fbef3097d79f8264e6907a98f03"
+                    file://applets/startup/startup.c;endline=22;md5=7cbcea60b667f609495222faf3e07917"
 
-DEPENDS = "gnome-common gtk+ startup-notification dbus dbus-glib dbus-glib-native"
+DEPENDS = "gnome-common gtk+3 startup-notification dbus dbus-glib dbus-glib-native"
 DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}"
 DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
 
 # The startup-notification requires x11 in DISTRO_FEATURES
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRCREV = "26a3a67b41c50e0ae163d8fe86ccf7a0f0a671ae"
-PV = "2.0+git${SRCPV}"
+# SRCREV tagged 2.10
+SRCREV = "145a8075c66952dad9ab5f36d944c78c1ae3f4ab"
 
 RPROVIDES_${PN} = "matchbox-panel"
 RREPLACES_${PN} = "matchbox-panel"
 RCONFLICTS_${PN} = "matchbox-panel"
 
-SRC_URI = "git://git.yoctoproject.org/${BPN} \
-           file://0001-showdesktop-Make-sure-active-state-is-initialized.patch \
-           file://silence-warnings.patch"
+SRC_URI = "git://git.yoctoproject.org/${BPN}"
 
 EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
 EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}"
@@ -33,7 +31,8 @@ S = "${WORKDIR}/git"
 
 FILES_${PN} += "${libdir}/matchbox-panel/*.so \
                 ${datadir}/matchbox-panel/brightness/*.png \
-                ${datadir}/matchbox-panel/startup/*.png "
+                ${datadir}/matchbox-panel/startup/*.png \
+                ${datadir}/icons/"
 FILES_${PN}-dev += "${libdir}/matchbox-panel/*.la"
 
 inherit autotools pkgconfig distro_features_check
-- 
2.1.4

[PATCHv3 04/30] sato-screenshot: Upgrade to 0.2

[Jussi Kukkonen]

New version supports Gtk+3.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../{sato-screenshot_git.bb => sato-screenshot_0.2.bb}             | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
 rename meta/recipes-sato/sato-screenshot/{sato-screenshot_git.bb => sato-screenshot_0.2.bb} (86%)

diff --git a/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb b/meta/recipes-sato/sato-screenshot/sato-screenshot_0.2.bb
similarity index 86%
rename from meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
rename to meta/recipes-sato/sato-screenshot/sato-screenshot_0.2.bb
index 1b2b65d..92f0ee1 100644
--- a/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
+++ b/meta/recipes-sato/sato-screenshot/sato-screenshot_0.2.bb
@@ -7,11 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://main.c;endline=9;md5=023e14d6404d0a961eb97cbd011fc141 \
                     file://screenshot-ui.h;endline=9;md5=638d9ffa83e9325a36df224166ed6ad0"
 
-DEPENDS = "matchbox-panel-2"
-SRCREV = "3a9688e8a01b63a78f402b4e7c0b8b005fcdfa29"
-PV = "0.1+git${SRCPV}"
-PR = "r2"
+DEPENDS = "matchbox-panel-2 gtk+3"
 
+# SRCREV tagged 0.2
+SRCREV = "5db2672fb857b2c80b949d8fce92e0f0029cc947"
 SRC_URI = "git://git.yoctoproject.org/screenshot"
 
 S = "${WORKDIR}/git"
-- 
2.1.4

[PATCHv3 05/30] settings-daemon: Upgrade to 0.0.2

[Jussi Kukkonen]

* New versions builds with gdk-x11-3.0 and supports gconf key
  "matchbox_theme".
* Remove patch that's already upstream.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../files/dso_linking_change_build_fix.patch       | 31 ----------------------
 ...ings-daemon_git.bb => settings-daemon_0.0.2.bb} |  9 +++----
 2 files changed, 4 insertions(+), 36 deletions(-)
 delete mode 100644 meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch
 rename meta/recipes-sato/settings-daemon/{settings-daemon_git.bb => settings-daemon_0.0.2.bb} (85%)

diff --git a/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch b/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch
deleted file mode 100644
index 5943744..0000000
--- a/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-after gcc linking has changed, all the libraries must be explicitely specified to for linking. 
-This patch avoids this linking error:
-
-| make  all-am^M
-| make[1]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/settings-daemon-0.0+svnr2059-r3/settings-daemon'^M
-| ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -Wall -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types  -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o settings-daemon settings_daemon-xsettings-common.o settings_daemon-xsettings-manager.o settings_daemon-settings-daemon.o -pthread -lgconf-2 -ldbus-glib-1 -ldbus-1 -lpthread -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0^M
-| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: *^A: invalid DSO for symbol `XCreateSimpleWindow' definition^M
-| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libX11.so.6: could not read symbols: Bad value^M
-| collect2: ld returned 1 exit status^M
-| make[1]: *** [settings-daemon] Error 1^M
-| make[1]: Leaving directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/settings-daemon-0.0+svnr2059-r3/settings-daemon'^M
-| make: *** [all] Error 2^M
-
-Nitin A Kamble <nitin.a.kamble@intel.com>
-Date: 2011/01/11
-
-Index: settings-daemon/configure.ac
-===================================================================
---- settings-daemon.orig/configure.ac
-+++ settings-daemon/configure.ac
-@@ -14,7 +14,7 @@ AC_PROG_CC
- 
- 
- dnl TODO: make gconf optional
--PKG_CHECK_MODULES(APP, [gconf-2.0 gdk-x11-2.0])
-+PKG_CHECK_MODULES(APP, [gconf-2.0 gdk-x11-2.0 x11])
- 
- 
- AC_SUBST(APP_CFLAGS)
diff --git a/meta/recipes-sato/settings-daemon/settings-daemon_git.bb b/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb
similarity index 85%
rename from meta/recipes-sato/settings-daemon/settings-daemon_git.bb
rename to meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb
index c061553..56eb656 100644
--- a/meta/recipes-sato/settings-daemon/settings-daemon_git.bb
+++ b/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb
@@ -4,16 +4,15 @@ BUGTRACKER = "http://bugzilla.yoctoproject.org/"
 LICENSE = "MIT-style"
 LIC_FILES_CHKSUM = "file://xsettings-manager.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \
                     file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b"
-DEPENDS = "gconf glib-2.0 gtk+"
+DEPENDS = "gconf glib-2.0 gtk+3"
 SECTION = "x11"
-SRCREV = "9a99528b02255450db81176abd9bbcc1dab9a4c1"
-PV = "0.0+git${SRCPV}"
-
 
+# SRCREV tagged 0.0.2
+SRCREV = "b2e5da502f8c5ff75e9e6da771372ef8e40fd9a2"
 SRC_URI = "git://git.yoctoproject.org/xsettings-daemon \
            file://addsoundkeys.patch;apply=yes \
            file://70settings-daemon.sh \
-           file://dso_linking_change_build_fix.patch"
+           "
 
 S = "${WORKDIR}/git"
 
-- 
2.1.4

[PATCHv3 06/30] matchbox-wm: Upgrade to 1.2.1

[Jussi Kukkonen]

New version does not change MBWM theme when the Gtk+ theme
is changed using Net/ThemeName X property.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../matchbox-wm/{matchbox-wm_git.bb => matchbox-wm_1.2.1.bb}         | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/matchbox-wm/{matchbox-wm_git.bb => matchbox-wm_1.2.1.bb} (94%)

diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.1.bb
similarity index 94%
rename from meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb
rename to meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.1.bb
index aa76828..c3d2d23 100644
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb
+++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.1.bb
@@ -10,9 +10,8 @@ LIC_FILES_CHKSUM = "file://src/wm.h;endline=21;md5=a7e844465edbcf79c282369f93caa
 SECTION = "x11/wm"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat gconf libxcursor libxfixes"
 
-SRCREV = "8178e70d5c742c4cd63b51df228cc8aa3594d518"
-PV = "1.2+git${SRCPV}"
-
+# SRCREV tagged 1.2.1
+SRCREV = "9fd1806dfa7c8f2202db18b7bc880857a3019f8c"
 SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager \
            file://kbdconfig"
 
-- 
2.1.4

[PATCHv3 07/30] connman-gnome: Add patch to port to Gtk+3

[Jussi Kukkonen]

Upstream is not really active anymore: patch the Gtk+3 upgrade
in for now (long term solution is to change to another UI).

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../connman/connman-gnome/0001-Port-to-Gtk3.patch  | 277 +++++++++++++++++++++
 .../connman/connman-gnome_0.7.bb                   |   5 +-
 2 files changed, 280 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-connectivity/connman/connman-gnome/0001-Port-to-Gtk3.patch

diff --git a/meta/recipes-connectivity/connman/connman-gnome/0001-Port-to-Gtk3.patch b/meta/recipes-connectivity/connman/connman-gnome/0001-Port-to-Gtk3.patch
new file mode 100644
index 0000000..c93e9b4
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman-gnome/0001-Port-to-Gtk3.patch
@@ -0,0 +1,277 @@
+From a59b0fac02e74a971ac3f08bf28c17ce361a9526 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Wed, 2 Mar 2016 15:47:49 +0200
+Subject: [PATCH] Port to Gtk3
+
+Some unused (or not useful) code was removed, functionality should stay
+the same.
+
+Code still contains quite a few uses of deprecated API.
+
+Upstream-Status: Submitted
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+---
+ applet/agent.c        |  3 +--
+ applet/main.c         | 43 -------------------------------------------
+ applet/status.c       |  8 --------
+ configure.ac          |  3 +--
+ properties/ethernet.c | 14 +++++++-------
+ properties/main.c     |  2 +-
+ properties/wifi.c     | 12 ++++++------
+ 7 files changed, 16 insertions(+), 69 deletions(-)
+
+diff --git a/applet/agent.c b/applet/agent.c
+index 65bed08..04fe86a 100644
+--- a/applet/agent.c
++++ b/applet/agent.c
+@@ -126,7 +126,6 @@ static void request_input_dialog(GHashTable *request,
+ 	gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
+ 	gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE);
+ 	gtk_window_set_urgency_hint(GTK_WINDOW(dialog), TRUE);
+-	gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
+ 	input->dialog = dialog;
+ 
+ 	gtk_dialog_add_button(GTK_DIALOG(dialog),
+@@ -139,7 +138,7 @@ static void request_input_dialog(GHashTable *request,
+ 	gtk_table_set_row_spacings(GTK_TABLE(table), 4);
+ 	gtk_table_set_col_spacings(GTK_TABLE(table), 20);
+ 	gtk_container_set_border_width(GTK_CONTAINER(table), 12);
+-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), table);
++	gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area (GTK_DIALOG(dialog))), table);
+ 
+ 	label = gtk_label_new(_("Please provide some network information:"));
+ 	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
+diff --git a/applet/main.c b/applet/main.c
+index f12d371..cd16285 100644
+--- a/applet/main.c
++++ b/applet/main.c
+@@ -157,46 +157,6 @@ static void name_owner_changed(DBusGProxy *proxy, const char *name,
+ 	}
+ }
+ 
+-static void open_uri(GtkWindow *parent, const char *uri)
+-{
+-	GtkWidget *dialog;
+-	GdkScreen *screen;
+-	GError *error = NULL;
+-	gchar *cmdline;
+-
+-	screen = gtk_window_get_screen(parent);
+-
+-	cmdline = g_strconcat("xdg-open ", uri, NULL);
+-
+-	if (gdk_spawn_command_line_on_screen(screen,
+-				cmdline, &error) == FALSE) {
+-		dialog = gtk_message_dialog_new(parent,
+-				GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR,
+-				GTK_BUTTONS_CLOSE, "%s", error->message);
+-		gtk_dialog_run(GTK_DIALOG(dialog));
+-		gtk_widget_destroy(dialog);
+-		g_error_free(error);
+-	}
+-
+-	g_free(cmdline);
+-}
+-
+-static void about_url_hook(GtkAboutDialog *dialog,
+-				const gchar *url, gpointer data)
+-{
+-	open_uri(GTK_WINDOW(dialog), url);
+-}
+-
+-static void about_email_hook(GtkAboutDialog *dialog,
+-				const gchar *email, gpointer data)
+-{
+-	gchar *uri;
+-
+-	uri = g_strconcat("mailto:", email, NULL);
+-	open_uri(GTK_WINDOW(dialog), uri);
+-	g_free(uri);
+-}
+-
+ static void about_callback(GtkWidget *item, gpointer user_data)
+ {
+ 	const gchar *authors[] = {
+@@ -204,9 +164,6 @@ static void about_callback(GtkWidget *item, gpointer user_data)
+ 		NULL
+ 	};
+ 
+-	gtk_about_dialog_set_url_hook(about_url_hook, NULL, NULL);
+-	gtk_about_dialog_set_email_hook(about_email_hook, NULL, NULL);
+-
+ 	gtk_show_about_dialog(NULL, "version", VERSION,
+ 			"copyright", "Copyright \xc2\xa9 2008 Intel Corporation",
+ 			"comments", _("A connection manager for the GNOME desktop"),
+diff --git a/applet/status.c b/applet/status.c
+index aed6f1e..015ff29 100644
+--- a/applet/status.c
++++ b/applet/status.c
+@@ -102,8 +102,6 @@ static void icon_animation_start(IconAnimation *animation,
+ {
+ 	available = TRUE;
+ 
+-	gtk_status_icon_set_tooltip(statusicon, NULL);
+-
+ 	animation->start = start;
+ 	animation->end = (end == 0) ? animation->count - 1 : end;
+ 
+@@ -120,8 +118,6 @@ static void icon_animation_stop(IconAnimation *animation)
+ {
+ 	available = TRUE;
+ 
+-	gtk_status_icon_set_tooltip(statusicon, NULL);
+-
+ 	if (animation->id > 0)
+ 		g_source_remove(animation->id);
+ 
+@@ -251,8 +247,6 @@ void status_unavailable(void)
+ 	available = FALSE;
+ 
+ 	gtk_status_icon_set_from_pixbuf(statusicon, pixbuf_notifier);
+-	gtk_status_icon_set_tooltip(statusicon,
+-				"Connection Manager daemon is not running");
+ 
+ 	gtk_status_icon_set_visible(statusicon, TRUE);
+ }
+@@ -299,7 +293,6 @@ static void set_ready(gint signal)
+ 
+ 	if (signal < 0) {
+ 		gtk_status_icon_set_from_pixbuf(statusicon, pixbuf_wired);
+-		gtk_status_icon_set_tooltip(statusicon, NULL);
+ 		return;
+ 	}
+ 
+@@ -311,7 +304,6 @@ static void set_ready(gint signal)
+ 		index = 4;
+ 
+ 	gtk_status_icon_set_from_pixbuf(statusicon, pixbuf_signal[index]);
+-	gtk_status_icon_set_tooltip(statusicon, NULL);
+ }
+ 
+ struct timeout_data {
+diff --git a/configure.ac b/configure.ac
+index b972e07..a4dad5d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,8 +55,7 @@ AC_SUBST(DBUS_LIBS)
+ DBUS_BINDING_TOOL="dbus-binding-tool"
+ AC_SUBST(DBUS_BINDING_TOOL)
+ 
+-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.8, dummy=yes,
+-				AC_MSG_ERROR(gtk+ >= 2.8 is required))
++PKG_CHECK_MODULES(GTK, gtk+-3.0)
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+ 
+diff --git a/properties/ethernet.c b/properties/ethernet.c
+index 31db7a0..0b6b423 100644
+--- a/properties/ethernet.c
++++ b/properties/ethernet.c
+@@ -82,7 +82,7 @@ void add_ethernet_switch_button(GtkWidget *mainbox, GtkTreeIter *iter,
+ 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 24);
+ 	gtk_box_pack_start(GTK_BOX(mainbox), vbox, FALSE, FALSE, 0);
+ 
+-	table = gtk_table_new(1, 1, TRUE);
++	table = gtk_table_new(1, 1, FALSE);
+ 	gtk_table_set_row_spacings(GTK_TABLE(table), 10);
+ 	gtk_table_set_col_spacings(GTK_TABLE(table), 10);
+ 	gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
+@@ -136,7 +136,7 @@ void add_ethernet_service(GtkWidget *mainbox, GtkTreeIter *iter, struct config_d
+ 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 24);
+ 	gtk_box_pack_start(GTK_BOX(mainbox), vbox, FALSE, FALSE, 0);
+ 
+-	table = gtk_table_new(5, 5, TRUE);
++	table = gtk_table_new(5, 5, FALSE);
+ 	gtk_table_set_row_spacings(GTK_TABLE(table), 10);
+ 	gtk_table_set_col_spacings(GTK_TABLE(table), 10);
+ 	gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
+@@ -144,9 +144,9 @@ void add_ethernet_service(GtkWidget *mainbox, GtkTreeIter *iter, struct config_d
+ 	label = gtk_label_new(_("Configuration:"));
+ 	gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 2, 0, 1);
+ 
+-	combo = gtk_combo_box_new_text();
+-	gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "DHCP");
+-	gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "MANUAL");
++	combo = gtk_combo_box_text_new();
++	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), "DHCP");
++	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), "MANUAL");
+ 	gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(combo),
+ 					separator_function, NULL, NULL);
+ 	gtk_table_attach_defaults(GTK_TABLE(table), combo, 2, 4, 0, 1);
+@@ -219,7 +219,7 @@ void update_ethernet_ipv4(struct config_data *data, guint policy)
+ 	case CONNMAN_POLICY_DHCP:
+ 		gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
+ 		for (i = 0; i < 3; i++) {
+-			gtk_entry_set_editable(GTK_ENTRY(entry[i]), 0);
++			gtk_editable_set_editable(GTK_EDITABLE(entry[i]), 0);
+ 			gtk_widget_set_sensitive(entry[i], 0);
+ 			gtk_entry_set_text(GTK_ENTRY(entry[i]), _(""));
+ 		}
+@@ -227,7 +227,7 @@ void update_ethernet_ipv4(struct config_data *data, guint policy)
+ 	case CONNMAN_POLICY_MANUAL:
+ 		gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 1);
+ 		for (i = 0; i < 3; i++) {
+-			gtk_entry_set_editable(GTK_ENTRY(entry[i]), 1);
++			gtk_editable_set_editable(GTK_EDITABLE(entry[i]), 1);
+ 			gtk_widget_set_sensitive(entry[i], 1);
+ 		}
+ 		break;
+diff --git a/properties/main.c b/properties/main.c
+index c05f443..6f76361 100644
+--- a/properties/main.c
++++ b/properties/main.c
+@@ -429,7 +429,7 @@ static GtkWidget *create_interfaces(GtkWidget *window)
+ 
+ 	scrolled = gtk_scrolled_window_new(NULL, NULL);
+ 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
+-				GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
++				GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+ 	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled),
+ 							GTK_SHADOW_OUT);
+ 	gtk_box_pack_start(GTK_BOX(hbox), scrolled, FALSE, TRUE, 0);
+diff --git a/properties/wifi.c b/properties/wifi.c
+index bd325ef..a5827e0 100644
+--- a/properties/wifi.c
++++ b/properties/wifi.c
+@@ -125,7 +125,7 @@ void add_wifi_switch_button(GtkWidget *mainbox, GtkTreeIter *iter,
+ 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 24);
+ 	gtk_box_pack_start(GTK_BOX(mainbox), vbox, FALSE, FALSE, 0);
+ 
+-	table = gtk_table_new(1, 1, TRUE);
++	table = gtk_table_new(1, 1, FALSE);
+ 	gtk_table_set_row_spacings(GTK_TABLE(table), 10);
+ 	gtk_table_set_col_spacings(GTK_TABLE(table), 10);
+ 	gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
+@@ -185,9 +185,9 @@ static void wifi_ipconfig(GtkWidget *table, struct config_data *data, GtkTreeIte
+ 	gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 2, 3, 4);
+ 	data->ipv4.label[0] = label;
+ 
+-	combo = gtk_combo_box_new_text();
+-	gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "DHCP");
+-	gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Manual");
++	combo = gtk_combo_box_text_new();
++	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), "DHCP");
++	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), "Manual");
+ 
+ 	gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(combo),
+ 			separator_function, NULL, NULL);
+@@ -335,14 +335,14 @@ void update_wifi_ipv4(struct config_data *data, guint policy)
+ 	case CONNMAN_POLICY_DHCP:
+ 		gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
+ 		for (i = 0; i < 3; i++) {
+-			gtk_entry_set_editable(GTK_ENTRY(entry[i]), 0);
++			gtk_editable_set_editable(GTK_EDITABLE(entry[i]), 0);
+ 			gtk_widget_set_sensitive(entry[i], 0);
+ 		}
+ 		break;
+ 	case CONNMAN_POLICY_MANUAL:
+ 		gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 1);
+ 		for (i = 0; i < 3; i++) {
+-			gtk_entry_set_editable(GTK_ENTRY(entry[i]), 1);
++			gtk_editable_set_editable(GTK_EDITABLE(entry[i]), 1);
+ 			gtk_widget_set_sensitive(entry[i], 1);
+ 		}
+ 		break;
+-- 
+2.8.1
+
diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb
index 3521c7f..a56bd37 100644
--- a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb
+++ b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
                     file://properties/main.c;beginline=1;endline=20;md5=50c77c81871308b033ab7a1504626afb \
                     file://common/connman-dbus.c;beginline=1;endline=20;md5=de6b485c0e717a0236402d220187717a"
 
-DEPENDS = "gtk+ dbus-glib dbus-glib-native intltool-native gettext-native"
+DEPENDS = "gtk+3 dbus-glib dbus-glib-native intltool-native gettext-native"
 
 # 0.7 tag
 SRCREV = "cf3c325b23dae843c5499a113591cfbc98acb143"
@@ -15,12 +15,13 @@ SRC_URI = "git://github.com/connectivity/connman-gnome.git \
            file://null_check_for_ipv4_config.patch \
            file://images/* \
            file://connman-gnome-fix-dbus-interface-name.patch \
+           file://0001-Port-to-Gtk3.patch \
           "
 
 S = "${WORKDIR}/git"
 
 inherit autotools-brokensep gtk-icon-cache pkgconfig distro_features_check
-ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
 RDEPENDS_${PN} = "connman"
 
-- 
2.1.4

[PATCHv3 08/30] matchbox-keyboard: Enable GTK+3 IM module

[Jussi Kukkonen]

* Build GTK+3 im module (and no GTK+2 by default)
* Fix FILES for this case

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
index fb4c6e9..c7870cf 100644
--- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
+++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
@@ -26,7 +26,7 @@ REQUIRED_DISTRO_FEATURES = "x11"
 
 EXTRA_OECONF = "--disable-cairo"
 
-PACKAGECONFIG ??= "gtk2-im applet"
+PACKAGECONFIG ??= "gtk3-im applet"
 PACKAGECONFIG[applet] = "--enable-applet,--disable-applet,matchbox-panel-2"
 PACKAGECONFIG[gtk2-im] = "--enable-gtk-im,--disable-gtk-im,gtk+"
 PACKAGECONFIG[gtk3-im] = "--enable-gtk3-im,--disable-gtk3-im,gtk+3"
@@ -39,7 +39,8 @@ FILES_${PN} = "${bindir}/ \
 	       ${datadir}/pixmaps \
 	       ${datadir}/matchbox-keyboard"
 
-FILES_${PN}-im = "${libdir}/gtk-2.0/*/immodules/*.so"
+FILES_${PN}-im = "${libdir}/gtk-2.0/*/immodules/*.so \
+                  ${libdir}/gtk-3.0/*/immodules/*.so"
 
 FILES_${PN}-applet = "${libdir}/matchbox-panel/*.so"
 
@@ -49,6 +50,7 @@ do_install_append () {
 	install -m 755 ${WORKDIR}/80matchboxkeyboard.sh ${D}/${sysconfdir}/X11/Xsession.d/
 
 	rm -f ${D}${libdir}/gtk-2.0/*/immodules/*.la
+	rm -f ${D}${libdir}/gtk-3.0/*/immodules/*.la
 	rm -f ${D}${libdir}/matchbox-panel/*.la
 }
 
-- 
2.1.4

[PATCHv3 09/30] packagegroup-core-x11: Use adwaita icons instead of sato

[Jussi Kukkonen]

Adwaita icon set is significantly more extensive (8MB vs 2MB). However,
as pcmanfm already rrecommends adwaita-icon-theme, this change actually
makes typical packagegroup-core-x11 smaller as a whole since
sato-icon-theme is no longer required.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index 21b5ce7..234a23a 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
@@ -30,7 +30,7 @@ RDEPENDS_${PN}-base = "\
     matchbox-keyboard-im \
     matchbox-config-gtk \
     xcursor-transparent-theme \
-    sato-icon-theme \
+    adwaita-icon-theme \
     settings-daemon \
     gtk-sato-engine \
     shutdown-desktop \
-- 
2.1.4

[PATCHv3 10/30] vte: Upgrade to 0.44.1

[Jussi Kukkonen]

* License change LGPL 2.0 -> LGPL 2.1+
* vte-termcap is no more
* API break: current version seems to be parallel installable
  with old one, but I did not opt for that.
* Add patch to avoid stack protection by default
* Add SECURITY_NO_PIE_CFLAGS exception until linking failure with
  libc_nonshared.a is resolved (undefined reference to
  __init_array_start)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/conf/distro/include/security_flags.inc        |   2 +
 .../vte/vte-0.28.2/cve-2012-2738.patch             | 136 ---------------------
 .../vte/vte-0.28.2/obsolete_automake_macros.patch  |  14 ---
 meta/recipes-support/vte/vte.inc                   |  15 ---
 ...-Don-t-enable-stack-protection-by-default.patch |  29 +++++
 meta/recipes-support/vte/vte_0.28.2.bb             |  16 ---
 meta/recipes-support/vte/vte_0.44.1.bb             |  24 ++++
 7 files changed, 55 insertions(+), 181 deletions(-)
 delete mode 100644 meta/recipes-support/vte/vte-0.28.2/cve-2012-2738.patch
 delete mode 100644 meta/recipes-support/vte/vte-0.28.2/obsolete_automake_macros.patch
 delete mode 100644 meta/recipes-support/vte/vte.inc
 create mode 100644 meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch
 delete mode 100644 meta/recipes-support/vte/vte_0.28.2.bb
 create mode 100644 meta/recipes-support/vte/vte_0.44.1.bb

diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc
index ea1d4e5..0df65e0 100644
--- a/meta/conf/distro/include/security_flags.inc
+++ b/meta/conf/distro/include/security_flags.inc
@@ -95,6 +95,8 @@ SECURITY_CFLAGS_pn-zlib = "${SECURITY_NO_PIE_CFLAGS}"
 SECURITY_CFLAGS_pn-ltp = "${SECURITY_NO_PIE_CFLAGS}"
 SECURITY_CFLAGS_pn-pulseaudio = "${SECURITY_NO_PIE_CFLAGS}"
 
+SECURITY_CFLAGS_pn-vte = "${SECURITY_NO_PIE_CFLAGS}"
+
 # Recipes which fail to compile when elevating -Wformat-security to an error
 SECURITY_STRINGFORMAT_pn-busybox = ""
 SECURITY_STRINGFORMAT_pn-console-tools = ""
diff --git a/meta/recipes-support/vte/vte-0.28.2/cve-2012-2738.patch b/meta/recipes-support/vte/vte-0.28.2/cve-2012-2738.patch
deleted file mode 100644
index 9b99803..0000000
--- a/meta/recipes-support/vte/vte-0.28.2/cve-2012-2738.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-Upstream-Status: Backport
-CVE: CVE-2012-2738
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From e524b0b3bd8fad844ffa73927c199545b892cdbd Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@gnome.org>
-Date: Sat, 19 May 2012 19:36:09 +0200
-Subject: [PATCH 1/2] emulation: Limit integer arguments to 65535
-
-To guard against malicious sequences containing excessively big numbers,
-limit all parsed numbers to 16 bit range. Doing this here in the parsing
-routine is a catch-all guard; this doesn't preclude enforcing
-more stringent limits in the handlers themselves.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=676090
----
- src/table.c  | 2 +-
- src/vteseq.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/table.c b/src/table.c
-index 140e8c8..85cf631 100644
---- a/src/table.c
-+++ b/src/table.c
-@@ -550,7 +550,7 @@ _vte_table_extract_numbers(GValueArray **array,
- 		if (G_UNLIKELY (*array == NULL)) {
- 			*array = g_value_array_new(1);
- 		}
--		g_value_set_long(&value, total);
-+		g_value_set_long(&value, CLAMP (total, 0, G_MAXUSHORT));
- 		g_value_array_append(*array, &value);
- 	} while (i++ < arginfo->length);
- 	g_value_unset(&value);
-diff --git a/src/vteseq.c b/src/vteseq.c
-index 7ef4c8c..10991db 100644
---- a/src/vteseq.c
-+++ b/src/vteseq.c
-@@ -557,7 +557,7 @@ vte_sequence_handler_multiple(VteTerminal *terminal,
-                               GValueArray *params,
-                               VteTerminalSequenceHandler handler)
- {
--        vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXLONG);
-+        vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXUSHORT);
- }
- 
- static void
--- 
-2.4.9 (Apple Git-60)
-
-
-From cf1ad453a8def873c49cf6d88162593402f32bb2 Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@gnome.org>
-Date: Sat, 19 May 2012 20:04:12 +0200
-Subject: [PATCH 2/2] emulation: Limit repetitions
-
-Don't allow malicious sequences to cause excessive repetitions.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=676090
----
- src/vteseq.c | 25 ++++++++++++++++++-------
- 1 file changed, 18 insertions(+), 7 deletions(-)
-
-diff --git a/src/vteseq.c b/src/vteseq.c
-index 10991db..209522f 100644
---- a/src/vteseq.c
-+++ b/src/vteseq.c
-@@ -1392,7 +1392,7 @@ vte_sequence_handler_dc (VteTerminal *terminal, GValueArray *params)
- static void
- vte_sequence_handler_DC (VteTerminal *terminal, GValueArray *params)
- {
--	vte_sequence_handler_multiple(terminal, params, vte_sequence_handler_dc);
-+	vte_sequence_handler_multiple_r(terminal, params, vte_sequence_handler_dc);
- }
- 
- /* Delete a line at the current cursor position. */
-@@ -1785,7 +1785,7 @@ vte_sequence_handler_reverse_index (VteTerminal *terminal, GValueArray *params)
- static void
- vte_sequence_handler_RI (VteTerminal *terminal, GValueArray *params)
- {
--	vte_sequence_handler_multiple(terminal, params, vte_sequence_handler_nd);
-+	vte_sequence_handler_multiple_r(terminal, params, vte_sequence_handler_nd);
- }
- 
- /* Save cursor (position). */
-@@ -2777,8 +2777,7 @@ vte_sequence_handler_insert_lines (VteTerminal *terminal, GValueArray *params)
- {
- 	GValue *value;
- 	VteScreen *screen;
--	long param, end, row;
--	int i;
-+	long param, end, row, i, limit;
- 	screen = terminal->pvt->screen;
- 	/* The default is one. */
- 	param = 1;
-@@ -2796,7 +2795,13 @@ vte_sequence_handler_insert_lines (VteTerminal *terminal, GValueArray *params)
- 	} else {
- 		end = screen->insert_delta + terminal->row_count - 1;
- 	}
--	/* Insert the new lines at the cursor. */
-+
-+	/* Only allow to insert as many lines as there are between this row
-+         * and the end of the scrolling region. See bug #676090.
-+         */
-+        limit = end - row + 1;
-+        param = MIN (param, limit);
-+
- 	for (i = 0; i < param; i++) {
- 		/* Clear a line off the end of the region and add one to the
- 		 * top of the region. */
-@@ -2817,8 +2822,7 @@ vte_sequence_handler_delete_lines (VteTerminal *terminal, GValueArray *params)
- {
- 	GValue *value;
- 	VteScreen *screen;
--	long param, end, row;
--	int i;
-+	long param, end, row, i, limit;
- 
- 	screen = terminal->pvt->screen;
- 	/* The default is one. */
-@@ -2837,6 +2841,13 @@ vte_sequence_handler_delete_lines (VteTerminal *terminal, GValueArray *params)
- 	} else {
- 		end = screen->insert_delta + terminal->row_count - 1;
- 	}
-+
-+        /* Only allow to delete as many lines as there are between this row
-+         * and the end of the scrolling region. See bug #676090.
-+         */
-+        limit = end - row + 1;
-+        param = MIN (param, limit);
-+
- 	/* Clear them from below the current cursor. */
- 	for (i = 0; i < param; i++) {
- 		/* Insert a line at the end of the region and remove one from
--- 
-2.4.9 (Apple Git-60)
-
diff --git a/meta/recipes-support/vte/vte-0.28.2/obsolete_automake_macros.patch b/meta/recipes-support/vte/vte-0.28.2/obsolete_automake_macros.patch
deleted file mode 100644
index 6763d37..0000000
--- a/meta/recipes-support/vte/vte-0.28.2/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=691545]
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd vte-0.28.2/gnome-pty-helper/configure.in vte-0.28.2/gnome-pty-helper/configure.in
---- vte-0.28.2/gnome-pty-helper/configure.in	2010-07-15 20:08:44.000000000 +0300
-+++ vte-0.28.2/gnome-pty-helper/configure.in	2013-01-11 14:50:34.971027440 +0200
-@@ -8,7 +8,6 @@
- AC_ISC_POSIX
- AC_PROG_CC
- AC_STDC_HEADERS
--AM_PROG_CC_STDC
-
- if test -z "$enable_maintainer_mode"; then
-   enable_maintainer_mode=yes
diff --git a/meta/recipes-support/vte/vte.inc b/meta/recipes-support/vte/vte.inc
deleted file mode 100644
index 8565cc2..0000000
--- a/meta/recipes-support/vte/vte.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY = "Virtual terminal emulator GTK+ widget library"
-BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte"
-LICENSE = "LGPLv2.0"
-DEPENDS = " glib-2.0 gtk+ intltool-native ncurses"
-RDEPENDS_libvte = "vte-termcap"
-
-inherit gnome gtk-doc distro_features_check upstream-version-is-even gobject-introspection
-ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
-
-EXTRA_OECONF = "--disable-python"
-
-PACKAGES =+ "libvte vte-termcap"
-FILES_libvte = "${libdir}/*.so.* ${libexecdir}/gnome-pty-helper"
-FILES_vte-termcap = "${datadir}/vte/termcap-0.0"
-
diff --git a/meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch b/meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch
new file mode 100644
index 0000000..fcfc559
--- /dev/null
+++ b/meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch
@@ -0,0 +1,29 @@
+From b0a579d83e355545b64742c997fe8b1d58bf4207 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Mon, 13 Jun 2016 11:05:00 +0300
+Subject: [PATCH] Don't enable stack-protection by default
+
+These are set by security_flags.inc.
+
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+---
+ configure.ac | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 068d072..d580f84 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -138,8 +138,6 @@ m4_define([compiler_flags_common],[ dnl
+   -fno-common dnl
+   -fdiagnostics-show-option dnl
+   -fno-strict-aliasing dnl
+-  -fstack-protector dnl
+-  -fstack-protector-strong dnl
+   -fno-semantic-interposition dnl
+   -Wno-deprecated-declarations dnl
+ ])
+-- 
+2.1.4
+
diff --git a/meta/recipes-support/vte/vte_0.28.2.bb b/meta/recipes-support/vte/vte_0.28.2.bb
deleted file mode 100644
index 74087ca..0000000
--- a/meta/recipes-support/vte/vte_0.28.2.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require vte.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
-
-PR = "r6"
-
-SRC_URI += "file://obsolete_automake_macros.patch \
-            file://cve-2012-2738.patch \
-           "
-
-CFLAGS += "-D_GNU_SOURCE"
-
-SRC_URI[archive.md5sum] = "497f26e457308649e6ece32b3bb142ff"
-SRC_URI[archive.sha256sum] = "86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae"
-
-RECIPE_NO_UPDATE_REASON = "matchbox-terminal needs to be ported over to new vte first"
diff --git a/meta/recipes-support/vte/vte_0.44.1.bb b/meta/recipes-support/vte/vte_0.44.1.bb
new file mode 100644
index 0000000..f42a9aa
--- /dev/null
+++ b/meta/recipes-support/vte/vte_0.44.1.bb
@@ -0,0 +1,24 @@
+SUMMARY = "Virtual terminal emulator GTK+ widget library"
+BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte"
+LICENSE = "LGPLv2.1+"
+DEPENDS = "glib-2.0 gtk+3 intltool-native"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+inherit gnomebase gtk-doc distro_features_check upstream-version-is-even vala gobject-introspection
+
+SRC_URI += "file://0001-Don-t-enable-stack-protection-by-default.patch"
+SRC_URI[archive.md5sum] = "20916d97a5902657e54307cc2757beee"
+SRC_URI[archive.sha256sum] = "712dd548339f600fd7e221d12b2670a13a4361b2cd23ba0e057e76cc19fe5d4e"
+
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+
+PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls"
+
+CFLAGS += "-D_GNU_SOURCE"
+
+# Enable vala only if gobject-introspection is enabled
+EXTRA_OECONF = "--enable-vala=auto"
+
+PACKAGES =+ "libvte"
+FILES_libvte = "${libdir}/*.so.*"
-- 
2.1.4

[PATCHv3 11/30] matchbox-terminal: Upgrade to 0.1

[Jussi Kukkonen]

New version uses Gtk+3 and a more modern Vte.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../{matchbox-terminal_git.bb => matchbox-terminal_0.1.bb}        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-sato/matchbox-terminal/{matchbox-terminal_git.bb => matchbox-terminal_0.1.bb} (76%)

diff --git a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.1.bb
similarity index 76%
rename from meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb
rename to meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.1.bb
index c8cbd57..e0a899c 100644
--- a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb
+++ b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.1.bb
@@ -6,15 +6,15 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://main.c;endline=20;md5=96e39176d9e355639a0b8b1c7a840820"
 
-DEPENDS = "gtk+ vte"
+DEPENDS = "gtk+3 vte"
 SECTION = "x11/utils"
-SRCREV = "452bca253492a97a587f440289b9ab27d217353e"
-PV = "0.0+git${SRCPV}"
 
+#SRCREV tagged 0.1
+SRCREV = "3ad357db2302760b8a8817b5f4478dd87479442f"
 SRC_URI = "git://git.yoctoproject.org/${BPN}"
 
 S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig distro_features_check
 
-ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
-- 
2.1.4

[PATCHv3 12/30] puzzles: Use Gtk+3 by default

[Jussi Kukkonen]

Also split the puzzles into two packages (just like the old
oh-puzzles).

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-sato/puzzles/puzzles_git.bb | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb
index 346f43b..a9daacd 100644
--- a/meta/recipes-sato/puzzles/puzzles_git.bb
+++ b/meta/recipes-sato/puzzles/puzzles_git.bb
@@ -23,16 +23,28 @@ S = "${WORKDIR}/git"
 
 inherit autotools-brokensep distro_features_check pkgconfig
 
-PACKAGECONFIG ??= "gtk2"
+PACKAGECONFIG ??= "gtk3"
 PACKAGECONFIG[gtk2] = "--with-gtk=2,,gtk+,"
 PACKAGECONFIG[gtk3] = "--with-gtk=3,,gtk+3,"
 
+PACKAGES += "${PN}-extra"
+FILES_${PN} = ""
+FILES_${PN}-extra = "${prefix}/bin ${datadir}/applications"
+
+python __anonymous () {
+    var = bb.data.expand("FILES_${PN}", d, 1)
+    data = d.getVar(var, True)
+    for name in ("bridges", "fifteen", "inertia", "map", "samegame", "slant"):
+        data = data + " ${prefix}/bin/%s" % name
+        data = data + " ${datadir}/applications/%s.desktop" % name
+    d.setVar(var, data)
+}
+
+
 do_configure_prepend () {
     ./mkfiles.pl
 }
 
-FILES_${PN} = "${prefix}/bin/* ${datadir}/applications/*"
-
 do_install () {
     rm -rf ${D}/*
     export prefix=${D}
-- 
2.1.4

[PATCHv3 13/30] gst-player: Start building with Gtk+3

[Jussi Kukkonen]

Drop the patch that added gtk+2 support.
Use an icon that is found in adwaita icon theme.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../gstreamer/gst-player/gst-player.desktop        |  2 +-
 .../gstreamer/gst-player/gtk2.patch                | 71 ----------------------
 .../recipes-multimedia/gstreamer/gst-player_git.bb |  5 +-
 3 files changed, 3 insertions(+), 75 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gst-player/gtk2.patch

diff --git a/meta/recipes-multimedia/gstreamer/gst-player/gst-player.desktop b/meta/recipes-multimedia/gstreamer/gst-player/gst-player.desktop
index 9fd207b..7ddd456 100644
--- a/meta/recipes-multimedia/gstreamer/gst-player/gst-player.desktop
+++ b/meta/recipes-multimedia/gstreamer/gst-player/gst-player.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Media Player
 Comment=Basic media player
-Icon=audio-player
+Icon=multimedia-player
 TryExec=gtk-play
 Exec=gtk-play
 StartupNotify=true
diff --git a/meta/recipes-multimedia/gstreamer/gst-player/gtk2.patch b/meta/recipes-multimedia/gstreamer/gst-player/gtk2.patch
deleted file mode 100644
index 2cd18bb..0000000
--- a/meta/recipes-multimedia/gstreamer/gst-player/gtk2.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-As the rest of Sato is GTK+ 2, patch gtk-play to use GTK+ 2.  When the rest of
-Sato has been ported to GTK+ 3 this patch can be dropped.
-
-Upstream-Status: Inappropriate
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-
-diff --git a/configure.ac b/configure.ac
-index b8af13b..90ab74c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -60,7 +60,7 @@ AC_SUBST(GLIB_PREFIX)
- GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-1.0`"
- AC_SUBST(GST_PREFIX)
- 
--PKG_CHECK_MODULES(GTK, [gtk+-3.0], [have_gtk="yes"], [have_gtk="no"])
-+PKG_CHECK_MODULES(GTK, [gtk+-2.0], [have_gtk="yes"], [have_gtk="no"])
- AM_CONDITIONAL(HAVE_GTK, test "x$have_gtk" != "xno")
- 
- GOBJECT_INTROSPECTION_CHECK([1.31.1])
-diff --git a/gtk/gtk-play.c b/gtk/gtk-play.c
-index f015077..954d6fb 100644
---- a/gtk/gtk-play.c
-+++ b/gtk/gtk-play.c
-@@ -34,6 +34,46 @@ typedef struct
-   gulong seekbar_value_changed_signal_id;
- } GtkPlay;
- 
-+/* Compat stubs */
-+GtkWidget *
-+gtk_box_new (GtkOrientation orientation,
-+             gint spacing)
-+{
-+  switch (orientation) {
-+  case GTK_ORIENTATION_HORIZONTAL:
-+    return gtk_hbox_new (FALSE, spacing);
-+  case GTK_ORIENTATION_VERTICAL:
-+    return gtk_vbox_new (FALSE, spacing);
-+  }
-+}
-+
-+GtkWidget*
-+gtk_button_new_from_icon_name (const gchar *icon_name,
-+                               GtkIconSize  size)
-+{
-+  GtkWidget *button;
-+  GtkWidget *image;
-+
-+  image = gtk_image_new_from_icon_name (icon_name, size);
-+  button =  g_object_new (GTK_TYPE_BUTTON,
-+                         "image", image,
-+                         NULL);
-+  return button;
-+}
-+
-+GtkWidget *
-+gtk_scale_new_with_range (GtkOrientation orientation,
-+                          gdouble min,
-+                          gdouble max,
-+                          gdouble step)
-+{
-+  switch (orientation) {
-+  case GTK_ORIENTATION_HORIZONTAL:
-+    return gtk_hscale_new_with_range (min, max, step);
-+  case GTK_ORIENTATION_VERTICAL:
-+    return gtk_vscale_new_with_range (min, max, step);
-+  }
-+}
- 
- static void
- set_title (GtkPlay * play, const gchar * title)
diff --git a/meta/recipes-multimedia/gstreamer/gst-player_git.bb b/meta/recipes-multimedia/gstreamer/gst-player_git.bb
index 8129169..6d39c2d 100644
--- a/meta/recipes-multimedia/gstreamer/gst-player_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-player_git.bb
@@ -2,11 +2,10 @@ SUMMARY = "GStreamer playback helper library and examples"
 LICENSE = "LGPL-2.0+"
 LIC_FILES_CHKSUM = "file://lib/gst/player/gstplayer.c;beginline=1;endline=19;md5=03aeca9d8295f811817909075a15ff65"
 
-DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gtk+"
+DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gtk+3"
 
 SRC_URI = "git://github.com/sdroege/gst-player.git \
            file://filechooser.patch \
-           file://gtk2.patch \
            file://Fix-pause-play.patch \
            file://Add-error-signal-emission-for-missing-plugins.patch \
            file://gst-player.desktop"
@@ -17,7 +16,7 @@ S = "${WORKDIR}/git"
 
 inherit autotools gtk-doc lib_package pkgconfig distro_features_check gobject-introspection
 
-ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
 do_configure_prepend() {
 	touch ${S}/ChangeLog
-- 
2.1.4

[PATCHv3 14/30] matchbox-config-gtk: Upgrade to 0.2

[Jussi Kukkonen]

New version supports Gtk+3.
Rebase the patch.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../matchbox-config-gtk/files/no-handed.patch      | 26 +++++++++++++---------
 ...onfig-gtk_git.bb => matchbox-config-gtk_0.2.bb} | 11 +++++----
 2 files changed, 20 insertions(+), 17 deletions(-)
 rename meta/recipes-sato/matchbox-config-gtk/{matchbox-config-gtk_git.bb => matchbox-config-gtk_0.2.bb} (80%)

diff --git a/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch b/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch
index 8256949..1cb184f 100644
--- a/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch
+++ b/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch
@@ -1,10 +1,13 @@
 Upstream-Status: Inappropriate [configuration]
+---
+ appearance/mb-appearance.c | 4 ++++
+ 1 file changed, 4 insertions(+)
 
-Index: appearance/mb-appearance.c
-===================================================================
---- appearance/mb-appearance.c	(revision 1614)
-+++ appearance/mb-appearance.c	(working copy)
-@@ -300,11 +300,13 @@
+diff --git a/appearance/mb-appearance.c b/appearance/mb-appearance.c
+index 6af8376..71fd57b 100644
+--- a/appearance/mb-appearance.c
++++ b/appearance/mb-appearance.c
+@@ -317,11 +317,13 @@ on_gconf_value_changed (GConfClient* client, const gchar* key, GConfValue* value
      gtk_font_button_set_font_name (GTK_FONT_BUTTON (font_button),
                                     gconf_value_get_string (value));
    } else if (strcmp (key, HANDED_KEY) == 0) {
@@ -18,18 +21,19 @@ Index: appearance/mb-appearance.c
    }
  }
  
-@@ -395,12 +397,13 @@
-   gtk_container_add (GTK_CONTAINER (align), font_button);
+@@ -408,10 +410,12 @@ main (int argc, char **argv) {
  
    /* Left/Right Handed */
--  
+   
 +#if 0
-   frame = new_frame (_("Orientation"), &align);
-   gtk_box_pack_start (GTK_BOX (box), frame, TRUE, TRUE, 0);
    handed_check = gtk_check_button_new_with_mnemonic (_("_Left-handed"));
+   frame = new_frame (_("Orientation"),handed_check);
+   gtk_box_pack_start (GTK_BOX (box), frame, TRUE, TRUE, 0);
    g_signal_connect (handed_check, "toggled", G_CALLBACK (on_handed_set), NULL);
-   gtk_container_add (GTK_CONTAINER (align), handed_check);
 +#endif
  
    gconf_client_add_dir (gconf, INTERFACE_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
    g_signal_connect (gconf, "value-changed", G_CALLBACK (on_gconf_value_changed), NULL);
+-- 
+2.8.1
+
diff --git a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb
similarity index 80%
rename from meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb
rename to meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb
index 5f73a4c..3ca5989 100644
--- a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb
+++ b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb
@@ -6,17 +6,16 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://appearance/mb-appearance.c;endline=25;md5=ea92333cf8a6802639d62d874c114a28"
 
-DEPENDS = "gconf gtk+"
+DEPENDS = "gconf gtk+3"
 RDEPENDS_${PN} = "settings-daemon"
 
-SRCREV = "3ed74dfb7c57be088a5ab36e446c0ccde9fa1028"
-PV = "0.0+git${SRCPV}"
+# SRCREV tagged 0.2
+SRCREV = "ef2192ce98d9374ffdad5f78544c3f8f353c16aa"
+SRC_URI = "git://git.yoctoproject.org/${BPN} \
+           file://no-handed.patch"
 
 S = "${WORKDIR}/git"
 
-SRC_URI = "git://git.yoctoproject.org/${BPN} \
-        file://no-handed.patch;striplevel=0"
-
 inherit autotools pkgconfig distro_features_check
 
 # The settings-daemon requires x11 in DISTRO_FEATURES
-- 
2.1.4

[PATCHv3 15/30] leafpad: Replace with L3afpad

[Jussi Kukkonen]

L3afpad is a GTK+3 fork of leafpad.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../packagegroups/packagegroup-self-hosted.bb      |  2 +-
 .../builder/files/builder_session.sh               |  4 +-
 meta/recipes-sato/l3afpad/l3afpad_git.bb           | 23 ++++++
 meta/recipes-sato/leafpad/files/leafpad.desktop    | 10 ---
 meta/recipes-sato/leafpad/files/owl-menu.patch     | 63 -----------------
 ...gtkprint-.c-Fix-security-formatting-issue.patch | 81 ----------------------
 meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb      | 37 ----------
 .../packagegroups/packagegroup-core-x11-sato.bb    |  2 +-
 8 files changed, 27 insertions(+), 195 deletions(-)
 create mode 100644 meta/recipes-sato/l3afpad/l3afpad_git.bb
 delete mode 100644 meta/recipes-sato/leafpad/files/leafpad.desktop
 delete mode 100644 meta/recipes-sato/leafpad/files/owl-menu.patch
 delete mode 100644 meta/recipes-sato/leafpad/files/src-dialog-gtkprint-.c-Fix-security-formatting-issue.patch
 delete mode 100644 meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb

diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
index 4e7fd4d..974664d 100644
--- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
@@ -187,7 +187,7 @@ RDEPENDS_packagegroup-self-hosted-graphics = "\
     gtk-theme-clearlooks \
     xdg-utils \
     epiphany \
-    leafpad \
+    l3afpad \
     pcmanfm \
     vte \
     "
diff --git a/meta/recipes-graphics/builder/files/builder_session.sh b/meta/recipes-graphics/builder/files/builder_session.sh
index 001a033..4e509a7 100644
--- a/meta/recipes-graphics/builder/files/builder_session.sh
+++ b/meta/recipes-graphics/builder/files/builder_session.sh
@@ -23,8 +23,8 @@ if [ ! -d /home/builder/.local/share/applications ]; then
     xdg-mime default epiphany.desktop x-scheme-handler/https
     xdg-mime default epiphany.desktop text/html
 
-    #register text files with leafpad text editor
-    xdg-mime default leafpad.desktop text/plain
+    #register text files with l3afpad text editor
+    xdg-mime default l3afpad.desktop text/plain
 fi
 
 cd /home/builder/poky
diff --git a/meta/recipes-sato/l3afpad/l3afpad_git.bb b/meta/recipes-sato/l3afpad/l3afpad_git.bb
new file mode 100644
index 0000000..1e7c82f
--- /dev/null
+++ b/meta/recipes-sato/l3afpad/l3afpad_git.bb
@@ -0,0 +1,23 @@
+SUMMARY = "Simple GTK+ Text Editor"
+HOMEPAGE = "https://github.com/stevenhoneyman/l3afpad"
+
+# Note that COPYING seems to mistakenly contain LGPLv2.1.
+# The source code is marked GPLv2+ and COPYING used to contain
+# that as well.
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
+                    file://src/l3afpad.h;endline=20;md5=8848fd645cd45115d8cb47ca5c42a50e \
+                    file://src/utils.c;endline=20;md5=ae4792f69d3bb7b7ba91d582ba9b1a05"
+
+DEPENDS = "gtk+3 intltool-native gettext-native"
+
+PV = "0.8.18.1.11+git${SRCPV}"
+SRC_URI = "git://github.com/stevenhoneyman/l3afpad.git"
+SRCREV ="3cdccdc9505643e50f8208171d9eee5de11a42ff"
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig distro_features_check
+
+EXTRA_OECONF = "--disable-emacs --disable-print"
+FILES_${PN} += "${datadir}/icons"
diff --git a/meta/recipes-sato/leafpad/files/leafpad.desktop b/meta/recipes-sato/leafpad/files/leafpad.desktop
deleted file mode 100644
index c7e2d5b..0000000
--- a/meta/recipes-sato/leafpad/files/leafpad.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Notes
-Exec=/usr/bin/leafpad
-Comment=Text Editor
-Icon=accessories-text-editor
-Terminal=false
-Type=Application
-Categories=GTK;Utility;TextEditor;
-X-MB-SingleInstance=true
-StartupNotify=true
diff --git a/meta/recipes-sato/leafpad/files/owl-menu.patch b/meta/recipes-sato/leafpad/files/owl-menu.patch
deleted file mode 100644
index 2ebf74a..0000000
--- a/meta/recipes-sato/leafpad/files/owl-menu.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Upstream-Status: Inappropriate [enable feature]
-
---- tmp/src/menu.c.orig	2007-04-23 12:08:41.000000000 +0100
-+++ tmp/src/menu.c	2007-04-23 12:08:41.000000000 +0100
-@@ -152,7 +152,7 @@
- 	}
- 	
- 	accel_group = gtk_accel_group_new();
--	ifactory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", accel_group);
-+	ifactory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", accel_group);
- 	gtk_item_factory_set_translate_func(ifactory, menu_translate, NULL, NULL);
- 	gtk_item_factory_create_items(ifactory, nmenu_items, menu_items, NULL);
- 	gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
-
---- tmp/src/window.c.orig	2007-04-23 12:14:07.000000000 +0100
-+++ tmp/src/window.c	2007-04-23 12:14:07.000000000 +0100
-@@ -18,6 +18,8 @@
-  */
- 
- #include "leafpad.h"
-+#include <libowl/owlwindowmenu.h>
-+
- /*
- static void cb_scroll_event(GtkAdjustment *adj, GtkWidget *view)
- {
-@@ -52,7 +54,6 @@
- 	gtk_container_add(GTK_CONTAINER(window), vbox);
- 	
- 	menubar = create_menu_bar(window);
--	gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0);
- 	
- 	sw = gtk_scrolled_window_new(NULL, NULL);
- 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-
---- tmp/src/main.c.orig	2007-04-23 12:15:03.000000000 +0100
-+++ tmp/src/main.c	2007-04-23 12:15:03.000000000 +0100
-@@ -244,6 +244,7 @@
- 	Conf *conf;
- 	GtkItemFactory *ifactory;
- 	gchar *stdin_data = NULL;
-+	GtkWidget *menu;
- 	
- 	bindtextdomain(PACKAGE, LOCALEDIR);
- 	bind_textdomain_codeset(PACKAGE, "UTF-8");
-@@ -293,7 +294,10 @@
- 		conf->autoindent);
- 	
- 	gtk_widget_show_all(pub->mw->window);
-+	owl_set_window_menu (GTK_WINDOW(pub->mw->window),
-+			     GTK_MENU(pub->mw->menubar));
-+	
- 	g_free(conf->fontname);
- 	g_free(conf);
- 	
-
---- tmp/src/Makefile.am.orig	2007-04-23 12:17:54.000000000 +0100
-+++ tmp/src/Makefile.am	2007-04-23 12:17:54.000000000 +0100
-@@ -27,4 +27,4 @@
- 	i18n.h
- 
- leafpad_CFLAGS  = $(GTK_CFLAGS) $(GNOMEPRINT_CFLAGS)
--leafpad_LDADD   = $(GTK_LIBS) $(INTLLIBS) $(GNOMEPRINT_LIBS)
-+leafpad_LDADD   = $(GTK_LIBS) $(INTLLIBS) $(GNOMEPRINT_LIBS) -lowl
diff --git a/meta/recipes-sato/leafpad/files/src-dialog-gtkprint-.c-Fix-security-formatting-issue.patch b/meta/recipes-sato/leafpad/files/src-dialog-gtkprint-.c-Fix-security-formatting-issue.patch
deleted file mode 100644
index cf2687f..0000000
--- a/meta/recipes-sato/leafpad/files/src-dialog-gtkprint-.c-Fix-security-formatting-issue.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 316ccb1733a6da726c0e7f0748e3e88ec459ca54 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com>
-Date: Fri, 13 May 2016 14:36:51 -0500
-Subject: [PATCH] src/{dialog,gtkprint}.c: Fix security formatting issues
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-../../../../../../../workspace/sources/leafpad/src/dialog.c: In
-unction
-'run_dialog_message':
-../../../../../../../workspace/sources/leafpad/src/dialog.c:39:3:
-rror:
-format not a string literal and no format arguments
-[-Werror=format-security]
-   str);
-   ^
-../../../../../../../workspace/sources/leafpad/src/dialog.c: In
-unction
-'create_dialog_message_question':
-../../../../../../../workspace/sources/leafpad/src/dialog.c:64:3:
-rror:
-format not a string literal and no format arguments
-[-Werror=format-security]
-   str);
-
-../../../../../../../workspace/sources/leafpad/src/gtkprint.c: In
-function 'create_error_dialog':
-../../../../../../../workspace/sources/leafpad/src/gtkprint.c:168:3:
-error: format not a string literal and no format arguments
-[-Werror=format-security]
-   message);
-
-[YOCTO #9546]
-
-Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
-
-Upstream-status: Pending
----
- src/dialog.c   | 4 ++--
- src/gtkprint.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/dialog.c b/src/dialog.c
-index 14b69d7..8c8f2da 100644
---- a/src/dialog.c
-+++ b/src/dialog.c
-@@ -36,7 +36,7 @@ void run_dialog_message(GtkWidget *window,
- 		GTK_DIALOG_DESTROY_WITH_PARENT,
- 		type,
- 		GTK_BUTTONS_NONE,
--		str);
-+		str, NULL);
- 	gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
- 	gtk_dialog_add_buttons(GTK_DIALOG(dialog),
- 		GTK_STOCK_OK, GTK_RESPONSE_CANCEL, NULL);
-@@ -61,7 +61,7 @@ GtkWidget *create_dialog_message_question(GtkWidget *window, gchar *message, ...
- 		GTK_DIALOG_DESTROY_WITH_PARENT,
- 		GTK_MESSAGE_QUESTION,
- 		GTK_BUTTONS_NONE,
--		str);
-+		str, NULL);
- 	gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
- 	gtk_dialog_add_buttons(GTK_DIALOG(dialog),
- 		GTK_STOCK_NO, GTK_RESPONSE_NO,
-diff --git a/src/gtkprint.c b/src/gtkprint.c
-index 3f39384..e2bb83a 100644
---- a/src/gtkprint.c
-+++ b/src/gtkprint.c
-@@ -165,7 +165,7 @@ static void create_error_dialog(GtkTextView *text_view, gchar *message)
- 		GTK_DIALOG_DESTROY_WITH_PARENT,
- 		GTK_MESSAGE_ERROR,
- 		GTK_BUTTONS_NONE,
--		message);
-+		message, NULL);
- 	gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
- 	gtk_dialog_add_buttons(GTK_DIALOG(dialog),
- 		GTK_STOCK_OK, GTK_RESPONSE_CANCEL, NULL);
--- 
-2.1.4
-
diff --git a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
deleted file mode 100644
index e6a4b56..0000000
--- a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-SUMMARY = "Simple GTK+ Text Editor"
-HOMEPAGE = "http://tarot.freeshell.org/leafpad/"
-
-LICENSE = "GPLv2 & GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
-                    file://src/leafpad.h;endline=20;md5=d3d6a89f5e61e8b13bdea537511ba1fa \
-                    file://src/utils.c;endline=20;md5=0d2cc6584ba3202448bb274f62739571"
-
-DEPENDS = "gtk+ intltool-native libowl gettext-native"
-# The libowl requires x11 in DISTRO_FEATURES
-REQUIRED_DISTRO_FEATURES = "x11"
-
-SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
-           file://leafpad.desktop \
-           file://src-dialog-gtkprint-.c-Fix-security-formatting-issue.patch \
-           "
-
-SRC_URI[md5sum] = "254a72fc67505e3aa52884c729cd7b97"
-SRC_URI[sha256sum] = "959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c"
-PR = "r2"
-
-SRC_URI_append_poky = " file://owl-menu.patch;apply=yes "
-
-inherit autotools pkgconfig distro_features_check
-
-EXTRA_OECONF = " --enable-chooser --disable-emacs --disable-print"
-
-do_install_append () {
-        install -d ${D}/${datadir}
-        install -d ${D}/${datadir}/applications
-        install -m 0644 ${WORKDIR}/leafpad.desktop ${D}/${datadir}/applications
-}
-
-FILES_${PN} += "${datadir}/applications/leafpad.desktop"
-
-PACKAGES += "leafpad-stock-icons"
-FILES_leafpad-stock-icons = "${datadir}/icons/hicolor/"
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index 234a23a..034fc75 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
@@ -47,7 +47,7 @@ WEB ?= ""
 
 SUMMARY_${PN}-apps = "Sato desktop - applications"
 RDEPENDS_${PN}-apps = "\
-    leafpad \
+    l3afpad \
     gst-player-bin \
     matchbox-terminal \
     sato-screenshot \
-- 
2.1.4

[PATCHv3 16/30] pcmanfm: switch to GTK3 version

[Jussi Kukkonen]

From: "Maxin B. John" <maxin.john@intel.com>

Build GTK3 version of pcmanfm.

Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-sato/pcmanfm/pcmanfm_1.2.4.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_1.2.4.bb b/meta/recipes-sato/pcmanfm/pcmanfm_1.2.4.bb
index a6b0aac..a6bf213 100644
--- a/meta/recipes-sato/pcmanfm/pcmanfm_1.2.4.bb
+++ b/meta/recipes-sato/pcmanfm/pcmanfm_1.2.4.bb
@@ -7,8 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
                     file://src/gseal-gtk-compat.h;endline=21;md5=46922c8691f58d124f9420fe16149ce2"
 
 SECTION = "x11"
-DEPENDS = "gtk+ startup-notification libfm intltool-native gettext-native"
-DEPENDS_append_poky = " libowl"
+DEPENDS = "gtk+3 startup-notification libfm intltool-native gettext-native"
 
 
 COMPATIBLE_HOST = '(x86_64.*|i.86.*|aarch64.*|arm.*|mips.*|powerpc.*|sh.*)-(linux|freebsd.*)'
@@ -30,6 +29,8 @@ inherit autotools pkgconfig distro_features_check
 # The startup-notification requires x11 in DISTRO_FEATURES
 REQUIRED_DISTRO_FEATURES = "x11"
 
+EXTRA_OECONF = "--with-gtk=3"
+
 do_install_append () {
 	install -d ${D}/${datadir}
 	install -d ${D}/${datadir}/pixmaps/
-- 
2.1.4

[PATCHv3 17/30] libfm: switch to GTK3 version

[Jussi Kukkonen]

From: "Maxin B. John" <maxin.john@intel.com>

Build GTK3 version of libfm.

Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-support/libfm/libfm_1.2.4.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/libfm/libfm_1.2.4.bb b/meta/recipes-support/libfm/libfm_1.2.4.bb
index 866b11a..2218f9c 100644
--- a/meta/recipes-support/libfm/libfm_1.2.4.bb
+++ b/meta/recipes-support/libfm/libfm_1.2.4.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4641e94ec96f98fabc56ff9cc48be14b \
 
 
 SECTION = "x11/libs"
-DEPENDS = "glib-2.0 pango gtk+ menu-cache intltool-native libexif libfm-extra gettext-native"
+DEPENDS = "glib-2.0 pango gtk+3 menu-cache intltool-native libexif libfm-extra gettext-native"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz"
 
@@ -17,7 +17,9 @@ SRC_URI[md5sum] = "74997d75e7e87dc73398746fd373bf52"
 SRC_URI[sha256sum] = "7804f6f28cb3d1bc8ffb3151ab7ff0c063b27c5f9b06c682eb903e01cf25502f"
 
 inherit autotools pkgconfig gtk-doc distro_features_check
-ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+
+EXTRA_OECONF = "--with-gtk=3"
 
 do_configure[dirs] =+ "${S}/m4"
 
-- 
2.1.4

[PATCHv3 18/30] libowl: Remove as unused

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-sato/libowl/libowl_git.bb | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 meta/recipes-sato/libowl/libowl_git.bb

diff --git a/meta/recipes-sato/libowl/libowl_git.bb b/meta/recipes-sato/libowl/libowl_git.bb
deleted file mode 100644
index 9cc47db..0000000
--- a/meta/recipes-sato/libowl/libowl_git.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY = "OpenedHand Widget Library"
-HOMEPAGE = "http://www.o-hand.com"
-BUGTRACKER = "http://bugzilla.yoctoproject.org/"
-
-LICENSE = "GPLv2 & LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
-                    file://libowl/owlpaned.h;endline=20;md5=7fef844c4cc01b10541a7ab6ab5971af \
-                    file://libowl/owltreemodelslice.h;endline=20;md5=a5421f2cdae8debe5e4c48c09a02beb9 \
-                    file://libowl/owlcolourswatch.h;endline=24;md5=063c415c58719d536990ca8f606b5730"
-
-SECTION = "libs"
-DEPENDS = "gtk+"
-SRCREV = "6ebc8ac8f8575278dd40a535cadefa26374e44b1"
-PV = "0.1+git${SRCPV}"
-
-SRC_URI = "git://git.yoctoproject.org/${BPN}"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig distro_features_check
-
-# Requires gdk/gdkx.h which is provided by gtk when x11 in DISTRO_FEATURES
-REQUIRED_DISTRO_FEATURES = "x11"
-- 
2.1.4

[PATCHv3 19/30] packagegroup-core-x11-sato: Remove gtk-sato-engine

[Jussi Kukkonen]

The theme engine is no longer needed with GTK+3.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index 034fc75..1b065d6 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
@@ -32,7 +32,6 @@ RDEPENDS_${PN}-base = "\
     xcursor-transparent-theme \
     adwaita-icon-theme \
     settings-daemon \
-    gtk-sato-engine \
     shutdown-desktop \
     libsdl \
     ${NETWORK_MANAGER} \
-- 
2.1.4

[PATCHv3 20/30] gtk+: RRECOMMEND adwaita theme

[Jussi Kukkonen]

Without this a gtk+2 app appended to an image is going to look awful.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-gnome/gtk+/gtk+.inc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
index 5bbfe6b..c240baa 100644
--- a/meta/recipes-gnome/gtk+/gtk+.inc
+++ b/meta/recipes-gnome/gtk+/gtk+.inc
@@ -58,7 +58,14 @@ FILES_libgail = " \
 	${libdir}/gtk-2.0/modules/libferret.so \
 	"
 
-GTKBASE_RRECOMMENDS ?= "liberation-fonts gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info"
+GTKBASE_RRECOMMENDS ?= "liberation-fonts \
+                        gdk-pixbuf-loader-png \
+                        gdk-pixbuf-loader-jpeg \
+                        gdk-pixbuf-loader-gif \
+                        gdk-pixbuf-loader-xpm \
+                        shared-mime-info \
+                        gnome-theme-adwaita \
+                        "
 GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1"
 
 RRECOMMENDS_${PN} = "${GTKBASE_RRECOMMENDS}"
-- 
2.1.4

[PATCHv3 21/30] webkitgtk: Disable Gtk2 plugin process by default

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-sato/webkit/webkitgtk_2.12.3.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb
index 265fedb..6c03e98 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb
@@ -39,7 +39,6 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl', '' ,d)} \
                    enchant \
-                   gtk2 \
                    libsecret \
                   "
 
-- 
2.1.4

[PATCHv3 22/30] avahi-ui: Build with Gtk+3

[Jussi Kukkonen]

Add patch to install GtkBuilder ui files for GTK+3.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb | 11 +++++----
 ...c-install-GtkBuilder-interface-files-for-.patch | 28 ++++++++++++++++++++++
 2 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch

diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
index 1b3e918..c6f67f1 100644
--- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
+++ b/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
@@ -7,14 +7,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 require avahi.inc
 
 inherit distro_features_check
-ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
+SRC_URI += "file://0001-configure.ac-install-GtkBuilder-interface-files-for-.patch"
 SRC_URI[md5sum] = "22b5e705d3eabb31d26f2e1e7b074013"
 SRC_URI[sha256sum] = "d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454"
 
-DEPENDS += "avahi gtk+ libglade"
+DEPENDS += "avahi gtk+3"
 
-AVAHI_GTK = "--enable-gtk --disable-gtk3 --disable-pygtk"
+AVAHI_GTK = "--disable-gtk --enable-gtk3 --disable-pygtk"
 
 S = "${WORKDIR}/avahi-${PV}"
 
@@ -27,9 +28,9 @@ FILES_${PN}-staticdev += "${libdir}/libavahi-ui.a"
 FILES_${PN}-utils = "${bindir}/b* ${datadir}/applications/b*"
 
 FILES_avahi-discover = "${datadir}/applications/avahi-discover.desktop \
-                        ${datadir}/avahi/interfaces/avahi-discover* \
+                        ${datadir}/avahi/interfaces/avahi-discover.ui \
                         ${bindir}/avahi-discover-standalone \
-                        ${datadir}/avahi/interfaces/avahi-discover.glade"
+                        "
 
 do_install_append () {
 	rm ${D}${sysconfdir} -rf
diff --git a/meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch b/meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch
new file mode 100644
index 0000000..8ccef08
--- /dev/null
+++ b/meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch
@@ -0,0 +1,28 @@
+From a59f13fab31a6e25bb03b2c2bc3aea576f857b6c Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Sun, 12 Jun 2016 18:32:49 +0300
+Subject: [PATCH] configure.ac: install GtkBuilder interface files for GTK+3
+ too
+
+Upstream-Status: Pending
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index aebb716..48bdf63 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -965,7 +965,7 @@ AC_SUBST(avahi_socket)
+ #
+ # Avahi interfaces dir
+ #
+-if test "x$HAVE_PYTHON_DBUS" = "xyes" -o "x$HAVE_GTK" = "xyes"; then
++if test "x$HAVE_PYTHON_DBUS" = "xyes" -o "x$HAVE_GTK" = "xyes" -o "x$HAVE_GTK3" = "xyes"; then
+ 	interfacesdir="${datadir}/${PACKAGE}/interfaces/"
+ 	AC_SUBST(interfacesdir)
+ fi
+-- 
+2.1.4
+
-- 
2.1.4

[PATCHv3 23/30] sysprof: Upgrade to git version slightly past 3.20

[Jussi Kukkonen]

New version uses Gtk+3. 3.20 release requires a bunch of fixes to
build without polkit, this git revision inclues those fixes.

* Add patch to use proper U64_TO_POINTER macro to fix build on
  32 bit platforms.
* Forward port memory barrier patches for arm & mips
* sysprof builds with loads of warnings and git builds also use
  -Werror: avoid that by setting "--enable-compile-warnings"

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../sysprof/files/0001-Avoid-building-docs.patch   | 42 ++++++++++++++++++++++
 .../0001-Disable-check-for-polkit-for-UI.patch     | 32 +++++++++++++++++
 ...ward-port-mips-arm-memory-barrier-patches.patch | 38 ++++++++++++++++++++
 .../files/0001-callgraph-Use-U64_TO_POINTER.patch  | 29 +++++++++++++++
 .../sysprof/files/define-NT_GNU_BUILD_ID.patch     |  4 +--
 .../sysprof/files/gui-argument.patch               | 35 ------------------
 meta/recipes-kernel/sysprof/files/rmb-arm.patch    | 21 -----------
 meta/recipes-kernel/sysprof/files/rmb-mips.patch   | 22 ------------
 meta/recipes-kernel/sysprof/sysprof_git.bb         | 34 ++++++++++--------
 9 files changed, 163 insertions(+), 94 deletions(-)
 create mode 100644 meta/recipes-kernel/sysprof/files/0001-Avoid-building-docs.patch
 create mode 100644 meta/recipes-kernel/sysprof/files/0001-Disable-check-for-polkit-for-UI.patch
 create mode 100644 meta/recipes-kernel/sysprof/files/0001-Forward-port-mips-arm-memory-barrier-patches.patch
 create mode 100644 meta/recipes-kernel/sysprof/files/0001-callgraph-Use-U64_TO_POINTER.patch
 delete mode 100644 meta/recipes-kernel/sysprof/files/gui-argument.patch
 delete mode 100644 meta/recipes-kernel/sysprof/files/rmb-arm.patch
 delete mode 100644 meta/recipes-kernel/sysprof/files/rmb-mips.patch

diff --git a/meta/recipes-kernel/sysprof/files/0001-Avoid-building-docs.patch b/meta/recipes-kernel/sysprof/files/0001-Avoid-building-docs.patch
new file mode 100644
index 0000000..202f354
--- /dev/null
+++ b/meta/recipes-kernel/sysprof/files/0001-Avoid-building-docs.patch
@@ -0,0 +1,42 @@
+From 27df521c68e7c8b5b050dab15f40aa15fd03623a Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Wed, 4 May 2016 14:58:24 +0300
+Subject: [PATCH] Avoid building docs
+
+Upstream-Status: Inappropriate
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+---
+ Makefile.am | 2 +-
+ m4/yelp.m4  | 6 ------
+ 2 files changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index b919a3f..3a3851d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = daemon data help lib po src tools tests
++SUBDIRS = daemon data lib po src tools tests
+ 
+ EXTRA_DIST = AUTHORS tap-test COPYING.gpl-2
+ 
+diff --git a/m4/yelp.m4 b/m4/yelp.m4
+index 5db847f..1b6ede4 100644
+--- a/m4/yelp.m4
++++ b/m4/yelp.m4
+@@ -27,12 +27,6 @@ AC_ARG_WITH([help-dir],
+ HELP_DIR="$with_help_dir"
+ AC_SUBST(HELP_DIR)
+ 
+-AC_ARG_VAR([ITSTOOL], [Path to the `itstool` command])
+-AC_CHECK_PROG([ITSTOOL], [itstool], [itstool])
+-if test x"$ITSTOOL" = x; then
+-  AC_MSG_ERROR([itstool not found])
+-fi
+-
+ AC_ARG_VAR([XMLLINT], [Path to the `xmllint` command])
+ AC_CHECK_PROG([XMLLINT], [xmllint], [xmllint])
+ if test x"$XMLLINT" = x; then
+-- 
+2.1.4
+
diff --git a/meta/recipes-kernel/sysprof/files/0001-Disable-check-for-polkit-for-UI.patch b/meta/recipes-kernel/sysprof/files/0001-Disable-check-for-polkit-for-UI.patch
new file mode 100644
index 0000000..6085232
--- /dev/null
+++ b/meta/recipes-kernel/sysprof/files/0001-Disable-check-for-polkit-for-UI.patch
@@ -0,0 +1,32 @@
+From 765d578145e31ddc9495adfab8037ade33c6a9cc Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Wed, 4 May 2016 10:59:36 +0300
+Subject: [PATCH] Disable check for polkit for UI
+
+The check is not technically required: sysprof just needs
+to be able to access system perf counters at runtime.
+
+Upstream-Status: Pending
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8559597..ecf93ad 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -131,8 +131,8 @@ AS_IF([test "$enable_gtk" = auto],[
+ 	AS_IF([test "$have_gtk" = "yes" && test "$have_polkit" = "yes"],[enable_gtk=yes],[enable_gtk=no])
+ ])
+ AS_IF([test "$enable_gtk" = "yes"],[
+-	AS_IF([test "$have_gtk" = "yes" && test "$have_polkit" = "yes"],[],[
+-		AC_MSG_ERROR([--enable-gtk requires gtk+-3.0 >= gtk_required_version and polkit-gobject-1])
++	AS_IF([test "$have_gtk" = "yes"],[],[
++		AC_MSG_ERROR([--enable-gtk requires gtk+-3.0 >= gtk_required_version])
+ 	])
+ ])
+ AM_CONDITIONAL(ENABLE_GTK, test "$enable_gtk" = "yes")
+-- 
+2.8.1
+
diff --git a/meta/recipes-kernel/sysprof/files/0001-Forward-port-mips-arm-memory-barrier-patches.patch b/meta/recipes-kernel/sysprof/files/0001-Forward-port-mips-arm-memory-barrier-patches.patch
new file mode 100644
index 0000000..92e804f
--- /dev/null
+++ b/meta/recipes-kernel/sysprof/files/0001-Forward-port-mips-arm-memory-barrier-patches.patch
@@ -0,0 +1,38 @@
+From a2d385e504323641b1127821833c61e77301c90b Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Sat, 11 Jun 2016 22:45:37 +0300
+Subject: [PATCH] Forward port mips & arm memory barrier patches
+
+Upstream-Status: Pending
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+---
+ lib/util/util.h | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/lib/util/util.h b/lib/util/util.h
+index 591722d..0768056 100644
+--- a/lib/util/util.h
++++ b/lib/util/util.h
+@@ -29,4 +29,19 @@
+ #define read_barrier()           asm volatile("" ::: "memory")
+ #endif
+ 
++#ifdef __arm__
++/*
++ * Use the __kuser_memory_barrier helper in the CPU helper page. See
++ * arch/arm/kernel/entry-armv.S in the kernel source for details.
++ */
++#define read_barrier()         ((void(*)(void))0xffff0fa0)()
++#endif
++
++#ifdef __mips__
++#define read_barrier()         asm volatile(".set   mips2\n\t" \
++                                            "sync\n\t" \
++                                            ".set   mips0" ::: "memory")
++#endif
++
++
+ #endif /* SP_UTIL_H */
+-- 
+2.1.4
+
diff --git a/meta/recipes-kernel/sysprof/files/0001-callgraph-Use-U64_TO_POINTER.patch b/meta/recipes-kernel/sysprof/files/0001-callgraph-Use-U64_TO_POINTER.patch
new file mode 100644
index 0000000..ac1384c
--- /dev/null
+++ b/meta/recipes-kernel/sysprof/files/0001-callgraph-Use-U64_TO_POINTER.patch
@@ -0,0 +1,29 @@
+From 05816e6f9cd65b2624bb04de65fdf61031c7017f Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Fri, 10 Jun 2016 14:01:54 +0300
+Subject: [PATCH] callgraph: Use U64_TO_POINTER
+
+This fixes a "cast to pointer from integer of different size" on i586.
+
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Upstream-Status: Pending
+---
+ lib/sp-callgraph-view.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/sp-callgraph-view.c b/lib/sp-callgraph-view.c
+index 02cc17b..58315b0 100644
+--- a/lib/sp-callgraph-view.c
++++ b/lib/sp-callgraph-view.c
+@@ -135,7 +135,7 @@ build_functions_store (StackNode *node,
+ 
+   gtk_list_store_append (state->store, &iter);
+   gtk_list_store_set (state->store, &iter,
+-                      COLUMN_NAME, (const gchar *)node->data,
++                      COLUMN_NAME, U64_TO_POINTER(node->data),
+                       COLUMN_SELF, 100.0 * size / state->profile_size,
+                       COLUMN_TOTAL, 100.0 * total / state->profile_size,
+                       COLUMN_POINTER, node,
+-- 
+2.1.4
+
diff --git a/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch b/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
index dcc2cbe..f75ddad 100644
--- a/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
+++ b/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
@@ -7,8 +7,8 @@ Upstream-Status: Pending
 
 Index: git/elfparser.h
 ===================================================================
---- git.orig/elfparser.h	2011-07-16 18:57:41.000000000 -0700
-+++ git/elfparser.h	2011-07-16 20:28:54.733829895 -0700
+--- git.orig/lib/util/elfparser.h	2011-07-16 18:57:41.000000000 -0700
++++ git/lib/util/elfparser.h	2011-07-16 20:28:54.733829895 -0700
 @@ -17,6 +17,10 @@
   */
  #include <glib.h>
diff --git a/meta/recipes-kernel/sysprof/files/gui-argument.patch b/meta/recipes-kernel/sysprof/files/gui-argument.patch
deleted file mode 100644
index d2c053e..0000000
--- a/meta/recipes-kernel/sysprof/files/gui-argument.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Add the ability to explicitly enable/disable GUI support
-
-Signed-off-by: Christopher Larson <chris_larson@mentor.com>
-Upstream-Status: Pending
-
---- git.orig/configure.ac
-+++ git/configure.ac
-@@ -62,12 +62,24 @@ KMICRO=`uname -r | cut -d"." -f 3 | cut
- # Pkgconfig dependencies
- 
- core_dep="glib-2.0 >= 2.6.0"
--gui_dep="gtk+-2.0 > 2.6.0 gdk-pixbuf-2.0 pangoft2 libglade-2.0"
- 
- PKG_CHECK_MODULES(CORE_DEP, $core_dep, [], AC_MSG_ERROR([sysprof dependencies not satisfied]))
- 
--build_gui=yes
--PKG_CHECK_MODULES(GUI_DEP, $gui_dep, [], build_gui=no)
-+gui_dep="gtk+-2.0 > 2.6.0 gdk-pixbuf-2.0 pangoft2 libglade-2.0"
-+
-+AC_ARG_ENABLE([gui],
-+  [AS_HELP_STRING([--disable-gui],
-+    [Disable GUI functionality (requires gtk+, gdk-pixbuf, pangoft2, libglade) @<:@default=auto@:>@])],
-+  [],
-+  [enable_gui=auto])
-+
-+build_gui=no
-+AS_IF([test "x$enable_gui" != xno],
-+  [PKG_CHECK_MODULES(GUI_DEP, $gui_dep, build_gui=yes,
-+    [if test "x$enable_gui" != xauto; then
-+       AC_MSG_FAILURE(
-+         [--enable-gui was given, but gui dependencies were not satisfied])
-+     fi])])
- 
- AM_CONDITIONAL([BUILD_GUI], [test "$build_gui" = yes])
- 
diff --git a/meta/recipes-kernel/sysprof/files/rmb-arm.patch b/meta/recipes-kernel/sysprof/files/rmb-arm.patch
deleted file mode 100644
index c53ac64..0000000
--- a/meta/recipes-kernel/sysprof/files/rmb-arm.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-Upstream-Status: Pending
-
-Index: git/util.h
-===================================================================
---- git.orig/util.h	2010-12-07 22:41:57.156243001 -0600
-+++ git/util.h	2010-12-07 22:43:47.616243002 -0600
-@@ -37,4 +37,13 @@
- #define cpu_relax()     asm volatile("" ::: "memory");
- #endif
- 
-+#ifdef __arm__
-+/*
-+ * Use the __kuser_memory_barrier helper in the CPU helper page. See
-+ * arch/arm/kernel/entry-armv.S in the kernel source for details.
-+ */
-+#define rmb()		((void(*)(void))0xffff0fa0)()
-+#define cpu_relax()	asm volatile("":::"memory")
-+#endif
-+
- #endif
diff --git a/meta/recipes-kernel/sysprof/files/rmb-mips.patch b/meta/recipes-kernel/sysprof/files/rmb-mips.patch
deleted file mode 100644
index e055b8a..0000000
--- a/meta/recipes-kernel/sysprof/files/rmb-mips.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Upstream-Status: Pending
-
-Index: git/util.h
-===================================================================
---- git.orig/util.h	2010-12-08 01:22:44.486243001 -0600
-+++ git/util.h	2010-12-08 01:23:27.836243001 -0600
-@@ -37,4 +37,15 @@
- #define cpu_relax()     asm volatile("" ::: "memory");
- #endif
- 
-+#ifdef __mips__
-+#define rmb()		asm volatile(					\
-+				".set	mips2\n\t"			\
-+				"sync\n\t"				\
-+				".set	mips0"				\
-+				: /* no output */			\
-+				: /* no input */			\
-+				: "memory")
-+#define cpu_relax()	asm volatile("" ::: "memory")
-+#endif
-+
- #endif
diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/meta/recipes-kernel/sysprof/sysprof_git.bb
index 84c6aad..461f414 100644
--- a/meta/recipes-kernel/sysprof/sysprof_git.bb
+++ b/meta/recipes-kernel/sysprof/sysprof_git.bb
@@ -1,29 +1,35 @@
 SUMMARY = "System-wide Performance Profiler for Linux"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://src/sp-application.c;endline=17;md5=40e55577ef122c88fe20052acda64875"
+
+inherit gnomebase gettext
 
 DEPENDS = "glib-2.0"
 
-SRCREV = "cd44ee6644c3641507fb53b8a2a69137f2971219"
-PV = "1.2.0+git${SRCPV}"
+S = "${WORKDIR}/git"
+SRCREV = "9c6cec9b49766bf77c1713bc5a7c6d651e628068"
+PV = "3.20.0+git${SRCPV}"
 
 SRC_URI = "git://git.gnome.org/sysprof \
            file://define-NT_GNU_BUILD_ID.patch \
-           file://gui-argument.patch \
+           file://0001-Disable-check-for-polkit-for-UI.patch \
+           file://0001-Avoid-building-docs.patch \
+           file://0001-callgraph-Use-U64_TO_POINTER.patch \
+           file://0001-Forward-port-mips-arm-memory-barrier-patches.patch \
           "
+SRC_URI[archive.md5sum] = "d56e8492033b60e247634731e7f760b9"
+SRC_URI[archive.sha256sum] = "4a338ad41bfffae87ef281f6e75c9660b3e0c6671bf5233be0c3f55a5e5b1ce5"
 
-SRC_URI_append_arm  = " file://rmb-arm.patch"
-SRC_URI_append_armeb  = " file://rmb-arm.patch"
-SRC_URI_append_mips = " file://rmb-mips.patch"
-SRC_URI_append_mips64 = " file://rmb-mips.patch"
-SRC_URI_append_mips64n32 = " file://rmb-mips.patch"
+AUTOTOOLS_AUXDIR = "${S}/build-aux"
 
-S = "${WORKDIR}/git"
+EXTRA_OECONF = "--enable-compile-warnings"
 
-inherit autotools pkgconfig
+PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}"
+PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3"
 
-PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK2DISTROFEATURES}', 'gui', '', d)}"
-PACKAGECONFIG[gui] = "--enable-gui,--disable-gui,gtk+ gdk-pixbuf pango libglade"
+FILES_${PN} += "${datadir}/icons/ ${libdir}"
+FILES_${PN}-dev = "${prefix}/include"
 
 # We do not yet work for aarch64.
 #
-- 
2.1.4

[PATCHv3 24/30] matchbox-session-sato: Update session startup

[Jussi Kukkonen]

* Use Adwaita Gtk+ theme
* sato-gtk-engine is no longer needed with Adwaita
* GTK_CSD tricks are no longer needed since the panel
  does not draw on top windows
* Add meta-theme index file: it used to be provided by gtk-sato-engine
  and is used by matchbox-config-gtk only (to be able to show a single
  selection for Gtk+, icon and Matchbox themes). This is a more
  logical place for it.
* Set matchbox-theme gconf key (just to be explicit, this is the
  default already)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../matchbox-sato/matchbox-session-sato/index.theme           |  7 +++++++
 meta/recipes-sato/matchbox-sato/matchbox-session-sato/session |  9 ++-------
 meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb  | 11 ++++++++---
 3 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 meta/recipes-sato/matchbox-sato/matchbox-session-sato/index.theme

diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/index.theme b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/index.theme
new file mode 100644
index 0000000..c9260cf
--- /dev/null
+++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/index.theme
@@ -0,0 +1,7 @@
+[X-GNOME-Metatheme]
+Encoding=UTF-8
+Type=X-GNOME-Metatheme
+Name=Sato
+GtkTheme=Adwaita
+IconTheme=Sato
+MatchboxTheme=Sato
diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session
index 42ce483..f6313bd 100644
--- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session
+++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session
@@ -14,11 +14,6 @@ else
     KEYBOARD_APPLET="keyboard"
 fi
 
-# Tell GTK+3 we really want server side decorations, even with
-# GtkHeaderBar using applications: Without that mb-panel will render
-# on top of the client side decorations.
-export GTK_CSD=0
-
 matchbox-desktop &
 
 # Lines containing feature-[foo] are removed at build time if the machine
@@ -28,6 +23,6 @@ START_APPLETS=showdesktop,windowselector
 END_APPLETS=clock,battery,$KEYBOARD_APPLET,systray,startup-notify,notify
 END_APPLETS=openmoko-panel-gsm,$END_APPLETS # feature-phone
 
-matchbox-panel --titlebar --start-applets $START_APPLETS --end-applets $END_APPLETS &
+matchbox-panel --start-applets $START_APPLETS --end-applets $END_APPLETS &
 
-exec matchbox-window-manager -theme Sato -use_desktop_mode decorated -use_cursor $SHOWCURSOR $@
+exec matchbox-window-manager -theme Sato -use_cursor $SHOWCURSOR $@
diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
index 76de18a..fb4750b 100644
--- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
+++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://session;endline=3;md5=f8a5c5b9c279e52dc094d10e11c2be6
 
 SECTION = "x11"
 DEPENDS = "gconf-native"
-RDEPENDS_${PN} = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato matchbox-session gconf"
+RDEPENDS_${PN} = "formfactor matchbox-theme-sato matchbox-panel-2 matchbox-desktop-sato matchbox-session gconf"
 PR = "r30"
 
 # This package is architecture specific because the session script is modified
@@ -19,9 +19,12 @@ inherit distro_features_check
 # The matchbox-theme-sato requires x11 in DISTRO_FEATURES
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI = "file://session"
+SRC_URI = "file://session \
+           file://index.theme"
 S = "${WORKDIR}"
 
+FILES_${PN} += "${datadir}/themes/Sato/index.theme"
+
 do_install() {
 	# This is the set of machine features that the script has markers for
 	FEATURES="phone"
@@ -34,6 +37,7 @@ do_install() {
 		fi
 	done
 
+	install -D ${S}/index.theme ${D}/${datadir}/themes/Sato/index.theme
 	install -d ${D}/${sysconfdir}/matchbox
 	sed -f "$SCRIPT" ${S}/session > ${D}/${sysconfdir}/matchbox/session
         chmod +x ${D}/${sysconfdir}/matchbox/session
@@ -44,7 +48,8 @@ pkg_postinst_${PN} () {
 		#type, name, value
 		gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type $1 --set /desktop/poky/interface/$2 "$3"
 	}
-	set_value string theme Sato
+	set_value string theme Adwaita
+	set_value string matchbox_theme Sato
 	set_value string icon_theme Sato
 	set_value bool touchscreen true
 	set_value string font_name "Sans 9"
-- 
2.1.4

[PATCHv3 25/30] matchbox-desktop: Add Sato folder configuration

[Jussi Kukkonen]

matchbox-desktop folder configuration for Sato was in a separate
project 'matchbox-desktop-sato'. Skip the extra overhead: remove
matchbox-desktop-sato and include the files here.

Drop Utilities folder and include those icons in the Applictions
folder in an effort to make the common case a little more useful:
Now e.g. Terminal icon should be visible on startup.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../matchbox-desktop-sato_git.bb                   | 22 ----------------------
 .../matchbox-desktop/files/vfolders/All.directory  |  5 +++++
 .../files/vfolders/Applications.directory          |  6 ++++++
 .../files/vfolders/Games.directory                 |  9 +++++++++
 .../matchbox-desktop/files/vfolders/Root.order     |  4 ++++
 .../files/vfolders/Settings.directory              |  8 ++++++++
 .../matchbox-desktop/matchbox-desktop_2.1.bb       | 11 ++++++++++-
 .../matchbox-sato/matchbox-session-sato_0.1.bb     |  2 +-
 8 files changed, 43 insertions(+), 24 deletions(-)
 delete mode 100644 meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb
 create mode 100644 meta/recipes-sato/matchbox-desktop/files/vfolders/All.directory
 create mode 100644 meta/recipes-sato/matchbox-desktop/files/vfolders/Applications.directory
 create mode 100644 meta/recipes-sato/matchbox-desktop/files/vfolders/Games.directory
 create mode 100644 meta/recipes-sato/matchbox-desktop/files/vfolders/Root.order
 create mode 100644 meta/recipes-sato/matchbox-desktop/files/vfolders/Settings.directory

diff --git a/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb b/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb
deleted file mode 100644
index 1979cbb..0000000
--- a/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "Matchbox desktop folders for the Sato environment"
-HOMEPAGE = "http://matchbox-project.org"
-BUGTRACKER = "http://bugzilla.yoctoproject.org/"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-
-SECTION = "x11"
-DEPENDS = ""
-RCONFLICTS_${PN} = "matchbox-common"
-
-SRCREV = "810b0b08eb79e4685202da2ec347b990bb467e07"
-PV = "0.1+git${SRCPV}"
-PR = "r1"
-
-SRC_URI = "git://git.yoctoproject.org/${BPN}"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig
-
-FILES_${PN} += "${datadir}"
diff --git a/meta/recipes-sato/matchbox-desktop/files/vfolders/All.directory b/meta/recipes-sato/matchbox-desktop/files/vfolders/All.directory
new file mode 100644
index 0000000..dfa41e3
--- /dev/null
+++ b/meta/recipes-sato/matchbox-desktop/files/vfolders/All.directory
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=All
+Icon=mbfolder.png
+Type=Directory
+Match=meta-all
diff --git a/meta/recipes-sato/matchbox-desktop/files/vfolders/Applications.directory b/meta/recipes-sato/matchbox-desktop/files/vfolders/Applications.directory
new file mode 100644
index 0000000..a7e3501
--- /dev/null
+++ b/meta/recipes-sato/matchbox-desktop/files/vfolders/Applications.directory
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Applications
+Comment=Applications
+Icon=gnome-applications.png
+Type=Directory
+Match=AudioVideo;Audio;Video;Graphics;Network;Office;Utility;System;Development;meta-fallback;
diff --git a/meta/recipes-sato/matchbox-desktop/files/vfolders/Games.directory b/meta/recipes-sato/matchbox-desktop/files/vfolders/Games.directory
new file mode 100644
index 0000000..1b0928c
--- /dev/null
+++ b/meta/recipes-sato/matchbox-desktop/files/vfolders/Games.directory
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Games
+Name[de]=Spiele
+Comment=Games of all kind
+Comment[de]=Spiele aller Art
+Icon=mbfolder.png
+Type=Directory
+Match=Game
+
diff --git a/meta/recipes-sato/matchbox-desktop/files/vfolders/Root.order b/meta/recipes-sato/matchbox-desktop/files/vfolders/Root.order
new file mode 100644
index 0000000..01a86d2
--- /dev/null
+++ b/meta/recipes-sato/matchbox-desktop/files/vfolders/Root.order
@@ -0,0 +1,4 @@
+Applications
+Games
+Settings
+All
diff --git a/meta/recipes-sato/matchbox-desktop/files/vfolders/Settings.directory b/meta/recipes-sato/matchbox-desktop/files/vfolders/Settings.directory
new file mode 100644
index 0000000..5dde365
--- /dev/null
+++ b/meta/recipes-sato/matchbox-desktop/files/vfolders/Settings.directory
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Settings
+Name[de]=Einstellungen
+Comment=Settings for your handheld computer
+Comment[de]=Einstellungen für Ihren Handheld-Computer
+Icon=mbfolder.png
+Type=Directory
+Match=Settings
diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.1.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.1.bb
index d6c53b0..d9a2f22 100644
--- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.1.bb
+++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.1.bb
@@ -12,7 +12,9 @@ SECTION = "x11/wm"
 
 # SRCREV tagged 2.1
 SRCREV = "c8473519a0f37488b8b3e839e275b000cdde0b80"
-SRC_URI = "git://git.yoctoproject.org/${BPN}-2"
+SRC_URI = "git://git.yoctoproject.org/${BPN}-2 \
+           file://vfolders/* \
+           "
 
 EXTRA_OECONF = "--enable-startup-notification --with-dbus"
 
@@ -22,3 +24,10 @@ inherit autotools pkgconfig distro_features_check
 
 # The startup-notification requires x11 in DISTRO_FEATURES
 REQUIRED_DISTRO_FEATURES = "x11"
+
+do_install_append() {
+    install -d ${D}${datadir}/matchbox/vfolders/
+    install -m 0644 ${WORKDIR}/vfolders/* ${D}${datadir}/matchbox/vfolders/
+}
+
+FILES_${PN} += "${datadir}/matchbox/vfolders/"
diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
index fb4750b..42c742f 100644
--- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
+++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://session;endline=3;md5=f8a5c5b9c279e52dc094d10e11c2be6
 
 SECTION = "x11"
 DEPENDS = "gconf-native"
-RDEPENDS_${PN} = "formfactor matchbox-theme-sato matchbox-panel-2 matchbox-desktop-sato matchbox-session gconf"
+RDEPENDS_${PN} = "formfactor matchbox-theme-sato matchbox-panel-2 matchbox-desktop matchbox-session gconf"
 PR = "r30"
 
 # This package is architecture specific because the session script is modified
-- 
2.1.4

[PATCHv3 26/30] packagegroup-self-hosted: Remove unused theme, use Adwaita icons

[Jussi Kukkonen]

GTK+3 default theme is included in GTK+3. The corresponding GTK+2
theme would be in gnome-theme-adwaita, but the packagegroup does not
have GTK+2 apps anymore.

Also move icons to -graphics package.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
index 974664d..e8b4feb 100644
--- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
@@ -121,8 +121,6 @@ RDEPENDS_packagegroup-self-hosted-extended = "\
     groff \
     gzip \
     settings-daemon \
-    hicolor-icon-theme \
-    sato-icon-theme \
     libaio \
     libusb1 \
     libxml2 \
@@ -184,7 +182,7 @@ RDEPENDS_packagegroup-self-hosted-graphics = "\
     libsdl \
     libsdl-dev \
     libx11-dev \
-    gtk-theme-clearlooks \
+    adwaita-icon-theme \
     xdg-utils \
     epiphany \
     l3afpad \
-- 
2.1.4

[PATCHv3 27/30] gtk-sato-engine: Remove as unused

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-sato/gtk-engines/gtk-sato-engine.inc  | 25 ----------------------
 .../gtk-engines/gtk-sato-engine_git.bb             | 14 ------------
 2 files changed, 39 deletions(-)
 delete mode 100644 meta/recipes-sato/gtk-engines/gtk-sato-engine.inc
 delete mode 100644 meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb

diff --git a/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc b/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc
deleted file mode 100644
index 93538ed..0000000
--- a/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-SUMMARY = "Sato theme engine for GTK+"
-HOMEPAGE = "http://www.o-hand.com"
-BUGTRACKER = "http://bugzilla.yoctoproject.org/"
-
-LICENSE = "LGPLv2.1 & LGPLv2+"
-
-SECTION = "x11/base"
-DEPENDS = "gtk+"
-RDEPENDS_gtk-theme-sato = "gtk-sato-engine"
-
-inherit distro_features_check
-ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
-
-PACKAGES += "gtk-theme-sato"
-FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so "
-FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*.la"
-FILES_gtk-theme-sato = "${datadir}/icons ${datadir}/themes"
-
-inherit autotools-brokensep pkgconfig
-
-do_configure_prepend() {
-	for i in `ls gtk-common`; do
-		ln -sf ../gtk-common/$i gtk2-engine/$i
-	done
-}
diff --git a/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb b/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb
deleted file mode 100644
index da4d98a..0000000
--- a/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require gtk-sato-engine.inc
-
-LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-                    file://src/sato-utils.h;endline=24;md5=708f28cfe7fe028d497aaf4389b80b62 \
-                    file://src/sato-main.c;endline=24;md5=b5e5dddebca570275becb51b526e4c5a"
-
-SRCREV = "4740ad8d53aba4368ce3e03b06cfdc69eb86dcdc"
-PV = "0.3.3+git${SRCPV}"
-
-SRC_URI = "git://git.yoctoproject.org/${BPN}"
-
-S = "${WORKDIR}/git"
-
-EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}"
-- 
2.1.4

[PATCHv3 28/30] sato-icon-theme: remove as unused

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../0001-Inherit-the-GNOME-icon-theme.patch        | 31 -----------------
 .../sato-icon-theme/sato-icon-theme_0.4.1.bb       | 40 ----------------------
 2 files changed, 71 deletions(-)
 delete mode 100644 meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch
 delete mode 100644 meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb

diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch b/meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch
deleted file mode 100644
index 2c176ee..0000000
--- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b9f02989310a3c920589f1aa646bcbf16b2572a0 Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@intel.com>
-Date: Wed, 13 Jun 2012 11:07:33 +0100
-Subject: [PATCH] Inherit the GNOME icon theme
-
-If the GNOME icon theme isn't installed this is a no-op, but if it is then
-you'll get fallback from Sato to GNOME for icons that are not in Sato.
-
-As applications that use the full GNOME icon theme depend on gnome-icon-theme,
-this just works.
-
-Upstream-Status: Backport
----
- index.theme |    1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/index.theme b/index.theme
-index c4b03a7..688fbbf 100644
---- a/index.theme
-+++ b/index.theme
-@@ -1,6 +1,7 @@
- [Icon Theme]
- Name=Sato
- Comment=Sato icon theme
-+Inherits=Adwaita
- 
- Directories=16x16/apps,16x16/status,16x16/stock,16x16/places,16x16/mimetypes,16x16/devices,16x16/actions,22x22/apps,22x22/status,22x22/stock,22x22/places,22x22/mimetypes,22x22/devices,22x22/actions,32x32/apps,32x32/status,32x32/stock,32x32/places,32x32/mimetypes,32x32/devices,32x32/actions,48x48/apps,48x48/status,48x48/stock,48x48/places,48x48/mimetypes,48x48/devices,48x48/actions,64x64/apps,64x64/status,64x64/stock,64x64/places,64x64/mimetypes,64x64/devices,64x64/actions,
- 
--- 
-1.7.10
-
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
deleted file mode 100644
index ced735f..0000000
--- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-SUMMARY = "Sato icon theme"
-HOMEPAGE = "http://www.o-hand.com"
-BUGTRACKER = "http://bugzilla.yoctoproject.org/"
-
-LICENSE = "CC-BY-SA-3.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=56a830bbe6e4697fe6cbbae01bb7c2b2"
-SECTION = "x11"
-
-PR = "r6"
-
-DEPENDS = "icon-naming-utils-native libxml-simple-perl-native"
-
-SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \
-           file://0001-Inherit-the-GNOME-icon-theme.patch"
-
-SRC_URI[md5sum] = "86a847f3128a43a9cf23b7029a656f50"
-SRC_URI[sha256sum] = "0b0a2807a6a96918ac799a86094ec3e8e2c892be0fd679a4232c2a77f2f61732"
-
-inherit autotools pkgconfig allarch gtk-icon-cache perlnative
-
-# The configure script uses pkg-config to find native binaries to execute, so
-# tell it to use our pkg-config-native wrapper.
-export PKG_CONFIG = "pkg-config-native"
-
-FILES_${PN} += "${datadir}/icons/Sato"
-
-do_install_append() {
-	find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s preferences-system.png {}/apps/preferences-desktop.png \;
-	find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s file-manager.png {}/apps/system-file-manager.png \;
-	find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s ../apps/terminal.png {}/places/computer.png \;
-}
-
-# Explictly setting "Sato" as the default icon theme to avoid flickering from
-# the desktop and settings daemon racing.  This shouldn't be done here but in the sato image
-pkg_postinst_${PN} () {
-    mkdir -p $D/etc/gtk-2.0
-
-    grep -s -q -e ^gtk-icon-theme-name.*\"Sato\" $D/etc/gtk-2.0/gtkrc || \
-        echo 'gtk-icon-theme-name = "Sato"' >> $D/etc/gtk-2.0/gtkrc
-}
-- 
2.1.4

[PATCHv3 29/30] gtk-engines: Remove as unused

[Jussi Kukkonen]

gtk-engines is no longer used by any theme in oe-core

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../gtk-engines/gtk-engines-2.20.2/glib-2.32.patch | 23 ---------
 .../gtk-engines-2.20.2/substitute-tests.patch      | 37 ---------------
 .../gtk-engines/gtk-engines_2.20.2.bb              | 55 ----------------------
 3 files changed, 115 deletions(-)
 delete mode 100644 meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch
 delete mode 100644 meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch
 delete mode 100644 meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb

diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch b/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch
deleted file mode 100644
index f0b878d..0000000
--- a/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 8d49a386f467cbf8e0842d2218126f643e50f834 Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar@opensuse.org>
-Date: Sun, 27 Nov 2011 14:24:57 +0000
-Subject: Fix build with glib 2.31: Only glib.h can be #include'd. Fixes bug #664914
-
-Upstream-Status: Backport
-
----
-diff --git a/engines/clearlooks/src/animation.c b/engines/clearlooks/src/animation.c
-index 1f7a41f..56a9286 100644
---- a/engines/clearlooks/src/animation.c
-+++ b/engines/clearlooks/src/animation.c
-@@ -28,7 +28,7 @@
- #include "animation.h"
- 
- #ifdef HAVE_WORKING_ANIMATION
--#include <glib/gtimer.h>
-+#include <glib.h>
- 
- struct _AnimationInfo {
- 	GTimer *timer;
---
-cgit v0.9.0.2
diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch b/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch
deleted file mode 100644
index 5c557ba..0000000
--- a/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd gtk-engines-2.20.2/configure.ac gtk-engines-2.20.2/configure.ac
---- gtk-engines-2.20.2/configure.ac	2010-10-01 15:42:37.000000000 +0300
-+++ gtk-engines-2.20.2/configure.ac	2013-08-20 02:50:27.930510565 +0300
-@@ -166,6 +166,9 @@
-
- AC_SUBST(DEVELOPMENT_CFLAGS)
-
-+AC_SUBST([exported_symbols_tests], [[$(EXPORTED_SYMBOLS_TESTS)]])
-+AC_SUBST([torture_test_tests], [[$(TORTURE_TEST_TESTS)]])
-+
- AM_CONFIG_HEADER([engines/support/config.h])
-
- AC_CONFIG_FILES([
-diff -Nurd gtk-engines-2.20.2/test/Makefile.am gtk-engines-2.20.2/test/Makefile.am
---- gtk-engines-2.20.2/test/Makefile.am	2010-09-19 18:18:21.000000000 +0300
-+++ gtk-engines-2.20.2/test/Makefile.am	2013-08-20 02:50:36.842510865 +0300
-@@ -66,7 +66,7 @@
- # Prefix with exported_
- EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES))
-
--TESTS += $(EXPORTED_SYMBOLS_TESTS)
-+TESTS += @exported_symbols_tests@
-
-
- #############################################################
-@@ -88,7 +88,7 @@
- TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES))
-
- # Add TORTURE_TEST_ENGINES to list of tests
--TESTS += $(TORTURE_TEST_TESTS)
-+TESTS += @torture_test_tests@
-
- # Possible other tests:
- #  - An extensive theme switch tests that loads/unloads the engine
diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
deleted file mode 100644
index c0ac911..0000000
--- a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
+++ /dev/null
@@ -1,55 +0,0 @@
-SUMMARY = "GTK+ theme engines"
-HOMEPAGE = "http://www.gnome.org/"
-BUGTRACKER = "https://bugzilla.gnome.org/"
-
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
-
-SECTION = "x11/base"
-DEPENDS = "intltool-native gtk+ gettext-native"
-
-PR = "r3"
-
-PACKAGES += "${PN}-schemas"
-PACKAGES_DYNAMIC += "^gtk-engine-.* ^gtk-theme-.*"
-
-RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95"
-RDEPENDS_gtk-theme-metal = "gtk-engine-metal"
-RDEPENDS_gtk-theme-mist = "gtk-engine-mist"
-RDEPENDS_gtk-theme-crux = "gtk-engine-crux-engine"
-RDEPENDS_gtk-theme-lighthouseblue = "gtk-engine-lighthouseblue"
-RDEPENDS_gtk-theme-thinice = "gtk-engine-thinice"
-RDEPENDS_gtk-theme-industrial = "gtk-engine-industrial"
-RDEPENDS_gtk-theme-clearlooks = "gtk-engine-clearlooks"
-
-FILES_${PN} = ""
-FILES_${PN}-dev += "${libdir}/gtk-2.0/*/engines/*.la"
-FILES_${PN}-schemas = "${datadir}/gtk-engines/*.xml"
-
-CFLAGS_prepend = "-DHAVE_ANIMATION "
-
-RDEPENDS_${PN}-dev = ""
-
-inherit gnomebase
-GNOME_COMPRESS_TYPE="bz2"
-
-inherit distro_features_check
-ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
-
-# This picks stable releases in the 2.x series (but not 2.90 onwards,
-# which were GNOME 3 betas).
-UPSTREAM_CHECK_REGEX = "(?P<pver>2\.([0-8]*[02468])+(\.\d+)+)"
-
-python populate_packages_prepend() {
-    engines_root = os.path.join(d.getVar('libdir', True), "gtk-2.0/2.10.0/engines")
-    themes_root = os.path.join(d.getVar('datadir', True), "themes")
-
-    do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='')
-    do_split_packages(d, themes_root, '(.*)', 'gtk-theme-%s', 'GTK theme %s', allow_dirs=True, extra_depends='')
-    # TODO: mark theme packages as arch all
-}
-
-SRC_URI += "file://glib-2.32.patch \
-            file://substitute-tests.patch"
-SRC_URI[archive.md5sum] = "5deb287bc6075dc21812130604c7dc4f"
-SRC_URI[archive.sha256sum] = "15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5"
-- 
2.1.4

[PATCHv3 30/30] gnome-themes-standard: Use distro_features_check for GTK+2

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-gnome/gnome/gnome-themes-standard_3.18.0.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-gnome/gnome/gnome-themes-standard_3.18.0.bb b/meta/recipes-gnome/gnome/gnome-themes-standard_3.18.0.bb
index 06135e0..523253e 100644
--- a/meta/recipes-gnome/gnome/gnome-themes-standard_3.18.0.bb
+++ b/meta/recipes-gnome/gnome/gnome-themes-standard_3.18.0.bb
@@ -6,7 +6,9 @@ SECTION = "x11/gnome"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
-inherit autotools pkgconfig gettext gtk-icon-cache upstream-version-is-even
+inherit autotools pkgconfig gettext gtk-icon-cache upstream-version-is-even distro_features_check
+
+ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
 
 DEPENDS += "intltool-native gtk+"
 
-- 
2.1.4

Re: [PATCHv3 10/30] vte: Upgrade to 0.44.1

[Jussi Kukkonen]

[-- Attachment #1: Type: text/plain, Size: 13584 bytes --]

On 14 June 2016 at 11:14, Jussi Kukkonen <jussi.kukkonen@intel.com> wrote:

> * License change LGPL 2.0 -> LGPL 2.1+
> * vte-termcap is no more
> * API break: current version seems to be parallel installable
>   with old one, but I did not opt for that.
> * Add patch to avoid stack protection by default
> * Add SECURITY_NO_PIE_CFLAGS exception until linking failure with
>   libc_nonshared.a is resolved (undefined reference to
>   __init_array_start)
>

Just found out Khem has worked around a similar problem with libtool-cross
already: I've modified this patch so that SECURITY_NO_PIE_CFLAGS is no
longer used, but instead libtool-cross is used:

+# libtool adds "-nostdlib" when g++ is used. This breaks PIE builds.
+# Use libtool-cross (which has a hack to prevent that) instead.
+EXTRA_OEMAKE_class-target =
"LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool"

 - Jussi




> Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
> ---
>  meta/conf/distro/include/security_flags.inc        |   2 +
>  .../vte/vte-0.28.2/cve-2012-2738.patch             | 136
> ---------------------
>  .../vte/vte-0.28.2/obsolete_automake_macros.patch  |  14 ---
>  meta/recipes-support/vte/vte.inc                   |  15 ---
>  ...-Don-t-enable-stack-protection-by-default.patch |  29 +++++
>  meta/recipes-support/vte/vte_0.28.2.bb             |  16 ---
>  meta/recipes-support/vte/vte_0.44.1.bb             |  24 ++++
>  7 files changed, 55 insertions(+), 181 deletions(-)
>  delete mode 100644 meta/recipes-support/vte/vte-0.28.2/cve-2012-2738.patch
>  delete mode 100644
> meta/recipes-support/vte/vte-0.28.2/obsolete_automake_macros.patch
>  delete mode 100644 meta/recipes-support/vte/vte.inc
>  create mode 100644
> meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch
>  delete mode 100644 meta/recipes-support/vte/vte_0.28.2.bb
>  create mode 100644 meta/recipes-support/vte/vte_0.44.1.bb
>
> diff --git a/meta/conf/distro/include/security_flags.inc
> b/meta/conf/distro/include/security_flags.inc
> index ea1d4e5..0df65e0 100644
> --- a/meta/conf/distro/include/security_flags.inc
> +++ b/meta/conf/distro/include/security_flags.inc
> @@ -95,6 +95,8 @@ SECURITY_CFLAGS_pn-zlib = "${SECURITY_NO_PIE_CFLAGS}"
>  SECURITY_CFLAGS_pn-ltp = "${SECURITY_NO_PIE_CFLAGS}"
>  SECURITY_CFLAGS_pn-pulseaudio = "${SECURITY_NO_PIE_CFLAGS}"
>
> +SECURITY_CFLAGS_pn-vte = "${SECURITY_NO_PIE_CFLAGS}"
> +
>  # Recipes which fail to compile when elevating -Wformat-security to an
> error
>  SECURITY_STRINGFORMAT_pn-busybox = ""
>  SECURITY_STRINGFORMAT_pn-console-tools = ""
> diff --git a/meta/recipes-support/vte/vte-0.28.2/cve-2012-2738.patch
> b/meta/recipes-support/vte/vte-0.28.2/cve-2012-2738.patch
> deleted file mode 100644
> index 9b99803..0000000
> --- a/meta/recipes-support/vte/vte-0.28.2/cve-2012-2738.patch
> +++ /dev/null
> @@ -1,136 +0,0 @@
> -Upstream-Status: Backport
> -CVE: CVE-2012-2738
> -Signed-off-by: Ross Burton <ross.burton@intel.com>
> -
> -From e524b0b3bd8fad844ffa73927c199545b892cdbd Mon Sep 17 00:00:00 2001
> -From: Christian Persch <chpe@gnome.org>
> -Date: Sat, 19 May 2012 19:36:09 +0200
> -Subject: [PATCH 1/2] emulation: Limit integer arguments to 65535
> -
> -To guard against malicious sequences containing excessively big numbers,
> -limit all parsed numbers to 16 bit range. Doing this here in the parsing
> -routine is a catch-all guard; this doesn't preclude enforcing
> -more stringent limits in the handlers themselves.
> -
> -https://bugzilla.gnome.org/show_bug.cgi?id=676090
> ----
> - src/table.c  | 2 +-
> - src/vteseq.c | 2 +-
> - 2 files changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/src/table.c b/src/table.c
> -index 140e8c8..85cf631 100644
> ---- a/src/table.c
> -+++ b/src/table.c
> -@@ -550,7 +550,7 @@ _vte_table_extract_numbers(GValueArray **array,
> -               if (G_UNLIKELY (*array == NULL)) {
> -                       *array = g_value_array_new(1);
> -               }
> --              g_value_set_long(&value, total);
> -+              g_value_set_long(&value, CLAMP (total, 0, G_MAXUSHORT));
> -               g_value_array_append(*array, &value);
> -       } while (i++ < arginfo->length);
> -       g_value_unset(&value);
> -diff --git a/src/vteseq.c b/src/vteseq.c
> -index 7ef4c8c..10991db 100644
> ---- a/src/vteseq.c
> -+++ b/src/vteseq.c
> -@@ -557,7 +557,7 @@ vte_sequence_handler_multiple(VteTerminal *terminal,
> -                               GValueArray *params,
> -                               VteTerminalSequenceHandler handler)
> - {
> --        vte_sequence_handler_multiple_limited(terminal, params, handler,
> G_MAXLONG);
> -+        vte_sequence_handler_multiple_limited(terminal, params, handler,
> G_MAXUSHORT);
> - }
> -
> - static void
> ---
> -2.4.9 (Apple Git-60)
> -
> -
> -From cf1ad453a8def873c49cf6d88162593402f32bb2 Mon Sep 17 00:00:00 2001
> -From: Christian Persch <chpe@gnome.org>
> -Date: Sat, 19 May 2012 20:04:12 +0200
> -Subject: [PATCH 2/2] emulation: Limit repetitions
> -
> -Don't allow malicious sequences to cause excessive repetitions.
> -
> -https://bugzilla.gnome.org/show_bug.cgi?id=676090
> ----
> - src/vteseq.c | 25 ++++++++++++++++++-------
> - 1 file changed, 18 insertions(+), 7 deletions(-)
> -
> -diff --git a/src/vteseq.c b/src/vteseq.c
> -index 10991db..209522f 100644
> ---- a/src/vteseq.c
> -+++ b/src/vteseq.c
> -@@ -1392,7 +1392,7 @@ vte_sequence_handler_dc (VteTerminal *terminal,
> GValueArray *params)
> - static void
> - vte_sequence_handler_DC (VteTerminal *terminal, GValueArray *params)
> - {
> --      vte_sequence_handler_multiple(terminal, params,
> vte_sequence_handler_dc);
> -+      vte_sequence_handler_multiple_r(terminal, params,
> vte_sequence_handler_dc);
> - }
> -
> - /* Delete a line at the current cursor position. */
> -@@ -1785,7 +1785,7 @@ vte_sequence_handler_reverse_index (VteTerminal
> *terminal, GValueArray *params)
> - static void
> - vte_sequence_handler_RI (VteTerminal *terminal, GValueArray *params)
> - {
> --      vte_sequence_handler_multiple(terminal, params,
> vte_sequence_handler_nd);
> -+      vte_sequence_handler_multiple_r(terminal, params,
> vte_sequence_handler_nd);
> - }
> -
> - /* Save cursor (position). */
> -@@ -2777,8 +2777,7 @@ vte_sequence_handler_insert_lines (VteTerminal
> *terminal, GValueArray *params)
> - {
> -       GValue *value;
> -       VteScreen *screen;
> --      long param, end, row;
> --      int i;
> -+      long param, end, row, i, limit;
> -       screen = terminal->pvt->screen;
> -       /* The default is one. */
> -       param = 1;
> -@@ -2796,7 +2795,13 @@ vte_sequence_handler_insert_lines (VteTerminal
> *terminal, GValueArray *params)
> -       } else {
> -               end = screen->insert_delta + terminal->row_count - 1;
> -       }
> --      /* Insert the new lines at the cursor. */
> -+
> -+      /* Only allow to insert as many lines as there are between this row
> -+         * and the end of the scrolling region. See bug #676090.
> -+         */
> -+        limit = end - row + 1;
> -+        param = MIN (param, limit);
> -+
> -       for (i = 0; i < param; i++) {
> -               /* Clear a line off the end of the region and add one to
> the
> -                * top of the region. */
> -@@ -2817,8 +2822,7 @@ vte_sequence_handler_delete_lines (VteTerminal
> *terminal, GValueArray *params)
> - {
> -       GValue *value;
> -       VteScreen *screen;
> --      long param, end, row;
> --      int i;
> -+      long param, end, row, i, limit;
> -
> -       screen = terminal->pvt->screen;
> -       /* The default is one. */
> -@@ -2837,6 +2841,13 @@ vte_sequence_handler_delete_lines (VteTerminal
> *terminal, GValueArray *params)
> -       } else {
> -               end = screen->insert_delta + terminal->row_count - 1;
> -       }
> -+
> -+        /* Only allow to delete as many lines as there are between this
> row
> -+         * and the end of the scrolling region. See bug #676090.
> -+         */
> -+        limit = end - row + 1;
> -+        param = MIN (param, limit);
> -+
> -       /* Clear them from below the current cursor. */
> -       for (i = 0; i < param; i++) {
> -               /* Insert a line at the end of the region and remove one
> from
> ---
> -2.4.9 (Apple Git-60)
> -
> diff --git
> a/meta/recipes-support/vte/vte-0.28.2/obsolete_automake_macros.patch
> b/meta/recipes-support/vte/vte-0.28.2/obsolete_automake_macros.patch
> deleted file mode 100644
> index 6763d37..0000000
> --- a/meta/recipes-support/vte/vte-0.28.2/obsolete_automake_macros.patch
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -Upstream-Status: Submitted [
> https://bugzilla.gnome.org/show_bug.cgi?id=691545]
> -
> -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
> -diff -Nurd vte-0.28.2/gnome-pty-helper/configure.in
> vte-0.28.2/gnome-pty-helper/configure.in
> ---- vte-0.28.2/gnome-pty-helper/configure.in   2010-07-15
> 20:08:44.000000000 +0300
> -+++ vte-0.28.2/gnome-pty-helper/configure.in   2013-01-11
> 14:50:34.971027440 +0200
> -@@ -8,7 +8,6 @@
> - AC_ISC_POSIX
> - AC_PROG_CC
> - AC_STDC_HEADERS
> --AM_PROG_CC_STDC
> -
> - if test -z "$enable_maintainer_mode"; then
> -   enable_maintainer_mode=yes
> diff --git a/meta/recipes-support/vte/vte.inc
> b/meta/recipes-support/vte/vte.inc
> deleted file mode 100644
> index 8565cc2..0000000
> --- a/meta/recipes-support/vte/vte.inc
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -SUMMARY = "Virtual terminal emulator GTK+ widget library"
> -BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte"
> -LICENSE = "LGPLv2.0"
> -DEPENDS = " glib-2.0 gtk+ intltool-native ncurses"
> -RDEPENDS_libvte = "vte-termcap"
> -
> -inherit gnome gtk-doc distro_features_check upstream-version-is-even
> gobject-introspection
> -ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
> -
> -EXTRA_OECONF = "--disable-python"
> -
> -PACKAGES =+ "libvte vte-termcap"
> -FILES_libvte = "${libdir}/*.so.* ${libexecdir}/gnome-pty-helper"
> -FILES_vte-termcap = "${datadir}/vte/termcap-0.0"
> -
> diff --git
> a/meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch
> b/meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch
> new file mode 100644
> index 0000000..fcfc559
> --- /dev/null
> +++
> b/meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch
> @@ -0,0 +1,29 @@
> +From b0a579d83e355545b64742c997fe8b1d58bf4207 Mon Sep 17 00:00:00 2001
> +From: Jussi Kukkonen <jussi.kukkonen@intel.com>
> +Date: Mon, 13 Jun 2016 11:05:00 +0300
> +Subject: [PATCH] Don't enable stack-protection by default
> +
> +These are set by security_flags.inc.
> +
> +Upstream-Status: Inappropriate [configuration]
> +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
> +---
> + configure.ac | 2 --
> + 1 file changed, 2 deletions(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index 068d072..d580f84 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -138,8 +138,6 @@ m4_define([compiler_flags_common],[ dnl
> +   -fno-common dnl
> +   -fdiagnostics-show-option dnl
> +   -fno-strict-aliasing dnl
> +-  -fstack-protector dnl
> +-  -fstack-protector-strong dnl
> +   -fno-semantic-interposition dnl
> +   -Wno-deprecated-declarations dnl
> + ])
> +--
> +2.1.4
> +
> diff --git a/meta/recipes-support/vte/vte_0.28.2.bb
> b/meta/recipes-support/vte/vte_0.28.2.bb
> deleted file mode 100644
> index 74087ca..0000000
> --- a/meta/recipes-support/vte/vte_0.28.2.bb
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -require vte.inc
> -
> -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
> -
> -PR = "r6"
> -
> -SRC_URI += "file://obsolete_automake_macros.patch \
> -            file://cve-2012-2738.patch \
> -           "
> -
> -CFLAGS += "-D_GNU_SOURCE"
> -
> -SRC_URI[archive.md5sum] = "497f26e457308649e6ece32b3bb142ff"
> -SRC_URI[archive.sha256sum] =
> "86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae"
> -
> -RECIPE_NO_UPDATE_REASON = "matchbox-terminal needs to be ported over to
> new vte first"
> diff --git a/meta/recipes-support/vte/vte_0.44.1.bb
> b/meta/recipes-support/vte/vte_0.44.1.bb
> new file mode 100644
> index 0000000..f42a9aa
> --- /dev/null
> +++ b/meta/recipes-support/vte/vte_0.44.1.bb
> @@ -0,0 +1,24 @@
> +SUMMARY = "Virtual terminal emulator GTK+ widget library"
> +BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte"
> +LICENSE = "LGPLv2.1+"
> +DEPENDS = "glib-2.0 gtk+3 intltool-native"
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
> +
> +inherit gnomebase gtk-doc distro_features_check upstream-version-is-even
> vala gobject-introspection
> +
> +SRC_URI += "file://0001-Don-t-enable-stack-protection-by-default.patch"
> +SRC_URI[archive.md5sum] = "20916d97a5902657e54307cc2757beee"
> +SRC_URI[archive.sha256sum] =
> "712dd548339f600fd7e221d12b2670a13a4361b2cd23ba0e057e76cc19fe5d4e"
> +
> +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
> +
> +PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls"
> +
> +CFLAGS += "-D_GNU_SOURCE"
> +
> +# Enable vala only if gobject-introspection is enabled
> +EXTRA_OECONF = "--enable-vala=auto"
> +
> +PACKAGES =+ "libvte"
> +FILES_libvte = "${libdir}/*.so.*"
> --
> 2.1.4
>
>

[-- Attachment #2: Type: text/html, Size: 17749 bytes --]

Re: [PATCHv3 10/30] vte: Upgrade to 0.44.1

[Mark Asselstine]

On 14 June 2016 at 11:14, Jussi Kukkonen <jussi.kukkonen@intel.com
> <mailto:jussi.kukkonen@intel.com>> wrote:
> 
>     * License change LGPL 2.0 -> LGPL 2.1+
>     * vte-termcap is no more
>     * API break: current version seems to be parallel installable
>        with old one, but I did not opt for that.
>     * Add patch to avoid stack protection by default
>     * Add SECURITY_NO_PIE_CFLAGS exception until linking failure with
>        libc_nonshared.a is resolved (undefined reference to
>        __init_array_start)
> 
> 
> Just found out Khem has worked around a similar problem with
> libtool-cross already: I've modified this patch so
> that SECURITY_NO_PIE_CFLAGS is no longer used, but instead libtool-cross
> is used:
> 
> +# libtool adds "-nostdlib" when g++ is used. This breaks PIE builds.
> +# Use libtool-cross (which has a hack to prevent that) instead.
> +EXTRA_OEMAKE_class-target =
> "LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool"
> 
>   - Jussi

Just a heads up this this breaks xfce4-terminal. There is currently no
xfce4-terminal release which will function with vte api 2.91, only
ongoing work on their master branch as far as I can tell. I have no
idea how far reaching the effects of this change will be on
xfce. Before I spend any time on this is this something which folks
are aware of and is there a plan in place? Is there a possibility to
keep the older vte around?

Thanks,
Mark


> 
> 
>     Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com
>     <mailto:jussi.kukkonen@intel.com>>
>     ---
>       meta/conf/distro/include/security_flags.inc        |   2 +
>       .../vte/vte-0.28.2/cve-2012-2738.patch             | 136
>     ---------------------
>       .../vte/vte-0.28.2/obsolete_automake_macros.patch  |  14 ---
>       meta/recipes-support/vte/vte.inc                   |  15 ---
>       ...-Don-t-enable-stack-protection-by-default.patch |  29 +++++
>       meta/recipes-support/vte/vte_0.28.2.bb <http://vte_0.28.2.bb>
> 
>       |  16 ---
> 
>       meta/recipes-support/vte/vte_0.44.1.bb <http://vte_0.44.1.bb>
> 
>       |  24 ++++
> 
>       7 files changed, 55 insertions(+), 181 deletions(-)
>       delete mode 100644
>     meta/recipes-support/vte/vte-0.28.2/cve-2012-2738.patch
>       delete mode 100644
>     meta/recipes-support/vte/vte-0.28.2/obsolete_automake_macros.patch
>       delete mode 100644 meta/recipes-support/vte/vte.inc
>       create mode 100644
>    
> meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.
> patch delete mode 100644 meta/recipes-support/vte/vte_0.28.2.bb
>     <http://vte_0.28.2.bb>
>       create mode 100644 meta/recipes-support/vte/vte_0.44.1.bb
>     <http://vte_0.44.1.bb>
> 
>     diff --git a/meta/conf/distro/include/security_flags.inc
>     b/meta/conf/distro/include/security_flags.inc
>     index ea1d4e5..0df65e0 100644
>     --- a/meta/conf/distro/include/security_flags.inc
>     +++ b/meta/conf/distro/include/security_flags.inc
>     @@ -95,6 +95,8 @@ SECURITY_CFLAGS_pn-zlib = "${SECURITY_NO_PIE_CFLAGS}"
>       SECURITY_CFLAGS_pn-ltp = "${SECURITY_NO_PIE_CFLAGS}"
>       SECURITY_CFLAGS_pn-pulseaudio = "${SECURITY_NO_PIE_CFLAGS}"
> 
>     +SECURITY_CFLAGS_pn-vte = "${SECURITY_NO_PIE_CFLAGS}"
>     +
>       # Recipes which fail to compile when elevating -Wformat-security
>     to an error
>       SECURITY_STRINGFORMAT_pn-busybox = ""
>       SECURITY_STRINGFORMAT_pn-console-tools = ""
>     diff --git a/meta/recipes-support/vte/vte-0.28.2/cve-2012-2738.patch
>     b/meta/recipes-support/vte/vte-0.28.2/cve-2012-2738.patch
>     deleted file mode 100644
>     index 9b99803..0000000
>     --- a/meta/recipes-support/vte/vte-0.28.2/cve-2012-2738.patch
>     +++ /dev/null
>     @@ -1,136 +0,0 @@
>     -Upstream-Status: Backport
>     -CVE: CVE-2012-2738
>     -Signed-off-by: Ross Burton <ross.burton@intel.com
>     <mailto:ross.burton@intel.com>>
>     -
>     -From e524b0b3bd8fad844ffa73927c199545b892cdbd Mon Sep 17 00:00:00 2001
>     -From: Christian Persch <chpe@gnome.org 

[RFC][PATCH] vte: bring back old version to support xfce4-terminal

[Mark Asselstine]

The recent uprev to vte version 0.44.1 as part of commit
commit dc21182ada418cf3917ae8319494d219462c5bfd [vte: Upgrade to 0.44.1]
brought with it an jump in api version, leaving any packages, such as
xfce4-terminal, failing to configure/build. The commit log indicated
that it was a possibility to support the two versions (more
specifically the two api versions) side by side but that this option
was not taken.

Since we now know that this uprev does have fairly significant impact
on some other packages bring back the old version and have it live
side by side with the new. The appended version '0.0' was selected to
match the api version string used by the the upstream vte project.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---

While waiting to hear back about my inquiry I did take some
time to put together this patch that allows things that
require the older vte to continue to build. Since xfce4-terminal
lives in meta-openembedded this might make more sense to carry
over there. I am sure folks will have an opinion so sending this
out as an RFC.

Mark


 .../vte/vte-0.0/cve-2012-2738.patch                | 136 +++++++++++++++++++++
 .../vte/vte-0.0/obsolete_automake_macros.patch     |  14 +++
 meta/recipes-support/vte/vte-0.0_0.28.2.bb         |  31 +++++
 3 files changed, 181 insertions(+)
 create mode 100644 meta/recipes-support/vte/vte-0.0/cve-2012-2738.patch
 create mode 100644 meta/recipes-support/vte/vte-0.0/obsolete_automake_macros.patch
 create mode 100644 meta/recipes-support/vte/vte-0.0_0.28.2.bb

diff --git a/meta/recipes-support/vte/vte-0.0/cve-2012-2738.patch b/meta/recipes-support/vte/vte-0.0/cve-2012-2738.patch
new file mode 100644
index 0000000..9b99803
--- /dev/null
+++ b/meta/recipes-support/vte/vte-0.0/cve-2012-2738.patch
@@ -0,0 +1,136 @@
+Upstream-Status: Backport
+CVE: CVE-2012-2738
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+From e524b0b3bd8fad844ffa73927c199545b892cdbd Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@gnome.org>
+Date: Sat, 19 May 2012 19:36:09 +0200
+Subject: [PATCH 1/2] emulation: Limit integer arguments to 65535
+
+To guard against malicious sequences containing excessively big numbers,
+limit all parsed numbers to 16 bit range. Doing this here in the parsing
+routine is a catch-all guard; this doesn't preclude enforcing
+more stringent limits in the handlers themselves.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=676090
+---
+ src/table.c  | 2 +-
+ src/vteseq.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/table.c b/src/table.c
+index 140e8c8..85cf631 100644
+--- a/src/table.c
++++ b/src/table.c
+@@ -550,7 +550,7 @@ _vte_table_extract_numbers(GValueArray **array,
+ 		if (G_UNLIKELY (*array == NULL)) {
+ 			*array = g_value_array_new(1);
+ 		}
+-		g_value_set_long(&value, total);
++		g_value_set_long(&value, CLAMP (total, 0, G_MAXUSHORT));
+ 		g_value_array_append(*array, &value);
+ 	} while (i++ < arginfo->length);
+ 	g_value_unset(&value);
+diff --git a/src/vteseq.c b/src/vteseq.c
+index 7ef4c8c..10991db 100644
+--- a/src/vteseq.c
++++ b/src/vteseq.c
+@@ -557,7 +557,7 @@ vte_sequence_handler_multiple(VteTerminal *terminal,
+                               GValueArray *params,
+                               VteTerminalSequenceHandler handler)
+ {
+-        vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXLONG);
++        vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXUSHORT);
+ }
+ 
+ static void
+-- 
+2.4.9 (Apple Git-60)
+
+
+From cf1ad453a8def873c49cf6d88162593402f32bb2 Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@gnome.org>
+Date: Sat, 19 May 2012 20:04:12 +0200
+Subject: [PATCH 2/2] emulation: Limit repetitions
+
+Don't allow malicious sequences to cause excessive repetitions.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=676090
+---
+ src/vteseq.c | 25 ++++++++++++++++++-------
+ 1 file changed, 18 insertions(+), 7 deletions(-)
+
+diff --git a/src/vteseq.c b/src/vteseq.c
+index 10991db..209522f 100644
+--- a/src/vteseq.c
++++ b/src/vteseq.c
+@@ -1392,7 +1392,7 @@ vte_sequence_handler_dc (VteTerminal *terminal, GValueArray *params)
+ static void
+ vte_sequence_handler_DC (VteTerminal *terminal, GValueArray *params)
+ {
+-	vte_sequence_handler_multiple(terminal, params, vte_sequence_handler_dc);
++	vte_sequence_handler_multiple_r(terminal, params, vte_sequence_handler_dc);
+ }
+ 
+ /* Delete a line at the current cursor position. */
+@@ -1785,7 +1785,7 @@ vte_sequence_handler_reverse_index (VteTerminal *terminal, GValueArray *params)
+ static void
+ vte_sequence_handler_RI (VteTerminal *terminal, GValueArray *params)
+ {
+-	vte_sequence_handler_multiple(terminal, params, vte_sequence_handler_nd);
++	vte_sequence_handler_multiple_r(terminal, params, vte_sequence_handler_nd);
+ }
+ 
+ /* Save cursor (position). */
+@@ -2777,8 +2777,7 @@ vte_sequence_handler_insert_lines (VteTerminal *terminal, GValueArray *params)
+ {
+ 	GValue *value;
+ 	VteScreen *screen;
+-	long param, end, row;
+-	int i;
++	long param, end, row, i, limit;
+ 	screen = terminal->pvt->screen;
+ 	/* The default is one. */
+ 	param = 1;
+@@ -2796,7 +2795,13 @@ vte_sequence_handler_insert_lines (VteTerminal *terminal, GValueArray *params)
+ 	} else {
+ 		end = screen->insert_delta + terminal->row_count - 1;
+ 	}
+-	/* Insert the new lines at the cursor. */
++
++	/* Only allow to insert as many lines as there are between this row
++         * and the end of the scrolling region. See bug #676090.
++         */
++        limit = end - row + 1;
++        param = MIN (param, limit);
++
+ 	for (i = 0; i < param; i++) {
+ 		/* Clear a line off the end of the region and add one to the
+ 		 * top of the region. */
+@@ -2817,8 +2822,7 @@ vte_sequence_handler_delete_lines (VteTerminal *terminal, GValueArray *params)
+ {
+ 	GValue *value;
+ 	VteScreen *screen;
+-	long param, end, row;
+-	int i;
++	long param, end, row, i, limit;
+ 
+ 	screen = terminal->pvt->screen;
+ 	/* The default is one. */
+@@ -2837,6 +2841,13 @@ vte_sequence_handler_delete_lines (VteTerminal *terminal, GValueArray *params)
+ 	} else {
+ 		end = screen->insert_delta + terminal->row_count - 1;
+ 	}
++
++        /* Only allow to delete as many lines as there are between this row
++         * and the end of the scrolling region. See bug #676090.
++         */
++        limit = end - row + 1;
++        param = MIN (param, limit);
++
+ 	/* Clear them from below the current cursor. */
+ 	for (i = 0; i < param; i++) {
+ 		/* Insert a line at the end of the region and remove one from
+-- 
+2.4.9 (Apple Git-60)
+
diff --git a/meta/recipes-support/vte/vte-0.0/obsolete_automake_macros.patch b/meta/recipes-support/vte/vte-0.0/obsolete_automake_macros.patch
new file mode 100644
index 0000000..6763d37
--- /dev/null
+++ b/meta/recipes-support/vte/vte-0.0/obsolete_automake_macros.patch
@@ -0,0 +1,14 @@
+Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=691545]
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd vte-0.28.2/gnome-pty-helper/configure.in vte-0.28.2/gnome-pty-helper/configure.in
+--- vte-0.28.2/gnome-pty-helper/configure.in	2010-07-15 20:08:44.000000000 +0300
++++ vte-0.28.2/gnome-pty-helper/configure.in	2013-01-11 14:50:34.971027440 +0200
+@@ -8,7 +8,6 @@
+ AC_ISC_POSIX
+ AC_PROG_CC
+ AC_STDC_HEADERS
+-AM_PROG_CC_STDC
+
+ if test -z "$enable_maintainer_mode"; then
+   enable_maintainer_mode=yes
diff --git a/meta/recipes-support/vte/vte-0.0_0.28.2.bb b/meta/recipes-support/vte/vte-0.0_0.28.2.bb
new file mode 100644
index 0000000..5962f61
--- /dev/null
+++ b/meta/recipes-support/vte/vte-0.0_0.28.2.bb
@@ -0,0 +1,31 @@
+SUMMARY = "Virtual terminal emulator GTK+ widget library"
+BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte"
+LICENSE = "LGPLv2.0"
+DEPENDS = " glib-2.0 gtk+ intltool-native ncurses"
+RDEPENDS_libvte-0.0 = "vte-termcap"
+
+S = "${WORKDIR}/vte-${PV}"
+
+inherit gnome gtk-doc distro_features_check upstream-version-is-even gobject-introspection
+ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
+
+EXTRA_OECONF = "--disable-python"
+
+PACKAGES =+ "libvte-0.0 vte-termcap"
+FILES_libvte = "${libdir}/*.so.* ${libexecdir}/gnome-pty-helper"
+FILES_vte-termcap = "${datadir}/vte/termcap-0.0"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
+
+GNOMEBN = "vte"
+
+SRC_URI += "file://obsolete_automake_macros.patch \
+            file://cve-2012-2738.patch \
+           "
+
+CFLAGS += "-D_GNU_SOURCE"
+
+SRC_URI[archive.md5sum] = "497f26e457308649e6ece32b3bb142ff"
+SRC_URI[archive.sha256sum] = "86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae"
+
+RECIPE_NO_UPDATE_REASON = "xfce4-terminal needs to be ported over to new vte first"
-- 
2.5.0

Re: [RFC][PATCH] vte: bring back old version to support xfce4-terminal

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 510 bytes --]

On 16 June 2016 at 21:49, Mark Asselstine <mark.asselstine@windriver.com>
wrote:

> While waiting to hear back about my inquiry I did take some
> time to put together this patch that allows things that
> require the older vte to continue to build. Since xfce4-terminal
> lives in meta-openembedded this might make more sense to carry
> over there. I am sure folks will have an opinion so sending this
> out as an RFC.
>

That's certainly a good argument for putting the old vte in meta-oe.

Ross

[-- Attachment #2: Type: text/html, Size: 935 bytes --]

Re: [RFC][PATCH] vte: bring back old version to support xfce4-terminal

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 847 bytes --]

meta-xfce4, right?

On Thu, Jun 16, 2016 at 11:47 PM, Burton, Ross <ross.burton@intel.com>
wrote:

>
> On 16 June 2016 at 21:49, Mark Asselstine <mark.asselstine@windriver.com>
> wrote:
>
>> While waiting to hear back about my inquiry I did take some
>> time to put together this patch that allows things that
>> require the older vte to continue to build. Since xfce4-terminal
>> lives in meta-openembedded this might make more sense to carry
>> over there. I am sure folks will have an opinion so sending this
>> out as an RFC.
>>
>
> That's certainly a good argument for putting the old vte in meta-oe.
>
> Ross
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>

[-- Attachment #2: Type: text/html, Size: 1758 bytes --]

Re: [RFC][PATCH] vte: bring back old version to support xfce4-terminal

[Andre McCurdy]

On Thu, Jun 16, 2016 at 2:47 PM, Burton, Ross <ross.burton@intel.com> wrote:
>
> On 16 June 2016 at 21:49, Mark Asselstine <mark.asselstine@windriver.com>
> wrote:
>>
>> While waiting to hear back about my inquiry I did take some
>> time to put together this patch that allows things that
>> require the older vte to continue to build. Since xfce4-terminal
>> lives in meta-openembedded this might make more sense to carry
>> over there. I am sure folks will have an opinion so sending this
>> out as an RFC.
>
> That's certainly a good argument for putting the old vte in meta-oe.

The meta-oe layers generally have a higher priority than oe-core, so
having an older version in meta-oe and a newer version in oe-core can
lead to unexpected results.

> Ross
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

Re: [RFC][PATCH] vte: bring back old version to support xfce4-terminal

[Jussi Kukkonen]

[-- Attachment #1: Type: text/plain, Size: 1234 bytes --]

On 17 June 2016 at 04:10, Andre McCurdy <armccurdy@gmail.com> wrote:

> On Thu, Jun 16, 2016 at 2:47 PM, Burton, Ross <ross.burton@intel.com>
> wrote:
> >
> > On 16 June 2016 at 21:49, Mark Asselstine <mark.asselstine@windriver.com
> >
> > wrote:
> >>
> >> While waiting to hear back about my inquiry I did take some
> >> time to put together this patch that allows things that
> >> require the older vte to continue to build. Since xfce4-terminal
> >> lives in meta-openembedded this might make more sense to carry
> >> over there. I am sure folks will have an opinion so sending this
> >> out as an RFC.
> >
> > That's certainly a good argument for putting the old vte in meta-oe.
>
> The meta-oe layers generally have a higher priority than oe-core, so
> having an older version in meta-oe and a newer version in oe-core can
> lead to unexpected results.
>
>
As far as I know the versions are parallel installable so that should not
be a problem. I removed the old one as there was no need for it in oe-core.
Should have checked meta-oe as well, but there were just so many moving
parts to juggle here... The right solution should indeed be to add the old
one into the layer where it's needed.

Jussi

[-- Attachment #2: Type: text/html, Size: 1837 bytes --]

Re: [RFC][PATCH] vte: bring back old version to support xfce4-terminal

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 921 bytes --]

On 17 June 2016 at 07:37, Jussi Kukkonen <jussi.kukkonen@intel.com> wrote:

> > That's certainly a good argument for putting the old vte in meta-oe.
>>
>> The meta-oe layers generally have a higher priority than oe-core, so
>> having an older version in meta-oe and a newer version in oe-core can
>> lead to unexpected results.
>>
>>
> As far as I know the versions are parallel installable so that should not
> be a problem. I removed the old one as there was no need for it in oe-core.
> Should have checked meta-oe as well, but there were just so many moving
> parts to juggle here... The right solution should indeed be to add the old
> one into the layer where it's needed.
>

If they're parallel installable then the resurrected vte could have the
version in the PN so both can be installed at the same time, until
everything has moved to the modern vte and the old one can die for good.

Ross

[-- Attachment #2: Type: text/html, Size: 1455 bytes --]

Re: [RFC][PATCH] vte: bring back old version to support xfce4-terminal

[Mark Asselstine]

On June 16, 2016 18:10:09 Andre McCurdy wrote:
> On Thu, Jun 16, 2016 at 2:47 PM, Burton, Ross <ross.burton@intel.com> wrote:
> > On 16 June 2016 at 21:49, Mark Asselstine <mark.asselstine@windriver.com>
> > 
> > wrote:
> >> While waiting to hear back about my inquiry I did take some
> >> time to put together this patch that allows things that
> >> require the older vte to continue to build. Since xfce4-terminal
> >> lives in meta-openembedded this might make more sense to carry
> >> over there. I am sure folks will have an opinion so sending this
> >> out as an RFC.
> > 
> > That's certainly a good argument for putting the old vte in meta-oe.
> 
> The meta-oe layers generally have a higher priority than oe-core, so
> having an older version in meta-oe and a newer version in oe-core can
> lead to unexpected results.

This should not be an issue. My change has the old recipe renamed with the API 
version so the old version becomes referenced by 'vte-0.0' (per the commit log 
the 0.0 is consistent with the API versioning upstream). So recipes which 
require the old version, like xfce4-terminal, have to have their DEPENDS 
adjusted accordingly. There should be no surprises.

I will have a closer look today to ensure nothing in oe-core is requiring the 
old version and if not I will prepare a patch for meta-oe since that seems to 
be the general agreement for a home for this. I need to do some further checks 
and runtime tests but I will get this out shortly. In the meantime anyone else 
running in to the build failure can exploit the RFC patch.

Mark

> 
> > Ross
> > 
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [RFC][PATCH] vte: bring back old version to support xfce4-terminal

[Jussi Kukkonen]

[-- Attachment #1: Type: text/plain, Size: 2632 bytes --]

On 17 June 2016 at 16:33, Mark Asselstine <mark.asselstine@windriver.com>
wrote:

> On June 16, 2016 18:10:09 Andre McCurdy wrote:
> > On Thu, Jun 16, 2016 at 2:47 PM, Burton, Ross <ross.burton@intel.com>
> wrote:
> > > On 16 June 2016 at 21:49, Mark Asselstine <
> mark.asselstine@windriver.com>
> > >
> > > wrote:
> > >> While waiting to hear back about my inquiry I did take some
> > >> time to put together this patch that allows things that
> > >> require the older vte to continue to build. Since xfce4-terminal
> > >> lives in meta-openembedded this might make more sense to carry
> > >> over there. I am sure folks will have an opinion so sending this
> > >> out as an RFC.
> > >
> > > That's certainly a good argument for putting the old vte in meta-oe.
> >
> > The meta-oe layers generally have a higher priority than oe-core, so
> > having an older version in meta-oe and a newer version in oe-core can
> > lead to unexpected results.
>
> This should not be an issue. My change has the old recipe renamed with the
> API
> version so the old version becomes referenced by 'vte-0.0' (per the commit
> log
> the 0.0 is consistent with the API versioning upstream). So recipes which
> require the old version, like xfce4-terminal, have to have their DEPENDS
> adjusted accordingly. There should be no surprises.
>
> I will have a closer look today to ensure nothing in oe-core is requiring
> the
> old version and if not I will prepare a patch for meta-oe since that seems
> to
> be the general agreement for a home for this. I need to do some further
> checks
> and runtime tests but I will get this out shortly. In the meantime anyone
> else
> running in to the build failure can exploit the RFC patch.


Thanks Mark. I can confirm that nothing in oe-core needs the old vte.

As a sidenote in case you're looking at the vte users in oe-core: I notice
I didn't include a  patch for qemu yet. The situation there is that our
qemu version works fine with the new vte but might still need a small
configure.ac patch in addition to updated PACKAGECONFIG line. I'll include
this in my next patchset.

- Jussi


Mark
>
> >
> > > Ross
> > >
> > > --
> > > _______________________________________________
> > > Openembedded-core mailing list
> > > Openembedded-core@lists.openembedded.org
> > > http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 4090 bytes --]

Re: [RFC][PATCH] vte: bring back old version to support xfce4-terminal

[Mark Asselstine]

On June 17, 2016 20:43:06 Jussi Kukkonen wrote:
> On 17 June 2016 at 16:33, Mark Asselstine <mark.asselstine@windriver.com>
> 
> wrote:
> > On June 16, 2016 18:10:09 Andre McCurdy wrote:
> > > On Thu, Jun 16, 2016 at 2:47 PM, Burton, Ross <ross.burton@intel.com>
> > 
> > wrote:
> > > > On 16 June 2016 at 21:49, Mark Asselstine <
> > 
> > mark.asselstine@windriver.com>
> > 
> > > > wrote:
> > > >> While waiting to hear back about my inquiry I did take some
> > > >> time to put together this patch that allows things that
> > > >> require the older vte to continue to build. Since xfce4-terminal
> > > >> lives in meta-openembedded this might make more sense to carry
> > > >> over there. I am sure folks will have an opinion so sending this
> > > >> out as an RFC.
> > > > 
> > > > That's certainly a good argument for putting the old vte in meta-oe.
> > > 
> > > The meta-oe layers generally have a higher priority than oe-core, so
> > > having an older version in meta-oe and a newer version in oe-core can
> > > lead to unexpected results.
> > 
> > This should not be an issue. My change has the old recipe renamed with the
> > API
> > version so the old version becomes referenced by 'vte-0.0' (per the commit
> > log
> > the 0.0 is consistent with the API versioning upstream). So recipes which
> > require the old version, like xfce4-terminal, have to have their DEPENDS
> > adjusted accordingly. There should be no surprises.
> > 
> > I will have a closer look today to ensure nothing in oe-core is requiring
> > the
> > old version and if not I will prepare a patch for meta-oe since that seems
> > to
> > be the general agreement for a home for this. I need to do some further
> > checks
> > and runtime tests but I will get this out shortly. In the meantime anyone
> > else
> > running in to the build failure can exploit the RFC patch.
> 
> Thanks Mark. I can confirm that nothing in oe-core needs the old vte.
> 
> As a sidenote in case you're looking at the vte users in oe-core: I notice
> I didn't include a  patch for qemu yet. The situation there is that our
> qemu version works fine with the new vte but might still need a small
> configure.ac patch in addition to updated PACKAGECONFIG line. I'll include
> this in my next patchset.

Since I work quite a bit with meta-virtualization and thus QEMU that will be 
nice to avoid any potential issues in that area.

Thanks for the heads up regarding other vte users in oe-core. This will allow 
me to focus on some runtime testing in meta-oe prior to me sending a patch 
that way.

This should wrap up the discussions around vte for oe-core at least for now.

Mark

> 
> - Jussi
> 
> 
> Mark
> 
> > > > Ross
> > > > 
> > > > --
> > > > _______________________________________________
> > > > Openembedded-core mailing list
> > > > Openembedded-core@lists.openembedded.org
> > > > http://lists.openembedded.org/mailman/listinfo/openembedded-core
> > 
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCHv3 10/30] vte: Upgrade to 0.44.1

[Andreas Müller]

On Tue, Jun 14, 2016 at 10:14 AM, Jussi Kukkonen
<jussi.kukkonen@intel.com> wrote:
> * License change LGPL 2.0 -> LGPL 2.1+
> * vte-termcap is no more
> * API break: current version seems to be parallel installable
Could we move vte to meta-oe to avoid further world blacklisting?

Andreas

Re: [PATCHv3 10/30] vte: Upgrade to 0.44.1

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 284 bytes --]

On 22 June 2016 at 19:24, Andreas Müller <schnitzeltony@googlemail.com>
wrote:

> Could we move vte to meta-oe to avoid further world blacklisting?
>

This was the agreement in the other thread - Mark was going to restore the
old version with a new PN for meta-xfce.

Ross

[-- Attachment #2: Type: text/html, Size: 683 bytes --]

Re: [PATCHv3 10/30] vte: Upgrade to 0.44.1

[Mark Asselstine]

On Wednesday, June 22, 2016 9:18:10 PM EDT Burton, Ross wrote:
> On 22 June 2016 at 19:24, Andreas Müller <schnitzeltony@googlemail.com>
> 
> wrote:
> > Could we move vte to meta-oe to avoid further world blacklisting?
> 
> This was the agreement in the other thread - Mark was going to restore the
> old version with a new PN for meta-xfce.

Jussi got to it first and has a review out for this on for meta-oe.

Mark

> 
> Ross