diff options
Diffstat (limited to 'meta-gnome')
13 files changed, 83 insertions, 106 deletions
diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf index faacba478e..4094e5194e 100644 --- a/meta-gnome/conf/layer.conf +++ b/meta-gnome/conf/layer.conf | |||
| @@ -17,7 +17,7 @@ LAYERVERSION_gnome-layer = "1" | |||
| 17 | 17 | ||
| 18 | LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer meta-python" | 18 | LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer meta-python" |
| 19 | 19 | ||
| 20 | LAYERSERIES_COMPAT_gnome-layer = "walnascar whinlatter" | 20 | LAYERSERIES_COMPAT_gnome-layer = "whinlatter wrynose" |
| 21 | 21 | ||
| 22 | SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\ | 22 | SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\ |
| 23 | faenza-icon-theme->gdk-pixbuf \ | 23 | faenza-icon-theme->gdk-pixbuf \ |
diff --git a/meta-gnome/recipes-connectivity/gtk-vnc/gtk-vnc_1.5.0.bb b/meta-gnome/recipes-connectivity/gtk-vnc/gtk-vnc_1.5.0.bb index e9cb53c97c..0c095f8be3 100644 --- a/meta-gnome/recipes-connectivity/gtk-vnc/gtk-vnc_1.5.0.bb +++ b/meta-gnome/recipes-connectivity/gtk-vnc/gtk-vnc_1.5.0.bb | |||
| @@ -12,7 +12,7 @@ DEPENDS = " \ | |||
| 12 | zlib \ | 12 | zlib \ |
| 13 | " | 13 | " |
| 14 | 14 | ||
| 15 | REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" | 15 | REQUIRED_DISTRO_FEATURES = "gobject-introspection-data x11" |
| 16 | GIR_MESON_OPTION = "" | 16 | GIR_MESON_OPTION = "" |
| 17 | VALA_MESON_OPTION = "with-vala" | 17 | VALA_MESON_OPTION = "with-vala" |
| 18 | VALA_MESON_ENABLE_FLAG ?= 'enabled' | 18 | VALA_MESON_ENABLE_FLAG ?= 'enabled' |
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-meson-Fix-libunwind-header-detection-on-non-macOS-pl.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-meson-Fix-libunwind-header-detection-on-non-macOS-pl.patch deleted file mode 100644 index 879529b80e..0000000000 --- a/meta-gnome/recipes-gimp/gimp/gimp/0001-meson-Fix-libunwind-header-detection-on-non-macOS-pl.patch +++ /dev/null | |||
| @@ -1,51 +0,0 @@ | |||
| 1 | From 8862f36fcec74152afeee2a99c0e04b84b6cf5b3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Bruno Lopes <brunvonlope@outlook.com> | ||
| 3 | Date: Sun, 25 Jan 2026 11:11:48 -0300 | ||
| 4 | Subject: [PATCH] meson: Fix libunwind header detection on non-macOS platforms | ||
| 5 | |||
| 6 | Closes: #15750 | ||
| 7 | |||
| 8 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gimp/-/commit/1aa51ca0637db88a4ea958d03fa6692e6ac0289b] | ||
| 9 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 10 | --- | ||
| 11 | meson.build | 17 ++++++++++------- | ||
| 12 | 1 file changed, 10 insertions(+), 7 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/meson.build b/meson.build | ||
| 15 | index 2192968..cfa1f71 100644 | ||
| 16 | --- a/meson.build | ||
| 17 | +++ b/meson.build | ||
| 18 | @@ -731,11 +731,14 @@ conf.set('HAVE_LIBBACKTRACE', libbacktrace.found()) | ||
| 19 | ## Check for libunwind | ||
| 20 | # In most platforms, unw_*() functions are in the libunwind library. | ||
| 21 | # In macOS, it is on libSystem (there we only need the SDK header). | ||
| 22 | -libunwind = ( get_option('libunwind') | ||
| 23 | - ? dependency('libunwind', version: '>=1.1.0', required: false) | ||
| 24 | - : no_dep | ||
| 25 | -) | ||
| 26 | -have_unwind = libunwind.found() or cc.has_header('libunwind.h', required: false) | ||
| 27 | +libunwind = no_dep | ||
| 28 | +if get_option('libunwind') | ||
| 29 | + libunwind = dependency('libunwind', version: '>=1.1.0', required: false) | ||
| 30 | + libunwind_h = platform_osx ? cc.has_header('libunwind.h', required: false) : false | ||
| 31 | + have_unwind = libunwind.found() or libunwind_h | ||
| 32 | +else | ||
| 33 | + have_unwind = false | ||
| 34 | +endif | ||
| 35 | conf.set('HAVE_LIBUNWIND', have_unwind ? 1 : false) | ||
| 36 | |||
| 37 | ## Check for backtrace() API | ||
| 38 | @@ -758,11 +761,11 @@ if platform_windows | ||
| 39 | elif platform_linux | ||
| 40 | if not have_execinfo_h | ||
| 41 | dashboard_backtrace='no (missing: execinfo.h)' | ||
| 42 | - elif not libbacktrace.found() and not libunwind.found() | ||
| 43 | + elif not libbacktrace.found() and not have_unwind | ||
| 44 | dashboard_backtrace='rough (missing: libbacktrace and libunwind)' | ||
| 45 | elif not libbacktrace.found() | ||
| 46 | dashboard_backtrace='partially detailed (missing: libbacktrace)' | ||
| 47 | - elif not libunwind.found() | ||
| 48 | + elif not have_unwind | ||
| 49 | dashboard_backtrace='partially detailed (missing: libunwind)' | ||
| 50 | else | ||
| 51 | dashboard_backtrace='detailed' | ||
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-meson.build-require-iso-codes-native.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-meson.build-require-iso-codes-native.patch deleted file mode 100644 index ffb8ef29df..0000000000 --- a/meta-gnome/recipes-gimp/gimp/gimp/0001-meson.build-require-iso-codes-native.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | From 8ccd12d6ec3330e9646ae9db6fd491226d516dc3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Markus Volk <f_l_k@t-online.de> | ||
| 3 | Date: Fri, 28 Mar 2025 01:33:00 +0100 | ||
| 4 | Subject: [PATCH] meson.build: require iso-codes-native | ||
| 5 | |||
| 6 | This fixes: | ||
| 7 | FAILED: app/widgets/gimplanguagestore-data.h | ||
| 8 | /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/gimp/3.0.2/build/tools/gen-languages | ||
| 9 | gimp_language_store_parser_init: 0.006277 seconds | ||
| 10 | ERROR: parse_iso_codes: error parsing '/usr/share/xml/iso-codes/iso_639_3.xml': No such file or directory | ||
| 11 | |||
| 12 | Upstream-Status: Denied [https://gitlab.gnome.org/GNOME/gimp/-/merge_requests/2185] | ||
| 13 | Upstream argues that iso-codes locale (.mo files) are required on the target | ||
| 14 | |||
| 15 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
| 16 | --- | ||
| 17 | meson.build | 2 +- | ||
| 18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 19 | |||
| 20 | diff --git a/meson.build b/meson.build | ||
| 21 | index efbc2d8175..fd050f4d3c 100644 | ||
| 22 | --- a/meson.build | ||
| 23 | +++ b/meson.build | ||
| 24 | @@ -1135,7 +1135,7 @@ endif | ||
| 25 | ################################################################################ | ||
| 26 | # ISO codes | ||
| 27 | |||
| 28 | -isocodes = dependency('iso-codes', required: false) | ||
| 29 | +isocodes = dependency('iso-codes', required: false, native: true) | ||
| 30 | if isocodes.found() | ||
| 31 | isocodes_prefix = isocodes.get_variable(pkgconfig: 'prefix') | ||
| 32 | isocodes_location = isocodes_prefix / 'share' / 'xml' / 'iso-codes' | ||
| 33 | -- | ||
| 34 | 2.49.0 | ||
| 35 | |||
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0002-meson.build-use-relative-path-for-ISO_CODES_LOCATION.patch b/meta-gnome/recipes-gimp/gimp/gimp/0002-meson.build-use-relative-path-for-ISO_CODES_LOCATION.patch new file mode 100644 index 0000000000..826d3394ad --- /dev/null +++ b/meta-gnome/recipes-gimp/gimp/gimp/0002-meson.build-use-relative-path-for-ISO_CODES_LOCATION.patch | |||
| @@ -0,0 +1,51 @@ | |||
| 1 | From 8ccd12d6ec3330e9646ae9db6fd491226d516dc3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Markus Volk <f_l_k@t-online.de> | ||
| 3 | Date: Fri, 28 Mar 2025 01:33:00 +0100 | ||
| 4 | Subject: [PATCH] meson.build: use relative path for ISO_CODES_LOCATION | ||
| 5 | |||
| 6 | If the host system does not provide iso-codes, the build fails with the following message: | ||
| 7 | FAILED: app/widgets/gimplanguagestore-data.h | ||
| 8 | /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/gimp/3.0.2/build/tools/gen-languages | ||
| 9 | gimp_language_store_parser_init: 0.006277 seconds | ||
| 10 | ERROR: parse_iso_codes: Error parsing ‘/usr/share/xml/iso-codes/iso_639_3.xml’: No such file or directory | ||
| 11 | |||
| 12 | So far, we have worked around the problem by using the “iso-codes-native” dependency, but the path | ||
| 13 | for 'isocodes_prefix' is then generated from the native pkgconfig entry, resulting in a hard-coded path to | ||
| 14 | ${STAGING_DATADIR_NATIVE}, which then leaks into the binaries of gimp and gimp-console. | ||
| 15 | |||
| 16 | Instead, use iso-codes for the target and adjust the path stored in ISO_CODES_LOCATION | ||
| 17 | (which is used in tools/gen-languages.c) to a relative path so that the build system can find it. | ||
| 18 | |||
| 19 | This allows us to depend on iso-codes for the target system, while still working on host systems that | ||
| 20 | do not provide iso-codes. | ||
| 21 | |||
| 22 | It also fixes a reproducibility issue: | ||
| 23 | ERROR: gimp-3.2.0-r0 do_package_qa: QA Issue: File /usr/bin/gimp-console-3.2 in package gimp contains reference to TMPDIR [buildpaths] | ||
| 24 | ERROR: gimp-3.2.0-r0 do_package_qa: QA Issue: File /usr/bin/gimp-3.2 in package gimp contains reference to TMPDIR [buildpaths] | ||
| 25 | ERROR: gimp-3.2.0-r0 do_package_qa: Fatal QA errors were found, failing task. | ||
| 26 | ERROR: Logfile of failure stored in: /home/flk/bitbake-builds/poky/build/tmp/work/corei7-64-oe-linux/gimp/3.2.0/temp/log.do_package_qa.597065 | ||
| 27 | ERROR: Task (/home/flk/bitbake-builds/poky/layers/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_3.2.0.bb:do_package_qa) failed with exit code '1' | ||
| 28 | |||
| 29 | Upstream-Status: Inappropriate [oe-specific] | ||
| 30 | |||
| 31 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
| 32 | --- | ||
| 33 | meson.build | 2 +- | ||
| 34 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 35 | |||
| 36 | diff --git a/meson.build b/meson.build | ||
| 37 | index efbc2d8175..fd050f4d3c 100644 | ||
| 38 | --- a/meson.build | ||
| 39 | +++ b/meson.build | ||
| 40 | @@ -1184,7 +1184,7 @@ | ||
| 41 | isocodes_prefix = isocodes.get_variable(pkgconfig: 'prefix') | ||
| 42 | isocodes_location = isocodes_prefix / 'share' / 'xml' / 'iso-codes' | ||
| 43 | isocodes_localedir= isocodes_prefix / 'share' / 'locale' | ||
| 44 | - conf.set_quoted('ISO_CODES_LOCATION', isocodes_location) | ||
| 45 | + conf.set_quoted('ISO_CODES_LOCATION', '..' / 'recipe-sysroot' / 'usr' / 'share' / 'xml' / 'iso-codes') | ||
| 46 | conf.set_quoted('ISO_CODES_LOCALEDIR', isocodes_localedir) | ||
| 47 | endif | ||
| 48 | conf.set('HAVE_ISO_CODES', isocodes.found()) | ||
| 49 | -- | ||
| 50 | 2.49.0 | ||
| 51 | |||
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0002-meson.build-reproducibility-fix.patch b/meta-gnome/recipes-gimp/gimp/gimp/0003-meson.build-reproducibility-fix.patch index 532715d588..532715d588 100644 --- a/meta-gnome/recipes-gimp/gimp/gimp/0002-meson.build-reproducibility-fix.patch +++ b/meta-gnome/recipes-gimp/gimp/gimp/0003-meson.build-reproducibility-fix.patch | |||
diff --git a/meta-gnome/recipes-gimp/gimp/gimp_3.0.8.bb b/meta-gnome/recipes-gimp/gimp/gimp_3.2.0.bb index 5cbb94055a..d6928498ac 100644 --- a/meta-gnome/recipes-gimp/gimp/gimp_3.0.8.bb +++ b/meta-gnome/recipes-gimp/gimp/gimp_3.2.0.bb | |||
| @@ -20,7 +20,7 @@ DEPENDS = " \ | |||
| 20 | glib-2.0-native \ | 20 | glib-2.0-native \ |
| 21 | gtk+3 \ | 21 | gtk+3 \ |
| 22 | harfbuzz \ | 22 | harfbuzz \ |
| 23 | iso-codes-native \ | 23 | iso-codes \ |
| 24 | jpeg \ | 24 | jpeg \ |
| 25 | json-glib \ | 25 | json-glib \ |
| 26 | lcms \ | 26 | lcms \ |
| @@ -32,7 +32,7 @@ DEPENDS = " \ | |||
| 32 | librsvg-native \ | 32 | librsvg-native \ |
| 33 | libxmu \ | 33 | libxmu \ |
| 34 | libxslt-native \ | 34 | libxslt-native \ |
| 35 | mypaint-brushes-1.0 \ | 35 | mypaint-brushes \ |
| 36 | pango \ | 36 | pango \ |
| 37 | poppler \ | 37 | poppler \ |
| 38 | poppler-data \ | 38 | poppler-data \ |
| @@ -48,6 +48,8 @@ LDFLAGS:append:libc-musl = " -lexecinfo" | |||
| 48 | 48 | ||
| 49 | inherit meson gtk-icon-cache mime-xdg pkgconfig gettext gobject-introspection vala bash-completion | 49 | inherit meson gtk-icon-cache mime-xdg pkgconfig gettext gobject-introspection vala bash-completion |
| 50 | 50 | ||
| 51 | REQUIRED_DISTRO_FEATURES = "x11" | ||
| 52 | |||
| 51 | GIR_MESON_OPTION = 'can-crosscompile-gir' | 53 | GIR_MESON_OPTION = 'can-crosscompile-gir' |
| 52 | VALA_MESON_OPTION = "vala" | 54 | VALA_MESON_OPTION = "vala" |
| 53 | VALA_MESON_ENABLE_FLAG = "enabled" | 55 | VALA_MESON_ENABLE_FLAG = "enabled" |
| @@ -56,13 +58,12 @@ GIDOCGEN_MESON_OPTION = "gi-docgen" | |||
| 56 | GIDOCGEN_MESON_ENABLE_FLAG = "enabled" | 58 | GIDOCGEN_MESON_ENABLE_FLAG = "enabled" |
| 57 | GIDOCGEN_MESON_DISABLE_FLAG = "disabled" | 59 | GIDOCGEN_MESON_DISABLE_FLAG = "disabled" |
| 58 | 60 | ||
| 59 | SRC_URI = "https://download.gimp.org/gimp/v3.0/${BP}.tar.xz \ | 61 | SRC_URI = "https://download.gimp.org/gimp/v3.2/${BP}.tar.xz \ |
| 60 | file://0002-meson.build-reproducibility-fix.patch \ | ||
| 61 | file://0001-meson.build-dont-check-for-lgi.patch \ | 62 | file://0001-meson.build-dont-check-for-lgi.patch \ |
| 62 | file://0001-meson.build-require-iso-codes-native.patch \ | 63 | file://0002-meson.build-use-relative-path-for-ISO_CODES_LOCATION.patch \ |
| 63 | file://0001-meson-Fix-libunwind-header-detection-on-non-macOS-pl.patch \ | 64 | file://0003-meson.build-reproducibility-fix.patch \ |
| 64 | " | 65 | " |
| 65 | SRC_URI[sha256sum] = "feb498acc01b26827cff1ff95aa8fb82cdd6a60d7abf773cfcd19abeafca3386" | 66 | SRC_URI[sha256sum] = "2618391416e51be3c693df9ef90e3860ed72ab3d36363ea1f196e30b75b2e083" |
| 66 | 67 | ||
| 67 | PACKAGECONFIG[aa] = "-Daa=enabled,-Daa=disabled,aalib" | 68 | PACKAGECONFIG[aa] = "-Daa=enabled,-Daa=disabled,aalib" |
| 68 | PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib" | 69 | PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib" |
diff --git a/meta-gnome/recipes-gimp/mypaint/mypaint-brushes_2.0.2.bb b/meta-gnome/recipes-gimp/mypaint/mypaint-brushes_2.0.2.bb new file mode 100644 index 0000000000..4e444938b1 --- /dev/null +++ b/meta-gnome/recipes-gimp/mypaint/mypaint-brushes_2.0.2.bb | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | SUMMARY = "MyPaint brushes" | ||
| 2 | LICENSE = "CC0-1.0" | ||
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=65d3616852dbf7b1a6d4b53b00626032" | ||
| 4 | |||
| 5 | inherit autotools allarch | ||
| 6 | |||
| 7 | SRC_URI = "git://github.com/mypaint/mypaint-brushes.git;protocol=https;branch=master;tag=v${PV}" | ||
| 8 | SRCREV = "0df6d130152a94c3bd67709941978074a1303cc5" | ||
| 9 | |||
| 10 | FILES:${PN} += "${datadir}/mypaint-data" | ||
diff --git a/meta-gnome/recipes-gnome/gdm/gdm_49.2.bb b/meta-gnome/recipes-gnome/gdm/gdm_49.2.bb index e1f3c488a8..94e256e4f2 100644 --- a/meta-gnome/recipes-gnome/gdm/gdm_49.2.bb +++ b/meta-gnome/recipes-gnome/gdm/gdm_49.2.bb | |||
| @@ -79,3 +79,6 @@ FILES:${PN} += " \ | |||
| 79 | " | 79 | " |
| 80 | 80 | ||
| 81 | RDEPENDS:${PN} += "${PN}-base" | 81 | RDEPENDS:${PN} += "${PN}-base" |
| 82 | # gdm relies on dbus-run-session provided by dbus | ||
| 83 | RCONFLICTS:${PN} += "dbus-broker" | ||
| 84 | RDEPENDS:${PN} += "dbus" | ||
diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_49.1.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_49.1.bb index dfda4a3a13..a9b5aceb1d 100644 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_49.1.bb +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_49.1.bb | |||
| @@ -18,23 +18,23 @@ DEPENDS = " \ | |||
| 18 | upower \ | 18 | upower \ |
| 19 | libwacom \ | 19 | libwacom \ |
| 20 | networkmanager \ | 20 | networkmanager \ |
| 21 | alsa-lib \ | ||
| 21 | " | 22 | " |
| 22 | 23 | ||
| 23 | # all these are mandatory | 24 | # all these are mandatory |
| 24 | REQUIRED_DISTRO_FEATURES = "polkit pulseaudio systemd gobject-introspection-data" | 25 | REQUIRED_DISTRO_FEATURES = "alsa polkit pulseaudio systemd gobject-introspection-data" |
| 25 | GIR_MESON_OPTION = "" | 26 | GIR_MESON_OPTION = "" |
| 26 | 27 | ||
| 27 | SRC_URI += "file://0001-gsd-smartcard-enum-types.c.in-fix-reproducibility-is.patch" | 28 | SRC_URI += "file://0001-gsd-smartcard-enum-types.c.in-fix-reproducibility-is.patch" |
| 28 | SRC_URI[archive.sha256sum] = "2a9957fc4f91c3b9127b49484179bef485120d9c1c208e44d44e6a746e6cc1c1" | 29 | SRC_URI[archive.sha256sum] = "2a9957fc4f91c3b9127b49484179bef485120d9c1c208e44d44e6a746e6cc1c1" |
| 29 | 30 | ||
| 30 | PACKAGECONFIG ??= " \ | 31 | PACKAGECONFIG ??= " \ |
| 31 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11 alsa', d)} \ | 32 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ |
| 32 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xwayland', '', d)} \ | 33 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xwayland', '', d)} \ |
| 33 | gudev \ | 34 | gudev \ |
| 34 | smartcard \ | 35 | smartcard \ |
| 35 | cups \ | 36 | cups \ |
| 36 | " | 37 | " |
| 37 | PACKAGECONFIG[alsa] = "-Dalsa=true,-Dalsa=false,alsa-lib" | ||
| 38 | PACKAGECONFIG[cups] = "-Dcups=true,-Dcups=false,cups" | 38 | PACKAGECONFIG[cups] = "-Dcups=true,-Dcups=false,cups" |
| 39 | PACKAGECONFIG[gudev] = "-Dgudev=true,-Dgudev=false,libgudev" | 39 | PACKAGECONFIG[gudev] = "-Dgudev=true,-Dgudev=false,libgudev" |
| 40 | PACKAGECONFIG[smartcard] = "-Dsmartcard=true,-Dsmartcard=false,nss" | 40 | PACKAGECONFIG[smartcard] = "-Dsmartcard=true,-Dsmartcard=false,nss" |
diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_48.3.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_48.7.bb index 802a6948ae..3f668fe410 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_48.3.bb +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_48.7.bb | |||
| @@ -34,7 +34,7 @@ GIR_MESON_OPTION = "" | |||
| 34 | REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" | 34 | REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" |
| 35 | 35 | ||
| 36 | SRC_URI += "file://0001-shell-app-usage.c-only-include-x11-headers-if-HAVE_X.patch" | 36 | SRC_URI += "file://0001-shell-app-usage.c-only-include-x11-headers-if-HAVE_X.patch" |
| 37 | SRC_URI[archive.sha256sum] = "fb0203fc748593f14e51732618e1f042525fd719764a0fdb0ee3f6fe413a9b2b" | 37 | SRC_URI[archive.sha256sum] = "2dff328d5f7e29f8c897bc21caac7d2d443be3c63ae84d7623dec800f23493c3" |
| 38 | 38 | ||
| 39 | PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" | 39 | PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" |
| 40 | PACKAGECONFIG[bluetooth] = ",,gnome-bluetooth" | 40 | PACKAGECONFIG[bluetooth] = ",,gnome-bluetooth" |
| @@ -76,7 +76,7 @@ RDEPENDS:${PN} += " \ | |||
| 76 | accountsservice \ | 76 | accountsservice \ |
| 77 | adwaita-icon-theme \ | 77 | adwaita-icon-theme \ |
| 78 | adwaita-icon-theme-cursors \ | 78 | adwaita-icon-theme-cursors \ |
| 79 | gdm-base \ | 79 | gdm \ |
| 80 | gnome-control-center \ | 80 | gnome-control-center \ |
| 81 | gnome-backgrounds \ | 81 | gnome-backgrounds \ |
| 82 | gnome-bluetooth \ | 82 | gnome-bluetooth \ |
diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.58.1.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.58.2.bb index 6dfed59d86..e3b90950d6 100644 --- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.58.1.bb +++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.58.2.bb | |||
| @@ -18,7 +18,7 @@ DEPENDS += "\ | |||
| 18 | RDEPENDS:${PN} += "gsettings-desktop-schemas" | 18 | RDEPENDS:${PN} += "gsettings-desktop-schemas" |
| 19 | 19 | ||
| 20 | SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" | 20 | SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" |
| 21 | SRC_URI[archive.sha256sum] = "fc537d6bbab1ffa76972df7d4a1819b0c0fe19ebd1dfe82421d1f32e14b5dc3b" | 21 | SRC_URI[archive.sha256sum] = "ad9d5bf0b45caf232520df0adee51eb650200b0370680f80a350ead9d1d61ddf" |
| 22 | 22 | ||
| 23 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 23 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
| 24 | 24 | ||
diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck3_43.2.bb b/meta-gnome/recipes-gnome/libwnck/libwnck3_43.2.bb index 4342325f11..13923a3e17 100644 --- a/meta-gnome/recipes-gnome/libwnck/libwnck3_43.2.bb +++ b/meta-gnome/recipes-gnome/libwnck/libwnck3_43.2.bb | |||
| @@ -2,7 +2,7 @@ SUMMARY = "Window navigation construction toolkit" | |||
| 2 | LICENSE = "LGPL-2.0-only" | 2 | LICENSE = "LGPL-2.0-only" |
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" |
| 4 | 4 | ||
| 5 | BPN = "libwnck" | 5 | GNOMEBN = "libwnck" |
| 6 | 6 | ||
| 7 | SECTION = "x11/libs" | 7 | SECTION = "x11/libs" |
| 8 | DEPENDS = "cairo glib-2.0 gtk+3" | 8 | DEPENDS = "cairo glib-2.0 gtk+3" |
| @@ -23,6 +23,4 @@ SRC_URI += "file://ef0e40d59c32d7ebeb94d242436e3144cefc174a.patch;patch=1 \ | |||
| 23 | file://0001-Fix-build-issue-caused-by-OE-core-changes-to-startup.patch;patch=1" | 23 | file://0001-Fix-build-issue-caused-by-OE-core-changes-to-startup.patch;patch=1" |
| 24 | SRC_URI[archive.sha256sum] = "55a7444ec1fbb95c086d40967388f231b5c0bbc8cffaa086bf9290ae449e51d5" | 24 | SRC_URI[archive.sha256sum] = "55a7444ec1fbb95c086d40967388f231b5c0bbc8cffaa086bf9290ae449e51d5" |
| 25 | 25 | ||
| 26 | # gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG. | 26 | REQUIRED_DISTRO_FEATURES = "x11" |
| 27 | # cairo would at least needed to be built with xlib. | ||
| 28 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | ||
