From 247ed71ba56f7dba3d42fa3abac2c161d6c89022 Mon Sep 17 00:00:00 2001 From: Bruce Leidl Date: Sat, 6 Apr 2019 21:23:45 -0400 Subject: [PATCH] Gnome upgrade to 3.32 --- ...-conf.bbappend => systemd-conf_%.bbappend} | 0 ...ash-to-panel_17.bb => dash-to-panel_19.bb} | 2 +- ....ac-Fix-pkgconfig-sysroot-locations.patch} | 9 +- ...tings-settings-property-documentati.patch} | 27 +-- ...-net-ethernet.h-and-linux-if_ether.h.patch | 19 ++- ...net-ethernet.h-seems-to-be-over-spe.patch} | 14 +- ...musl-basic.patch => 0003-musl-basic.patch} | 34 ++-- ...ch => 0004-musl-dlopen-configure-ac.patch} | 10 +- ....patch => 0005-musl-network-support.patch} | 51 +++--- ...til.patch => 0006-musl-process-util.patch} | 22 ++- ...r-conflicts-by-including-net-ethern.patch} | 16 +- ...Add-a-strndupa-replacement-for-musl.patch} | 28 ++-- ...ger_1.14.4.bb => networkmanager_1.16.0.bb} | 36 ++-- .../polkit/polkit_0.115.bb | 10 +- .../{upower_0.99.7.bb => upower_0.99.10.bb} | 10 +- ...i2-atk_2.30.0.bb => at-spi2-atk_2.32.0.bb} | 5 +- ...-core_2.30.0.bb => at-spi2-core_2.32.0.bb} | 5 +- ...able-introspection-for-cross-compile.patch | 6 +- .../atk/{atk_2.30.0.bb => atk_2.32.0.bb} | 5 +- .../{dconf_0.30.1.bb => dconf_0.32.0.bb} | 4 +- .../gcr/{gcr_3.28.0.bb => gcr_3.28.1.bb} | 5 +- .../gdm/{gdm_3.30.1.bb => gdm_3.31.91.bb} | 4 +- .../recipes-gnome/gexiv2/gexiv2_0.10.8.bb | 12 -- .../recipes-gnome/gexiv2/gexiv2_0.12.0.bb | 12 ++ .../gjs/{gjs_1.53.4.bb => gjs_1.56.0.bb} | 8 +- ...3.30.0.bb => gnome-backgrounds_3.31.91.bb} | 4 +- ...th_3.28.2.bb => gnome-bluetooth_3.32.0.bb} | 5 +- ...GOA-CUPS-and-User-Accounts-optional.patch} | 75 ++++----- ....1.bb => gnome-control-center_3.32.0.1.bb} | 9 +- ...ktop_3.30.2.bb => gnome-desktop_3.32.0.bb} | 14 +- ...ing_3.28.2.bb => gnome-keyring_3.31.91.bb} | 4 +- ...sion_3.30.1.bb => gnome-session_3.31.4.bb} | 4 +- .../0001-don-t-run-power-module-tests.patch | 62 +++++++ ...1.2.bb => gnome-settings-daemon_3.32.0.bb} | 32 +--- ...> 0001-do-not-build-calendar-server.patch} | 21 +-- ...-shell_3.30.2.bb => gnome-shell_3.32.0.bb} | 14 +- ...nal_3.30.2.bb => gnome-terminal_3.32.0.bb} | 4 +- .../0001-remove-cross-compile-check.patch | 22 +++ .../gsettings-desktop-schemas_3.28.1.bb | 14 -- .../gsettings-desktop-schemas_3.32.0.bb | 19 +++ .../libgweather/libgweather_3.32.0.bb | 1 - ...1-dont-generate-default-modes-header.patch | 93 +++++++++++ .../mutter/0001-remove-check-for-zenity.patch | 28 ---- .../0001-remove-private-get_client_pid.patch | 22 +++ .../mutter/0002-export-get_client_pid.patch | 23 +++ .../mutter/mutter/get_client_pid.patch | 10 -- .../mutter/mutter/startup-notification.patch | 45 ----- .../recipes-gnome/mutter/mutter_3.30.2.bb | 25 --- .../recipes-gnome/mutter/mutter_3.32.0.bb | 27 +++ .../vte/{vte_0.54.2.bb => vte_0.56.0.bb} | 4 +- .../recipes-support/gsound/gsound_1.0.2.bb | 9 + ...o-not-create-python-environment-new.patch} | 47 ++---- ...-compiling-failure-on-mips64-n32-bsp.patch | 79 --------- ...include-RequiredDefines.h-for-depend.patch | 33 ---- ...-mozjs-fix-coredump-caused-by-getenv.patch | 27 --- .../0002-do-not-include-requireddefines.patch | 19 +++ .../0003-fix-coredump-caused-by-getenv.patch | 21 +++ ...round-autoconf-2.13-detection-failed.patch | 28 ---- ...ch => 0004-new-fix-cannot-find-link.patch} | 24 +-- ...toconf-213-to-refresh-old-configure.patch} | 35 ++-- .../0005-fix-do_compile-failed-on-mips.patch | 38 ----- .../mozjs/mozjs/0006-support-musl.patch | 158 ------------------ ...ix-cross-compilation-on-i586-targets.patch | 35 ---- .../mozjs/mozjs/add-riscv-support.patch | 70 -------- ...isable-mozglue-in-stand-alone-builds.patch | 74 -------- .../mozjs/mozjs/format-overflow.patch | 21 --- .../{mozjs_52.9.1.bb => mozjs_60.2.3.bb} | 36 ++-- 67 files changed, 613 insertions(+), 1076 deletions(-) rename meta-citadel/recipes-core/systemd/{systemd-conf.bbappend => systemd-conf_%.bbappend} (100%) rename meta-citadel/recipes-desktop/dash-to-panel/{dash-to-panel_17.bb => dash-to-panel_19.bb} (88%) rename meta-gnome/recipes-connectivity/networkmanager/networkmanager/{0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch => 0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch} (81%) rename meta-gnome/recipes-connectivity/networkmanager/networkmanager/{0003-Do-not-create-settings-settings-property-documentati.patch => 0002-Do-not-create-settings-settings-property-documentati.patch} (69%) rename meta-gnome/recipes-connectivity/networkmanager/networkmanager/{ => musl}/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch (83%) rename meta-gnome/recipes-connectivity/networkmanager/networkmanager/{0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch => musl/0002-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch} (84%) rename meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/{0001-musl-basic.patch => 0003-musl-basic.patch} (55%) rename meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/{0002-musl-dlopen-configure-ac.patch => 0004-musl-dlopen-configure-ac.patch} (88%) rename meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/{0003-musl-network-support.patch => 0005-musl-network-support.patch} (69%) rename meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/{0004-musl-process-util.patch => 0006-musl-process-util.patch} (79%) rename meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/{0005-musl-avoid-further-conflicts-by-including-net-ethern.patch => 0007-musl-avoid-further-conflicts-by-including-net-ethern.patch} (91%) rename meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/{0006-Add-a-strndupa-replacement-for-musl.patch => 0008-Add-a-strndupa-replacement-for-musl.patch} (60%) rename meta-gnome/recipes-connectivity/networkmanager/{networkmanager_1.14.4.bb => networkmanager_1.16.0.bb} (76%) rename meta-gnome/recipes-freedesktop/upower/{upower_0.99.7.bb => upower_0.99.10.bb} (57%) rename meta-gnome/recipes-gnome/atk/{at-spi2-atk_2.30.0.bb => at-spi2-atk_2.32.0.bb} (77%) rename meta-gnome/recipes-gnome/atk/{at-spi2-core_2.30.0.bb => at-spi2-core_2.32.0.bb} (90%) rename meta-gnome/recipes-gnome/atk/{atk_2.30.0.bb => atk_2.32.0.bb} (86%) rename meta-gnome/recipes-gnome/dconf/{dconf_0.30.1.bb => dconf_0.32.0.bb} (76%) rename meta-gnome/recipes-gnome/gcr/{gcr_3.28.0.bb => gcr_3.28.1.bb} (84%) rename meta-gnome/recipes-gnome/gdm/{gdm_3.30.1.bb => gdm_3.31.91.bb} (90%) delete mode 100644 meta-gnome/recipes-gnome/gexiv2/gexiv2_0.10.8.bb create mode 100644 meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.0.bb rename meta-gnome/recipes-gnome/gjs/{gjs_1.53.4.bb => gjs_1.56.0.bb} (65%) rename meta-gnome/recipes-gnome/gnome-backgrounds/{gnome-backgrounds_3.30.0.bb => gnome-backgrounds_3.31.91.bb} (65%) rename meta-gnome/recipes-gnome/gnome-bluetooth/{gnome-bluetooth_3.28.2.bb => gnome-bluetooth_3.32.0.bb} (78%) rename meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/{0001-Make-goa-cups-and-user-accounts-optional.patch => 0001-Make-GOA-CUPS-and-User-Accounts-optional.patch} (83%) rename meta-gnome/recipes-gnome/gnome-control-center/{gnome-control-center_3.30.1.bb => gnome-control-center_3.32.0.1.bb} (85%) rename meta-gnome/recipes-gnome/gnome-desktop/{gnome-desktop_3.30.2.bb => gnome-desktop_3.32.0.bb} (52%) rename meta-gnome/recipes-gnome/gnome-keyring/{gnome-keyring_3.28.2.bb => gnome-keyring_3.31.91.bb} (79%) rename meta-gnome/recipes-gnome/gnome-session/{gnome-session_3.30.1.bb => gnome-session_3.31.4.bb} (78%) create mode 100644 meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-don-t-run-power-module-tests.patch rename meta-gnome/recipes-gnome/gnome-settings-daemon/{gnome-settings-daemon_3.30.1.2.bb => gnome-settings-daemon_3.32.0.bb} (50%) rename meta-gnome/recipes-gnome/gnome-shell/gnome-shell/{0001-do-no-build-calendar-server.patch => 0001-do-not-build-calendar-server.patch} (71%) rename meta-gnome/recipes-gnome/gnome-shell/{gnome-shell_3.30.2.bb => gnome-shell_3.32.0.bb} (71%) rename meta-gnome/recipes-gnome/gnome-terminal/{gnome-terminal_3.30.2.bb => gnome-terminal_3.32.0.bb} (82%) create mode 100644 meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas/0001-remove-cross-compile-check.patch delete mode 100644 meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_3.28.1.bb create mode 100644 meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_3.32.0.bb create mode 100644 meta-gnome/recipes-gnome/mutter/mutter/0001-dont-generate-default-modes-header.patch delete mode 100644 meta-gnome/recipes-gnome/mutter/mutter/0001-remove-check-for-zenity.patch create mode 100644 meta-gnome/recipes-gnome/mutter/mutter/0001-remove-private-get_client_pid.patch create mode 100644 meta-gnome/recipes-gnome/mutter/mutter/0002-export-get_client_pid.patch delete mode 100644 meta-gnome/recipes-gnome/mutter/mutter/get_client_pid.patch delete mode 100644 meta-gnome/recipes-gnome/mutter/mutter/startup-notification.patch delete mode 100644 meta-gnome/recipes-gnome/mutter/mutter_3.30.2.bb create mode 100644 meta-gnome/recipes-gnome/mutter/mutter_3.32.0.bb rename meta-gnome/recipes-gnome/vte/{vte_0.54.2.bb => vte_0.56.0.bb} (85%) create mode 100644 meta-gnome/recipes-support/gsound/gsound_1.0.2.bb rename meta-gnome/recipes-support/mozjs/mozjs/{0001-do-not-create-python-environment.patch => 0001-do-not-create-python-environment-new.patch} (63%) delete mode 100644 meta-gnome/recipes-support/mozjs/mozjs/0001-fix-compiling-failure-on-mips64-n32-bsp.patch delete mode 100644 meta-gnome/recipes-support/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch delete mode 100644 meta-gnome/recipes-support/mozjs/mozjs/0001-mozjs-fix-coredump-caused-by-getenv.patch create mode 100644 meta-gnome/recipes-support/mozjs/mozjs/0002-do-not-include-requireddefines.patch create mode 100644 meta-gnome/recipes-support/mozjs/mozjs/0003-fix-coredump-caused-by-getenv.patch delete mode 100644 meta-gnome/recipes-support/mozjs/mozjs/0003-workaround-autoconf-2.13-detection-failed.patch rename meta-gnome/recipes-support/mozjs/mozjs/{0002-fix-cannot-find-link.patch => 0004-new-fix-cannot-find-link.patch} (51%) rename meta-gnome/recipes-support/mozjs/mozjs/{0004-do-not-use-autoconf-2.13-to-refresh-old.configure.patch => 0005-do-not-use-autoconf-213-to-refresh-old-configure.patch} (53%) delete mode 100644 meta-gnome/recipes-support/mozjs/mozjs/0005-fix-do_compile-failed-on-mips.patch delete mode 100644 meta-gnome/recipes-support/mozjs/mozjs/0006-support-musl.patch delete mode 100644 meta-gnome/recipes-support/mozjs/mozjs/0010-fix-cross-compilation-on-i586-targets.patch delete mode 100644 meta-gnome/recipes-support/mozjs/mozjs/add-riscv-support.patch delete mode 100644 meta-gnome/recipes-support/mozjs/mozjs/disable-mozglue-in-stand-alone-builds.patch delete mode 100644 meta-gnome/recipes-support/mozjs/mozjs/format-overflow.patch rename meta-gnome/recipes-support/mozjs/{mozjs_52.9.1.bb => mozjs_60.2.3.bb} (70%) diff --git a/meta-citadel/recipes-core/systemd/systemd-conf.bbappend b/meta-citadel/recipes-core/systemd/systemd-conf_%.bbappend similarity index 100% rename from meta-citadel/recipes-core/systemd/systemd-conf.bbappend rename to meta-citadel/recipes-core/systemd/systemd-conf_%.bbappend diff --git a/meta-citadel/recipes-desktop/dash-to-panel/dash-to-panel_17.bb b/meta-citadel/recipes-desktop/dash-to-panel/dash-to-panel_19.bb similarity index 88% rename from meta-citadel/recipes-desktop/dash-to-panel/dash-to-panel_17.bb rename to meta-citadel/recipes-desktop/dash-to-panel/dash-to-panel_19.bb index 2aed8ac..1ab0172 100644 --- a/meta-citadel/recipes-desktop/dash-to-panel/dash-to-panel_17.bb +++ b/meta-citadel/recipes-desktop/dash-to-panel/dash-to-panel_19.bb @@ -2,7 +2,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" SRC_URI = "git://github.com/jderose9/dash-to-panel.git;protocol=https" -SRCREV="035239ae692b616271bafa86172e2a6e55393974" +SRCREV="5558eeae574e9ae7b6bf2e1b9f4aacd97f944054" S = "${WORKDIR}/git" DEPENDS = "gettext-native glib-2.0-native" 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/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch similarity index 81% rename from meta-gnome/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch rename to meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch index 351f264..302c029 100644 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch @@ -1,4 +1,4 @@ -From 583f0448fb7e9aba2b410c06eec6f420b41a6a0c Mon Sep 17 00:00:00 2001 +From 3dc3d8e73bc430ea4e93e33f7b2a4b3e0ff175af 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 @@ -8,10 +8,10 @@ Subject: [PATCH] Fixed configure.ac: Fix pkgconfig sysroot locations 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 51e5eb6..c9d3e56 100644 +index 967eac0..b914219 100644 --- a/configure.ac +++ b/configure.ac -@@ -572,7 +572,7 @@ if test "$have_jansson" = "yes"; then +@@ -592,7 +592,7 @@ if test "$have_jansson" = "yes"; then AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled]) AC_CHECK_TOOLS(READELF, [eu-readelf readelf]) @@ -20,6 +20,3 @@ index 51e5eb6..c9d3e56 100644 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/0002-Do-not-create-settings-settings-property-documentati.patch similarity index 69% rename from meta-gnome/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch rename to meta-gnome/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch index c50293c..5581dd3 100644 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch @@ -13,15 +13,15 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Andreas Müller --- - Makefile.am | 20 -------------------- + Makefile.am | 11 ----------- configure.ac | 5 ----- - 2 files changed, 25 deletions(-) + 2 files changed, 16 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 1e100f6..d31e3c1 100644 +index b180466..1ab4658 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -1115,9 +1115,7 @@ EXTRA_DIST += \ +@@ -1298,9 +1298,7 @@ EXTRA_DIST += \ if HAVE_INTROSPECTION libnm_noinst_data = \ @@ -31,7 +31,7 @@ index 1e100f6..d31e3c1 100644 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) +@@ -3930,18 +3928,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 @@ -40,16 +40,7 @@ index 1e100f6..d31e3c1 100644 - $(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 +- $(srcdir)/tools/check-settings-docs.sh "$(srcdir)" "$(builddir)" "$(clients_common_settings_doc_h)" -check_local += check-local-settings-docs -else $(clients_common_settings_doc_h): $(clients_common_settings_doc_h).in clients/common/.dirstamp @@ -60,10 +51,10 @@ index 1e100f6..d31e3c1 100644 $(clients_common_settings_doc_h) \ $(clients_common_settings_doc_h).in diff --git a/configure.ac b/configure.ac -index 79dc3b9..23d14a6 100644 +index b914219..872c292 100644 --- a/configure.ac +++ b/configure.ac -@@ -1195,11 +1195,6 @@ GTK_DOC_CHECK(1.0) +@@ -1215,11 +1215,6 @@ GTK_DOC_CHECK(1.0) # check if we can build setting property documentation build_docs=no if test -n "$INTROSPECTION_MAKEFILE"; then @@ -76,5 +67,5 @@ index 79dc3b9..23d14a6 100644 if test -z "$PERL"; then AC_MSG_ERROR([--enable-introspection requires perl]) -- -2.14.5 +2.20.1 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/musl/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch similarity index 83% rename from meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch rename to meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch index 0c415bc..555e5ff 100644 --- 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/musl/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch @@ -1,4 +1,4 @@ -From 3f4b6319701834182304c4079119780f4ae5b49b Mon Sep 17 00:00:00 2001 +From b2cdab746ef64bc25ba0b9cff596ebdddd6e8dc6 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 @@ -7,6 +7,7 @@ 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 -- @@ -14,19 +15,19 @@ Signed-off-by: Khem Raj 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 +index def56a2..dd4eb78 100644 --- a/shared/n-acd/src/n-acd.c +++ b/shared/n-acd/src/n-acd.c -@@ -23,7 +23,6 @@ - #include +@@ -11,7 +11,6 @@ + #include #include - #include --#include #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 +index 1b54ec4..ed39938 100644 --- a/src/platform/wpan/nm-wpan-utils.h +++ b/src/platform/wpan/nm-wpan-utils.h @@ -20,8 +20,6 @@ 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/musl/0002-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch similarity index 84% rename from meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch rename to meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0002-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch index 49a0735..5c59208 100644 --- 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/musl/0002-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch @@ -1,28 +1,29 @@ -From 18f71c1b48730b8602826517f2b5b088283ae948 Mon Sep 17 00:00:00 2001 +From 32dc6cab58912add5bc6495558538953d9344c36 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 +index 741128e..62914ae 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 "nm-sd-adapt-core.h" #include +#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 +index bf3afad..4cace87 100644 --- a/src/systemd/src/systemd/sd-lldp.h +++ b/src/systemd/src/systemd/sd-lldp.h @@ -18,7 +18,7 @@ @@ -34,6 +35,3 @@ index 3f35eeb..61b0e45 100644 #include #include "sd-event.h" --- -2.14.1 - diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-basic.patch similarity index 55% rename from meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch rename to meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-basic.patch index 00dda5b..8d90548 100644 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-basic.patch @@ -1,4 +1,4 @@ -From e92de7409a3e107f90d108a9c5d49bd0418296dd Mon Sep 17 00:00:00 2001 +From ff1a5b849755db67b1778940fff92d6eb8b8b050 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 @@ -6,6 +6,11 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + Upstream-Status: Pending Stolen from [1] and prettyfied slightly @@ -15,14 +20,14 @@ Stolen from [1] and prettyfied slightly Signed-off-by: Andreas Müller --- - src/systemd/src/basic/stdio-util.h | 2 ++ - src/systemd/src/basic/util.h | 5 +++++ + shared/systemd/src/basic/stdio-util.h | 2 ++ + shared/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 +diff --git a/shared/systemd/src/basic/stdio-util.h b/shared/systemd/src/basic/stdio-util.h +index dc67b6e..6336243 100644 +--- a/shared/systemd/src/basic/stdio-util.h ++++ b/shared/systemd/src/basic/stdio-util.h @@ -1,7 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ #pragma once @@ -33,12 +38,12 @@ index 73c0327..e1ce64f 100644 #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" +diff --git a/shared/systemd/src/basic/util.h b/shared/systemd/src/basic/util.h +index dc33d66..8ee2d64 100644 +--- a/shared/systemd/src/basic/util.h ++++ b/shared/systemd/src/basic/util.h +@@ -27,6 +27,11 @@ + #include "macro.h" #include "time-util.h" +#if !defined(__GLIBC__) @@ -49,6 +54,3 @@ index b31dfd1..9b7032c 100644 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/0004-musl-dlopen-configure-ac.patch similarity index 88% rename from meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch rename to meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-dlopen-configure-ac.patch index c162c1d..419e1be 100644 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-dlopen-configure-ac.patch @@ -1,4 +1,4 @@ -From 57239fda56b68a8f3e413f7b6af5290ba0d86636 Mon Sep 17 00:00:00 2001 +From 7743ea63fbe572b1f82db7d399fe9c5c99521432 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 @@ -14,15 +14,16 @@ 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 +index b914219..1b2b0ff 100644 --- a/configure.ac +++ b/configure.ac -@@ -235,6 +235,7 @@ dnl +@@ -241,6 +241,7 @@ dnl dnl Checks for libdl - on certain platforms its part of libc dnl AC_SEARCH_LIBS([dlopen], [dl dld], [], [ac_cv_search_dlopen=]) @@ -30,6 +31,3 @@ index 487a266..96ae4f7 100644 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/0005-musl-network-support.patch similarity index 69% rename from meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch rename to meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-network-support.patch index 9a58c0e..45f607f 100644 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-network-support.patch @@ -1,4 +1,4 @@ -From 714b4731a238653e9c7d885c0dee10677b0a4df3 Mon Sep 17 00:00:00 2001 +From 70ecbc01874bf2f8603ccbdfda634cac0bb83d93 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 @@ -13,14 +13,15 @@ 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(+) + libnm-core/nm-utils.h | 4 ++++ + shared/systemd/src/basic/socket-util.h | 6 ++++++ + src/platform/wifi/nm-wifi-utils.h | 4 ++++ + 3 files changed, 14 insertions(+) diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h -index df9284b..2bcf4b8 100644 +index 2b5baba..976850c 100644 --- a/libnm-core/nm-utils.h +++ b/libnm-core/nm-utils.h @@ -30,7 +30,11 @@ @@ -35,8 +36,25 @@ index df9284b..2bcf4b8 100644 #include #include "nm-core-enum-types.h" +diff --git a/shared/systemd/src/basic/socket-util.h b/shared/systemd/src/basic/socket-util.h +index d2246a8..76f257f 100644 +--- a/shared/systemd/src/basic/socket-util.h ++++ b/shared/systemd/src/basic/socket-util.h +@@ -13,6 +13,12 @@ + #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_socket.h" + #include "sparse-endian.h" diff --git a/src/platform/wifi/nm-wifi-utils.h b/src/platform/wifi/nm-wifi-utils.h -index 705717b..da3edc4 100644 +index 36148b5..d282eb2 100644 --- a/src/platform/wifi/nm-wifi-utils.h +++ b/src/platform/wifi/nm-wifi-utils.h @@ -22,7 +22,11 @@ @@ -51,22 +69,3 @@ index 705717b..da3edc4 100644 #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/0006-musl-process-util.patch similarity index 79% rename from meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch rename to meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0006-musl-process-util.patch index 9e5c943..525e359 100644 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0006-musl-process-util.patch @@ -1,4 +1,4 @@ -From d513c8bfc982dbd976617178b040c512c95710b6 Mon Sep 17 00:00:00 2001 +From 4f2fb1e1f785bad22df8f3d96cb4792acf21f315 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 @@ -13,14 +13,15 @@ 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 +++++++++ + shared/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 +diff --git a/shared/systemd/src/basic/process-util.c b/shared/systemd/src/basic/process-util.c +index b0afb5c..7adc8bd 100644 +--- a/shared/systemd/src/basic/process-util.c ++++ b/shared/systemd/src/basic/process-util.c @@ -21,6 +21,9 @@ #include #include @@ -31,7 +32,7 @@ index 1412f03..45f5049 100644 #if 0 /* NM_IGNORED */ #if HAVE_VALGRIND_VALGRIND_H #include -@@ -1153,11 +1156,13 @@ void reset_cached_pid(void) { +@@ -1168,11 +1171,13 @@ void reset_cached_pid(void) { cached_pid = CACHED_PID_UNSET; } @@ -40,12 +41,12 @@ index 1412f03..45f5049 100644 * 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__)); + extern void* __dso_handle _weak_; +#endif pid_t getpid_cached(void) { static bool installed = false; -@@ -1186,7 +1191,11 @@ pid_t getpid_cached(void) { +@@ -1201,7 +1206,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. */ @@ -57,6 +58,3 @@ index 1412f03..45f5049 100644 /* 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/0007-musl-avoid-further-conflicts-by-including-net-ethern.patch similarity index 91% rename from meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch rename to meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0007-musl-avoid-further-conflicts-by-including-net-ethern.patch index 6bca95e..211a2da 100644 --- 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/0007-musl-avoid-further-conflicts-by-including-net-ethern.patch @@ -1,4 +1,4 @@ -From b3b4fe35018c98ad176719b2d9ffb867974fc7c3 Mon Sep 17 00:00:00 2001 +From 4232a34064e33b52f07cca51b902b93699800f72 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 @@ -9,6 +9,7 @@ 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 ++ @@ -17,7 +18,7 @@ Signed-off-by: Andreas Müller 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 +index bd0d429..c935fe1 100644 --- a/src/systemd/src/systemd/sd-dhcp-client.h +++ b/src/systemd/src/systemd/sd-dhcp-client.h @@ -20,7 +20,9 @@ @@ -29,9 +30,9 @@ index e388552..9c4dde8 100644 +#endif #include #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 +index d299c79..991e67e 100644 --- a/src/systemd/src/systemd/sd-dhcp-lease.h +++ b/src/systemd/src/systemd/sd-dhcp-lease.h @@ -19,7 +19,9 @@ @@ -45,7 +46,7 @@ index 2a60145..19d1814 100644 #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 +index 43d38f5..57ab487 100644 --- a/src/systemd/src/systemd/sd-dhcp6-client.h +++ b/src/systemd/src/systemd/sd-dhcp6-client.h @@ -20,7 +20,9 @@ @@ -55,9 +56,9 @@ index fa36dca..2d25010 100644 +#if defined(__GLIBC__) #include +#endif - #include #include + #include "sd-dhcp6-lease.h" 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 @@ -72,6 +73,3 @@ index 71bd4cf..1c667ba 100644 #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/0008-Add-a-strndupa-replacement-for-musl.patch similarity index 60% rename from meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0006-Add-a-strndupa-replacement-for-musl.patch rename to meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0008-Add-a-strndupa-replacement-for-musl.patch index 023a4d9..8858101 100644 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0006-Add-a-strndupa-replacement-for-musl.patch +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0008-Add-a-strndupa-replacement-for-musl.patch @@ -1,4 +1,4 @@ -From 6db6596e450062601d18b2ae812a4a58d2e03a53 Mon Sep 17 00:00:00 2001 +From cdd69321ec97ed19e66a747a968a1637a251b9e6 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 @@ -9,15 +9,16 @@ 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 +++++ + shared/systemd/src/basic/in-addr-util.c | 1 + + shared/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 +diff --git a/shared/systemd/src/basic/in-addr-util.c b/shared/systemd/src/basic/in-addr-util.c +index 5ced350..c6b52b8 100644 +--- a/shared/systemd/src/basic/in-addr-util.c ++++ b/shared/systemd/src/basic/in-addr-util.c @@ -13,6 +13,7 @@ #include "in-addr-util.h" #include "macro.h" @@ -26,11 +27,11 @@ index 2a02d90..a57c360 100644 #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 @@ +diff --git a/shared/systemd/src/basic/string-util.h b/shared/systemd/src/basic/string-util.h +index 38070ab..6b918e0 100644 +--- a/shared/systemd/src/basic/string-util.h ++++ b/shared/systemd/src/basic/string-util.h +@@ -27,6 +27,11 @@ #define strcaseeq(a,b) (strcasecmp((a),(b)) == 0) #define strncaseeq(a, b, n) (strncasecmp((a), (b), (n)) == 0) @@ -42,6 +43,3 @@ index 4c94b18..a6dc446 100644 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_1.14.4.bb b/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.16.0.bb similarity index 76% rename from meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb rename to meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.16.0.bb index 870a528..bdf60ee 100644 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.16.0.bb @@ -5,7 +5,7 @@ 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 \ + file://docs/api/html/license.html;md5=233931303ef80eded167add1f60a50c1 \ " DEPENDS = " \ @@ -16,7 +16,6 @@ DEPENDS = " \ util-linux \ libndp \ libnewt \ - polkit \ jansson \ curl \ " @@ -25,19 +24,19 @@ inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introsp 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 \ + file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \ + file://0002-Do-not-create-settings-settings-property-documentati.patch \ + file://musl/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch \ + file://musl/0002-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch \ + file://musl/0003-musl-basic.patch \ + file://musl/0004-musl-dlopen-configure-ac.patch \ + file://musl/0005-musl-network-support.patch \ + file://musl/0006-musl-process-util.patch \ + file://musl/0007-musl-avoid-further-conflicts-by-including-net-ethern.patch \ + file://musl/0008-Add-a-strndupa-replacement-for-musl.patch \ " -SRC_URI[md5sum] = "54ce62f0aa18ef6c5e754eaac47494ac" -SRC_URI[sha256sum] = "35a3ede4c7d12d6212033c9e44cb82b7692f38063b53a067567f02f5937c8c18" +SRC_URI[md5sum] = "10abacaafb162a67d2942adf03e7e9e4" +SRC_URI[sha256sum] = "8e962833b6ca03edda1bc57ed6614a7b8c2339531b44acef098d05f2324c5d2c" UPSTREAM_CHECK_URI = "${GNOME_MIRROR}/NetworkManager/1.10/" UPSTREAM_CHECK_REGEX = "NetworkManager\-(?P1\.10(\.\d+)+).tar.xz" @@ -69,13 +68,13 @@ do_compile_prepend() { 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)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit', d)} \ " PACKAGECONFIG[systemd] = " \ - --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \ + --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd, \ --without-systemdsystemunitdir, \ - polkit \ " +PACKAGECONFIG[polkit] = "--enable-polkit --enable-polkit-agent,--disable-polkit --disable-polkit-agent,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" @@ -111,6 +110,7 @@ FILES_${PN} += " \ ${datadir}/dbus-1 \ ${noarch_base_libdir}/udev/* \ ${systemd_unitdir}/system \ + ${libdir}/pppd \ " RRECOMMENDS_${PN} += "iptables \ @@ -136,7 +136,7 @@ FILES_${PN}-nmtui-doc = " \ ${mandir}/man1/nmtui* \ " -SYSTEMD_SERVICE_${PN} = "NetworkManager.service NetworkManager-dispatcher.service" +SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'NetworkManager.service NetworkManager-dispatcher.service', '', d)}" do_install_append() { rm -rf ${D}/run ${D}${localstatedir}/run diff --git a/meta-gnome/recipes-freedesktop/polkit/polkit_0.115.bb b/meta-gnome/recipes-freedesktop/polkit/polkit_0.115.bb index ad0f66a..6f7fee7 100644 --- a/meta-gnome/recipes-freedesktop/polkit/polkit_0.115.bb +++ b/meta-gnome/recipes-freedesktop/polkit/polkit_0.115.bb @@ -20,12 +20,14 @@ PACKAGECONFIG[systemd] = "--enable-libsystemd-login=yes --with-systemdsystemunit PACKAGECONFIG[consolekit] = ",,,consolekit" PAM_SRC_URI = "file://polkit-1_pam.patch" -SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \ - file://0001-make-netgroup-support-configurable.patch \ +SRC_URI = "git://gitlab.freedesktop.org/polkit/polkit.git;protocol=https \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ " -SRC_URI[md5sum] = "f03b055d6ae5fc8eac76838c7d83d082" -SRC_URI[sha256sum] = "2f87ecdabfbd415c6306673ceadc59846f059b18ef2fce42bac63fe283f12131" +SRCREV = "2e756da8b6517ffa52a58674b6800b0b444b13c2" +S = "${WORKDIR}/git" + +#SRC_URI[md5sum] = "f03b055d6ae5fc8eac76838c7d83d082" +#SRC_URI[sha256sum] = "2f87ecdabfbd415c6306673ceadc59846f059b18ef2fce42bac63fe283f12131" EXTRA_OECONF = "--with-os-type=moblin \ --disable-man-pages \ diff --git a/meta-gnome/recipes-freedesktop/upower/upower_0.99.7.bb b/meta-gnome/recipes-freedesktop/upower/upower_0.99.10.bb similarity index 57% rename from meta-gnome/recipes-freedesktop/upower/upower_0.99.7.bb rename to meta-gnome/recipes-freedesktop/upower/upower_0.99.10.bb index fbbf05a..8e42a4b 100644 --- a/meta-gnome/recipes-freedesktop/upower/upower_0.99.7.bb +++ b/meta-gnome/recipes-freedesktop/upower/upower_0.99.10.bb @@ -1,12 +1,12 @@ SUMMARY = "Linux power management daemon" HOMEPAGE = "http://upower.freedesktop.org" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08 \ - file://doc/html/license.html;md5=dd77cfbf0965ebe2f167827e6ae5f63f" +LIC_FILES_CHKSUM = "file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08" + +SRC_URI = "https://gitlab.freedesktop.org/upower/upower/uploads/c438511024b9bc5a904f8775cfc8e4c4/upower-0.99.10.tar.xz" +SRC_URI[md5sum] = "ac6b6bee31110fd8478a8e881c40fba6" +SRC_URI[sha256sum] = "642251b97080ede8be6dbfeaf8f30ff6eadd6eb27aa137bc50f5b9b2295ba29d" -SRC_URI = "https://upower.freedesktop.org/releases/upower-${PV}.tar.xz" -SRC_URI[md5sum] = "236bb439d9ff1151450b3d8582399532" -SRC_URI[sha256sum] = "24bcc2f6ab25a2533bac70b587bcb019e591293076920f5b5e04bdedc140a401" DEPENDS = "libusb1 glib-2.0 intltool-native libgudev" diff --git a/meta-gnome/recipes-gnome/atk/at-spi2-atk_2.30.0.bb b/meta-gnome/recipes-gnome/atk/at-spi2-atk_2.32.0.bb similarity index 77% rename from meta-gnome/recipes-gnome/atk/at-spi2-atk_2.30.0.bb rename to meta-gnome/recipes-gnome/atk/at-spi2-atk_2.32.0.bb index eb4be6b..8135b02 100644 --- a/meta-gnome/recipes-gnome/atk/at-spi2-atk_2.30.0.bb +++ b/meta-gnome/recipes-gnome/atk/at-spi2-atk_2.32.0.bb @@ -3,8 +3,8 @@ HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" -SRC_URI[archive.md5sum] = "1ad754b90bcb14244b73ca4d0c14d274" -SRC_URI[archive.sha256sum] = "e2e1571004ea7b105c969473ce455a95be4038fb2541471714aeb33a26da8a9a" +SRC_URI[archive.md5sum] = "6a4b27bace3b9352721ed462b95f6291" +SRC_URI[archive.sha256sum] = "0b51e6d339fa2bcca3a3e3159ccea574c67b107f1ac8b00047fa60e34ce7a45c" DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2" @@ -18,3 +18,4 @@ PACKAGES =+ "${PN}-gnome ${PN}-gtk2" FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules" FILES_${PN}-gtk2 = "${libdir}/gtk-2.0/modules/libatk-bridge.*" +BBCLASSEXTEND = "native" 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.32.0.bb similarity index 90% rename from meta-gnome/recipes-gnome/atk/at-spi2-core_2.30.0.bb rename to meta-gnome/recipes-gnome/atk/at-spi2-core_2.32.0.bb index 536431f..7f5ab5f 100644 --- a/meta-gnome/recipes-gnome/atk/at-spi2-core_2.30.0.bb +++ b/meta-gnome/recipes-gnome/atk/at-spi2-core_2.32.0.bb @@ -8,8 +8,8 @@ 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" +SRC_URI[md5sum] = "57269004541646c4c5cf0bcb7c99bb5b" +SRC_URI[sha256sum] = "43a435d213f8d4b55e8ac83a46ae976948dc511bb4a515b69637cb36cf0e7220" DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst" @@ -37,3 +37,4 @@ FILES_${PN} += "${datadir}/dbus-1/services/*.service \ ${datadir}/defaults/at-spi2 \ ${systemd_user_unitdir}/at-spi-dbus-bus.service \ " +BBCLASSEXTEND = "native" 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 index e56bac8..f9b9054 100644 --- 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 @@ -1,4 +1,4 @@ -From 2a3300378813ce86d532b3852119b2ef29157755 Mon Sep 17 00:00:00 2001 +From e112815aabac23d9f9c8fa3ff66965a6a823a143 Mon Sep 17 00:00:00 2001 From: Bruce Leidl Date: Sun, 13 Jan 2019 21:04:00 -0500 Subject: [PATCH] sup @@ -8,11 +8,11 @@ Subject: [PATCH] sup 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atk/meson.build b/atk/meson.build -index 616a3e6..941ded8 100644 +index 0ad67e5..1d2a49c 100644 --- a/atk/meson.build +++ b/atk/meson.build @@ -137,7 +137,7 @@ libatk_dep = declare_dependency(link_with: libatk, - dependencies: gobject_dep, + dependencies: glib_dep, sources: atk_enum_h) -if not meson.is_cross_build() and get_option('introspection') diff --git a/meta-gnome/recipes-gnome/atk/atk_2.30.0.bb b/meta-gnome/recipes-gnome/atk/atk_2.32.0.bb similarity index 86% rename from meta-gnome/recipes-gnome/atk/atk_2.30.0.bb rename to meta-gnome/recipes-gnome/atk/atk_2.32.0.bb index b64f70b..ffbda44 100644 --- a/meta-gnome/recipes-gnome/atk/atk_2.30.0.bb +++ b/meta-gnome/recipes-gnome/atk/atk_2.32.0.bb @@ -27,11 +27,10 @@ EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'Tr '${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" +SRC_URI[archive.md5sum] = "c10b0b2af3c199e42caa6275b845c49d" +SRC_URI[archive.sha256sum] = "cb41feda7fe4ef0daa024471438ea0219592baf7c291347e5a858bb64e4091cc" BBCLASSEXTEND = "native" diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.30.1.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb similarity index 76% rename from meta-gnome/recipes-gnome/dconf/dconf_0.30.1.bb rename to meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb index 7b3390d..84f83b1 100644 --- a/meta-gnome/recipes-gnome/dconf/dconf_0.30.1.bb +++ b/meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb @@ -3,8 +3,8 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" SECTION = "x11/gnome" -SRC_URI[archive.md5sum] = "a959eef51c917b3c57cfbef1448a375e" -SRC_URI[archive.sha256sum] = "549a3a7cc3881318107dc48a7b02ee8f88c9127acaf2d47f7724f78a8f6d02b7" +SRC_URI[archive.md5sum] = "e1ac0b6285abefeed69ca9e380e44f5a" +SRC_URI[archive.sha256sum] = "68bce78b19bc94cb2c3bb8587e37f9e5e338568c3a674f86edde9c9f1624ffab" DEPENDS = "dbus glib-2.0 xmlto-native glib-2.0-native" diff --git a/meta-gnome/recipes-gnome/gcr/gcr_3.28.0.bb b/meta-gnome/recipes-gnome/gcr/gcr_3.28.1.bb similarity index 84% rename from meta-gnome/recipes-gnome/gcr/gcr_3.28.0.bb rename to meta-gnome/recipes-gnome/gcr/gcr_3.28.1.bb index d47e23a..e46278e 100644 --- a/meta-gnome/recipes-gnome/gcr/gcr_3.28.0.bb +++ b/meta-gnome/recipes-gnome/gcr/gcr_3.28.1.bb @@ -15,9 +15,8 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ file://0001-Use-pkgconfig-to-find-libgcrypt.patch \ " -# 3.28.0 sums -SRC_URI[archive.md5sum] = "5321319307dad34dca2fd52e7c9c01ab" -SRC_URI[archive.sha256sum] = "15e175d1da7ec486d59749ba34906241c442898118ce224a7b70bf2e849faf0b" +SRC_URI[archive.md5sum] = "afd88cacfd54c1ac5b3e0eb35e3aa674" +SRC_URI[archive.sha256sum] = "95204aa2111c301778ebfbe60975ce3ed698c958430ffcc2a785ac5e593d168b" FILES_${PN} += " \ ${datadir}/dbus-1 \ diff --git a/meta-gnome/recipes-gnome/gdm/gdm_3.30.1.bb b/meta-gnome/recipes-gnome/gdm/gdm_3.31.91.bb similarity index 90% rename from meta-gnome/recipes-gnome/gdm/gdm_3.30.1.bb rename to meta-gnome/recipes-gnome/gdm/gdm_3.31.91.bb index c5851ac..8bf8e15 100644 --- a/meta-gnome/recipes-gnome/gdm/gdm_3.30.1.bb +++ b/meta-gnome/recipes-gnome/gdm/gdm_3.31.91.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit gnomebase useradd gettext pkgconfig autotools gobject-introspection systemd -SRC_URI[archive.md5sum] = "83094013e224a072f6adc086c034f076" -SRC_URI[archive.sha256sum] = "4b3d11856adf9fc26b43b2742c196e9e9dc2d2a5eff8bb34d906537288e2732f" +SRC_URI[archive.md5sum] = "3af260a278e99ff4b17b999fd6c44465" +SRC_URI[archive.sha256sum] = "791f24f0e15d7dcd747efa2957f2bad3d5c9aeab185b0090bfba19bcc57b958a" SRC_URI += "\ file://gdm.conf \ diff --git a/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.10.8.bb b/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.10.8.bb deleted file mode 100644 index 057cd70..0000000 --- a/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.10.8.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" - -SRC_URI[archive.md5sum] = "fcbaa7233fc076a6743c22da746956be" -SRC_URI[archive.sha256sum] = "81c528fd1e5e03577acd80fb77798223945f043fd1d4e06920c71202eea90801" - -DEPENDS = "glib-2.0 exiv2" - -inherit gnome python3native autotools gobject-introspection - -EXTRA_OECONF = "" - diff --git a/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.0.bb b/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.0.bb new file mode 100644 index 0000000..6802ebe --- /dev/null +++ b/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.0.bb @@ -0,0 +1,12 @@ +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" + +SRC_URI[archive.md5sum] = "0a618c5b053106d1801d89cc77385419" +SRC_URI[archive.sha256sum] = "58f539b0386f36300b76f3afea3a508de4914b27e78f58ee4d142486a42f926a" +DEPENDS = "glib-2.0 exiv2" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase python3native gobject-introspection + +EXTRA_OEMESON = "-Dvapi=false" + diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.53.4.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.56.0.bb similarity index 65% rename from meta-gnome/recipes-gnome/gjs/gjs_1.53.4.bb rename to meta-gnome/recipes-gnome/gjs/gjs_1.56.0.bb index dce2dbd..32f8c80 100644 --- a/meta-gnome/recipes-gnome/gjs/gjs_1.53.4.bb +++ b/meta-gnome/recipes-gnome/gjs/gjs_1.56.0.bb @@ -12,13 +12,9 @@ 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] = "aa47ee8bdcb7c36e9eafd4c7796fbb96" +SRC_URI[archive.sha256sum] = "64a7ad5554adb0105fabb432abcfa690033c177d8e650872b469b7cbf475ec1a" -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/gnome-backgrounds/gnome-backgrounds_3.30.0.bb b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.31.91.bb similarity index 65% rename from meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.30.0.bb rename to meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.31.91.bb index f8df1a0..ff6a750 100644 --- a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.30.0.bb +++ b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.31.91.bb @@ -3,8 +3,8 @@ SUMMARY = "Default GNOME desktop background images" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" -SRC_URI[archive.md5sum] = "13ecd0e4bb4721a68310948e67dbaaaa" -SRC_URI[archive.sha256sum] = "ece63a2aaf2e9b685721d125b7832fee63749db58743bc147ee92e136896e984" +SRC_URI[archive.md5sum] = "a13411df9de5255a3a702ec2dfaa5ca8" +SRC_URI[archive.sha256sum] = "21fc5879ec1a5f592d383d3f9b407a2d58274c25fc8277a9e1c4a10642118a95" FILES_${PN} += "\ ${datadir}/backgrounds/gnome \ diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.28.2.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.0.bb similarity index 78% rename from meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.28.2.bb rename to meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.0.bb index ce4fa05..3ea5bcc 100644 --- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.28.2.bb +++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.0.bb @@ -4,8 +4,9 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343" -SRC_URI[archive.md5sum] = "eff705fadd5e0bb44a087d10fcbe34af" -SRC_URI[archive.sha256sum] = "1f4961ac33b5f9ce5e6e01ea2c08ad29cc98ed2b8878e38da867235b28a50732" +SRC_URI[archive.md5sum] = "e6c0e5fafa6a2673a3f102b1683c61d6" +SRC_URI[archive.sha256sum] = "ab8fa07613aa6b92be6151b1e2063cad5349bc1a8314eb091a0e62be2ea03e52" + DEPENDS = "glib-2.0 glib-2.0-native gtk+3 libcanberra libnotify libxml2-native gobject-introspection" 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 similarity index 83% rename from meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Make-goa-cups-and-user-accounts-optional.patch rename to meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Make-GOA-CUPS-and-User-Accounts-optional.patch index 18eb2f1..35ef303 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 e1efcaf6a1181a0c1538b561dd83e73563b5ee53 Mon Sep 17 00:00:00 2001 +From a4a3e68f2f6412ea74c7607b28b54c17c15073e8 Mon Sep 17 00:00:00 2001 From: Bruce Leidl -Date: Sun, 13 Jan 2019 19:50:40 -0500 -Subject: [PATCH] make goa cups and blah blah +Date: Fri, 5 Apr 2019 07:36:45 -0400 +Subject: [PATCH] Make GOA, CUPS, and User Accounts optional --- - meson.build | 15 ++++++++++++++- + meson.build | 13 +++++++++++++ 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 ++++++ tests/meson.build | 2 +- - 7 files changed, 70 insertions(+), 10 deletions(-) + 7 files changed, 69 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build -index 2a8519c..b7ce0e5 100644 +index e89ea52..d7926c9 100644 --- a/meson.build +++ b/meson.build -@@ -96,6 +96,13 @@ libgvc = subproject( - ) - libgvc_dep = libgvc.get_variable('libgvc_dep') +@@ -112,6 +112,13 @@ if not libhandy_dep.found() + libhandy_dep = libhandy.get_variable('libhandy_dep') + endif +enable_goa = get_option('online_accounts') +enable_cups = get_option('cups') @@ -31,17 +31,17 @@ index 2a8519c..b7ce0e5 100644 goa_req_version = '>= 3.25.3' pulse_req_version = '>= 2.0' -@@ -107,7 +114,9 @@ gio_dep = dependency('gio-2.0') +@@ -122,7 +129,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') +if enable_goa goa_dep = dependency('goa-1.0', version: goa_req_version) +endif - gsettings_desktop_dep = dependency('gsettings-desktop-schemas', version: '>= 3.27.2') + gsettings_desktop_dep = dependency('gsettings-desktop-schemas', version: '>= 3.31.0') libxml_dep = dependency('libxml-2.0') polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.103') -@@ -128,6 +137,8 @@ common_deps = [ +@@ -144,6 +153,8 @@ common_deps = [ dependency('gtk+-3.0', version: '>= 3.22.20') ] @@ -50,7 +50,7 @@ index 2a8519c..b7ce0e5 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') -@@ -148,6 +159,8 @@ foreach header: check_headers +@@ -164,6 +175,8 @@ foreach header: check_headers assert(cc.has_header(header[1], args: cups_cflags), 'CUPS headers not found: ' + header[1]) endforeach @@ -59,13 +59,6 @@ index 2a8519c..b7ce0e5 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 a347168..e0c3b23 100644 --- a/meson_options.txt @@ -83,7 +76,7 @@ index a347168..e0c3b23 100644 +option('cups', type: 'boolean', value: false, description: 'build with support for CUPS') +option('user_accounts', type: 'boolean', value: false, description: 'build with support for user accounts panel') diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c -index a37682d..e17b0e1 100644 +index 714c7f7..59723e1 100644 --- a/panels/background/bg-pictures-source.c +++ b/panels/background/bg-pictures-source.c @@ -23,13 +23,17 @@ @@ -124,8 +117,8 @@ index a37682d..e17b0e1 100644 g_clear_object (&source->thumb_factory); G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object); -@@ -460,7 +468,9 @@ add_single_file (BgPicturesSource *bg_source, - gboolean retval = FALSE; +@@ -461,7 +469,9 @@ add_single_file (BgPicturesSource *bg_source, + const gchar *pictures_path; g_autoptr(GFile) pictures_dir = NULL; g_autoptr(GFile) cache_dir = NULL; +#ifdef WITH_GOA @@ -134,7 +127,7 @@ index a37682d..e17b0e1 100644 /* find png and jpeg files */ if (!content_type) -@@ -516,13 +526,16 @@ add_single_file (BgPicturesSource *bg_source, +@@ -520,13 +530,16 @@ add_single_file (BgPicturesSource *bg_source, read_file: @@ -151,7 +144,7 @@ index a37682d..e17b0e1 100644 } else { -@@ -560,6 +573,7 @@ add_single_file (BgPicturesSource *bg_source, +@@ -564,6 +577,7 @@ add_single_file (BgPicturesSource *bg_source, picture_copied_for_read, bg_source); } @@ -159,7 +152,7 @@ index a37682d..e17b0e1 100644 retval = TRUE; -@@ -590,6 +604,7 @@ add_single_file_from_info (BgPicturesSource *bg_source, +@@ -594,6 +608,7 @@ add_single_file_from_info (BgPicturesSource *bg_source, return add_single_file (bg_source, file, content_type, mtime, ret_row_ref); } @@ -167,7 +160,7 @@ index a37682d..e17b0e1 100644 static gboolean add_single_file_from_media (BgPicturesSource *bg_source, GFile *file, -@@ -614,6 +629,7 @@ add_single_file_from_media (BgPicturesSource *bg_source, +@@ -618,6 +633,7 @@ add_single_file_from_media (BgPicturesSource *bg_source, return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL); } @@ -175,7 +168,7 @@ index a37682d..e17b0e1 100644 gboolean bg_pictures_source_add (BgPicturesSource *bg_source, -@@ -930,6 +946,7 @@ monitor_path (BgPicturesSource *self, +@@ -934,6 +950,7 @@ monitor_path (BgPicturesSource *self, return monitor; } @@ -183,7 +176,7 @@ index a37682d..e17b0e1 100644 static void media_found_cb (BgPicturesSource *self, GrlMedia *media) { -@@ -941,6 +958,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media) +@@ -945,6 +962,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media) g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref); add_single_file_from_media (self, file, media); } @@ -191,7 +184,7 @@ index a37682d..e17b0e1 100644 static void bg_pictures_source_init (BgPicturesSource *self) -@@ -964,9 +982,11 @@ bg_pictures_source_init (BgPicturesSource *self) +@@ -968,9 +986,11 @@ bg_pictures_source_init (BgPicturesSource *self) cache_path = bg_pictures_source_get_cache_path (); self->cache_dir_monitor = monitor_path (self, cache_path); @@ -250,10 +243,10 @@ 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 37a3436..ba10d34 100644 +index 95a44bb..0f927bd 100644 --- a/panels/meson.build +++ b/panels/meson.build -@@ -9,16 +9,13 @@ panels = [ +@@ -10,16 +10,13 @@ panels = [ 'keyboard', 'mouse', 'notifications', @@ -270,7 +263,7 @@ index 37a3436..ba10d34 100644 ] if host_is_linux -@@ -33,6 +30,18 @@ if host_is_linux_not_s390 +@@ -34,6 +31,18 @@ if host_is_linux_not_s390 ] endif @@ -290,10 +283,10 @@ index 37a3436..ba10d34 100644 panels_libs = [] foreach cappletname: panels diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c -index 6b5c6e3..032a03c 100644 +index 5eeb44e..93d18f0 100644 --- a/shell/cc-panel-loader.c +++ b/shell/cc-panel-loader.c -@@ -104,9 +104,13 @@ static struct { +@@ -102,9 +102,13 @@ static CcPanelLoaderVtable default_panels[] = PANEL_TYPE("wifi", cc_wifi_panel_get_type, cc_wifi_panel_static_init_func), #endif PANEL_TYPE("notifications", cc_notifications_panel_get_type, NULL), @@ -307,7 +300,7 @@ index 6b5c6e3..032a03c 100644 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 { +@@ -114,7 +118,9 @@ static CcPanelLoaderVtable default_panels[] = PANEL_TYPE("thunderbolt", cc_bolt_panel_get_type, NULL), #endif PANEL_TYPE("universal-access", cc_ua_panel_get_type, NULL), @@ -318,13 +311,13 @@ index 6b5c6e3..032a03c 100644 PANEL_TYPE("wacom", cc_wacom_panel_get_type, cc_wacom_panel_static_init_func), #endif diff --git a/tests/meson.build b/tests/meson.build -index 7c894e4..cc2031c 100644 +index 4594327..cd52250 100644 --- a/tests/meson.build +++ b/tests/meson.build -@@ -3,5 +3,5 @@ subdir('common') - #if host_is_linux - # subdir('network') - #endif +@@ -6,5 +6,5 @@ endif + + subdir('interactive-panels') + -subdir('printers') +#subdir('printers') subdir('info') diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.30.1.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.32.0.1.bb similarity index 85% rename from meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.30.1.bb rename to meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.32.0.1.bb index 089680b..e4e90a1 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.30.1.bb +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.32.0.1.bb @@ -2,13 +2,14 @@ SUMMARY = "GNOME desktop configuration UI" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" -SRC_URI[archive.md5sum] = "79a63122f715d4a8d43dce9f38066e86" -SRC_URI[archive.sha256sum] = "2b1f9bb794cf57838f8340ac8b0e30e6a924c6a3de50c8f2af5f64d6609569bb" +SRC_URI[archive.md5sum] = "31728ca3e3dc8d2e3a6cbdfd987b7901" +SRC_URI[archive.sha256sum] = "86795715bf439aafb5b74a42065ac1d86cac53075b1cc8044bc27a964e15c012" 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" + +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 udisks2 gsound" # # Extra options have been added to meson_options.txt to make some components of the control @@ -30,7 +31,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" +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_3.30.2.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.32.0.bb similarity index 52% rename from meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.30.2.bb rename to meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.32.0.bb index e65deed..8803332 100644 --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.30.2.bb +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.32.0.bb @@ -4,18 +4,18 @@ LICENSE = "GPLv2 & LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" -inherit gnome pkgconfig upstream-version-is-even gobject-introspection gettext +GNOMEBASEBUILDCLASS = "meson" +inherit gnome pkgconfig upstream-version-is-even gobject-introspection -SRC_URI[archive.md5sum] = "afcee5e8506bcdc1daaac9e6c3682685" -SRC_URI[archive.sha256sum] = "5475e693cb7ada801a36e8d16bc0dbb58930b793f455419b205cd9241d63d14c" +SRC_URI[archive.md5sum] = "e423ed6d648c6c4f9798fa9cd9ea8d99" +SRC_URI[archive.sha256sum] = "a6393dc5fc29fc0652ac84c73b3da205d0b0168128c4cf6d27797a08f3d07b54" -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" + +DEPENDS += "itstool-native gsettings-desktop-schemas gconf virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes udev libseccomp" inherit gtk-doc -ACLOCALDIR = "${STAGING_DATADIR_NATIVE}/aclocal" - -EXTRA_OECONF = "--disable-desktop-docs --with-gnome-distributor=Subgraph --enable-introspection=yes" +EXTRA_OEMESON = "-Ddesktop_docs=false -Dgnome_distributor='Subgraph'" PACKAGES =+ "libgnome-desktop" FILES_libgnome-desktop = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml" diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.28.2.bb b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.31.91.bb similarity index 79% rename from meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.28.2.bb rename to meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.31.91.bb index 45259a5..74ea1ef 100644 --- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.28.2.bb +++ b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.31.91.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ inherit gettext gnome -SRC_URI[archive.md5sum] = "284580f954f762caf62aed2ae7358177" -SRC_URI[archive.sha256sum] = "81171b7d07211b216b4c9bb79bf2deb3deca18fe8d56d46dda1c4549b4a2646a" +SRC_URI[archive.md5sum] = "8b6c33409fc62f1431647c74c34a9c6b" +SRC_URI[archive.sha256sum] = "a4d90afc4dabe77c6ff8b606588ad782621df8efeb114cbdc619dc4e38a65eba" DEPENDS = "gcr intltool-native glib-2.0-native libpam" RDEPENDS_${PN} = "gcr libpam" diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.30.1.bb b/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.31.4.bb similarity index 78% rename from meta-gnome/recipes-gnome/gnome-session/gnome-session_3.30.1.bb rename to meta-gnome/recipes-gnome/gnome-session/gnome-session_3.31.4.bb index 1a88c4a..d18baa6 100644 --- a/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.30.1.bb +++ b/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.31.4.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase meson -SRC_URI[archive.md5sum] = "45c33dfaad7d40c008f8131aff2e0391" -SRC_URI[archive.sha256sum] = "eafe85972689186c7c6b5fe1d3bb4dc204a1e0e6b6e763e24b8fb43a40c07739" +SRC_URI[archive.md5sum] = "f2d548a79732f0db9f6148de908c68ce" +SRC_URI[archive.sha256sum] = "5279776b9f8b74e348507fedb062ef303172fbb1f3a16979a8cb9321c396878e" DEPENDS = "glib-2.0-native intltool-native xmlto-native glib-2.0 gnome-desktop json-glib" RDEPENDS_${PN} = "gnome-settings-daemon" diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-don-t-run-power-module-tests.patch b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-don-t-run-power-module-tests.patch new file mode 100644 index 0000000..970ca4e --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-don-t-run-power-module-tests.patch @@ -0,0 +1,62 @@ +From 11f025c3fdf32b33ad5ac263b1e638a33f01149b Mon Sep 17 00:00:00 2001 +From: Bruce Leidl +Date: Sat, 6 Apr 2019 19:55:22 -0400 +Subject: [PATCH] don't run power module tests + +--- + plugins/power/meson.build | 43 --------------------------------------- + 1 file changed, 43 deletions(-) + +diff --git a/plugins/power/meson.build b/plugins/power/meson.build +index 8babf97..0e0d506 100644 +--- a/plugins/power/meson.build ++++ b/plugins/power/meson.build +@@ -102,48 +102,5 @@ if host_is_linux + ) + endif + +-output = 'gsdpowerconstants.py' +- +-gsdpowerconstants_py = custom_target( +- output, +- input: 'gsd-power-constants.h', +- output: output, +- build_by_default: true, +- command: [join_paths(meson.current_source_dir(), 'gsd-power-constants-update.pl'), '@INPUT@', '@OUTPUT@'] +-) +- +-output = 'gsdpowerenums.py' +- +-gsdpowerenums_py = custom_target( +- output, +- output: output, +- capture: true, +- build_by_default: true, +- command: [gsd_power_enums_update] +-) +- +-test_py = find_program('test.py') + +-envs = environment() +-#envs.prepend('G_DEBUG', 'fatal-warnings') +-envs.set('BUILDDIR', meson.current_build_dir()) +-envs.set('TOP_BUILDDIR', meson.build_root()) +-envs.set('LD_PRELOAD', 'libumockdev-preload.so.0') +-envs.set('NO_AT_BRIDGE', '1') +-envs.set('HAVE_SYSFS_BACKLIGHT', host_is_linux ? '1' : '0') +- +-if get_option('b_sanitize').split(',').contains('address') +- # libasan needs to be loaded first; so we need to explicitly preload it +- envs.set('POWER_LD_PRELOAD', 'libasan.so.5') +-endif +- +-foreach i : [ 1, 2, 3, 4, 5, 6, 7, 8 ] +- test( +- 'test-power @0@/8'.format(i), +- test_py, +- args: [ 'PowerPluginTest@0@'.format(i) ], +- env: envs, +- timeout: 100 +- ) +-endforeach + diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.30.1.2.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.32.0.bb similarity index 50% rename from meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.30.1.2.bb rename to meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.32.0.bb index 041cd11..a72cd78 100644 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.30.1.2.bb +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.32.0.bb @@ -13,39 +13,13 @@ 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] = "d1f55fb2059a2c52b1ce9af71f949961" +SRC_URI[archive.sha256sum] = "c3b8035aced4971ac49d3f3a5faa301a0825607e73248666a5f8078793d58397" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gobject-introspection gettext meson-exe-wrapper +SRC_URI += " file://0001-don-t-run-power-module-tests.patch" EXTRA_OEMESON += "--buildtype=release -Dcups=false " - -# 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 -#} - -#do_configure_prepend() { -# setup_wrapper -#} diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-do-no-build-calendar-server.patch b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-do-not-build-calendar-server.patch similarity index 71% rename from meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-do-no-build-calendar-server.patch rename to meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-do-not-build-calendar-server.patch index 6d5d811..a14d1f6 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-do-no-build-calendar-server.patch +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-do-not-build-calendar-server.patch @@ -1,7 +1,7 @@ -From ab1b210071c9d43b1d743624407e2d47e2fa4b66 Mon Sep 17 00:00:00 2001 -From: brl -Date: Tue, 19 Dec 2017 14:49:57 -0500 -Subject: [PATCH] do no build calendar server +From 7c4660a3c74ccd1e4dbb784dea7b6fef2bed76ab Mon Sep 17 00:00:00 2001 +From: Bruce Leidl +Date: Thu, 4 Apr 2019 14:40:42 -0400 +Subject: [PATCH] do not build calendar server --- meson.build | 4 ++-- @@ -9,13 +9,13 @@ Subject: [PATCH] do no build calendar server 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build -index 48771eb..4d0d90b 100644 +index e42611e..dae2510 100644 --- a/meson.build +++ b/meson.build -@@ -69,8 +69,8 @@ endif +@@ -73,8 +73,8 @@ else + endif + atk_bridge_dep = dependency('atk-bridge-2.0') - canberra_dep = dependency('libcanberra') - canberra_gtk_dep = dependency('libcanberra-gtk3') -ecal_dep = dependency('libecal-1.2', version: ecal_req) -eds_dep = dependency('libedataserver-1.2', version: eds_req) +#ecal_dep = dependency('libecal-1.2', version: ecal_req) @@ -24,7 +24,7 @@ index 48771eb..4d0d90b 100644 gdk_x11_dep = dependency('gdk-x11-3.0') gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0') diff --git a/src/meson.build b/src/meson.build -index 3e55573..9b55a62 100644 +index 97a5a79..98371a1 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,7 +1,7 @@ @@ -36,6 +36,3 @@ index 3e55573..9b55a62 100644 subdir('hotplug-sniffer') subdir('st') subdir('tray') --- -2.14.3 - 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.32.0.bb similarity index 71% rename from meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.30.2.bb rename to meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.32.0.bb index 59a57a0..e7de770 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.30.2.bb +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.32.0.bb @@ -5,14 +5,14 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gobject-introspection gettext -SRC_URI[archive.md5sum] = "3aef5c837c85f6e5318b845fc844b1fe" -SRC_URI[archive.sha256sum] = "22632c9bbccef11fe3130fc8d642e37de223d089e004bdb58dae309a38694c4d" +SRC_URI[archive.md5sum] = "f0bc523fec6b58fa6ba762e6317334b1" +SRC_URI[archive.sha256sum] = "22f9833ae7d3fb8d5f817c75c79288724ff10d5deb1c2e1c1d0bbab135d753b6" -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 \ -" +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ + file://0001-Disabled-calendar-events-from-user-session.patch \ + file://0001-do-not-use-python-path-from-build-environment.patch \ + file://0001-do-not-build-calendar-server.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" diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.30.2.bb b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.32.0.bb similarity index 82% rename from meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.30.2.bb rename to meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.32.0.bb index 4cfd391..e65d77a 100644 --- a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.30.2.bb +++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.32.0.bb @@ -8,8 +8,8 @@ DEPENDS = "intltool-native dconf gconf glib-2.0 util-linux gsettings-desktop-sch # python3native is needed to run itstool during build inherit gettext gnome python3native -SRC_URI[archive.md5sum] = "debc2a025675312ad5ae33232f02c027" -SRC_URI[archive.sha256sum] = "6b1fc2720e3bfc592645d41e38d0d3a0f2bdf5ef7bce490b2d5c8ba39f395e38" +SRC_URI[archive.md5sum] = "7f329d387bf047f6a4f742014aa5c813" +SRC_URI[archive.sha256sum] = "240742574974b694ad5c7643684838d28f3dff65be34e478edf92a36cc1495dc" EXTRA_OECONF = "--disable-search-provider --without-nautilus-extension" diff --git a/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas/0001-remove-cross-compile-check.patch b/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas/0001-remove-cross-compile-check.patch new file mode 100644 index 0000000..fc747fb --- /dev/null +++ b/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas/0001-remove-cross-compile-check.patch @@ -0,0 +1,22 @@ +From 4de526e6188af4a4b2f4765d1989c4a6fd66a4e5 Mon Sep 17 00:00:00 2001 +From: Bruce Leidl +Date: Wed, 3 Apr 2019 20:40:05 -0400 +Subject: [PATCH] remove cross compile check + +--- + headers/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/headers/meson.build b/headers/meson.build +index 3ce8b61..1132695 100644 +--- a/headers/meson.build ++++ b/headers/meson.build +@@ -19,7 +19,7 @@ enums_xml = custom_target( + install: true, + install_dir: schemasdir) + +-if not meson.is_cross_build() and get_option('introspection') ++if get_option('introspection') + noinst_lib = shared_library('noinst', + headers, + install: false) diff --git a/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_3.28.1.bb b/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_3.28.1.bb deleted file mode 100644 index 5b6640a..0000000 --- a/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_3.28.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "GNOME desktop-wide GSettings schemas" -HOMEPAGE = "http://live.gnome.org/gsettings-desktop-schemas" -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/gsettings-desktop-schema/gsettings-desktop-schemas_3.32.0.bb b/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_3.32.0.bb new file mode 100644 index 0000000..6a19a12 --- /dev/null +++ b/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_3.32.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "GNOME desktop-wide GSettings schemas" +HOMEPAGE = "http://live.gnome.org/gsettings-desktop-schemas" +BUGTRACKER = "https://bugzilla.gnome.org/" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "glib-2.0 intltool-native" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gsettings gettext gobject-introspection upstream-version-is-even + +EXTRA_OEMESON = "-Dintrospection=true" + +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ + file://0001-remove-cross-compile-check.patch \ + " +SRC_URI[archive.md5sum] = "0c2d468a482c12594757442c983aa8ea" +SRC_URI[archive.sha256sum] = "2d59b4b3a548859dfae46314ee4666787a00d5c82db382e97df7aa9d0e310a35" diff --git a/meta-gnome/recipes-gnome/libgweather/libgweather_3.32.0.bb b/meta-gnome/recipes-gnome/libgweather/libgweather_3.32.0.bb index 5b07a65..f844304 100644 --- a/meta-gnome/recipes-gnome/libgweather/libgweather_3.32.0.bb +++ b/meta-gnome/recipes-gnome/libgweather/libgweather_3.32.0.bb @@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI[archive.md5sum] = "68f28c2abb89ed2182aea6752d685cc6" SRC_URI[archive.sha256sum] = "de9a2b392a8b27e012ed80bb9c950085692cd8e898c367c092df15f964a91d13" -#DEPENDS = "gtk+3 libxml2 libsoup-2.4 glib-2.0 intltool-native geocode-glib glib-2.0-native" DEPENDS = "gtk+3 libxml2 libsoup-2.4 glib-2.0 itstool-native geocode-glib glib-2.0-native" FILES_${PN} += "${datadir}/glib-2.0/schemas" diff --git a/meta-gnome/recipes-gnome/mutter/mutter/0001-dont-generate-default-modes-header.patch b/meta-gnome/recipes-gnome/mutter/mutter/0001-dont-generate-default-modes-header.patch new file mode 100644 index 0000000..7b0576a --- /dev/null +++ b/meta-gnome/recipes-gnome/mutter/mutter/0001-dont-generate-default-modes-header.patch @@ -0,0 +1,93 @@ +From 2565becb5e6b0ea2b11f79256a83ec7626c10b97 Mon Sep 17 00:00:00 2001 +From: Bruce Leidl +Date: Sat, 6 Apr 2019 20:06:32 -0400 +Subject: [PATCH] dont generate default modes header + +--- + src/backends/native/meta-default-modes.h | 57 ++++++++++++++++++++++++ + src/meson.build | 8 ---- + 2 files changed, 57 insertions(+), 8 deletions(-) + create mode 100644 src/backends/native/meta-default-modes.h + +diff --git a/src/backends/native/meta-default-modes.h b/src/backends/native/meta-default-modes.h +new file mode 100644 +index 0000000..8b45f9f +--- /dev/null ++++ b/src/backends/native/meta-default-modes.h +@@ -0,0 +1,57 @@ ++/* Generated by gen-default-modes.py */ ++ ++static const drmModeModeInfo meta_default_landscape_drm_mode_infos[] = { ++{ 38250, 800, 832, 912, 1024, 0, 600, 603, 607, 624, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "800x600_60.00" }, ++{ 63500, 1024, 1072, 1176, 1328, 0, 768, 771, 775, 798, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1024x768_60.00" }, ++{ 81750, 1152, 1216, 1336, 1520, 0, 864, 867, 871, 897, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1152x864_60.00" }, ++{ 101250, 1280, 1360, 1488, 1696, 0, 960, 963, 967, 996, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1280x960_60.00" }, ++{ 121750, 1400, 1488, 1632, 1864, 0, 1050, 1053, 1057, 1089, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1400x1050_60.00" }, ++{ 129000, 1440, 1528, 1680, 1920, 0, 1080, 1083, 1087, 1120, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1440x1080_60.00" }, ++{ 161000, 1600, 1712, 1880, 2160, 0, 1200, 1203, 1207, 1245, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1600x1200_60.00" }, ++{ 233500, 1920, 2064, 2264, 2608, 0, 1440, 1443, 1447, 1493, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1920x1440_60.00" }, ++{ 267250, 2048, 2208, 2424, 2800, 0, 1536, 1539, 1543, 1592, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "2048x1536_60.00" }, ++{ 83500, 1280, 1352, 1480, 1680, 0, 800, 803, 809, 831, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1280x800_60.00" }, ++{ 106500, 1440, 1528, 1672, 1904, 0, 900, 903, 909, 934, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1440x900_60.00" }, ++{ 146250, 1680, 1784, 1960, 2240, 0, 1050, 1053, 1059, 1089, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1680x1050_60.00" }, ++{ 193250, 1920, 2056, 2256, 2592, 0, 1200, 1203, 1209, 1245, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1920x1200_60.00" }, ++{ 348500, 2560, 2760, 3032, 3504, 0, 1600, 1603, 1609, 1658, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "2560x1600_60.00" }, ++{ 74500, 1280, 1344, 1472, 1664, 0, 720, 723, 728, 748, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1280x720_60.00" }, ++{ 85250, 1368, 1440, 1576, 1784, 0, 768, 771, 781, 798, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1368x768_60.00" }, ++{ 118250, 1600, 1696, 1856, 2112, 0, 900, 903, 908, 934, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1600x900_60.00" }, ++{ 173000, 1920, 2048, 2248, 2576, 0, 1080, 1083, 1088, 1120, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1920x1080_60.00" }, ++{ 197000, 2048, 2184, 2400, 2752, 0, 1152, 1155, 1160, 1195, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "2048x1152_60.00" }, ++{ 312250, 2560, 2752, 3024, 3488, 0, 1440, 1443, 1448, 1493, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "2560x1440_60.00" }, ++{ 396250, 2880, 3096, 3408, 3936, 0, 1620, 1623, 1628, 1679, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "2880x1620_60.00" }, ++{ 492000, 3200, 3456, 3800, 4400, 0, 1800, 1803, 1808, 1865, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "3200x1800_60.00" }, ++{ 712750, 3840, 4160, 4576, 5312, 0, 2160, 2163, 2168, 2237, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "3840x2160_60.00" }, ++{ 813000, 4096, 4440, 4888, 5680, 0, 2304, 2307, 2312, 2386, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "4096x2304_60.00" }, ++{ 1276500, 5120, 5560, 6128, 7136, 0, 2880, 2883, 2888, 2982, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "5120x2880_60.00" }, ++}; ++ ++static const drmModeModeInfo meta_default_portrait_drm_mode_infos[] = { ++{ 38250, 600, 603, 607, 624, 0, 800, 832, 912, 1024, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "600x800_60.00" }, ++{ 63500, 768, 771, 775, 798, 0, 1024, 1072, 1176, 1328, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "768x1024_60.00" }, ++{ 81750, 864, 867, 871, 897, 0, 1152, 1216, 1336, 1520, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "864x1152_60.00" }, ++{ 101250, 960, 963, 967, 996, 0, 1280, 1360, 1488, 1696, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "960x1280_60.00" }, ++{ 121750, 1050, 1053, 1057, 1089, 0, 1400, 1488, 1632, 1864, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1050x1400_60.00" }, ++{ 129000, 1080, 1083, 1087, 1120, 0, 1440, 1528, 1680, 1920, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1080x1440_60.00" }, ++{ 161000, 1200, 1203, 1207, 1245, 0, 1600, 1712, 1880, 2160, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1200x1600_60.00" }, ++{ 233500, 1440, 1443, 1447, 1493, 0, 1920, 2064, 2264, 2608, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1440x1920_60.00" }, ++{ 267250, 1536, 1539, 1543, 1592, 0, 2048, 2208, 2424, 2800, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1536x2048_60.00" }, ++{ 83500, 800, 803, 809, 831, 0, 1280, 1352, 1480, 1680, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "800x1280_60.00" }, ++{ 106500, 900, 903, 909, 934, 0, 1440, 1528, 1672, 1904, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "900x1440_60.00" }, ++{ 146250, 1050, 1053, 1059, 1089, 0, 1680, 1784, 1960, 2240, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1050x1680_60.00" }, ++{ 193250, 1200, 1203, 1209, 1245, 0, 1920, 2056, 2256, 2592, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1200x1920_60.00" }, ++{ 348500, 1600, 1603, 1609, 1658, 0, 2560, 2760, 3032, 3504, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1600x2560_60.00" }, ++{ 74500, 720, 723, 728, 748, 0, 1280, 1344, 1472, 1664, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "720x1280_60.00" }, ++{ 85250, 768, 771, 781, 798, 0, 1368, 1440, 1576, 1784, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "768x1368_60.00" }, ++{ 118250, 900, 903, 908, 934, 0, 1600, 1696, 1856, 2112, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "900x1600_60.00" }, ++{ 173000, 1080, 1083, 1088, 1120, 0, 1920, 2048, 2248, 2576, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1080x1920_60.00" }, ++{ 197000, 1152, 1155, 1160, 1195, 0, 2048, 2184, 2400, 2752, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1152x2048_60.00" }, ++{ 312250, 1440, 1443, 1448, 1493, 0, 2560, 2752, 3024, 3488, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1440x2560_60.00" }, ++{ 396250, 1620, 1623, 1628, 1679, 0, 2880, 3096, 3408, 3936, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1620x2880_60.00" }, ++{ 492000, 1800, 1803, 1808, 1865, 0, 3200, 3456, 3800, 4400, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1800x3200_60.00" }, ++{ 712750, 2160, 2163, 2168, 2237, 0, 3840, 4160, 4576, 5312, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "2160x3840_60.00" }, ++{ 813000, 2304, 2307, 2312, 2386, 0, 4096, 4440, 4888, 5680, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "2304x4096_60.00" }, ++{ 1276500, 2880, 2883, 2888, 2982, 0, 5120, 5560, 6128, 7136, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "2880x5120_60.00" }, ++}; +diff --git a/src/meson.build b/src/meson.build +index 8779c95..12229a9 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -604,14 +604,6 @@ dbus_idle_monitor_built_sources = gnome.gdbus_codegen('meta-dbus-idle-monitor', + mutter_built_sources += dbus_idle_monitor_built_sources + + if have_native_backend +- cvt = find_program('cvt') +- +- gen_default_modes = find_program('backends/native/gen-default-modes.py') +- default_modes_h = custom_target('meta-default-modes', +- output: 'meta-default-modes.h', +- command: [gen_default_modes, '@OUTPUT@'] +- ) +- mutter_built_sources += default_modes_h + + gdbus_codegen = find_program('gdbus-codegen') + dbus_login1_built_sources = custom_target('meta-dbus-login1', diff --git a/meta-gnome/recipes-gnome/mutter/mutter/0001-remove-check-for-zenity.patch b/meta-gnome/recipes-gnome/mutter/mutter/0001-remove-check-for-zenity.patch deleted file mode 100644 index 67c51cf..0000000 --- a/meta-gnome/recipes-gnome/mutter/mutter/0001-remove-check-for-zenity.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 63162a620053f3d21a5610be50e66a72595ebf09 Mon Sep 17 00:00:00 2001 -From: brl -Date: Tue, 12 Dec 2017 22:33:08 -0500 -Subject: [PATCH] remove check for zenity - ---- - configure.ac | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 89c15e2..5b3414e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -390,11 +390,6 @@ fi - - AM_CONDITIONAL(HAVE_SM, test "$found_sm" = "yes") - --AC_PATH_PROG(ZENITY, zenity, no) --if test x"$ZENITY" = xno; then -- AC_MSG_ERROR([zenity not found in your path - needed for dialogs]) --fi -- - AC_ARG_ENABLE(debug, - [ --enable-debug enable debugging],, - enable_debug=no) --- -2.14.3 - diff --git a/meta-gnome/recipes-gnome/mutter/mutter/0001-remove-private-get_client_pid.patch b/meta-gnome/recipes-gnome/mutter/mutter/0001-remove-private-get_client_pid.patch new file mode 100644 index 0000000..7d1b8a8 --- /dev/null +++ b/meta-gnome/recipes-gnome/mutter/mutter/0001-remove-private-get_client_pid.patch @@ -0,0 +1,22 @@ +From e03f5efe9ac52ec06257ec8cf9ef45eb109d0f43 Mon Sep 17 00:00:00 2001 +From: Bruce Leidl +Date: Sat, 6 Apr 2019 20:23:15 -0400 +Subject: [PATCH] remove private get_client_pid + +--- + src/core/window-private.h | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/core/window-private.h b/src/core/window-private.h +index 9fe5bc5..c1a0e9e 100644 +--- a/src/core/window-private.h ++++ b/src/core/window-private.h +@@ -771,8 +771,6 @@ void meta_window_handle_leave (MetaWindow *window); + void meta_window_handle_ungrabbed_event (MetaWindow *window, + const ClutterEvent *event); + +-uint32_t meta_window_get_client_pid (MetaWindow *window); +- + void meta_window_get_client_area_rect (const MetaWindow *window, + cairo_rectangle_int_t *rect); + void meta_window_get_titlebar_rect (MetaWindow *window, diff --git a/meta-gnome/recipes-gnome/mutter/mutter/0002-export-get_client_pid.patch b/meta-gnome/recipes-gnome/mutter/mutter/0002-export-get_client_pid.patch new file mode 100644 index 0000000..4246884 --- /dev/null +++ b/meta-gnome/recipes-gnome/mutter/mutter/0002-export-get_client_pid.patch @@ -0,0 +1,23 @@ +From 4cf17283901981e0528ef889fa610bef79382dc1 Mon Sep 17 00:00:00 2001 +From: Bruce Leidl +Date: Sat, 6 Apr 2019 20:10:23 -0400 +Subject: [PATCH] export get_client_pid + +--- + src/meta/window.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/meta/window.h b/src/meta/window.h +index 6261fff..2b5f711 100644 +--- a/src/meta/window.h ++++ b/src/meta/window.h +@@ -334,6 +334,9 @@ guint32 meta_window_get_user_time (MetaWindow *window); + META_EXPORT + int meta_window_get_pid (MetaWindow *window); + ++META_EXPORT ++guint32 meta_window_get_client_pid (MetaWindow *window); ++ + META_EXPORT + const char *meta_window_get_client_machine (MetaWindow *window); + diff --git a/meta-gnome/recipes-gnome/mutter/mutter/get_client_pid.patch b/meta-gnome/recipes-gnome/mutter/mutter/get_client_pid.patch deleted file mode 100644 index e1b73e6..0000000 --- a/meta-gnome/recipes-gnome/mutter/mutter/get_client_pid.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/meta/window.h 2018-03-12 18:45:19.000000000 +0000 -+++ b/src/meta/window.h 2018-10-25 18:15:11.258297608 +0000 -@@ -205,6 +205,7 @@ - guint meta_window_get_stable_sequence (MetaWindow *window); - guint32 meta_window_get_user_time (MetaWindow *window); - int meta_window_get_pid (MetaWindow *window); -+guint32 meta_window_get_client_pid (MetaWindow *window); - const char *meta_window_get_client_machine (MetaWindow *window); - gboolean meta_window_is_remote (MetaWindow *window); - gboolean meta_window_is_attached_dialog (MetaWindow *window); diff --git a/meta-gnome/recipes-gnome/mutter/mutter/startup-notification.patch b/meta-gnome/recipes-gnome/mutter/mutter/startup-notification.patch deleted file mode 100644 index 1a4dd0b..0000000 --- a/meta-gnome/recipes-gnome/mutter/mutter/startup-notification.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 4ed430b4ef3013c96fa56cdc57b925b42d20ead9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= -Date: Thu, 20 Oct 2016 18:00:04 +0200 -Subject: [PATCH] gtk-shell: Work around non-working startup notifications - -GNOME Shell relies on the MetaScreen::startup-sequence-changed signal, -which is tied to (lib)startup-notification and therefore X11. As a result, -when we remove the startup sequence of a wayland client, GNOME Shell will -not be notified about this until startup-notification's timeout is hit. -As a temporary stop-gap, go through XWayland even for wayland clients, -so that the signal is emitted when expected. - -https://bugzilla.gnome.org/show_bug.cgi?id=768531 ---- - src/wayland/meta-wayland-gtk-shell.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/src/wayland/meta-wayland-gtk-shell.c b/src/wayland/meta-wayland-gtk-shell.c -index d6e249f..9d1a19e 100644 ---- a/src/wayland/meta-wayland-gtk-shell.c -+++ b/src/wayland/meta-wayland-gtk-shell.c -@@ -219,11 +219,21 @@ gtk_shell_set_startup_id (struct wl_client *client, - struct wl_resource *resource, - const char *startup_id) - { -+#if 0 - MetaDisplay *display; - - display = meta_get_display (); - meta_startup_notification_remove_sequence (display->startup_notification, - startup_id); -+#else -+ /* HACK: MetaScreen::startup-sequence-changed is currently tied to -+ (lib)startup-notification, which means it only works on X11; -+ so for now, always go through XWayland, even for wayland clients */ -+ gdk_x11_display_broadcast_startup_message (gdk_display_get_default (), -+ "remove", -+ "ID", startup_id, -+ NULL); -+#endif - } - - static void --- -2.9.3 diff --git a/meta-gnome/recipes-gnome/mutter/mutter_3.30.2.bb b/meta-gnome/recipes-gnome/mutter/mutter_3.30.2.bb deleted file mode 100644 index d7ba092..0000000 --- a/meta-gnome/recipes-gnome/mutter/mutter_3.30.2.bb +++ /dev/null @@ -1,25 +0,0 @@ -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI[archive.md5sum] = "d74b9bf421b2b82ebfe11cccc055a760" -SRC_URI[archive.sha256sum] = "df24dcc0b866fc6bffbfc82881a84bd7cc9c641e4124d2545c368c0b10e12363" - -SRC_URI_append = "\ - file://0001-remove-check-for-zenity.patch \ - file://startup-notification.patch \ - file://get_client_pid.patch \ -" - -DEPENDS = "libxrandr libsm libx11 libxi glib-2.0 wayland-protocols libwacom mesa gtk+3 pango cairo gsettings-desktop-schemas xcomposite upower gnome-desktop libxkbfile json-glib wayland-native xinerama zenity libinput libcanberra" -RDEPENDS_${PN} = "zenity" - -inherit gettext pkgconfig autotools gobject-introspection gnome - -FILES_${PN} += "${datadir}/gnome-control-center" - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/cogl/cogl/.libs:${B}/cogl/cogl-pango/.libs:${B}/cogl/cogl-path/.libs:${B}/clutter/clutter/.libs" -} - -EXTRA_OECONF = "--with-gudev --with-libwacom" - diff --git a/meta-gnome/recipes-gnome/mutter/mutter_3.32.0.bb b/meta-gnome/recipes-gnome/mutter/mutter_3.32.0.bb new file mode 100644 index 0000000..b1998a5 --- /dev/null +++ b/meta-gnome/recipes-gnome/mutter/mutter_3.32.0.bb @@ -0,0 +1,27 @@ +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI[archive.md5sum] = "3519b713b08ccfce7ac5b1b8836bbf40" +SRC_URI[archive.sha256sum] = "7668a2208cb40f0f0c3a90dd72c3ea83993dbdfc24f517c6fa95abc04a8e1f19" + +DEPENDS = "libxrandr libsm libx11 libxi glib-2.0 wayland-protocols libwacom mesa gtk+3 pango cairo gsettings-desktop-schemas gnome-settings-daemon xcomposite upower gnome-desktop libxkbfile json-glib wayland-native xinerama zenity libinput libcanberra" +RDEPENDS_${PN} = "zenity" + +GNOMEBASEBUILDCLASS = "meson" +inherit gettext pkgconfig autotools gobject-introspection gnome + +SRC_URI += "file://0001-dont-generate-default-modes-header.patch \ + file://0002-export-get_client_pid.patch \ + file://0001-remove-private-get_client_pid.patch \ + " +FILES_${PN} += "${datadir}/gnome-control-center ${libdir}/mutter-4/*" +FILES_${PN}-dbg += "${datadir}/mutter-4/tests ${datadir}/installed-tests" +FILES_SOLIBSDEV = "${libdir}/mutter-4/lib*.so ${libdir}/lib*.so" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/cogl/cogl/.libs:${B}/cogl/cogl-pango/.libs:${B}/cogl/cogl-path/.libs:${B}/clutter/clutter/.libs" +} + +#EXTRA_OECONF = "--with-gudev --with-libwacom" +EXTRA_OEMESON = "-Dremote_desktop=false -Dxwayland_path=/usr/bin/Xwayland" + diff --git a/meta-gnome/recipes-gnome/vte/vte_0.54.2.bb b/meta-gnome/recipes-gnome/vte/vte_0.56.0.bb similarity index 85% rename from meta-gnome/recipes-gnome/vte/vte_0.54.2.bb rename to meta-gnome/recipes-gnome/vte/vte_0.56.0.bb index aa377a3..6f817ce 100644 --- a/meta-gnome/recipes-gnome/vte/vte_0.54.2.bb +++ b/meta-gnome/recipes-gnome/vte/vte_0.56.0.bb @@ -7,8 +7,8 @@ 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" +SRC_URI[archive.md5sum] = "67d3c07cfd59bfe1872a95dcc22feeff" +SRC_URI[archive.sha256sum] = "5fab50e66b9d5bb7dfc6a1a9c334ed10d60b63f4a222f11281bba977ae11b7f0" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" diff --git a/meta-gnome/recipes-support/gsound/gsound_1.0.2.bb b/meta-gnome/recipes-support/gsound/gsound_1.0.2.bb new file mode 100644 index 0000000..31dd976 --- /dev/null +++ b/meta-gnome/recipes-support/gsound/gsound_1.0.2.bb @@ -0,0 +1,9 @@ +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=447b837ae57f08b7060593ac6256163f" + +SRC_URI[archive.md5sum] = "c26fd21c21b9ef6533a202a73fab21db" +SRC_URI[archive.sha256sum] = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53" + +inherit autotools gnomebase gobject-introspection +DEPENDS = "glib-2.0 libcanberra" + 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-new.patch similarity index 63% rename from meta-gnome/recipes-support/mozjs/mozjs/0001-do-not-create-python-environment.patch rename to meta-gnome/recipes-support/mozjs/mozjs/0001-do-not-create-python-environment-new.patch index ba317bc..8b39b7a 100644 --- 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-new.patch @@ -1,24 +1,19 @@ -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 +From 9b32dd063116186d679578cff24366b19874699d Mon Sep 17 00:00:00 2001 +From: Bruce Leidl +Date: Thu, 4 Apr 2019 15:30:20 -0400 +Subject: [PATCH] do not create python environment new -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(-) + js/src/old-configure | 2 +- + 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure -index 2123beb..6fe6591 100644 +index 83b8d705..79d04b60 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): +@@ -250,24 +250,6 @@ def virtualenv_python(env_python, build_env, mozconfig, help): else: python = sys.executable @@ -42,9 +37,9 @@ index 2123beb..6fe6591 100644 - return python - set_config('PYTHON', virtualenv_python) + diff --git a/configure.py b/configure.py -index f7392d0..45323a5 100644 +index 9b2bae9a..771e34e3 100644 --- a/configure.py +++ b/configure.py @@ -12,7 +12,15 @@ import textwrap @@ -56,28 +51,19 @@ index f7392d0..45323a5 100644 +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"]: ++for s in ["python", "testing/mozbase", "third_party/python"]: + 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, + from mozbuild.makeutil import Makefile + from mozbuild.pythonutil import iter_modules_in_path diff --git a/js/src/old-configure b/js/src/old-configure -index ee4527b..75b00e1 100644 +index 2c579b77..830b6361 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 +@@ -9974,7 +9974,7 @@ if test "$JS_STANDALONE"; then if test "$no_recursion" != yes; then trap '' EXIT @@ -86,6 +72,3 @@ index ee4527b..75b00e1 100644 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 deleted file mode 100644 index bc1af3c..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs/0001-fix-compiling-failure-on-mips64-n32-bsp.patch +++ /dev/null @@ -1,79 +0,0 @@ -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 deleted file mode 100644 index c111ea5..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0a61b0b98c152f10404ccbdeeac583a486638a7a Mon Sep 17 00:00:00 2001 -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 - -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 - -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@ - @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@ --- -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 deleted file mode 100644 index 477f73a..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs/0001-mozjs-fix-coredump-caused-by-getenv.patch +++ /dev/null @@ -1,27 +0,0 @@ -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/0002-do-not-include-requireddefines.patch b/meta-gnome/recipes-support/mozjs/mozjs/0002-do-not-include-requireddefines.patch new file mode 100644 index 0000000..f4e4b2b --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/mozjs/0002-do-not-include-requireddefines.patch @@ -0,0 +1,19 @@ +From 39df72a4abd14d65f888bda6045d4255bd5ce2fc Mon Sep 17 00:00:00 2001 +From: Bruce Leidl +Date: Thu, 4 Apr 2019 15:31:45 -0400 +Subject: [PATCH] do not include requireddefines + +--- + js/src/build/js.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/js/src/build/js.pc.in b/js/src/build/js.pc.in +index 2eae393a..c2dea62d 100644 +--- a/js/src/build/js.pc.in ++++ b/js/src/build/js.pc.in +@@ -8,4 +8,4 @@ Description: The Mozilla library for JavaScript + Version: @MOZILLA_VERSION@ + @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@ diff --git a/meta-gnome/recipes-support/mozjs/mozjs/0003-fix-coredump-caused-by-getenv.patch b/meta-gnome/recipes-support/mozjs/mozjs/0003-fix-coredump-caused-by-getenv.patch new file mode 100644 index 0000000..b3ff38e --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/mozjs/0003-fix-coredump-caused-by-getenv.patch @@ -0,0 +1,21 @@ +From 5d3bd1a8d7cdbbf193079ed6500070276b7c8c70 Mon Sep 17 00:00:00 2001 +From: Bruce Leidl +Date: Thu, 4 Apr 2019 15:33:10 -0400 +Subject: [PATCH] fix coredump caused by getenv + +--- + mozglue/misc/TimeStamp.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mozglue/misc/TimeStamp.cpp b/mozglue/misc/TimeStamp.cpp +index c123bd71..b849254b 100644 +--- a/mozglue/misc/TimeStamp.cpp ++++ b/mozglue/misc/TimeStamp.cpp +@@ -11,6 +11,7 @@ + #include "mozilla/TimeStamp.h" + #include + #include ++#include + + namespace mozilla { + 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 deleted file mode 100644 index a754ff1..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs/0003-workaround-autoconf-2.13-detection-failed.patch +++ /dev/null @@ -1,28 +0,0 @@ -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/0002-fix-cannot-find-link.patch b/meta-gnome/recipes-support/mozjs/mozjs/0004-new-fix-cannot-find-link.patch similarity index 51% rename from meta-gnome/recipes-support/mozjs/mozjs/0002-fix-cannot-find-link.patch rename to meta-gnome/recipes-support/mozjs/mozjs/0004-new-fix-cannot-find-link.patch index 4f7ebc6..b2e4de4 100644 --- a/meta-gnome/recipes-support/mozjs/mozjs/0002-fix-cannot-find-link.patch +++ b/meta-gnome/recipes-support/mozjs/mozjs/0004-new-fix-cannot-find-link.patch @@ -1,26 +1,17 @@ -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 +From 2f0d0585ffc7640e3e10a7260991b33a0783bbd4 Mon Sep 17 00:00:00 2001 +From: Bruce Leidl +Date: Thu, 4 Apr 2019 15:34:56 -0400 +Subject: [PATCH] new 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 +index dc140a42..516652da 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, +@@ -133,7 +133,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)) @@ -29,6 +20,3 @@ index 8c2dbc0..83bffc3 100644 if result: return result --- -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/0005-do-not-use-autoconf-213-to-refresh-old-configure.patch similarity index 53% rename from meta-gnome/recipes-support/mozjs/mozjs/0004-do-not-use-autoconf-2.13-to-refresh-old.configure.patch rename to meta-gnome/recipes-support/mozjs/mozjs/0005-do-not-use-autoconf-213-to-refresh-old-configure.patch index 4cba79c..3a0709f 100644 --- 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/0005-do-not-use-autoconf-213-to-refresh-old-configure.patch @@ -1,21 +1,27 @@ -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 +From 8d26c3717dfb677d8c7a739e26352c1c5ef7838a Mon Sep 17 00:00:00 2001 +From: Bruce Leidl +Date: Thu, 4 Apr 2019 15:39:26 -0400 +Subject: [PATCH] do not use autoconf 213 to refresh old configure -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia --- - build/moz.configure/old.configure | 2 +- + build/moz.configure/old.configure | 4 ++-- js/src/old-configure | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure -index ece47f4..a73900f 100644 +index 17d0c5bf..436fcc5e 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, +@@ -33,7 +33,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: +@@ -87,7 +87,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)) @@ -25,10 +31,10 @@ index ece47f4..a73900f 100644 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 +index 830b6361..129b131f 100644 --- a/js/src/old-configure +++ b/js/src/old-configure -@@ -619,7 +619,7 @@ if test -z "$srcdir"; then +@@ -587,7 +587,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=. @@ -37,6 +43,3 @@ index 75b00e1..8a8ef52 100644 if test ! -r $srcdir/$ac_unique_file; then srcdir=.. fi --- -2.7.4 - 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 deleted file mode 100644 index 38e4698..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs/0005-fix-do_compile-failed-on-mips.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 deleted file mode 100644 index 32a977c..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs/0006-support-musl.patch +++ /dev/null @@ -1,158 +0,0 @@ -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 deleted file mode 100644 index 9194e34..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs/0010-fix-cross-compilation-on-i586-targets.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 - -Remove offending -Wl,-rpath-link that may cause host libraries to be picked -during linking. The patch applies a fix to configure.in. So as not to -regenerate configure, similar fix is applied there. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Maciej Borzecki - -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,${DIST}/bin -Wl,-rpath-link,${prefix}/lib" -+MOZ_FIX_LINK_PATHS="-Wl,-rpath-link,${DIST}/bin" - - - --- -2.7.4 - diff --git a/meta-gnome/recipes-support/mozjs/mozjs/add-riscv-support.patch b/meta-gnome/recipes-support/mozjs/mozjs/add-riscv-support.patch deleted file mode 100644 index 4354a9d..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs/add-riscv-support.patch +++ /dev/null @@ -1,70 +0,0 @@ -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 deleted file mode 100644 index 5487cdb..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs/disable-mozglue-in-stand-alone-builds.patch +++ /dev/null @@ -1,74 +0,0 @@ -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/format-overflow.patch b/meta-gnome/recipes-support/mozjs/mozjs/format-overflow.patch deleted file mode 100644 index 29c6a7b..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs/format-overflow.patch +++ /dev/null @@ -1,21 +0,0 @@ -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/mozjs_52.9.1.bb b/meta-gnome/recipes-support/mozjs/mozjs_60.2.3.bb similarity index 70% rename from meta-gnome/recipes-support/mozjs/mozjs_52.9.1.bb rename to meta-gnome/recipes-support/mozjs/mozjs_60.2.3.bb index f31ed88..4088d03 100644 --- a/meta-gnome/recipes-support/mozjs/mozjs_52.9.1.bb +++ b/meta-gnome/recipes-support/mozjs/mozjs_60.2.3.bb @@ -1,30 +1,17 @@ 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" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dc9b6ecd19a14a54a628edaaf23733bf" -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 = "http://archive.ubuntu.com/ubuntu/pool/main/m/mozjs60/mozjs60_60.2.3.orig.tar.xz \ + file://0001-do-not-create-python-environment-new.patch \ + file://0002-do-not-include-requireddefines.patch \ + file://0003-fix-coredump-caused-by-getenv.patch \ + file://0004-new-fix-cannot-find-link.patch \ + file://0005-do-not-use-autoconf-213-to-refresh-old-configure.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" +SRC_URI[md5sum] = "ef7c243c2ef474c7b055c0b7f91ea2f2" +SRC_URI[sha256sum] = "4163add2c4c25499fb45d7cca7cab9ecbede0cb054b9bcfc9abaee84733c4d04" inherit autotools pkgconfig perlnative pythonnative @@ -45,6 +32,7 @@ EXTRA_OECONF = " \ --prefix=${prefix} \ --libdir=${libdir} \ --disable-tests \ + --disable-jemalloc \ --with-nspr-libs='-lplds4 -lplc4 -lnspr4' \ ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', "--enable-gold", '--disable-gold', d)} \ " @@ -66,7 +54,7 @@ do_compile_prepend() { export S export PYTHONPATH cd ${S} - for sub_dir in python testing/mozbase; do + for sub_dir in python testing/mozbase third_party/python; do for module_dir in `ls $sub_dir -1`;do [ $module_dir = "virtualenv" ] && continue if [ -d "${S}/$sub_dir/$module_dir" ];then @@ -83,7 +71,7 @@ do_install_prepend() { export S export PYTHONPATH cd ${S} - for sub_dir in python testing/mozbase; do + for sub_dir in python testing/mozbase third_party/python; do for module_dir in `ls $sub_dir -1`;do [ $module_dir = "virtualenv" ] && continue if [ -d "${S}/$sub_dir/$module_dir" ];then