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>
Without this a gtk+2 app appended to an image is going to look awful.
(From OE-Core rev: a01fd55ca0a93489170e8b1612f25ae3a3ed996e)
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>
Rrecommend a similar set of packages as the gtk+ recipe.
Most importantly this actually makes icons render even when other
packages do not drag in the relevant gdkpixbuf loaders.
(From OE-Core rev: 0c686118fa74745571ff4ce6786fd415d39dbeb9)
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>
configure needs wayland-scanner which comes from wayland-native, add missing
DEPENDS.
(From OE-Core rev: 44d780271a14e54d729335700bb53248b898217a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Cosmetic change to use "True", not 1 as expand parameter for getVar.
(From OE-Core rev: 4c9d063c72cc021ee22472783f74d73078671813)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Where variables are used in python, we need to ensure they are expanded.
This happens to work at the moment but likely will not happen in future
and isn't good code practise.
Its mostly an issue around key values, since bitbake has already
performed key expansion when these functions are executed.
(From OE-Core rev: 6d1142b56948c048111c4f78d9909c1846ab225b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The setscene [depends] support is nasty with hidden side effects, in
particular hardcoding that the items mentioned basically always get
installed from sstate. Installing librsvg-native ends up pulling
in qemu-native and all kinds of things we don't want.
http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=e384d9ba0c4a3335575a766a82ed79201d794b11
was meant to resolve the reasons this dependency was present and
I suspect I simply forgot to remove it at the time. Remove it now
for much better sstate usage.
(From OE-Core rev: 9b0dd8e1c365d54300c15fdc06dd031fd0366575)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix a do_configure() error (missing m4 macro) in puzzles recipe caused
by this update.
(From OE-Core rev: b646dd99b8fda54375ad7c0cd5ce1ef9dcca2736)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
With the autodebug package generation logic, specifically setting FILES_${PN}-dbg
isn't needed in most cases, we can remove them.
(From OE-Core rev: 3ab59d49dd7c18e194b58d1248b4b87709b5a738)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Package new development tool gtk-builder-tool.
* Disable colord support (for explicitness, no functional change)
(From OE-Core rev: 59498a8b4fa69a359e72225d14c554aae133571a)
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>
(From OE-Core rev: 44b8ad12042eb4a1161c6f8359479f3dfa31eab9)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Conflicts:
gtk+3 and gtk+ have the same priority 10 for gtk-update-icon-cache
Turn up gtk+3's priority to fix the conflict.
[YOCTO #8477]
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>
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>
The demo app uses OpenGL (within a GtkGLArea): it needs a runtime
dependency on a GL library. Current GTK+ can only handle
full GL (libGL.so.1) so RDEPEND on libgl.
(From OE-Core rev: 3d95440b77bfe90d20c8b7a96e611b6cf2ffcb70)
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>
If you currently do a DISTRO_FEATURES_remove = "x11" with OE-Core, you
see failures due to dependency problems. The work in resolving this was
partially completed a while back. This adds in the markup mainly for
gtk/gtk3+ recipes and means "bitbake world" will work successfully.
Rather than code the gtk/gtk+ specific distro features into each recipe,
a shared variable is used.
(From OE-Core rev: ef967c70182eeccb59c7511d838a7ecb0b2315c1)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
GTK+ needs either X11 or DirectFB, and fails with obscure errors if neither are present.
(From OE-Core rev: d308e4750e6647c2f2be9c69e25645d3eeb78b3f)
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>
* Rename from gtk-update-icon-cache to gtk-icon-utils to better
reflect the content. Fix references in other recipes and classes
* Upgrade to GTK+ 3.16.4
* Add gtk-encode-symbolic-svg binary: it is used by icon themes
(e.g. Adwaita) to generate png versions of svg icons.
* Depend on librsvg-native for gtk-encode-symbolic-svg
* Add a patch that removes Gdk dependency from gtk-encode-symbolic-svg:
this way the native build stays slim.
(From OE-Core rev: 5f4fe36f735ff8b97c5112b16bd90e794053573d)
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>
* 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>
This is turned on by default in gcc-5 so far
we have been getting by this issue but time to fix it
has now come
Change-Id: I012248731de0be7a9b7e232073746360fe6c83dd
(From OE-Core rev: 8d8db821d7bcf30079f5a71c255481b12ec00e17)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Remove patches that are no longer needed:
* GtkButton-do-no-prelight: merged upstream
* Duplicate-the-exec-string: upstream decided this behaviour is incorrect
* cellrenderer-cairo: Cairo isn't the performance bottleneck it once was, drop
* configure-nm: resolved upstrea
* configurefix.patch: not applied
* run-iconcache: not needed when building tarballs, and if gtk-update-icon-cache
is needed at build time (e.g. user is customising default icon theme) then
they can add a dependency on gtk-update-icon-cache-native.
Also remove mention of patches that have been commented out for a long time.
(From OE-Core rev: 9299b5d2e5f82cf0e3f66ca49dedbe2c8b18bb44)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This patch shouldn't be adding a .orig file. Aside from not being
necessary, attempting to apply the patch with patch rather than quilt
results in failure.
(From OE-Core rev: 4a888b2ab61662c7f749b5d1e64af92ed613d8eb)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without this each tries to provide libgtk-3.0 which directly conflict when
using multilibs.
(From OE-Core rev: afc4412f9ff14dd45aba6a47bfc87e703f3c4763)
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>
* building without x11 doesn't work, because it sets default
gdkbackend to x11 and then requires cairo-xlib to be available
* checking for CAIRO_BACKEND... no
configure: error: Package requirements (cairo-xlib >= 1.6) were not met:
No package 'cairo-xlib' found
(From OE-Core rev: a9f36bee8ef79ce7c9e3545ab5c854a45c232661)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.
(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
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-libjasper and --without-libtiff were removed when GTK+ and gdk-pixbuf
separated, in 2.22.0
(From OE-Core rev: d7aa6bf8d7702736e2bd81442ddef98869f40eae)
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>
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>
Jussi Kukkonen
Robert Yang
Alexander Kanavin
Richard Purdie
Ross Burton
Khem Raj
Paul Eggleton
Marko Lindqvist
Martin Jansa
Otavio Salvador
Valentin Popa
Chong Lu
Christopher Larson