From 9bcc4c3f7a179936093ca47f5a20e0aec5d7bc2a Mon Sep 17 00:00:00 2001 From: Bruce Leidl Date: Tue, 15 Jan 2019 12:02:49 -0500 Subject: [PATCH] Upgrade Gnome to 3.30 --- ...-string-to-s-printf-formatted-string.patch | 31 + ...-not-set-Wno-unused-but-set-variable.patch | 30 + .../modemmanager/modemmanager_%.bbappend | 2 + .../modemmanager/modemmanager_1.6.12.bb | 27 - .../modemmanager/modemmanager_1.8.2.bb | 58 + ...-building-introspection-without-docs.patch | 25 - ...reating-libnm-core-tests-directory-f.patch | 33 - .../networkmanager-openvpn_1.2.10.bb | 40 + .../networkmanager/networkmanager.inc | 128 - ...-net-ethernet.h-and-linux-if_ether.h.patch | 53 + ...-net-ethernet.h-seems-to-be-over-spe.patch | 39 + ...e.ac-Fix-pkgconfig-sysroot-locations.patch | 25 + ...ttings-settings-property-documentati.patch | 80 + .../networkmanager/musl/0001-musl-basic.patch | 54 + .../musl/0002-musl-dlopen-configure-ac.patch | 35 + .../musl/0003-musl-network-support.patch | 72 + .../musl/0004-musl-process-util.patch | 62 + ...er-conflicts-by-including-net-ethern.patch | 77 + ...-Add-a-strndupa-replacement-for-musl.patch | 47 + .../networkmanager/networkmanager_%.bbappend | 16 + .../networkmanager/networkmanager_1.10.6.bb | 10 - .../networkmanager/networkmanager_1.14.4.bb | 143 + .../recipes-devtools/autoconf/autoconf213.bb | 26 - meta-gnome/recipes-devtools/meson/meson.inc | 29 - ...e-cross_args-in-front-of-output_args.patch | 30 - ...pport-building-allarch-recipes-again.patch | 28 - ...sues-that-arise-when-cross-compiling.patch | 85 - .../0002-Make-CPU-family-warnings-fatal.patch | 36 - ...ction-determine-g-ir-scanner-and-g-i.patch | 39 - .../meson/meson/0003-native_bindir.patch | 125 - .../meson/meson/gi-flags.patch | 35 - .../meson/meson/gtkdoc-flags.patch | 44 - .../meson/meson/meson-setup.py | 62 - .../meson/meson/meson-wrapper | 14 - .../meson/meson/native_bindir.patch | 71 - .../recipes-devtools/meson/meson_%.bbappend | 4 + .../recipes-devtools/meson/meson_0.47.2.bb | 3 - .../meson/nativesdk-meson_0.47.2.bb | 74 - ...ce_0.6.45.bb => accountsservice_0.6.54.bb} | 8 +- .../0001-remove-gobject-introspection.patch | 128 - .../colord/colord_1.4.1.bb | 63 - .../colord/colord_1.4.3.bb | 34 + .../{plymouth_0.9.3.bb => plymouth_0.9.4.bb} | 4 +- ...1-make-netgroup-support-configurable.patch | 56 +- .../polkit/polkit/polkit-1_pam.patch | 18 +- .../{polkit_0.113.bb => polkit_0.115.bb} | 26 +- ...nly-define-memfd_create-if-not-alrea.patch | 66 - .../pulseaudio/pulseaudio/volatiles.04_pulse | 2 - .../pulseaudio/pulseaudio_11.1.bb | 15 - .../pulseaudio/pulseaudio_12.%.bbappend | 1 + ...i2-atk_2.26.2.bb => at-spi2-atk_2.30.0.bb} | 12 +- .../recipes-gnome/atk/at-spi2-core_2.28.0.bb | 24 - .../recipes-gnome/atk/at-spi2-core_2.30.0.bb | 39 + ...001-Switch-from-filename-to-basename.patch | 38 + ...able-introspection-for-cross-compile.patch | 22 + meta-gnome/recipes-gnome/atk/atk_2.28.1.bb | 19 - meta-gnome/recipes-gnome/atk/atk_2.30.0.bb | 37 + ...0001-meson.build-do-not-compile-docs.patch | 27 + .../recipes-gnome/dconf/dconf_0.26.1.bb | 24 - .../recipes-gnome/dconf/dconf_0.27.1.bb | 23 - .../recipes-gnome/dconf/dconf_0.30.1.bb | 24 + meta-gnome/recipes-gnome/gdm/gdm_3.27.92.bb | 3 - .../gdm/{gdm.inc => gdm_3.30.1.bb} | 11 +- ...lib_3.25.4.1.bb => geocode-glib_3.26.0.bb} | 8 +- meta-gnome/recipes-gnome/gjs/gjs.inc | 14 - ...spected_gobject_interface_properties.patch | 57 + meta-gnome/recipes-gnome/gjs/gjs_1.52.0.bb | 6 - meta-gnome/recipes-gnome/gjs/gjs_1.53.4.bb | 24 + .../recipes-gnome/glib-2.0/glib-2.0_2.56.1.bb | 23 - ..._3.28.0.bb => gnome-backgrounds_3.30.0.bb} | 7 +- ...th_3.28.0.bb => gnome-bluetooth_3.28.2.bb} | 6 +- ...-goa-cups-and-user-accounts-optional.patch | 92 +- ...-Fix-USER_DIR_MODE-value-in-config.h.patch | 41 - ...28.0.bb => gnome-control-center_3.30.1.bb} | 9 +- ...e.ac-Remove-gnome-common-macro-calls.patch | 33 - ...umbnail-don-t-convert-time_t-to-long.patch | 73 - .../gnome-desktop/gnome-desktop_3.28.0.bb | 5 - ...me-desktop.inc => gnome-desktop_3.30.2.bb} | 7 +- .../gnome-keyring/gnome-keyring_3.28.0.1.bb | 4 - ...me-keyring.inc => gnome-keyring_3.28.2.bb} | 7 +- .../gnome-online-accounts_3.28.0.bb | 12 - .../dont-check-for-have-xtrans.patch | 88 - .../gnome-session/gnome-session_3.27.92.bb | 10 - ...me-session.inc => gnome-session_3.30.1.bb} | 11 +- ...0.bb => gnome-settings-daemon_3.30.1.2.bb} | 42 +- .../recipes-gnome/gnome-shell/gnome-shell.inc | 57 - ...0001-javascript-invalid-access-fixes.patch | 512 --- .../gnome-shell/gnome-shell_3.28.0.bb | 3 - .../gnome-shell/gnome-shell_3.30.2.bb | 43 + .../gnome-terminal/gnome-terminal_3.28.0.bb | 6 - ...-terminal.inc => gnome-terminal_3.30.2.bb} | 14 +- ...weaks_3.28.0.bb => gnome-tweaks_3.30.2.bb} | 4 +- ...-usage_3.28.0.bb => gnome-usage_3.30.0.bb} | 5 +- meta-gnome/recipes-gnome/grilo/grilo_0.3.4.bb | 14 - .../gsettings-desktop-schemas_3.28.0.bb | 4 - ...nc => gsettings-desktop-schemas_3.28.1.bb} | 5 + .../recipes-gnome/libgee/libgee_0.20.1.bb | 8 +- .../recipes-gnome/libgtop/libgtop_2.38.0.bb | 7 +- ...eather_3.28.0.bb => libgweather_3.28.2.bb} | 4 +- ...unnecessary-relayouts-in-cluttertext.patch | 108 - .../{mutter_3.28.0.bb => mutter_3.30.2.bb} | 6 +- .../nautilus/0001-find-libm-correctly.patch | 25 - .../recipes-gnome/nautilus/nautilus_3.28.0.bb | 73 - .../recipes-gnome/nautilus/nautilus_3.30.2.bb | 25 + .../network-manager-applet.inc | 15 - .../network-manager-applet_1.8.10.bb | 3 - .../network-manager-applet_1.8.18.bb | 16 + .../recipes-gnome/pango/pango_1.42.0.bb | 3 - .../pango/{pango.inc => pango_1.42.4.bb} | 8 +- .../{tracker_2.0.3.bb => tracker_2.1.5.bb} | 20 +- meta-gnome/recipes-gnome/vte/vte_0.52.0.bb | 4 - .../vte/{vte.inc => vte_0.54.2.bb} | 7 +- .../yelp-tools/yelp-tools_3.18.0.bb | 39 - .../yelp-tools/yelp-tools_3.28.0.bb | 15 + .../recipes-gnome/yelp-xsl/yelp-xsl_3.20.1.bb | 38 - .../recipes-gnome/yelp-xsl/yelp-xsl_3.30.1.bb | 15 + .../recipes-gnome/zenity/zenity_3.28.0.bb | 3 - .../zenity/{zenity.inc => zenity_3.30.0.bb} | 4 +- .../wayland/libinput_1.11.3.bb | 29 - .../recipes-graphics/wayland/mtdev_1.1.5.bb | 18 - .../wayland/wayland-protocols_1.16.bb | 22 - .../wayland/wayland/fixpathinpcfiles.patch | 32 - .../wayland/wayland_1.16.0.bb | 44 - .../recipes-graphics/wayland/weston-conf.bb | 35 - .../recipes-graphics/wayland/weston-init.bb | 31 - .../recipes-graphics/wayland/weston-init/init | 53 - .../wayland/weston-init/weston-start | 69 - .../wayland/weston-init/weston.service | 13 - .../weston/0001-make-error-portable.patch | 78 - ...ovide-a-default-version-that-doesn-t.patch | 173 - .../wayland/weston/weston.desktop | 9 - .../wayland/weston/weston.png | Bin 2383 -> 0 bytes .../wayland/weston/xwayland.weston-start | 7 - .../recipes-graphics/wayland/weston_5.0.0.bb | 108 - .../ibus/0001-strip-out-dbus-build-dep.patch | 29 + ...0002-decorate-automake-for-valaflags.patch | 46 + .../recipes-support/ibus/ibus_1.5.17.bb | 28 - .../recipes-support/ibus/ibus_1.5.19.bb | 41 + .../recipes-support/jansson/jansson_2.12.bb | 13 + ...t-character-of-string-to-be-null-or-.patch | 32 - ...001-do-not-create-python-environment.patch | 91 + ...-compiling-failure-on-mips64-n32-bsp.patch | 79 + ...include-RequiredDefines.h-for-depend.patch | 32 +- ...-mozjs-fix-coredump-caused-by-getenv.patch | 27 + ...7.0.0-fix-the-compile-bug-of-powerpc.patch | 36 - .../mozjs/0001-regenerate-configure.patch | 3238 ----------------- ...ve-JS_BYTES_PER_WORD-out-of-config.h.patch | 75 - .../mozjs/0002-fix-cannot-find-link.patch | 34 + .../mozjs/0003-Add-AArch64-support.patch | 76 - ...round-autoconf-2.13-detection-failed.patch | 28 + ...toconf-2.13-to-refresh-old.configure.patch | 42 + ...bug746112-no-decommit-on-large-pages.patch | 103 - .../mozjs/mozjs/0005-aarch64-64k-page.patch | 44 - .../0005-fix-do_compile-failed-on-mips.patch | 38 + .../mozjs/mozjs/0006-support-musl.patch | 158 + ...ix-cross-compilation-on-i586-targets.patch | 41 +- .../Manually_mmap_heap_memory_esr17.patch | 115 - .../mozjs/mozjs/add-riscv-support.patch | 70 + ...isable-mozglue-in-stand-alone-builds.patch | 74 + .../fix-the-compile-error-of-powerpc64.patch | 18 - .../mozjs/fix_milestone_compile_issue.patch | 20 - .../mozjs/mozjs/format-overflow.patch | 21 + meta-gnome/recipes-support/mozjs/mozjs52.bb | 59 - .../0001-do-not-include-RequiredDefines.patch | 23 - .../recipes-support/mozjs/mozjs_17.0.0.bb | 82 - .../recipes-support/mozjs/mozjs_52.9.1.bb | 113 + 166 files changed, 2443 insertions(+), 7412 deletions(-) create mode 100644 meta-gnome/recipes-connectivity/modemmanager/modemmanager/0001-Do-not-pass-null-string-to-s-printf-formatted-string.patch create mode 100644 meta-gnome/recipes-connectivity/modemmanager/modemmanager/0001-Do-not-set-Wno-unused-but-set-variable.patch create mode 100644 meta-gnome/recipes-connectivity/modemmanager/modemmanager_%.bbappend delete mode 100644 meta-gnome/recipes-connectivity/modemmanager/modemmanager_1.6.12.bb create mode 100644 meta-gnome/recipes-connectivity/modemmanager/modemmanager_1.8.2.bb delete mode 100644 meta-gnome/recipes-connectivity/networkmanager/files/0001-allow-building-introspection-without-docs.patch delete mode 100644 meta-gnome/recipes-connectivity/networkmanager/files/0001-build-fix-race-creating-libnm-core-tests-directory-f.patch create mode 100644 meta-gnome/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.10.bb delete mode 100644 meta-gnome/recipes-connectivity/networkmanager/networkmanager.inc create mode 100644 meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch create mode 100644 meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch create mode 100644 meta-gnome/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch create mode 100644 meta-gnome/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch create mode 100644 meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch create mode 100644 meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch create mode 100644 meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch create mode 100644 meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch create mode 100644 meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch create mode 100644 meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0006-Add-a-strndupa-replacement-for-musl.patch create mode 100644 meta-gnome/recipes-connectivity/networkmanager/networkmanager_%.bbappend delete mode 100644 meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb create mode 100644 meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb delete mode 100644 meta-gnome/recipes-devtools/autoconf/autoconf213.bb delete mode 100644 meta-gnome/recipes-devtools/meson/meson.inc delete mode 100644 meta-gnome/recipes-devtools/meson/meson/0001-Linker-rules-move-cross_args-in-front-of-output_args.patch delete mode 100644 meta-gnome/recipes-devtools/meson/meson/0001-Support-building-allarch-recipes-again.patch delete mode 100644 meta-gnome/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch delete mode 100644 meta-gnome/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch delete mode 100644 meta-gnome/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch delete mode 100644 meta-gnome/recipes-devtools/meson/meson/0003-native_bindir.patch delete mode 100644 meta-gnome/recipes-devtools/meson/meson/gi-flags.patch delete mode 100644 meta-gnome/recipes-devtools/meson/meson/gtkdoc-flags.patch delete mode 100755 meta-gnome/recipes-devtools/meson/meson/meson-setup.py delete mode 100755 meta-gnome/recipes-devtools/meson/meson/meson-wrapper delete mode 100644 meta-gnome/recipes-devtools/meson/meson/native_bindir.patch create mode 100644 meta-gnome/recipes-devtools/meson/meson_%.bbappend delete mode 100644 meta-gnome/recipes-devtools/meson/meson_0.47.2.bb delete mode 100644 meta-gnome/recipes-devtools/meson/nativesdk-meson_0.47.2.bb rename meta-gnome/recipes-freedesktop/accountsservice/{accountsservice_0.6.45.bb => accountsservice_0.6.54.bb} (77%) delete mode 100644 meta-gnome/recipes-freedesktop/colord/colord/0001-remove-gobject-introspection.patch delete mode 100644 meta-gnome/recipes-freedesktop/colord/colord_1.4.1.bb create mode 100644 meta-gnome/recipes-freedesktop/colord/colord_1.4.3.bb rename meta-gnome/recipes-freedesktop/plymouth/{plymouth_0.9.3.bb => plymouth_0.9.4.bb} (95%) rename meta-gnome/recipes-freedesktop/polkit/{polkit_0.113.bb => polkit_0.115.bb} (77%) delete mode 100644 meta-gnome/recipes-freedesktop/pulseaudio/pulseaudio/0001-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch delete mode 100644 meta-gnome/recipes-freedesktop/pulseaudio/pulseaudio/volatiles.04_pulse delete mode 100644 meta-gnome/recipes-freedesktop/pulseaudio/pulseaudio_11.1.bb create mode 100644 meta-gnome/recipes-freedesktop/pulseaudio/pulseaudio_12.%.bbappend rename meta-gnome/recipes-gnome/atk/{at-spi2-atk_2.26.2.bb => at-spi2-atk_2.30.0.bb} (53%) delete mode 100644 meta-gnome/recipes-gnome/atk/at-spi2-core_2.28.0.bb create mode 100644 meta-gnome/recipes-gnome/atk/at-spi2-core_2.30.0.bb create mode 100644 meta-gnome/recipes-gnome/atk/atk/0001-Switch-from-filename-to-basename.patch create mode 100644 meta-gnome/recipes-gnome/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch delete mode 100644 meta-gnome/recipes-gnome/atk/atk_2.28.1.bb create mode 100644 meta-gnome/recipes-gnome/atk/atk_2.30.0.bb create mode 100644 meta-gnome/recipes-gnome/dconf/dconf/0001-meson.build-do-not-compile-docs.patch delete mode 100644 meta-gnome/recipes-gnome/dconf/dconf_0.26.1.bb delete mode 100644 meta-gnome/recipes-gnome/dconf/dconf_0.27.1.bb create mode 100644 meta-gnome/recipes-gnome/dconf/dconf_0.30.1.bb delete mode 100644 meta-gnome/recipes-gnome/gdm/gdm_3.27.92.bb rename meta-gnome/recipes-gnome/gdm/{gdm.inc => gdm_3.30.1.bb} (83%) rename meta-gnome/recipes-gnome/geocode-glib/{geocode-glib_3.25.4.1.bb => geocode-glib_3.26.0.bb} (54%) delete mode 100644 meta-gnome/recipes-gnome/gjs/gjs.inc create mode 100644 meta-gnome/recipes-gnome/gjs/gjs/overriding_introspected_gobject_interface_properties.patch delete mode 100644 meta-gnome/recipes-gnome/gjs/gjs_1.52.0.bb create mode 100644 meta-gnome/recipes-gnome/gjs/gjs_1.53.4.bb delete mode 100644 meta-gnome/recipes-gnome/glib-2.0/glib-2.0_2.56.1.bb rename meta-gnome/recipes-gnome/gnome-backgrounds/{gnome-backgrounds_3.28.0.bb => gnome-backgrounds_3.30.0.bb} (65%) rename meta-gnome/recipes-gnome/gnome-bluetooth/{gnome-bluetooth_3.28.0.bb => gnome-bluetooth_3.28.2.bb} (78%) delete mode 100644 meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-build-Fix-USER_DIR_MODE-value-in-config.h.patch rename meta-gnome/recipes-gnome/gnome-control-center/{gnome-control-center_3.28.0.bb => gnome-control-center_3.30.1.bb} (86%) delete mode 100644 meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch delete mode 100644 meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch delete mode 100644 meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.28.0.bb rename meta-gnome/recipes-gnome/gnome-desktop/{gnome-desktop.inc => gnome-desktop_3.30.2.bb} (84%) delete mode 100644 meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.28.0.1.bb rename meta-gnome/recipes-gnome/gnome-keyring/{gnome-keyring.inc => gnome-keyring_3.28.2.bb} (78%) delete mode 100644 meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.28.0.bb delete mode 100644 meta-gnome/recipes-gnome/gnome-session/gnome-session/dont-check-for-have-xtrans.patch delete mode 100644 meta-gnome/recipes-gnome/gnome-session/gnome-session_3.27.92.bb rename meta-gnome/recipes-gnome/gnome-session/{gnome-session.inc => gnome-session_3.30.1.bb} (62%) rename meta-gnome/recipes-gnome/gnome-settings-daemon/{gnome-settings-daemon_3.28.0.bb => gnome-settings-daemon_3.30.1.2.bb} (57%) delete mode 100644 meta-gnome/recipes-gnome/gnome-shell/gnome-shell.inc delete mode 100644 meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-javascript-invalid-access-fixes.patch delete mode 100644 meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.28.0.bb create mode 100644 meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.30.2.bb delete mode 100644 meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.28.0.bb rename meta-gnome/recipes-gnome/gnome-terminal/{gnome-terminal.inc => gnome-terminal_3.30.2.bb} (81%) rename meta-gnome/recipes-gnome/gnome-tweaks/{gnome-tweaks_3.28.0.bb => gnome-tweaks_3.30.2.bb} (75%) rename meta-gnome/recipes-gnome/gnome-usage/{gnome-usage_3.28.0.bb => gnome-usage_3.30.0.bb} (73%) delete mode 100644 meta-gnome/recipes-gnome/grilo/grilo_0.3.4.bb delete mode 100644 meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_3.28.0.bb rename meta-gnome/recipes-gnome/gsettings-desktop-schema/{gsettings-desktop-schemas.inc => gsettings-desktop-schemas_3.28.1.bb} (69%) rename meta-gnome/recipes-gnome/libgweather/{libgweather_3.28.0.bb => libgweather_3.28.2.bb} (77%) delete mode 100644 meta-gnome/recipes-gnome/mutter/mutter/0002-avoid-unnecessary-relayouts-in-cluttertext.patch rename meta-gnome/recipes-gnome/mutter/{mutter_3.28.0.bb => mutter_3.30.2.bb} (78%) delete mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus/0001-find-libm-correctly.patch delete mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus_3.28.0.bb create mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus_3.30.2.bb delete mode 100644 meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet.inc delete mode 100644 meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet_1.8.10.bb create mode 100644 meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet_1.8.18.bb delete mode 100644 meta-gnome/recipes-gnome/pango/pango_1.42.0.bb rename meta-gnome/recipes-gnome/pango/{pango.inc => pango_1.42.4.bb} (86%) rename meta-gnome/recipes-gnome/tracker/{tracker_2.0.3.bb => tracker_2.1.5.bb} (72%) delete mode 100644 meta-gnome/recipes-gnome/vte/vte_0.52.0.bb rename meta-gnome/recipes-gnome/vte/{vte.inc => vte_0.54.2.bb} (75%) delete mode 100644 meta-gnome/recipes-gnome/yelp-tools/yelp-tools_3.18.0.bb create mode 100644 meta-gnome/recipes-gnome/yelp-tools/yelp-tools_3.28.0.bb delete mode 100644 meta-gnome/recipes-gnome/yelp-xsl/yelp-xsl_3.20.1.bb create mode 100644 meta-gnome/recipes-gnome/yelp-xsl/yelp-xsl_3.30.1.bb delete mode 100644 meta-gnome/recipes-gnome/zenity/zenity_3.28.0.bb rename meta-gnome/recipes-gnome/zenity/{zenity.inc => zenity_3.30.0.bb} (73%) delete mode 100644 meta-gnome/recipes-graphics/wayland/libinput_1.11.3.bb delete mode 100644 meta-gnome/recipes-graphics/wayland/mtdev_1.1.5.bb delete mode 100644 meta-gnome/recipes-graphics/wayland/wayland-protocols_1.16.bb delete mode 100644 meta-gnome/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch delete mode 100644 meta-gnome/recipes-graphics/wayland/wayland_1.16.0.bb delete mode 100644 meta-gnome/recipes-graphics/wayland/weston-conf.bb delete mode 100644 meta-gnome/recipes-graphics/wayland/weston-init.bb delete mode 100644 meta-gnome/recipes-graphics/wayland/weston-init/init delete mode 100755 meta-gnome/recipes-graphics/wayland/weston-init/weston-start delete mode 100644 meta-gnome/recipes-graphics/wayland/weston-init/weston.service delete mode 100644 meta-gnome/recipes-graphics/wayland/weston/0001-make-error-portable.patch delete mode 100644 meta-gnome/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch delete mode 100644 meta-gnome/recipes-graphics/wayland/weston/weston.desktop delete mode 100644 meta-gnome/recipes-graphics/wayland/weston/weston.png delete mode 100644 meta-gnome/recipes-graphics/wayland/weston/xwayland.weston-start delete mode 100644 meta-gnome/recipes-graphics/wayland/weston_5.0.0.bb create mode 100644 meta-gnome/recipes-support/ibus/ibus/0001-strip-out-dbus-build-dep.patch create mode 100644 meta-gnome/recipes-support/ibus/ibus/0002-decorate-automake-for-valaflags.patch delete mode 100644 meta-gnome/recipes-support/ibus/ibus_1.5.17.bb create mode 100644 meta-gnome/recipes-support/ibus/ibus_1.5.19.bb create mode 100644 meta-gnome/recipes-support/jansson/jansson_2.12.bb delete mode 100644 meta-gnome/recipes-support/mozjs/mozjs/0001-compare-the-first-character-of-string-to-be-null-or-.patch create mode 100644 meta-gnome/recipes-support/mozjs/mozjs/0001-do-not-create-python-environment.patch create mode 100644 meta-gnome/recipes-support/mozjs/mozjs/0001-fix-compiling-failure-on-mips64-n32-bsp.patch create mode 100644 meta-gnome/recipes-support/mozjs/mozjs/0001-mozjs-fix-coredump-caused-by-getenv.patch delete mode 100644 meta-gnome/recipes-support/mozjs/mozjs/0001-mozjs17.0.0-fix-the-compile-bug-of-powerpc.patch delete mode 100644 meta-gnome/recipes-support/mozjs/mozjs/0001-regenerate-configure.patch delete mode 100644 meta-gnome/recipes-support/mozjs/mozjs/0002-Move-JS_BYTES_PER_WORD-out-of-config.h.patch create mode 100644 meta-gnome/recipes-support/mozjs/mozjs/0002-fix-cannot-find-link.patch delete mode 100644 meta-gnome/recipes-support/mozjs/mozjs/0003-Add-AArch64-support.patch create mode 100644 meta-gnome/recipes-support/mozjs/mozjs/0003-workaround-autoconf-2.13-detection-failed.patch create mode 100644 meta-gnome/recipes-support/mozjs/mozjs/0004-do-not-use-autoconf-2.13-to-refresh-old.configure.patch delete mode 100644 meta-gnome/recipes-support/mozjs/mozjs/0004-mozbug746112-no-decommit-on-large-pages.patch delete mode 100644 meta-gnome/recipes-support/mozjs/mozjs/0005-aarch64-64k-page.patch create mode 100644 meta-gnome/recipes-support/mozjs/mozjs/0005-fix-do_compile-failed-on-mips.patch create mode 100644 meta-gnome/recipes-support/mozjs/mozjs/0006-support-musl.patch delete mode 100644 meta-gnome/recipes-support/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch create mode 100644 meta-gnome/recipes-support/mozjs/mozjs/add-riscv-support.patch create mode 100644 meta-gnome/recipes-support/mozjs/mozjs/disable-mozglue-in-stand-alone-builds.patch delete mode 100644 meta-gnome/recipes-support/mozjs/mozjs/fix-the-compile-error-of-powerpc64.patch delete mode 100644 meta-gnome/recipes-support/mozjs/mozjs/fix_milestone_compile_issue.patch create mode 100644 meta-gnome/recipes-support/mozjs/mozjs/format-overflow.patch delete mode 100644 meta-gnome/recipes-support/mozjs/mozjs52.bb delete mode 100644 meta-gnome/recipes-support/mozjs/mozjs52/0001-do-not-include-RequiredDefines.patch delete mode 100644 meta-gnome/recipes-support/mozjs/mozjs_17.0.0.bb create mode 100644 meta-gnome/recipes-support/mozjs/mozjs_52.9.1.bb diff --git a/meta-gnome/recipes-connectivity/modemmanager/modemmanager/0001-Do-not-pass-null-string-to-s-printf-formatted-string.patch b/meta-gnome/recipes-connectivity/modemmanager/modemmanager/0001-Do-not-pass-null-string-to-s-printf-formatted-string.patch new file mode 100644 index 0000000..5fbafbb --- /dev/null +++ b/meta-gnome/recipes-connectivity/modemmanager/modemmanager/0001-Do-not-pass-null-string-to-s-printf-formatted-string.patch @@ -0,0 +1,31 @@ +From b8862e6af1c6d022b8c182098e7deddb874ece19 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 18 Dec 2018 23:10:44 -0800 +Subject: [PATCH] Do not pass null string to %s printf formatted string + +Here the string is already decided to be NULL and passing +a null pointer to %s will not work + +Fixes +error: '%s' directive argument is null + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/mobile-broadband/ModemManager/merge_requests/67] + +Signed-off-by: Khem Raj +--- + plugins/mtk/mm-broadband-modem-mtk.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/mtk/mm-broadband-modem-mtk.c b/plugins/mtk/mm-broadband-modem-mtk.c +index 475a63ac..541de4a5 100644 +--- a/plugins/mtk/mm-broadband-modem-mtk.c ++++ b/plugins/mtk/mm-broadband-modem-mtk.c +@@ -191,7 +191,7 @@ get_supported_modes_ready (MMBaseModem *self, + + response = mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error); + if (!response) { +- mm_dbg ("Fail to get response %s", response); ++ mm_dbg ("Fail to get response"); + g_task_return_error (task, error); + g_object_unref (task); + return; diff --git a/meta-gnome/recipes-connectivity/modemmanager/modemmanager/0001-Do-not-set-Wno-unused-but-set-variable.patch b/meta-gnome/recipes-connectivity/modemmanager/modemmanager/0001-Do-not-set-Wno-unused-but-set-variable.patch new file mode 100644 index 0000000..dcbe01d --- /dev/null +++ b/meta-gnome/recipes-connectivity/modemmanager/modemmanager/0001-Do-not-set-Wno-unused-but-set-variable.patch @@ -0,0 +1,30 @@ +From d4f73b037d11d20f080e74c05df28853fb833075 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Dec 2018 22:59:47 -0800 +Subject: [PATCH] Do not set Wno-unused-but-set-variable + +This is gcc specific warning, not implemented by pretending to be gcc +like compilers e.g. clang. + +We will pass this option from recipe + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj +--- + m4/compiler_warnings.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/compiler_warnings.m4 b/m4/compiler_warnings.m4 +index f498a28..e65e97f 100644 +--- a/m4/compiler_warnings.m4 ++++ b/m4/compiler_warnings.m4 +@@ -11,7 +11,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then + -Wdeclaration-after-statement -Wstrict-prototypes \ + -Wno-unused-parameter -Wno-sign-compare \ + -Wno-deprecated-declarations \ +- -Wno-unused-but-set-variable -Wformat-security; do ++ -Wno-unused -Wformat-security; do + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $option" + AC_MSG_CHECKING([whether gcc understands $option]) diff --git a/meta-gnome/recipes-connectivity/modemmanager/modemmanager_%.bbappend b/meta-gnome/recipes-connectivity/modemmanager/modemmanager_%.bbappend new file mode 100644 index 0000000..583d032 --- /dev/null +++ b/meta-gnome/recipes-connectivity/modemmanager/modemmanager_%.bbappend @@ -0,0 +1,2 @@ + +PACKAGECONFIG = "polkit systemd" diff --git a/meta-gnome/recipes-connectivity/modemmanager/modemmanager_1.6.12.bb b/meta-gnome/recipes-connectivity/modemmanager/modemmanager_1.6.12.bb deleted file mode 100644 index 16a44e1..0000000 --- a/meta-gnome/recipes-connectivity/modemmanager/modemmanager_1.6.12.bb +++ /dev/null @@ -1,27 +0,0 @@ -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI = "https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" -SRC_URI[md5sum] = "d21c280220ee647e62eeb4e1df642fe3" -SRC_URI[sha256sum] = "eefb7615c2c7ebc994abfc2782bfa9e798643a633362b40db96f7f61706a6283" - -S = "${WORKDIR}/ModemManager-${PV}" - -DEPENDS = "libgudev intltool-native glib-2.0 systemd polkit glib-2.0-native" - -FILES_${PN} += "\ - ${libdir}/ModemManager \ - ${libdir}/rules.d \ - ${datadir}/bash-completion \ - ${datadir}/polkit-1/actions \ - ${datadir}/icons \ - ${datadir}/dbus-1 \ -" -SYSTEMD_SERVICE_${PN} = "ModemManager.service" - -inherit pkgconfig gettext autotools systemd - -# --with-udev-base-dir set for usr merge -EXTRA_OECONF = "--disable-introspection --disable-vala --without-mbim --without-qmi --with-udev-base-dir=/usr/lib --enable-more-warnings=no" - diff --git a/meta-gnome/recipes-connectivity/modemmanager/modemmanager_1.8.2.bb b/meta-gnome/recipes-connectivity/modemmanager/modemmanager_1.8.2.bb new file mode 100644 index 0000000..f8e074a --- /dev/null +++ b/meta-gnome/recipes-connectivity/modemmanager/modemmanager_1.8.2.bb @@ -0,0 +1,58 @@ +SUMMARY = "ModemManager is a daemon controlling broadband devices/connections" +DESCRIPTION = "ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/ModemManager/" +LICENSE = "GPL-2.0 & LGPL-2.1" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ +" + +inherit gnomebase gettext systemd vala gobject-introspection bash-completion + +DEPENDS = "glib-2.0 libgudev dbus-glib intltool-native" + +SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \ + file://0001-Do-not-set-Wno-unused-but-set-variable.patch \ + file://0001-Do-not-pass-null-string-to-s-printf-formatted-string.patch \ + " + +SRC_URI[md5sum] = "a49c9f73e46c7b89e5efedda250d22c0" +SRC_URI[sha256sum] = "96f2a5f0ed15532b4c4c185b756fdc0326e7c2027cea26a1264f91e098260f80" + +S = "${WORKDIR}/ModemManager-${PV}" + +PACKAGECONFIG ??= "mbim qmi polkit \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ +" + +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,," +PACKAGECONFIG[polkit] = "--with-polkit=yes,--with-polkit=no,polkit" +# Support WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol. +PACKAGECONFIG[mbim] = "--with-mbim,--without-mbim,libmbim" +# Support WWAN modems and devices which speak the Qualcomm MSM Interface (QMI) protocol. +PACKAGECONFIG[qmi] = "--with-qmi,--without-qmi,libqmi" + +EXTRA_OECONF = " \ + --with-udev-base-dir=${nonarch_base_libdir}/udev \ +" +CFLAGS_append_toolchain-gcc = " -Wno-unused-but-set-variable" + +FILES_${PN} += " \ + ${datadir}/icons \ + ${datadir}/polkit-1 \ + ${datadir}/dbus-1 \ + ${libdir}/ModemManager \ + ${systemd_unitdir}/system \ +" + +FILES_${PN}-dev += " \ + ${libdir}/ModemManager/*.la \ +" + +FILES_${PN}-staticdev += " \ + ${libdir}/ModemManager/*.a \ +" + +FILES_${PN}-dbg += "${libdir}/ModemManager/.debug" + +SYSTEMD_SERVICE_${PN} = "ModemManager.service" diff --git a/meta-gnome/recipes-connectivity/networkmanager/files/0001-allow-building-introspection-without-docs.patch b/meta-gnome/recipes-connectivity/networkmanager/files/0001-allow-building-introspection-without-docs.patch deleted file mode 100644 index f1e8546..0000000 --- a/meta-gnome/recipes-connectivity/networkmanager/files/0001-allow-building-introspection-without-docs.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d0c44d704d8ad95e9bd2491b60ed6a0f7cc832e7 Mon Sep 17 00:00:00 2001 -From: brl -Date: Mon, 25 Dec 2017 16:59:53 -0500 -Subject: [PATCH] allow building introspection without docs - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index f8dcd13..ac3b6d7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1258,7 +1258,7 @@ GTK_DOC_CHECK(1.0) - - # check if we can build setting property documentation - build_docs=no --if test -n "$INTROSPECTION_MAKEFILE"; then -+if test -n "$INTROSPECTION_MAKEFILE" -a "$enable_gtk_doc" = "yes"; then - # If g-i is installed we know we have python, but we might not have pygobject - if ! "$PYTHON" -c 'from gi.repository import GObject' >& /dev/null; then - AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)]) --- -2.14.3 - diff --git a/meta-gnome/recipes-connectivity/networkmanager/files/0001-build-fix-race-creating-libnm-core-tests-directory-f.patch b/meta-gnome/recipes-connectivity/networkmanager/files/0001-build-fix-race-creating-libnm-core-tests-directory-f.patch deleted file mode 100644 index c238310..0000000 --- a/meta-gnome/recipes-connectivity/networkmanager/files/0001-build-fix-race-creating-libnm-core-tests-directory-f.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b55fba8fbda49b9ec2f6f67c44960a0a5fd35ad9 Mon Sep 17 00:00:00 2001 -From: Thomas Haller -Date: Wed, 14 Jun 2017 14:03:30 +0200 -Subject: [PATCH] build: fix race creating "libnm-core/tests" directory for - "nm-core-tests-enum-types.c" - -https://bugzilla.gnome.org/show_bug.cgi?id=783783 - -Upstream-Status: Backport - -Signed-off-by: Andrei Gherzan - ---- - Makefile.am | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index 72bd241..f25fc02 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -616,6 +616,9 @@ GLIB_GENERATED += \ - libnm-core/tests/nm-core-tests-enum-types.c - nm_core_tests_enum_types_sources = libnm-core/tests/test-general-enums.h - -+libnm-core/tests/nm-core-tests-enum-types.h.stamp: libnm-core/tests/.dirstamp -+libnm-core/tests/nm-core-tests-enum-types.c.stamp: libnm-core/tests/.dirstamp -+ - $(libnm_core_tests_test_general_OBJECTS): libnm-core/tests/nm-core-tests-enum-types.h - - libnm_core_tests_cppflags = \ --- -2.7.4 - diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.10.bb b/meta-gnome/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.10.bb new file mode 100644 index 0000000..9159fcb --- /dev/null +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.10.bb @@ -0,0 +1,40 @@ +SUMMARY = "NetworkManager-openvpn-plugin" +SECTION = "net/misc" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=100d5a599bead70ddcd70dcd73f2e29c" + +DEPENDS = "dbus dbus-glib networkmanager openvpn intltool-native glib-2.0-native" + +inherit gnomebase useradd gettext systemd + +SRC_URI = "${GNOME_MIRROR}/NetworkManager-openvpn/${@gnome_verdir("${PV}")}/NetworkManager-openvpn-${PV}.tar.xz" + +SRC_URI[md5sum] = "f118226ed2bfbacfd64ac4d1e0bd0383" +SRC_URI[sha256sum] = "ac86a7a539d78df90095676e9183f2d422fb93dbfe4b3afef22f81825d303d61" + +S = "${WORKDIR}/NetworkManager-openvpn-${PV}" + +PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome" + +do_install_append () { + rm -rf ${D}${libdir}/NetworkManager/*.la +} + +# Create user and group nm-openvpn that are needed since version 1.0.6 +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system nm-openvpn" + +FILES_${PN} += " \ + ${libdir}/NetworkManager/*.so \ + ${nonarch_libdir}/NetworkManager/VPN/nm-openvpn-service.name \ +" + +FILES_${PN}-staticdev += " \ + ${libdir}/NetworkManager/*.a \ +" + +RDEPENDS_${PN} = " \ + networkmanager \ + openvpn \ +" diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager.inc b/meta-gnome/recipes-connectivity/networkmanager/networkmanager.inc deleted file mode 100644 index f0c5b38..0000000 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager.inc +++ /dev/null @@ -1,128 +0,0 @@ - -SUMMARY = "NetworkManager" -SECTION = "net/misc" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \ - file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \ - file://docs/api/html/license.html;md5=eb0c003714e5391000fdfd9c9615cccf \ -" - -DEPENDS = "intltool-native libnl dbus dbus-glib dbus-glib-native libgudev util-linux libnewt polkit libndp python3-pygobject-native python3-pygobject xmlto-native" - - -export GI_TYPELIB_PATH = "${STAGING_LIBDIR_NATIVE}/girepository-1.0" -inherit gnomebase gettext systemd bluetooth gobject-introspection upstream-version-is-even python3native gtk-doc - -SRC_URI = "${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ - file://watch-resolvconf.path file://watch-resolvconf.service \ - " -S = "${WORKDIR}/NetworkManager-${PV}" - -EXTRA_OECONF = " \ - --disable-ifcfg-rh \ - --disable-ifnet \ - --disable-ifcfg-suse \ - --disable-json-validation \ - --disable-more-warnings \ - --with-iptables=${sbindir}/iptables \ - --disable-vala \ - --without-selinux \ - --without-wext \ - --with-libnm-glib \ - --with-tests \ - --enable-introspection \ - --with-nmtui=yes \ -" - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/libnm-util/.libs:${B}/libnm/.libs:${B}/libnm-core/.libs:${B}/libnm-glib/.libs" -} - -PACKAGECONFIG ??= "nss ifupdown netconfig dhclient concheck \ - ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \ - ${@bb.utils.contains('DISTRO_FEATURES','bluetooth','${BLUEZ}','',d)} \ - ${@bb.utils.contains('DISTRO_FEATURES','wifi','wifi','',d)} \ -" -PACKAGECONFIG[systemd] = " \ - --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \ - --without-systemdsystemunitdir, \ - polkit \ -" -PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" -# consolekit is not picked by shlibs, so add it to RDEPENDS too -PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" -PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager" -PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp" -# Use full featured dhcp client instead of internal one -PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client" -PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" -PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" -PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt" -PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,wpa-supplicant" -PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" -PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no" -PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" -PACKAGECONFIG[concheck] = "--enable-concheck,--disable-concheck,curl,curl" - -PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests \ - ${PN}-nmtui ${PN}-nmtui-doc \ - ${PN}-adsl \ -" - -FILES_libnmutil += "${libdir}/libnm-util.so.*" -FILES_libnmglib += "${libdir}/libnm-glib.so.*" -FILES_libnmglib-vpn += "${libdir}/libnm-glib-vpn.so.*" - -FILES_${PN}-adsl = "${libdir}/NetworkManager/libnm-device-plugin-adsl.so" - -FILES_${PN} += " \ - ${libexecdir} \ - ${libdir}/NetworkManager \ - ${libdir}/pppd/*/nm-pppd-plugin.so \ - ${libdir}/NetworkManager/*.so \ - ${datadir}/bash-completion \ - ${datadir}/gir-1.0 \ - ${datadir}/polkit-1 \ - ${datadir}/dbus-1 \ - ${base_libdir}/udev/* \ - ${systemd_unitdir}/system \ -" - -RRECOMMENDS_${PN} += "iptables \ - ${@bb.utils.contains('PACKAGECONFIG','dnsmasq','dnsmasq','',d)} \ -" - -FILES_${PN}-dbg += " \ - ${libdir}/NetworkManager/.debug/ \ - ${libdir}/pppd/*/.debug/ \ -" - -FILES_${PN}-dev += " \ - ${datadir}/NetworkManager/gdb-cmd \ - ${libdir}/pppd/*/*.la \ - ${libdir}/NetworkManager/*.la \ -" - -FILES_${PN}-tests = " \ - ${bindir}/nm-online \ -" - -FILES_${PN}-nmtui = " \ - ${bindir}/nmtui \ - ${bindir}/nmtui-edit \ - ${bindir}/nmtui-connect \ - ${bindir}/nmtui-hostname \ -" - -FILES_${PN}-nmtui-doc = " \ - ${mandir}/man1/nmtui* \ -" - -SYSTEMD_SERVICE_${PN} = "NetworkManager.service NetworkManager-dispatcher.service watch-resolvconf.path" - -do_install_append() { - rm -rf ${D}/run ${D}${localstatedir}/run - install -m 644 ${WORKDIR}/watch-resolvconf.path ${D}${systemd_system_unitdir} - install -m 644 ${WORKDIR}/watch-resolvconf.service ${D}${systemd_system_unitdir} -} diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch new file mode 100644 index 0000000..0c415bc --- /dev/null +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch @@ -0,0 +1,53 @@ +From 3f4b6319701834182304c4079119780f4ae5b49b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 7 Nov 2018 11:30:44 -0800 +Subject: [PATCH] Do not include net/ethernet.h and linux/if_ether.h + +They conflict when used together especially with musl +removing them still keeps it working so it seems they are redundant + +Signed-off-by: Khem Raj +--- + shared/n-acd/src/n-acd.c | 1 - + src/platform/wpan/nm-wpan-utils.h | 2 -- + src/settings/nm-settings-connection.h | 2 -- + 3 files changed, 5 deletions(-) + +diff --git a/shared/n-acd/src/n-acd.c b/shared/n-acd/src/n-acd.c +index 9164f95..9538e50 100644 +--- a/shared/n-acd/src/n-acd.c ++++ b/shared/n-acd/src/n-acd.c +@@ -23,7 +23,6 @@ + #include + #include + #include +-#include + #include + #include + #include +diff --git a/src/platform/wpan/nm-wpan-utils.h b/src/platform/wpan/nm-wpan-utils.h +index f7d0c03..e1c81f5 100644 +--- a/src/platform/wpan/nm-wpan-utils.h ++++ b/src/platform/wpan/nm-wpan-utils.h +@@ -20,8 +20,6 @@ + #ifndef __WPAN_UTILS_H__ + #define __WPAN_UTILS_H__ + +-#include +- + #include "nm-dbus-interface.h" + #include "platform/nm-netlink.h" + +diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h +index e796b71..c01fef6 100644 +--- a/src/settings/nm-settings-connection.h ++++ b/src/settings/nm-settings-connection.h +@@ -22,8 +22,6 @@ + #ifndef __NETWORKMANAGER_SETTINGS_CONNECTION_H__ + #define __NETWORKMANAGER_SETTINGS_CONNECTION_H__ + +-#include +- + #include "nm-dbus-object.h" + #include "nm-connection.h" + diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch new file mode 100644 index 0000000..49a0735 --- /dev/null +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch @@ -0,0 +1,39 @@ +From 18f71c1b48730b8602826517f2b5b088283ae948 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 31 Mar 2017 16:48:00 -0700 +Subject: [PATCH] sd-lldp.h: Remove net/ethernet.h seems to be over specified + +Signed-off-by: Khem Raj +--- + src/systemd/src/libsystemd-network/sd-lldp.c | 1 + + src/systemd/src/systemd/sd-lldp.h | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/systemd/src/libsystemd-network/sd-lldp.c b/src/systemd/src/libsystemd-network/sd-lldp.c +index 31e2448..7721cc2 100644 +--- a/src/systemd/src/libsystemd-network/sd-lldp.c ++++ b/src/systemd/src/libsystemd-network/sd-lldp.c +@@ -3,6 +3,7 @@ + #include "nm-sd-adapt.h" + + #include ++#include + #include + + #include "sd-lldp.h" +diff --git a/src/systemd/src/systemd/sd-lldp.h b/src/systemd/src/systemd/sd-lldp.h +index 3f35eeb..61b0e45 100644 +--- a/src/systemd/src/systemd/sd-lldp.h ++++ b/src/systemd/src/systemd/sd-lldp.h +@@ -18,7 +18,7 @@ + ***/ + + #include +-#include ++//#include + #include + + #include "sd-event.h" +-- +2.14.1 + diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch new file mode 100644 index 0000000..351f264 --- /dev/null +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch @@ -0,0 +1,25 @@ +From 583f0448fb7e9aba2b410c06eec6f420b41a6a0c Mon Sep 17 00:00:00 2001 +From: Pablo Saavedra +Date: Tue, 13 Mar 2018 17:36:20 +0100 +Subject: [PATCH] Fixed configure.ac: Fix pkgconfig sysroot locations + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 51e5eb6..c9d3e56 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -572,7 +572,7 @@ if test "$have_jansson" = "yes"; then + AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled]) + + AC_CHECK_TOOLS(READELF, [eu-readelf readelf]) +- JANSSON_LIBDIR=`$PKG_CONFIG --variable=libdir jansson` ++ JANSSON_LIBDIR=${PKG_CONFIG_SYSROOT_DIR}`$PKG_CONFIG --variable=libdir jansson` + JANSSON_SONAME=`$READELF -d $JANSSON_LIBDIR/libjansson.so |sed -n 's/.*SONAME.*\[[\([^]]*\)]]/\1/p'` + + if test "$JANSSON_SONAME" = ""; then +-- +2.14.1 + diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch new file mode 100644 index 0000000..c50293c --- /dev/null +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch @@ -0,0 +1,80 @@ +From 4f000a4a19975d6aba71427e693cd1ed080abda9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 22 Mar 2018 11:08:30 +0100 +Subject: [PATCH] Do not create settings settings/property documentation +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It was tried to get this work but gi / GirRepository could not be found by +python. Anyway it is not necessary for us to have the settings/property docs. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller +--- + Makefile.am | 20 -------------------- + configure.ac | 5 ----- + 2 files changed, 25 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 1e100f6..d31e3c1 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1115,9 +1115,7 @@ EXTRA_DIST += \ + if HAVE_INTROSPECTION + + libnm_noinst_data = \ +- libnm/nm-property-docs.xml \ + libnm/nm-settings-docs-overrides.xml \ +- libnm/nm-settings-docs.xml \ + libnm/nm-settings-keyfile-docs.xml \ + libnm/nm-settings-ifcfg-rh-docs.xml + +@@ -3692,27 +3690,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums) + $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp + + clients_common_settings_doc_h = clients/common/settings-docs.h +-if HAVE_INTROSPECTION +-$(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-property-docs.xml clients/common/.dirstamp +- $(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^) +-DISTCLEANFILES += $(clients_common_settings_doc_h) +-check-local-settings-docs: $(clients_common_settings_doc_h) +- @if test -z "$$NMTST_NO_CHECK_SETTINGS_DOCS" ; then \ +- if ! cmp -s "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)" ; then \ +- if test "$$NM_TEST_REGENERATE" == 1 ; then \ +- cp -f "$(builddir)/$(clients_common_settings_doc_h)" "$(srcdir)/$(clients_common_settings_doc_h).in"; \ +- else \ +- echo "The generated file \"$(builddir)/$(clients_common_settings_doc_h)\" differs from the source file \"$(srcdir)/$(clients_common_settings_doc_h).in\". You probably should copy the generated file over to the source file. You can skip this test by setting \$$NMTST_NO_CHECK_SETTINGS_DOCS=yes". You can also automatically copy the file by rerunning the test with \$$NM_TEST_REGENERATE=1 ; \ +- false; \ +- fi; \ +- fi;\ +- fi +-check_local += check-local-settings-docs +-else + $(clients_common_settings_doc_h): $(clients_common_settings_doc_h).in clients/common/.dirstamp + $(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)" + check-local-settings-docs: +-endif + EXTRA_DIST += \ + $(clients_common_settings_doc_h) \ + $(clients_common_settings_doc_h).in +diff --git a/configure.ac b/configure.ac +index 79dc3b9..23d14a6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1195,11 +1195,6 @@ GTK_DOC_CHECK(1.0) + # check if we can build setting property documentation + build_docs=no + if test -n "$INTROSPECTION_MAKEFILE"; then +- # If g-i is installed we know we have python, but we might not have pygobject +- if ! "$PYTHON" -c 'from gi.repository import GObject' >& /dev/null; then +- AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)]) +- fi +- + AC_PATH_PROG(PERL, perl) + if test -z "$PERL"; then + AC_MSG_ERROR([--enable-introspection requires perl]) +-- +2.14.5 + diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch new file mode 100644 index 0000000..00dda5b --- /dev/null +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch @@ -0,0 +1,54 @@ +From e92de7409a3e107f90d108a9c5d49bd0418296dd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 22 Mar 2018 17:54:10 +0100 +Subject: [PATCH] Usual fix for musl libc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Stolen from [1] and prettyfied slightly + +[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches + +Signed-off-by: Andreas Müller + +--- + src/systemd/src/basic/stdio-util.h | 2 ++ + src/systemd/src/basic/util.h | 5 +++++ + 2 files changed, 7 insertions(+) + +diff --git a/src/systemd/src/basic/stdio-util.h b/src/systemd/src/basic/stdio-util.h +index 73c0327..e1ce64f 100644 +--- a/src/systemd/src/basic/stdio-util.h ++++ b/src/systemd/src/basic/stdio-util.h +@@ -1,7 +1,9 @@ + /* SPDX-License-Identifier: LGPL-2.1+ */ + #pragma once + ++#if defined(__GLIBC__) + #include ++#endif + #include + #include + #include +diff --git a/src/systemd/src/basic/util.h b/src/systemd/src/basic/util.h +index b31dfd1..9b7032c 100644 +--- a/src/systemd/src/basic/util.h ++++ b/src/systemd/src/basic/util.h +@@ -28,6 +28,11 @@ + #include "missing.h" + #include "time-util.h" + ++#if !defined(__GLIBC__) ++typedef int (*__compar_fn_t) (const void*, const void*); ++typedef __compar_fn_t comparison_fn_t; ++#endif ++ + size_t page_size(void) _pure_; + #define PAGE_ALIGN(l) ALIGN_TO((l), page_size()) + +-- +2.14.3 + diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch new file mode 100644 index 0000000..c162c1d --- /dev/null +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch @@ -0,0 +1,35 @@ +From 57239fda56b68a8f3e413f7b6af5290ba0d86636 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 22 Mar 2018 18:18:06 +0100 +Subject: [PATCH] musl: dlopen is included so LD_LIBS="" instead of + LD_LIBS="none required" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Stolen from [1] and prettyfied slightly + +[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches + +Signed-off-by: Andreas Müller +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index 487a266..96ae4f7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -235,6 +235,7 @@ dnl + dnl Checks for libdl - on certain platforms its part of libc + dnl + AC_SEARCH_LIBS([dlopen], [dl dld], [], [ac_cv_search_dlopen=]) ++AS_IF([test "$ac_cv_search_dlopen" = "none required"],[ac_cv_search_dlopen=""]) + AC_SUBST([DL_LIBS], "$ac_cv_search_dlopen") + + PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.37.6 gmodule-2.0], +-- +2.14.3 + diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch new file mode 100644 index 0000000..9a58c0e --- /dev/null +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch @@ -0,0 +1,72 @@ +From 714b4731a238653e9c7d885c0dee10677b0a4df3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 22 Mar 2018 18:24:07 +0100 +Subject: [PATCH] musl: network support +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Stolen from [1] and prettyfied slightly + +[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches + +Signed-off-by: Andreas Müller +--- + libnm-core/nm-utils.h | 4 ++++ + src/platform/wifi/nm-wifi-utils.h | 4 ++++ + src/systemd/src/basic/socket-util.h | 5 +++++ + 3 files changed, 13 insertions(+) + +diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h +index df9284b..2bcf4b8 100644 +--- a/libnm-core/nm-utils.h ++++ b/libnm-core/nm-utils.h +@@ -30,7 +30,11 @@ + #include + + /* For ETH_ALEN and INFINIBAND_ALEN */ ++#if defined(__GLIBC__) + #include ++#else ++#define ETH_ALEN 6 /* Octets in one ethernet addr */ ++#endif + #include + + #include "nm-core-enum-types.h" +diff --git a/src/platform/wifi/nm-wifi-utils.h b/src/platform/wifi/nm-wifi-utils.h +index 705717b..da3edc4 100644 +--- a/src/platform/wifi/nm-wifi-utils.h ++++ b/src/platform/wifi/nm-wifi-utils.h +@@ -22,7 +22,11 @@ + #ifndef __WIFI_UTILS_H__ + #define __WIFI_UTILS_H__ + ++#if defined(__GLIBC__) + #include ++#else /* musl libc */ ++#define ETH_ALEN 6 /* Octets in one ethernet addr */ ++#endif + + #include "nm-dbus-interface.h" + #include "nm-setting-wireless.h" +diff --git a/src/systemd/src/basic/socket-util.h b/src/systemd/src/basic/socket-util.h +index d7e2d85..d109c84 100644 +--- a/src/systemd/src/basic/socket-util.h ++++ b/src/systemd/src/basic/socket-util.h +@@ -11,6 +11,11 @@ + #include + #include + #include ++#if !defined(__GLIBC__) ++/* SIOCGSTAMPNS from linux/asm-generic.h ++ * for src/systemd/src/libsystemd-network/sd-lldp.c */ ++#include ++#endif + + #include "macro.h" + #include "missing.h" +-- +2.14.3 + diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch new file mode 100644 index 0000000..9e5c943 --- /dev/null +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch @@ -0,0 +1,62 @@ +From d513c8bfc982dbd976617178b040c512c95710b6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 25 Oct 2018 09:57:07 +0200 +Subject: [PATCH] musl: process-util +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Stolen from [1] and prettyfied slightly + +[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches + +Signed-off-by: Andreas Müller +--- + src/systemd/src/basic/process-util.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/src/systemd/src/basic/process-util.c b/src/systemd/src/basic/process-util.c +index 1412f03..45f5049 100644 +--- a/src/systemd/src/basic/process-util.c ++++ b/src/systemd/src/basic/process-util.c +@@ -21,6 +21,9 @@ + #include + #include + #include ++#ifndef __GLIBC__ ++#include ++#endif + #if 0 /* NM_IGNORED */ + #if HAVE_VALGRIND_VALGRIND_H + #include +@@ -1153,11 +1156,13 @@ void reset_cached_pid(void) { + cached_pid = CACHED_PID_UNSET; + } + ++#ifdef __GLIBC__ + /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc + * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against + * libpthread, as it is part of glibc anyway. */ + extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle); + extern void* __dso_handle __attribute__ ((__weak__)); ++#endif + + pid_t getpid_cached(void) { + static bool installed = false; +@@ -1186,7 +1191,11 @@ pid_t getpid_cached(void) { + * only half-documented (glibc doesn't document it but LSB does — though only superficially) + * we'll check for errors only in the most generic fashion possible. */ + ++#ifdef __GLIBC__ + if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) { ++#else ++ if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) { ++#endif + /* OOM? Let's try again later */ + cached_pid = CACHED_PID_UNSET; + return new_pid; +-- +2.14.5 + diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch new file mode 100644 index 0000000..6bca95e --- /dev/null +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch @@ -0,0 +1,77 @@ +From b3b4fe35018c98ad176719b2d9ffb867974fc7c3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 16 Apr 2018 14:45:44 +0200 +Subject: [PATCH] musl: avoid further conflicts by including net/ethernet.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + src/systemd/src/systemd/sd-dhcp-client.h | 2 ++ + src/systemd/src/systemd/sd-dhcp-lease.h | 2 ++ + src/systemd/src/systemd/sd-dhcp6-client.h | 2 ++ + src/systemd/src/systemd/sd-ipv4ll.h | 2 ++ + 4 files changed, 8 insertions(+) + +diff --git a/src/systemd/src/systemd/sd-dhcp-client.h b/src/systemd/src/systemd/sd-dhcp-client.h +index e388552..9c4dde8 100644 +--- a/src/systemd/src/systemd/sd-dhcp-client.h ++++ b/src/systemd/src/systemd/sd-dhcp-client.h +@@ -20,7 +20,9 @@ + ***/ + + #include ++#if defined(__GLIBC__) + #include ++#endif + #include + #include + +diff --git a/src/systemd/src/systemd/sd-dhcp-lease.h b/src/systemd/src/systemd/sd-dhcp-lease.h +index 2a60145..19d1814 100644 +--- a/src/systemd/src/systemd/sd-dhcp-lease.h ++++ b/src/systemd/src/systemd/sd-dhcp-lease.h +@@ -19,7 +19,9 @@ + ***/ + + #include ++#if defined(__GLIBC__) + #include ++#endif + #include + #include + +diff --git a/src/systemd/src/systemd/sd-dhcp6-client.h b/src/systemd/src/systemd/sd-dhcp6-client.h +index fa36dca..2d25010 100644 +--- a/src/systemd/src/systemd/sd-dhcp6-client.h ++++ b/src/systemd/src/systemd/sd-dhcp6-client.h +@@ -20,7 +20,9 @@ + ***/ + + #include ++#if defined(__GLIBC__) + #include ++#endif + #include + #include + +diff --git a/src/systemd/src/systemd/sd-ipv4ll.h b/src/systemd/src/systemd/sd-ipv4ll.h +index 71bd4cf..1c667ba 100644 +--- a/src/systemd/src/systemd/sd-ipv4ll.h ++++ b/src/systemd/src/systemd/sd-ipv4ll.h +@@ -19,7 +19,9 @@ + along with systemd; If not, see . + ***/ + ++#if defined(__GLIBC__) + #include ++#endif + #include + + #include "sd-event.h" +-- +2.14.5 + diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0006-Add-a-strndupa-replacement-for-musl.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0006-Add-a-strndupa-replacement-for-musl.patch new file mode 100644 index 0000000..023a4d9 --- /dev/null +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0006-Add-a-strndupa-replacement-for-musl.patch @@ -0,0 +1,47 @@ +From 6db6596e450062601d18b2ae812a4a58d2e03a53 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 16 Apr 2018 15:07:20 +0200 +Subject: [PATCH] Add a strndupa replacement for musl +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + src/systemd/src/basic/in-addr-util.c | 1 + + src/systemd/src/basic/string-util.h | 5 +++++ + 2 files changed, 6 insertions(+) + +diff --git a/src/systemd/src/basic/in-addr-util.c b/src/systemd/src/basic/in-addr-util.c +index 2a02d90..a57c360 100644 +--- a/src/systemd/src/basic/in-addr-util.c ++++ b/src/systemd/src/basic/in-addr-util.c +@@ -13,6 +13,7 @@ + #include "in-addr-util.h" + #include "macro.h" + #include "parse-util.h" ++#include "string-util.h" + #include "util.h" + + bool in4_addr_is_null(const struct in_addr *a) { +diff --git a/src/systemd/src/basic/string-util.h b/src/systemd/src/basic/string-util.h +index 4c94b18..a6dc446 100644 +--- a/src/systemd/src/basic/string-util.h ++++ b/src/systemd/src/basic/string-util.h +@@ -26,6 +26,11 @@ + #define strcaseeq(a,b) (strcasecmp((a),(b)) == 0) + #define strncaseeq(a, b, n) (strncasecmp((a), (b), (n)) == 0) + ++/* musl does not know strndupa */ ++#if !defined(__GLIBC__) ++#define strndupa(x,s) strncpy(alloca(strlen(x)+1),x,s) ++#endif ++ + int strcmp_ptr(const char *a, const char *b) _pure_; + + static inline bool streq_ptr(const char *a, const char *b) { +-- +2.14.3 + diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager_%.bbappend b/meta-gnome/recipes-connectivity/networkmanager/networkmanager_%.bbappend new file mode 100644 index 0000000..135dafc --- /dev/null +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager_%.bbappend @@ -0,0 +1,16 @@ +# Append recipe from meta-openembedded/meta-networking +PACKAGECONFIG = "nss dhclient systemd wifi glib" +EXTRA_OECONF_remove = "--with-nmtui=yes" +EXTRA_OECONF += "--disable-ovs --with-nmtui=no" + +SRC_URI += "\ + file://watch-resolvconf.path \ + file://watch-resolvconf.service \ +" + +SYSTEMD_SERVICE_${PN} += "watch-resolvconf.path" + +do_install_append() { + install -m 644 ${WORKDIR}/watch-resolvconf.path ${D}${systemd_system_unitdir} + install -m 644 ${WORKDIR}/watch-resolvconf.service ${D}${systemd_system_unitdir} +} diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb b/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb deleted file mode 100644 index 572d121..0000000 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb +++ /dev/null @@ -1,10 +0,0 @@ -require networkmanager.inc -LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \ - file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \ - file://docs/api/html/license.html;md5=77b9e362690c149da196aefe7712db30\ -" -EXTRA_OECONF += "--disable-ovs --with-nmtui=no" -SRC_URI[md5sum] = "de3c7147a693da6f80eb22f126086a14" -SRC_URI[sha256sum] = "6af0b1e856a3725f88791f55c4fbb04105dc0b20dbf182aaec8aad16481fac76" - - diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb b/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb new file mode 100644 index 0000000..870a528 --- /dev/null +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb @@ -0,0 +1,143 @@ +SUMMARY = "NetworkManager" +HOMEPAGE = "https://wiki.gnome.org/Projects/NetworkManager" +SECTION = "net/misc" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \ + file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \ + file://docs/api/html/license.html;md5=2d56a1b0c42e388aa86aef59b154e8c3 \ +" + +DEPENDS = " \ + intltool-native \ + libxslt-native \ + libnl \ + libgudev \ + util-linux \ + libndp \ + libnewt \ + polkit \ + jansson \ + curl \ +" + +inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introspection gtk-doc + +SRC_URI = " \ + ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ + file://0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch \ + file://0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \ + file://0003-Do-not-create-settings-settings-property-documentati.patch \ + file://0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch \ + file://musl/0001-musl-basic.patch \ + file://musl/0002-musl-dlopen-configure-ac.patch \ + file://musl/0003-musl-network-support.patch \ + file://musl/0004-musl-process-util.patch \ + file://musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch \ + file://musl/0006-Add-a-strndupa-replacement-for-musl.patch \ +" +SRC_URI[md5sum] = "54ce62f0aa18ef6c5e754eaac47494ac" +SRC_URI[sha256sum] = "35a3ede4c7d12d6212033c9e44cb82b7692f38063b53a067567f02f5937c8c18" + +UPSTREAM_CHECK_URI = "${GNOME_MIRROR}/NetworkManager/1.10/" +UPSTREAM_CHECK_REGEX = "NetworkManager\-(?P1\.10(\.\d+)+).tar.xz" + +S = "${WORKDIR}/NetworkManager-${PV}" + +EXTRA_OECONF = " \ + --disable-ifcfg-rh \ + --disable-more-warnings \ + --with-iptables=${sbindir}/iptables \ + --with-tests \ + --with-nmtui=yes \ + --with-udev-dir=${nonarch_base_libdir}/udev \ +" + +# gobject-introspection related +GI_DATA_ENABLED_libc-musl = "False" + +# stolen from https://github.com/voidlinux/void-packages/blob/master/srcpkgs/NetworkManager/template +CFLAGS_libc-musl_append = " \ + -DHAVE_SECURE_GETENV -Dsecure_getenv=getenv \ + -D__USE_POSIX199309 -DRTLD_DEEPBIND=0 \ +" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/libnm/.libs:${B}/libnm-glib/.libs:${B}/libnm-util/.libs" +} + +PACKAGECONFIG ??= "nss ifupdown dhclient dnsmasq \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'wifi', d)} \ +" +PACKAGECONFIG[systemd] = " \ + --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \ + --without-systemdsystemunitdir, \ + polkit \ +" +PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" +# consolekit is not picked by shlibs, so add it to RDEPENDS too +PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" +PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager" +PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp" +# Use full featured dhcp client instead of internal one +PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client" +PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" +PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" +PACKAGECONFIG[glib] = "--with-libnm-glib,,dbus-glib-native dbus-glib" +PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls" +PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,,wpa-supplicant" +PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" +PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" + +PACKAGES =+ "libnmutil libnmglib libnmglib-vpn \ + ${PN}-nmtui ${PN}-nmtui-doc \ + ${PN}-adsl \ +" + +FILES_libnmutil += "${libdir}/libnm-util.so.*" +FILES_libnmglib += "${libdir}/libnm-glib.so.*" +FILES_libnmglib-vpn += "${libdir}/libnm-glib-vpn.so.*" + +FILES_${PN}-adsl = "${libdir}/NetworkManager/libnm-device-plugin-adsl.so" + +FILES_${PN} += " \ + ${libexecdir} \ + ${libdir}/NetworkManager/${PV}/*.so \ + ${nonarch_libdir}/NetworkManager/VPN \ + ${nonarch_libdir}/NetworkManager/conf.d \ + ${datadir}/polkit-1 \ + ${datadir}/dbus-1 \ + ${noarch_base_libdir}/udev/* \ + ${systemd_unitdir}/system \ +" + +RRECOMMENDS_${PN} += "iptables \ + ${@bb.utils.filter('PACKAGECONFIG', 'dnsmasq', d)} \ +" +RCONFLICTS_${PN} = "connman" + +FILES_${PN}-dev += " \ + ${datadir}/NetworkManager/gdb-cmd \ + ${libdir}/pppd/*/*.la \ + ${libdir}/NetworkManager/*.la \ + ${libdir}/NetworkManager/${PV}/*.la \ +" + +FILES_${PN}-nmtui = " \ + ${bindir}/nmtui \ + ${bindir}/nmtui-edit \ + ${bindir}/nmtui-connect \ + ${bindir}/nmtui-hostname \ +" + +FILES_${PN}-nmtui-doc = " \ + ${mandir}/man1/nmtui* \ +" + +SYSTEMD_SERVICE_${PN} = "NetworkManager.service NetworkManager-dispatcher.service" + +do_install_append() { + rm -rf ${D}/run ${D}${localstatedir}/run +} diff --git a/meta-gnome/recipes-devtools/autoconf/autoconf213.bb b/meta-gnome/recipes-devtools/autoconf/autoconf213.bb deleted file mode 100644 index b5922fc..0000000 --- a/meta-gnome/recipes-devtools/autoconf/autoconf213.bb +++ /dev/null @@ -1,26 +0,0 @@ - -# ugh.... -# https://bugzilla.mozilla.org/show_bug.cgi?id=104642 - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f" - -SRC_URI = "http://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz" -SRC_URI[md5sum] = "9de56d4a161a723228220b0f425dc711" -SRC_URI[sha256sum] = "f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e" - -DEPENDS = "m4-native gnu-config-native" -RDEPENDS_${PN} = "perl" -export PERL = "${USRBINPATH}/perl" -S = "${WORKDIR}/autoconf-2.13" -FILES_${PN} += "/usr/share/autoconf" - -inherit autotools - -do_configure() { - oe_runconf --program-suffix=213 --infodir=${D}/${infodir} --bindir=${D}/${bindir} --datadir=${D}/${datadir} -} - -EXTRA_OECONF = "--program-suffix=213" -BBCLASSEXTEND = "native" - diff --git a/meta-gnome/recipes-devtools/meson/meson.inc b/meta-gnome/recipes-devtools/meson/meson.inc deleted file mode 100644 index ddbb306..0000000 --- a/meta-gnome/recipes-devtools/meson/meson.inc +++ /dev/null @@ -1,29 +0,0 @@ -HOMEPAGE = "http://mesonbuild.com" -SUMMARY = "A high performance build system" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${PV}.tar.gz \ - file://0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch \ - file://0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch \ - file://0001-Linker-rules-move-cross_args-in-front-of-output_args.patch \ - file://0003-native_bindir.patch \ - file://gi-flags.patch \ - file://gtkdoc-flags.patch \ - file://0001-use-exe-wrapper-for-custom-targets.patch \ - " -SRC_URI[sha256sum] = "92d8afd921751261e36151643464efd3394162f69efbe8cd53e0a66b1cf395eb" -SRC_URI[md5sum] = "31bda3519d8c0eb3438267268a78085e" - -SRC_URI_append_class-native = "file://0002-Make-CPU-family-warnings-fatal.patch \ - file://0001-Support-building-allarch-recipes-again.patch \ - " - -UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases" - -inherit setuptools3 - -RDEPENDS_${PN} = "ninja python3-core python3-modules" - -FILES_${PN} += "${datadir}/polkit-1" diff --git a/meta-gnome/recipes-devtools/meson/meson/0001-Linker-rules-move-cross_args-in-front-of-output_args.patch b/meta-gnome/recipes-devtools/meson/meson/0001-Linker-rules-move-cross_args-in-front-of-output_args.patch deleted file mode 100644 index 97778c3..0000000 --- a/meta-gnome/recipes-devtools/meson/meson/0001-Linker-rules-move-cross_args-in-front-of-output_args.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4676224dbdff0f7107e8cbdbe0eab19c855f1454 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 17 Nov 2017 13:18:28 +0200 -Subject: [PATCH] Linker rules: move {cross_args} in front of {output_args} - -The previous order was found to break linking in some cases -(e.g. when -no-pic -fno-PIC was present in {cross_args}. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - mesonbuild/backend/ninjabackend.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py -index bb281e1..969b70e 100644 ---- a/mesonbuild/backend/ninjabackend.py -+++ b/mesonbuild/backend/ninjabackend.py -@@ -1501,7 +1501,7 @@ int dummy; - rspfile_content = $ARGS {output_args} $in $LINK_ARGS {cross_args} $aliasing - ''' - else: -- command_template = ' command = {executable} $ARGS {output_args} $in $LINK_ARGS {cross_args} $aliasing\n' -+ command_template = ' command = {executable} $ARGS {cross_args} {output_args} $in $LINK_ARGS $aliasing\n' - command = command_template.format( - executable=' '.join(compiler.get_linker_exelist()), - cross_args=' '.join(cross_args), --- -2.15.0 - diff --git a/meta-gnome/recipes-devtools/meson/meson/0001-Support-building-allarch-recipes-again.patch b/meta-gnome/recipes-devtools/meson/meson/0001-Support-building-allarch-recipes-again.patch deleted file mode 100644 index f6dd230..0000000 --- a/meta-gnome/recipes-devtools/meson/meson/0001-Support-building-allarch-recipes-again.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d80d02a3ca6e21fa3d055c88c05234c2eb4db128 Mon Sep 17 00:00:00 2001 -From: Peter Kjellerstedt -Date: Thu, 26 Jul 2018 16:32:49 +0200 -Subject: [PATCH] Support building allarch recipes again - -This registers "allarch" as a known CPU family. - -Upstream-Status: Inappropriate [OE specific] -Signed-off-by: Peter Kjellerstedt ---- - mesonbuild/environment.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index a0580a2..712b1e8 100644 ---- a/mesonbuild/environment.py -+++ b/mesonbuild/environment.py -@@ -73,6 +73,7 @@ from .compilers import ( - build_filename = 'meson.build' - - known_cpu_families = ( -+ 'allarch', - 'aarch64', - 'arm', - 'e2k', --- -2.12.0 - diff --git a/meta-gnome/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch b/meta-gnome/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch deleted file mode 100644 index 7ffd6c5..0000000 --- a/meta-gnome/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 3ac4e58c5494bd7e603a325b5b5c2b8075849fee Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 4 Aug 2017 16:16:41 +0300 -Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling - -Specifically: -1) Make it possible to specify a wrapper for executing binaries -(usually, some kind of target hardware emulator, such as qemu) -2) Explicitly provide CC and LD via command line, as otherwise gtk-doc will -try to guess them, incorrectly. -3) If things break down, print the full command with arguments, -not just the binary name. -4) Correctly determine the compiler/linker executables and cross-options when cross-compiling - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin - ---- - mesonbuild/modules/gnome.py | 18 +++++++++++++++--- - mesonbuild/scripts/gtkdochelper.py | 9 +++++++-- - 2 files changed, 22 insertions(+), 5 deletions(-) - -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index cb69641..727eb6a 100644 ---- a/mesonbuild/modules/gnome.py -+++ b/mesonbuild/modules/gnome.py -@@ -792,6 +792,10 @@ This will become a hard error in the future.''') - '--mode=' + mode] - if namespace: - args.append('--namespace=' + namespace) -+ gtkdoc_exe_wrapper = state.environment.cross_info.config["properties"].get('gtkdoc_exe_wrapper', None) -+ if gtkdoc_exe_wrapper is not None: -+ args.append('--gtkdoc-exe-wrapper=' + gtkdoc_exe_wrapper) -+ - args += self._unpack_args('--htmlargs=', 'html_args', kwargs) - args += self._unpack_args('--scanargs=', 'scan_args', kwargs) - args += self._unpack_args('--scanobjsargs=', 'scanobjs_args', kwargs) -diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py -index 948dc5a..9c5bd19 100644 ---- a/mesonbuild/scripts/gtkdochelper.py -+++ b/mesonbuild/scripts/gtkdochelper.py -@@ -45,6 +45,7 @@ parser.add_argument('--ignore-headers', dest='ignore_headers', default='') - parser.add_argument('--namespace', dest='namespace', default='') - parser.add_argument('--mode', dest='mode', default='') - parser.add_argument('--installdir', dest='install_dir') -+parser.add_argument('--gtkdoc-exe-wrapper', dest='gtkdoc_exe_wrapper') - - def gtkdoc_run_check(cmd, cwd, library_paths=None): - if library_paths is None: -@@ -64,7 +65,7 @@ def gtkdoc_run_check(cmd, cwd, library_paths=None): - # This preserves the order of messages. - p, out = Popen_safe(cmd, cwd=cwd, env=env, stderr=subprocess.STDOUT)[0:2] - if p.returncode != 0: -- err_msg = ["{!r} failed with status {:d}".format(cmd[0], p.returncode)] -+ err_msg = ["{!r} failed with status {:d}".format(cmd, p.returncode)] - if out: - err_msg.append(out) - raise MesonException('\n'.join(err_msg)) -@@ -74,7 +75,7 @@ def gtkdoc_run_check(cmd, cwd, library_paths=None): - def build_gtkdoc(source_root, build_root, doc_subdir, src_subdirs, - main_file, module, - html_args, scan_args, fixxref_args, mkdb_args, -- gobject_typesfile, scanobjs_args, ld, cc, ldflags, cflags, -+ gobject_typesfile, scanobjs_args, gtkdoc_exe_wrapper, ld, cc, ldflags, cflags, - html_assets, content_files, ignore_headers, namespace, - expand_content_files, mode): - print("Building documentation for %s" % module) -@@ -135,6 +136,9 @@ def build_gtkdoc(source_root, build_root, doc_subdir, src_subdirs, - if gobject_typesfile: - scanobjs_cmd = ['gtkdoc-scangobj'] + scanobjs_args + ['--types=' + gobject_typesfile, - '--module=' + module, -+ '--run=' + gtkdoc_exe_wrapper, -+ '--cc=' + cc, -+ '--ld=' + ld, - '--cflags=' + cflags, - '--ldflags=' + ldflags, - '--cc=' + cc, -@@ -238,6 +242,7 @@ def run(args): - mkdbargs, - options.gobject_typesfile, - scanobjsargs, -+ options.gtkdoc_exe_wrapper, - options.ld, - options.cc, - options.ldflags, diff --git a/meta-gnome/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch b/meta-gnome/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch deleted file mode 100644 index ca56a6a..0000000 --- a/meta-gnome/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 2e8553fc01e62ebc4faa240bf20984a8a0ac7387 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Tue, 3 Jul 2018 13:59:09 +0100 -Subject: [PATCH] Make CPU family warnings fatal - -Upstream-Status: Inappropriate [OE specific] -Signed-off-by: Ross Burton - ---- - mesonbuild/environment.py | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index d29a77f..267acf9 100644 ---- a/mesonbuild/environment.py -+++ b/mesonbuild/environment.py -@@ -239,9 +239,7 @@ def detect_cpu_family(compilers): - return 'x86_64' - - if trial not in known_cpu_families: -- mlog.warning('Unknown CPU family {!r}, please report this at ' -- 'https://github.com/mesonbuild/meson/issues/new with the' -- 'output of `uname -a` and `cat /proc/cpuinfo`'.format(trial)) -+ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial) - - return trial - -@@ -1014,7 +1012,7 @@ class CrossBuildInfo: - raise EnvironmentException('Malformed value in cross file variable %s.' % entry) - - if entry == 'cpu_family' and res not in known_cpu_families: -- mlog.warning('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % value) -+ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % value) - - if self.ok_type(res): - self.config[s][entry] = res diff --git a/meta-gnome/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch b/meta-gnome/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch deleted file mode 100644 index f32267d..0000000 --- a/meta-gnome/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0b860cb8a22ae876b6088939dbabca216bc29431 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 4 Aug 2017 16:18:47 +0300 -Subject: [PATCH] gobject-introspection: determine g-ir-scanner and - g-ir-compiler paths from pkgconfig - -Do not hardcode the name of those binaries; gobject-introspection -provides them via pkgconfig, and they can be set to something else -(for example when cross-compiling). - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin - ---- - mesonbuild/modules/gnome.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index b29bab9..dc4c401 100644 ---- a/mesonbuild/modules/gnome.py -+++ b/mesonbuild/modules/gnome.py -@@ -393,8 +393,6 @@ class GnomeModule(ExtensionModule): - raise MesonException('Gir takes one argument') - if kwargs.get('install_dir'): - raise MesonException('install_dir is not supported with generate_gir(), see "install_dir_gir" and "install_dir_typelib"') -- giscanner = self.interpreter.find_program_impl('g-ir-scanner') -- gicompiler = self.interpreter.find_program_impl('g-ir-compiler') - girtarget = args[0] - while hasattr(girtarget, 'held_object'): - girtarget = girtarget.held_object -@@ -405,6 +403,8 @@ class GnomeModule(ExtensionModule): - self.gir_dep = PkgConfigDependency('gobject-introspection-1.0', - state.environment, - {'native': True}) -+ giscanner = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) -+ gicompiler = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) - pkgargs = self.gir_dep.get_compile_args() - except Exception: - raise MesonException('gobject-introspection dependency was not found, gir cannot be generated.') diff --git a/meta-gnome/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta-gnome/recipes-devtools/meson/meson/0003-native_bindir.patch deleted file mode 100644 index da47745..0000000 --- a/meta-gnome/recipes-devtools/meson/meson/0003-native_bindir.patch +++ /dev/null @@ -1,125 +0,0 @@ -From e762d85c823adfefc27ba6128c7b997aa50166ce Mon Sep 17 00:00:00 2001 -From: Ricardo Ribalda Delgado -Date: Wed, 15 Nov 2017 15:05:01 +0100 -Subject: [PATCH] native_bindir - -Some libraries, like QT, have pre-processors that convert their input -files into something that the cross-compiler can process. We find the -path of those pre-processors via pkg-config-native instead of -pkg-config. - -This path forces the use of pkg-config-native for host_bins arguments. - -There are some discussions upstream to merge this patch, but I presonaly believe -that is is OE only. https://github.com/mesonbuild/meson/issues/1849#issuecomment-303730323 - -Upstream-Status: Inappropriate [OE specific] -Signed-off-by: Ricardo Ribalda Delgado - ---- - mesonbuild/dependencies/base.py | 19 +++++++++++-------- - mesonbuild/dependencies/ui.py | 6 +++--- - 2 files changed, 14 insertions(+), 11 deletions(-) - -diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index 6d3678f..90fdb80 100644 ---- a/mesonbuild/dependencies/base.py -+++ b/mesonbuild/dependencies/base.py -@@ -146,7 +146,7 @@ class Dependency: - def need_threads(self): - return False - -- def get_pkgconfig_variable(self, variable_name, kwargs): -+ def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False): - raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name)) - - def get_configtool_variable(self, variable_name): -@@ -183,7 +183,7 @@ class InternalDependency(Dependency): - self.sources = sources - self.ext_deps = ext_deps - -- def get_pkgconfig_variable(self, variable_name, kwargs): -+ def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False): - raise DependencyException('Method "get_pkgconfig_variable()" is ' - 'invalid for an internal dependency') - -@@ -523,15 +523,18 @@ class PkgConfigDependency(ExternalDependency): - return s.format(self.__class__.__name__, self.name, self.is_found, - self.version_reqs) - -- def _call_pkgbin_real(self, args, env): -- cmd = self.pkgbin.get_command() + args -+ def _call_pkgbin_real(self, args, env, use_native=False): -+ if use_native: -+ cmd = self.pkgbin.get_command() + "-native" + args -+ else: -+ cmd = self.pkgbin.get_command() + args - p, out = Popen_safe(cmd, env=env)[0:2] - rc, out = p.returncode, out.strip() - call = ' '.join(cmd) - mlog.debug("Called `{}` -> {}\n{}".format(call, rc, out)) - return rc, out - -- def _call_pkgbin(self, args, env=None): -+ def _call_pkgbin(self, args, env=None, use_native=False): - if env is None: - fenv = env - env = os.environ -@@ -540,7 +543,7 @@ class PkgConfigDependency(ExternalDependency): - targs = tuple(args) - cache = PkgConfigDependency.pkgbin_cache - if (self.pkgbin, targs, fenv) not in cache: -- cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env) -+ cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native) - return cache[(self.pkgbin, targs, fenv)] - - def _convert_mingw_paths(self, args): -@@ -718,7 +721,7 @@ class PkgConfigDependency(ExternalDependency): - (self.name, out_raw)) - self.link_args, self.raw_link_args = self._search_libs(out, out_raw) - -- def get_pkgconfig_variable(self, variable_name, kwargs): -+ def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False): - options = ['--variable=' + variable_name, self.name] - - if 'define_variable' in kwargs: -@@ -731,7 +734,7 @@ class PkgConfigDependency(ExternalDependency): - - options = ['--define-variable=' + '='.join(definition)] + options - -- ret, out = self._call_pkgbin(options) -+ ret, out = self._call_pkgbin(options, use_native=use_native) - variable = '' - if ret != 0: - if self.required: -diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py -index 197d22c..c683d21 100644 ---- a/mesonbuild/dependencies/ui.py -+++ b/mesonbuild/dependencies/ui.py -@@ -285,7 +285,7 @@ class QtBaseDependency(ExternalDependency): - self.bindir = self.get_pkgconfig_host_bins(core) - if not self.bindir: - # If exec_prefix is not defined, the pkg-config file is broken -- prefix = core.get_pkgconfig_variable('exec_prefix', {}) -+ prefix = core.get_pkgconfig_variable('exec_prefix', {}, use_native=True) - if prefix: - self.bindir = os.path.join(prefix, 'bin') - -@@ -427,7 +427,7 @@ class Qt4Dependency(QtBaseDependency): - applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease'] - for application in applications: - try: -- return os.path.dirname(core.get_pkgconfig_variable('%s_location' % application, {})) -+ return os.path.dirname(core.get_pkgconfig_variable('%s_location' % application, {}, use_native=True)) - except MesonException: - pass - -@@ -437,7 +437,7 @@ class Qt5Dependency(QtBaseDependency): - QtBaseDependency.__init__(self, 'qt5', env, kwargs) - - def get_pkgconfig_host_bins(self, core): -- return core.get_pkgconfig_variable('host_bins', {}) -+ return core.get_pkgconfig_variable('host_bins', {}, use_native=True) - - def get_private_includes(self, mod_inc_dir, module): - return _qt_get_private_includes(mod_inc_dir, module, self.version) diff --git a/meta-gnome/recipes-devtools/meson/meson/gi-flags.patch b/meta-gnome/recipes-devtools/meson/meson/gi-flags.patch deleted file mode 100644 index 9a4c296..0000000 --- a/meta-gnome/recipes-devtools/meson/meson/gi-flags.patch +++ /dev/null @@ -1,35 +0,0 @@ -Pass the correct cflags/ldflags to the gobject-introspection tools. - -Upstream-Status: Submitted [https://github.com/mesonbuild/meson/pull/4261] -Signed-off-by: Ross Burton - -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index cb69641e..bb4449a0 100644 ---- a/mesonbuild/modules/gnome.py -+++ b/mesonbuild/modules/gnome.py -@@ -579,7 +579,10 @@ class GnomeModule(ExtensionModule): - external_ldflags += list(dep_external_ldflags) - scan_command += ['--cflags-begin'] - scan_command += cflags -- scan_command += state.environment.coredata.get_external_args(lang) -+ if state.environment.is_cross_build(): -+ scan_command += state.environment.cross_info.config["properties"].get(lang + '_args', "") -+ else: -+ scan_command += state.environment.coredata.get_external_args(lang) - scan_command += ['--cflags-end'] - # need to put our output directory first as we need to use the - # generated libraries instead of any possibly installed system/prefix -@@ -614,7 +614,12 @@ class GnomeModule(ExtensionModule): - scan_command.append('-L' + d) - scan_command += ['--library', libname] - -- for link_arg in state.environment.coredata.get_external_link_args(lang): -+ if state.environment.is_cross_build(): -+ link_args = state.environment.cross_info.config["properties"].get(lang + '_link_args', "") -+ else: -+ link_args = state.environment.coredata.get_external_link_args(lang) -+ -+ for link_arg in link_args: - if link_arg.startswith('-L'): - scan_command.append(link_arg) - scan_command += list(external_ldflags) diff --git a/meta-gnome/recipes-devtools/meson/meson/gtkdoc-flags.patch b/meta-gnome/recipes-devtools/meson/meson/gtkdoc-flags.patch deleted file mode 100644 index ecf3489..0000000 --- a/meta-gnome/recipes-devtools/meson/meson/gtkdoc-flags.patch +++ /dev/null @@ -1,44 +0,0 @@ -Ensure that in a cross compile only the target flags are passed to gtk-doc, and -not the native flags. - -Upstream-Status: Submitted [https://github.com/mesonbuild/meson/pull/4261] -Signed-off-by: Ross Burton - -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index 4af33304..8751f53c 100644 ---- a/mesonbuild/modules/gnome.py -+++ b/mesonbuild/modules/gnome.py -@@ -851,17 +851,30 @@ This will become a hard error in the future.''') - if not isinstance(incd.held_object, (str, build.IncludeDirs)): - raise MesonException( - 'Gir include dirs should be include_directories().') -+ - cflags.update(get_include_args(inc_dirs)) -- cflags.update(state.environment.coredata.get_external_args('c')) -+ if state.environment.is_cross_build(): -+ cflags.update(state.environment.cross_info.config["properties"].get('c_args', "")) -+ else: -+ cflags.update(state.environment.coredata.get_external_args('c')) -+ - ldflags = OrderedSet() - ldflags.update(internal_ldflags) -- ldflags.update(state.environment.coredata.get_external_link_args('c')) -+ if state.environment.is_cross_build(): -+ ldflags.update(state.environment.cross_info.config["properties"].get('c_link_args', "")) -+ else: -+ ldflags.update(state.environment.coredata.get_external_link_args('c')) - ldflags.update(external_ldflags) -+ - if cflags: - args += ['--cflags=%s' % ' '.join(cflags)] - if ldflags: - args += ['--ldflags=%s' % ' '.join(ldflags)] -- compiler = state.environment.coredata.compilers.get('c') -+ -+ if state.environment.is_cross_build(): -+ compiler = state.environment.coredata.cross_compilers.get('c') -+ else: -+ compiler = state.environment.coredata.compilers.get('c') - if compiler: - args += ['--cc=%s' % ' '.join(compiler.get_exelist())] - args += ['--ld=%s' % ' '.join(compiler.get_linker_exelist())] diff --git a/meta-gnome/recipes-devtools/meson/meson/meson-setup.py b/meta-gnome/recipes-devtools/meson/meson/meson-setup.py deleted file mode 100755 index a9749ea..0000000 --- a/meta-gnome/recipes-devtools/meson/meson/meson-setup.py +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/env python3 - -import os -import sys - -def bail(msg): - print(msg, file=sys.stderr) - sys.exit(1) - -_MARKER = '@@' -def transform_line(line): - # Substitute any special markers of this form: - # @@ENV@@ - # with the value of ENV, split into meson array syntax. - start = line.find(_MARKER) - if start == -1: - return line - - end = line.rfind(_MARKER) - if end == start: - return line - - # Lookup value of the env var. - var = line[start+len(_MARKER):end] - try: - val = os.environ[var] - except KeyError: - bail('cannot generate meson.cross; env var %s not set' % var) - - # Transform into meson array. - val = ["'%s'" % x for x in val.split()] - val = ', '.join(val) - val = '[%s]' % val - - before = line[:start] - after = line[end+len(_MARKER):] - - return '%s%s%s' % (before, val, after) - -# Make sure this is really an SDK extraction environment. -try: - sysroot = os.environ['OECORE_NATIVE_SYSROOT'] -except KeyError: - bail('OECORE_NATIVE_SYSROOT env var must be set') - -cross_file = os.path.join(sysroot, 'usr/share/meson/meson.cross') -tmp_cross_file = '%s.tmp' % cross_file - -# Read through and transform the current meson.cross. -lines = [] -with open(cross_file, 'r') as f: - for line in f: - lines.append(transform_line(line)) - -# Write the transformed result to a tmp file and atomically rename it. In case -# we crash during the file write, we don't want an invalid meson.cross file. -with open(tmp_cross_file, 'w') as f: - for line in lines: - f.write(line) - f.flush() - os.fdatasync(f.fileno()) -os.rename(tmp_cross_file, cross_file) diff --git a/meta-gnome/recipes-devtools/meson/meson/meson-wrapper b/meta-gnome/recipes-devtools/meson/meson/meson-wrapper deleted file mode 100755 index b2e00da..0000000 --- a/meta-gnome/recipes-devtools/meson/meson/meson-wrapper +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -if [ -z "$OECORE_NATIVE_SYSROOT" ]; then - echo "OECORE_NATIVE_SYSROOT not set; are you in a Yocto SDK environment?" >&2 -fi - -# If these are set to a cross-compile path, meson will get confused and try to -# use them as native tools. Unset them to prevent this, as all the cross-compile -# config is already in meson.cross. -unset CC CXX CPP LD AR NM STRIP - -exec "$OECORE_NATIVE_SYSROOT/usr/bin/meson.real" \ - --cross-file "$OECORE_NATIVE_SYSROOT/usr/share/meson/meson.cross" \ - "$@" diff --git a/meta-gnome/recipes-devtools/meson/meson/native_bindir.patch b/meta-gnome/recipes-devtools/meson/meson/native_bindir.patch deleted file mode 100644 index 993e975..0000000 --- a/meta-gnome/recipes-devtools/meson/meson/native_bindir.patch +++ /dev/null @@ -1,71 +0,0 @@ -There are some discussions upstream to merge this patch, but I presonaly believe -that is is OE only. https://github.com/mesonbuild/meson/issues/1849#issuecomment-303730323 - -Upstream-Status: Inappropriate [OE specific] -Signed-off-by: Ricardo Ribalda Delgado -diff --git a/mesonbuild/dependencies.py b/mesonbuild/dependencies.py -index 04a22f985941..3e33bc4a79e7 100644 ---- a/mesonbuild/dependencies.py -+++ b/mesonbuild/dependencies.py -@@ -95,7 +95,7 @@ class Dependency: - def need_threads(self): - return False - -- def get_pkgconfig_variable(self, variable_name): -+ def get_pkgconfig_variable(self, variable_name, use_native=False): - raise MesonException('Tried to get a pkg-config variable from a non-pkgconfig dependency.') - - class InternalDependency(Dependency): -@@ -224,8 +224,12 @@ class PkgConfigDependency(Dependency): - return s.format(self.__class__.__name__, self.name, self.is_found, - self.version_reqs) - -- def _call_pkgbin(self, args): -- p, out = Popen_safe([self.pkgbin] + args, env=os.environ)[0:2] -+ def _call_pkgbin(self, args, use_native=False): -+ if use_native: -+ pkgbin = [self.pkgbin + "-native"] -+ else: -+ pkgbin = [self.pkgbin] -+ p, out = Popen_safe(pkgbin + args, env=os.environ)[0:2] - return p.returncode, out.strip() - - def _set_cargs(self): -@@ -259,8 +263,8 @@ class PkgConfigDependency(Dependency): - self.is_libtool = True - self.libs.append(lib) - -- def get_pkgconfig_variable(self, variable_name): -- ret, out = self._call_pkgbin(['--variable=' + variable_name, self.name]) -+ def get_pkgconfig_variable(self, variable_name, use_native=False): -+ ret, out = self._call_pkgbin(['--variable=' + variable_name, self.name], use_native=use_native) - variable = '' - if ret != 0: - if self.required: -@@ -1091,7 +1095,7 @@ class QtBaseDependency(Dependency): - self.bindir = self.get_pkgconfig_host_bins(core) - if not self.bindir: - # If exec_prefix is not defined, the pkg-config file is broken -- prefix = core.get_pkgconfig_variable('exec_prefix') -+ prefix = core.get_pkgconfig_variable('exec_prefix', use_native=True) - if prefix: - self.bindir = os.path.join(prefix, 'bin') - -@@ -1202,7 +1206,7 @@ class Qt5Dependency(QtBaseDependency): - QtBaseDependency.__init__(self, 'qt5', env, kwargs) - - def get_pkgconfig_host_bins(self, core): -- return core.get_pkgconfig_variable('host_bins') -+ return core.get_pkgconfig_variable('host_bins', use_native=True) - - class Qt4Dependency(QtBaseDependency): - def __init__(self, env, kwargs): -@@ -1216,7 +1220,7 @@ class Qt4Dependency(QtBaseDependency): - applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease'] - for application in applications: - try: -- return os.path.dirname(core.get_pkgconfig_variable('%s_location' % application)) -+ return os.path.dirname(core.get_pkgconfig_variable('%s_location' % application, use_native=True)) - except MesonException: - pass - diff --git a/meta-gnome/recipes-devtools/meson/meson_%.bbappend b/meta-gnome/recipes-devtools/meson/meson_%.bbappend new file mode 100644 index 0000000..4eafd97 --- /dev/null +++ b/meta-gnome/recipes-devtools/meson/meson_%.bbappend @@ -0,0 +1,4 @@ + +FILESEXTRAPATHS_prepend := "${THISDIR}/meson:" + +SRC_URI += "file://0001-use-exe-wrapper-for-custom-targets.patch " diff --git a/meta-gnome/recipes-devtools/meson/meson_0.47.2.bb b/meta-gnome/recipes-devtools/meson/meson_0.47.2.bb deleted file mode 100644 index 897fa14..0000000 --- a/meta-gnome/recipes-devtools/meson/meson_0.47.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -include meson.inc - -BBCLASSEXTEND = "native" diff --git a/meta-gnome/recipes-devtools/meson/nativesdk-meson_0.47.2.bb b/meta-gnome/recipes-devtools/meson/nativesdk-meson_0.47.2.bb deleted file mode 100644 index 53503aa..0000000 --- a/meta-gnome/recipes-devtools/meson/nativesdk-meson_0.47.2.bb +++ /dev/null @@ -1,74 +0,0 @@ -include meson.inc - -inherit nativesdk - -SRC_URI += "file://meson-setup.py \ - file://meson-wrapper" - -def meson_array(var, d): - return "', '".join(d.getVar(var).split()).join(("'", "'")) - -# both are required but not used by meson -MESON_SDK_ENDIAN = "bogus-endian" -MESON_TARGET_ENDIAN = "bogus-endian" - -MESON_TOOLCHAIN_ARGS = "${BUILDSDK_CC_ARCH}${TOOLCHAIN_OPTIONS}" -MESON_C_ARGS = "${MESON_TOOLCHAIN_ARGS} ${BUILDSDK_CFLAGS}" -MESON_CPP_ARGS = "${MESON_TOOLCHAIN_ARGS} ${BUILDSDK_CXXFLAGS}" -MESON_LINK_ARGS = "${MESON_TOOLCHAIN_ARGS} ${BUILDSDK_LDFLAGS}" - -# This logic is similar but not identical to that in meson.bbclass, since it's -# generating for an SDK rather than a cross-compile. Important differences are: -# - We can't set vars like CC, CXX, etc. yet because they will be filled in with -# real paths by meson-setup.sh when the SDK is extracted. -# - Some overrides aren't needed, since the SDK injects paths that take care of -# them. -addtask write_config before do_install -do_write_config[vardeps] += "MESON_C_ARGS MESON_CPP_ARGS MESON_LINK_ARGS CC CXX LD AR NM STRIP READELF" -do_write_config() { - # This needs to be Py to split the args into single-element lists - cat >${WORKDIR}/meson.cross < ${B}/wrapper << EOF -#!/bin/sh -${STAGING_LIBDIR}/ld-linux-x86-64.so.2 --library-path ${STAGING_LIBDIR} \$@ -EOF - chmod +x ${B}/wrapper - fi - - if ! grep -q "^exe_wrapper" ${WORKDIR}/meson.cross; then - cat ${WORKDIR}/meson.cross | sed "/pkgconfig/ a\ -exe_wrapper = '${B}/wrapper'" > ${WORKDIR}/meson.cross.tmp - mv ${WORKDIR}/meson.cross.tmp ${WORKDIR}/meson.cross - fi -} - -do_configure_prepend() { - setup_wrapper -} - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --home /var/lib/colord --no-create-home --shell /bin/false --user-group colord" -inherit meson systemd useradd gettext - diff --git a/meta-gnome/recipes-freedesktop/colord/colord_1.4.3.bb b/meta-gnome/recipes-freedesktop/colord/colord_1.4.3.bb new file mode 100644 index 0000000..1b93ec3 --- /dev/null +++ b/meta-gnome/recipes-freedesktop/colord/colord_1.4.3.bb @@ -0,0 +1,34 @@ +SUMMARY = "System service to manage, install and generate color profiles to color manage input and output devices" +HOMEPAGE ="https://www.freedesktop.org/software/colord/" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "https://www.freedesktop.org/software/colord/releases/colord-${PV}.tar.xz" +SRC_URI[md5sum] = "f032ecac927e9078c41fff97800441e8" +SRC_URI[sha256sum] = "9a8e669ee1ea31632bee636cc57353f703c2ea9b64cd6e02bbaabe9a1e549df7" + +inherit meson meson-exe-wrapper pkgconfig systemd useradd gettext gobject-introspection + +DEPENDS = "glib-2.0-native lcms libgusb libgudev polkit" +EXTRA_OEMESON = "-Dargyllcms_sensor=false -Dman=false -Ddocs=false -Ddaemon_user=colord -Dbash_completion=false -Dtests=false --buildtype=release" + +PACKAGES += "${PN}-plugins" + +FILES_${PN} += "\ + ${datadir}/glib-2.0/schemas \ + ${datadir}/polkit-1 \ + ${datadir}/dbus-1 \ + ${datadir}/color/icc/colord \ + ${libdir}/tmpfiles.d \ + ${systemd_user_unitdir}/colord-session.service \ +" +SYSTEMD_SERVICE_${PN} = "colord.service" + +FILES_${PN}-plugins = "\ + ${libdir}/colord-plugins \ + ${libdir}/colord-sensors \ +" +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system --home /var/lib/colord --no-create-home --shell /bin/false --user-group colord" + diff --git a/meta-gnome/recipes-freedesktop/plymouth/plymouth_0.9.3.bb b/meta-gnome/recipes-freedesktop/plymouth/plymouth_0.9.4.bb similarity index 95% rename from meta-gnome/recipes-freedesktop/plymouth/plymouth_0.9.3.bb rename to meta-gnome/recipes-freedesktop/plymouth/plymouth_0.9.4.bb index 71e6bbe..3cfe411 100644 --- a/meta-gnome/recipes-freedesktop/plymouth/plymouth_0.9.3.bb +++ b/meta-gnome/recipes-freedesktop/plymouth/plymouth_0.9.4.bb @@ -17,8 +17,8 @@ PROVIDES = "virtual/psplash" RPROVIDES_${PN} = "virtual-psplash virtual-psplash-support" SRC_URI = "http://www.freedesktop.org/software/plymouth/releases/${BPN}-${PV}.tar.xz file://plymouthd.conf file://subgraph.png" -SRC_URI[md5sum] = "b261c720888a5431cdfce8494805eab3" -SRC_URI[sha256sum] = "9f8dd08a90ceaf6228dcd8c27759adf18fc9482f15b6c56dcbcced268b4e4a74" +SRC_URI[md5sum] = "4efa5551d230165981b105e7c6a50aa7" +SRC_URI[sha256sum] = "4a197a4f1a05785d7453dd829b231352fb2d09171bd86c5ffaafbb2dd6791351" EXTRA_OECONF += " --enable-shared --disable-static --disable-gtk --disable-documentation \ --with-logo=${LOGO} \ diff --git a/meta-gnome/recipes-freedesktop/polkit/polkit/0001-make-netgroup-support-configurable.patch b/meta-gnome/recipes-freedesktop/polkit/polkit/0001-make-netgroup-support-configurable.patch index 4e3af87..3b0ef5e 100644 --- a/meta-gnome/recipes-freedesktop/polkit/polkit/0001-make-netgroup-support-configurable.patch +++ b/meta-gnome/recipes-freedesktop/polkit/polkit/0001-make-netgroup-support-configurable.patch @@ -12,16 +12,19 @@ Signed-off-by: Khem Raj --- Upstream-Status: Pending +Rebase to 0.115 +Signed-off-by: Hongxu Jia +--- configure.ac | 2 +- src/polkitbackend/polkitbackendinteractiveauthority.c | 6 +++++- - src/polkitbackend/polkitbackendjsauthority.c | 5 ++--- - 3 files changed, 8 insertions(+), 5 deletions(-) + src/polkitbackend/polkitbackendjsauthority.cpp | 2 ++ + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index 07982d1..21590b2 100644 +index 8b3e1b1..1c392df 100644 --- a/configure.ac +++ b/configure.ac -@@ -158,7 +158,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXPAT_LIBS="-lexpat"], +@@ -99,7 +99,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXPAT_LIBS="-lexpat"], [AC_MSG_ERROR([Can't find expat library. Please install expat.])]) AC_SUBST(EXPAT_LIBS) @@ -31,10 +34,10 @@ index 07982d1..21590b2 100644 if test "x$GCC" = "xyes"; then LDFLAGS="-Wl,--as-needed $LDFLAGS" diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c -index 7019356..cf39d77 100644 +index cb6fdab..de3f752 100644 --- a/src/polkitbackend/polkitbackendinteractiveauthority.c +++ b/src/polkitbackend/polkitbackendinteractiveauthority.c -@@ -2213,7 +2213,7 @@ get_users_in_group (PolkitIdentity *group, +@@ -2224,7 +2224,7 @@ get_users_in_group (PolkitIdentity *group, out: return ret; } @@ -43,7 +46,7 @@ index 7019356..cf39d77 100644 static GList * get_users_in_net_group (PolkitIdentity *group, gboolean include_root) -@@ -2270,6 +2270,8 @@ get_users_in_net_group (PolkitIdentity *group, +@@ -2285,6 +2285,8 @@ get_users_in_net_group (PolkitIdentity *group, return ret; } @@ -52,7 +55,7 @@ index 7019356..cf39d77 100644 /* ---------------------------------------------------------------------------------------------------- */ static void -@@ -2355,10 +2357,12 @@ authentication_agent_initiate_challenge (AuthenticationAgent *agent, +@@ -2369,10 +2371,12 @@ authentication_agent_initiate_challenge (AuthenticationAgent *agent, { user_identities = g_list_concat (user_identities, get_users_in_group (identity, FALSE)); } @@ -65,43 +68,26 @@ index 7019356..cf39d77 100644 else { g_warning ("Unsupported identity"); -diff --git a/src/polkitbackend/polkitbackendjsauthority.c b/src/polkitbackend/polkitbackendjsauthority.c -index 097dcc5..e59b3f7 100644 ---- a/src/polkitbackend/polkitbackendjsauthority.c -+++ b/src/polkitbackend/polkitbackendjsauthority.c -@@ -1498,7 +1498,6 @@ js_polkit_spawn (JSContext *cx, - - /* ---------------------------------------------------------------------------------------------------- */ - -- - static JSBool - js_polkit_user_is_in_netgroup (JSContext *cx, - unsigned argc, -@@ -1518,6 +1517,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, - user = JS_EncodeString (cx, user_str); - netgroup = JS_EncodeString (cx, netgroup_str); +diff --git a/src/polkitbackend/polkitbackendjsauthority.cpp b/src/polkitbackend/polkitbackendjsauthority.cpp +index 517f3c6..6042dd2 100644 +--- a/src/polkitbackend/polkitbackendjsauthority.cpp ++++ b/src/polkitbackend/polkitbackendjsauthority.cpp +@@ -1502,6 +1502,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, + user = JS_EncodeString (cx, args[0].toString()); + netgroup = JS_EncodeString (cx, args[1].toString()); +#if defined HAVE_INNETGR if (innetgr (netgroup, NULL, /* host */ user, -@@ -1525,6 +1525,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, +@@ -1509,6 +1510,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, { - is_in_netgroup = JS_TRUE; + is_in_netgroup = true; } +#endif JS_free (cx, netgroup); JS_free (cx, user); -@@ -1536,8 +1537,6 @@ js_polkit_user_is_in_netgroup (JSContext *cx, - return ret; - } - -- -- - /* ---------------------------------------------------------------------------------------------------- */ - - typedef struct -- -2.7.0 +2.7.4 diff --git a/meta-gnome/recipes-freedesktop/polkit/polkit/polkit-1_pam.patch b/meta-gnome/recipes-freedesktop/polkit/polkit/polkit-1_pam.patch index 74647ef..c491abf 100644 --- a/meta-gnome/recipes-freedesktop/polkit/polkit/polkit-1_pam.patch +++ b/meta-gnome/recipes-freedesktop/polkit/polkit/polkit-1_pam.patch @@ -4,9 +4,18 @@ Upstream-Status:Inappropriate [configuration] Signed-off-by: Xiaofeng Yan ---- a/configure.ac 2011-03-04 02:26:20.000000000 +0800 -+++ b/configure.ac.new 2011-07-18 10:14:12.516818852 +0800 -@@ -350,10 +350,10 @@ +Upstream-Status: Inappropriate [oe specific] +Rebase to 0.115 +Signed-off-by: Hongxu Jia +--- + configure.ac | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 36df239..8b3e1b1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -471,10 +471,10 @@ elif test x$with_os_type = xfreebsd -o x$with_os_type = xnetbsd; then PAM_FILE_INCLUDE_PASSWORD=system PAM_FILE_INCLUDE_SESSION=system else @@ -21,3 +30,6 @@ Signed-off-by: Xiaofeng Yan fi AC_SUBST(PAM_FILE_INCLUDE_AUTH) +-- +2.7.4 + diff --git a/meta-gnome/recipes-freedesktop/polkit/polkit_0.113.bb b/meta-gnome/recipes-freedesktop/polkit/polkit_0.115.bb similarity index 77% rename from meta-gnome/recipes-freedesktop/polkit/polkit_0.113.bb rename to meta-gnome/recipes-freedesktop/polkit/polkit_0.115.bb index 9a9c61d..ad0f66a 100644 --- a/meta-gnome/recipes-freedesktop/polkit/polkit_0.113.bb +++ b/meta-gnome/recipes-freedesktop/polkit/polkit_0.115.bb @@ -5,7 +5,7 @@ LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \ file://src/polkit/polkit.h;beginline=1;endline=20;md5=0a8630b0133176d0504c87a0ded39db4" -DEPENDS = "expat glib-2.0 intltool-native mozjs paxctl-native" +DEPENDS = "expat glib-2.0 intltool-native mozjs" inherit autotools gtk-doc pkgconfig useradd systemd gobject-introspection @@ -17,26 +17,25 @@ PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam" PACKAGECONFIG[systemd] = "--enable-libsystemd-login=yes --with-systemdsystemunitdir=${systemd_unitdir}/system/,--enable-libsystemd-login=no --with-systemdsystemunitdir=,systemd" # there is no --enable/--disable option for consolekit and it's not picked by shlibs, so add it to RDEPENDS -#PACKAGECONFIG[consolekit] = ",,,consolekit" +PACKAGECONFIG[consolekit] = ",,,consolekit" PAM_SRC_URI = "file://polkit-1_pam.patch" -SRC_URI = "git://anongit.freedesktop.org/git/polkit.git;protocol=https \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" -SRCREV="32e9a69c335324a53a2c0ba4e0b513fb044be0fd" +SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \ + file://0001-make-netgroup-support-configurable.patch \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ +" +SRC_URI[md5sum] = "f03b055d6ae5fc8eac76838c7d83d082" +SRC_URI[sha256sum] = "2f87ecdabfbd415c6306673ceadc59846f059b18ef2fce42bac63fe283f12131" -S = "${WORKDIR}/git" - -EXTRA_OECONF = "--with-os-type=moblin --disable-man-pages --enable-examples=no" +EXTRA_OECONF = "--with-os-type=moblin \ + --disable-man-pages \ + --disable-libelogind \ + " do_compile_prepend () { export GIR_EXTRA_LIBS_PATH="${B}/src/polkit/.libs" } -do_install_append() { - paxctl -cmr ${D}${libdir}/polkit-1/polkitd - rm ${D}${sysconfdir}/polkit-1/rules.d/50-default.rules -} - PACKAGES =+ "${PN}-examples" FILES_${PN}_append = " \ @@ -54,4 +53,3 @@ USERADD_PARAM_${PN} = "--system --no-create-home --user-group --home-dir ${sysco SYSTEMD_SERVICE_${PN} = "${BPN}.service" SYSTEMD_AUTO_ENABLE = "disable" -BBCLASSEXTEND="native" diff --git a/meta-gnome/recipes-freedesktop/pulseaudio/pulseaudio/0001-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch b/meta-gnome/recipes-freedesktop/pulseaudio/pulseaudio/0001-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch deleted file mode 100644 index 0391f37..0000000 --- a/meta-gnome/recipes-freedesktop/pulseaudio/pulseaudio/0001-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 0cb66c0c5aafd48b63a755860746e70afb332c8d Mon Sep 17 00:00:00 2001 -From: Tanu Kaskinen -Date: Wed, 24 Jan 2018 03:51:49 +0200 -Subject: [PATCH] memfd-wrappers: only define memfd_create() if not already - defined - -glibc 2.27 is to be released soon, and it will provide memfd_create(). -If glibc provides the function, we must not define it ourselves, -otherwise building fails due to conflict between the two implementations -of the same function. - -BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=104733 ---- -Upstream-Status: Submitted [https://bugs.freedesktop.org/attachment.cgi?id=136927] -Signed-off-by: Khem Raj - - configure.ac | 3 +++ - src/pulsecore/memfd-wrappers.h | 7 ++++--- - 2 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 77b5ff5..3a71fd8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -607,6 +607,9 @@ AS_IF([test "x$enable_memfd" = "xyes" && test "x$HAVE_MEMFD" = "x0"], - [AC_MSG_ERROR([*** Your Linux kernel does not support memfd shared memory. - *** Use linux v3.17 or higher for such a feature.])]) - -+AS_IF([test "x$HAVE_MEMFD" = "x1"], -+ AC_CHECK_FUNCS([memfd_create])) -+ - AC_SUBST(HAVE_MEMFD) - AM_CONDITIONAL([HAVE_MEMFD], [test "x$HAVE_MEMFD" = x1]) - AS_IF([test "x$HAVE_MEMFD" = "x1"], AC_DEFINE([HAVE_MEMFD], 1, [Have memfd shared memory.])) -diff --git a/src/pulsecore/memfd-wrappers.h b/src/pulsecore/memfd-wrappers.h -index 3bed9b2..c7aadfd 100644 ---- a/src/pulsecore/memfd-wrappers.h -+++ b/src/pulsecore/memfd-wrappers.h -@@ -20,13 +20,14 @@ - License along with PulseAudio; if not, see . - ***/ - --#ifdef HAVE_MEMFD -+#if defined(HAVE_MEMFD) && !defined(HAVE_MEMFD_CREATE) - - #include - #include - - /* -- * No glibc wrappers exist for memfd_create(2), so provide our own. -+ * Before glibc version 2.27 there was no wrapper for memfd_create(2), -+ * so we have to provide our own. - * - * Also define memfd fcntl sealing macros. While they are already - * defined in the kernel header file , that file as -@@ -63,6 +64,6 @@ static inline int memfd_create(const char *name, unsigned int flags) { - #define F_SEAL_WRITE 0x0008 /* prevent writes */ - #endif - --#endif /* HAVE_MEMFD */ -+#endif /* HAVE_MEMFD && !HAVE_MEMFD_CREATE */ - - #endif --- -2.16.1 - diff --git a/meta-gnome/recipes-freedesktop/pulseaudio/pulseaudio/volatiles.04_pulse b/meta-gnome/recipes-freedesktop/pulseaudio/pulseaudio/volatiles.04_pulse deleted file mode 100644 index 5b19980..0000000 --- a/meta-gnome/recipes-freedesktop/pulseaudio/pulseaudio/volatiles.04_pulse +++ /dev/null @@ -1,2 +0,0 @@ -# -d pulse pulse 0755 /var/run/pulse none diff --git a/meta-gnome/recipes-freedesktop/pulseaudio/pulseaudio_11.1.bb b/meta-gnome/recipes-freedesktop/pulseaudio/pulseaudio_11.1.bb deleted file mode 100644 index 76101df..0000000 --- a/meta-gnome/recipes-freedesktop/pulseaudio/pulseaudio_11.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -require recipes-multimedia/pulseaudio/pulseaudio.inc - -SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \ - file://volatiles.04_pulse \ - file://0001-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch \ -" -SRC_URI[md5sum] = "390de38231d5cdd6b43ada8939eb74f1" -SRC_URI[sha256sum] = "f2521c525a77166189e3cb9169f75c2ee2b82fa3fcf9476024fbc2c3a6c9cd9e" - -do_compile_prepend() { - mkdir -p ${S}/libltdl - cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl -} - -RDEPENDS_pulseaudio-server_remove = "pulseaudio-module-console-kit" diff --git a/meta-gnome/recipes-freedesktop/pulseaudio/pulseaudio_12.%.bbappend b/meta-gnome/recipes-freedesktop/pulseaudio/pulseaudio_12.%.bbappend new file mode 100644 index 0000000..884089e --- /dev/null +++ b/meta-gnome/recipes-freedesktop/pulseaudio/pulseaudio_12.%.bbappend @@ -0,0 +1 @@ +RDEPENDS_pulseaudio-server_remove = "pulseaudio-module-console-kit" diff --git a/meta-gnome/recipes-gnome/atk/at-spi2-atk_2.26.2.bb b/meta-gnome/recipes-gnome/atk/at-spi2-atk_2.30.0.bb similarity index 53% rename from meta-gnome/recipes-gnome/atk/at-spi2-atk_2.26.2.bb rename to meta-gnome/recipes-gnome/atk/at-spi2-atk_2.30.0.bb index d29d296..eb4be6b 100644 --- a/meta-gnome/recipes-gnome/atk/at-spi2-atk_2.26.2.bb +++ b/meta-gnome/recipes-gnome/atk/at-spi2-atk_2.30.0.bb @@ -3,15 +3,13 @@ HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" -MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" +SRC_URI[archive.md5sum] = "1ad754b90bcb14244b73ca4d0c14d274" +SRC_URI[archive.sha256sum] = "e2e1571004ea7b105c969473ce455a95be4038fb2541471714aeb33a26da8a9a" -SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "355c7916a69513490cb83ad34016b169" -SRC_URI[sha256sum] = "61891f0abae1689f6617a963105a3f1dcdab5970c4a36ded9c79a7a544b16a6e" +DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2" -DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core" - -inherit autotools pkgconfig distro_features_check upstream-version-is-even +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase distro_features_check upstream-version-is-even # The at-spi2-core requires x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-gnome/recipes-gnome/atk/at-spi2-core_2.28.0.bb b/meta-gnome/recipes-gnome/atk/at-spi2-core_2.28.0.bb deleted file mode 100644 index 9ef4d1f..0000000 --- a/meta-gnome/recipes-gnome/atk/at-spi2-core_2.28.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Assistive Technology Service Provider Interface (dbus core)" -HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" - -SRC_URI[archive.md5sum] = "9c42f79636ed1c0e908b7483d789b32e" -SRC_URI[archive.sha256sum] = "42a2487ab11ce43c288e73b2668ef8b1ab40a0e2b4f94e80fca04ad27b6f1c87" - - -DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gobject-introspection gettext systemd distro_features_check upstream-version-is-even -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -#EXTRA_OEMESON = "--buildtype=release -Denable-introspection=yes -Ddbus-daemon=${bindir}" -EXTRA_OEMESON = "--buildtype=release -Denable-introspection=yes -Ddbus_daemon=${bindir}/dbus-daemon" - -FILES_${PN} += "${datadir}/dbus-1/services/*.service \ - ${datadir}/dbus-1/accessibility-services/*.service \ - ${datadir}/defaults/at-spi2 \ - ${systemd_user_unitdir}/at-spi-dbus-bus.service \ - " diff --git a/meta-gnome/recipes-gnome/atk/at-spi2-core_2.30.0.bb b/meta-gnome/recipes-gnome/atk/at-spi2-core_2.30.0.bb new file mode 100644 index 0000000..536431f --- /dev/null +++ b/meta-gnome/recipes-gnome/atk/at-spi2-core_2.30.0.bb @@ -0,0 +1,39 @@ +SUMMARY = "Assistive Technology Service Provider Interface (dbus core)" +HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" + +MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" + +SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ + " + +SRC_URI[md5sum] = "d4f22c66b3210ffe6b10d01c04e008b5" +SRC_URI[sha256sum] = "0175f5393d19da51f4c11462cba4ba6ef3fa042abf1611a70bdfed586b7bfb2b" + +DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst" + +inherit meson gtk-doc gettext systemd pkgconfig distro_features_check upstream-version-is-even gobject-introspection +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_OEMESON = " -Dsystemd_user_dir=${systemd_user_unitdir} \ + -Ddbus_daemon=${bindir}" + +GTKDOC_ENABLE_FLAG = "-Denable_docs=true" +GTKDOC_DISABLE_FLAG = "-Denable_docs=false" + +GI_ENABLE_FLAG = "-Denable-introspection=yes" +GI_DISABLE_FLAG = "-Denable-introspection=no" + +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ + '${GI_DISABLE_FLAG}', d)} " + +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ + '${GTKDOC_DISABLE_FLAG}', d)} " + +FILES_${PN} += "${datadir}/dbus-1/services/*.service \ + ${datadir}/dbus-1/accessibility-services/*.service \ + ${datadir}/defaults/at-spi2 \ + ${systemd_user_unitdir}/at-spi-dbus-bus.service \ + " diff --git a/meta-gnome/recipes-gnome/atk/atk/0001-Switch-from-filename-to-basename.patch b/meta-gnome/recipes-gnome/atk/atk/0001-Switch-from-filename-to-basename.patch new file mode 100644 index 0000000..047e81f --- /dev/null +++ b/meta-gnome/recipes-gnome/atk/atk/0001-Switch-from-filename-to-basename.patch @@ -0,0 +1,38 @@ +Upstream-Status: Submitted + +From 0330251715fee908f2f162565d4fa1df5030d0c0 Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Thu, 14 Jun 2018 17:21:49 +0000 +Subject: [PATCH] Switch from filename to basename + +When atk-enum-types.h is installed in to a system, the user likely has +no access to the location where the headers were built, especially if +the software was built in a sysroot environment. If the headers were +built for a mulitlib environment, the build pathing may be different. +Subsequently, if two mulitlib variants of atk are installed together the +headers conflict for no other reason then they were built in two +different locations. Switching from filename to basename, still should +provide sufficient information on the providence of the enums, while not +conflicting for really no good reason. + +Signed-off-by: Jeremy Puhlman +--- + atk/atk-enum-types.h.template | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/atk/atk-enum-types.h.template b/atk/atk-enum-types.h.template +index 7b4cec4..8321c24 100644 +--- a/atk/atk-enum-types.h.template ++++ b/atk/atk-enum-types.h.template +@@ -14,7 +14,7 @@ G_BEGIN_DECLS + + /*** BEGIN file-production ***/ + +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +-- +2.14.1.459.g238e487 + diff --git a/meta-gnome/recipes-gnome/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch b/meta-gnome/recipes-gnome/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch new file mode 100644 index 0000000..e56bac8 --- /dev/null +++ b/meta-gnome/recipes-gnome/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch @@ -0,0 +1,22 @@ +From 2a3300378813ce86d532b3852119b2ef29157755 Mon Sep 17 00:00:00 2001 +From: Bruce Leidl +Date: Sun, 13 Jan 2019 21:04:00 -0500 +Subject: [PATCH] sup + +--- + atk/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/atk/meson.build b/atk/meson.build +index 616a3e6..941ded8 100644 +--- a/atk/meson.build ++++ b/atk/meson.build +@@ -137,7 +137,7 @@ libatk_dep = declare_dependency(link_with: libatk, + dependencies: gobject_dep, + sources: atk_enum_h) + +-if not meson.is_cross_build() and get_option('introspection') ++if get_option('introspection') + gnome.generate_gir(libatk, + sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ], + namespace: 'Atk', diff --git a/meta-gnome/recipes-gnome/atk/atk_2.28.1.bb b/meta-gnome/recipes-gnome/atk/atk_2.28.1.bb deleted file mode 100644 index 32f1335..0000000 --- a/meta-gnome/recipes-gnome/atk/atk_2.28.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Accessibility toolkit for GNOME" -HOMEPAGE = "http://live.gnome.org/GAP/" -BUGTRACKER = "https://bugzilla.gnome.org/" -SECTION = "x11/libs" - -LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://atk/atkutil.c;endline=18;md5=6fd31cd2fdc9b30f619ca8d819bc12d3 \ - file://atk/atk.h;endline=18;md5=fcd7710187e0eae485e356c30d1b0c3b" - -DEPENDS = "glib-2.0" - -inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection - -SRC_URI[archive.md5sum] = "dfb5e7474220afa3f4ca7e45af9f3a11" -SRC_URI[archive.sha256sum] = "cd3a1ea6ecc268a2497f0cd018e970860de24a6d42086919d6bf6c8e8d53f4fc" - -BBCLASSEXTEND = "native" - diff --git a/meta-gnome/recipes-gnome/atk/atk_2.30.0.bb b/meta-gnome/recipes-gnome/atk/atk_2.30.0.bb new file mode 100644 index 0000000..b64f70b --- /dev/null +++ b/meta-gnome/recipes-gnome/atk/atk_2.30.0.bb @@ -0,0 +1,37 @@ +SUMMARY = "Accessibility toolkit for GNOME" +HOMEPAGE = "http://live.gnome.org/GAP/" +BUGTRACKER = "https://bugzilla.gnome.org/" +SECTION = "x11/libs" + +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ + file://atk/atkutil.c;endline=18;md5=6fd31cd2fdc9b30f619ca8d819bc12d3 \ + file://atk/atk.h;endline=18;md5=fcd7710187e0eae485e356c30d1b0c3b" + +# Need gettext-native as Meson can't turn off i18n +DEPENDS = "gettext-native glib-2.0" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection + +GTKDOC_ENABLE_FLAG = "-Denable_docs=true" +GTKDOC_DISABLE_FLAG = "-Denable_docs=false" + +GI_ENABLE_FLAG = "-Ddisable_introspection=false" +GI_DISABLE_FLAG = "-Ddisable_introspection=true" + +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ + '${GI_DISABLE_FLAG}', d)} " + +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ + '${GTKDOC_DISABLE_FLAG}', d)} " + +SRC_URI_append = " \ + file://0001-Switch-from-filename-to-basename.patch \ + file://0001-meson.build-enable-introspection-for-cross-compile.patch \ + " +SRC_URI[archive.md5sum] = "769c85005d392ad17ffbc063f2d26454" +SRC_URI[archive.sha256sum] = "dd4d90d4217f2a0c1fee708a555596c2c19d26fef0952e1ead1938ab632c027b" + +BBCLASSEXTEND = "native" + diff --git a/meta-gnome/recipes-gnome/dconf/dconf/0001-meson.build-do-not-compile-docs.patch b/meta-gnome/recipes-gnome/dconf/dconf/0001-meson.build-do-not-compile-docs.patch new file mode 100644 index 0000000..2f42835 --- /dev/null +++ b/meta-gnome/recipes-gnome/dconf/dconf/0001-meson.build-do-not-compile-docs.patch @@ -0,0 +1,27 @@ +From 50a9133e0b13798640da0b7cd11b5a85e35b2038 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Fri, 23 Nov 2018 16:27:32 +0800 +Subject: [PATCH] meson.build: do not compile docs + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia +--- + meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 04b6d47..46fdbc8 100644 +--- a/meson.build ++++ b/meson.build +@@ -81,7 +81,6 @@ subdir('gdbus') + subdir('gsettings') + subdir('client') + subdir('bin') +-subdir('docs') + subdir('tests') + + meson.add_install_script('meson_post_install.py', gio_module_dir) +-- +2.7.4 + diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.26.1.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.26.1.bb deleted file mode 100644 index d2800a8..0000000 --- a/meta-gnome/recipes-gnome/dconf/dconf_0.26.1.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Low level configuration database backend for GSettings" -HOMEPAGE = "https://wiki.gnome.org/Projects/dconf" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - -SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/dconf/0.26/dconf-${PV}.tar.xz" -SRC_URI[md5sum] = "a3cb67032e060450fa01c1a0f874bb60" -SRC_URI[sha256sum] = "d583b1f7fc93b879e2956acc6a26ea05a445a0002158aeef80c8e378e1414535" - -DEPENDS = "glib-2.0 xmlto-native glib-2.0-native" - -FILES_${PN} += "\ - ${libdir}/gio/modules/libdconfsettings.so \ - ${datadir}/bash-completion/completions/dconf \ - ${datadir}/vala/vapi \ - ${datadir}/dbus-1/services \ -" - -inherit pkgconfig gettext autotools - -EXTRA_OECONF = "--enable-man=no" - -BBCLASSEXTEND= "native" diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.27.1.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.27.1.bb deleted file mode 100644 index adaa8e7..0000000 --- a/meta-gnome/recipes-gnome/dconf/dconf_0.27.1.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Low level configuration database backend for GSettings" -HOMEPAGE = "https://wiki.gnome.org/Projects/dconf" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - -SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/dconf/0.27/dconf-${PV}.tar.xz" -SRC_URI[archive.md5sum] = "30bb3010ecd36d6e53ddbc40ef4b80ec" -SRC_URI[archive.sha256sum] = "37daf52e68d03ca0b6d0c2e0df7acac64e091074457ae306683b78b5cfa7e9ce" - -DEPENDS = "glib-2.0 xmlto-native glib-2.0-native" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gobject-introspection gettext vala - -FILES_${PN} += "\ - ${libdir}/gio/modules/libdconfsettings.so \ - ${datadir}/bash-completion/completions/dconf \ - ${datadir}/vala/vapi \ - ${datadir}/dbus-1/services \ -" - -BBCLASSEXTEND= "native" diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.30.1.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.30.1.bb new file mode 100644 index 0000000..7b3390d --- /dev/null +++ b/meta-gnome/recipes-gnome/dconf/dconf_0.30.1.bb @@ -0,0 +1,24 @@ +SUMMARY = "configuation database system" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" +SECTION = "x11/gnome" + +SRC_URI[archive.md5sum] = "a959eef51c917b3c57cfbef1448a375e" +SRC_URI[archive.sha256sum] = "549a3a7cc3881318107dc48a7b02ee8f88c9127acaf2d47f7724f78a8f6d02b7" + +DEPENDS = "dbus glib-2.0 xmlto-native glib-2.0-native" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase bash-completion vala + +SRC_URI += "file://0001-meson.build-do-not-compile-docs.patch" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${libdir}/gio/modules/*.so \ +" + +EXTRA_OEMESON_append_class-native = "-Dbash_completion=false" + +BBCLASSEXTEND= "native" diff --git a/meta-gnome/recipes-gnome/gdm/gdm_3.27.92.bb b/meta-gnome/recipes-gnome/gdm/gdm_3.27.92.bb deleted file mode 100644 index b9e64da..0000000 --- a/meta-gnome/recipes-gnome/gdm/gdm_3.27.92.bb +++ /dev/null @@ -1,3 +0,0 @@ -require gdm.inc -SRC_URI[archive.md5sum] = "f8b2156d9cfa9be2d95f34f2ef08c44d" -SRC_URI[archive.sha256sum] = "c1107f8c13df3e54a250d946361b0bcc690fd4f2b22abc39f3e0e26a750ad632" diff --git a/meta-gnome/recipes-gnome/gdm/gdm.inc b/meta-gnome/recipes-gnome/gdm/gdm_3.30.1.bb similarity index 83% rename from meta-gnome/recipes-gnome/gdm/gdm.inc rename to meta-gnome/recipes-gnome/gdm/gdm_3.30.1.bb index 8b8243e..c5851ac 100644 --- a/meta-gnome/recipes-gnome/gdm/gdm.inc +++ b/meta-gnome/recipes-gnome/gdm/gdm_3.30.1.bb @@ -6,10 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit gnomebase useradd gettext pkgconfig autotools gobject-introspection systemd -SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ - file://gdm.conf \ - file://0001-replace-absolute-path-with-staging-path.patch \ - " +SRC_URI[archive.md5sum] = "83094013e224a072f6adc086c034f076" +SRC_URI[archive.sha256sum] = "4b3d11856adf9fc26b43b2742c196e9e9dc2d2a5eff8bb34d906537288e2732f" + +SRC_URI += "\ + file://gdm.conf \ + file://0001-replace-absolute-path-with-staging-path.patch \ +" DEPENDS = "libxcb libxinerama libxau libxdmcp intltool-native glib-2.0 accountsservice libpam libcheck libcanberra gtk+3 libx11 libxi systemd libxext glib-2.0-native dconf-native plymouth" diff --git a/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.25.4.1.bb b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.0.bb similarity index 54% rename from meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.25.4.1.bb rename to meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.0.bb index 26105ca..642e56b 100644 --- a/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.25.4.1.bb +++ b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.0.bb @@ -5,13 +5,13 @@ LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gettext +inherit gnomebase gettext gobject-introspection -SRC_URI[archive.md5sum] = "7315e7ff162dfd01165ba8a284e3eda6" -SRC_URI[archive.sha256sum] = "f10169262c313dfaa21acf00687c01e0aaf52983524648e8b9e8e42c052dd778" +SRC_URI[archive.md5sum] = "98c0a7d175014d5865be7d3f774ef14c" +SRC_URI[archive.sha256sum] = "ea4086b127050250c158beff28dbcdf81a797b3938bb79bbaaecc75e746fbeee" FILES_${PN} += "${datadir}/icons/gnome" DEPENDS = "json-glib libsoup-2.4 glib-2.0 glib-2.0-native" -EXTRA_OEMESON = "-Denable-installed-tests=false -Dintrospection=false -Denable-introspection=false -Denable-gtk-doc=false --buildtype=release" +EXTRA_OEMESON = "-Denable-installed-tests=false -Denable-gtk-doc=false --buildtype=release" diff --git a/meta-gnome/recipes-gnome/gjs/gjs.inc b/meta-gnome/recipes-gnome/gjs/gjs.inc deleted file mode 100644 index a50ccaf..0000000 --- a/meta-gnome/recipes-gnome/gjs/gjs.inc +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "GNOME javascript bindings based on the Spidermonkey javascript engine" -HOMEPAGE = "https://wiki.gnome.org/Projects/Gjs" - -LICENSE = "MIT & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=e7436dd55d7c05a5fa18f8cab10b3a6b \ - file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7" - -inherit gnomebase gettext gobject-introspection - -export GI_DATADIR="${STAGING_DATADIR}/gobject-introspection-1.0" - -DEPENDS = "glib-2.0 gobject-introspection cairo gtk+3 mozjs52 glib-2.0-native" -EXTRA_OECONF = "--without-dbus-tests" - diff --git a/meta-gnome/recipes-gnome/gjs/gjs/overriding_introspected_gobject_interface_properties.patch b/meta-gnome/recipes-gnome/gjs/gjs/overriding_introspected_gobject_interface_properties.patch new file mode 100644 index 0000000..0e51bab --- /dev/null +++ b/meta-gnome/recipes-gnome/gjs/gjs/overriding_introspected_gobject_interface_properties.patch @@ -0,0 +1,57 @@ +diff --git a/gi/object.cpp b/gi/object.cpp +index 2b2265da0cc74c2a1b5b027c2566c5f0e334e278..7003273630efcd6a09c302476e95544ad287c853 100644 +--- a/gi/object.cpp ++++ b/gi/object.cpp +@@ -717,7 +717,11 @@ bool ObjectPrototype::lazy_define_gobject_property(JSContext* cx, + JS::RootedValue private_id(cx, JS::StringValue(JSID_TO_STRING(id))); + if (!gjs_define_property_dynamic( + cx, obj, name, "gobject_prop", &ObjectBase::prop_getter, +- &ObjectBase::prop_setter, private_id, GJS_MODULE_PROP_FLAGS)) ++ &ObjectBase::prop_setter, private_id, ++ // Make property configurable so that interface properties can be ++ // overridden by GObject.ParamSpec.override in the class that ++ // implements them ++ GJS_MODULE_PROP_FLAGS & ~JSPROP_PERMANENT)) + return false; + + *resolved = true; +diff --git a/installed-tests/js/testGObjectInterface.js b/installed-tests/js/testGObjectInterface.js +index 9eab97461cca93817ac747060134306ba235a9b1..daefb6831e38725db5c86398569040af942cd714 100644 +--- a/installed-tests/js/testGObjectInterface.js ++++ b/installed-tests/js/testGObjectInterface.js +@@ -84,6 +84,22 @@ const ImplementationOfTwoInterfaces = GObject.registerClass({ + } + }); + ++const ImplementationOfIntrospectedInterface = GObject.registerClass({ ++ Implements: [Gio.Action], ++ Properties: { ++ 'enabled': GObject.ParamSpec.override('enabled', Gio.Action), ++ 'name': GObject.ParamSpec.override('name', Gio.Action), ++ 'state': GObject.ParamSpec.override('state', Gio.Action), ++ 'state-type': GObject.ParamSpec.override('state-type', Gio.Action), ++ 'parameter-type': GObject.ParamSpec.override('parameter-type', ++ Gio.Action) ++ } ++}, class ImplementationOfIntrospectedInterface extends GObject.Object { ++ get name() { ++ return 'inaction'; ++ } ++}); ++ + describe('GObject interface', function () { + it('cannot be instantiated', function () { + expect(() => new AGObjectInterface()).toThrow(); +@@ -247,6 +263,11 @@ describe('GObject interface', function () { + 253, 'testGObjectMustOverrideInterfaceProperties'); + }); + ++ it('can have introspected properties overriden', function() { ++ let obj = new ImplementationOfIntrospectedInterface(); ++ expect(obj.name).toEqual('inaction'); ++ }); ++ + it('can be implemented by a class as well as its parent class', function () { + const SubObject = GObject.registerClass( + class SubObject extends GObjectImplementingGObjectInterface {}); + diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.52.0.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.52.0.bb deleted file mode 100644 index aeaf1c0..0000000 --- a/meta-gnome/recipes-gnome/gjs/gjs_1.52.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require gjs.inc -LIC_FILES_CHKSUM = "file://COPYING;md5=beb29cf17fabe736f0639b09ee6e76fa \ - file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7" -SRC_URI[archive.md5sum] = "5f626919a37b75d1b652be6da8723f41" -SRC_URI[archive.sha256sum] = "5524a045e5e1d34a2a510133c662f2685e15ce26ae2ed699fb5d131b6b04a4ca" -FILES_${PN}-dbg += "${datadir}/gjs-1.0/lsan ${datadir}/gjs-1.0/valgrind" diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.53.4.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.53.4.bb new file mode 100644 index 0000000..dce2dbd --- /dev/null +++ b/meta-gnome/recipes-gnome/gjs/gjs_1.53.4.bb @@ -0,0 +1,24 @@ +SUMMARY = "GNOME javascript bindings based on the Spidermonkey javascript engine" +HOMEPAGE = "https://wiki.gnome.org/Projects/Gjs" + +LICENSE = "MIT & LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=beb29cf17fabe736f0639b09ee6e76fa \ + file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7" + +inherit gnomebase gettext gobject-introspection + +export GI_DATADIR="${STAGING_DATADIR}/gobject-introspection-1.0" + +DEPENDS = "glib-2.0 gobject-introspection cairo gtk+3 mozjs glib-2.0-native" +EXTRA_OECONF = "--without-dbus-tests" + + +SRC_URI[archive.md5sum] = "d38565cf77cdef6ef866e7eb77593632" +SRC_URI[archive.sha256sum] = "c1762329eea3632c74653c49e6c7057079b618d4a3e82803d5a9b2bad70a3a57" + +# https://gitlab.gnome.org/GNOME/gjs/issues/186 +# https://gitlab.gnome.org/GNOME/gjs/issues/187 +SRC_URI += "file://overriding_introspected_gobject_interface_properties.patch" +RDEPENDS_${PN} += "libmozjs" + +FILES_${PN}-dbg += "${datadir}/gjs-1.0/lsan ${datadir}/gjs-1.0/valgrind" diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0_2.56.1.bb b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0_2.56.1.bb deleted file mode 100644 index dc8b25e..0000000 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0_2.56.1.bb +++ /dev/null @@ -1,23 +0,0 @@ -FILESEXTRAPATHS_append = ":${COREBASE}/meta/recipes-core/glib-2.0/glib-2.0" -require recipes-core/glib-2.0/glib.inc - -INSANE_SKIP_${PN} = "version-going-backwards" -SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" - -SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ - file://configure-libtool.patch \ - file://uclibc_musl_translation.patch \ - file://allow-run-media-sdX-drive-mount-if-username-root.patch \ - file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ - file://Enable-more-tests-while-cross-compiling.patch \ - file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ - file://0001-Test-for-pthread_getname_np-before-using-it.patch \ - file://0010-Do-not-hardcode-python-path-into-various-tools.patch \ - " - -SRC_URI_append_class-native = " file://relocate-modules.patch" -SRC_URI[md5sum] = "988af38524804ea1ae6bc9a2bad181ff" -SRC_URI[sha256sum] = "40ef3f44f2c651c7a31aedee44259809b6f03d3d20be44545cd7d177221c0b8d" - - - diff --git a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.28.0.bb b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.30.0.bb similarity index 65% rename from meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.28.0.bb rename to meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.30.0.bb index 1ec675b..f8df1a0 100644 --- a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.28.0.bb +++ b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.30.0.bb @@ -3,9 +3,8 @@ SUMMARY = "Default GNOME desktop background images" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" -SRC_URI[archive.md5sum] = "eca3276373841a0cec2ed582d52a5899" -SRC_URI[archive.sha256sum] = "b25b963d9d1ce076b489ef1e85c6540166f2312c77132f4ec0ecc90f3da8f1e1" - +SRC_URI[archive.md5sum] = "13ecd0e4bb4721a68310948e67dbaaaa" +SRC_URI[archive.sha256sum] = "ece63a2aaf2e9b685721d125b7832fee63749db58743bc147ee92e136896e984" FILES_${PN} += "\ ${datadir}/backgrounds/gnome \ @@ -14,5 +13,3 @@ FILES_${PN} += "\ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gettext - - diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.28.0.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.28.2.bb similarity index 78% rename from meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.28.0.bb rename to meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.28.2.bb index 45a60a6..ce4fa05 100644 --- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.28.0.bb +++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.28.2.bb @@ -4,9 +4,8 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343" -SRC_URI[archive.md5sum] = "75ec82570d0baf18b6cbff86c2712e87" -SRC_URI[archive.sha256sum] = "771472f6df7bf16bdcb2266f4e52b7aa8c5e723509481d734ad22b9ae9fcfe60" - +SRC_URI[archive.md5sum] = "eff705fadd5e0bb44a087d10fcbe34af" +SRC_URI[archive.sha256sum] = "1f4961ac33b5f9ce5e6e01ea2c08ad29cc98ed2b8878e38da867235b28a50732" DEPENDS = "glib-2.0 glib-2.0-native gtk+3 libcanberra libnotify libxml2-native gobject-introspection" @@ -14,6 +13,5 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gobject-introspection gettext FILES_${PN} += "${datadir}/icons" - EXTRA_OEMESON = "--buildtype=release -Denable-introspection=true" diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Make-goa-cups-and-user-accounts-optional.patch b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Make-goa-cups-and-user-accounts-optional.patch index d41768a..18eb2f1 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Make-goa-cups-and-user-accounts-optional.patch +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Make-goa-cups-and-user-accounts-optional.patch @@ -1,25 +1,25 @@ -From e771fb2af8b8e12640f01390d0695f9338142ee5 Mon Sep 17 00:00:00 2001 +From e1efcaf6a1181a0c1538b561dd83e73563b5ee53 Mon Sep 17 00:00:00 2001 From: Bruce Leidl -Date: Thu, 22 Mar 2018 19:50:28 -0400 -Subject: [PATCH] Make goa cups and user accounts optional +Date: Sun, 13 Jan 2019 19:50:40 -0500 +Subject: [PATCH] make goa cups and blah blah -There is also a path leak fix --- - meson.build | 13 +++++++++++++ - meson_options.txt | 4 ++++ + meson.build | 15 ++++++++++++++- + meson_options.txt | 7 ++++++- panels/background/bg-pictures-source.c | 20 ++++++++++++++++++++ panels/background/meson.build | 15 +++++++++++---- panels/meson.build | 15 ++++++++++++--- shell/cc-panel-loader.c | 6 ++++++ - 6 files changed, 66 insertions(+), 7 deletions(-) + tests/meson.build | 2 +- + 7 files changed, 70 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build -index 2d0d45e..a61de4a 100644 +index 2a8519c..b7ce0e5 100644 --- a/meson.build +++ b/meson.build -@@ -97,6 +97,13 @@ libgd = subproject( +@@ -96,6 +96,13 @@ libgvc = subproject( ) - libgd_dep = libgd.get_variable('libgd_dep') + libgvc_dep = libgvc.get_variable('libgvc_dep') +enable_goa = get_option('online_accounts') +enable_cups = get_option('cups') @@ -31,7 +31,7 @@ index 2d0d45e..a61de4a 100644 goa_req_version = '>= 3.25.3' pulse_req_version = '>= 2.0' -@@ -108,7 +115,9 @@ gio_dep = dependency('gio-2.0') +@@ -107,7 +114,9 @@ gio_dep = dependency('gio-2.0') glib_dep = dependency('glib-2.0', version: '>= 2.53.0') gnome_desktop_dep = dependency('gnome-desktop-3.0', version: '>= 3.27.90') gnome_settings_dep = dependency('gnome-settings-daemon', version: '>= 3.25.90') @@ -41,7 +41,7 @@ index 2d0d45e..a61de4a 100644 gsettings_desktop_dep = dependency('gsettings-desktop-schemas', version: '>= 3.27.2') libxml_dep = dependency('libxml-2.0') polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.103') -@@ -129,6 +138,8 @@ common_deps = [ +@@ -128,6 +137,8 @@ common_deps = [ dependency('gtk+-3.0', version: '>= 3.22.20') ] @@ -50,7 +50,7 @@ index 2d0d45e..a61de4a 100644 # Check for CUPS 1.4 or newer cups_dep = dependency('cups', version : '>= 1.4', required: false) assert(cups_dep.found(), 'CUPS 1.4 or newer not found') -@@ -149,6 +160,8 @@ foreach header: check_headers +@@ -148,6 +159,8 @@ foreach header: check_headers assert(cc.has_header(header[1], args: cups_cflags), 'CUPS headers not found: ' + header[1]) endforeach @@ -59,14 +59,25 @@ index 2d0d45e..a61de4a 100644 # Optional dependency for the user accounts panel enable_cheese = get_option('cheese') if enable_cheese +@@ -282,4 +295,4 @@ output += ' NetworkManager (Network panel) ............. ' + host_is_linux.t + output += ' Wacom (Wacom tablet panel) ................. ' + host_is_linux_not_s390.to_string() + '\n' + output += ' Wayland .................................... ' + enable_wayland.to_string() + '\n' + +-message(output) +\ No newline at end of file ++message(output) diff --git a/meson_options.txt b/meson_options.txt -index 7498af4..d5e2548 100644 +index a347168..e0c3b23 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -3,3 +3,7 @@ option('documentation', type: 'boolean', value: false, description: 'build docum +@@ -3,4 +3,9 @@ option('documentation', type: 'boolean', value: false, description: 'build docum option('gnome_session_libexecdir', type: 'string', value: '', description: 'Directory for gnome-session\'s libexecdir') option('ibus', type: 'boolean', value: true, description: 'build with IBus support') - option('wayland', type: 'boolean', value: true, description: 'build with Wayland support') + option('tracing', type: 'boolean', value: false, description: 'add extra debugging information') +-option('wayland', type: 'boolean', value: true, description: 'build with Wayland support') +\ No newline at end of file ++option('wayland', type: 'boolean', value: true, description: 'build with Wayland support') ++ +option('staging_dir', type: 'string', description: 'set staging directory for cross-compile') +option('online_accounts', type: 'boolean', value: false, description: 'build with support for gnome-online-accounts') +option('cups', type: 'boolean', value: false, description: 'build with support for CUPS') @@ -239,7 +250,7 @@ index bb34b69..0db3dae 100644 '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir), '-DDATADIR="@0@"'.format(control_center_datadir), diff --git a/panels/meson.build b/panels/meson.build -index d671c47..a823bc8 100644 +index 37a3436..ba10d34 100644 --- a/panels/meson.build +++ b/panels/meson.build @@ -9,16 +9,13 @@ panels = [ @@ -259,7 +270,7 @@ index d671c47..a823bc8 100644 ] if host_is_linux -@@ -32,6 +29,18 @@ if host_is_linux_not_s390 +@@ -33,6 +30,18 @@ if host_is_linux_not_s390 ] endif @@ -279,32 +290,41 @@ index d671c47..a823bc8 100644 panels_libs = [] foreach cappletname: panels diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c -index 675833c..da96263 100644 +index 6b5c6e3..032a03c 100644 --- a/shell/cc-panel-loader.c +++ b/shell/cc-panel-loader.c -@@ -91,16 +91,22 @@ static struct { - PANEL_TYPE("wifi", cc_wifi_panel_get_type ), +@@ -104,9 +104,13 @@ static struct { + PANEL_TYPE("wifi", cc_wifi_panel_get_type, cc_wifi_panel_static_init_func), #endif - PANEL_TYPE("notifications", cc_notifications_panel_get_type), + PANEL_TYPE("notifications", cc_notifications_panel_get_type, NULL), +#ifdef WITH_GOA - PANEL_TYPE("online-accounts", cc_goa_panel_get_type ), + PANEL_TYPE("online-accounts", cc_goa_panel_get_type, NULL), +#endif - PANEL_TYPE("power", cc_power_panel_get_type ), + PANEL_TYPE("power", cc_power_panel_get_type, NULL), +#ifdef WITH_CUPS - PANEL_TYPE("printers", cc_printers_panel_get_type ), + PANEL_TYPE("printers", cc_printers_panel_get_type, NULL), +#endif - PANEL_TYPE("privacy", cc_privacy_panel_get_type ), - PANEL_TYPE("region", cc_region_panel_get_type ), - PANEL_TYPE("search", cc_search_panel_get_type ), - PANEL_TYPE("sharing", cc_sharing_panel_get_type ), - PANEL_TYPE("sound", cc_sound_panel_get_type ), - PANEL_TYPE("universal-access", cc_ua_panel_get_type ), + PANEL_TYPE("privacy", cc_privacy_panel_get_type, NULL), + PANEL_TYPE("region", cc_region_panel_get_type, NULL), + PANEL_TYPE("search", cc_search_panel_get_type, NULL), +@@ -116,7 +120,9 @@ static struct { + PANEL_TYPE("thunderbolt", cc_bolt_panel_get_type, NULL), + #endif + PANEL_TYPE("universal-access", cc_ua_panel_get_type, NULL), +#ifdef WITH_USER_ACCOUNTS - PANEL_TYPE("user-accounts", cc_user_panel_get_type ), + PANEL_TYPE("user-accounts", cc_user_panel_get_type, NULL), +#endif #ifdef BUILD_WACOM - PANEL_TYPE("wacom", cc_wacom_panel_get_type ), + PANEL_TYPE("wacom", cc_wacom_panel_get_type, cc_wacom_panel_static_init_func), #endif --- -2.16.2 - +diff --git a/tests/meson.build b/tests/meson.build +index 7c894e4..cc2031c 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -3,5 +3,5 @@ subdir('common') + #if host_is_linux + # subdir('network') + #endif +-subdir('printers') ++#subdir('printers') + subdir('info') diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-build-Fix-USER_DIR_MODE-value-in-config.h.patch b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-build-Fix-USER_DIR_MODE-value-in-config.h.patch deleted file mode 100644 index 01922fe..0000000 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-build-Fix-USER_DIR_MODE-value-in-config.h.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 37a6b940cb83d97b808da77f397e34100beb263f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= -Date: Sat, 14 Apr 2018 23:06:40 +0200 -Subject: [PATCH] build: Fix `USER_DIR_MODE` value in config.h - -meson defines `USER_DIR_MODE` with a raw octal value to be used as -the default permissions when creating the user's configuration -directory. - -However, meson does not support raw octal values[0], so the define -misses the initial `0` value. Due to this, the directory is created -with wrong permissions. - -This has been changed to use the octal value as a string in meson, -so the definition has the proper value. - -Fixes #49 - -[0] https://github.com/mesonbuild/meson/issues/2047 ---- - meson.build | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index fb74d04d1..ae1a897b3 100644 ---- a/meson.build -+++ b/meson.build -@@ -44,7 +44,9 @@ foreach define: set_defines - config_h.set_quoted(define[0], define[1]) - endforeach - --config_h.set('USER_DIR_MODE', 0700, -+# meson does not support octal values, so it must be handled as a -+# string. See: https://github.com/mesonbuild/meson/issues/2047 -+config_h.set('USER_DIR_MODE', '0700', - description: 'Permissions for creating the user\'s config, cache and data directories') - - # compiler flags --- -2.19.1 - diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.28.0.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.30.1.bb similarity index 86% rename from meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.28.0.bb rename to meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.30.1.bb index a2b3880..089680b 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.28.0.bb +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.30.1.bb @@ -2,13 +2,12 @@ SUMMARY = "GNOME desktop configuration UI" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" -SRC_URI[archive.md5sum] = "a717df964cf2cd6798358032932986bc" -SRC_URI[archive.sha256sum] = "03768b7b543caf9c534118287f9f55c375cb9886c0b3961311c0cf2ca82ddd5b" +SRC_URI[archive.md5sum] = "79a63122f715d4a8d43dce9f38066e86" +SRC_URI[archive.sha256sum] = "2b1f9bb794cf57838f8340ac8b0e30e6a924c6a3de50c8f2af5f64d6609569bb" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gettext - DEPENDS = "pulseaudio colord-gtk networkmanager ibus colord gnome-desktop gnome-settings-daemon polkit libcanberra gdk-pixbuf fontconfig gtk+3 glib-2.0 intltool-native upower libpwquality cairo libxml2 libgudev libsoup-2.4 libxi libwacom libx11 libgtop gnome-common-native autoconf-archive-native wayland accountsservice modemmanager network-manager-applet gnome-bluetooth clutter-1.0 clutter-gtk gsettings-desktop-schemas glib-2.0-native libxml2-native" # @@ -31,9 +30,7 @@ DEPENDS = "pulseaudio colord-gtk networkmanager ibus colord gnome-desktop gnome- # EXTRA_OEMESON += "-Duser_accounts=true" # DEPENDS += "accountsservice krb5" # -SRC_URI += "file://0001-Make-goa-cups-and-user-accounts-optional.patch \ - file://0001-build-Fix-USER_DIR_MODE-value-in-config.h.patch \ - " +SRC_URI += "file://0001-Make-goa-cups-and-user-accounts-optional.patch" FILES_${PN} += "\ ${datadir}/bash-completion \ diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch deleted file mode 100644 index e95393c..0000000 --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 834bc861921fe0361f2d6a5b5716fc97a9519478 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Thu, 6 Jul 2017 13:13:45 +0300 -Subject: [PATCH] configure.ac: Remove gnome-common macro calls - -gnome-common is deprecated and these aren't doing much for us. - -Upstreamable fix would probably involve using autoconf-archive: -Trying to avoid that dependency for now. - -Upstream-Status: Inappropriate -Signed-off-by: Jussi Kukkonen ---- - configure.ac | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7adcf0e..bb7659d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -71,9 +71,6 @@ AC_SUBST(GNOME_DATE) - AC_SUBST(GNOME_DATE_COMMENT_START) - AC_SUBST(GNOME_DATE_COMMENT_END) - --GNOME_COMPILE_WARNINGS([maximum]) --GNOME_MAINTAINER_MODE_DEFINES -- - AC_ARG_ENABLE(deprecation_flags, - [AC_HELP_STRING([--enable-deprecation-flags], - [use *_DISABLE_DEPRECATED flags @<:@default=no@:>@])],, --- -2.1.4 - diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch deleted file mode 100644 index c1a7d4f..0000000 --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 9048939b76b3bd10783adb79ed0aaf6cd13895cc Mon Sep 17 00:00:00 2001 -From: Christopher Larson -Date: Tue, 13 Dec 2016 20:39:51 -0700 -Subject: [PATCH 1/2] gnome-desktop-thumbnail: don't convert time_t to long - -Explicitly use strftime+strptime rather than snprintf+atol. This fixes the -build for X32, where long's size doesn't match that of time_t. - -Upstream-Status: Pending -Signed-off-by: Christopher Larson - ---- - libgnome-desktop/gnome-desktop-thumbnail.c | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -diff --git a/libgnome-desktop/gnome-desktop-thumbnail.c b/libgnome-desktop/gnome-desktop-thumbnail.c -index e56c3d7..5d96bf3 100644 ---- a/libgnome-desktop/gnome-desktop-thumbnail.c -+++ b/libgnome-desktop/gnome-desktop-thumbnail.c -@@ -120,6 +120,8 @@ - * Since: 2.2 - */ - -+#define _XOPEN_SOURCE -+ - #include - - #include -@@ -1105,6 +1107,7 @@ save_thumbnail (GdkPixbuf *pixbuf, - char *tmp_path = NULL; - int tmp_fd; - char mtime_str[21]; -+ struct tm *tmp_mtime = NULL; - gboolean ret = FALSE; - GError *error = NULL; - const char *width, *height; -@@ -1124,7 +1127,11 @@ save_thumbnail (GdkPixbuf *pixbuf, - goto out; - close (tmp_fd); - -- g_snprintf (mtime_str, 21, "%" G_GINT64_FORMAT, (gint64) mtime); -+ tmp_mtime = localtime (&mtime); -+ if (!tmp_mtime) -+ goto out; -+ strftime (mtime_str, 21, "%s", tmp_mtime); -+ free (tmp_mtime); - width = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Width"); - height = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Height"); - -@@ -1319,6 +1326,7 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf, - { - const char *thumb_uri, *thumb_mtime_str; - time_t thumb_mtime; -+ struct tm tmp_mtime; - - thumb_uri = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::URI"); - if (g_strcmp0 (uri, thumb_uri) != 0) -@@ -1327,7 +1335,11 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf, - thumb_mtime_str = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::MTime"); - if (!thumb_mtime_str) - return FALSE; -- thumb_mtime = atol (thumb_mtime_str); -+ if (!strptime (thumb_mtime_str, "%s", &tmp_mtime)) -+ return FALSE; -+ thumb_mtime = mktime (&tmp_mtime); -+ if (!thumb_mtime) -+ return FALSE; - if (mtime != thumb_mtime) - return FALSE; - --- -2.14.1 - diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.28.0.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.28.0.bb deleted file mode 100644 index ae79af4..0000000 --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.28.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require gnome-desktop.inc -SRC_URI[archive.md5sum] = "3e7b67578307220a21688f28307b6789" -SRC_URI[archive.sha256sum] = "f1df71c39e32147f6d58f53a9c05b964b00b7c98fbca090419355437c72fd59d" - - diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop.inc b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.30.2.bb similarity index 84% rename from meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop.inc rename to meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.30.2.bb index d0ed0c0..e65deed 100644 --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop.inc +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.30.2.bb @@ -4,7 +4,10 @@ LICENSE = "GPLv2 & LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" -inherit gnome pkgconfig upstream-version-is-even gobject-introspection +inherit gnome pkgconfig upstream-version-is-even gobject-introspection gettext + +SRC_URI[archive.md5sum] = "afcee5e8506bcdc1daaac9e6c3682685" +SRC_URI[archive.sha256sum] = "5475e693cb7ada801a36e8d16bc0dbb58930b793f455419b205cd9241d63d14c" DEPENDS += "intltool-native gsettings-desktop-schemas gconf virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes udev libseccomp gnome-common-native autoconf-archive-native" @@ -18,3 +21,5 @@ PACKAGES =+ "libgnome-desktop" FILES_libgnome-desktop = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml" RRECOMMENDS_libgnome-desktop += "gsettings-desktop-schemas" + + diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.28.0.1.bb b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.28.0.1.bb deleted file mode 100644 index 8bec0c2..0000000 --- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.28.0.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -require gnome-keyring.inc -SRC_URI[archive.md5sum] = "e78cb39f006022a50ccfce1e0806c34e" -SRC_URI[archive.sha256sum] = "d17c996f0917d9fb9d86492d8ff6e834fe76e3231ec355f7016b29d2f960bd63" - diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring.inc b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.28.2.bb similarity index 78% rename from meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring.inc rename to meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.28.2.bb index 1101470..45259a5 100644 --- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring.inc +++ b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.28.2.bb @@ -5,6 +5,11 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" +inherit gettext gnome + +SRC_URI[archive.md5sum] = "284580f954f762caf62aed2ae7358177" +SRC_URI[archive.sha256sum] = "81171b7d07211b216b4c9bb79bf2deb3deca18fe8d56d46dda1c4549b4a2646a" + DEPENDS = "gcr intltool-native glib-2.0-native libpam" RDEPENDS_${PN} = "gcr libpam" FILES_${PN} += "\ @@ -14,7 +19,5 @@ FILES_${PN} += "\ ${datadir}/dbus-1 \ " -inherit gettext gnome - EXTRA_OECONF = "--disable-doc --disable-ssh-agent" diff --git a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.28.0.bb b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.28.0.bb deleted file mode 100644 index de64a2c..0000000 --- a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.28.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=34c88b124db5fb2762c1676be7dadd36" - -SRC_URI[archive.md5sum] = "25827cac1609cf1b5a089d9615d47d86" -SRC_URI[archive.sha256sum] = "87bc4ef307604f1ce4f09f6e5c9996ef8d37ca5e0a3bf76f6b27d71844adb40c" - -DEPENDS = "libxml2 libsoup-2.4 libsecret gcr json-glib gtk+3 glib-2.0 glib-2.0-native xmlto-native webkitgtk rest" - -inherit gnome gettext gobject-introspection vala - -EXTRA_OECONF = "--disable-Werror" - diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session/dont-check-for-have-xtrans.patch b/meta-gnome/recipes-gnome/gnome-session/gnome-session/dont-check-for-have-xtrans.patch deleted file mode 100644 index 80dad91..0000000 --- a/meta-gnome/recipes-gnome/gnome-session/gnome-session/dont-check-for-have-xtrans.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 1ece66e683258a0bfa044d074becfe207d04a748 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Wed, 21 Mar 2018 15:19:44 -0400 -Subject: xsmp: don't check for HAVE_XTRANS - -It's not set anymore since the meson switch. -Instead require the xtrans.pc file to be around. - -https://bugzilla.gnome.org/show_bug.cgi?id=794575 ---- - gnome-session/gsm-xsmp-server.c | 6 ------ - meson.build | 2 ++ - 2 files changed, 2 insertions(+), 6 deletions(-) - -diff --git a/gnome-session/gsm-xsmp-server.c b/gnome-session/gsm-xsmp-server.c -index 1460a28..d558f9b 100644 ---- a/gnome-session/gsm-xsmp-server.c -+++ b/gnome-session/gsm-xsmp-server.c -@@ -39,14 +39,12 @@ - #include - #include - --#if HAVE_XTRANS - /* Get the proto for _IceTransNoListen */ - #define ICE_t - #define TRANS_SERVER - #include - #undef ICE_t - #undef TRANS_SERVER --#endif /* HAVE_XTRANS */ - - #include "gsm-xsmp-server.h" - #include "gsm-xsmp-client.h" -@@ -582,7 +580,6 @@ setup_listener (GsmXsmpServer *server) - gsm_util_init_error (TRUE, "Could not initialize libSM: %s", error); - } - --#if HAVE_XTRANS - /* By default, IceListenForConnections will open one socket for each - * transport type known to X. We don't want connections from remote - * hosts, so for security reasons it would be best if ICE didn't -@@ -592,7 +589,6 @@ setup_listener (GsmXsmpServer *server) - * guess. - */ - _IceTransNoListen ("tcp"); --#endif - - /* Create the XSMP socket. Older versions of IceListenForConnections - * have a bug which causes the umask to be set to 0 on certain types -@@ -634,7 +630,6 @@ setup_listener (GsmXsmpServer *server) - gsm_util_init_error (TRUE, "IceListenForConnections did not return a local listener!"); - } - --#ifdef HAVE_XTRANS - if (server->priv->num_local_xsmp_sockets != server->priv->num_xsmp_sockets) { - /* Xtrans was apparently compiled with support for some - * non-local transport besides TCP (which we disabled above); we -@@ -653,7 +648,6 @@ setup_listener (GsmXsmpServer *server) - network_id_list); - free (network_id_list); - } --#endif - - /* Update .ICEauthority with new auth entries for our socket */ - if (!update_iceauthority (server, TRUE)) { -diff --git a/meson.build b/meson.build -index 9eb36a4..6f6d051 100644 ---- a/meson.build -+++ b/meson.build -@@ -95,6 +95,7 @@ glib_req_version = '>= 2.46.0' - gio_dep = dependency('gio-2.0', version: glib_req_version) - glib_dep = dependency('glib-2.0', version: glib_req_version) - gtk_dep = dependency('gtk+-3.0', version: '>= 3.18.0') -+xtrans_dep = dependency('xtrans') - ice_dep = dependency('ice') - sm_dep = dependency('sm') - x11_dep = dependency('x11') -@@ -107,6 +108,7 @@ session_deps = [ - ] - - session_bin_deps = session_deps + [ -+ xtrans_dep, - ice_dep, - sm_dep - ] --- -cgit v0.12 - diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.27.92.bb b/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.27.92.bb deleted file mode 100644 index bad0270..0000000 --- a/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.27.92.bb +++ /dev/null @@ -1,10 +0,0 @@ -require gnome-session.inc -SRC_URI[archive.md5sum] = "ceed281645d1f98768de957dc8e79ee6" -SRC_URI[archive.sha256sum] = "2e935ae2cacca2e1a7bff22bbe799797c74f79a33261093ceb3fd514b39bd14d" - -# https://bugzilla.gnome.org/show_bug.cgi?id=794757 -SRC_URI += "file://dont-check-for-have-xtrans.patch" - -EXTRA_OEMESON = "-Denable-docbook=false -Denable-man=false" -inherit meson - diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session.inc b/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.30.1.bb similarity index 62% rename from meta-gnome/recipes-gnome/gnome-session/gnome-session.inc rename to meta-gnome/recipes-gnome/gnome-session/gnome-session_3.30.1.bb index e482ca8..1a88c4a 100644 --- a/meta-gnome/recipes-gnome/gnome-session/gnome-session.inc +++ b/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.30.1.bb @@ -3,17 +3,20 @@ HOMEPAGE = "https://wiki.gnome.org/Projects/SessionManagement" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -def gnome_verdir(v): - return oe.utils.trim_version(v, 2) +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase meson -GNOMEBN ?= "${BPN}" -SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.xz;name=archive" +SRC_URI[archive.md5sum] = "45c33dfaad7d40c008f8131aff2e0391" +SRC_URI[archive.sha256sum] = "eafe85972689186c7c6b5fe1d3bb4dc204a1e0e6b6e763e24b8fb43a40c07739" DEPENDS = "glib-2.0-native intltool-native xmlto-native glib-2.0 gnome-desktop json-glib" RDEPENDS_${PN} = "gnome-settings-daemon" + FILES_${PN} += "\ ${datadir}/xsessions \ ${datadir}/glib-2.0/schemas \ ${datadir}/GConf \ ${datadir}/wayland-sessions \ " +EXTRA_OEMESON = "-Denable-docbook=false -Denable-man=false" + diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.28.0.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.30.1.2.bb similarity index 57% rename from meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.28.0.bb rename to meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.30.1.2.bb index c5ed663..041cd11 100644 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.28.0.bb +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.30.1.2.bb @@ -13,14 +13,14 @@ FILES_${PN} += "\ FILES_${PN}-staticdev += "${libdir}/gnome-settings-daemon-3.0/libgsd.a" +SRC_URI[archive.md5sum] = "bdac5b7329f919f7172f1feb240e48d8" +SRC_URI[archive.sha256sum] = "5cdcf64f6e41fe1816e719850709e8e7a53a11460955f2be77fcee9c80812d1d" -SRC_URI[archive.md5sum] = "508f36ade9b97afebd32a3437b1a4c56" -SRC_URI[archive.sha256sum] = "de3eeef55c8736cbb8c25fcda2e861879a3b612931758fe1387f61a288636cdc" GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gobject-introspection gettext +inherit gnomebase gobject-introspection gettext meson-exe-wrapper -EXTRA_OEMESON = "--buildtype=release -Dcups=false" +EXTRA_OEMESON += "--buildtype=release -Dcups=false " # This probably belongs in meson.bbclass @@ -30,22 +30,22 @@ EXTRA_OEMESON = "--buildtype=release -Dcups=false" # 2) add exe_wrapper line to the end of [binaries] section in the # meson.cross file that meson.bbclass generated # -setup_wrapper() { - if [ ! -e ${B}/wrapper ]; then - cat > ${B}/wrapper << EOF +#setup_wrapper() { +# if [ ! -e ${B}/wrapper ]; then +# cat > ${B}/wrapper << EOF #!/bin/sh -${STAGING_LIBDIR}/ld-linux-x86-64.so.2 --library-path ${STAGING_LIBDIR} \$@ -EOF - chmod +x ${B}/wrapper - fi +#${STAGING_LIBDIR}/ld-linux-x86-64.so.2 --library-path ${STAGING_LIBDIR} \$@ +#EOF +# chmod +x ${B}/wrapper +# fi +# +# if ! grep -q "^exe_wrapper" ${WORKDIR}/meson.cross; then +# cat ${WORKDIR}/meson.cross | sed "/pkgconfig/ a\ +#exe_wrapper = '${B}/wrapper'" > ${WORKDIR}/meson.cross.tmp +# mv ${WORKDIR}/meson.cross.tmp ${WORKDIR}/meson.cross +# fi +#} - if ! grep -q "^exe_wrapper" ${WORKDIR}/meson.cross; then - cat ${WORKDIR}/meson.cross | sed "/pkgconfig/ a\ -exe_wrapper = '${B}/wrapper'" > ${WORKDIR}/meson.cross.tmp - mv ${WORKDIR}/meson.cross.tmp ${WORKDIR}/meson.cross - fi -} - -do_configure_prepend() { - setup_wrapper -} +#do_configure_prepend() { +# setup_wrapper +#} diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell.inc b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell.inc deleted file mode 100644 index bd46c11..0000000 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell.inc +++ /dev/null @@ -1,57 +0,0 @@ -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -inherit meson gobject-introspection gettext - -def gnome_verdir(v): - return oe.utils.trim_version(v, 2) - -GNOMEBN ?= "${BPN}" -SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.xz;name=archive \ - file://0001-do-no-build-calendar-server.patch \ - file://0001-do-not-use-python-path-from-build-environment.patch \ - file://0001-javascript-invalid-access-fixes.patch \ - file://0001-Disabled-calendar-events-from-user-session.patch \ - " - -DEPENDS = "glib-2.0-native systemd libcanberra gtk+3 glib-2.0 libxml2 libcroco mutter libsoup-2.4 gsettings-desktop-schemas gcr atk polkit startup-notification libx11 gnome-bluetooth libsecret networkmanager gjs mozjs52 network-manager-applet pulseaudio libxml2-native paxctl-native ibus xmlto-native sassc-native" - -RDEPENDS_${PN} = "xserver-xorg-xwayland cantarell-fonts gnome-theme-adwaita gnome-theme-adwaita-dark gnome-control-center gnome-session dconf" - -FILES_${PN} += "\ - ${datadir}/dbus-1 \ - ${datadir}/glib-2.0/schemas \ - ${datadir}/GConf/gsettings \ - ${datadir}/xdg-desktop-portal \ - ${datadir}/gnome-control-center/keybindings \ -" - -MUTTER_DIR = "/usr/lib/mutter" -GIR_SCANNER_NATIVE = "${STAGING_BINDIR_NATIVE}/g-ir-scanner" -GIR_SCRIPT_PATH = "${B}/g-ir-scanner-script" - -# https://github.com/ninja-build/ninja/issues/1002 -write_gir_script () { - cat > ${GIR_SCRIPT_PATH} << EOF -#!/bin/sh -export PKG_CONFIG=pkg-config -export PKG_CONFIG_PATH=\"${PKG_CONFIG_PATH}\" -export XDG_DATA_DIRS=\"${STAGING_DATADIR}\" -export CC="x86_64-oe-linux-gcc --sysroot=${STAGING_DIR_HOST}" -export LD="x86_64-oe-linux-gcc --sysroot=${STAGING_DIR_HOST}" -${STAGING_BINDIR}/g-ir-scanner-wrapper \$@ -EOF - chmod +x ${GIR_SCRIPT_PATH} -} - -do_configure_append () { - write_gir_script - sed --in-place=.old1 "s;=${MUTTER_DIR};=${PKG_CONFIG_SYSROOT_DIR}${MUTTER_DIR};" ${B}/build.ninja - sed --in-place=.old2 "s;COMMAND = ${GIR_SCANNER_NATIVE};COMMAND = ${GIR_SCRIPT_PATH};" ${B}/build.ninja -} - -do_install_append() { - paxctl -cm ${D}${bindir}/gnome-shell -} - -EXTRA_OEMESON = "--buildtype=release -Dbrowser_plugin=false -Dman=false -Dsystemd=true -Dnetworkmanager=true" diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-javascript-invalid-access-fixes.patch b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-javascript-invalid-access-fixes.patch deleted file mode 100644 index 781f910..0000000 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-javascript-invalid-access-fixes.patch +++ /dev/null @@ -1,512 +0,0 @@ -From fa873b3e84f52f2bd1ff397e7cae8bd8b31c700c Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Thu, 22 Mar 2018 22:24:17 -0400 -Subject: [PATCH] javascript invalid access fixes - -Attempt to rebase this -https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/4 ---- - js/ui/dnd.js | 65 +++++++++++++++++++++++++----------------- - js/ui/tweener.js | 69 ++++++++++++++++++++++++++++++++++++--------- - js/ui/workspace.js | 38 +++++++++++++++++-------- - js/ui/workspaceThumbnail.js | 36 +++++++++++++++++------ - 4 files changed, 150 insertions(+), 58 deletions(-) - -diff --git a/js/ui/dnd.js b/js/ui/dnd.js -index a38607c..431c60d 100644 ---- a/js/ui/dnd.js -+++ b/js/ui/dnd.js -@@ -27,6 +27,12 @@ var DragMotionResult = { - CONTINUE: 3 - }; - -+var DragState = { -+ INIT: 0, -+ DRAGGING: 1, -+ CANCELLED: 2, -+}; -+ - var DRAG_CURSOR_MAP = { - 0: Meta.Cursor.DND_UNSUPPORTED_TARGET, - 1: Meta.Cursor.DND_COPY, -@@ -78,6 +84,8 @@ var _Draggable = new Lang.Class({ - dragActorOpacity: undefined }); - - this.actor = actor; -+ this._dragState = DragState.INIT; -+ - if (!params.manualMode) { - this.actor.connect('button-press-event', - this._onButtonPress.bind(this)); -@@ -88,7 +96,7 @@ var _Draggable = new Lang.Class({ - this.actor.connect('destroy', () => { - this._actorDestroyed = true; - -- if (this._dragInProgress && this._dragCancellable) -+ if (this._dragState == DragState.DRAGGING && this._dragCancellable) - this._cancelDrag(global.get_current_time()); - this.disconnectAll(); - }); -@@ -100,7 +108,6 @@ var _Draggable = new Lang.Class({ - this._dragActorOpacity = params.dragActorOpacity; - - this._buttonDown = false; // The mouse button has been pressed and has not yet been released. -- this._dragInProgress = false; // The drag has been started, and has not been dropped or cancelled yet. - this._animationInProgress = false; // The drag is over and the item is in the process of animating to its original position (snapping back or reverting). - this._dragCancellable = true; - -@@ -206,9 +213,10 @@ var _Draggable = new Lang.Class({ - (event.type() == Clutter.EventType.TOUCH_END && - global.display.is_pointer_emulating_sequence(event.get_event_sequence()))) { - this._buttonDown = false; -- if (this._dragInProgress) { -+ if (this._dragState == DragState.DRAGGING) { - return this._dragActorDropped(event); -- } else if (this._dragActor != null && !this._animationInProgress) { -+ } else if ((this._dragActor != null || this._dragState == DragState.CANCELLED) && -+ !this._animationInProgress) { - // Drag must have been cancelled with Esc. - this._dragComplete(); - return Clutter.EVENT_STOP; -@@ -222,14 +230,14 @@ var _Draggable = new Lang.Class({ - } else if (event.type() == Clutter.EventType.MOTION || - (event.type() == Clutter.EventType.TOUCH_UPDATE && - global.display.is_pointer_emulating_sequence(event.get_event_sequence()))) { -- if (this._dragInProgress) { -+ if (this._dragActor && this._dragState == DragState.DRAGGING) { - return this._updateDragPosition(event); -- } else if (this._dragActor == null) { -+ } else if (this._dragActor == null && this._dragState != DragState.CANCELLED) { - return this._maybeStartDrag(event); - } - // We intercept KEY_PRESS event so that we can process Esc key press to cancel - // dragging and ignore all other key presses. -- } else if (event.type() == Clutter.EventType.KEY_PRESS && this._dragInProgress) { -+ } else if (event.type() == Clutter.EventType.KEY_PRESS && this._dragState == DragState.DRAGGING) { - let symbol = event.get_key_symbol(); - if (symbol == Clutter.Escape) { - this._cancelDrag(event.get_time()); -@@ -265,7 +273,7 @@ var _Draggable = new Lang.Class({ - */ - startDrag(stageX, stageY, time, sequence) { - currentDraggable = this; -- this._dragInProgress = true; -+ this._dragState = DragState.DRAGGING; - - // Special-case St.Button: the pointer grab messes with the internal - // state, so force a reset to a reasonable state here -@@ -342,6 +350,13 @@ var _Draggable = new Lang.Class({ - Shell.util_set_hidden_from_pick(this._dragActor, true); - } - -+ this._dragActorDestroyId = this._dragActor.connect('destroy', () => { -+ // Cancel ongoing animation (if any) -+ this._finishAnimation(); -+ -+ this._dragActor = null; -+ this._dragState = DragState.CANCELLED; -+ }); - this._dragOrigOpacity = this._dragActor.opacity; - if (this._dragActorOpacity != undefined) - this._dragActor.opacity = this._dragActorOpacity; -@@ -500,7 +515,7 @@ var _Draggable = new Lang.Class({ - event.get_time())) { - // If it accepted the drop without taking the actor, - // handle it ourselves. -- if (this._dragActor.get_parent() == Main.uiGroup) { -+ if (this._dragActor && this._dragActor.get_parent() == Main.uiGroup) { - if (this._restoreOnSuccess) { - this._restoreDragActor(event.get_time()); - return true; -@@ -508,7 +523,7 @@ var _Draggable = new Lang.Class({ - this._dragActor.destroy(); - } - -- this._dragInProgress = false; -+ this._dragState = DragState.INIT; - global.screen.set_cursor(Meta.Cursor.DEFAULT); - this.emit('drag-end', event.get_time(), true); - this._dragComplete(); -@@ -557,20 +572,22 @@ var _Draggable = new Lang.Class({ - - _cancelDrag(eventTime) { - this.emit('drag-cancelled', eventTime); -- this._dragInProgress = false; -- let [snapBackX, snapBackY, snapBackScale] = this._getRestoreLocation(); -+ let wasCancelled = (this._dragState == DragState.CANCELLED); -+ this._dragState = DragState.CANCELLED; - -- if (this._actorDestroyed) { -+ if (this._actorDestroyed || wasCancelled) { - global.screen.set_cursor(Meta.Cursor.DEFAULT); - if (!this._buttonDown) - this._dragComplete(); - this.emit('drag-end', eventTime, false); -- if (!this._dragOrigParent) -+ if (!this._dragOrigParent && this._dragActor) - this._dragActor.destroy(); - - return; - } - -+ let [snapBackX, snapBackY, snapBackScale] = this._getRestoreLocation(); -+ - this._animateDragEnd(eventTime, - { x: snapBackX, - y: snapBackY, -@@ -581,7 +598,7 @@ var _Draggable = new Lang.Class({ - }, - - _restoreDragActor(eventTime) { -- this._dragInProgress = false; -+ this._dragState = DragState.INIT; - let [restoreX, restoreY, restoreScale] = this._getRestoreLocation(); - - // fade the actor back in at its original location -@@ -596,12 +613,6 @@ var _Draggable = new Lang.Class({ - _animateDragEnd(eventTime, params) { - this._animationInProgress = true; - -- // finish animation if the actor gets destroyed -- // during it -- this._dragActorDestroyId = -- this._dragActor.connect('destroy', -- this._finishAnimation.bind(this)); -- - params['opacity'] = this._dragOrigOpacity; - params['transition'] = 'easeOutQuad'; - params['onComplete'] = this._onAnimationComplete; -@@ -624,9 +635,6 @@ var _Draggable = new Lang.Class({ - }, - - _onAnimationComplete(dragActor, eventTime) { -- dragActor.disconnect(this._dragActorDestroyId); -- this._dragActorDestroyId = 0; -- - if (this._dragOrigParent) { - Main.uiGroup.remove_child(this._dragActor); - this._dragOrigParent.add_actor(this._dragActor); -@@ -641,7 +649,7 @@ var _Draggable = new Lang.Class({ - }, - - _dragComplete() { -- if (!this._actorDestroyed) -+ if (!this._actorDestroyed && this._dragActor) - Shell.util_set_hidden_from_pick(this._dragActor, false); - - this._ungrabEvents(); -@@ -652,7 +660,12 @@ var _Draggable = new Lang.Class({ - this._updateHoverId = 0; - } - -- this._dragActor = undefined; -+ if (this._dragActor) { -+ this._dragActor.disconnect(this._dragActorDestroyId); -+ this._dragActor = null; -+ } -+ -+ this._dragState = DragState.INIT; - currentDraggable = null; - } - }); -diff --git a/js/ui/tweener.js b/js/ui/tweener.js -index 1a85e2f..c9b5018 100644 ---- a/js/ui/tweener.js -+++ b/js/ui/tweener.js -@@ -69,30 +69,73 @@ function _getTweenState(target) { - return target.__ShellTweenerState; - } - -+function _getExtraHandlers(target) { -+ if (!target.__ShellTweenerHandlers) -+ target.__ShellTweenerHandlers = {}; -+ return target.__ShellTweenerHandlers; -+} -+ - function _resetTweenState(target) { - let state = target.__ShellTweenerState; - - if (state) { -- if (state.destroyedId) -+ if (state.destroyedId) { - state.actor.disconnect(state.destroyedId); -+ delete state.destroyedId; -+ } - } - -+ _removeHandler(target, 'onComplete', _tweenCompleted); - target.__ShellTweenerState = {}; - } - - function _addHandler(target, params, name, handler) { -- if (params[name]) { -- let oldHandler = params[name]; -- let oldScope = params[name + 'Scope']; -- let oldParams = params[name + 'Params']; -- let eventScope = oldScope ? oldScope : target; -- -- params[name] = () => { -- oldHandler.apply(eventScope, oldParams); -- handler(target); -- }; -- } else -- params[name] = () => { handler(target); }; -+ let wrapperNeeded = false; -+ let extraHandlers = _getExtraHandlers(target); -+ -+ if (!(name in extraHandlers)) { -+ extraHandlers[name] = []; -+ wrapperNeeded = true; -+ } -+ -+ let handlers = extraHandlers[name]; -+ handlers.push(handler); -+ -+ if (wrapperNeeded) { -+ if (params[name]) { -+ let oldHandler = params[name]; -+ let oldScope = params[name + 'Scope']; -+ let oldParams = params[name + 'Params']; -+ let eventScope = oldScope ? oldScope : target; -+ -+ params[name] = function () { -+ oldHandler.apply(eventScope, oldParams); -+ handlers.forEach((h) => h(target)); -+ }; -+ } else -+ params[name] = function () { handlers.forEach((h) => h(target)); }; -+ } -+} -+ -+function _removeHandler(target, name, handler) { -+ let extraHandlers = _getExtraHandlers(target); -+ -+ if (name in extraHandlers) { -+ let handlers = extraHandlers[name]; -+ let handlerIndex = handlers.indexOf(handler); -+ -+ while (handlerIndex > -1) { -+ handlers.splice(handlerIndex, 1); -+ handlerIndex = handlers.indexOf(handler); -+ } -+ } -+} -+ -+function _removeHandlers(target) { -+ let extraHandlers = _getExtraHandlers(target); -+ -+ for (let name in extraHandlers) -+ extraHandlers[name].length = 0; - } - - function _actorDestroyed(target) { -diff --git a/js/ui/workspace.js b/js/ui/workspace.js -index d049eae..e2f3582 100644 ---- a/js/ui/workspace.js -+++ b/js/ui/workspace.js -@@ -139,14 +139,9 @@ var WindowClone = new Lang.Class({ - - this._windowClone._updateId = this.metaWindow.connect('size-changed', - this._onRealWindowSizeChanged.bind(this)); -- this._windowClone._destroyId = -- this.realWindow.connect('destroy', () => { -- // First destroy the clone and then destroy everything -- // This will ensure that we never see it in the -- // _disconnectSignals loop -- this._windowClone.destroy(); -- this.destroy(); -- }); -+ -+ this._windowClone._destroyId = this.realWindow.connect('destroy', -+ this.destroy.bind(this)); - - this._updateAttachedDialogs(); - this._computeBoundingBox(); -@@ -310,7 +305,14 @@ var WindowClone = new Lang.Class({ - }, - - destroy() { -- this.actor.destroy(); -+ this.emit('destroy'); -+ -+ // First destroy the clone and then destroy everything -+ // This will ensure that we never see it in the _disconnectSignals loop -+ this.metaWindow.disconnect(this._windowClone._updateId); -+ this.realWindow.disconnect(this._windowClone._destroyId); -+ this._windowClone.destroy(); -+ - }, - - _disconnectSignals() { -@@ -1132,6 +1134,7 @@ var Workspace = new Lang.Class({ - // Create clones for windows that should be - // visible in the Overview - this._windows = []; -+ this._windowsDestroyedIds = []; - this._windowOverlays = []; - for (let i = 0; i < windows.length; i++) { - if (this._isOverviewWindow(windows[i])) { -@@ -1429,7 +1432,7 @@ var Workspace = new Lang.Class({ - return GLib.SOURCE_REMOVE; - }, - -- _doRemoveWindow(metaWin) { -+ _doRemoveWindow : function(metaWin, {cloneDestroy}={cloneDestroy: true}) { - let win = metaWin.get_compositor_private(); - - // find the position of the window in our list -@@ -1439,8 +1442,10 @@ var Workspace = new Lang.Class({ - return; - - let clone = this._windows[index]; -+ clone.disconnect(this._windowsDestroyedIds[index]); - - this._windows.splice(index, 1); -+ this._windowsDestroyedIds.splice(index, 1); - this._windowOverlays.splice(index, 1); - - // If metaWin.get_compositor_private() returned non-NULL, that -@@ -1458,7 +1463,9 @@ var Workspace = new Lang.Class({ - scale: stageWidth / clone.actor.width - }; - } -- clone.destroy(); -+ -+ if (cloneDestroy) -+ clone.destroy(); - - - // We need to reposition the windows; to avoid shuffling windows -@@ -1801,7 +1808,11 @@ var Workspace = new Lang.Class({ - this._actualGeometryLater = 0; - } - -+ for (let index = 0; index < this._windows.length; ++index) -+ this._windows[index].disconnect(this._windowsDestroyedIds[index]); -+ - this._windows = []; -+ this._windowsDestroyedIds = []; - }, - - // Sets this.leavingOverview flag to false. -@@ -1850,6 +1861,10 @@ var Workspace = new Lang.Class({ - this._recalculateWindowPositions(WindowPositionFlags.NONE); - }); - -+ let cloneDestroyedId = clone.connect('destroy', () => { -+ this._doRemoveWindow(clone.metaWindow, {cloneDestroy: false}); -+ }); -+ - this.actor.add_actor(clone.actor); - - overlay.connect('show-close-button', this._onShowOverlayClose.bind(this)); -@@ -1860,6 +1875,7 @@ var Workspace = new Lang.Class({ - clone.setStackAbove(this._windows[this._windows.length - 1].actor); - - this._windows.push(clone); -+ this._windowsDestroyedIds.push(cloneDestroyedId); - this._windowOverlays.push(overlay); - - return [clone, overlay]; -diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js -index 7d5d2c0..fef3f6a 100644 ---- a/js/ui/workspaceThumbnail.js -+++ b/js/ui/workspaceThumbnail.js -@@ -70,12 +70,9 @@ var WindowClone = new Lang.Class({ - - this.clone._updateId = this.metaWindow.connect('position-changed', - this._onPositionChanged.bind(this)); -- this.clone._destroyId = this.realWindow.connect('destroy', () => { -- // First destroy the clone and then destroy everything -- // This will ensure that we never see it in the _disconnectSignals loop -- this.clone.destroy(); -- this.destroy(); -- }); -+ -+ this.clone._destroyId = this.realWindow.connect('destroy', this.destroy.bind(this)); -+ - this._onPositionChanged(); - - this.actor.connect('button-release-event', -@@ -142,6 +139,14 @@ var WindowClone = new Lang.Class({ - }, - - destroy() { -+ this.emit('destroy'); -+ -+ // First destroy the clone and then destroy everything -+ // This will ensure that we never see it in the _disconnectSignals loop -+ this.metaWindow.disconnect(this.clone._updateId); -+ this.realWindow.disconnect(this.clone._destroyId); -+ this.clone.destroy(); -+ - this.actor.destroy(); - }, - -@@ -285,6 +290,7 @@ var WorkspaceThumbnail = new Lang.Class({ - - // Create clones for windows that should be visible in the Overview - this._windows = []; -+ this._windowsDestroyedIds = []; - this._allWindows = []; - this._minimizedChangedIds = []; - for (let i = 0; i < windows.length; i++) { -@@ -373,7 +379,7 @@ var WorkspaceThumbnail = new Lang.Class({ - return this._collapseFraction; - }, - -- _doRemoveWindow(metaWin) { -+ _doRemoveWindow : function(metaWin, {cloneDestroy}={cloneDestroy: true}) { - let win = metaWin.get_compositor_private(); - - // find the position of the window in our list -@@ -383,9 +389,13 @@ var WorkspaceThumbnail = new Lang.Class({ - return; - - let clone = this._windows[index]; -+ clone.disconnect(this._windowsDestroyedIds[index]); -+ - this._windows.splice(index, 1); -+ this._windowsDestroyedIds.splice(index, 1); - -- clone.destroy(); -+ if (cloneDestroy) -+ clone.destroy(); - }, - - _doAddWindow(metaWin) { -@@ -504,7 +514,11 @@ var WorkspaceThumbnail = new Lang.Class({ - this._bgManager = null; - } - -+ for (let index = 0; index < this._windows.length; ++index) -+ this._windows[index].disconnect(this._windowsDestroyedIds[index]); -+ - this._windows = []; -+ this._windowsDestroyedIds = []; - this.actor = null; - }, - -@@ -537,6 +551,11 @@ var WorkspaceThumbnail = new Lang.Class({ - clone.connect('drag-end', () => { - Main.overview.endWindowDrag(clone.metaWindow); - }); -+ -+ let cloneDestroyedId = clone.connect('destroy', () => { -+ this._doRemoveWindow(clone.metaWindow, {cloneDestroy: false}); -+ }); -+ - this._contents.add_actor(clone.actor); - - if (this._windows.length == 0) -@@ -545,6 +564,7 @@ var WorkspaceThumbnail = new Lang.Class({ - clone.setStackAbove(this._windows[this._windows.length - 1].actor); - - this._windows.push(clone); -+ this._windowsDestroyedIds.push(cloneDestroyedId); - - return clone; - }, --- -2.16.2 - diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.28.0.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.28.0.bb deleted file mode 100644 index 2f09c7c..0000000 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.28.0.bb +++ /dev/null @@ -1,3 +0,0 @@ -require gnome-shell.inc -SRC_URI[archive.md5sum] = "a0bf48381d8f4f081055f73764618016" -SRC_URI[archive.sha256sum] = "c7dec00d3c2b26e16611aac99630e3d41842179e9ec30cc873233b56c080ba4e" diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.30.2.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.30.2.bb new file mode 100644 index 0000000..59a57a0 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.30.2.bb @@ -0,0 +1,43 @@ +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gobject-introspection gettext + +SRC_URI[archive.md5sum] = "3aef5c837c85f6e5318b845fc844b1fe" +SRC_URI[archive.sha256sum] = "22632c9bbccef11fe3130fc8d642e37de223d089e004bdb58dae309a38694c4d" + +SRC_URI += "\ + file://0001-do-no-build-calendar-server.patch \ + file://0001-Disabled-calendar-events-from-user-session.patch \ + file://0001-do-not-use-python-path-from-build-environment.patch \ +" + +DEPENDS = "glib-2.0-native systemd libcanberra gtk+3 glib-2.0 libxml2 libcroco mutter libsoup-2.4 gsettings-desktop-schemas gcr atk polkit startup-notification libx11 gnome-bluetooth libsecret networkmanager gjs mozjs network-manager-applet pulseaudio libxml2-native paxctl-native ibus xmlto-native sassc-native" + +RDEPENDS_${PN} = "xserver-xorg-xwayland cantarell-fonts gnome-theme-adwaita gnome-theme-adwaita-dark gnome-control-center gnome-session dconf" + +FILES_${PN} += "\ + ${datadir}/dbus-1 \ + ${datadir}/xdg-desktop-portal \ + ${datadir}/gnome-control-center/keybindings \ + ${systemd_user_unitdir} \ +" + +PACKAGES =+ "${PN}-tools" +FILES_${PN}-tools += "\ + /usr/bin/gnome-shell-perf-tool \ + /usr/bin/gnome-shell-extension-tool \ +" + +do_configure_append () { + MUTTER_DIR="/usr/lib/mutter" + sed --in-place=.old1 "s;=${MUTTER_DIR};=${PKG_CONFIG_SYSROOT_DIR}${MUTTER_DIR};" ${B}/build.ninja +} + +do_install_append() { + paxctl -cm ${D}${bindir}/gnome-shell +} + +EXTRA_OEMESON += "-Dbrowser_plugin=false -Dman=false -Dsystemd=true -Dnetworkmanager=true" diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.28.0.bb b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.28.0.bb deleted file mode 100644 index 79d26b2..0000000 --- a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.28.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require gnome-terminal.inc -SRC_URI[archive.md5sum] = "46827785f9de78329a1d894a6a957b83" -SRC_URI[archive.sha256sum] = "a551d5eee10f66560fc7c6bdff6f7358ce9c60b526d8ba68a82f2ab024a3bcc4" -EXTRA_OECONF = "--disable-search-provider --without-nautilus-extension" - - diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal.inc b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.30.2.bb similarity index 81% rename from meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal.inc rename to meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.30.2.bb index d539a51..4cfd391 100644 --- a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal.inc +++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.30.2.bb @@ -5,6 +5,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" DEPENDS = "intltool-native dconf gconf glib-2.0 util-linux gsettings-desktop-schemas glib-2.0-native vte libpcre gtk+3 vala-native libxml2-native desktop-file-utils-native yelp-tools-native" +# python3native is needed to run itstool during build +inherit gettext gnome python3native + +SRC_URI[archive.md5sum] = "debc2a025675312ad5ae33232f02c027" +SRC_URI[archive.sha256sum] = "6b1fc2720e3bfc592645d41e38d0d3a0f2bdf5ef7bce490b2d5c8ba39f395e38" + +EXTRA_OECONF = "--disable-search-provider --without-nautilus-extension" + FILES_${PN} += "\ ${systemd_user_unitdir} \ ${datadir}/dbus-1/services \ @@ -15,9 +23,3 @@ FILES_${PN} += "\ FILES_${PN}-doc += "\ ${datadir}/help \ " - -# python3native is needed to run itstool during build -inherit gettext gnome python3native - -EXTRA_OECONF = "--disable-search-provider --without-nautilus-extension --disable-gterminal" - diff --git a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_3.28.0.bb b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_3.30.2.bb similarity index 75% rename from meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_3.28.0.bb rename to meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_3.30.2.bb index d43a405..159cd06 100644 --- a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_3.28.0.bb +++ b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_3.30.2.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSES/GPL-3.0;md5=9eef91148a9b14ec7f9df333daebc746 GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gettext -SRC_URI[archive.md5sum] = "7fd38ddd8ed2233494e67706599c21a0" -SRC_URI[archive.sha256sum] = "2944532de25cd41631afe1b0d154a6b2377551c1c67fffa5a1c4928c94eb1f35" +SRC_URI[archive.md5sum] = "5c4f9181cf18ce229f63d84723943721" +SRC_URI[archive.sha256sum] = "3f78551515eadf848c9140482e08842a5552acdc2987d8cc13f496187cd4c348" DEPENDS = "glib-2.0 glib-2.0-native" diff --git a/meta-gnome/recipes-gnome/gnome-usage/gnome-usage_3.28.0.bb b/meta-gnome/recipes-gnome/gnome-usage/gnome-usage_3.30.0.bb similarity index 73% rename from meta-gnome/recipes-gnome/gnome-usage/gnome-usage_3.28.0.bb rename to meta-gnome/recipes-gnome/gnome-usage/gnome-usage_3.30.0.bb index 234038f..76cbb9f 100644 --- a/meta-gnome/recipes-gnome/gnome-usage/gnome-usage_3.28.0.bb +++ b/meta-gnome/recipes-gnome/gnome-usage/gnome-usage_3.30.0.bb @@ -8,8 +8,9 @@ inherit gnomebase gobject-introspection gettext vala SRC_URI += "file://0001-Added-machine-tags.patch" DEPENDS = "glib-2.0 glib-2.0-native gtk+3 gobject-introspection libgtop" -SRC_URI[archive.md5sum] = "f234a0cb0cbce809d00584d45ab5d46a" -SRC_URI[archive.sha256sum] = "d812655c23a59990045f8f282bcd2b138d594b6cd670aaec01e3cf6b235f6004" +SRC_URI[archive.md5sum] = "7641fecd816f76d31415f4e2e2b301b6" +SRC_URI[archive.sha256sum] = "50577b76d05310cb6f26138fb6f4d0c8d02d4f71a657ac3f445f999038633b38" + FILES_${PN} += "${datadir}/metainfo" diff --git a/meta-gnome/recipes-gnome/grilo/grilo_0.3.4.bb b/meta-gnome/recipes-gnome/grilo/grilo_0.3.4.bb deleted file mode 100644 index c07315d..0000000 --- a/meta-gnome/recipes-gnome/grilo/grilo_0.3.4.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Framework for discovery and browsing of network accessible media" -HOMEPAGE = "https://wiki.gnome.org/Projects/Grilo" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" - -SRC_URI[archive.md5sum] = "a15a92a903aeb7579e1b0f6e8b4b0fb1" -SRC_URI[archive.sha256sum] = "7c6964053b42574c2f14715d2392a02ea5cbace955eb73e067c77aa3e43b066e" - -DEPENDS = "glib-2.0 gtk+3 libsoup-2.4 intltool-native libxml2 gnome-common-native" - -inherit gettext gobject-introspection gnome - -EXTRA_OECONF = "--disable-grl-net --disable-grl-pls --disable-test-ui --disable-vala" - diff --git a/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_3.28.0.bb b/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_3.28.0.bb deleted file mode 100644 index 8d99516..0000000 --- a/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_3.28.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require gsettings-desktop-schemas.inc -SRC_URI[archive.md5sum] = "370610e29b37d063ede3ef0f29c06eb9" -SRC_URI[archive.sha256sum] = "4cb4cd7790b77e5542ec75275237613ad22f3a1f2f41903a298cf6cc996a9167" - diff --git a/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas.inc b/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_3.28.1.bb similarity index 69% rename from meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas.inc rename to meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_3.28.1.bb index b5ed8d7..5b6640a 100644 --- a/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas.inc +++ b/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_3.28.1.bb @@ -4,6 +4,11 @@ BUGTRACKER = "https://bugzilla.gnome.org/" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + DEPENDS = "glib-2.0 intltool-native" inherit gnomebase gsettings gettext gobject-introspection upstream-version-is-even + +SRC_URI[archive.md5sum] = "83bb19d025f126fae495ab43a2f26f40" +SRC_URI[archive.sha256sum] = "f88ea6849ffe897c51cfeca5e45c3890010c82c58be2aee18b01349648e5502f" + diff --git a/meta-gnome/recipes-gnome/libgee/libgee_0.20.1.bb b/meta-gnome/recipes-gnome/libgee/libgee_0.20.1.bb index 0210e59..8b846b1 100644 --- a/meta-gnome/recipes-gnome/libgee/libgee_0.20.1.bb +++ b/meta-gnome/recipes-gnome/libgee/libgee_0.20.1.bb @@ -2,17 +2,15 @@ SUMMARY = "A collection library providing GObject based interfaces and classes f LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" -SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/libgee/0.20/libgee-${PV}.tar.xz" -SRC_URI[md5sum] = "d224dca55bb909f6730f40cc267337be" -SRC_URI[sha256sum] = "bb2802d29a518e8c6d2992884691f06ccfcc25792a5686178575c7111fea4630" - +SRC_URI[archive.md5sum] = "d224dca55bb909f6730f40cc267337be" +SRC_URI[archive.sha256sum] = "bb2802d29a518e8c6d2992884691f06ccfcc25792a5686178575c7111fea4630" DEPENDS = "glib-2.0" PACKAGES += "${PN}-vala" FILES_${PN}-vala = "${datadir}/vala/vapi" -inherit pkgconfig autotools +inherit gnomebase pkgconfig autotools EXTRA_OECONF = "" diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb b/meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb index 23be795..ed7d964 100644 --- a/meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb +++ b/meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb @@ -3,13 +3,12 @@ HOMEPAGE = "https://developer.gnome.org/libgtop/stable/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -SRC_URI = "https://download.gnome.org/sources/libgtop/2.38/libgtop-${PV}.tar.xz" -SRC_URI[md5sum] = "bb0ce7de6b28694b40405eedac8a31b5" -SRC_URI[sha256sum] = "4f6c0e62bb438abfd16b4559cd2eca0251de19e291c888cdc4dc88e5ffebb612" +SRC_URI[archive.md5sum] = "bb0ce7de6b28694b40405eedac8a31b5" +SRC_URI[archive.sha256sum] = "4f6c0e62bb438abfd16b4559cd2eca0251de19e291c888cdc4dc88e5ffebb612" DEPENDS = "libx11 glib-2.0 libxau" -inherit perlnative gettext pkgconfig autotools +inherit gnomebase perlnative gettext pkgconfig autotools EXTRA_OECONF = "--with-examples=no" diff --git a/meta-gnome/recipes-gnome/libgweather/libgweather_3.28.0.bb b/meta-gnome/recipes-gnome/libgweather/libgweather_3.28.2.bb similarity index 77% rename from meta-gnome/recipes-gnome/libgweather/libgweather_3.28.0.bb rename to meta-gnome/recipes-gnome/libgweather/libgweather_3.28.2.bb index 8d572ed..bd2f1f1 100644 --- a/meta-gnome/recipes-gnome/libgweather/libgweather_3.28.0.bb +++ b/meta-gnome/recipes-gnome/libgweather/libgweather_3.28.2.bb @@ -3,8 +3,8 @@ HOMEPAGE = "https://wiki.gnome.org/Projects/LibGWeather" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI[archive.md5sum] = "767b4af6ce55bda74cb2f53aaefcfc6f" -SRC_URI[archive.sha256sum] = "594be78dcc0b4c48bf79cd42ea6768160b661bc2a74d9d35ecc742575416e18f" +SRC_URI[archive.md5sum] = "4f8771fedc83bd1c7594c5aa7f21dedb" +SRC_URI[archive.sha256sum] = "081ce81653afc614e12641c97a8dd9577c524528c63772407ae2dbcde12bde75" DEPENDS = "gtk+3 libxml2 libsoup-2.4 glib-2.0 intltool-native geocode-glib glib-2.0-native" diff --git a/meta-gnome/recipes-gnome/mutter/mutter/0002-avoid-unnecessary-relayouts-in-cluttertext.patch b/meta-gnome/recipes-gnome/mutter/mutter/0002-avoid-unnecessary-relayouts-in-cluttertext.patch deleted file mode 100644 index 417e22a..0000000 --- a/meta-gnome/recipes-gnome/mutter/mutter/0002-avoid-unnecessary-relayouts-in-cluttertext.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 8286557a0555058440536e88393fda445d49d399 Mon Sep 17 00:00:00 2001 -From: Yussuf Khalil -Date: Sun, 18 Feb 2018 21:21:44 +0100 -Subject: [PATCH] clutter: Avoid unnecessary relayouts in ClutterText - -We can save an unnecessary relayout if the required size to fully draw the text -is equal to the currently allocated size after the underlying text buffer or -attributes that only affect the PangoLayout have changed. ---- - clutter/clutter/clutter-text.c | 43 ++++++++++++++++++++++++++---------------- - 1 file changed, 27 insertions(+), 16 deletions(-) - -diff --git a/clutter/clutter/clutter-text.c b/clutter/clutter/clutter-text.c -index 4828a4cbd..4a6a74a0c 100644 ---- a/clutter/clutter/clutter-text.c -+++ b/clutter/clutter/clutter-text.c -@@ -4511,6 +4511,27 @@ buffer_deleted_text (ClutterTextBuffer *buffer, - } - } - -+static void -+clutter_text_queue_redraw_or_relayout (ClutterText *self) -+{ -+ ClutterActor *actor = CLUTTER_ACTOR (self); -+ gfloat preferred_width; -+ gfloat preferred_height; -+ -+ clutter_text_dirty_cache (self); -+ -+ /* we're using our private implementations here to avoid the caching done by ClutterActor */ -+ clutter_text_get_preferred_width (actor, -1, NULL, &preferred_width); -+ clutter_text_get_preferred_height (actor, preferred_width, NULL, &preferred_height); -+ -+ if (clutter_actor_has_allocation (actor) && -+ (fabsf (preferred_width - clutter_actor_get_width (actor)) > 0.001 || -+ fabsf (preferred_height - clutter_actor_get_height (actor)) > 0.001)) -+ clutter_actor_queue_relayout (actor); -+ else -+ clutter_text_queue_redraw (actor); -+} -+ - static void - buffer_notify_text (ClutterTextBuffer *buffer, - GParamSpec *spec, -@@ -4518,9 +4539,7 @@ buffer_notify_text (ClutterTextBuffer *buffer, - { - g_object_freeze_notify (G_OBJECT (self)); - -- clutter_text_dirty_cache (self); -- -- clutter_actor_queue_relayout (CLUTTER_ACTOR (self)); -+ clutter_text_queue_redraw_or_relayout (self); - - g_signal_emit (self, text_signals[TEXT_CHANGED], 0); - g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_TEXT]); -@@ -4872,8 +4891,7 @@ clutter_text_set_cursor_visible (ClutterText *self, - { - priv->cursor_visible = cursor_visible; - -- clutter_text_dirty_cache (self); -- clutter_actor_queue_relayout (CLUTTER_ACTOR (self)); -+ clutter_text_queue_redraw_or_relayout (self); - - g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CURSOR_VISIBLE]); - } -@@ -5774,9 +5792,7 @@ clutter_text_set_line_alignment (ClutterText *self, - { - priv->alignment = alignment; - -- clutter_text_dirty_cache (self); -- -- clutter_actor_queue_relayout (CLUTTER_ACTOR (self)); -+ clutter_text_queue_redraw_or_relayout (self); - - g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_LINE_ALIGNMENT]); - } -@@ -5831,9 +5847,7 @@ clutter_text_set_use_markup (ClutterText *self, - if (setting) - clutter_text_set_markup_internal (self, text); - -- clutter_text_dirty_cache (self); -- -- clutter_actor_queue_relayout (CLUTTER_ACTOR (self)); -+ clutter_text_queue_redraw_or_relayout (self); - } - - /** -@@ -5880,9 +5894,7 @@ clutter_text_set_justify (ClutterText *self, - { - priv->justify = justify; - -- clutter_text_dirty_cache (self); -- -- clutter_actor_queue_relayout (CLUTTER_ACTOR (self)); -+ clutter_text_queue_redraw_or_relayout (self); - - g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_JUSTIFY]); - } -@@ -6449,8 +6461,7 @@ clutter_text_set_preedit_string (ClutterText *self, - priv->preedit_set = TRUE; - } - -- clutter_text_dirty_cache (self); -- clutter_actor_queue_relayout (CLUTTER_ACTOR (self)); -+ clutter_text_queue_redraw_or_relayout (self); - } - - diff --git a/meta-gnome/recipes-gnome/mutter/mutter_3.28.0.bb b/meta-gnome/recipes-gnome/mutter/mutter_3.30.2.bb similarity index 78% rename from meta-gnome/recipes-gnome/mutter/mutter_3.28.0.bb rename to meta-gnome/recipes-gnome/mutter/mutter_3.30.2.bb index 203825f..d7ba092 100644 --- a/meta-gnome/recipes-gnome/mutter/mutter_3.28.0.bb +++ b/meta-gnome/recipes-gnome/mutter/mutter_3.30.2.bb @@ -1,11 +1,11 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI[archive.md5sum] = "7a3baf2fbb02f9cc341bf0424a31d0d2" -SRC_URI[archive.sha256sum] = "58fffc8025f21fb6da27bd2189b6db4d20c54f950b1a46aa7f7cbf0a82d386b0" +SRC_URI[archive.md5sum] = "d74b9bf421b2b82ebfe11cccc055a760" +SRC_URI[archive.sha256sum] = "df24dcc0b866fc6bffbfc82881a84bd7cc9c641e4124d2545c368c0b10e12363" + SRC_URI_append = "\ file://0001-remove-check-for-zenity.patch \ - file://0002-avoid-unnecessary-relayouts-in-cluttertext.patch \ file://startup-notification.patch \ file://get_client_pid.patch \ " diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus/0001-find-libm-correctly.patch b/meta-gnome/recipes-gnome/nautilus/nautilus/0001-find-libm-correctly.patch deleted file mode 100644 index bd6b3cd..0000000 --- a/meta-gnome/recipes-gnome/nautilus/nautilus/0001-find-libm-correctly.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1fc676b74ad3c95670496bcabed0aa2837fc3e8c Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Fri, 23 Mar 2018 21:20:39 -0400 -Subject: [PATCH] find libm correctly - ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 340caa0..36bd4a1 100644 ---- a/meson.build -+++ b/meson.build -@@ -67,7 +67,7 @@ libgd = subproject( - ) - libgd_dep = libgd.get_variable('libgd_dep') - --libm = cc.find_library('libm') -+libm = cc.find_library('m') - - gail = dependency('gail-3.0') - if get_option('extensions') --- -2.16.2 - diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_3.28.0.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_3.28.0.bb deleted file mode 100644 index 68ccbc0..0000000 --- a/meta-gnome/recipes-gnome/nautilus/nautilus_3.28.0.bb +++ /dev/null @@ -1,73 +0,0 @@ -SUMMARY = "GNOME file manager" -HOMEPAGE = "https://wiki.gnome.org/action/show/Apps/Files" - -LICENSE = "GPLv3 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \ - file://libnautilus-extension/LICENSE;md5=321bf41f280cf805086dd5a720b37785" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gobject-introspection gettext - -SRC_URI += "file://0001-find-libm-correctly.patch" -SRC_URI[archive.md5sum] = "b929e5c132cdb6e3cbdf216967e7baf0" -SRC_URI[archive.sha256sum] = "b60035352903d792553e5cb2624dcbad927dd6121594a1dfdb7860c5e53bf620" - - -FILES_${PN} += "\ - ${datadir}/glib-2.0/schemas \ - ${datadir}/gnome-shell/search-providers/nautilus-search-provider.ini \ - ${datadir}/metainfo/org.gnome.Nautilus.appdata.xml \ - ${datadir}/icons/hicolor/ \ - ${datadir}/dbus-1/services \ -" - -DEPENDS += "gtk+3 glib-2.0 pango gnome-autoar libxml2 gnome-desktop tracker gexiv2" -# This probably belongs in meson.bbclass -# -# 1) write out a wrapper script that can execute target binaries -# -# 2) add exe_wrapper line to the end of [binaries] section in the -# meson.cross file that meson.bbclass generated -# -setup_wrapper() { - if [ ! -e ${B}/wrapper ]; then - cat > ${B}/wrapper << EOF -#!/bin/sh -${STAGING_LIBDIR}/ld-linux-x86-64.so.2 --library-path ${STAGING_LIBDIR} \$@ -EOF - chmod +x ${B}/wrapper - fi - - if ! grep -q "^exe_wrapper" ${WORKDIR}/meson.cross; then - cat ${WORKDIR}/meson.cross | sed "/pkgconfig/ a\ -exe_wrapper = '${B}/wrapper'" > ${WORKDIR}/meson.cross.tmp - mv ${WORKDIR}/meson.cross.tmp ${WORKDIR}/meson.cross - fi -} -GIR_SCANNER_NATIVE = "${STAGING_BINDIR_NATIVE}/g-ir-scanner" -GIR_SCRIPT_PATH = "${B}/g-ir-scanner-script" - -# https://github.com/ninja-build/ninja/issues/1002 -write_gir_script () { - cat > ${GIR_SCRIPT_PATH} << EOF -#!/bin/sh -export PKG_CONFIG=pkg-config -export PKG_CONFIG_PATH=\"${PKG_CONFIG_PATH}\" -export XDG_DATA_DIRS=\"${STAGING_DATADIR}\" -export CC="x86_64-oe-linux-gcc --sysroot=${STAGING_DIR_HOST}" -export LD="x86_64-oe-linux-gcc --sysroot=${STAGING_DIR_HOST}" -${STAGING_BINDIR}/g-ir-scanner-wrapper \$@ -EOF - chmod +x ${GIR_SCRIPT_PATH} -} - -do_configure_append () { - write_gir_script - sed --in-place=.old2 "s;COMMAND = ${GIR_SCANNER_NATIVE};COMMAND = ${GIR_SCRIPT_PATH};" ${B}/build.ninja -} - -do_configure_prepend() { - setup_wrapper -} - -EXTRA_OEMESON = "-Denable-selinux=false -Denable-desktop=false -Denable-packagekit=false -Denable-nst-extention=false" diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_3.30.2.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_3.30.2.bb new file mode 100644 index 0000000..aa9763c --- /dev/null +++ b/meta-gnome/recipes-gnome/nautilus/nautilus_3.30.2.bb @@ -0,0 +1,25 @@ +SUMMARY = "GNOME file manager" +HOMEPAGE = "https://wiki.gnome.org/action/show/Apps/Files" + +LICENSE = "GPLv3 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \ + file://libnautilus-extension/LICENSE;md5=321bf41f280cf805086dd5a720b37785" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gobject-introspection gettext + +SRC_URI[archive.md5sum] = "1149a9aa289ddc0db2157c77e0399e1d" +SRC_URI[archive.sha256sum] = "78269bbb0ce538cb9f40dd2feae4fc56dbb7c06651a6b5c9258f6b9631cb4084" + + +FILES_${PN} += "\ + ${datadir}/glib-2.0/schemas \ + ${datadir}/gnome-shell/search-providers \ + ${datadir}/metainfo/org.gnome.Nautilus.appdata.xml \ + ${datadir}/icons/hicolor/ \ + ${datadir}/dbus-1/services \ +" + +DEPENDS += "gtk+3 glib-2.0 pango gnome-autoar libxml2 gnome-desktop tracker gexiv2" + +EXTRA_OEMESON = "-Dselinux=false -Dpackagekit=false -Dextensions=false -Dintrospection=true" diff --git a/meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet.inc b/meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet.inc deleted file mode 100644 index eb92d04..0000000 --- a/meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet.inc +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Applet for managing network connections" -HOMEPAGE = "https://wiki.gnome.org/Projects/NetworkManager" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -DEPENDS = "gcr iso-codes networkmanager libgudev gtk+3 intltool-native modemmanager glib-2.0 libnotify libsecret glib-2.0-native" - -inherit gettext gobject-introspection gnome - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/src/libnma/.libs:${B}/src/utils/.libs:${B}/src/wireless-security/.libs:${B}/src/libnm-gtk/.libs" -} - -EXTRA_OECONF = "--without-selinux --without-team --enable-introspection --with-libnm-gtk" - diff --git a/meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet_1.8.10.bb b/meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet_1.8.10.bb deleted file mode 100644 index b63626c..0000000 --- a/meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet_1.8.10.bb +++ /dev/null @@ -1,3 +0,0 @@ -require network-manager-applet.inc -SRC_URI[archive.md5sum] = "eae3be75e77ff1a7ea3174be25e62d03" -SRC_URI[archive.sha256sum] = "0adc4bfae8b49f7a1d929c22ef20933bd41fb4a8b458280f44c65f9e45b4c9c3" diff --git a/meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet_1.8.18.bb b/meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet_1.8.18.bb new file mode 100644 index 0000000..d46966c --- /dev/null +++ b/meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet_1.8.18.bb @@ -0,0 +1,16 @@ +SUMMARY = "Applet for managing network connections" +HOMEPAGE = "https://wiki.gnome.org/Projects/NetworkManager" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +DEPENDS = "gcr iso-codes networkmanager libgudev gtk+3 intltool-native modemmanager glib-2.0 libnotify libsecret glib-2.0-native" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gettext gobject-introspection + +SRC_URI[archive.md5sum] = "34923579b39360db64649342ee6735d8" +SRC_URI[archive.sha256sum] = "23dc1404f1e0622b7c4718b6d978b101d5e4d9be0b92133b3863a4dc29786178" + +FILES_${PN} += "${datadir}/metainfo" + +EXTRA_OEMESON = "-Dwwan=false -Dteam=false -Dgcr=false -Dmobile_broadband_provider_info=false -Dgtk_doc=false -Dintrospection=true -Dselinux=false" diff --git a/meta-gnome/recipes-gnome/pango/pango_1.42.0.bb b/meta-gnome/recipes-gnome/pango/pango_1.42.0.bb deleted file mode 100644 index 98dbdba..0000000 --- a/meta-gnome/recipes-gnome/pango/pango_1.42.0.bb +++ /dev/null @@ -1,3 +0,0 @@ -require pango.inc -SRC_URI[archive.md5sum] = "10fd7ddf2c7cbdf942087d16c0936669" -SRC_URI[archive.sha256sum] = "9924d88a3dcedff753f0763814a1605307c5c9c931413b8b47ea7267d1b19446" diff --git a/meta-gnome/recipes-gnome/pango/pango.inc b/meta-gnome/recipes-gnome/pango/pango_1.42.4.bb similarity index 86% rename from meta-gnome/recipes-gnome/pango/pango.inc rename to meta-gnome/recipes-gnome/pango/pango_1.42.4.bb index 3f9d7ee..d4c5b7b 100644 --- a/meta-gnome/recipes-gnome/pango/pango.inc +++ b/meta-gnome/recipes-gnome/pango/pango_1.42.4.bb @@ -13,12 +13,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection -#FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-graphics/pango/pango:" - -#SRC_URI += "file://run-ptest \ -# file://0001-Drop-introspection-macros-from-acinclude.m4.patch \ -# file://0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch \ -#" +SRC_URI[archive.md5sum] = "deb171a31a3ad76342d5195a1b5bbc7c" +SRC_URI[archive.sha256sum] = "1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d" DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi" diff --git a/meta-gnome/recipes-gnome/tracker/tracker_2.0.3.bb b/meta-gnome/recipes-gnome/tracker/tracker_2.1.5.bb similarity index 72% rename from meta-gnome/recipes-gnome/tracker/tracker_2.0.3.bb rename to meta-gnome/recipes-gnome/tracker/tracker_2.1.5.bb index cbc41a9..e311c4f 100644 --- a/meta-gnome/recipes-gnome/tracker/tracker_2.0.3.bb +++ b/meta-gnome/recipes-gnome/tracker/tracker_2.1.5.bb @@ -9,11 +9,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=506ab4920510c723c01689e212f41404 \ file://src/libtracker-data/COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc" -SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/tracker/2.0/tracker-${PV}.tar.xz \ - file://0001-assume-sqlite-built-threadsafe-and-with-fts5.patch \ - " -SRC_URI[md5sum] = "8fe16374c5a7e50cd7166e204a6371cd" -SRC_URI[sha256sum] = "5a2fb274c128ec67a920944937b5147ceaf5db16fef6691ea22c4cb841e20580" +inherit gettext pkgconfig pythonnative gnomebase vala +SRC_URI += "file://0001-assume-sqlite-built-threadsafe-and-with-fts5.patch " +SRC_URI[archive.md5sum] = "8c4b86386b9b7d2c1a75218af582458e" +SRC_URI[archive.sha256sum] = "b234b7573773b904dc3e885ff5ec44e86b035767cde783bc50d65d12cd72861e" DEPENDS = "intltool-native libunistring sqlite3 dbus upower networkmanager bash-completion glib-2.0-native libsoup-2.4 libxml2 json-glib" @@ -35,7 +34,14 @@ FILES_${PN}-staticdev += "\ " INSANE_SKIP_${PN} += "dev-so" -inherit gettext pkgconfig pythonnative autotools +EXTRA_OECONF = "\ + --with-unicode-support=libunistring \ + --enable-minimal \ + --disable-introspection \ + --disable-tracker-fts \ + --disable-libstemmer \ + --disable-journal \ + --disable-network-manager \ +" -EXTRA_OECONF = "--enable-minimal --disable-introspection" diff --git a/meta-gnome/recipes-gnome/vte/vte_0.52.0.bb b/meta-gnome/recipes-gnome/vte/vte_0.52.0.bb deleted file mode 100644 index 1b3d436..0000000 --- a/meta-gnome/recipes-gnome/vte/vte_0.52.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require vte.inc -EXTRA_OECONF = "--with-gnutls" -SRC_URI[archive.md5sum] = "95b0d12864f7374128da33998e756e75" -SRC_URI[archive.sha256sum] = "d5ae72dddd57af493afa10ca2a290f284e588021b0bd8aaaa63dbb75de7c0567" diff --git a/meta-gnome/recipes-gnome/vte/vte.inc b/meta-gnome/recipes-gnome/vte/vte_0.54.2.bb similarity index 75% rename from meta-gnome/recipes-gnome/vte/vte.inc rename to meta-gnome/recipes-gnome/vte/vte_0.54.2.bb index c0dba4e..aa377a3 100644 --- a/meta-gnome/recipes-gnome/vte/vte.inc +++ b/meta-gnome/recipes-gnome/vte/vte_0.54.2.bb @@ -3,10 +3,13 @@ BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" LICENSE = "LGPLv2.1+" DEPENDS = "glib-2.0 gtk+3 libpcre2 intltool-native libxml2-native gperf-native gnutls" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" +LIC_FILES_CHKSUM = "file://COPYING.GPL3;md5=2f31b266d3440dd7ee50f92cf67d8e6c" inherit gnomebase gtk-doc distro_features_check upstream-version-is-even gobject-introspection vala +SRC_URI[archive.md5sum] = "054a8a46b9de9078f81931311cf27a68" +SRC_URI[archive.sha256sum] = "527d48b5131af1a0835006b7538fd3b243847bebc76b66bafa84457a98153834" + ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" # Help g-ir-scanner find the .so for linking @@ -16,7 +19,7 @@ do_compile_prepend() { CFLAGS += "-D_GNU_SOURCE" -EXTRA_OECONF = "--disable-test-application --with-gnutls" +EXTRA_OECONF = "--with-gnutls" # libtool adds "-nostdlib" when g++ is used. This breaks PIE builds. # Use libtool-cross (which has a hack to prevent that) instead. diff --git a/meta-gnome/recipes-gnome/yelp-tools/yelp-tools_3.18.0.bb b/meta-gnome/recipes-gnome/yelp-tools/yelp-tools_3.18.0.bb deleted file mode 100644 index 8be7e51..0000000 --- a/meta-gnome/recipes-gnome/yelp-tools/yelp-tools_3.18.0.bb +++ /dev/null @@ -1,39 +0,0 @@ -# Recipe created by recipetool -# This is the basis of a recipe and may need further editing in order to be fully functional. -# (Feel free to remove these comments when editing.) - -# WARNING: the following LICENSE and LIC_FILES_CHKSUM values are best guesses - it is -# your responsibility to verify that the values are complete and correct. -# -# The following license files were not able to be identified and are -# represented as "Unknown" below, you will need to check them yourself: -# COPYING -# xslt/mal-license.xsl -# -# NOTE: multiple licenses have been detected; they have been separated with & -# in the LICENSE value for now since it is a reasonable assumption that all -# of the licenses apply. If instead there is a choice between the multiple -# licenses then you should change the value to separate the licenses with | -# instead of &. If there is any doubt, check the accompanying documentation -# to determine which situation is applicable. -LICENSE = "Unknown & GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d67c6f9f1515506abfea4f0d920c0774 \ - file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ - file://xslt/mal-license.xsl;md5=b02305a5e9d23df0f83b0c61a8883509" - -SRC_URI = "https://download.gnome.org/sources/yelp-tools/3.18/yelp-tools-${PV}.tar.xz" -SRC_URI[md5sum] = "ceca436ff2ab3900dde718c0f0286f3f" -SRC_URI[sha256sum] = "c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932" - -# NOTE: the following prog dependencies are unknown, ignoring: xsltproc xmllint itstool -DEPENDS = "yelp-xsl xmlto-native libxml2-native itstool-native" - -# NOTE: if this software is not capable of being built in a separate build directory -# from the source, you should replace autotools with autotools-brokensep in the -# inherit line -inherit pkgconfig autotools - -# Specify any options you want to pass to the configure script using EXTRA_OECONF: -EXTRA_OECONF = "" - -BBCLASSEXTEND = "native" diff --git a/meta-gnome/recipes-gnome/yelp-tools/yelp-tools_3.28.0.bb b/meta-gnome/recipes-gnome/yelp-tools/yelp-tools_3.28.0.bb new file mode 100644 index 0000000..49347df --- /dev/null +++ b/meta-gnome/recipes-gnome/yelp-tools/yelp-tools_3.28.0.bb @@ -0,0 +1,15 @@ +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d67c6f9f1515506abfea4f0d920c0774 \ + file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ + file://xslt/mal-license.xsl;md5=b02305a5e9d23df0f83b0c61a8883509" + +SRC_URI[archive.md5sum] = "76907906611daae8f19a5276dd65f55d" +SRC_URI[archive.sha256sum] = "82dbfeea2359dfef8ee92c7580c7f03768d12f9bf67d839f03a5e9b0686dc1ac" + +DEPENDS = "yelp-xsl xmlto-native libxml2-native itstool-native" + +inherit gnomebase pkgconfig autotools + +EXTRA_OECONF = "" + +BBCLASSEXTEND = "native" diff --git a/meta-gnome/recipes-gnome/yelp-xsl/yelp-xsl_3.20.1.bb b/meta-gnome/recipes-gnome/yelp-xsl/yelp-xsl_3.20.1.bb deleted file mode 100644 index 332894a..0000000 --- a/meta-gnome/recipes-gnome/yelp-xsl/yelp-xsl_3.20.1.bb +++ /dev/null @@ -1,38 +0,0 @@ -# Recipe created by recipetool -# This is the basis of a recipe and may need further editing in order to be fully functional. -# (Feel free to remove these comments when editing.) - -# WARNING: the following LICENSE and LIC_FILES_CHKSUM values are best guesses - it is -# your responsibility to verify that the values are complete and correct. -# -# The following license files were not able to be identified and are -# represented as "Unknown" below, you will need to check them yourself: -# COPYING -# -# NOTE: multiple licenses have been detected; they have been separated with & -# in the LICENSE value for now since it is a reasonable assumption that all -# of the licenses apply. If instead there is a choice between the multiple -# licenses then you should change the value to separate the licenses with | -# instead of &. If there is any doubt, check the accompanying documentation -# to determine which situation is applicable. -LICENSE = "Unknown & GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=3e2bad3c5e3990988f9fa1bc5785b147 \ - file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ - file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343" - -SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/yelp-xsl/3.20/yelp-xsl-${PV}.tar.xz" -SRC_URI[md5sum] = "2332716e6e39125a942bc761a6f94211" -SRC_URI[sha256sum] = "dc61849e5dca473573d32e28c6c4e3cf9c1b6afe241f8c26e29539c415f97ba0" - -# NOTE: the following prog dependencies are unknown, ignoring: xmllint xsltproc itstool -DEPENDS = "intltool-native itstool-native" - -# NOTE: if this software is not capable of being built in a separate build directory -# from the source, you should replace autotools with autotools-brokensep in the -# inherit line -inherit gettext autotools - -# Specify any options you want to pass to the configure script using EXTRA_OECONF: -EXTRA_OECONF = "" -BBCLASSEXTEND = "native" - diff --git a/meta-gnome/recipes-gnome/yelp-xsl/yelp-xsl_3.30.1.bb b/meta-gnome/recipes-gnome/yelp-xsl/yelp-xsl_3.30.1.bb new file mode 100644 index 0000000..137678a --- /dev/null +++ b/meta-gnome/recipes-gnome/yelp-xsl/yelp-xsl_3.30.1.bb @@ -0,0 +1,15 @@ +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=3e2bad3c5e3990988f9fa1bc5785b147 \ + file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ + file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343" + +SRC_URI[archive.md5sum] = "371f7379f1614e602f861922182bbfbe" +SRC_URI[archive.sha256sum] = "fcef31c5938c6654976bbabb8b5d0d9e49fa2ce79136db74ca213056fdb8cf39" + +DEPENDS = "intltool-native itstool-native" + +inherit gnomebase gettext + +EXTRA_OECONF = "" +BBCLASSEXTEND = "native" + diff --git a/meta-gnome/recipes-gnome/zenity/zenity_3.28.0.bb b/meta-gnome/recipes-gnome/zenity/zenity_3.28.0.bb deleted file mode 100644 index 4f17f07..0000000 --- a/meta-gnome/recipes-gnome/zenity/zenity_3.28.0.bb +++ /dev/null @@ -1,3 +0,0 @@ -require zenity.inc -SRC_URI[archive.md5sum] = "0916c428ed858242c0864da4dc4c7f02" -SRC_URI[archive.sha256sum] = "5e588f12b987db30139b0283d39d19b0fd47cab87840cc112dfe61e592826df8" diff --git a/meta-gnome/recipes-gnome/zenity/zenity.inc b/meta-gnome/recipes-gnome/zenity/zenity_3.30.0.bb similarity index 73% rename from meta-gnome/recipes-gnome/zenity/zenity.inc rename to meta-gnome/recipes-gnome/zenity/zenity_3.30.0.bb index 640ad42..d36f6df 100644 --- a/meta-gnome/recipes-gnome/zenity/zenity.inc +++ b/meta-gnome/recipes-gnome/zenity/zenity_3.30.0.bb @@ -4,11 +4,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" inherit gnome perlnative gettext +SRC_URI[archive.md5sum] = "b2180f4ef4fcb2ee90da8c65bd5241af" +SRC_URI[archive.sha256sum] = "995ef696616492c40be6da99919851d41faed6643a97c9d24743b46bc8b537f2" + SRC_URI += "file://0001-Don-t-build-help.patch \ file://0002-Don-t-include-gdialog.patch \ " DEPENDS = "libx11 libnotify glib-2.0 gtk+3 gnome-common autoconf-archive" - EXTRA_OECONF = "" BBCLASSEXTEND = "native" diff --git a/meta-gnome/recipes-graphics/wayland/libinput_1.11.3.bb b/meta-gnome/recipes-graphics/wayland/libinput_1.11.3.bb deleted file mode 100644 index 12e2091..0000000 --- a/meta-gnome/recipes-graphics/wayland/libinput_1.11.3.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Library to handle input devices in Wayland compositors" -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libinput/" -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=1f2ea9ebff3a2c6d458faf58492efb63" - -DEPENDS = "libevdev udev mtdev" - -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ - " -SRC_URI[md5sum] = "df6e877f11de4a9793511e9abfe7ef01" -SRC_URI[sha256sum] = "f31191d96e425b4f16319842279d65946d9d983dcd3d9e466ae1206aa10ecb06" - -UPSTREAM_CHECK_REGEX = "libinput-(?P\d+\.\d+\.(?!9\d+)\d+)" -inherit meson pkgconfig lib_package - -PACKAGECONFIG ??= "" -PACKAGECONFIG[libwacom] = "-Dlibwacom=true,-Dlibwacom=false,libwacom" -PACKAGECONFIG[gui] = "-Ddebug-gui=true,-Ddebug-gui=false,cairo gtk+3" - -UDEVDIR = "`pkg-config --variable=udevdir udev`" - -EXTRA_OEMESON += "-Dudev-dir=${UDEVDIR} -Ddocumentation=false -Dtests=false" - -# package name changed in 1.8.1 upgrade: make sure package upgrades work -RPROVIDES_${PN} = "libinput" -RREPLACES_${PN} = "libinput" -RCONFLICTS_${PN} = "libinput" diff --git a/meta-gnome/recipes-graphics/wayland/mtdev_1.1.5.bb b/meta-gnome/recipes-graphics/wayland/mtdev_1.1.5.bb deleted file mode 100644 index ccd0ebb..0000000 --- a/meta-gnome/recipes-graphics/wayland/mtdev_1.1.5.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Multitouch Protocol Translation Library" - -DESCRIPTION = "mtdev is a library which transforms all variants of kernel \ -multitouch events to the slotted type B protocol. The events put into mtdev may \ -be from any MT device, specifically type A without contact tracking, type A with \ -contact tracking, or type B with contact tracking" - -HOMEPAGE = "http://bitmath.org/code/mtdev/" -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=ea6bd0268bb0fcd6b27698616ceee5d6" - -SRC_URI = "http://bitmath.org/code/${BPN}/${BP}.tar.bz2" -SRC_URI[md5sum] = "52c9610b6002f71d1642dc1a1cca5ec1" -SRC_URI[sha256sum] = "6677d5708a7948840de734d8b4675d5980d4561171c5a8e89e54adf7a13eba7f" - -inherit autotools pkgconfig diff --git a/meta-gnome/recipes-graphics/wayland/wayland-protocols_1.16.bb b/meta-gnome/recipes-graphics/wayland/wayland-protocols_1.16.bb deleted file mode 100644 index fc4b711..0000000 --- a/meta-gnome/recipes-graphics/wayland/wayland-protocols_1.16.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Collection of additional Wayland protocols" -DESCRIPTION = "Wayland protocols that add functionality not \ -available in the Wayland core protocol. Such protocols either add \ -completely new functionality, or extend the functionality of some other \ -protocol either in Wayland core, or some other protocol in \ -wayland-protocols." -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ - file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" - -SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - " -SRC_URI[md5sum] = "e0b523ff162e30bab46be1d65d527683" -SRC_URI[sha256sum] = "6b1485951fdcd36a960c870c46f28b03a3e5121fb46246916333ed07f78c98c5" - -UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" - -inherit allarch autotools pkgconfig - -PACKAGES = "${PN}" -FILES_${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" diff --git a/meta-gnome/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch b/meta-gnome/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch deleted file mode 100644 index ad3526d..0000000 --- a/meta-gnome/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch +++ /dev/null @@ -1,32 +0,0 @@ -Fix wayland-client and wayland-scanner pc files - -Upstream-Status: Pending - -Signed-off-by: Fabien Lahoudere - -Index: wayland-1.14.0/src/wayland-client.pc.in -=================================================================== ---- wayland-1.14.0.orig/src/wayland-client.pc.in -+++ wayland-1.14.0/src/wayland-client.pc.in -@@ -1,7 +1,7 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ - datarootdir=@datarootdir@ --pkgdatadir=@datadir@/@PACKAGE@ -+pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@ - libdir=@libdir@ - includedir=@includedir@ - -Index: wayland-1.14.0/src/wayland-scanner.pc.in -=================================================================== ---- wayland-1.14.0.orig/src/wayland-scanner.pc.in -+++ wayland-1.14.0/src/wayland-scanner.pc.in -@@ -2,7 +2,7 @@ prefix=@prefix@ - exec_prefix=@exec_prefix@ - datarootdir=@datarootdir@ - pkgdatadir=@datadir@/@PACKAGE@ --wayland_scanner=@bindir@/wayland-scanner -+wayland_scanner=wayland-scanner - - Name: Wayland Scanner - Description: Wayland scanner diff --git a/meta-gnome/recipes-graphics/wayland/wayland_1.16.0.bb b/meta-gnome/recipes-graphics/wayland/wayland_1.16.0.bb deleted file mode 100644 index 112ee1a..0000000 --- a/meta-gnome/recipes-graphics/wayland/wayland_1.16.0.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "Wayland, a protocol between a compositor and clients" -DESCRIPTION = "Wayland is a protocol for a compositor to talk to its clients \ -as well as a C library implementation of that protocol. The compositor can be \ -a standalone display server running on Linux kernel modesetting and evdev \ -input devices, an X application, or a wayland client itself. The clients can \ -be traditional applications, X servers (rootless or fullscreen) or other \ -display servers." -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ - file://src/wayland-server.c;endline=24;md5=b8e046164a766bb1ede8ba38e9dcd7ce" - -DEPENDS = "expat libxml2 libffi wayland-native" - -SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://fixpathinpcfiles.patch \ - " -SRC_URI[md5sum] = "0c215e53de71d6fb26f7102cdc6432d3" -SRC_URI[sha256sum] = "4e72c2b56109ccfb6610d776e465f4ca0af2280c9c2f7d5cc23f0ed2548752f5" - -UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-documentation --with-host-scanner" -EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries" - -# Wayland installs a M4 macro for other projects to use, which uses the target -# pkg-config to find files. Replace pkg-config with pkg-config-native. -do_install_append_class-native() { - sed -e 's,PKG_CHECK_MODULES(.*),,g' \ - -e 's,$PKG_CONFIG,pkg-config-native,g' \ - -i ${D}/${datadir}/aclocal/wayland-scanner.m4 -} - -sysroot_stage_all_append_class-target () { - rm ${SYSROOT_DESTDIR}/${datadir}/aclocal/wayland-scanner.m4 - cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/ -} - -FILES_${PN} = "${libdir}/*${SOLIBS}" -FILES_${PN}-dev += "${bindir} ${datadir}/wayland" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-gnome/recipes-graphics/wayland/weston-conf.bb b/meta-gnome/recipes-graphics/wayland/weston-conf.bb deleted file mode 100644 index f52200c..0000000 --- a/meta-gnome/recipes-graphics/wayland/weston-conf.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Weston, a Wayland compositor, configuration files" -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -CONFFILES_${PN} = "${sysconfdir}/xdg/weston/weston.ini" - -FILES_${PN} = "${sysconfdir}/xdg/weston/weston.ini" - -PACKAGES = "${PN}" - -do_configure[noexec] = '1' -do_compile[noexec] = '1' - -do_install() { - : -} - -do_install_qemux86() { - mkdir -p ${D}/${sysconfdir}/xdg/weston - cat << EOF > ${D}/${sysconfdir}/xdg/weston/weston.ini -[core] -backend=fbdev-backend.so -EOF -} - -do_install_qemux86-64() { - mkdir -p ${D}/${sysconfdir}/xdg/weston - cat << EOF > ${D}/${sysconfdir}/xdg/weston/weston.ini -[core] -backend=fbdev-backend.so -EOF -} diff --git a/meta-gnome/recipes-graphics/wayland/weston-init.bb b/meta-gnome/recipes-graphics/wayland/weston-init.bb deleted file mode 100644 index 22ba5f3..0000000 --- a/meta-gnome/recipes-graphics/wayland/weston-init.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Startup script and systemd unit file for the Weston Wayland compositor" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -SRC_URI = "file://init \ - file://weston.service \ - file://weston-start" - -S = "${WORKDIR}" - -do_install() { - install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston - install -Dm0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir}/weston.service - - # Install weston-start script - install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start - sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start - sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start -} - -inherit allarch update-rc.d distro_features_check systemd - -# rdepends on weston which depends on virtual/egl -REQUIRED_DISTRO_FEATURES = "opengl" - -RDEPENDS_${PN} = "weston kbd" - -INITSCRIPT_NAME = "weston" -INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ." - -SYSTEMD_SERVICE_${PN} = "weston.service" diff --git a/meta-gnome/recipes-graphics/wayland/weston-init/init b/meta-gnome/recipes-graphics/wayland/weston-init/init deleted file mode 100644 index d3e87c6..0000000 --- a/meta-gnome/recipes-graphics/wayland/weston-init/init +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -# -### BEGIN INIT INFO -# Provides: weston -# Required-Start: $local_fs $remote_fs -# Required-Stop: $local_fs $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -### END INIT INFO - -if test -e /etc/default/weston ; then - . /etc/default/weston -fi - -killproc() { - pid=`/bin/pidof $1` - [ "$pid" != "" ] && kill $pid -} - -read CMDLINE < /proc/cmdline -for x in $CMDLINE; do - case $x in - weston=false) - echo "Weston disabled" - exit 0; - ;; - esac -done - -case "$1" in - start) - . /etc/profile - - weston-start -- $OPTARGS - ;; - - stop) - echo "Stopping Weston" - killproc weston - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - *) - echo "usage: $0 { start | stop | restart }" - ;; -esac - -exit 0 diff --git a/meta-gnome/recipes-graphics/wayland/weston-init/weston-start b/meta-gnome/recipes-graphics/wayland/weston-init/weston-start deleted file mode 100755 index e72fbaa..0000000 --- a/meta-gnome/recipes-graphics/wayland/weston-init/weston-start +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh -# Copyright (C) 2016 O.S. Systems Software LTDA. -# Copyright (C) 2016 Freescale Semiconductor - -export PATH="/sbin:/usr/sbin:/bin:/usr/bin" - -usage() { - cat <] [-- ] -EOF -} - -## Module support -modules_dir=@DATADIR@/weston-start - -# Add weston extra argument -add_weston_argument() { - weston_args="$weston_args $1" -} - -# Add openvt extra argument -add_openvt_argument() { - openvt_args="$openvt_args $1" -} - -if [ -n "$WAYLAND_DISPLAY" ]; then - echo "ERROR: A Wayland compositor is already running, nested Weston instance is not supported yet." - exit 1 -fi -if [ -n "$DISPLAY" ]; then - launcher="weston" -else - launcher="weston-launch --" -fi - -openvt_args="-s" -while [ -n "$1" ]; do - if [ "$1" = "--" ]; then - shift - break - fi - openvt_args="$openvt_args $1" - shift -done - -weston_args=$* - -# Load and run modules -if [ -d "$modules_dir" ]; then - for m in "$modules_dir"/*; do - # Skip backup files - if [ "`echo $m | sed -e 's/\~$//'`" != "$m" ]; then - continue - fi - - # process module - . $m - done -fi - -if test -z "$XDG_RUNTIME_DIR"; then - export XDG_RUNTIME_DIR=/run/user/`id -u` - if ! test -d "$XDG_RUNTIME_DIR"; then - mkdir --parents $XDG_RUNTIME_DIR - chmod 0700 $XDG_RUNTIME_DIR - fi -fi - -exec openvt $openvt_args -- $launcher $weston_args --log=@LOCALSTATEDIR@/log/weston.log diff --git a/meta-gnome/recipes-graphics/wayland/weston-init/weston.service b/meta-gnome/recipes-graphics/wayland/weston-init/weston.service deleted file mode 100644 index 18f7262..0000000 --- a/meta-gnome/recipes-graphics/wayland/weston-init/weston.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Weston Wayland Compositor -RequiresMountsFor=/run - -[Service] -User=root -PAMName=login -EnvironmentFile=-/etc/default/weston -ExecStart=/usr/bin/weston-start -v -e -- $OPTARGS - -[Install] -WantedBy=multi-user.target - diff --git a/meta-gnome/recipes-graphics/wayland/weston/0001-make-error-portable.patch b/meta-gnome/recipes-graphics/wayland/weston/0001-make-error-portable.patch deleted file mode 100644 index 09ec155..0000000 --- a/meta-gnome/recipes-graphics/wayland/weston/0001-make-error-portable.patch +++ /dev/null @@ -1,78 +0,0 @@ -From ad1d2161c811cff25d1684c33611f300adb753bc Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 29 May 2015 20:56:00 -0700 -Subject: [PATCH] make error() portable - -error() is not posix but gnu extension so may not be available on all -kind of systemsi e.g. musl. - -Upstream-Status: Submitted - -Signed-off-by: Khem Raj - ---- - configure.ac | 2 ++ - libweston/weston-error.h | 20 ++++++++++++++++++++ - libweston/weston-launch.c | 2 +- - 3 files changed, 23 insertions(+), 1 deletion(-) - create mode 100644 libweston/weston-error.h - -diff --git a/configure.ac b/configure.ac -index 7aebbdb..dc9c802 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -109,6 +109,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], - [[#include ]]) - AC_CHECK_HEADERS([execinfo.h]) - -+AC_CHECK_HEADERS([error.h]) -+ - AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate]) - - # check for libdrm as a build-time dependency only -diff --git a/libweston/weston-error.h b/libweston/weston-error.h -new file mode 100644 -index 0000000..2089d02 ---- /dev/null -+++ b/libweston/weston-error.h -@@ -0,0 +1,20 @@ -+#ifndef _WESTON_ERROR_H -+#define _WESTON_ERROR_H -+ -+#if defined(HAVE_ERROR_H) -+#include -+#else -+#include -+#include -+#define _weston_error(S, E, F, ...) do { \ -+ if (E) \ -+ err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \ -+ else \ -+ err(S, F, ##__VA_ARGS__); \ -+} while(0) -+ -+#define error _weston_error -+#endif -+ -+#endif -+ -diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c -index 1adcf21..166bf3b 100644 ---- a/libweston/weston-launch.c -+++ b/libweston/weston-launch.c -@@ -33,7 +33,6 @@ - #include - #include - --#include - #include - - #include -@@ -59,6 +58,7 @@ - #endif - - #include "weston-launch.h" -+#include "weston-error.h" - - #define DRM_MAJOR 226 - diff --git a/meta-gnome/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch b/meta-gnome/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch deleted file mode 100644 index d648538..0000000 --- a/meta-gnome/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch +++ /dev/null @@ -1,173 +0,0 @@ -From b98b9dbda902225cdd972b5bff6a641c36cc7e90 Mon Sep 17 00:00:00 2001 -From: Tom Hochstein -Date: Wed, 22 Feb 2017 15:53:30 +0200 -Subject: [PATCH] weston-launch: Provide a default version that doesn't require PAM - -weston-launch requires PAM for starting weston as a non-root user. - -Since starting weston as root is a valid use case by itself, if -PAM is not available, provide a default version of weston-launch -without non-root-user support. - -Upstream-Status: Pending - -Signed-off-by: Tom Hochstein -Signed-off-by: Jussi Kukkonen -Signed-off-by: Denys Dmytriyenko - ---- - configure.ac | 9 +++++++-- - libweston/weston-launch.c | 20 ++++++++++++++++++++ - 2 files changed, 27 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index dc9c802..48cf5cb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -451,13 +451,17 @@ AC_ARG_ENABLE(resize-optimization, - AS_IF([test "x$enable_resize_optimization" = "xyes"], - [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])]) - -+AC_ARG_WITH(pam, -+ AS_HELP_STRING([--with-pam], [Use PAM]), -+ [use_pam=$withval], [use_pam=yes]) - AC_ARG_ENABLE(weston-launch, [ --enable-weston-launch],, enable_weston_launch=yes) - AM_CONDITIONAL(BUILD_WESTON_LAUNCH, test x$enable_weston_launch = xyes) --if test x$enable_weston_launch = xyes; then -+if test x$enable_weston_launch = xyes -a x$use_pam = xyes; then - WESTON_SEARCH_LIBS([PAM], [pam], [pam_open_session], [have_pam=yes], [have_pam=no]) - if test x$have_pam = xno; then -- AC_ERROR([weston-launch requires pam]) -+ AC_ERROR([PAM support is explicitly requested, but libpam couldn't be found]) - fi -+ AC_DEFINE([HAVE_PAM], [1], [Define if PAM is available]) - fi - - AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes") -@@ -702,6 +706,7 @@ AC_MSG_RESULT([ - Enable developer documentation ${enable_devdocs} - - weston-launch utility ${enable_weston_launch} -+ PAM support ${use_pam} - systemd-login support ${have_systemd_login} - systemd notify support ${enable_systemd_notify} - -diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c -index 166bf3b..6fb9232 100644 ---- a/libweston/weston-launch.c -+++ b/libweston/weston-launch.c -@@ -51,7 +51,9 @@ - - #include - #include -+#ifdef HAVE_PAM - #include -+#endif - - #ifdef HAVE_SYSTEMD_LOGIN - #include -@@ -101,8 +103,10 @@ drmSetMaster(int drm_fd) - #endif - - struct weston_launch { -+#ifdef HAVE_PAM - struct pam_conv pc; - pam_handle_t *ph; -+#endif - int tty; - int ttynr; - int sock[2]; -@@ -189,6 +193,7 @@ weston_launch_allowed(struct weston_launch *wl) - return false; - } - -+#ifdef HAVE_PAM - static int - pam_conversation_fn(int msg_count, - const struct pam_message **messages, -@@ -229,6 +234,7 @@ setup_pam(struct weston_launch *wl) - - return 0; - } -+#endif - - static int - setup_launcher_socket(struct weston_launch *wl) -@@ -422,6 +428,7 @@ quit(struct weston_launch *wl, int status) - close(wl->signalfd); - close(wl->sock[0]); - -+#ifdef HAVE_PAM - if (wl->new_user) { - err = pam_close_session(wl->ph, 0); - if (err) -@@ -429,6 +436,7 @@ quit(struct weston_launch *wl, int status) - err, pam_strerror(wl->ph, err)); - pam_end(wl->ph, err); - } -+#endif - - if (ioctl(wl->tty, KDSKBMUTE, 0) && - ioctl(wl->tty, KDSKBMODE, wl->kb_mode)) -@@ -608,6 +616,7 @@ setup_session(struct weston_launch *wl, char **child_argv) - setenv("HOME", wl->pw->pw_dir, 1); - setenv("SHELL", wl->pw->pw_shell, 1); - -+#ifdef HAVE_PAM - env = pam_getenvlist(wl->ph); - if (env) { - for (i = 0; env[i]; ++i) { -@@ -616,6 +625,7 @@ setup_session(struct weston_launch *wl, char **child_argv) - } - free(env); - } -+#endif - - /* - * We open a new session, so it makes sense -@@ -683,8 +693,10 @@ static void - help(const char *name) - { - fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name); -+#ifdef HAVE_PAM - fprintf(stderr, " -u, --user Start session as specified username,\n" - " e.g. -u joe, requires root.\n"); -+#endif - fprintf(stderr, " -t, --tty Start session on alternative tty,\n" - " e.g. -t /dev/tty4, requires -u option.\n"); - fprintf(stderr, " -v, --verbose Be verbose\n"); -@@ -698,7 +710,9 @@ main(int argc, char *argv[]) - int i, c; - char *tty = NULL; - struct option opts[] = { -+#ifdef HAVE_PAM - { "user", required_argument, NULL, 'u' }, -+#endif - { "tty", required_argument, NULL, 't' }, - { "verbose", no_argument, NULL, 'v' }, - { "help", no_argument, NULL, 'h' }, -@@ -710,9 +724,13 @@ main(int argc, char *argv[]) - while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) { - switch (c) { - case 'u': -+#ifdef HAVE_PAM - wl.new_user = optarg; - if (getuid() != 0) - error(1, 0, "Permission denied. -u allowed for root only"); -+#else -+ error(1, 0, "-u is unsupported in this weston-launch build"); -+#endif - break; - case 't': - tty = optarg; -@@ -753,8 +771,10 @@ main(int argc, char *argv[]) - if (setup_tty(&wl, tty) < 0) - exit(EXIT_FAILURE); - -+#ifdef HAVE_PAM - if (wl.new_user && setup_pam(&wl) < 0) - exit(EXIT_FAILURE); -+#endif - - if (setup_launcher_socket(&wl) < 0) - exit(EXIT_FAILURE); diff --git a/meta-gnome/recipes-graphics/wayland/weston/weston.desktop b/meta-gnome/recipes-graphics/wayland/weston/weston.desktop deleted file mode 100644 index 1086ae8..0000000 --- a/meta-gnome/recipes-graphics/wayland/weston/weston.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Name=Weston -Comment=Wayland Compostitor -Exec=weston -Icon=weston -Terminal=false -Categories=Utility; diff --git a/meta-gnome/recipes-graphics/wayland/weston/weston.png b/meta-gnome/recipes-graphics/wayland/weston/weston.png deleted file mode 100644 index ea8b7e0e233c86301a88e5bc925f09b3de2f9dec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2383 zcmV-V39$BwP)Px#AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy24YJ`L;(K){{a7>y{D4^000SaNLh0L00vqB00vqCV0pn~000Od zNklxQqBu<>r2)6lHU)*YGzD6ustAQm;suEZ zhy*;Kma`z8lfl}Zs zt(P8+CIeqHN%sZD!;$E}D=->`wJ4A{*-ZKJL!lV-N%25gfT6XP%v!n#FS3o9;k$el zEw@6~y|s39h@#XAXucVg0ZW%aSL#DjK(fo5S{d|YSh)e1F0G!WRlt)hzVZG*NdkI5 z15N8gicM(04cdm>n3{&%QE--6R?H@77?5XY$sl)Z6)5!lt3D_jSY$*2q=0V$cTzkZ zbwTT`kn9Y_lnM4C*!e(lq7zo`f|f1r49k!^0hMem6S^$f=)Y@ltl+)tUPyMy^Xv%B zzBojZFQY3;9}=c~E`YBhg%g%8L=7qvdLD*Eb8QCtFK&aj!6{1pY8wJ09mH6&4LU#O z_OoDSKRA{Gz61;c7@=ijJ8*}u-Bp=3hxMW$`r+! zjnKSFK9{dT?sc#8YTywsra*%IA;JM~=b|oWlBP{-2sUX7u0202?EA<0ylV|`hAvyK#*9d29WHCbRpF%B?F|=_k9k`2FX+- zCF~dt0@7@Tj-b*|7=y|}*un{?r4zhnEMz(sO*4BP=#OKx0xL%eajTmqLu-m;X*{V{|`$$li(87AM z6WVTzx~?!5cgS09$n@!suwgVxWsa*sO&fyQc6}TY?eaXc4=(&vo;&V_)@?!Q&_LUV z#EqWhPe5fpj;T%$RN%ViO|pj7TTh$TLHb5W_dwTu(q=Eh#51sPRBBJM6Z$?2h8c`& z{h$QAC&kmXiR1==;m#u{x0MAbjJq?mYlkFzgo*A?2K6TU56F%}aa^`60NoD=s~RxV z(0of&Pu;y2mbdE+{8Ty@d@f(99ij|a`>6Zu2Ke-TsN|t|O2G9zEE(9n6Bgfs^bL?1 z40KeokbkQlsGP^t`Pk2;v+=8bs!x6%vkR}eZd`(^e{`1=1uMS@P49!2ZQ^p@?7ty* zyxvX5gjc6dBAfX{n=3QPG?l-=AhaZRdEmXr-oO9eMlQMOZEP+W-9_@-A9 zP5@V6djYZ)|`OK z9lZv%3aLU)+{c%JF+=U}8}dOBK{D{W zNWcX$b5JrYEOxPeW@^NEcx`ivaBdIePgVzb3HT9mC`RoFfeNwp3h)?Sl~+jMp80-s zLuO5j>*7QqZV!K-ABE|C)qrf^7f9In7$Qtnx$!$bFf>d)2jjbgLYX@v?A5#MwdSGV zUQgILnE085LLe33IpBLhA!NJ8eIBq1@HDU+_ehPl1laKh;p`IM;*?=-ME);6 zEA9*?kOzJOd=r=p1M-ND759{*kWevaII={P{KphDM+LD?Pgu2mQSKH>guL3XT(c-1&a zK^y}P0DFNqfJ!|u%Yjlr7cd9d{uSdP-&}^)&6_Bm*?_&c205a&x)WIht^lWzg?`-C zqn88oZkY0~$Z9TQrB4E|smyC$?(h~gMd+&X-GW#aR1B~%z*x0&tFCOWlNI>MZcDkiHCXvpcpM70000bbVXQnWMOn=I&E)cX=Zr/dev/null 2>/dev/null; then - mkdir -p /tmp/.X11-unix - - add_weston_argument "--modules=xwayland.so" -fi diff --git a/meta-gnome/recipes-graphics/wayland/weston_5.0.0.bb b/meta-gnome/recipes-graphics/wayland/weston_5.0.0.bb deleted file mode 100644 index e517109..0000000 --- a/meta-gnome/recipes-graphics/wayland/weston_5.0.0.bb +++ /dev/null @@ -1,108 +0,0 @@ -SUMMARY = "Weston, a Wayland compositor" -DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ - file://libweston/compositor.c;endline=27;md5=6c53bbbd99273f4f7c4affa855c33c0a" - -SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://weston.png \ - file://weston.desktop \ - file://0001-make-error-portable.patch \ - file://xwayland.weston-start \ - file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ -" -SRC_URI[md5sum] = "752a04ce3c65af4884cfac4e57231bdb" -SRC_URI[sha256sum] = "15a23423bcfa45e31e1dedc0cd524ba71e2930df174fde9c99b71a537c4e4caf" - -UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" - -inherit autotools pkgconfig useradd distro_features_check -# depends on virtual/egl -REQUIRED_DISTRO_FEATURES = "opengl" - -DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg" -DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native" - -WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}" - -EXTRA_OECONF = "--enable-setuid-install \ - --disable-rdp-compositor \ - " -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd x11', d)} \ - clients launch" -# -# Compositor choices -# -# Weston on KMS -PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/mesa virtual/libgbm mtdev" -# Weston on Wayland (nested Weston) -PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,virtual/mesa" -# Weston on X11 -PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo" -# Headless Weston -PACKAGECONFIG[headless] = "--enable-headless-compositor,--disable-headless-compositor" -# Weston on framebuffer -PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,udev mtdev" -# weston-launch -PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,drm" -# VA-API desktop recorder -PACKAGECONFIG[vaapi] = "--enable-vaapi-recorder,--disable-vaapi-recorder,libva" -# Weston with EGL support -PACKAGECONFIG[egl] = "--enable-egl --enable-simple-egl-clients,--disable-egl --disable-simple-egl-clients,virtual/egl" -# Weston with cairo glesv2 support -PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo" -# Weston with lcms support -PACKAGECONFIG[lcms] = "--enable-lcms,--disable-lcms,lcms" -# Weston with webp support -PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp" -# Weston with systemd-login support -PACKAGECONFIG[systemd] = "--enable-systemd-login,--disable-systemd-login,systemd dbus" -# Weston with Xwayland support (requires X11 and Wayland) -PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland" -# colord CMS support -PACKAGECONFIG[colord] = "--enable-colord,--disable-colord,colord" -# Clients support -PACKAGECONFIG[clients] = "--enable-clients --enable-simple-clients --enable-demo-clients-install,--disable-clients --disable-simple-clients" -# Weston with PAM support -PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" - -do_install_append() { - # Weston doesn't need the .la files to load modules, so wipe them - rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la - - # If X11, ship a desktop file to launch it - if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then - install -d ${D}${datadir}/applications - install ${WORKDIR}/weston.desktop ${D}${datadir}/applications - - install -d ${D}${datadir}/icons/hicolor/48x48/apps - install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps - fi - - if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then - install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland - fi -} - -PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \ - libweston-${WESTON_MAJOR_VERSION} ${PN}-examples" - -FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so ${datadir}" - -FILES_libweston-${WESTON_MAJOR_VERSION} = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.so" -SUMMARY_libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wayland window managers'." - -FILES_${PN}-examples = "${bindir}/*" - -FILES_${PN}-xwayland = "${libdir}/libweston-${WESTON_MAJOR_VERSION}/xwayland.so" -RDEPENDS_${PN}-xwayland += "xserver-xorg-xwayland" - -RDEPENDS_${PN} += "xkeyboard-config" -RRECOMMENDS_${PN} = "weston-conf liberation-fonts" -RRECOMMENDS_${PN}-dev += "wayland-protocols" - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system weston-launch" diff --git a/meta-gnome/recipes-support/ibus/ibus/0001-strip-out-dbus-build-dep.patch b/meta-gnome/recipes-support/ibus/ibus/0001-strip-out-dbus-build-dep.patch new file mode 100644 index 0000000..4319761 --- /dev/null +++ b/meta-gnome/recipes-support/ibus/ibus/0001-strip-out-dbus-build-dep.patch @@ -0,0 +1,29 @@ +ibus: Don't run dbus tests within the build. + + Prevent a test requiring spawning a dbus session from running + during the build. + + Upstream-status: Inappropriate [disable-feature] + + Signed-off-by: Brendan Kerrigan + +diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh +index 9c650e9..d7320c3 100755 +--- a/data/dconf/make-dconf-override-db.sh ++++ b/data/dconf/make-dconf-override-db.sh +@@ -12,10 +12,6 @@ export XDG_CACHE_HOME="$TMPDIR/cache" + export GSETTINGS_SCHEMA_DIR="$TMPDIR/schemas" + mkdir -p $XDG_CONFIG_HOME $XDG_CACHE_HOME $GSETTINGS_SCHEMA_DIR + +-eval `dbus-launch --sh-syntax` +- +-trap 'rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID' ERR +- + # in case that schema is not installed on the system + glib-compile-schemas --targetdir "$GSETTINGS_SCHEMA_DIR" "$PWD" + +@@ -47,4 +43,3 @@ done + + rm -rf $TMPDIR + +-kill $DBUS_SESSION_BUS_PID diff --git a/meta-gnome/recipes-support/ibus/ibus/0002-decorate-automake-for-valaflags.patch b/meta-gnome/recipes-support/ibus/ibus/0002-decorate-automake-for-valaflags.patch new file mode 100644 index 0000000..b15fec1 --- /dev/null +++ b/meta-gnome/recipes-support/ibus/ibus/0002-decorate-automake-for-valaflags.patch @@ -0,0 +1,46 @@ +ibus: Add automake decorations to sed in appropriate paths + + Multiple vapidir paths are required to build ibus correctly, + so decorations are added to the automake files to allow for + sed'ing the appropriate path during do_configure_prepend. + + Upstream-status: Inappropriate [configuration] + + Signed-off-by: Brendan Kerrigan + +diff --git a/engine/Makefile.am b/engine/Makefile.am +index 86f0e2b..7e922b5 100644 +--- a/engine/Makefile.am ++++ b/engine/Makefile.am +@@ -53,6 +53,7 @@ AM_VALAFLAGS = \ + --vapidir=$(top_builddir)/bindings/vala \ + --pkg=ibus-1.0 \ + --target-glib="$(VALA_TARGET_GLIB_VERSION)" \ ++ @EXTRA_AM_VALAFLAGS@ \ + $(NULL) + + libexec_PROGRAMS = \ +diff --git a/tools/Makefile.am b/tools/Makefile.am +index 5c18d3d..fe727c1 100644 +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -61,6 +61,7 @@ AM_VALAFLAGS = \ + --pkg=posix \ + --pkg=config \ + --target-glib="$(VALA_TARGET_GLIB_VERSION)" \ ++ @EXTRA_AM_VALAFLAGS@ \ + $(NULL) + + bin_PROGRAMS = ibus +diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am +index aaba7a4..ba48175 100644 +--- a/ui/gtk3/Makefile.am ++++ b/ui/gtk3/Makefile.am +@@ -80,6 +80,7 @@ AM_VALAFLAGS = \ + --pkg=xi \ + --pkg=gdk-wayland \ + --target-glib="$(VALA_TARGET_GLIB_VERSION)" \ ++ @EXTRA_AM_VALAFLAGS@ \ + $(NULL) + + if ENABLE_LIBNOTIFY diff --git a/meta-gnome/recipes-support/ibus/ibus_1.5.17.bb b/meta-gnome/recipes-support/ibus/ibus_1.5.17.bb deleted file mode 100644 index f964652..0000000 --- a/meta-gnome/recipes-support/ibus/ibus_1.5.17.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Intelligent input bus for Linux/Unix" -HOMEPAGE = "https://github.com/ibus/ibus/wiki" - -LICENSE = "Unicode & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING.unicode;md5=53c2b911a997d7831df75e1c37f3c4b4 \ - file://COPYING;md5=fbc093901857fcd118f065f900982c24" - -SRC_URI = "https://github.com/ibus/ibus/releases/download/${PV}/ibus-${PV}.tar.gz" -SRC_URI[md5sum] = "8bb26453d0d1fa58e56c22668aaa8786" -SRC_URI[sha256sum] = "0347a8055977ca458e8add750af5f9b76e1a524844cc3b0e2fad70ce153dd219" - -S = "${WORKDIR}/${BPN}-${PV}" - -FILES_${PN} += "\ - ${datadir}/icons/hicolor \ - ${datadir}/GConf/gsettings \ - ${datadir}/dbus-1/services \ - ${datadir}/bash-completion/completions \ - ${datadir}/glib-2.0/schemas \ - ${libdir}/gtk-3.0/3.0.0/immodules/im-ibus.so \ -" - -DEPENDS = "libx11 wayland intltool-native libnotify iso-codes dbus dconf libxkbcommon glib-2.0 gtk+3 gobject-introspection gconf glib-2.0-native" - -inherit gettext pythonnative pkgconfig gconf autotools gobject-introspection vala - -EXTRA_OECONF = "--disable-gtk2 --disable-tests --enable-wayland --disable-emoji-dict --disable-python-library" - diff --git a/meta-gnome/recipes-support/ibus/ibus_1.5.19.bb b/meta-gnome/recipes-support/ibus/ibus_1.5.19.bb new file mode 100644 index 0000000..19ae052 --- /dev/null +++ b/meta-gnome/recipes-support/ibus/ibus_1.5.19.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "Intelligent Input Bus for Linux/Unix" +LICENSE = "LGPLv2.1" +DEPENDS = "prelink \ + glib-2.0 \ + gsettings-desktop-schemas \ + json-glib \ + gnome-desktop \ + gettext-native \ + intltool-native \ + dconf \ + libnotify \ + gconf-native \ + gtk+ \ + " + +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +SRC_URI = " \ + https://github.com/ibus/ibus/releases/download/${PV}/${PN}-${PV}.tar.gz \ + file://0001-strip-out-dbus-build-dep.patch \ + file://0002-decorate-automake-for-valaflags.patch \ + " + +SRC_URI[md5sum] = "a2be6f200dd9ada2501474a6877a73ef" +SRC_URI[sha256sum] = "4b66c798dab093f0fa738e5c10688d395a463287d13678c208a81051af5d2429" +S = "${WORKDIR}/${PN}-${PV}" + +inherit autotools pkgconfig gtk-doc distro_features_check vala gobject-introspection + +FILES_${PN} += "${datadir}" +FILES_${PN} += "${libdir}" + +EXTRA_OECONF += " --disable-emoji-dict --disable-unicode-dict --disable-tests " + +do_configure_prepend() { + touch ${S}/ChangeLog + sed -i "s^@EXTRA_AM_VALAFLAGS@^--vapidir=${RECIPE_SYSROOT_NATIVE}${datadir}/vala-0.38/vapi --vapidir=${B}/bindings/vala --pkg gio-2.0^g" ${S}/tools/Makefile.am + sed -i "s^@EXTRA_AM_VALAFLAGS@^--vapidir=${RECIPE_SYSROOT_NATIVE}${datadir}/vala-0.38/vapi --vapidir=${B}/bindings/vala --pkg gio-2.0^g" ${S}/engine/Makefile.am + sed -i "s^@EXTRA_AM_VALAFLAGS@^--vapidir=${RECIPE_SYSROOT_NATIVE}${datadir}/vala-0.38/vapi --vapidir=${B}/bindings/vala --pkg gio-2.0^g" ${S}/ui/gtk3/Makefile.am +} + diff --git a/meta-gnome/recipes-support/jansson/jansson_2.12.bb b/meta-gnome/recipes-support/jansson/jansson_2.12.bb new file mode 100644 index 0000000..3cc353e --- /dev/null +++ b/meta-gnome/recipes-support/jansson/jansson_2.12.bb @@ -0,0 +1,13 @@ +SUMMARY = "Jansson is a C library for encoding, decoding and manipulating JSON data" +HOMEPAGE = "http://www.digip.org/jansson/" +BUGTRACKER = "https://github.com/akheron/jansson/issues" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fc2548c0eb83800f29330040e18b5a05" + +SRC_URI = "http://www.digip.org/jansson/releases/${BPN}-${PV}.tar.gz" + +SRC_URI[md5sum] = "0ed1f3a924604aae68067c214b0010ef" +SRC_URI[sha256sum] = "5f8dec765048efac5d919aded51b26a32a05397ea207aa769ff6b53c7027d2c9" + +inherit autotools pkgconfig + diff --git a/meta-gnome/recipes-support/mozjs/mozjs/0001-compare-the-first-character-of-string-to-be-null-or-.patch b/meta-gnome/recipes-support/mozjs/mozjs/0001-compare-the-first-character-of-string-to-be-null-or-.patch deleted file mode 100644 index 40d646c..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs/0001-compare-the-first-character-of-string-to-be-null-or-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f36c9476d2816e0d3e61c9e13c22ed73883cb54a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 24 Apr 2017 12:13:43 -0700 -Subject: [PATCH] compare the first character of string to be null or not - -Fixes - -error: ISO C++ forbids comparison between pointer and integer [-fpermissive] -| if (value[0] == '\0') -| ^~~~ - -Signed-off-by: Khem Raj ---- - js/src/shell/jsoptparse.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/js/src/shell/jsoptparse.cpp b/js/src/shell/jsoptparse.cpp -index b49d0a5..612aa00 100644 ---- a/js/src/shell/jsoptparse.cpp -+++ b/js/src/shell/jsoptparse.cpp -@@ -243,7 +243,7 @@ OptionParser::extractValue(size_t argc, char **argv, size_t *i, char **value) - char *eq = strchr(argv[*i], '='); - if (eq) { - *value = eq + 1; -- if (value[0] == '\0') -+ if (value[0][0] == '\0') - return error("A value is required for option %.*s", eq - argv[*i], argv[*i]); - return Okay; - } --- -2.12.2 - diff --git a/meta-gnome/recipes-support/mozjs/mozjs/0001-do-not-create-python-environment.patch b/meta-gnome/recipes-support/mozjs/mozjs/0001-do-not-create-python-environment.patch new file mode 100644 index 0000000..ba317bc --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/mozjs/0001-do-not-create-python-environment.patch @@ -0,0 +1,91 @@ +From 5028d1cd669c179ed49061316d04c8e8862a5bd8 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Thu, 12 Jul 2018 15:04:47 +0800 +Subject: [PATCH 1/5] do not create python environment + +Use oe's python environment rather than create one of host + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia +--- + build/moz.configure/init.configure | 18 ------------------ + configure.py | 10 +++++++++- + js/src/old-configure | 4 ++-- + 3 files changed, 11 insertions(+), 21 deletions(-) + +diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure +index 2123beb..6fe6591 100644 +--- a/build/moz.configure/init.configure ++++ b/build/moz.configure/init.configure +@@ -179,24 +179,6 @@ def virtualenv_python(env_python, build_env, mozconfig, help): + else: + python = sys.executable + +- if not manager.up_to_date(python): +- log.info('Creating Python environment') +- manager.build(python) +- +- python = normsep(manager.python_path) +- +- if python != normsep(sys.executable): +- log.info('Reexecuting in the virtualenv') +- if env_python: +- del os.environ['PYTHON'] +- # One would prefer to use os.execl, but that's completely borked on +- # Windows. +- sys.exit(subprocess.call([python] + sys.argv)) +- +- # We are now in the virtualenv +- if not distutils.sysconfig.get_python_lib(): +- die('Could not determine python site packages directory') +- + return python + + set_config('PYTHON', virtualenv_python) +diff --git a/configure.py b/configure.py +index f7392d0..45323a5 100644 +--- a/configure.py ++++ b/configure.py +@@ -12,7 +12,15 @@ import textwrap + + + base_dir = os.path.abspath(os.path.dirname(__file__)) +-sys.path.insert(0, os.path.join(base_dir, 'python', 'mozbuild')) ++sys.path.insert(0, os.path.join(base_dir, 'config')) ++def get_immediate_subdirectories(a_dir): ++ return [name for name in os.listdir(a_dir) ++ if os.path.isdir(os.path.join(a_dir, name))] ++for s in ["python", "testing/mozbase"]: ++ sub_dir = os.path.join(base_dir, s) ++ for module_dir in get_immediate_subdirectories(sub_dir): ++ sys.path.insert(0, os.path.join(sub_dir, module_dir)) ++ + from mozbuild.configure import ConfigureSandbox + from mozbuild.util import ( + indented_repr, +diff --git a/js/src/old-configure b/js/src/old-configure +index ee4527b..75b00e1 100644 +--- a/js/src/old-configure ++++ b/js/src/old-configure +@@ -10512,7 +10512,7 @@ if test "$MOZ_BUILD_APP" != js -o -n "$JS_STANDALONE"; then + ;; + esac + +- eval $dumpenv $PYTHON $_topsrcdir/build/subconfigure.py --prepare "$srcdir" "$moz_config_dir" "$_CONFIG_SHELL" $ac_configure_args ++ eval $dumpenv PYTHONPATH=$_topsrcdir/python/mozbuild/ $PYTHON $_topsrcdir/build/subconfigure.py --prepare "$srcdir" "$moz_config_dir" "$_CONFIG_SHELL" $ac_configure_args + + done + +@@ -10931,7 +10931,7 @@ if test "$JS_STANDALONE"; then + + if test "$no_recursion" != yes; then + trap '' EXIT +- if ! $PYTHON $_topsrcdir/build/subconfigure.py --list subconfigures --skip skip_subconfigures; then ++ if ! PYTHONPATH=$_topsrcdir/python/mozbuild/ $PYTHON $_topsrcdir/build/subconfigure.py --list subconfigures --skip skip_subconfigures; then + exit 1 + fi + fi +-- +2.7.4 + diff --git a/meta-gnome/recipes-support/mozjs/mozjs/0001-fix-compiling-failure-on-mips64-n32-bsp.patch b/meta-gnome/recipes-support/mozjs/mozjs/0001-fix-compiling-failure-on-mips64-n32-bsp.patch new file mode 100644 index 0000000..bc1af3c --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/mozjs/0001-fix-compiling-failure-on-mips64-n32-bsp.patch @@ -0,0 +1,79 @@ +From 5ad700c92224193bfc789f7d53af38fc6f8b8904 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Thu, 19 Jul 2018 17:31:35 +0800 +Subject: [PATCH] fix compiling failure on mips64-n32 bsp + +- Tweak mips64-n32 with mips32 + +- The toolchain of mips64-n32 supports both of macro + `__mips64' and `__mips__', but 32bit is required here. + +- N32 uses 64-bit registers but restricts addresses to 32 bits. + https://www.linux-mips.org/pub/linux/mips/doc/ABI/MIPS-N32-ABI-Handbook.pdf + Table 2-1 specifies the use of registers in n32 and native 64-bit mode. + From the table, N32 and N64 have the same registers + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia +--- + build/moz.configure/init.configure | 5 ++++- + js/src/jit/mips-shared/Architecture-mips-shared.h | 4 +++- + python/mozbuild/mozbuild/configure/constants.py | 2 +- + 3 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure +index 6fe6591..a77b46c 100644 +--- a/build/moz.configure/init.configure ++++ b/build/moz.configure/init.configure +@@ -357,7 +357,10 @@ def split_triplet(triplet): + canonical_cpu = 'mips32' + endianness = 'little' if 'el' in cpu else 'big' + elif cpu in ('mips64', 'mips64el'): +- canonical_cpu = 'mips64' ++ if 'n32' in triplet: ++ canonical_cpu = 'mips32' ++ else: ++ canonical_cpu = 'mips64' + endianness = 'little' if 'el' in cpu else 'big' + elif cpu.startswith('aarch64'): + canonical_cpu = 'aarch64' +diff --git a/js/src/jit/mips-shared/Architecture-mips-shared.h b/js/src/jit/mips-shared/Architecture-mips-shared.h +index 7afe305..c6e29dc 100644 +--- a/js/src/jit/mips-shared/Architecture-mips-shared.h ++++ b/js/src/jit/mips-shared/Architecture-mips-shared.h +@@ -24,6 +24,8 @@ + #define USES_O32_ABI + #elif (defined(_MIPS_SIM) && (_MIPS_SIM == _ABI64)) || defined(JS_SIMULATOR_MIPS64) + #define USES_N64_ABI ++#elif (defined(_MIPS_SIM) && (_MIPS_SIM == _ABIN32)) ++#define USES_N32_ABI + #else + #error "Unsupported ABI" + #endif +@@ -91,7 +93,7 @@ class Registers + ta1 = t5, + ta2 = t6, + ta3 = t7, +-#elif defined(USES_N64_ABI) ++#elif defined(USES_N64_ABI) || defined(USES_N32_ABI) + a4 = r8, + a5 = r9, + a6 = r10, +diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py +index dfc7cf8..27f83ab 100644 +--- a/python/mozbuild/mozbuild/configure/constants.py ++++ b/python/mozbuild/mozbuild/configure/constants.py +@@ -83,8 +83,8 @@ CPU_preprocessor_checks = OrderedDict(( + ('hppa', '__hppa__'), + ('sparc64', '__sparc__ && __arch64__'), + ('sparc', '__sparc__'), +- ('mips64', '__mips64'), + ('mips32', '__mips__'), ++ ('mips64', '__mips64'), + )) + + assert sorted(CPU_preprocessor_checks.keys()) == sorted(CPU.POSSIBLE_VALUES) +-- +2.7.4 + diff --git a/meta-gnome/recipes-support/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch b/meta-gnome/recipes-support/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch index bc141d9..c111ea5 100644 --- a/meta-gnome/recipes-support/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch +++ b/meta-gnome/recipes-support/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch @@ -3,33 +3,31 @@ From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 6 Jun 2013 18:36:01 +0200 Subject: [PATCH] js.pc.in: do not include RequiredDefines.h for depending packages -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit in our cross environment the would fail with: | cc1: fatal error: /usr/include/js-17.0/js/RequiredDefines.h: No such file or directory and currently it only defines __STDC_LIMIT_MACROS - Upstream-Status: Inappropriate [embedded specific] - Signed-off-by: Andreas Müller ---- - js.pc.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) -diff --git a/js.pc.in b/js.pc.in -index 13d761d..a95a7bd 100644 ---- a/js.pc.in -+++ b/js.pc.in +Rebase to 52.8.1 +Signed-off-by: Hongxu Jia +--- + js/src/js.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/js/src/js.pc.in b/js/src/js.pc.in +index 2eae393..c2dea62 100644 +--- a/js/src/js.pc.in ++++ b/js/src/js.pc.in @@ -8,4 +8,4 @@ Description: The Mozilla library for JavaScript Version: @MOZILLA_VERSION@ - Requires.private: @NSPR_PKGCONF_CHECK@ - Libs: -L${libdir} -l@LIBRARY_NAME@ --Cflags: -include ${includedir}/@MODULE@/js/RequiredDefines.h -I${includedir}/@MODULE@ -+Cflags: -I${includedir}/@MODULE@ + @PKGCONF_REQUIRES_PRIVATE@ + Libs: -L${libdir} -l@JS_LIBRARY_NAME@ +-Cflags: -include ${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -I${includedir}/@JS_LIBRARY_NAME@ ++Cflags: -I${includedir}/@JS_LIBRARY_NAME@ -- -1.7.6.5 +2.7.4 diff --git a/meta-gnome/recipes-support/mozjs/mozjs/0001-mozjs-fix-coredump-caused-by-getenv.patch b/meta-gnome/recipes-support/mozjs/mozjs/0001-mozjs-fix-coredump-caused-by-getenv.patch new file mode 100644 index 0000000..477f73a --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/mozjs/0001-mozjs-fix-coredump-caused-by-getenv.patch @@ -0,0 +1,27 @@ +From 20b639b7364f9953fdacb058f9ba800bcbf029b4 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 2 Aug 2018 09:40:48 +0800 +Subject: [PATCH] mozjs: fix coredump caused by getenv + +Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1480315] + +Signed-off-by: Changqing Li +--- + mozglue/misc/TimeStamp.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mozglue/misc/TimeStamp.cpp b/mozglue/misc/TimeStamp.cpp +index 932b75c..7a4d71b 100644 +--- a/mozglue/misc/TimeStamp.cpp ++++ b/mozglue/misc/TimeStamp.cpp +@@ -11,6 +11,7 @@ + #include "mozilla/TimeStamp.h" + #include + #include ++#include + + namespace mozilla { + +-- +2.7.4 + diff --git a/meta-gnome/recipes-support/mozjs/mozjs/0001-mozjs17.0.0-fix-the-compile-bug-of-powerpc.patch b/meta-gnome/recipes-support/mozjs/mozjs/0001-mozjs17.0.0-fix-the-compile-bug-of-powerpc.patch deleted file mode 100644 index de72d4f..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs/0001-mozjs17.0.0-fix-the-compile-bug-of-powerpc.patch +++ /dev/null @@ -1,36 +0,0 @@ -From da3929a96d9c74e11bf37d128890e18fcb745365 Mon Sep 17 00:00:00 2001 -From: Lei Maohui -Date: Mon, 26 Jan 2015 08:53:19 +0900 -Subject: [PATCH] mozjs17.0.0: fix the compile bug of powerpc - -To fix the bug as following - -error: cannot convert '__va_list_tag**' to '__va_list_tag (*)[1]' for -argument '5' to 'JSBool TryArgumentFormatter(JSContext*, const char**, -JSBool, jsval**, __va_list_tag (*)[1])' - -Signed-off-by: Lei Maohui ---- - jscpucfg.h | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/jscpucfg.h b/jscpucfg.h -index dfb1c14..8683491 100644 ---- a/jscpucfg.h -+++ b/jscpucfg.h -@@ -47,6 +47,12 @@ - #elif defined(JS_HAVE_ENDIAN_H) - # include - -+#if defined(_POWER) || defined(__powerpc__) || \ -+ defined(__ppc__) -+# define HAVE_VA_LIST_AS_ARRAY 1 -+# endif -+ -+ - # if defined(__BYTE_ORDER) - # if __BYTE_ORDER == __LITTLE_ENDIAN - # define IS_LITTLE_ENDIAN 1 --- -1.8.4.2 - diff --git a/meta-gnome/recipes-support/mozjs/mozjs/0001-regenerate-configure.patch b/meta-gnome/recipes-support/mozjs/mozjs/0001-regenerate-configure.patch deleted file mode 100644 index fa413ea..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs/0001-regenerate-configure.patch +++ /dev/null @@ -1,3238 +0,0 @@ -From 6440b4901c6f4bcc69686ff10806e311cc5a927b Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Tue, 3 Mar 2015 19:12:17 +0800 -Subject: [PATCH] regenerate configure with autoconf-2.13 - -Signed-off-by: Koen Kooi -Upstream-status: Inappropriate [generated file] - ---- - js/src/configure | 838 ++++++++++++++++++++++++++----------------------------- - 1 file changed, 389 insertions(+), 449 deletions(-) - -diff --git a/js/src/configure b/js/src/configure -index cb6b41b..b05298f 100755 ---- a/js/src/configure -+++ b/js/src/configure -@@ -5757,6 +5757,10 @@ arm*) - CPU_ARCH=arm - ;; - -+aarch64*) -+ CPU_ARCH=aarch64 -+ ;; -+ - mips|mipsel) - CPU_ARCH="mips" - ;; -@@ -5893,14 +5897,14 @@ no) - _SAVE_CFLAGS="$CFLAGS" - CFLAGS="$arch_flag" - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - MOZ_THUMB2=1 - else -@@ -5972,16 +5976,16 @@ if test -n "$all_flags"; then - _SAVE_CFLAGS="$CFLAGS" - CFLAGS="$all_flags" - echo $ac_n "checking whether the chosen combination of compiler flags ($all_flags) works""... $ac_c" 1>&6 --echo "configure:5976: checking whether the chosen combination of compiler flags ($all_flags) works" >&5 -+echo "configure:5980: checking whether the chosen combination of compiler flags ($all_flags) works" >&5 - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - else -@@ -6004,18 +6008,18 @@ fi - - if test "$CPU_ARCH" = "arm"; then - echo $ac_n "checking for ARM SIMD support in compiler""... $ac_c" 1>&6 --echo "configure:6008: checking for ARM SIMD support in compiler" >&5 -+echo "configure:6012: checking for ARM SIMD support in compiler" >&5 - # We try to link so that this also fails when - # building with LTO. - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - result="yes" - else -@@ -6038,18 +6042,18 @@ EOF - fi - - echo $ac_n "checking for ARM NEON support in compiler""... $ac_c" 1>&6 --echo "configure:6042: checking for ARM NEON support in compiler" >&5 -+echo "configure:6046: checking for ARM NEON support in compiler" >&5 - # We try to link so that this also fails when - # building with LTO. - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - result="yes" - else -@@ -6094,7 +6098,7 @@ configure_static_assert_macros=' - ' - - echo $ac_n "checking that static assertion macros used in autoconf tests work""... $ac_c" 1>&6 --echo "configure:6098: checking that static assertion macros used in autoconf tests work" >&5 -+echo "configure:6102: checking that static assertion macros used in autoconf tests work" >&5 - if eval "test \"`echo '$''{'ac_cv_static_assertion_macros_work'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6108,14 +6112,14 @@ cross_compiling=$ac_cv_prog_cc_cross - - ac_cv_static_assertion_macros_work="yes" - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -6125,14 +6129,14 @@ else - fi - rm -f conftest* - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_static_assertion_macros_work="no" - else -@@ -6148,14 +6152,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes - cross_compiling=$ac_cv_prog_cxx_cross - - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -6165,14 +6169,14 @@ else - fi - rm -f conftest* - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_static_assertion_macros_work="no" - else -@@ -6317,7 +6321,7 @@ if test "$GNU_CC"; then - _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Wall -Wpointer-arith -Wdeclaration-after-statement" - - echo $ac_n "checking whether the C compiler supports -Werror=return-type""... $ac_c" 1>&6 --echo "configure:6321: checking whether the C compiler supports -Werror=return-type" >&5 -+echo "configure:6325: checking whether the C compiler supports -Werror=return-type" >&5 - if eval "test \"`echo '$''{'ac_c_has_werror_return_type'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6333,14 +6337,14 @@ cross_compiling=$ac_cv_prog_cc_cross - _SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Werror -Werror=return-type" - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_c_has_werror_return_type="yes" - else -@@ -6368,7 +6372,7 @@ echo "$ac_t""$ac_c_has_werror_return_type" 1>&6 - - - echo $ac_n "checking whether the C compiler supports -Wtype-limits""... $ac_c" 1>&6 --echo "configure:6372: checking whether the C compiler supports -Wtype-limits" >&5 -+echo "configure:6376: checking whether the C compiler supports -Wtype-limits" >&5 - if eval "test \"`echo '$''{'ac_c_has_wtype_limits'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6384,14 +6388,14 @@ cross_compiling=$ac_cv_prog_cc_cross - _SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Werror -Wtype-limits" - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_c_has_wtype_limits="yes" - else -@@ -6419,7 +6423,7 @@ echo "$ac_t""$ac_c_has_wtype_limits" 1>&6 - - - echo $ac_n "checking whether the C compiler supports -Wempty-body""... $ac_c" 1>&6 --echo "configure:6423: checking whether the C compiler supports -Wempty-body" >&5 -+echo "configure:6427: checking whether the C compiler supports -Wempty-body" >&5 - if eval "test \"`echo '$''{'ac_c_has_wempty_body'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6435,14 +6439,14 @@ cross_compiling=$ac_cv_prog_cc_cross - _SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Werror -Wempty-body" - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_c_has_wempty_body="yes" - else -@@ -6476,7 +6480,7 @@ echo "$ac_t""$ac_c_has_wempty_body" 1>&6 - _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Wno-unused" - - echo $ac_n "checking whether the C compiler supports -Wno-overlength-strings""... $ac_c" 1>&6 --echo "configure:6480: checking whether the C compiler supports -Wno-overlength-strings" >&5 -+echo "configure:6484: checking whether the C compiler supports -Wno-overlength-strings" >&5 - if eval "test \"`echo '$''{'ac_c_has_wno_overlength_strings'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6492,14 +6496,14 @@ cross_compiling=$ac_cv_prog_cc_cross - _SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Werror -Woverlength-strings" - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_c_has_wno_overlength_strings="yes" - else -@@ -6580,7 +6584,7 @@ if test "$GNU_CXX"; then - _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wall -Wpointer-arith -Woverloaded-virtual" - - echo $ac_n "checking whether the C++ compiler supports -Werror=return-type""... $ac_c" 1>&6 --echo "configure:6584: checking whether the C++ compiler supports -Werror=return-type" >&5 -+echo "configure:6588: checking whether the C++ compiler supports -Werror=return-type" >&5 - if eval "test \"`echo '$''{'ac_cxx_has_werror_return_type'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6596,14 +6600,14 @@ cross_compiling=$ac_cv_prog_cxx_cross - _SAVE_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -Werror -Werror=return-type" - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cxx_has_werror_return_type="yes" - else -@@ -6631,7 +6635,7 @@ echo "$ac_t""$ac_cxx_has_werror_return_type" 1>&6 - - - echo $ac_n "checking whether the C++ compiler supports -Wtype-limits""... $ac_c" 1>&6 --echo "configure:6635: checking whether the C++ compiler supports -Wtype-limits" >&5 -+echo "configure:6639: checking whether the C++ compiler supports -Wtype-limits" >&5 - if eval "test \"`echo '$''{'ac_cxx_has_wtype_limits'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6647,14 +6651,14 @@ cross_compiling=$ac_cv_prog_cxx_cross - _SAVE_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -Werror -Wtype-limits" - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cxx_has_wtype_limits="yes" - else -@@ -6682,7 +6686,7 @@ echo "$ac_t""$ac_cxx_has_wtype_limits" 1>&6 - - - echo $ac_n "checking whether the C++ compiler supports -Wempty-body""... $ac_c" 1>&6 --echo "configure:6686: checking whether the C++ compiler supports -Wempty-body" >&5 -+echo "configure:6690: checking whether the C++ compiler supports -Wempty-body" >&5 - if eval "test \"`echo '$''{'ac_cxx_has_wempty_body'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6698,14 +6702,14 @@ cross_compiling=$ac_cv_prog_cxx_cross - _SAVE_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -Werror -Wempty-body" - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cxx_has_wempty_body="yes" - else -@@ -6741,7 +6745,7 @@ echo "$ac_t""$ac_cxx_has_wempty_body" 1>&6 - _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wno-ctor-dtor-privacy" - - echo $ac_n "checking whether the C++ compiler supports -Wno-overlength-strings""... $ac_c" 1>&6 --echo "configure:6745: checking whether the C++ compiler supports -Wno-overlength-strings" >&5 -+echo "configure:6749: checking whether the C++ compiler supports -Wno-overlength-strings" >&5 - if eval "test \"`echo '$''{'ac_cxx_has_wno_overlength_strings'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6757,14 +6761,14 @@ cross_compiling=$ac_cv_prog_cxx_cross - _SAVE_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -Werror -Woverlength-strings" - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cxx_has_wno_overlength_strings="yes" - else -@@ -6792,7 +6796,7 @@ echo "$ac_t""$ac_cxx_has_wno_overlength_strings" 1>&6 - - - echo $ac_n "checking whether the C++ compiler supports -Wno-invalid-offsetof""... $ac_c" 1>&6 --echo "configure:6796: checking whether the C++ compiler supports -Wno-invalid-offsetof" >&5 -+echo "configure:6800: checking whether the C++ compiler supports -Wno-invalid-offsetof" >&5 - if eval "test \"`echo '$''{'ac_cxx_has_wno_invalid_offsetof'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6808,14 +6812,14 @@ cross_compiling=$ac_cv_prog_cxx_cross - _SAVE_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -Werror -Winvalid-offsetof" - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cxx_has_wno_invalid_offsetof="yes" - else -@@ -6843,7 +6847,7 @@ echo "$ac_t""$ac_cxx_has_wno_invalid_offsetof" 1>&6 - - - echo $ac_n "checking whether the C++ compiler supports -Wno-variadic-macros""... $ac_c" 1>&6 --echo "configure:6847: checking whether the C++ compiler supports -Wno-variadic-macros" >&5 -+echo "configure:6851: checking whether the C++ compiler supports -Wno-variadic-macros" >&5 - if eval "test \"`echo '$''{'ac_cxx_has_wno_variadic_macros'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6859,14 +6863,14 @@ cross_compiling=$ac_cv_prog_cxx_cross - _SAVE_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -Werror -Wvariadic-macros" - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cxx_has_wno_variadic_macros="yes" - else -@@ -6918,7 +6922,7 @@ echo "$ac_t""$ac_cxx_has_wno_variadic_macros" 1>&6 - _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wno-c++0x-extensions" - - echo $ac_n "checking whether the C++ compiler supports -Wno-extended-offsetof""... $ac_c" 1>&6 --echo "configure:6922: checking whether the C++ compiler supports -Wno-extended-offsetof" >&5 -+echo "configure:6926: checking whether the C++ compiler supports -Wno-extended-offsetof" >&5 - if eval "test \"`echo '$''{'ac_cxx_has_wno_extended_offsetof'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6934,14 +6938,14 @@ cross_compiling=$ac_cv_prog_cxx_cross - _SAVE_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -Werror -Wextended-offsetof" - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cxx_has_wno_extended_offsetof="yes" - else -@@ -6979,7 +6983,7 @@ MKSHLIB_UNFORCE_ALL= - if test "$COMPILE_ENVIRONMENT"; then - if test "$GNU_CC"; then - echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6 --echo "configure:6983: checking whether ld has archive extraction flags" >&5 -+echo "configure:6987: checking whether ld has archive extraction flags" >&5 - if eval "test \"`echo '$''{'ac_cv_mkshlib_force_and_unforce'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6996,14 +7000,14 @@ LOOP_INPUT - LDFLAGS=$force - LIBS=$unforce - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_mkshlib_force_and_unforce=$line; break - else -@@ -7038,16 +7042,16 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6 --echo "configure:7042: checking for 64-bit OS" >&5 -+echo "configure:7046: checking for 64-bit OS" >&5 - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - result="yes" - else -@@ -7170,7 +7174,7 @@ case "$host" in - esac - - echo $ac_n "checking for Python version >= $PYTHON_VERSION but not 3.x""... $ac_c" 1>&6 --echo "configure:7174: checking for Python version >= $PYTHON_VERSION but not 3.x" >&5 -+echo "configure:7178: checking for Python version >= $PYTHON_VERSION but not 3.x" >&5 - - $PYTHON -c "import sys; sys.exit(sys.version[:3] < sys.argv[1] or sys.version[:2] != '2.')" $PYTHON_VERSION - _python_res=$? -@@ -7181,7 +7185,7 @@ fi - echo "$ac_t""yes" 1>&6 - - echo $ac_n "checking for custom implementation""... $ac_c" 1>&6 --echo "configure:7185: checking for custom implementation" >&5 -+echo "configure:7189: checking for custom implementation" >&5 - if test "$MOZ_CUSTOM_STDINT_H"; then - cat >> confdefs.pytmp <&6 --echo "configure:7302: checking for $ac_hdr" >&5 -+echo "configure:7306: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -7311,7 +7315,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:7315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -7394,17 +7398,17 @@ EOF - # builds. - _SAVE_LDFLAGS=$LDFLAGS - echo $ac_n "checking for -framework ExceptionHandling""... $ac_c" 1>&6 --echo "configure:7398: checking for -framework ExceptionHandling" >&5 -+echo "configure:7402: checking for -framework ExceptionHandling" >&5 - LDFLAGS="$LDFLAGS -framework ExceptionHandling" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_have_framework_exceptionhandling="yes" - else -@@ -7426,18 +7430,18 @@ rm -f conftest* - echo "Skipping -dead_strip because DTrace is enabled. See bug 403132." - else - echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6 --echo "configure:7430: checking for -dead_strip option to ld" >&5 -+echo "configure:7434: checking for -dead_strip option to ld" >&5 - _SAVE_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -Wl,-dead_strip" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - _HAVE_DEAD_STRIP=1 - else -@@ -7783,12 +7787,12 @@ EOF - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:7787: checking for $ac_hdr" >&5 -+echo "configure:7791: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -7796,7 +7800,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:7800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -7989,19 +7993,19 @@ EOF - _DEFINES_CXXFLAGS="$_DEFINES_CXXFLAGS -Uunix -U__unix -U__unix__" - - echo $ac_n "checking for __declspec(dllexport)""... $ac_c" 1>&6 --echo "configure:7993: checking for __declspec(dllexport)" >&5 -+echo "configure:7997: checking for __declspec(dllexport)" >&5 - if eval "test \"`echo '$''{'ac_os2_declspec'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8009: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_os2_declspec="yes" - else -@@ -8054,14 +8058,14 @@ EOF - _SAVE_LDFLAGS=$LDFLAGS - LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS" - cat > conftest.$ac_ext < - int main() { - printf("Hello World\n"); - ; return 0; } - EOF --if { (eval echo configure:8065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - : - else - echo "configure: failed program was:" >&5 -@@ -8089,7 +8093,7 @@ rm -f conftest* - CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'` - CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'` - echo $ac_n "checking for Sun C++ compiler version >= 5.9""... $ac_c" 1>&6 --echo "configure:8093: checking for Sun C++ compiler version >= 5.9" >&5 -+echo "configure:8097: checking for Sun C++ compiler version >= 5.9" >&5 - - ac_ext=C - # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -8099,7 +8103,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes - cross_compiling=$ac_cv_prog_cxx_cross - - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _BAD_COMPILER= - else -@@ -8125,7 +8129,7 @@ rm -f conftest* - _res="yes" - fi - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _ABOVE_SS12U1= - else -@@ -8535,7 +8539,7 @@ fi - - if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -a -z "$MOZ_DISABLE_ICF"; then - echo $ac_n "checking whether the linker supports Identical Code Folding""... $ac_c" 1>&6 --echo "configure:8539: checking whether the linker supports Identical Code Folding" >&5 -+echo "configure:8543: checking whether the linker supports Identical Code Folding" >&5 - if eval "test \"`echo '$''{'LD_SUPPORTS_ICF'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -8544,7 +8548,7 @@ else - 'int main() {return foo() - bar();}' > conftest.${ac_ext} - # If the linker supports ICF, foo and bar symbols will have - # the same address -- if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS -Wl,--icf=safe -ffunction-sections conftest.${ac_ext} $LIBS 1>&2'; { (eval echo configure:8548: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && -+ if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS -Wl,--icf=safe -ffunction-sections conftest.${ac_ext} $LIBS 1>&2'; { (eval echo configure:8552: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && - test -s conftest${ac_exeext} && - objdump -t conftest${ac_exeext} | awk '{a[$6] = $1} END {if (a["foo"] && (a["foo"] != a["bar"])) { exit 1 }}'; then - LD_SUPPORTS_ICF=yes -@@ -8559,14 +8563,14 @@ echo "$ac_t""$LD_SUPPORTS_ICF" 1>&6 - _SAVE_LDFLAGS="$LDFLAGS -Wl,--icf=safe" - LDFLAGS="$LDFLAGS -Wl,--icf=safe -Wl,--print-icf-sections" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - LD_PRINT_ICF_SECTIONS=-Wl,--print-icf-sections - else -@@ -8584,15 +8588,15 @@ fi - - if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -a -n "$MOZ_DEBUG_FLAGS"; then - echo $ac_n "checking whether removing dead symbols breaks debugging""... $ac_c" 1>&6 --echo "configure:8588: checking whether removing dead symbols breaks debugging" >&5 -+echo "configure:8592: checking whether removing dead symbols breaks debugging" >&5 - if eval "test \"`echo '$''{'GC_SECTIONS_BREAKS_DEBUG_RANGES'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - echo 'int foo() {return 42;}' \ - 'int bar() {return 1;}' \ - 'int main() {return foo();}' > conftest.${ac_ext} -- if { ac_try='${CC-cc} -o conftest.${ac_objext} $CFLAGS $MOZ_DEBUG_FLAGS -c conftest.${ac_ext} 1>&2'; { (eval echo configure:8595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && -- { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS $MOZ_DEBUG_FLAGS -Wl,--gc-sections conftest.${ac_objext} $LIBS 1>&2'; { (eval echo configure:8596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && -+ if { ac_try='${CC-cc} -o conftest.${ac_objext} $CFLAGS $MOZ_DEBUG_FLAGS -c conftest.${ac_ext} 1>&2'; { (eval echo configure:8599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && -+ { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS $MOZ_DEBUG_FLAGS -Wl,--gc-sections conftest.${ac_objext} $LIBS 1>&2'; { (eval echo configure:8600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && - test -s conftest${ac_exeext} -a -s conftest.${ac_objext}; then - if test "`$PYTHON "$_topsrcdir"/build/autoconf/check_debug_ranges.py conftest.${ac_objext} conftest.${ac_ext}`" = \ - "`$PYTHON "$_topsrcdir"/build/autoconf/check_debug_ranges.py conftest${ac_exeext} conftest.${ac_ext}`"; then -@@ -8615,12 +8619,12 @@ fi - - if test -z "$SKIP_COMPILER_CHECKS"; then - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:8619: checking for ANSI C header files" >&5 -+echo "configure:8623: checking for ANSI C header files" >&5 - if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -8628,7 +8632,7 @@ else - #include - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8632: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8636: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -8645,7 +8649,7 @@ rm -f conftest* - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat > conftest.$ac_ext < - EOF -@@ -8663,7 +8667,7 @@ fi - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat > conftest.$ac_ext < - EOF -@@ -8684,7 +8688,7 @@ if test "$cross_compiling" = yes; then - : - else - cat > conftest.$ac_ext < - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -8695,7 +8699,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); - exit (0); } - - EOF --if { (eval echo configure:8699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:8703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -8722,12 +8726,12 @@ EOF - fi - - echo $ac_n "checking for working const""... $ac_c" 1>&6 --echo "configure:8726: checking for working const" >&5 -+echo "configure:8730: checking for working const" >&5 - if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes - else -@@ -8800,12 +8804,12 @@ EOF - fi - - echo $ac_n "checking for mode_t""... $ac_c" 1>&6 --echo "configure:8804: checking for mode_t" >&5 -+echo "configure:8808: checking for mode_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #if STDC_HEADERS -@@ -8836,12 +8840,12 @@ EOF - fi - - echo $ac_n "checking for off_t""... $ac_c" 1>&6 --echo "configure:8840: checking for off_t" >&5 -+echo "configure:8844: checking for off_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #if STDC_HEADERS -@@ -8872,12 +8876,12 @@ EOF - fi - - echo $ac_n "checking for pid_t""... $ac_c" 1>&6 --echo "configure:8876: checking for pid_t" >&5 -+echo "configure:8880: checking for pid_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #if STDC_HEADERS -@@ -8908,12 +8912,12 @@ EOF - fi - - echo $ac_n "checking for size_t""... $ac_c" 1>&6 --echo "configure:8912: checking for size_t" >&5 -+echo "configure:8916: checking for size_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #if STDC_HEADERS -@@ -8951,12 +8955,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking for __stdcall""... $ac_c" 1>&6 --echo "configure:8955: checking for __stdcall" >&5 -+echo "configure:8959: checking for __stdcall" >&5 - if eval "test \"`echo '$''{'ac_cv___stdcall'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < struct foo; - template <> struct foo {}; -@@ -8965,7 +8969,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:8969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8973: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv___stdcall=true - else -@@ -8997,12 +9001,12 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 --echo "configure:9001: checking for ssize_t" >&5 -+echo "configure:9005: checking for ssize_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -9010,7 +9014,7 @@ int main() { - ssize_t foo = 0; - ; return 0; } - EOF --if { (eval echo configure:9014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_type_ssize_t=true - else -@@ -9035,12 +9039,12 @@ else - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 --echo "configure:9039: checking for st_blksize in struct stat" >&5 -+echo "configure:9043: checking for st_blksize in struct stat" >&5 - if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -9048,7 +9052,7 @@ int main() { - struct stat s; s.st_blksize; - ; return 0; } - EOF --if { (eval echo configure:9052: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_struct_st_blksize=yes - else -@@ -9072,12 +9076,12 @@ EOF - fi - - echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6 --echo "configure:9076: checking for siginfo_t" >&5 -+echo "configure:9080: checking for siginfo_t" >&5 - if eval "test \"`echo '$''{'ac_cv_siginfo_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -9085,7 +9089,7 @@ int main() { - siginfo_t* info; - ; return 0; } - EOF --if { (eval echo configure:9089: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_siginfo_t=true - else -@@ -9111,72 +9115,8 @@ else - fi - - --echo $ac_n "checking for the size of void*""... $ac_c" 1>&6 --echo "configure:9116: checking for the size of void*" >&5 --if eval "test \"`echo '$''{'moz_cv_size_of_JS_BYTES_PER_WORD'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- -- moz_cv_size_of_JS_BYTES_PER_WORD= -- for size in 4 8; do -- cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* -- moz_cv_size_of_JS_BYTES_PER_WORD=$size; break --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 --fi --rm -f conftest* -- done -- if test ! "$moz_cv_size_of_JS_BYTES_PER_WORD"; then -- { echo "configure: error: No size found for void*" 1>&2; exit 1; } -- fi -- --fi -- --echo "$ac_t""$moz_cv_size_of_JS_BYTES_PER_WORD" 1>&6 --cat >> confdefs.pytmp <> confdefs.h <> confdefs.pytmp <<\EOF -- (''' JS_BITS_PER_WORD_LOG2 ''', r''' 5 ''') --EOF --cat >> confdefs.h <<\EOF --#define JS_BITS_PER_WORD_LOG2 5 --EOF -- --elif test "$moz_cv_size_of_JS_BYTES_PER_WORD" -eq "8"; then -- cat >> confdefs.pytmp <<\EOF -- (''' JS_BITS_PER_WORD_LOG2 ''', r''' 6 ''') --EOF --cat >> confdefs.h <<\EOF --#define JS_BITS_PER_WORD_LOG2 6 --EOF -- --else -- { echo "configure: error: Unexpected JS_BYTES_PER_WORD" 1>&2; exit 1; } --fi -- -- - echo $ac_n "checking for the alignment of void*""... $ac_c" 1>&6 --echo "configure:9180: checking for the alignment of void*" >&5 -+echo "configure:9120: checking for the alignment of void*" >&5 - if eval "test \"`echo '$''{'moz_cv_align_of_JS_ALIGN_OF_POINTER'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9184,7 +9124,7 @@ else - moz_cv_align_of_JS_ALIGN_OF_POINTER= - for align in 2 4 8 16; do - cat > conftest.$ac_ext < -@@ -9197,7 +9137,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:9201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - moz_cv_align_of_JS_ALIGN_OF_POINTER=$align; break - else -@@ -9223,7 +9163,7 @@ EOF - - - echo $ac_n "checking for the size of double""... $ac_c" 1>&6 --echo "configure:9227: checking for the size of double" >&5 -+echo "configure:9167: checking for the size of double" >&5 - if eval "test \"`echo '$''{'moz_cv_size_of_JS_BYTES_PER_DOUBLE'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9231,7 +9171,7 @@ else - moz_cv_size_of_JS_BYTES_PER_DOUBLE= - for size in 6 8 10 12 14; do - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - moz_cv_size_of_JS_BYTES_PER_DOUBLE=$size; break - else -@@ -9270,12 +9210,12 @@ EOF - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:9274: checking for $ac_hdr" >&5 -+echo "configure:9214: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -9283,7 +9223,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:9287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -9326,12 +9266,12 @@ fi - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:9330: checking for $ac_hdr" >&5 -+echo "configure:9270: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include <$ac_hdr> -@@ -9339,7 +9279,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:9343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -9382,12 +9322,12 @@ fi - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:9386: checking for $ac_hdr" >&5 -+echo "configure:9326: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -9395,7 +9335,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:9399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -9435,12 +9375,12 @@ EOF - fi - - echo $ac_n "checking for uint""... $ac_c" 1>&6 --echo "configure:9439: checking for uint" >&5 -+echo "configure:9379: checking for uint" >&5 - if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -9448,7 +9388,7 @@ int main() { - uint foo = 0; - ; return 0; } - EOF --if { (eval echo configure:9452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9392: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_uint=true - else -@@ -9473,12 +9413,12 @@ else - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for uint_t""... $ac_c" 1>&6 --echo "configure:9477: checking for uint_t" >&5 -+echo "configure:9417: checking for uint_t" >&5 - if eval "test \"`echo '$''{'ac_cv_uint_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -9486,7 +9426,7 @@ int main() { - uint_t foo = 0; - ; return 0; } - EOF --if { (eval echo configure:9490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_uint_t=true - else -@@ -9520,12 +9460,12 @@ cross_compiling=$ac_cv_prog_cxx_cross - - - echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 --echo "configure:9524: checking for uname.domainname" >&5 -+echo "configure:9464: checking for uname.domainname" >&5 - if eval "test \"`echo '$''{'ac_cv_have_uname_domainname_field'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { -@@ -9533,7 +9473,7 @@ int main() { - (void)uname(res); if (res != 0) { domain = res->domainname; } - ; return 0; } - EOF --if { (eval echo configure:9537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_uname_domainname_field=true - else -@@ -9560,12 +9500,12 @@ else - fi - - echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 --echo "configure:9564: checking for uname.__domainname" >&5 -+echo "configure:9504: checking for uname.__domainname" >&5 - if eval "test \"`echo '$''{'ac_cv_have_uname_us_domainname_field'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { -@@ -9573,7 +9513,7 @@ int main() { - (void)uname(res); if (res != 0) { domain = res->__domainname; } - ; return 0; } - EOF --if { (eval echo configure:9577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_uname_us_domainname_field=true - else -@@ -9609,7 +9549,7 @@ cross_compiling=$ac_cv_prog_cc_cross - - if test "$GNU_CC"; then - echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 --echo "configure:9613: checking for visibility(hidden) attribute" >&5 -+echo "configure:9553: checking for visibility(hidden) attribute" >&5 - if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9637,7 +9577,7 @@ EOF - - - echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6 --echo "configure:9641: checking for visibility(default) attribute" >&5 -+echo "configure:9581: checking for visibility(default) attribute" >&5 - if eval "test \"`echo '$''{'ac_cv_visibility_default'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9665,7 +9605,7 @@ EOF - - - echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 --echo "configure:9669: checking for visibility pragma support" >&5 -+echo "configure:9609: checking for visibility pragma support" >&5 - if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9690,7 +9630,7 @@ fi - echo "$ac_t""$ac_cv_visibility_pragma" 1>&6 - if test "$ac_cv_visibility_pragma" = "yes"; then - echo $ac_n "checking For gcc visibility bug with class-level attributes (GCC bug 26905)""... $ac_c" 1>&6 --echo "configure:9694: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 -+echo "configure:9634: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 - if eval "test \"`echo '$''{'ac_cv_have_visibility_class_bug'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9718,7 +9658,7 @@ fi - echo "$ac_t""$ac_cv_have_visibility_class_bug" 1>&6 - - echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6 --echo "configure:9722: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 -+echo "configure:9662: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 - if eval "test \"`echo '$''{'ac_cv_have_visibility_builtin_bug'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9770,7 +9710,7 @@ fi # Sun Studio on Solaris - if test "$GNU_CC"; then - - echo $ac_n "checking for gcc PR49911""... $ac_c" 1>&6 --echo "configure:9774: checking for gcc PR49911" >&5 -+echo "configure:9714: checking for gcc PR49911" >&5 - ac_have_gcc_pr49911="no" - - ac_ext=C -@@ -9787,7 +9727,7 @@ if test "$cross_compiling" = yes; then - true - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - true - else -@@ -9865,12 +9805,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 --echo "configure:9869: checking for $ac_hdr that defines DIR" >&5 -+echo "configure:9809: checking for $ac_hdr that defines DIR" >&5 - if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include <$ac_hdr> -@@ -9878,7 +9818,7 @@ int main() { - DIR *dirp = 0; - ; return 0; } - EOF --if { (eval echo configure:9882: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_dirent_$ac_safe=yes" - else -@@ -9906,7 +9846,7 @@ done - # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. - if test $ac_header_dirent = dirent.h; then - echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 --echo "configure:9910: checking for opendir in -ldir" >&5 -+echo "configure:9850: checking for opendir in -ldir" >&5 - ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9914,7 +9854,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-ldir $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9947,7 +9887,7 @@ fi - - else - echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 --echo "configure:9951: checking for opendir in -lx" >&5 -+echo "configure:9891: checking for opendir in -lx" >&5 - ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9955,7 +9895,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lx $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -10000,12 +9940,12 @@ esac - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:10004: checking for $ac_hdr" >&5 -+echo "configure:9944: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -10013,7 +9953,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:10017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -10048,12 +9988,12 @@ EOF - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:10052: checking for $ac_hdr" >&5 -+echo "configure:9992: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -10061,7 +10001,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:10065: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -10095,12 +10035,12 @@ EOF - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:10099: checking for $ac_hdr" >&5 -+echo "configure:10039: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -10108,7 +10048,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:10112: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10052: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -10141,12 +10081,12 @@ EOF - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:10145: checking for $ac_hdr" >&5 -+echo "configure:10085: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -10154,7 +10094,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:10158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -10188,12 +10128,12 @@ EOF - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:10192: checking for $ac_hdr" >&5 -+echo "configure:10132: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -10201,7 +10141,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:10205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10145: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -10241,12 +10181,12 @@ cross_compiling=$ac_cv_prog_cxx_cross - NEW_H=new.h - ac_safe=`echo "new" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for new""... $ac_c" 1>&6 --echo "configure:10245: checking for new" >&5 -+echo "configure:10185: checking for new" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -10254,7 +10194,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:10258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -10298,12 +10238,12 @@ fi - if test "x$enable_dtrace" = "xyes"; then - ac_safe=`echo "sys/sdt.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for sys/sdt.h""... $ac_c" 1>&6 --echo "configure:10302: checking for sys/sdt.h" >&5 -+echo "configure:10242: checking for sys/sdt.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -10311,7 +10251,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:10315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10255: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -10353,12 +10293,12 @@ case $target in - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:10357: checking for $ac_hdr" >&5 -+echo "configure:10297: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -10366,7 +10306,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:10370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -10418,12 +10358,12 @@ CFLAGS="$CFLAGS $LINUX_HEADERS_INCLUDES" - - ac_safe=`echo "linux/perf_event.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for linux/perf_event.h""... $ac_c" 1>&6 --echo "configure:10422: checking for linux/perf_event.h" >&5 -+echo "configure:10362: checking for linux/perf_event.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -10431,7 +10371,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:10435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10375: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -10446,19 +10386,19 @@ fi - if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for perf_event_open system call""... $ac_c" 1>&6 --echo "configure:10450: checking for perf_event_open system call" >&5 -+echo "configure:10390: checking for perf_event_open system call" >&5 - if eval "test \"`echo '$''{'ac_cv_perf_event_open'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - return sizeof(__NR_perf_event_open); - ; return 0; } - EOF --if { (eval echo configure:10462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_perf_event_open=yes - else -@@ -10494,7 +10434,7 @@ case $target in - ;; - *) - echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 --echo "configure:10498: checking for gethostbyname_r in -lc_r" >&5 -+echo "configure:10438: checking for gethostbyname_r in -lc_r" >&5 - ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -10502,7 +10442,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lc_r $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -10554,14 +10494,14 @@ case $target in - *) - - echo $ac_n "checking for library containing dlopen""... $ac_c" 1>&6 --echo "configure:10558: checking for library containing dlopen" >&5 -+echo "configure:10498: checking for library containing dlopen" >&5 - if eval "test \"`echo '$''{'ac_cv_search_dlopen'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_func_search_save_LIBS="$LIBS" - ac_cv_search_dlopen="no" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_search_dlopen="none required" - else -@@ -10583,7 +10523,7 @@ rm -f conftest* - test "$ac_cv_search_dlopen" = "no" && for i in dl; do - LIBS="-l$i $ac_func_search_save_LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_search_dlopen="-l$i" - break -@@ -10612,12 +10552,12 @@ if test "$ac_cv_search_dlopen" != "no"; then - test "$ac_cv_search_dlopen" = "none required" || LIBS="$ac_cv_search_dlopen $LIBS" - ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 --echo "configure:10616: checking for dlfcn.h" >&5 -+echo "configure:10556: checking for dlfcn.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -10625,7 +10565,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:10629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -10662,12 +10602,12 @@ CFLAGS="$CFLAGS -D_GNU_SOURCE" - for ac_func in dladdr - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:10666: checking for $ac_func" >&5 -+echo "configure:10606: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -10724,7 +10664,7 @@ if test ! "$GNU_CXX"; then - case $target in - *-aix*) - echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6 --echo "configure:10728: checking for demangle in -lC_r" >&5 -+echo "configure:10668: checking for demangle in -lC_r" >&5 - ac_lib_var=`echo C_r'_'demangle | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -10732,7 +10672,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lC_r $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -10776,7 +10716,7 @@ fi - ;; - *) - echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 --echo "configure:10780: checking for demangle in -lC" >&5 -+echo "configure:10720: checking for demangle in -lC" >&5 - ac_lib_var=`echo C'_'demangle | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -10784,7 +10724,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lC $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -10834,7 +10774,7 @@ case $target in - ;; - *) - echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 --echo "configure:10838: checking for socket in -lsocket" >&5 -+echo "configure:10778: checking for socket in -lsocket" >&5 - ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -10842,7 +10782,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lsocket $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -10892,7 +10832,7 @@ darwin*) - *) - - echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 --echo "configure:10896: checking for pthread_create in -lpthreads" >&5 -+echo "configure:10836: checking for pthread_create in -lpthreads" >&5 - echo " - #include - #include -@@ -10915,7 +10855,7 @@ echo " - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 --echo "configure:10919: checking for pthread_create in -lpthread" >&5 -+echo "configure:10859: checking for pthread_create in -lpthread" >&5 - echo " - #include - #include -@@ -10938,7 +10878,7 @@ echo " - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 --echo "configure:10942: checking for pthread_create in -lc_r" >&5 -+echo "configure:10882: checking for pthread_create in -lc_r" >&5 - echo " - #include - #include -@@ -10961,7 +10901,7 @@ echo " - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 --echo "configure:10965: checking for pthread_create in -lc" >&5 -+echo "configure:10905: checking for pthread_create in -lc" >&5 - echo " - #include - #include -@@ -11020,7 +10960,7 @@ then - rm -f conftest* - ac_cv_have_dash_pthread=no - echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 --echo "configure:11024: checking whether ${CC-cc} accepts -pthread" >&5 -+echo "configure:10964: checking whether ${CC-cc} accepts -pthread" >&5 - echo 'int main() { return 0; }' | cat > conftest.c - ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 - if test $? -eq 0; then -@@ -11043,7 +10983,7 @@ echo "configure:11024: checking whether ${CC-cc} accepts -pthread" >&5 - ac_cv_have_dash_pthreads=no - if test "$ac_cv_have_dash_pthread" = "no"; then - echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 --echo "configure:11047: checking whether ${CC-cc} accepts -pthreads" >&5 -+echo "configure:10987: checking whether ${CC-cc} accepts -pthreads" >&5 - echo 'int main() { return 0; }' | cat > conftest.c - ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 - if test $? -eq 0; then -@@ -11148,13 +11088,13 @@ fi - - if test $ac_cv_prog_gcc = yes; then - echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 --echo "configure:11152: checking whether ${CC-cc} needs -traditional" >&5 -+echo "configure:11092: checking whether ${CC-cc} needs -traditional" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_pattern="Autoconf.*'x'" - cat > conftest.$ac_ext < - Autoconf TIOCGETP -@@ -11172,7 +11112,7 @@ rm -f conftest* - - if test $ac_cv_prog_gcc_traditional = no; then - cat > conftest.$ac_ext < - Autoconf TCGETA -@@ -11194,7 +11134,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 - fi - - echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 --echo "configure:11198: checking for 8-bit clean memcmp" >&5 -+echo "configure:11138: checking for 8-bit clean memcmp" >&5 - if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11202,7 +11142,7 @@ else - ac_cv_func_memcmp_clean=no - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_func_memcmp_clean=yes - else -@@ -11234,12 +11174,12 @@ for ac_func in fchmod flockfile getc_unlocked _getc_nolock getpagesize \ - stat64 statvfs statvfs64 strerror strtok_r truncate64 - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:11238: checking for $ac_func" >&5 -+echo "configure:11178: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -11291,14 +11231,14 @@ done - - - cat > conftest.$ac_ext < - int main() { - SYSTEMTIME st;FILETIME ft;SystemTimeToFileTime(&st,&ft); - ; return 0; } - EOF --if { (eval echo configure:11302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_have_systemtimetofiletime="yes" - else -@@ -11318,14 +11258,14 @@ EOF - - fi - cat > conftest.$ac_ext < - int main() { - FILETIME ft;GetSystemTimeAsFileTime(&ft); - ; return 0; } - EOF --if { (eval echo configure:11329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_have_getsystemtimeasfiletime="yes" - else -@@ -11355,19 +11295,19 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6 --echo "configure:11359: checking for wcrtomb" >&5 -+echo "configure:11299: checking for wcrtomb" >&5 - if eval "test \"`echo '$''{'ac_cv_have_wcrtomb'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - mbstate_t ps={0};wcrtomb(0,'f',&ps); - ; return 0; } - EOF --if { (eval echo configure:11371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_have_wcrtomb="yes" - else -@@ -11390,19 +11330,19 @@ EOF - - fi - echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 --echo "configure:11394: checking for mbrtowc" >&5 -+echo "configure:11334: checking for mbrtowc" >&5 - if eval "test \"`echo '$''{'ac_cv_have_mbrtowc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - mbstate_t ps={0};mbrtowc(0,0,0,&ps); - ; return 0; } - EOF --if { (eval echo configure:11406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_have_mbrtowc="yes" - else -@@ -11434,12 +11374,12 @@ cross_compiling=$ac_cv_prog_cc_cross - fi - - echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 --echo "configure:11438: checking for res_ninit()" >&5 -+echo "configure:11378: checking for res_ninit()" >&5 - if eval "test \"`echo '$''{'ac_cv_func_res_ninit'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_func_res_ninit=yes - else -@@ -11484,12 +11424,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6 --echo "configure:11488: checking for gnu_get_libc_version()" >&5 -+echo "configure:11428: checking for gnu_get_libc_version()" >&5 - if eval "test \"`echo '$''{'ac_cv_func_gnu_get_libc_version'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_func_gnu_get_libc_version=yes - else -@@ -11534,7 +11474,7 @@ cross_compiling=$ac_cv_prog_cc_cross - - - echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 --echo "configure:11538: checking for an implementation of va_copy()" >&5 -+echo "configure:11478: checking for an implementation of va_copy()" >&5 - if eval "test \"`echo '$''{'ac_cv_va_copy'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11544,7 +11484,7 @@ else - - else - cat > conftest.$ac_ext < -@@ -11558,7 +11498,7 @@ else - } - int main() { f (0, 42); return 0; } - EOF --if { (eval echo configure:11562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_va_copy=yes - else -@@ -11575,7 +11515,7 @@ fi - - echo "$ac_t""$ac_cv_va_copy" 1>&6 - echo $ac_n "checking for an implementation of __va_copy()""... $ac_c" 1>&6 --echo "configure:11579: checking for an implementation of __va_copy()" >&5 -+echo "configure:11519: checking for an implementation of __va_copy()" >&5 - if eval "test \"`echo '$''{'ac_cv___va_copy'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11585,7 +11525,7 @@ else - - else - cat > conftest.$ac_ext < -@@ -11599,7 +11539,7 @@ else - } - int main() { f (0, 42); return 0; } - EOF --if { (eval echo configure:11603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv___va_copy=yes - else -@@ -11616,7 +11556,7 @@ fi - - echo "$ac_t""$ac_cv___va_copy" 1>&6 - echo $ac_n "checking whether va_lists can be copied by value""... $ac_c" 1>&6 --echo "configure:11620: checking whether va_lists can be copied by value" >&5 -+echo "configure:11560: checking whether va_lists can be copied by value" >&5 - if eval "test \"`echo '$''{'ac_cv_va_val_copy'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11626,7 +11566,7 @@ else - - else - cat > conftest.$ac_ext < -@@ -11640,7 +11580,7 @@ else - } - int main() { f (0, 42); return 0; } - EOF --if { (eval echo configure:11644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_va_val_copy=yes - else -@@ -11710,12 +11650,12 @@ ARM_ABI_PREFIX= - if test "$GNU_CC"; then - if test "$CPU_ARCH" = "arm" ; then - echo $ac_n "checking for ARM EABI""... $ac_c" 1>&6 --echo "configure:11714: checking for ARM EABI" >&5 -+echo "configure:11654: checking for ARM EABI" >&5 - if eval "test \"`echo '$''{'ac_cv_gcc_arm_eabi'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_gcc_arm_eabi="yes" - else -@@ -11753,12 +11693,12 @@ echo "$ac_t""$ac_cv_gcc_arm_eabi" 1>&6 - fi - - echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 --echo "configure:11757: checking for modern C++ template specialization syntax support" >&5 -+echo "configure:11697: checking for modern C++ template specialization syntax support" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_modern_specialize_template_syntax'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < struct X { int a; }; - class Y {}; -@@ -11768,7 +11708,7 @@ X int_x; - X y_x; - ; return 0; } - EOF --if { (eval echo configure:11772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_modern_specialize_template_syntax=yes - else -@@ -11786,12 +11726,12 @@ if test "$ac_cv_cpp_modern_specialize_template_syntax" = no ; then - fi - - echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 --echo "configure:11790: checking whether partial template specialization works" >&5 -+echo "configure:11730: checking whether partial template specialization works" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_partial_specialization'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < class Foo {}; - template class Foo {}; -@@ -11799,7 +11739,7 @@ int main() { - return 0; - ; return 0; } - EOF --if { (eval echo configure:11803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_partial_specialization=yes - else -@@ -11823,12 +11763,12 @@ EOF - fi - - echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 --echo "configure:11827: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 -+echo "configure:11767: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_ambiguity_resolving_using'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_ambiguity_resolving_using=yes - else -@@ -11868,7 +11808,7 @@ EOF - fi - - echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 --echo "configure:11872: checking for C++ dynamic_cast to void*" >&5 -+echo "configure:11812: checking for C++ dynamic_cast to void*" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_dynamic_cast_void_ptr'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11876,7 +11816,7 @@ else - ac_cv_cpp_dynamic_cast_void_ptr=no - else - cat > conftest.$ac_ext <(suby)))); - } - EOF --if { (eval echo configure:11896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_cpp_dynamic_cast_void_ptr=yes - else -@@ -11919,19 +11859,19 @@ fi - - - echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 --echo "configure:11923: checking whether C++ requires implementation of unused virtual methods" >&5 -+echo "configure:11863: checking whether C++ requires implementation of unused virtual methods" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_unused_required'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_cpp_unused_required=no - else -@@ -11957,12 +11897,12 @@ fi - - - echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 --echo "configure:11961: checking for trouble comparing to zero near std::operator!=()" >&5 -+echo "configure:11901: checking for trouble comparing to zero near std::operator!=()" >&5 - if eval "test \"`echo '$''{'ac_cv_trouble_comparing_to_zero'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - template class Foo {}; -@@ -11973,7 +11913,7 @@ int main() { - Foo f; return (0 != f); - ; return 0; } - EOF --if { (eval echo configure:11977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_trouble_comparing_to_zero=no - else -@@ -12003,19 +11943,19 @@ fi - _SAVE_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS $DSO_PIC_CFLAGS $DSO_LDOPTS $MOZ_OPTIMIZE_LDFLAGS" - echo $ac_n "checking for __thread keyword for TLS variables""... $ac_c" 1>&6 --echo "configure:12007: checking for __thread keyword for TLS variables" >&5 -+echo "configure:11947: checking for __thread keyword for TLS variables" >&5 - if eval "test \"`echo '$''{'ac_cv_thread_keyword'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_thread_keyword=yes - else -@@ -12055,12 +11995,12 @@ fi - MALLOC_H= - ac_safe=`echo "malloc.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for malloc.h""... $ac_c" 1>&6 --echo "configure:12059: checking for malloc.h" >&5 -+echo "configure:11999: checking for malloc.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -12068,7 +12008,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:12072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -12091,12 +12031,12 @@ fi - if test "$MALLOC_H" = ""; then - ac_safe=`echo "malloc/malloc.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for malloc/malloc.h""... $ac_c" 1>&6 --echo "configure:12095: checking for malloc/malloc.h" >&5 -+echo "configure:12035: checking for malloc/malloc.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -12104,7 +12044,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:12108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12048: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -12127,12 +12067,12 @@ fi - if test "$MALLOC_H" = ""; then - ac_safe=`echo "sys/malloc.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for sys/malloc.h""... $ac_c" 1>&6 --echo "configure:12131: checking for sys/malloc.h" >&5 -+echo "configure:12071: checking for sys/malloc.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -12140,7 +12080,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:12144: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -12176,12 +12116,12 @@ MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc" - for ac_func in strndup posix_memalign memalign valloc - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:12180: checking for $ac_func" >&5 -+echo "configure:12120: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -12237,19 +12177,19 @@ done - - - echo $ac_n "checking for __attribute__((always_inline))""... $ac_c" 1>&6 --echo "configure:12241: checking for __attribute__((always_inline))" >&5 -+echo "configure:12181: checking for __attribute__((always_inline))" >&5 - if eval "test \"`echo '$''{'ac_cv_attribute_always_inline'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_attribute_always_inline=yes - else -@@ -12264,19 +12204,19 @@ fi - echo "$ac_t""$ac_cv_attribute_always_inline" 1>&6 - - echo $ac_n "checking for __attribute__((malloc))""... $ac_c" 1>&6 --echo "configure:12268: checking for __attribute__((malloc))" >&5 -+echo "configure:12208: checking for __attribute__((malloc))" >&5 - if eval "test \"`echo '$''{'ac_cv_attribute_malloc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_attribute_malloc=yes - else -@@ -12291,19 +12231,19 @@ fi - echo "$ac_t""$ac_cv_attribute_malloc" 1>&6 - - echo $ac_n "checking for __attribute__((warn_unused_result))""... $ac_c" 1>&6 --echo "configure:12295: checking for __attribute__((warn_unused_result))" >&5 -+echo "configure:12235: checking for __attribute__((warn_unused_result))" >&5 - if eval "test \"`echo '$''{'ac_cv_attribute_warn_unused'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12247: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_attribute_warn_unused=yes - else -@@ -12327,19 +12267,19 @@ cross_compiling=$ac_cv_prog_cc_cross - - - echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 --echo "configure:12331: checking for LC_MESSAGES" >&5 -+echo "configure:12271: checking for LC_MESSAGES" >&5 - if eval "test \"`echo '$''{'ac_cv_i18n_lc_messages'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - int category = LC_MESSAGES; - ; return 0; } - EOF --if { (eval echo configure:12343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_i18n_lc_messages=yes - else -@@ -12365,12 +12305,12 @@ fi - for ac_func in localeconv - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:12369: checking for $ac_func" >&5 -+echo "configure:12309: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -12580,7 +12520,7 @@ fi - # Extract the first word of "nspr-config", so it can be a program name with args. - set dummy nspr-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:12584: checking for $ac_word" >&5 -+echo "configure:12524: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -12615,7 +12555,7 @@ fi - - min_nspr_version=$NSPR_MINVER - echo $ac_n "checking for NSPR - version >= $min_nspr_version""... $ac_c" 1>&6 --echo "configure:12619: checking for NSPR - version >= $min_nspr_version" >&5 -+echo "configure:12559: checking for NSPR - version >= $min_nspr_version" >&5 - - no_nspr="" - if test "$NSPR_CONFIG" != "no"; then -@@ -12678,7 +12618,7 @@ if test -n "$MOZ_NATIVE_NSPR"; then - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $NSPR_CFLAGS" - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - MOZ_NATIVE_NSPR=1 - else -@@ -12729,7 +12669,7 @@ if test -z "$MOZ_ZLIB_LIBS$MOZ_ZLIB_CFLAGS$SKIP_LIBRARY_CHECKS"; then - MOZ_NATIVE_ZLIB= - else - echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 --echo "configure:12733: checking for gzread in -lz" >&5 -+echo "configure:12673: checking for gzread in -lz" >&5 - ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -12737,7 +12677,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lz $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -12772,7 +12712,7 @@ fi - if test "$MOZ_NATIVE_ZLIB" = 1; then - MOZZLIBNUM=`echo $MOZZLIB | awk -F. '{printf "0x%x\n", ((($1 * 16 + $2) * 16) + $3) * 16 + $4}'` - cat > conftest.$ac_ext < - #include -@@ -12783,7 +12723,7 @@ int main() { - #endif - ; return 0; } - EOF --if { (eval echo configure:12787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12727: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - MOZ_NATIVE_ZLIB=1 - else -@@ -12829,7 +12769,7 @@ if test -n "$MOZ_NATIVE_FFI"; then - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:12833: checking for $ac_word" >&5 -+echo "configure:12773: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -12873,19 +12813,19 @@ fi - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for libffi > 3.0.9""... $ac_c" 1>&6 --echo "configure:12877: checking for libffi > 3.0.9" >&5 -+echo "configure:12817: checking for libffi > 3.0.9" >&5 - - if $PKG_CONFIG --exists "libffi > 3.0.9" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_FFI_CFLAGS""... $ac_c" 1>&6 --echo "configure:12884: checking MOZ_FFI_CFLAGS" >&5 -+echo "configure:12824: checking MOZ_FFI_CFLAGS" >&5 - MOZ_FFI_CFLAGS=`$PKG_CONFIG --cflags "libffi > 3.0.9"` - echo "$ac_t""$MOZ_FFI_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_FFI_LIBS""... $ac_c" 1>&6 --echo "configure:12889: checking MOZ_FFI_LIBS" >&5 -+echo "configure:12829: checking MOZ_FFI_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - MOZ_FFI_LIBS="`$PKG_CONFIG --libs \"libffi > 3.0.9\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$MOZ_FFI_LIBS" 1>&6 -@@ -12921,7 +12861,7 @@ echo "configure:12889: checking MOZ_FFI_LIBS" >&5 - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:12925: checking for $ac_word" >&5 -+echo "configure:12865: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -12965,19 +12905,19 @@ fi - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for libffi >= 3.0.9""... $ac_c" 1>&6 --echo "configure:12969: checking for libffi >= 3.0.9" >&5 -+echo "configure:12909: checking for libffi >= 3.0.9" >&5 - - if $PKG_CONFIG --exists "libffi >= 3.0.9" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_FFI_CFLAGS""... $ac_c" 1>&6 --echo "configure:12976: checking MOZ_FFI_CFLAGS" >&5 -+echo "configure:12916: checking MOZ_FFI_CFLAGS" >&5 - MOZ_FFI_CFLAGS=`$PKG_CONFIG --cflags "libffi >= 3.0.9"` - echo "$ac_t""$MOZ_FFI_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_FFI_LIBS""... $ac_c" 1>&6 --echo "configure:12981: checking MOZ_FFI_LIBS" >&5 -+echo "configure:12921: checking MOZ_FFI_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - MOZ_FFI_LIBS="`$PKG_CONFIG --libs \"libffi >= 3.0.9\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$MOZ_FFI_LIBS" 1>&6 -@@ -13112,18 +13052,18 @@ MOZ_DEBUG_DISABLE_DEFS="-DNDEBUG -DTRIMMED" - - if test -n "$MOZ_DEBUG"; then - echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6 --echo "configure:13116: checking for valid debug flags" >&5 -+echo "configure:13056: checking for valid debug flags" >&5 - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS" - cat > conftest.$ac_ext < - int main() { - printf("Hello World\n"); - ; return 0; } - EOF --if { (eval echo configure:13127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:13067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _results=yes - else -@@ -13201,18 +13141,18 @@ fi - if test "$COMPILE_ENVIRONMENT"; then - if test -n "$MOZ_OPTIMIZE"; then - echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6 --echo "configure:13205: checking for valid optimization flags" >&5 -+echo "configure:13145: checking for valid optimization flags" >&5 - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS" - cat > conftest.$ac_ext < - int main() { - printf("Hello World\n"); - ; return 0; } - EOF --if { (eval echo configure:13216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:13156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _results=yes - else -@@ -13364,7 +13304,7 @@ EOF - fi - else - echo $ac_n "checking size of int *""... $ac_c" 1>&6 --echo "configure:13368: checking size of int *" >&5 -+echo "configure:13308: checking size of int *" >&5 - if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -13372,7 +13312,7 @@ else - ac_cv_sizeof_int_p=4 - else - cat > conftest.$ac_ext < - int main() -@@ -13383,7 +13323,7 @@ int main() - return(0); - } - EOF --if { (eval echo configure:13387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:13327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_sizeof_int_p=`cat conftestval` - else -@@ -13687,12 +13627,12 @@ fi - if test -n "$MOZ_VALGRIND"; then - ac_safe=`echo "valgrind/valgrind.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for valgrind/valgrind.h""... $ac_c" 1>&6 --echo "configure:13691: checking for valgrind/valgrind.h" >&5 -+echo "configure:13631: checking for valgrind/valgrind.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -13700,7 +13640,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:13704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:13644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -13973,7 +13913,7 @@ do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:13977: checking for $ac_word" >&5 -+echo "configure:13917: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_CCACHE'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -14099,12 +14039,12 @@ cross_compiling=$ac_cv_prog_cxx_cross - for ac_func in __cxa_demangle - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:14103: checking for $ac_func" >&5 -+echo "configure:14043: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -14184,12 +14124,12 @@ fi - if test -z "$SKIP_LIBRARY_CHECKS"; then - ac_safe=`echo "unwind.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for unwind.h""... $ac_c" 1>&6 --echo "configure:14188: checking for unwind.h" >&5 -+echo "configure:14128: checking for unwind.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -14197,7 +14137,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:14201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:14141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -14214,12 +14154,12 @@ fi - for ac_func in _Unwind_Backtrace - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:14218: checking for $ac_func" >&5 -+echo "configure:14158: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -14334,7 +14274,7 @@ if test -z "$SKIP_COMPILER_CHECKS"; then - # Compiler Options - - echo $ac_n "checking for -pipe support""... $ac_c" 1>&6 --echo "configure:14338: checking for -pipe support" >&5 -+echo "configure:14278: checking for -pipe support" >&5 - if test -n "$GNU_CC" -a -n "$GNU_CXX"; then - CFLAGS="$CFLAGS -pipe" - CXXFLAGS="$CXXFLAGS -pipe" -@@ -14348,16 +14288,16 @@ _SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fprofile-generate -fprofile-correction" - - echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 --echo "configure:14352: checking whether C compiler supports -fprofile-generate" >&5 -+echo "configure:14292: checking whether C compiler supports -fprofile-generate" >&5 - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:14301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - PROFILE_GEN_CFLAGS="-fprofile-generate" - result="yes" -@@ -14421,16 +14361,16 @@ if test "$_PEDANTIC"; then - _SAVE_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS -pedantic ${_WARNINGS_CXXFLAGS} -Wno-long-long" - echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6 --echo "configure:14425: checking whether C++ compiler has -pedantic long long bug" >&5 -+echo "configure:14365: checking whether C++ compiler has -pedantic long long bug" >&5 - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:14374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - result="no" - else -@@ -14457,12 +14397,12 @@ fi - _SAVE_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}" - echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6 --echo "configure:14461: checking for correct overload resolution with const and templates" >&5 -+echo "configure:14401: checking for correct overload resolution with const and templates" >&5 - if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -14492,7 +14432,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:14496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:14436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_nscap_nonconst_opeq_bug="no" - else -@@ -14518,19 +14458,19 @@ EOF - fi - - echo $ac_n "checking for tm_zone tm_gmtoff in struct tm""... $ac_c" 1>&6 --echo "configure:14522: checking for tm_zone tm_gmtoff in struct tm" >&5 -+echo "configure:14462: checking for tm_zone tm_gmtoff in struct tm" >&5 - if eval "test \"`echo '$''{'ac_cv_struct_tm_zone_tm_gmtoff'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - struct tm tm; tm.tm_zone = 0; tm.tm_gmtoff = 1; - ; return 0; } - EOF --if { (eval echo configure:14534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:14474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_struct_tm_zone_tm_gmtoff="yes" - else -@@ -14572,18 +14512,18 @@ cross_compiling=$ac_cv_prog_cc_cross - - - echo $ac_n "checking what kind of list files are supported by the linker""... $ac_c" 1>&6 --echo "configure:14576: checking what kind of list files are supported by the linker" >&5 -+echo "configure:14516: checking what kind of list files are supported by the linker" >&5 - if eval "test \"`echo '$''{'EXPAND_LIBS_LIST_STYLE'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - echo "int main() {return 0;}" > conftest.${ac_ext} -- if { ac_try='${CC-cc} -o conftest.${OBJ_SUFFIX} -c $CFLAGS $CPPFLAGS conftest.${ac_ext} 1>&5'; { (eval echo configure:14581: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.${OBJ_SUFFIX}; then -+ if { ac_try='${CC-cc} -o conftest.${OBJ_SUFFIX} -c $CFLAGS $CPPFLAGS conftest.${ac_ext} 1>&5'; { (eval echo configure:14521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.${OBJ_SUFFIX}; then - echo "INPUT(conftest.${OBJ_SUFFIX})" > conftest.list -- if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS conftest.list $LIBS 1>&5'; { (eval echo configure:14583: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then -+ if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS conftest.list $LIBS 1>&5'; { (eval echo configure:14523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then - EXPAND_LIBS_LIST_STYLE=linkerscript - else - echo "conftest.${OBJ_SUFFIX}" > conftest.list -- if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS @conftest.list $LIBS 1>&5'; { (eval echo configure:14587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then -+ if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS @conftest.list $LIBS 1>&5'; { (eval echo configure:14527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then - EXPAND_LIBS_LIST_STYLE=list - else - EXPAND_LIBS_LIST_STYLE=none -@@ -14603,7 +14543,7 @@ LIBS_DESC_SUFFIX=desc - - if test "$GCC_USE_GNU_LD"; then - echo $ac_n "checking what kind of ordering can be done with the linker""... $ac_c" 1>&6 --echo "configure:14607: checking what kind of ordering can be done with the linker" >&5 -+echo "configure:14547: checking what kind of ordering can be done with the linker" >&5 - if eval "test \"`echo '$''{'EXPAND_LIBS_ORDER_STYLE'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -14611,14 +14551,14 @@ else - _SAVE_LDFLAGS="$LDFLAGS" - LDFLAGS="${LDFLAGS} -Wl,--section-ordering-file,conftest.order" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - EXPAND_LIBS_ORDER_STYLE=section-ordering-file - else -@@ -14630,7 +14570,7 @@ fi - rm -f conftest* - LDFLAGS="$_SAVE_LDFLAGS" - if test -z "$EXPAND_LIBS_ORDER_STYLE"; then -- if { ac_try='${CC-cc} ${DSO_LDOPTS} ${LDFLAGS} -o ${DLL_PREFIX}conftest${DLL_SUFFIX} -Wl'; { (eval echo configure:14634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then -+ if { ac_try='${CC-cc} ${DSO_LDOPTS} ${LDFLAGS} -o ${DLL_PREFIX}conftest${DLL_SUFFIX} -Wl'; { (eval echo configure:14574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then - EXPAND_LIBS_ORDER_STYLE=linkerscript - else - EXPAND_LIBS_ORDER_STYLE=none -@@ -14741,7 +14681,7 @@ esac - if test -z "$SKIP_LIBRARY_CHECKS" -a -z "$NO_EDITLINE"; then - if test -n "$JS_WANT_READLINE"; then - echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 --echo "configure:14745: checking for readline in -lreadline" >&5 -+echo "configure:14685: checking for readline in -lreadline" >&5 - ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -14749,7 +14689,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lreadline $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -14990,9 +14930,9 @@ EOF - - - echo $ac_n "checking for posix_fallocate""... $ac_c" 1>&6 --echo "configure:14994: checking for posix_fallocate" >&5 -+echo "configure:14934: checking for posix_fallocate" >&5 - cat > conftest.$ac_ext < -@@ -15000,7 +14940,7 @@ int main() { - posix_fallocate(0, 0, 0); - ; return 0; } - EOF --if { (eval echo configure:15004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv___posix_fallocate=true - else -@@ -15029,7 +14969,7 @@ if test "$MOZ_X11"; then - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $XCFLAGS" - cat > conftest.$ac_ext < -@@ -15047,7 +14987,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:15051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:14991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -15162,12 +15102,12 @@ fi - for ac_func in setlocale - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:15166: checking for $ac_func" >&5 -+echo "configure:15106: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -15220,12 +15160,12 @@ done - for ac_func in localeconv - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:15224: checking for $ac_func" >&5 -+echo "configure:15164: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else --- -1.9.3 - diff --git a/meta-gnome/recipes-support/mozjs/mozjs/0002-Move-JS_BYTES_PER_WORD-out-of-config.h.patch b/meta-gnome/recipes-support/mozjs/mozjs/0002-Move-JS_BYTES_PER_WORD-out-of-config.h.patch deleted file mode 100644 index 6aeb2f6..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs/0002-Move-JS_BYTES_PER_WORD-out-of-config.h.patch +++ /dev/null @@ -1,75 +0,0 @@ -From d4a15ad82292ff6d772dcc631df98754d20be31b Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Tue, 18 Mar 2014 11:46:05 -0400 -Subject: [PATCH 2/5] Move JS_BYTES_PER_WORD out of config.h - -Instead define it in terms of the already extant GNU C extension -__SIZEOF_POINTER__. This avoids multiarch conflicts when 32 and 64 -bit packages of js are co-installed. ---- - -Upstream-status: Pending - - js/src/configure.in | 9 --------- - js/src/js-config.h.in | 1 - - js/src/jstypes.h | 12 ++++++++++++ - 3 files changed, 12 insertions(+), 10 deletions(-) - -diff --git a/js/src/configure.in b/js/src/configure.in -index 15605b2..64c7606 100644 ---- a/js/src/configure.in -+++ b/js/src/configure.in -@@ -2345,15 +2345,6 @@ else - AC_MSG_RESULT(no) - fi - --MOZ_SIZE_OF_TYPE(JS_BYTES_PER_WORD, void*, 4 8) --if test "$moz_cv_size_of_JS_BYTES_PER_WORD" -eq "4"; then -- AC_DEFINE(JS_BITS_PER_WORD_LOG2, 5) --elif test "$moz_cv_size_of_JS_BYTES_PER_WORD" -eq "8"; then -- AC_DEFINE(JS_BITS_PER_WORD_LOG2, 6) --else -- AC_MSG_ERROR([Unexpected JS_BYTES_PER_WORD]) --fi -- - MOZ_ALIGN_OF_TYPE(JS_ALIGN_OF_POINTER, void*, 2 4 8 16) - MOZ_SIZE_OF_TYPE(JS_BYTES_PER_DOUBLE, double, 6 8 10 12 14) - -diff --git a/js/src/js-config.h.in b/js/src/js-config.h.in -index 6889e00..4775420 100644 ---- a/js/src/js-config.h.in -+++ b/js/src/js-config.h.in -@@ -56,7 +56,6 @@ - #undef JS_INT32_TYPE - #undef JS_INT64_TYPE - #undef JS_INTPTR_TYPE --#undef JS_BYTES_PER_WORD - - /* Some mozilla code uses JS-friend APIs that depend on JS_METHODJIT being - correct. */ -diff --git a/js/src/jstypes.h b/js/src/jstypes.h -index d0cf183..3e7928f 100644 ---- a/js/src/jstypes.h -+++ b/js/src/jstypes.h -@@ -24,6 +24,18 @@ - #include "mozilla/Util.h" - - #include "js-config.h" -+#ifndef JS_BYTES_PER_WORD -+#define JS_BYTES_PER_WORD __SIZEOF_POINTER__ -+#endif -+#ifndef JS_BITS_PER_WORD_LOG2 -+#if JS_BYTES_PER_WORD == 8 -+#define JS_BITS_PER_WORD_LOG2 6 -+#elif JS_BYTES_PER_WORD == 4 -+#define JS_BITS_PER_WORD_LOG2 5 -+#else -+#error Unhandled JS_BYTES_PER_WORD -+#endif -+#endif - - /*********************************************************************** - ** MACROS: JS_EXTERN_API --- -1.9.3 - diff --git a/meta-gnome/recipes-support/mozjs/mozjs/0002-fix-cannot-find-link.patch b/meta-gnome/recipes-support/mozjs/mozjs/0002-fix-cannot-find-link.patch new file mode 100644 index 0000000..4f7ebc6 --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/mozjs/0002-fix-cannot-find-link.patch @@ -0,0 +1,34 @@ +From e6dcee5f8a0f80ce99946b81fa1233611a149fe6 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Thu, 12 Jul 2018 18:00:52 +0800 +Subject: [PATCH 2/5] fix cannot find link + +.. +|DEBUG: link: Trying 'mips64-wrs-linux-ld --sysroot=tmp-glibc/work/ +mips64-wrs-linux/mozjs/52.8.1-r0/recipe-sysroot ' +|ERROR: Cannot find link +... + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia +--- + build/moz.configure/checks.configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/moz.configure/checks.configure b/build/moz.configure/checks.configure +index 8c2dbc0..83bffc3 100644 +--- a/build/moz.configure/checks.configure ++++ b/build/moz.configure/checks.configure +@@ -128,7 +128,7 @@ def check_prog(var, progs, what=None, input=None, allow_missing=False, + + for prog in value or progs: + log.debug('%s: Trying %s', var.lower(), quote(prog)) +- result = find_program(prog, paths) ++ result = find_program(prog.split()[0], paths) + if result: + return result + +-- +2.7.4 + diff --git a/meta-gnome/recipes-support/mozjs/mozjs/0003-Add-AArch64-support.patch b/meta-gnome/recipes-support/mozjs/mozjs/0003-Add-AArch64-support.patch deleted file mode 100644 index 6e72429..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs/0003-Add-AArch64-support.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 15e710e331d36eb279852b5cd1ba37a9a6005217 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Mon, 2 Mar 2015 19:08:22 +0800 -Subject: [PATCH 3/5] Add AArch64 support - ---- -Upstream-status: Pending - - js/src/assembler/jit/ExecutableAllocator.h | 6 ++++++ - js/src/assembler/wtf/Platform.h | 4 ++++ - js/src/configure.in | 4 ++++ - mfbt/double-conversion/utils.h | 1 + - 4 files changed, 15 insertions(+) - -diff --git a/js/src/assembler/jit/ExecutableAllocator.h b/js/src/assembler/jit/ExecutableAllocator.h -index c071c33..90764c3 100644 ---- a/js/src/assembler/jit/ExecutableAllocator.h -+++ b/js/src/assembler/jit/ExecutableAllocator.h -@@ -382,6 +382,12 @@ public: - { - reprotectRegion(start, size, Executable); - } -+#elif WTF_CPU_AARCH64 && WTF_PLATFORM_LINUX -+ static void cacheFlush(void* code, size_t size) -+ { -+ intptr_t end = reinterpret_cast(code) + size; -+ __builtin___clear_cache(reinterpret_cast(code), reinterpret_cast(end)); -+ } - #else - static void makeWritable(void*, size_t) {} - static void makeExecutable(void*, size_t) {} -diff --git a/js/src/assembler/wtf/Platform.h b/js/src/assembler/wtf/Platform.h -index 0c84896..e8763a7 100644 ---- a/js/src/assembler/wtf/Platform.h -+++ b/js/src/assembler/wtf/Platform.h -@@ -325,6 +325,10 @@ - #define WTF_THUMB_ARCH_VERSION 0 - #endif - -+/* CPU(AArch64) - 64-bit ARM */ -+#if defined(__aarch64__) -+#define WTF_CPU_AARCH64 1 -+#endif - - /* WTF_CPU_ARMV5_OR_LOWER - ARM instruction set v5 or earlier */ - /* On ARMv5 and below the natural alignment is required. -diff --git a/js/src/configure.in b/js/src/configure.in -index 64c7606..0673aca 100644 ---- a/js/src/configure.in -+++ b/js/src/configure.in -@@ -1121,6 +1121,10 @@ arm*) - CPU_ARCH=arm - ;; - -+aarch64) -+ CPU_ARCH=aarch64 -+ ;; -+ - mips|mipsel) - CPU_ARCH="mips" - ;; -diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h -index 0eec2d9..fe26dab 100644 ---- a/mfbt/double-conversion/utils.h -+++ b/mfbt/double-conversion/utils.h -@@ -58,6 +58,7 @@ - defined(__mips__) || defined(__powerpc__) || \ - defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ - defined(__SH4__) || defined(__alpha__) || \ -+ defined(__aarch64__) || \ - defined(_MIPS_ARCH_MIPS32R2) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) --- -1.9.3 - diff --git a/meta-gnome/recipes-support/mozjs/mozjs/0003-workaround-autoconf-2.13-detection-failed.patch b/meta-gnome/recipes-support/mozjs/mozjs/0003-workaround-autoconf-2.13-detection-failed.patch new file mode 100644 index 0000000..a754ff1 --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/mozjs/0003-workaround-autoconf-2.13-detection-failed.patch @@ -0,0 +1,28 @@ +From 646a78262b18e19721cd41ee515215221dd241b6 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Thu, 12 Jul 2018 18:12:42 +0800 +Subject: [PATCH 3/5] workaround autoconf 2.13 detection failed + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia +--- + build/moz.configure/old.configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure +index b32c3f7..ece47f4 100644 +--- a/build/moz.configure/old.configure ++++ b/build/moz.configure/old.configure +@@ -31,7 +31,7 @@ def autoconf(mozconfig, autoconf): + autoconf = autoconf[0] if autoconf else None + + for ac in (mozconfig_autoconf, autoconf, 'autoconf-2.13', 'autoconf2.13', +- 'autoconf213'): ++ 'autoconf213', 'autoconf'): + if ac: + autoconf = find_program(ac) + if autoconf: +-- +2.7.4 + diff --git a/meta-gnome/recipes-support/mozjs/mozjs/0004-do-not-use-autoconf-2.13-to-refresh-old.configure.patch b/meta-gnome/recipes-support/mozjs/mozjs/0004-do-not-use-autoconf-2.13-to-refresh-old.configure.patch new file mode 100644 index 0000000..4cba79c --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/mozjs/0004-do-not-use-autoconf-2.13-to-refresh-old.configure.patch @@ -0,0 +1,42 @@ +From a46adb74b5ba5e17d676d31d70faca76c1381d15 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Thu, 12 Jul 2018 21:25:46 +0800 +Subject: [PATCH 4/5] do not use autoconf 2.13 to refresh old.configure + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia +--- + build/moz.configure/old.configure | 2 +- + js/src/old-configure | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure +index ece47f4..a73900f 100644 +--- a/build/moz.configure/old.configure ++++ b/build/moz.configure/old.configure +@@ -83,7 +83,7 @@ def prepare_configure(old_configure, mozconfig, autoconf, build_env, shell, + old_configure = os.path.join(old_configure_dir, 'js', 'src', + os.path.basename(old_configure)) + +- refresh = True ++ refresh = False + if exists(old_configure): + mtime = getmtime(old_configure) + aclocal = os.path.join(build_env.topsrcdir, 'build', 'autoconf', +diff --git a/js/src/old-configure b/js/src/old-configure +index 75b00e1..8a8ef52 100644 +--- a/js/src/old-configure ++++ b/js/src/old-configure +@@ -619,7 +619,7 @@ if test -z "$srcdir"; then + ac_prog=$0 + ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` + test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. +- srcdir=$ac_confdir ++ srcdir="$ac_confdir/../../" + if test ! -r $srcdir/$ac_unique_file; then + srcdir=.. + fi +-- +2.7.4 + diff --git a/meta-gnome/recipes-support/mozjs/mozjs/0004-mozbug746112-no-decommit-on-large-pages.patch b/meta-gnome/recipes-support/mozjs/mozjs/0004-mozbug746112-no-decommit-on-large-pages.patch deleted file mode 100644 index 8bd35d4..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs/0004-mozbug746112-no-decommit-on-large-pages.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 0128c5a9eeee0d3fc0deb9129dd20eb79338c8f4 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Mon, 2 Mar 2015 19:08:59 +0800 -Subject: [PATCH 4/5] mozbug746112-no-decommit-on-large-pages - ---- -Upstream-status: Pending - - js/src/gc/Heap.h | 15 ++++++++++----- - js/src/jsgc.cpp | 15 ++++++++++++--- - 2 files changed, 22 insertions(+), 8 deletions(-) - -diff --git a/js/src/gc/Heap.h b/js/src/gc/Heap.h -index b8f8c78..1cfd269 100644 ---- a/js/src/gc/Heap.h -+++ b/js/src/gc/Heap.h -@@ -103,26 +103,31 @@ struct Cell - }; - - /* -- * Page size is 4096 by default, except for SPARC, where it is 8192. -+ * Page size must be static to support our arena pointer optimizations, so we -+ * are forced to support each platform with non-4096 pages as a special case. -+ * Note: The freelist supports a maximum arena shift of 15. - * Note: Do not use JS_CPU_SPARC here, this header is used outside JS. - * Bug 692267: Move page size definition to gc/Memory.h and include it - * directly once jsgc.h is no longer an installed header. - */ - #if defined(SOLARIS) && (defined(__sparc) || defined(__sparcv9)) - const size_t PageShift = 13; -+const size_t ArenaShift = PageShift; -+#elif defined(__powerpc__) -+const size_t PageShift = 16; -+const size_t ArenaShift = 12; - #else - const size_t PageShift = 12; -+const size_t ArenaShift = PageShift; - #endif - const size_t PageSize = size_t(1) << PageShift; -+const size_t ArenaSize = size_t(1) << ArenaShift; -+const size_t ArenaMask = ArenaSize - 1; - - const size_t ChunkShift = 20; - const size_t ChunkSize = size_t(1) << ChunkShift; - const size_t ChunkMask = ChunkSize - 1; - --const size_t ArenaShift = PageShift; --const size_t ArenaSize = PageSize; --const size_t ArenaMask = ArenaSize - 1; -- - /* - * This is the maximum number of arenas we allow in the FreeCommitted state - * before we trigger a GC_SHRINK to release free arenas to the OS. -diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp -index b3caf05..a258d2d 100644 ---- a/js/src/jsgc.cpp -+++ b/js/src/jsgc.cpp -@@ -251,6 +251,13 @@ static const int BackgroundPhaseLength[] = { - sizeof(BackgroundPhaseStrings) / sizeof(AllocKind) - }; - -+/* Unused memory decommiting requires the arena size match the page size. */ -+static bool -+DecommitEnabled() -+{ -+ return PageSize == ArenaSize; -+} -+ - #ifdef DEBUG - void - ArenaHeader::checkSynchronizedWithFreeList() const -@@ -742,7 +749,8 @@ Chunk::fetchNextDecommittedArena() - decommittedArenas.unset(offset); - - Arena *arena = &arenas[offset]; -- MarkPagesInUse(arena, ArenaSize); -+ if (DecommitEnabled()) -+ MarkPagesInUse(arena, ArenaSize); - arena->aheader.setAsNotAllocated(); - - return &arena->aheader; -@@ -2731,7 +2739,7 @@ DecommitArenasFromAvailableList(JSRuntime *rt, Chunk **availableListHeadp) - chunk->removeFromAvailableList(); - - size_t arenaIndex = Chunk::arenaIndex(aheader->arenaAddress()); -- bool ok; -+ bool ok = true; - { - /* - * If the main thread waits for the decommit to finish, skip -@@ -2741,7 +2749,8 @@ DecommitArenasFromAvailableList(JSRuntime *rt, Chunk **availableListHeadp) - Maybe maybeUnlock; - if (!rt->isHeapBusy()) - maybeUnlock.construct(rt); -- ok = MarkPagesUnused(aheader->getArena(), ArenaSize); -+ if (DecommitEnabled()) -+ ok = MarkPagesUnused(aheader->getArena(), ArenaSize); - } - - if (ok) { --- -1.9.3 - diff --git a/meta-gnome/recipes-support/mozjs/mozjs/0005-aarch64-64k-page.patch b/meta-gnome/recipes-support/mozjs/mozjs/0005-aarch64-64k-page.patch deleted file mode 100644 index bc99ecc..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs/0005-aarch64-64k-page.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 9c42920c2b635a399bd1f93833efdeb1696f17ee Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Mon, 2 Mar 2015 19:09:57 +0800 -Subject: [PATCH 5/5] aarch64-64k-page - ---- -Upstream-status: Pending - - js/src/gc/Heap.h | 2 +- - js/src/gc/Memory.cpp | 3 +++ - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/js/src/gc/Heap.h b/js/src/gc/Heap.h -index 1cfd269..f4dbcda 100644 ---- a/js/src/gc/Heap.h -+++ b/js/src/gc/Heap.h -@@ -113,7 +113,7 @@ struct Cell - #if defined(SOLARIS) && (defined(__sparc) || defined(__sparcv9)) - const size_t PageShift = 13; - const size_t ArenaShift = PageShift; --#elif defined(__powerpc__) -+#elif defined(__powerpc__) || defined(__aarch64__) - const size_t PageShift = 16; - const size_t ArenaShift = 12; - #else -diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp -index 5b386a2..e5ad018 100644 ---- a/js/src/gc/Memory.cpp -+++ b/js/src/gc/Memory.cpp -@@ -302,8 +302,11 @@ GetPageFaultCount() - void - InitMemorySubsystem() - { -+ /* aarch64 may have 64KB or 4KB pages */ -+#ifndef __aarch64__ - if (size_t(sysconf(_SC_PAGESIZE)) != PageSize) - MOZ_CRASH(); -+#endif - } - - void * --- -1.9.3 - diff --git a/meta-gnome/recipes-support/mozjs/mozjs/0005-fix-do_compile-failed-on-mips.patch b/meta-gnome/recipes-support/mozjs/mozjs/0005-fix-do_compile-failed-on-mips.patch new file mode 100644 index 0000000..38e4698 --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/mozjs/0005-fix-do_compile-failed-on-mips.patch @@ -0,0 +1,38 @@ +From 55d833dc3c194f1eb7841f308ad3b9ec3800d3b3 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Fri, 13 Jul 2018 15:48:32 +0800 +Subject: [PATCH 5/5] fix do_compile failed on mips + +Link with var-OS_LDFLAGS to fix the issue. +Such as on mips: +... +|mips-wrsmllib32-linux-g++ -meb -mabi=32 -mhard-float ... -o libmozjs-52.so +|/usr/include/c++/8.1.0/bits/atomic_base.h:514: error: undefined +reference to '__atomic_fetch_add_8' +... + +In recipe, set OS_LDFLAGS="-Wl,-latomic" could fix the issue. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia +--- + config/config.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/config.mk b/config/config.mk +index 4e3fd1a..d847ffa 100644 +--- a/config/config.mk ++++ b/config/config.mk +@@ -523,7 +523,7 @@ EXPAND_MKSHLIB_ARGS = --uselist + ifdef SYMBOL_ORDER + EXPAND_MKSHLIB_ARGS += --symbol-order $(SYMBOL_ORDER) + endif +-EXPAND_MKSHLIB = $(EXPAND_LIBS_EXEC) $(EXPAND_MKSHLIB_ARGS) -- $(MKSHLIB) ++EXPAND_MKSHLIB = $(EXPAND_LIBS_EXEC) $(EXPAND_MKSHLIB_ARGS) -- $(MKSHLIB) $(OS_LDFLAGS) + + # $(call CHECK_SYMBOLS,lib,PREFIX,dep_name,test) + # Checks that the given `lib` doesn't contain dependency on symbols with a +-- +2.7.4 + diff --git a/meta-gnome/recipes-support/mozjs/mozjs/0006-support-musl.patch b/meta-gnome/recipes-support/mozjs/mozjs/0006-support-musl.patch new file mode 100644 index 0000000..32a977c --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/mozjs/0006-support-musl.patch @@ -0,0 +1,158 @@ +From 04e8a611e958f0da1ccac61acae3a6f1a5168b20 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Fri, 13 Jul 2018 18:08:14 +0800 +Subject: [PATCH] support musl + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia +--- + memory/jemalloc/src/src/pages.c | 1 - + memory/mozjemalloc/jemalloc.c | 7 +++---- + mozglue/misc/TimeStamp_darwin.cpp | 1 - + mozglue/misc/TimeStamp_posix.cpp | 1 - + nsprpub/pr/src/misc/prsystem.c | 1 - + python/psutil/psutil/_psutil_bsd.c | 1 - + python/psutil/psutil/_psutil_osx.c | 1 - + python/psutil/psutil/arch/bsd/process_info.c | 1 - + python/psutil/psutil/arch/osx/process_info.c | 1 - + 9 files changed, 3 insertions(+), 12 deletions(-) + +diff --git a/memory/jemalloc/src/src/pages.c b/memory/jemalloc/src/src/pages.c +index 647952a..7b964c8 100644 +--- a/memory/jemalloc/src/src/pages.c ++++ b/memory/jemalloc/src/src/pages.c +@@ -2,7 +2,6 @@ + #include "jemalloc/internal/jemalloc_internal.h" + + #ifdef JEMALLOC_SYSCTL_VM_OVERCOMMIT +-#include + #endif + + /******************************************************************************/ +diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c +index 5d4d83a..c618de9 100644 +--- a/memory/mozjemalloc/jemalloc.c ++++ b/memory/mozjemalloc/jemalloc.c +@@ -332,7 +332,6 @@ __FBSDID("$FreeBSD: head/lib/libc/stdlib/malloc.c 180599 2008-07-18 19:35:44Z ja + #include + #include + #if !defined(MOZ_MEMORY_SOLARIS) && !defined(MOZ_MEMORY_ANDROID) +-#include + #endif + #include + #ifndef MOZ_MEMORY +@@ -674,7 +673,7 @@ static bool malloc_initialized = false; + #elif defined(MOZ_MEMORY_DARWIN) + static malloc_mutex_t init_lock = {OS_SPINLOCK_INIT}; + #elif defined(MOZ_MEMORY_LINUX) && !defined(MOZ_MEMORY_ANDROID) +-static malloc_mutex_t init_lock = PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP; ++static malloc_mutex_t init_lock = PTHREAD_MUTEX_INITIALIZER; + #elif defined(MOZ_MEMORY) + static malloc_mutex_t init_lock = PTHREAD_MUTEX_INITIALIZER; + #else +@@ -1644,7 +1643,7 @@ malloc_mutex_init(malloc_mutex_t *mutex) + pthread_mutexattr_t attr; + if (pthread_mutexattr_init(&attr) != 0) + return (true); +- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP); ++ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_STALLED); + if (pthread_mutex_init(mutex, &attr) != 0) { + pthread_mutexattr_destroy(&attr); + return (true); +@@ -1709,7 +1708,7 @@ malloc_spin_init(malloc_spinlock_t *lock) + pthread_mutexattr_t attr; + if (pthread_mutexattr_init(&attr) != 0) + return (true); +- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP); ++ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_STALLED); + if (pthread_mutex_init(lock, &attr) != 0) { + pthread_mutexattr_destroy(&attr); + return (true); +diff --git a/mozglue/misc/TimeStamp_darwin.cpp b/mozglue/misc/TimeStamp_darwin.cpp +index f30bc98..3998c9c 100644 +--- a/mozglue/misc/TimeStamp_darwin.cpp ++++ b/mozglue/misc/TimeStamp_darwin.cpp +@@ -18,7 +18,6 @@ + + #include + #include +-#include + #include + #include + +diff --git a/mozglue/misc/TimeStamp_posix.cpp b/mozglue/misc/TimeStamp_posix.cpp +index 05dedde..d9e30f2 100644 +--- a/mozglue/misc/TimeStamp_posix.cpp ++++ b/mozglue/misc/TimeStamp_posix.cpp +@@ -21,7 +21,6 @@ + #if defined(__DragonFly__) || defined(__FreeBSD__) \ + || defined(__NetBSD__) || defined(__OpenBSD__) + #include +-#include + #endif + + #if defined(__DragonFly__) || defined(__FreeBSD__) +diff --git a/nsprpub/pr/src/misc/prsystem.c b/nsprpub/pr/src/misc/prsystem.c +index eba85fb..54b57bb 100644 +--- a/nsprpub/pr/src/misc/prsystem.c ++++ b/nsprpub/pr/src/misc/prsystem.c +@@ -27,7 +27,6 @@ + || defined(OPENBSD) || defined(DRAGONFLY) || defined(DARWIN) + #define _PR_HAVE_SYSCTL + #include +-#include + #endif + + #if defined(DARWIN) +diff --git a/python/psutil/psutil/_psutil_bsd.c b/python/psutil/psutil/_psutil_bsd.c +index 7b6e561..0a91262 100644 +--- a/python/psutil/psutil/_psutil_bsd.c ++++ b/python/psutil/psutil/_psutil_bsd.c +@@ -16,7 +16,6 @@ + #include + #include + #include +-#include + #include + #include + #include +diff --git a/python/psutil/psutil/_psutil_osx.c b/python/psutil/psutil/_psutil_osx.c +index 3ebf8ff..b3910ba 100644 +--- a/python/psutil/psutil/_psutil_osx.c ++++ b/python/psutil/psutil/_psutil_osx.c +@@ -13,7 +13,6 @@ + #include + #include + #include +-#include + #include + #include + #include +diff --git a/python/psutil/psutil/arch/bsd/process_info.c b/python/psutil/psutil/arch/bsd/process_info.c +index 4d73924..46f288d 100644 +--- a/python/psutil/psutil/arch/bsd/process_info.c ++++ b/python/psutil/psutil/arch/bsd/process_info.c +@@ -15,7 +15,6 @@ + #include + #include + #include +-#include + #include + #include + #include +diff --git a/python/psutil/psutil/arch/osx/process_info.c b/python/psutil/psutil/arch/osx/process_info.c +index b6dd5bb..62a838f 100644 +--- a/python/psutil/psutil/arch/osx/process_info.c ++++ b/python/psutil/psutil/arch/osx/process_info.c +@@ -16,7 +16,6 @@ + #include + #include + #include +-#include + #include + + #include "process_info.h" +-- +2.7.4 + diff --git a/meta-gnome/recipes-support/mozjs/mozjs/0010-fix-cross-compilation-on-i586-targets.patch b/meta-gnome/recipes-support/mozjs/mozjs/0010-fix-cross-compilation-on-i586-targets.patch index 6432e1f..9194e34 100644 --- a/meta-gnome/recipes-support/mozjs/mozjs/0010-fix-cross-compilation-on-i586-targets.patch +++ b/meta-gnome/recipes-support/mozjs/mozjs/0010-fix-cross-compilation-on-i586-targets.patch @@ -1,4 +1,4 @@ -From a452138a1dd274bfad381a701729783360dc86fb Mon Sep 17 00:00:00 2001 +From a452138a1dd274bfad381a701729783360dc86fb Mon Sep 17 00:00:00 2001 From: Maciej Borzecki Date: Tue, 5 Jan 2016 22:04:17 +0100 Subject: [PATCH] fix cross compilation on i586 targets @@ -10,37 +10,26 @@ regenerate configure, similar fix is applied there. Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Maciej Borzecki ---- - js/src/configure | 2 +- - js/src/configure.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/js/src/configure b/js/src/configure -index d019b0fdba44233596541de94307010d85a8e32e..5aa40f757a3dbb7d6887175046f44212c15c2eac 100755 ---- a/js/src/configure -+++ b/js/src/configure -@@ -5555,7 +5555,7 @@ TARGET_MD_ARCH=unix +Rebase to 52.8.1 +Signed-off-by: Hongxu Jia +--- + js/src/old-configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/js/src/old-configure b/js/src/old-configure +index 8a8ef52..d7afcff 100644 +--- a/js/src/old-configure ++++ b/js/src/old-configure +@@ -3964,7 +3964,7 @@ IMPORT_LIB_SUFFIX= DIRENT_INO=d_ino MOZ_USER_DIR=".mozilla" --MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib' -+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin' +-MOZ_FIX_LINK_PATHS="-Wl,-rpath-link,${DIST}/bin -Wl,-rpath-link,${prefix}/lib" ++MOZ_FIX_LINK_PATHS="-Wl,-rpath-link,${DIST}/bin" - MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)' -diff --git a/js/src/configure.in b/js/src/configure.in -index 0673aca12f6d83035549ade2a4a83906bf91f0f0..39b22724f9535ac1a6dba04658c91e4ef667fc47 100644 ---- a/js/src/configure.in -+++ b/js/src/configure.in -@@ -919,7 +919,7 @@ TARGET_MD_ARCH=unix - DIRENT_INO=d_ino - MOZ_USER_DIR=".mozilla" - --MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib' -+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin' - - MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)' -- -2.5.0 +2.7.4 diff --git a/meta-gnome/recipes-support/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch b/meta-gnome/recipes-support/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch deleted file mode 100644 index 15ad03f..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch +++ /dev/null @@ -1,115 +0,0 @@ -From a0c0f32299419359b44ac0f880c1ea9073ae51e1 Mon Sep 17 00:00:00 2001 -From: Zheng Xu -Date: Fri, 2 Sep 2016 17:40:05 +0800 -Subject: [PATCH] Bug 1143022 - Manually mmap on arm64 to ensure high 17 bits - are clear. r=ehoogeveen - -There might be 48-bit VA on arm64 depending on kernel configuration. -Manually mmap heap memory to align with the assumption made by JS engine. - -Change-Id: Ic5d2b2fe4b758b3c87cc0688348af7e71a991146 - -Upstream-status: Backport - ---- - js/src/gc/Memory.cpp | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 71 insertions(+), 2 deletions(-) - -diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp -index 5b386a2..38101cf 100644 ---- a/js/src/gc/Memory.cpp -+++ b/js/src/gc/Memory.cpp -@@ -306,6 +306,75 @@ InitMemorySubsystem() - MOZ_CRASH(); - } - -+static inline void * -+MapMemory(size_t length, int prot, int flags, int fd, off_t offset) -+{ -+#if defined(__ia64__) -+ /* -+ * The JS engine assumes that all allocated pointers have their high 17 bits clear, -+ * which ia64's mmap doesn't support directly. However, we can emulate it by passing -+ * mmap an "addr" parameter with those bits clear. The mmap will return that address, -+ * or the nearest available memory above that address, providing a near-guarantee -+ * that those bits are clear. If they are not, we return NULL below to indicate -+ * out-of-memory. -+ * -+ * The addr is chosen as 0x0000070000000000, which still allows about 120TB of virtual -+ * address space. -+ * -+ * See Bug 589735 for more information. -+ */ -+ void *region = mmap((void*)0x0000070000000000, length, prot, flags, fd, offset); -+ if (region == MAP_FAILED) -+ return MAP_FAILED; -+ /* -+ * If the allocated memory doesn't have its upper 17 bits clear, consider it -+ * as out of memory. -+ */ -+ if ((uintptr_t(region) + (length - 1)) & 0xffff800000000000) { -+ JS_ALWAYS_TRUE(0 == munmap(region, length)); -+ return MAP_FAILED; -+ } -+ return region; -+#elif defined(__aarch64__) -+ /* -+ * There might be similar virtual address issue on arm64 which depends on -+ * hardware and kernel configurations. But the work around is slightly -+ * different due to the different mmap behavior. -+ * -+ * TODO: Merge with the above code block if this implementation works for -+ * ia64 and sparc64. -+ */ -+ const uintptr_t start = UINT64_C(0x0000070000000000); -+ const uintptr_t end = UINT64_C(0x0000800000000000); -+ const uintptr_t step = ChunkSize; -+ /* -+ * Optimization options if there are too many retries in practice: -+ * 1. Examine /proc/self/maps to find an available address. This file is -+ * not always available, however. In addition, even if we examine -+ * /proc/self/maps, we may still need to retry several times due to -+ * racing with other threads. -+ * 2. Use a global/static variable with lock to track the addresses we have -+ * allocated or tried. -+ */ -+ uintptr_t hint; -+ void* region = MAP_FAILED; -+ for (hint = start; region == MAP_FAILED && hint + length <= end; hint += step) { -+ region = mmap((void*)hint, length, prot, flags, fd, offset); -+ if (region != MAP_FAILED) { -+ if ((uintptr_t(region) + (length - 1)) & 0xffff800000000000) { -+ if (munmap(region, length)) { -+ MOZ_ASSERT(errno == ENOMEM); -+ } -+ region = MAP_FAILED; -+ } -+ } -+ } -+ return region == MAP_FAILED ? NULL : region; -+#else -+ return mmap(NULL, length, prot, flags, fd, offset); -+#endif -+} -+ - void * - MapAlignedPages(size_t size, size_t alignment) - { -@@ -319,12 +388,12 @@ MapAlignedPages(size_t size, size_t alignment) - - /* Special case: If we want page alignment, no further work is needed. */ - if (alignment == PageSize) { -- return mmap(NULL, size, prot, flags, -1, 0); -+ return MapMemory(size, prot, flags, -1, 0); - } - - /* Overallocate and unmap the region's edges. */ - size_t reqSize = Min(size + 2 * alignment, 2 * size); -- void *region = mmap(NULL, reqSize, prot, flags, -1, 0); -+ void *region = MapMemory(reqSize, prot, flags, -1, 0); - if (region == MAP_FAILED) - return NULL; - --- -1.9.1 - diff --git a/meta-gnome/recipes-support/mozjs/mozjs/add-riscv-support.patch b/meta-gnome/recipes-support/mozjs/mozjs/add-riscv-support.patch new file mode 100644 index 0000000..4354a9d --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/mozjs/add-riscv-support.patch @@ -0,0 +1,70 @@ +Add RISC-V support + +Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1318905] + +Signed-off-by: Ricardo Salveti + +diff --git a/build/autoconf/config.guess b/build/autoconf/config.guess +index d5d667d..1277a86 100755 +--- a/build/autoconf/config.guess ++++ b/build/autoconf/config.guess +@@ -1029,6 +1029,9 @@ EOF + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} + exit ;; ++ riscv32:Linux:*:* | riscv64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + exit ;; +diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure +index 6fe6591..56e6730 100644 +--- a/build/moz.configure/init.configure ++++ b/build/moz.configure/init.configure +@@ -362,6 +362,9 @@ def split_triplet(triplet): + elif cpu.startswith('aarch64'): + canonical_cpu = 'aarch64' + endianness = 'little' ++ elif cpu in ('riscv32', 'riscv64'): ++ canonical_cpu = cpu ++ endianness = 'little' + else: + die('Unknown CPU type: %s' % cpu) + +diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h +index 15dd4bf..4f37218 100644 +--- a/mfbt/double-conversion/utils.h ++++ b/mfbt/double-conversion/utils.h +@@ -60,7 +60,8 @@ + defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ + defined(__SH4__) || defined(__alpha__) || \ + defined(_MIPS_ARCH_MIPS32R2) || \ +- defined(__AARCH64EL__) || defined(__aarch64__) ++ defined(__AARCH64EL__) || defined(__aarch64__) || \ ++ defined(__riscv) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) + #if defined(_WIN32) +diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py +index dfc7cf8..4f8d666 100644 +--- a/python/mozbuild/mozbuild/configure/constants.py ++++ b/python/mozbuild/mozbuild/configure/constants.py +@@ -48,6 +48,8 @@ CPU_bitness = { + 'mips64': 64, + 'ppc': 32, + 'ppc64': 64, ++ 'riscv32': 32, ++ 'riscv64': 64, + 's390': 32, + 's390x': 64, + 'sparc': 32, +@@ -79,6 +81,8 @@ CPU_preprocessor_checks = OrderedDict(( + ('s390', '__s390__'), + ('ppc64', '__powerpc64__'), + ('ppc', '__powerpc__'), ++ ('riscv32', '__riscv && __SIZEOF_POINTER__ == 4'), ++ ('riscv64', '__riscv && __SIZEOF_POINTER__ == 8'), + ('Alpha', '__alpha__'), + ('hppa', '__hppa__'), + ('sparc64', '__sparc__ && __arch64__'), diff --git a/meta-gnome/recipes-support/mozjs/mozjs/disable-mozglue-in-stand-alone-builds.patch b/meta-gnome/recipes-support/mozjs/mozjs/disable-mozglue-in-stand-alone-builds.patch new file mode 100644 index 0000000..5487cdb --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/mozjs/disable-mozglue-in-stand-alone-builds.patch @@ -0,0 +1,74 @@ +From 2fb531ac753500314336ccd508cb2d53f5e768e5 Mon Sep 17 00:00:00 2001 +From: Till Schneidereit +Date: Thu, 1 Oct 2015 12:59:09 +0200 +Subject: Disable MOZ_GLUE_IN_PROGRAM in stand-alone builds on all platforms + +Otherwise, build fails not being able to find HashBytes. + +Patch ported forward to mozjs52 by Philip Chimento +. + +https://bugzilla.mozilla.org/show_bug.cgi?id=1176787 + +Upstream-Status: Backport + +Signed-off-by: Ricardo Salveti +--- + js/src/old-configure | 20 ++++++++++++-------- + mozglue/build/moz.build | 2 +- + 2 files changed, 13 insertions(+), 9 deletions(-) + +diff --git a/js/src/old-configure b/js/src/old-configure +index d7afcff..8a6f142 100644 +--- a/js/src/old-configure ++++ b/js/src/old-configure +@@ -8546,21 +8546,25 @@ if test -z "$MOZ_ENABLE_WARNINGS_AS_ERRORS"; then + fi + + +-case "${OS_TARGET}" in +-Android|WINNT|Darwin) ++if test "$JS_STANDALONE"; then + MOZ_GLUE_IN_PROGRAM= +- ;; +-*) +- MOZ_GLUE_IN_PROGRAM=1 +- cat >> confdefs.pytmp <<\EOF ++else ++ case "${OS_TARGET}" in ++ Android|WINNT|Darwin) ++ MOZ_GLUE_IN_PROGRAM= ++ ;; ++ *) ++ MOZ_GLUE_IN_PROGRAM=1 ++ cat >> confdefs.pytmp <<\EOF + (''' MOZ_GLUE_IN_PROGRAM ''', ' 1 ') + EOF + cat >> confdefs.h <<\EOF + #define MOZ_GLUE_IN_PROGRAM 1 + EOF + +- ;; +-esac ++ ;; ++ esac ++fi + + if test "$MOZ_MEMORY"; then + if test "x$MOZ_DEBUG" = "x1"; then +diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build +index d289747..e3be5a2 100644 +--- a/mozglue/build/moz.build ++++ b/mozglue/build/moz.build +@@ -6,7 +6,7 @@ + + # Build mozglue as a shared lib on Windows, OSX and Android. + # If this is ever changed, update MOZ_SHARED_MOZGLUE in browser/installer/Makefile.in +-if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android'): ++if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android') and not CONFIG['JS_STANDALONE']: + SharedLibrary('mozglue') + else: + Library('mozglue') +-- +2.7.4 + diff --git a/meta-gnome/recipes-support/mozjs/mozjs/fix-the-compile-error-of-powerpc64.patch b/meta-gnome/recipes-support/mozjs/mozjs/fix-the-compile-error-of-powerpc64.patch deleted file mode 100644 index 43c4590..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs/fix-the-compile-error-of-powerpc64.patch +++ /dev/null @@ -1,18 +0,0 @@ -fix the compile error of powerpc64 - -Upstream-status: Accepted - - fix the following error - |error: 'jsuword' does not name a type - - ---- a/js/src/jsval.hold 2015-04-24 01:15:06.692970731 -0500 -+++ b/js/src/jsval.h 2015-04-24 01:15:41.792969478 -0500 -@@ -304,7 +304,6 @@ - int32_t i32; - uint32_t u32; - JSWhyMagic why; -- jsuword word; - } payload; - } s; - double asDouble; diff --git a/meta-gnome/recipes-support/mozjs/mozjs/fix_milestone_compile_issue.patch b/meta-gnome/recipes-support/mozjs/mozjs/fix_milestone_compile_issue.patch deleted file mode 100644 index abde01b..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs/fix_milestone_compile_issue.patch +++ /dev/null @@ -1,20 +0,0 @@ -fix the compile error do to perl update - -Upstream-status: Inappropriate - - -Signed-of-by: Armin Kuster - -Index: src/config/milestone.pl -=================================================================== ---- src.orig/config/milestone.pl -+++ src/config/milestone.pl -@@ -55,7 +55,7 @@ $MILESTONE_FILE = "$TOPSRCDIR/config/mi - # - my $milestone = Moz::Milestone::getOfficialMilestone($MILESTONE_FILE); - --if (defined(@TEMPLATE_FILE)) { -+if (@TEMPLATE_FILE) { - my $TFILE; - - foreach $TFILE (@TEMPLATE_FILE) { diff --git a/meta-gnome/recipes-support/mozjs/mozjs/format-overflow.patch b/meta-gnome/recipes-support/mozjs/mozjs/format-overflow.patch new file mode 100644 index 0000000..29c6a7b --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/mozjs/format-overflow.patch @@ -0,0 +1,21 @@ +Drop enable format string warnings to help gcc9 + +Fixes +| /mnt/a/yoe/build/tmp/work/core2-64-yoe-linux-musl/mozjs/52.9.1-r0/mozjs-52.9.1/js/src/jit/x64/BaseAssembler-x64.h:596:13: error: '%s' directive argument is null [-Werror=format-overflow=] +| 596 | spew("movq " MEM_obs ", %s", ADDR_obs(offset, base, index, scale), GPReg64Name(dst)); +| | ~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Inappropriate [Workaround for gcc9] +Signed-off-by: Khem Raj + +--- a/js/src/moz.build ++++ b/js/src/moz.build +@@ -785,7 +785,7 @@ if CONFIG['JS_HAS_CTYPES']: + DEFINES['FFI_BUILDING'] = True + + if CONFIG['GNU_CXX']: +- CXXFLAGS += ['-Wno-shadow', '-Werror=format'] ++ CXXFLAGS += ['-Wno-shadow'] + + # Suppress warnings in third-party code. + if CONFIG['CLANG_CXX']: diff --git a/meta-gnome/recipes-support/mozjs/mozjs52.bb b/meta-gnome/recipes-support/mozjs/mozjs52.bb deleted file mode 100644 index 321cc6a..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs52.bb +++ /dev/null @@ -1,59 +0,0 @@ -SUMMARY = "SpiderMonkey is Mozilla's JavaScript engine written in C/C++" -HOMEPAGE = "http://www.mozilla.org/js/" -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://../../LICENSE;md5=815ca599c9df247a0c7f619bab123dad" - -RELEASE_VERSION = "mozjs-52.2.1gnome1" - -SRC_URI = "https://download.gnome.org/teams/releng/tarballs-needing-help/mozjs/${RELEASE_VERSION}.tar.gz \ - file://0001-do-not-include-RequiredDefines.patch \ - " -SRC_URI[md5sum] = "72bd9a715ed1ab70b2aebe92969f6b63" -SRC_URI[sha256sum] = "31697943b1dbbb51ba9aee35b8269a353c487d7af4d336010b90054dc4f9b0af" - -DEPENDS += "nspr zlib autoconf213-native" - -S = "${WORKDIR}/${RELEASE_VERSION}/js/src" - -FILES_${PN}-staticdev += "${libdir}/*.ajs" - -# prevent FILES_mozjs52-dev from scooping up libmozjs-52.so -FILES_SOLIBSDEV = "" - -# put it here instead -PACKAGES =+ "lib${BPN}" -FILES_lib${BPN} = "${libdir}/lib*.so" - -inherit autotools pkgconfig perlnative pythonnative - -EXTRA_OECONF = " \ - --target=${TARGET_SYS} \ - --host=${BUILD_SYS} \ - --build=${BUILD_SYS} \ - --prefix=${prefix} \ - --libdir=${libdir} \ - --enable-posix-nspr-emulation \ - --with-system-zlib \ - --with-intl-api \ - --disable-jemalloc \ - --disable-static \ - --with-x=no \ -" - - - -# native-python uses RPATH to find libpython, but mozilla builder sets -# up a virtualenv which copies the python binary to a new location where -# it can no longer find the expected libpython with embedded RPATH. -# the LD_LIBRARY_PATH setting fixes this problem. - -EXTRA_OEMAKE += "SHELL=/bin/sh LD_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE}" - -do_configure() { - export LD_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE} - export SHELL=/bin/bash - STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} - STAGING_INCDIR=${STAGING_INCDIR_NATIVE} - LD=x86_64-oe-linux-ld - ${S}/configure ${EXTRA_OECONF} -} diff --git a/meta-gnome/recipes-support/mozjs/mozjs52/0001-do-not-include-RequiredDefines.patch b/meta-gnome/recipes-support/mozjs/mozjs52/0001-do-not-include-RequiredDefines.patch deleted file mode 100644 index d816b87..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs52/0001-do-not-include-RequiredDefines.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 488c8ee5ff98a2d1fb40553ff1db8b452f88a735 Mon Sep 17 00:00:00 2001 -From: brl -Date: Tue, 23 Jan 2018 14:51:11 -0500 -Subject: [PATCH] do not include RequiredDefines - -pkg-config does not correctly prepend sysroot to this ---- - js.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/js.pc.in b/js.pc.in -index 1efea33..f6614ff 100644 ---- a/js.pc.in -+++ b/js.pc.in -@@ -8,4 +8,4 @@ Description: The Mozilla library for JavaScript - Version: @MOZILLA_VERSION@ - Requires.private: @NSPR_PKGCONF_CHECK@ - Libs: -L${libdir} -l@JS_LIBRARY_NAME@ --Cflags: -include ${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -I${includedir}/@JS_LIBRARY_NAME@ -+Cflags: -I${includedir}/@JS_LIBRARY_NAME@ --- -2.14.3 - diff --git a/meta-gnome/recipes-support/mozjs/mozjs_17.0.0.bb b/meta-gnome/recipes-support/mozjs/mozjs_17.0.0.bb deleted file mode 100644 index 49b7f15..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs_17.0.0.bb +++ /dev/null @@ -1,82 +0,0 @@ -SUMMARY = "SpiderMonkey is Mozilla's JavaScript engine written in C/C++" -HOMEPAGE = "http://www.mozilla.org/js/" -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://../../LICENSE;md5=815ca599c9df247a0c7f619bab123dad" - -SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/js/${BPN}${PV}.tar.gz \ - file://0001-mozjs17.0.0-fix-the-compile-bug-of-powerpc.patch \ - file://0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch \ - file://0002-Move-JS_BYTES_PER_WORD-out-of-config.h.patch;patchdir=../../ \ - file://0003-Add-AArch64-support.patch;patchdir=../../ \ - file://0004-mozbug746112-no-decommit-on-large-pages.patch;patchdir=../../ \ - file://0005-aarch64-64k-page.patch;patchdir=../../ \ - file://0001-regenerate-configure.patch;patchdir=../../ \ - file://fix-the-compile-error-of-powerpc64.patch;patchdir=../../ \ - file://fix_milestone_compile_issue.patch \ - file://0010-fix-cross-compilation-on-i586-targets.patch;patchdir=../../ \ - file://Manually_mmap_heap_memory_esr17.patch;patchdir=../../ \ - file://0001-compare-the-first-character-of-string-to-be-null-or-.patch;patchdir=../../ \ - " - -SRC_URI[md5sum] = "20b6f8f1140ef6e47daa3b16965c9202" -SRC_URI[sha256sum] = "321e964fe9386785d3bf80870640f2fa1c683e32fe988eeb201b04471c172fba" - -S = "${WORKDIR}/${BPN}${PV}/js/src" - -inherit autotools pkgconfig perlnative pythonnative - -DEPENDS += "nspr zlib" - -# Host specific flags need to be defined, otherwise target flags will be passed to the host -export HOST_CFLAGS = "${BUILD_CFLAGS}" -export HOST_CXXFLAGS = "${BUILD_CXXFLAGS}" -export HOST_LDFLAGS = "${BUILD_LDFLAGS}" - -# nspr's package-config is ignored so set libs manually -EXTRA_OECONF = " \ - --target=${TARGET_SYS} \ - --host=${BUILD_SYS} \ - --build=${BUILD_SYS} \ - --prefix=${prefix} \ - --libdir=${libdir} \ - --with-nspr-libs='-lplds4 -lplc4 -lnspr4' \ - --enable-threadsafe \ - --disable-static \ -" -EXTRA_OECONF_append_armv4 = " \ - --disable-methodjit \ -" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -PACKAGECONFIG[x11] = "--with-x --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--without-x,virtual/libx11" - -# mozjs requires autoreconf 2.13 -do_configure() { - export HOST_CFLAGS="${BUILD_CFLAGS}" - export HOST_CXXFLAGS="${BUILD_CPPFLAGS}" - export HOST_LDFLAGS="${BUILD_LDFLAGS}" - ( cd ${S} - gnu-configize --force - mv config.guess config.sub build/autoconf ) - ${S}/configure ${EXTRA_OECONF} -} - -# patch.bbclass will try to apply the patches already present and fail, so clean them out -do_unpack() { - tar -xvf ${DL_DIR}/mozjs17.0.0.tar.gz -C ${WORKDIR}/ - rm -rf ${WORKDIR}/${BPN}${PV}/patches -} - - -PACKAGES =+ "lib${BPN}" -FILES_lib${BPN} += "${libdir}/lib*.so" -FILES_${PN}-dev += "${bindir}/js17-config" - -# Fails to build with thumb-1 (qemuarm) -#| {standard input}: Assembler messages: -#| {standard input}:2172: Error: shifts in CMP/MOV instructions are only supported in unified syntax -- `mov r2,r1,LSR#20' -#| {standard input}:2173: Error: unshifted register required -- `bic r2,r2,#(1<<11)' -#| {standard input}:2174: Error: unshifted register required -- `orr r1,r1,#(1<<20)' -#| {standard input}:2176: Error: instruction not supported in Thumb16 mode -- `subs r2,r2,#0x300' -#| {standard input}:2178: Error: instruction not supported in Thumb16 mode -- `subs r5,r2,#52' -ARM_INSTRUCTION_SET = "arm" diff --git a/meta-gnome/recipes-support/mozjs/mozjs_52.9.1.bb b/meta-gnome/recipes-support/mozjs/mozjs_52.9.1.bb new file mode 100644 index 0000000..f31ed88 --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/mozjs_52.9.1.bb @@ -0,0 +1,113 @@ +SUMMARY = "SpiderMonkey is Mozilla's JavaScript engine written in C/C++" +HOMEPAGE = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad" + +SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/main/m/mozjs52/mozjs52_52.9.1.orig.tar.xz \ + file://0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch \ + file://0010-fix-cross-compilation-on-i586-targets.patch \ + file://0001-do-not-create-python-environment.patch \ + file://0002-fix-cannot-find-link.patch \ + file://0003-workaround-autoconf-2.13-detection-failed.patch \ + file://0004-do-not-use-autoconf-2.13-to-refresh-old.configure.patch \ + file://0005-fix-do_compile-failed-on-mips.patch \ + file://disable-mozglue-in-stand-alone-builds.patch \ + file://add-riscv-support.patch \ + file://0001-mozjs-fix-coredump-caused-by-getenv.patch \ + file://format-overflow.patch \ + " +SRC_URI_append_libc-musl = " \ + file://0006-support-musl.patch \ + " +SRC_URI_append_mipsarchn32 = " \ + file://0001-fix-compiling-failure-on-mips64-n32-bsp.patch \ + " + +SRC_URI[md5sum] = "c9473c625ee0a9edaaac8b742ff24c5f" +SRC_URI[sha256sum] = "f9324a6724233ab15f10381fe13e635e89d725ef1e78025a0a7d36c58a84a0f9" + +inherit autotools pkgconfig perlnative pythonnative + +inherit distro_features_check +CONFLICT_DISTRO_FEATURES_mipsarchn32 = "ld-is-gold" + +DEPENDS += "nspr zlib" + +# Disable null pointer optimization in gcc >= 6 +# https://bugzilla.redhat.com/show_bug.cgi?id=1328045 +CFLAGS += "-fno-tree-vrp -fno-strict-aliasing -fno-delete-null-pointer-checks" +CXXFLAGS += "-fno-tree-vrp -fno-strict-aliasing -fno-delete-null-pointer-checks" + +# nspr's package-config is ignored so set libs manually +EXTRA_OECONF = " \ + --target=${TARGET_SYS} \ + --host=${BUILD_SYS} \ + --prefix=${prefix} \ + --libdir=${libdir} \ + --disable-tests \ + --with-nspr-libs='-lplds4 -lplc4 -lnspr4' \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', "--enable-gold", '--disable-gold', d)} \ +" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG[x11] = "--x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--x-includes=no --x-libraries=no,virtual/libx11" + +EXTRA_OEMAKE_task-compile += "OS_LDFLAGS='-Wl,-latomic ${LDFLAGS}'" +EXTRA_OEMAKE_task-install += "STATIC_LIBRARY_NAME=js_static" + +do_configure() { + export SHELL="/bin/sh" + export TMP="${B}" + ${S}/js/src/configure ${EXTRA_OECONF} +} + +do_compile_prepend() { + export SHELL="/bin/sh" + export S + export PYTHONPATH + cd ${S} + for sub_dir in python testing/mozbase; do + for module_dir in `ls $sub_dir -1`;do + [ $module_dir = "virtualenv" ] && continue + if [ -d "${S}/$sub_dir/$module_dir" ];then + PYTHONPATH="$PYTHONPATH:${S}/$sub_dir/$module_dir" + fi + done + done + PYTHONPATH="$PYTHONPATH:${S}/config:${S}/build" + cd - +} + +do_install_prepend() { + export SHELL="/bin/sh" + export S + export PYTHONPATH + cd ${S} + for sub_dir in python testing/mozbase; do + for module_dir in `ls $sub_dir -1`;do + [ $module_dir = "virtualenv" ] && continue + if [ -d "${S}/$sub_dir/$module_dir" ];then + PYTHONPATH="$PYTHONPATH:${S}/$sub_dir/$module_dir" + fi + done + done + PYTHONPATH="$PYTHONPATH:${S}/config:${S}/build" + cd - +} + +PACKAGES =+ "lib${BPN}" +FILES_lib${BPN} += "${libdir}/lib*.so" +FILES_${PN}-dev += "${bindir}/js52-config" +RPROVIDES_lib${BPN} += "libmozjs-52" + +# Fails to build with thumb-1 (qemuarm) +#| {standard input}: Assembler messages: +#| {standard input}:2172: Error: shifts in CMP/MOV instructions are only supported in unified syntax -- `mov r2,r1,LSR#20' +#| {standard input}:2173: Error: unshifted register required -- `bic r2,r2,#(1<<11)' +#| {standard input}:2174: Error: unshifted register required -- `orr r1,r1,#(1<<20)' +#| {standard input}:2176: Error: instruction not supported in Thumb16 mode -- `subs r2,r2,#0x300' +#| {standard input}:2178: Error: instruction not supported in Thumb16 mode -- `subs r5,r2,#52' +ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET_armv4 = "arm" + +DISABLE_STATIC = ""