diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2021-07-23 20:09:54 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2021-07-28 20:22:04 +0300 |
commit | 5f35090dc809872fb7b8f381c1ccf995b75f03a0 (patch) | |
tree | 630551abdfa860e31458f442108bf4a3d91993d4 /poky/meta/recipes-gnome | |
parent | 69721092c033f1c69060d2a5ae865f72a862e583 (diff) | |
download | openbmc-5f35090dc809872fb7b8f381c1ccf995b75f03a0.tar.xz |
poky: subtree update:2834c2f853..17aabc0127
Adam Romanek (3):
bitbake: fetch/git: run gc in foreground to avoid race with tar
bitbake: fetch2/s3: allow to use credentials from environment variables
own-mirrors: Add support for s3:// scheme in SOURCE_MIRROR_URL
Alexander Kanavin (44):
devtool upgrade: rebase override-only patches as well
cmake: update 3.20.3 -> 3.20.4
gnu-config: update to latest revision
bash: update 5.1 -> 5.1.8
dnf: updatee 4.7.0 -> 4.8.0
vulkan-samples: update to latest revision
bind: upgrade 9.16.16 -> 9.16.18
bluez5: upgrade 5.58 -> 5.59
dejagnu: upgrade 1.6.2 -> 1.6.3
libdnf: upgrade 0.63.0 -> 0.63.1
libpcre: upgrade 8.44 -> 8.45
libxi: upgrade 1.7.10 -> 1.7.99.2
mtools: upgrade 4.0.29 -> 4.0.31
python3-git: upgrade 3.1.17 -> 3.1.18
sqlite3: upgrade 3.35.5 -> 3.36.0
vte: upgrade 0.64.1 -> 0.64.2
x264: upgrade to latest revision
python3: apply test skipping patch unconditionally
pypi: set SRC_URI with _prepend, not with +=
man-pages: upgrade 5.11 -> 5.12
rt-tests: update 1.10 -> 2.1
python3-iniparse: update 0.4 -> 0.5
iputils: correct upstream version check
texinfo: update 6.7 -> 6.8
xserver-xorg: exclude development snapshots from upstream version checks
xwayland: exclude development snapshots from upstream version checks
devtool: correctly handle non-standard source tree locations in upgrades
llvm: make upgradable via devtool
xserver-xorg: update 1.20.11 -> 1.20.12
libmodulemd: update 2.12.1 -> 2.13.0
bluez5: upgrade 5.59 -> 5.60
createrepo-c: upgrade 0.17.3 -> 0.17.4
ethtool: upgrade 5.12 -> 5.13
gtk+3: upgrade 3.24.29 -> 3.24.30
harfbuzz: upgrade 2.8.1 -> 2.8.2
iproute2: upgrade 5.12.0 -> 5.13.0
libgit2: upgrade 1.1.0 -> 1.1.1
mpg123: upgrade 1.28.0 -> 1.28.2
mtools: upgrade 4.0.31 -> 4.0.32
ruby: upgrade 3.0.1 -> 3.0.2
stress-ng: upgrade 0.12.11 -> 0.12.12
webkitgtk: upgrade 2.32.1 -> 2.32.2
xwayland: upgrade 21.1.1 -> 21.1.2
tcl: fix upstream version check
Alexey Brodkin (3):
dpkg: Add ARC support
default-distrovars.inc: Remove seccomp for ARC
dhcpcd: add ARC support
Andreas Müller (4):
libdrm: upgrade 2.4.106 -> 2.4.107
mesa: upgrade 21.1.3 -> 21.1.4
pango: upgrade 1.48.5 -> 1.48.7
mesa: upgrade 21.1.4 -> 21.1.5
Andrej Valek (1):
busybox: add tmpdir option into mktemp applet
Armin Kuster (1):
maintainers.inc: remove myself as a Maintainer
Asfak Rahman (1):
openssh: Remove temporary keys before generating new ones
Bruce Ashfield (24):
linux-yocto/5.10: update to v5.10.46
linux-yocto/5.10: features/nft_tables: refresh config options
linux-yocto/5.4: update to v5.4.128
linux-yocto/5.10: rcu: Fix stall-warning deadlock due to non-release of rcu_node ->lock
linux-yocto/5.10: update to v5.10.47
linux-yocto/5.4: update to v5.4.129
linux-yocto/5.10: scsi-debug needs scsi-disk
linux-libc-headers: update to 5.13
kernel-devsrc: fix scripts/prepare for ARM64
kernel-devsrc: fix scripts prepare for powerpc
kernel-devsrc: powerpc64 add scripts prepare support
linux-yocto: introduce 5.13 recipes
linux-yocto/5.13: add devupstream support
linux-yocto-rt/5.13: integrate -rt1
linux-yocto: add vfat KERNEL_FEATURE when MACHINE_FEATURES include vfat
linux-yocto/5.10: update to v5.10.49
linux-yocto/5.4: update to v5.4.131
linux-yocto/5.13: update to v5.13.2
linux-yocto/5.10: update to v5.10.50
linux-yocto/5.4: update to v5.4.132
linux-yocto/5.13: update to v5.13.3
linux-yocto/5.13: update to v5.13.4
linux-yocto/5.10: update to v5.10.52
linux-yocto/5.4: update to v5.4.134
Changhyeok Bae (1):
iputils: Update to 20210202
Changqing Li (1):
boost-build-native: workaround one rarely hang problem on fedora34
Christoph Muellner (1):
ldconfig-native: Add RISC-V support
Damian Wrobel (1):
gobject-introspection: Fix the license (add MIT)
Denys Dmytriyenko (1):
bitbake: providers: replace newly added logger.warn() with logger.warning()
Fabio Berton (1):
lib/oe/package_manager: Don't ignore installation failures in install_complementary
Florian Amstutz (1):
devtool: deploy-target: Fix preserving attributes when using --strip
Jose Quaresma (3):
glslang: upgrade 11.4.0 -> 11.5.0
shaderc: upgrade 2021.0 -> 2021.1
spirv-tools: upgrade 2021.1 -> 2021.2
Joshua Watt (3):
ref-manual: Document BUILDHISTORY_PATH_PREFIX_STRIP
bitbake: bitbake: Add piping compression library
bitbake: server: Fix early parsing errors preventing zombie bitbake
Khem Raj (7):
glib-2.0: Fix signature of close_range
gnome-desktop-testing: Fix non-literal format string warning
util-linux: Disable chfn-chsh on non-target builds
libseccomp: Update to main branch
systemd: Fix libseccomp testcase involving __NR_ppoll
util-linux: Fix signature of close_range()
gpgme: Use glibc provided closefrom API when available
Lee Chee Yang (1):
qemu: fix CVE-2021-3527
Marek Vasut (2):
pulseaudio: Drop pulseaudio-conf
update-rc.d: update SRCREV to pull in fix for non-bash shell support
Mark Hatle (1):
populate_sdk_ext: Error if trying to generate an eSDK from a mulitconfig
Max Krummenacher (1):
xwayland: port packageconfig from xserver-xorg recipe
Michael Halstead (1):
releases: update to include 3.1.9
Michael Ho (1):
sstate.bbclass: fix errors about read-only sstate mirrors
Mike Crowe (1):
licence_image: Add lic-pkgs IMAGE_FEATURE
Mingli Yu (4):
pulseaudio: check if NEON code can be compiled on arm
perlcross: check the file if patched or not
perl: correct libpth and glibpth
parselogs.py: ignore rndr initialization failure
Patrick Williams (1):
docs: remove image-mklibs references
Paul Barker (1):
linux-yocto: Fix devupstream SRCREV assignment
Peter Bergin (1):
Revert "libubootenv: inherit uboot-config"
Quentin Schulz (1):
docs: replace remaining ``FOO`` by :term:`FOO`
Ralph Siemsen (1):
oeqa/manual/toaster: fix small typo
Richard Purdie (26):
package_pkgdata: Avoid task hash mismatches for generic task changes
selftest/fetch: Avoid occasional selftest failure from poor temp file name choice
kernel: Fix interaction when packaging disabled
kernel-devicetree: Fix interaction when packaging disabled
python3-pip/python3-pbr: Drop obsolete md5sum at upgrade
oeqa/selftest/runcmd: Tweal test timeouts
bash: Fix a rare make race build failure
sstate/staging: Handle directory creation race issue
oeqa/selftest/archiver: Allow tests to ignore empty directories
dwarfsrcfiles: Avoid races over debug-link files
oeqa/selftest/multiprocesslauch: Fix test race
runqemu: Remove potential lock races around tap device handling
glibc-testsuite: Fix build failures when directly running recipe
license: Drop adding RRECOMMENDS for license packages
report-error: Drop pointless inherit
pseudo: Add uninative configuration sanity check
pseudo: Update to latest version including statx fix
sstate: Drop pseudo exclusion
oeqa/qemurunner: Handle files no longer existing gracefully
python3: Add a fix for a make install race
Add README link to README.poky
README.OE-Core/README.qemu: Move to markdown format
bitbake: data_smart/parse: Allow ':' characters in variable/function names
zstd: Include pzstd in the build
buildtools-tarball: Add lz4 and ztsd (including pzstd)
build-appliance-image: Update to master head revision
Ross Burton (29):
glibc: backport MTE improvements from master
glibc: re-enable memory tagging
libgudev: fix SRC_URI
cantarell-fonts: fix SRC_URI
shadow: generate alternative links for chfn and chsh
util-linux: build chfn and chsh
util-linux: add missing ptest dependencies
util-linux: backport test suite fixes
util-linux: rewrite the ptest integration
glib-2.0: fix g-file-into modification time test
oeqa/selftest/recipetool: update socat version to fix failing download
parted: improve ptest execution
tcl: suffix all Tcl man pages instead of using alternatives
tcl: EXTRA_OECONF already passes --libdir, don't do it again
tcl: mark a patch as upstreamable
tcl: use tcl-core instead of patching out packages
tcl: use AUTOTOOLS_SCRIPT_PATH
tcl: remove redundant file creation
tcl: detect tests that error as well as fail
tcl: clock.test needs a timezone to be set
tcl: fix race in interp.test
parted: remove obsolete patch
parted: fix ptest RRECOMMENDS
busybox: support mounting swap via labels
meta: remove redundant ${libdir}/cmake from FILES_${PN}-dev
cups: update to 2.3.3op2
parted: skip tests that need vfat support
avahi: fix CVE-2021-36217, crash on pinging '.local'
parted: add device mappper PACKAGECONFIG
Sakib Sajal (3):
buildstats.bbclass: log host data on failure to task specific file
oe-time-dd-test.sh: add options and refactor
scripts/oe-time-dd-test.sh: run "uptime" on each iteration
Saul Wold (4):
qemurunner: Add info log for qemu startup
oeqa/qemurunner: add support qmp cmd args
oeqa/dump.py: Add support for QMP command arguments
testimage.bbclass: Add dump-guest-memory cmd
Scott Weaver (1):
meta-skeleton: update to satisfy yocto-check-layer tests
Tim Orling (6):
python3-importlib-metadata: upgrade 4.5.0 -> 4.6.0
python3-packaging: upgrade 20.9 -> 21.0
python3-hypothesis: upgrade 6.14.0 -> 6.14.1
python3-zipp: upgrade 3.4.1 -> 3.5.0
at-spi2-core: upgrade 2.40.2 -> 2.40.3
python3-hypothesis: upgrade 6.14.1 -> 6.14.3
Tony Tascioglu (1):
valgrind: skip flaky ptest fb_test_amd64
Trevor Gamblin (2):
python3-pip: upgrade 20.0.2 -> 21.1.2
python3-pip: add multiprocessing to RDEPENDS
Yi Zhao (1):
libffi: disable use of static exec trampolines
Zoltán Böszörményi (1):
tzdata: Allow controlling zoneinfo binary format
Zqiang (1):
ifupdown: Skip wrong test item
bkylerussell@gmail.com (1):
gstreamer: add libgst packages to PACKAGES_DYNAMIC
jbouchard (1):
Use the label provided when formating a dos partition
wangmy (19):
libcap: upgrade 2.50 -> 2.51
libhandy: upgrade 1.2.2 -> 1.2.3
libva: upgrade 2.11.0 -> 2.12.0
libxcrypt: upgrade 4.4.22 -> 4.4.23
python3-numpy: upgrade 1.20.3 -> 1.21.0
python3-pbr: upgrade 5.4.4 -> 5.6.0
cmake: upgrade 3.20.4 -> 3.20.5
gpgme: upgrade 1.15.1 -> 1.16.0
libglu: upgrade 9.0.1 -> 9.0.2
stress-ng: upgrade 0.12.10 -> 0.12.11
xf86-input-libinput: upgrade 1.0.1 -> 1.1.0
vulkan-headers: upgrade 1.2.176 -> 1.2.182
vulkan-loader: upgrade 1.2.176 -> 1.2.182
vulkan-tools: upgrade 1.2.176 -> 1.2.182
gnome-desktop-testing: upgrade 2018.1 -> 2021.1
python3-importlib-metadata: upgrade 4.6.0 -> 4.6.1
u-boot: upgrade 2021.04 -> 2021.07
python3-setuptools: upgrade 57.0.0 -> 57.1.0
btrfs-tools: upgrade 5.12.1 -> 5.13
zangrc (1):
python3-pip: upgrade 21.1.2 -> 21.1.3
zhengruoqin (3):
libffi: upgrade 3.3 -> 3.4.2
python3: upgrade 3.9.5 -> 3.9.6
python3-pathlib2: upgrade 2.3.5 -> 2.3.6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: If493204235c3a1ce4e7fe65438168512d17a900e
Diffstat (limited to 'poky/meta/recipes-gnome')
-rw-r--r-- | poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb | 2 | ||||
-rw-r--r-- | poky/meta/recipes-gnome/gtk+/gtk+3.inc | 1 | ||||
-rw-r--r-- | poky/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch | 44 | ||||
-rw-r--r-- | poky/meta/recipes-gnome/gtk+/gtk+3_3.24.30.bb (renamed from poky/meta/recipes-gnome/gtk+/gtk+3_3.24.29.bb) | 2 | ||||
-rw-r--r-- | poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb | 1 | ||||
-rw-r--r-- | poky/meta/recipes-gnome/libgudev/libgudev_236.bb | 5 | ||||
-rw-r--r-- | poky/meta/recipes-gnome/libhandy/libhandy_1.2.3.bb (renamed from poky/meta/recipes-gnome/libhandy/libhandy_1.2.2.bb) | 4 |
7 files changed, 31 insertions, 28 deletions
diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb index 4c986a574..048deabe6 100644 --- a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb +++ b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb @@ -6,7 +6,7 @@ generation for bindings, API verification and documentation generation." HOMEPAGE = "https://wiki.gnome.org/action/show/Projects/GObjectIntrospection" BUGTRACKER = "https://gitlab.gnome.org/GNOME/gobject-introspection/issues" SECTION = "libs" -LICENSE = "LGPLv2+ & GPLv2+" +LICENSE = "LGPLv2+ & GPLv2+ & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \ file://tools/compiler.c;endline=20;md5=fc5007fc20022720e6c0b0cdde41fabd \ file://giscanner/sourcescanner.c;endline=22;md5=194d6e0c1d00662f32d030ce44de8d39 \ diff --git a/poky/meta/recipes-gnome/gtk+/gtk+3.inc b/poky/meta/recipes-gnome/gtk+/gtk+3.inc index 8d5edb7ee..1445c406d 100644 --- a/poky/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/poky/meta/recipes-gnome/gtk+/gtk+3.inc @@ -63,7 +63,6 @@ PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,libepoxy" PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,,libgl" PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland wayland-protocols libxkbcommon virtual/egl virtual/libgles2 wayland-native" PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups" -PACKAGECONFIG[cloudprint] = "--enable-cloudprint,--disable-cloudprint,rest json-glib" PACKAGECONFIG[colord] = "--enable-colord,--disable-colord,colord" prepare_gtk_scripts() { diff --git a/poky/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch b/poky/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch index 398c9bc36..35cbab876 100644 --- a/poky/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch +++ b/poky/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch @@ -1,4 +1,4 @@ -From f83fcf1991afad6d9c15546b2ccd775dad4e314c Mon Sep 17 00:00:00 2001 +From eef50c94587fc30cd624adb5eb213eb9fa663dc1 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Tue, 21 Jun 2016 15:11:39 +0300 Subject: [PATCH] Add --disable-opengl configure option @@ -47,7 +47,7 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> create mode 100644 gdk/x11/gdkx-without-gl-context.h diff --git a/configure.ac b/configure.ac -index bd651bb..b4c061f 100644 +index 851bcbf..6cbf6a2 100644 --- a/configure.ac +++ b/configure.ac @@ -346,6 +346,15 @@ AC_ARG_ENABLE(cloudproviders, @@ -210,7 +210,7 @@ index 932daf1..54239d6 100644 return info; diff --git a/gdk/Makefile.am b/gdk/Makefile.am -index 479d6a1..7edbee8 100644 +index 710a548..b45f631 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -274,7 +274,6 @@ x11_introspection_files = \ @@ -243,10 +243,10 @@ index 479d6a1..7edbee8 100644 GdkX11_3_0_gir_SCANNERFLAGS = \ --identifier-prefix=Gdk \ diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c -index 240c99f..9eb49bf 100644 +index 748f548..911ab2a 100644 --- a/gdk/gdkdisplay.c +++ b/gdk/gdkdisplay.c -@@ -2419,7 +2419,9 @@ gboolean +@@ -2420,7 +2420,9 @@ gboolean gdk_display_make_gl_context_current (GdkDisplay *display, GdkGLContext *context) { @@ -258,7 +258,7 @@ index 240c99f..9eb49bf 100644 GdkRenderingMode diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c -index 933e204..1767508 100644 +index 9690077..55f85ef 100644 --- a/gdk/gdkgl.c +++ b/gdk/gdkgl.c @@ -26,7 +26,9 @@ @@ -334,7 +334,7 @@ index 933e204..1767508 100644 +#endif } diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c -index dfbed63..556f0a3 100644 +index 3b23639..1f04f8e 100644 --- a/gdk/gdkglcontext.c +++ b/gdk/gdkglcontext.c @@ -85,7 +85,9 @@ @@ -380,7 +380,7 @@ index dfbed63..556f0a3 100644 /** diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c -index 6ae0f86..4e48a2a 100644 +index 2de8ba4..1883a79 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -45,7 +45,9 @@ @@ -513,7 +513,7 @@ index 32b1f24..6352313 100644 + -include $(top_srcdir)/git.mk diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c -index 817944e..e7a2947 100644 +index 7e08f47..30fd7b6 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -37,7 +37,9 @@ @@ -526,7 +526,7 @@ index 817944e..e7a2947 100644 #include "gdk-private.h" #include "gdkprofilerprivate.h" -@@ -3188,7 +3190,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class) +@@ -3191,7 +3193,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class) display_class->text_property_to_utf8_list = _gdk_x11_display_text_property_to_utf8_list; display_class->utf8_to_string_target = _gdk_x11_display_utf8_to_string_target; @@ -538,10 +538,10 @@ index 817944e..e7a2947 100644 display_class->get_default_seat = gdk_x11_display_get_default_seat; diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c -index 8939ae9..931bff9 100644 +index bb4df05..46f5349 100644 --- a/gdk/x11/gdkscreen-x11.c +++ b/gdk/x11/gdkscreen-x11.c -@@ -1723,3 +1723,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen *screen) +@@ -1827,3 +1827,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen *screen) { return get_netwm_cardinal_property (screen, "_NET_CURRENT_DESKTOP"); } @@ -551,7 +551,7 @@ index 8939ae9..931bff9 100644 +void _gdk_x11_screen_update_visuals_for_gl (GdkScreen *screen) {} +#endif diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c -index 1fe7b90..d23a347 100644 +index 721d9bb..8e87acc 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -36,7 +36,9 @@ @@ -564,7 +564,7 @@ index 1fe7b90..d23a347 100644 #include "gdkprivate-x11.h" #include "gdk-private.h" -@@ -5861,7 +5863,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass) +@@ -5881,7 +5883,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass) impl_class->set_opaque_region = gdk_x11_window_set_opaque_region; impl_class->set_shadow_width = gdk_x11_window_set_shadow_width; impl_class->show_window_menu = gdk_x11_window_show_window_menu; @@ -668,10 +668,10 @@ index 0000000..c9e2617 + +#endif /* __GDK_X_H__ */ diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index eaca473..99352d1 100644 +index 074fb35..4fa9eb6 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am -@@ -1449,7 +1449,7 @@ gtktypefuncs.inc: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_s +@@ -1457,7 +1457,7 @@ gtktypefuncs.inc: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_s ${CPP} $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \ $(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \ sort | uniq | \ @@ -681,7 +681,7 @@ index eaca473..99352d1 100644 $(srcdir)/gtktestutils.c: gtktypefuncs.inc diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c -index 9a56443..7de0db2 100644 +index 802303e..33001cf 100644 --- a/gtk/gtkglarea.c +++ b/gtk/gtkglarea.c @@ -29,7 +29,9 @@ @@ -724,8 +724,8 @@ index 9a56443..7de0db2 100644 g_return_if_fail (GTK_IS_GL_AREA (area)); @@ -533,11 +540,13 @@ gtk_gl_area_attach_buffers (GtkGLArea *area) - glFramebufferRenderbufferEXT (GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, - GL_RENDERBUFFER_EXT, priv->depth_stencil_buffer); + glFramebufferRenderbuffer (GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, + GL_RENDERBUFFER, priv->depth_stencil_buffer); } +#endif } @@ -738,7 +738,7 @@ index 9a56443..7de0db2 100644 if (priv->context == NULL) @@ -569,6 +578,7 @@ gtk_gl_area_delete_buffers (GtkGLArea *area) - glDeleteFramebuffersEXT (1, &priv->frame_buffer); + glDeleteFramebuffers (1, &priv->frame_buffer); priv->frame_buffer = 0; } +#endif @@ -777,7 +777,7 @@ index 9a56443..7de0db2 100644 static gboolean diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c -index c241ec8..24576dd 100644 +index 48237d1..1f9b9be 100644 --- a/gtk/inspector/general.c +++ b/gtk/inspector/general.c @@ -33,8 +33,10 @@ @@ -824,7 +824,7 @@ index c241ec8..24576dd 100644 if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) { diff --git a/tests/Makefile.am b/tests/Makefile.am -index ee1e8b5..e6c6502 100644 +index f283e89..5e7180e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -80,8 +80,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \ diff --git a/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.29.bb b/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.30.bb index 031fbb6d6..7e7566f9a 100644 --- a/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.29.bb +++ b/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.30.bb @@ -8,7 +8,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar file://0003-Add-disable-opengl-configure-option.patch \ file://link_fribidi.patch \ " -SRC_URI[sha256sum] = "f57ec4ade8f15cab0c23a80dcaee85b876e70a8823d9105f067ce335a8268caa" +SRC_URI[sha256sum] = "ba75bfff320ad1f4cfbee92ba813ec336322cc3c660d406aad014b07087a3ba9" S = "${WORKDIR}/gtk+-${PV}" diff --git a/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb b/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb index 3b308318b..23cd25986 100644 --- a/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb +++ b/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb @@ -48,7 +48,6 @@ do_install_append () { } FILES_${PN} += "${datadir}/sgml" -FILES_${PN}-dev += "${libdir}/cmake" FILES_${PN}-doc = "" SYSROOT_PREPROCESS_FUNCS_append_class-native = " gtkdoc_makefiles_sysroot_preprocess" diff --git a/poky/meta/recipes-gnome/libgudev/libgudev_236.bb b/poky/meta/recipes-gnome/libgudev/libgudev_236.bb index daa578ddb..5d1d2d782 100644 --- a/poky/meta/recipes-gnome/libgudev/libgudev_236.bb +++ b/poky/meta/recipes-gnome/libgudev/libgudev_236.bb @@ -26,3 +26,8 @@ GTKDOC_MESON_OPTION = "gtk_doc" UPSTREAM_CHECK_URI = "http://ftp.gnome.org/pub/GNOME/sources/libgudev/" UPSTREAM_CHECK_REGEX = "(?P<pver>(\d+))" + +# This isn't a GNOME-style version do gnome_verdir fails. Just return the +# version as that is how the directory is structured. +def gnome_verdir(v): + return v diff --git a/poky/meta/recipes-gnome/libhandy/libhandy_1.2.2.bb b/poky/meta/recipes-gnome/libhandy/libhandy_1.2.3.bb index 9652948a3..acb6e53b7 100644 --- a/poky/meta/recipes-gnome/libhandy/libhandy_1.2.2.bb +++ b/poky/meta/recipes-gnome/libhandy/libhandy_1.2.3.bb @@ -9,8 +9,8 @@ BUGTRACKER = "https://gitlab.gnome.org/GNOME/libhandy/-/issues" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https" -SRCREV = "09f36006b26f41a2bb383b0c853e954c5792cfe1" +SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https;branch=libhandy-1-2" +SRCREV = "e9ca4ac4b134bbd6ab91b6f916a915192fd3a465" S = "${WORKDIR}/git" GIR_MESON_ENABLE_FLAG = 'enabled' |