Drop autotools-specific chunks in opengl.patch.
Drop add-missing-meson.build.patch (.35 tarball issue)
Drop buildpaths.patch (backport)
(From OE-Core rev: cd3cc911ea565a740b377fcc53cab1b754971d8b)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We can't drop the missing meson.build file into the build tree via SRC_URI
as then the timestamp of that file becomes the timestamp of the build,
which results in repeated builds having different timestamps.
Instead patch the file into the build, which doesn't change the SDE
every build.
(From OE-Core rev: b525fab08cb4f6d7b9a71bf82378a8396a20aba8)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
GTK+ 3.24.36 will drop the autotools build, so get ahead of the curve
and switch to Meson.
The tarball is missing one meson.build file so add that explictly for
now.
(From OE-Core rev: f9b0930eab6cf89bbf80c565676c89997b610206)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The gtktypefuncs.c removal is obsolete as that file isn't in the tarball
anymore, so remove it.
However the wayland-scanner files are still in the tarball despite
efforts to stop this, so generalise the removal to ensure it covers all
files which may be affected. Further investigation will be needed to
see if this is still an issue.
Rebase 0003-Add-disable-opengl-configure-option.patch.
(From OE-Core rev: cf5c5b4b83642ea44b21d29e7c59342666fbda6d)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
libtool is now longer renamed to ${host}-libtool, so remove the changes
to support this.
(From OE-Core rev: df74f8637b63d3b88a1b5bdbca22503b98d2d54b)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The list of resources is gathered with $(wildcard) in Make, which isn't
sorted. If this order changes then the generated libraries will differ.
(From OE-Core rev: f3675be6be29426688187a135221431a0941d007)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Rebase 0003-Add-disable-opengl-configure-option.patch
and add another fix to it (g-introspection input file list assumes
opengl is always available).
(From OE-Core rev: e6ca80559f02a8a38272ae52c568053dde52ac9f)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The installation path and wayland-scanner location problems in Wayland were
resolved in "wayland: Fix installation patch issue" (oe-core 14c0d99) which made
the WAYLAND_PROTOCOLS_SYSROOT_DIR workaround redundant.
(From OE-Core rev: 5d44eeca7706f6b3d178744f330710105e079618)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The patch "0003-Add-disable-opengl-configure-option.patch" used Git
rename syntax, which is not supported by patch 2.6.x and older.
(From OE-Core rev: 43e640ddcf32c718b3e0bb3f3654ed60eb497058)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Six-monthly feature release.
* Rebase the --disable-opengl patch.
* Remove a backported patch.
* Inherit gettext as that seems to have been missing.
(From OE-Core rev: d1dce7adbc649925bc9285798bf464b1e6f3d84d)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Treeview did not grab focus properly on mouse click, leading to e.g.
multifile selection with click/shift-click not working in the
filechooser. Backport a fix.
Fixes [YOCTO #10273].
(From OE-Core rev: d408b79dba47e4392a9d13aff1660a1e483a765c)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The patch contained git style patch like:
| diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx-with-gl-context.h
| similarity index 100%
| rename from gdk/x11/gdkx.h
| rename to gdk/x11/gdkx-with-gl-context.h
Which can't be applied by older patch tool such as patch 2.6.1. So
update the patch.
(From OE-Core rev: f9ac2c33c9a168f8b0fa2eca321f5377bad11fee)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Remove a patch that's no longer needed (as we don't
have a problem with client side decorations anymore)
* Wayland build now depends on wayland-protocols:
Use same WAYLAND_PROTOCOLS_SYSROOT_DIR trick as weston so
protocols are found and multilib build does not break
* Add new binary gtk-query-settings to -dev package
* Rebase patches
* Modify 0003-Add-disable-opengl-configure-option.patch so
that gdkx.h really is generated whenever it changes
* Depend on wayland-protocols in gtk+3-dev if Wayland is enabled as otherwise
the pkg-config files can't be used - RB
(From OE-Core rev: b610145b1aadb093ced72a7958d8df00ef1250b6)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
gtk+3: depend on wayland-protocols if wayland enabled
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Patch is a bit nasty and not maintainer friendly, but it does
make Gtk+3 compile without libepoxy (which means without OpenGL
dev files).
(From OE-Core rev: 82bedec89a86902456e924a3ac2f233b6a069dea)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Gdk initialization ends up calling epoxy GLX api, which calls exit()
if libGL.so.1 is not present. In practice this prevents all GTK+
applications from starting if GLX is not present.
If opengl and x11 distro features are set, make gtk+3 RDEPEND on libgl.
If opengl and x11 distro features are not set, use #ifdef to prevent
the GL initialization.
Remove libgl dependency from gtk3-demo: it can now run without
libgl (although trying to run the glarea demo will exit in that case).
[YOCTO #8529]
(From OE-Core rev: f9540f50ea661e260ec2b82436238cfb989e23c5)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When configured with just the Wayland backend (no X11), not enough
Pango headers were included.
(From OE-Core rev: 9d4a88d003fd1a4c8864d1470473ea7c90f5e6d7)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Drop --disable-gtk2-dependency and the patch for
gtk/native/Makefile.am: gtk-update-icon-cache is no longer used at
build time and as a result the option was removed.
* Add dependency to libepoxy
* Add dependency to virtual/mesa for wayland-egl
* Package new binaries gtk3-icon-browser and gtk-encode-symbolic-svg
* Add a backported patch that allows server side window decorations
in all cases
* RRECOMMEND adwaita-icon-theme-symbolic: GTK+ widgets expect a
symbolic theme to be installed
(From OE-Core rev: 8d34b4db648756d3474c809d2895b15299fc8a6a)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
fix-build-when-wayland-backend-enabled.patch removed as the issue
is fixed in upstream.
(From OE-Core rev: 59fe6f91b39c4aa67e7e1734c3731d49c7ea8376)
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The target gtk+3 does a native build in its "native" directory, we need
unset the target FLAGS for native build, otherwise, there might be build
failures.
(From OE-Core rev: 3f3e249b98182fa50358ade9278e3e26454275b8)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(*) removed patches that were already
commited upstream
(*) added new patch to solve the build issue
(*) changed the package URL because
the old one is unreliable.
(From OE-Core rev: c885365107cc31ba2eff94cfae4f09813ac53a97)
Signed-off-by: Valentin Popa <valentin.popa@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without this, it tries to run ./libtool, not the sys-prefixed libtool, which
fails, resulting in dynamic modules being disabled, which in turn results in
compiling the immodules directly into the gtk+3 library.
I tried switching it to using $LIBTOOL rather than hardcoding the path, as
LT_INIT sets LIBTOOL, but it didn't work, I didn't have time to dig further,
and this gets the job done for now.
(From OE-Core rev: f74e456772fc80c2333fbdf57c629a18412375e8)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Weston 1.1 is stricter with the protocol, so fix the behaviour in GTK+.
(From OE-Core rev: 3eb9bbea6f08171d0598c48ca65256c2afc92676)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
cross.patch was accepted upstream, so update this patch with the commit that was
merged.
(From OE-Core rev: 8e5ffa370c4259f925a0454fe7fd81c80ef2174b)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Mostly taken from meta-gnome, with some changes.
Instead of depending on gtk+-native, depend on just gdk-pixbuf-native and build
the tool required for the host directly. This saves building the entire GTK+
stack natively just for one tool.
Append a version suffix and use update-alternatives on gtk-update-icon-cache as
with GTK+ 2.
(From OE-Core rev: 16c0556808029a0f6a3f91a726b14626e9489498)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
