libsolv: upgrade 0.7.10 -> 0.7.11
PATCH 1/1 libsolv: upgrade 0.7.10 -> 0.7.11
From: Wang Mingyu <[email protected]>
---
.../libsolv/{libsolv_0.7.10.bb => libsolv_0.7.11.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-extended/libsolv/{libsolv_0.7.10.bb => libsolv_0.7.11.bb} (94%)meta/recipes-extended/libsolv/libsolv_0.7.11.bb renamed from meta/recipes-extended/libsolv/libsolv_0.7.10.bb +1 -1
@@ -10,7 +10,7 @@ DEPENDS = "expat zlib" SRC_URI = "git://github.com/openSUSE/libsolv.git \ " -SRCREV = "605dd2645ef899e2b7c95709476fb51e28d7e378" +SRCREV = "102ac552669181d3e43731aa275bdbbc7ddcb94c" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
Signature · 1 line
2.17.1
PATCH 1/1 msmtp: upgrade 1.8.7 -> 1.8.8
From: Wang Mingyu <[email protected]>
---
.../recipes-extended/msmtp/{msmtp_1.8.7.bb => msmtp_1.8.8.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/msmtp/{msmtp_1.8.7.bb => msmtp_1.8.8.bb} (86%)meta/recipes-extended/msmtp/msmtp_1.8.8.bb renamed from meta/recipes-extended/msmtp/msmtp_1.8.7.bb +2 -2
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" UPSTREAM_CHECK_URI = "https://marlam.de/msmtp/download/" SRC_URI = "https://marlam.de/${BPN}/releases/${BP}.tar.xz" -SRC_URI[md5sum] = "4cf3d000b24fc8769e9fd8ec8b3cf1fb" -SRC_URI[sha256sum] = "9a53bcdc244ec5b1a806934ecc7746d9d09db581f587bedf597e9da2f48c51f1" +SRC_URI[md5sum] = "016e432d12e12dc5d73960e2bc67f0fb" +SRC_URI[sha256sum] = "eccb53e48f025f7e6f60210316df61cf6097a491728341c1e375fc1acc6459e5" inherit gettext autotools update-alternatives pkgconfig
Signature · 1 line
2.17.1
PATCH 1/1 xorgproto: upgrade 2019.2 -> 2020.1
In reply to Wang MingyuFrom: Wang Mingyu <[email protected]>
legacy.patch
removed since it is included in 2020.1
---
.../xorg-proto/xorgproto/legacy.patch | 97 -------------------
...orgproto_2019.2.bb => xorgproto_2020.1.bb} | 7 +-
2 files changed, 3 insertions(+), 101 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-proto/xorgproto/legacy.patch
rename meta/recipes-graphics/xorg-proto/{xorgproto_2019.2.bb => xorgproto_2020.1.bb} (77%)meta/recipes-graphics/xorg-proto/xorgproto/legacy.patch deleted +0 -97
@@ -1,97 +0,0 @@ -These headers should be legacy to ensure autotools/meson intall the same files. - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/proto/xorgproto/merge_requests/12] -Signed-off-by: Ross Burton <[email protected]> - -diff --git a/include/X11/extensions/meson.build b/include/X11/extensions/meson.build -index 1d85cf8..d1ac281 100644 ---- a/include/X11/extensions/meson.build -+++ b/include/X11/extensions/meson.build -@@ -65,8 +65,6 @@ install_headers( - 'xf86dga.h', - 'xf86dgaproto.h', - 'xf86dgastr.h', -- 'xf86misc.h', -- 'xf86mscstr.h', - 'xf86vm.h', - 'xf86vmproto.h', - 'xf86vmstr.h', -@@ -85,13 +83,6 @@ install_headers( - 'xtestext1const.h', - 'xtestext1proto.h', - 'xtestproto.h', -- 'xtrapbits.h', -- 'xtrapddmi.h', -- 'xtrapdi.h', -- 'xtrapemacros.h', -- 'xtraplib.h', -- 'xtraplibp.h', -- 'xtrapproto.h', - 'Xv.h', - 'XvMC.h', - 'XvMCproto.h', -@@ -113,7 +104,16 @@ if get_option('legacy') == true - 'windowswmstr.h', - 'xcalibrateproto.h', - 'xcalibratewire.h', -+ 'xtrapbits.h', -+ 'xtrapddmi.h', -+ 'xtrapdi.h', -+ 'xtrapemacros.h', -+ 'xtraplib.h', -+ 'xtraplibp.h', -+ 'xtrapproto.h', - 'Xeviestr.h', -+ 'xf86misc.h', -+ 'xf86mscstr.h', - 'xf86rush.h', - 'xf86rushstr.h', - 'XKBgeom.h', -diff --git a/include/X11/meson.build b/include/X11/meson.build -index 1c33c64..a4b022e 100644 ---- a/include/X11/meson.build -+++ b/include/X11/meson.build -@@ -59,4 +59,6 @@ install_headers( - subdir('dri') - subdir('extensions') - subdir('fonts') --subdir('PM') -+if get_option('legacy') == true -+ subdir('PM') -+endif -diff --git a/meson.build b/meson.build -index cfbaa2c..68e622a 100644 ---- a/meson.build -+++ b/meson.build -@@ -42,18 +42,15 @@ pcs = [ - ['renderproto', '0.11.1'], - ['resourceproto', '1.2.0'], - ['scrnsaverproto', '1.2.2'], -- ['trapproto', '3.4.3'], - ['videoproto', '2.3.3'], - ['xcmiscproto', '1.2.2'], - ['xextproto', '7.3.0'], - ['xf86bigfontproto', '1.2.0'], - ['xf86dgaproto', '2.1'], - ['xf86driproto', '2.1.1'], -- ['xf86miscproto', '0.9.3'], - ['xf86vidmodeproto', '2.3.1'], - ['xineramaproto', '1.2.1'], - ['xproto', '7.0.32'], -- ['xproxymngproto', '1.0.3'], - ] - - foreach pc : pcs -@@ -78,9 +75,12 @@ if get_option('legacy') == true - ['fontcacheproto', '0.1.3'], - ['lg3dproto', '5.0'], - ['printproto', '1.0.5'], -+ ['trapproto', '3.4.3'], - ['windowswmproto', '1.0.4'], - ['xcalibrateproto', '0.1.0'], -+ ['xf86miscproto', '0.9.3'], - ['xf86rushproto', '1.2.2'], -+ ['xproxymngproto', '1.0.3'], - ] - foreach pc : legacy_pcs - pkg.generate(
meta/recipes-graphics/xorg-proto/xorgproto_2020.1.bb renamed from meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb +3 -4
@@ -9,10 +9,9 @@ SECTION = "x11/libs" LICENSE = "MIT-style" LIC_FILES_CHKSUM = "file://COPYING-x11proto;md5=b9e051107d5628966739a0b2e9b32676" -SRC_URI = "${XORG_MIRROR}/individual/proto/${BP}.tar.bz2 \ - file://legacy.patch" -SRC_URI[md5sum] = "a02dcaff48b4141b949ac99dfc344d86" -SRC_URI[sha256sum] = "46ecd0156c561d41e8aa87ce79340910cdf38373b759e737fcbba5df508e7b8e" +SRC_URI = "${XORG_MIRROR}/individual/proto/${BP}.tar.bz2" +SRC_URI[md5sum] = "c29f4fa78f53b52b3efdc71ebd9506b6" +SRC_URI[sha256sum] = "54a153f139035a376c075845dd058049177212da94d7a9707cf9468367b699d2" inherit meson
Signature · 1 line
2.17.1
PATCH v2 1/1 xkeyboard-config: upgrade 2.28 -> 2.29
In reply to Wang MingyuFrom: Wang Mingyu <[email protected]>
---
.../{xkeyboard-config_2.28.bb => xkeyboard-config_2.29.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-lib/{xkeyboard-config_2.28.bb => xkeyboard-config_2.29.bb} (87%)meta/recipes-graphics/xorg-lib/xkeyboard-config_2.29.bb renamed from meta/recipes-graphics/xorg-lib/xkeyboard-config_2.28.bb +2 -2
@@ -13,8 +13,8 @@ LICENSE = "MIT & MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9" SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "5a968ab77846ff85a04242410b2a61de" -SRC_URI[sha256sum] = "69adb25b0fc64e4075f8ec0eab8d869892419f474f91fb69db1713de2062bdce" +SRC_URI[md5sum] = "b5980bdc6c7d79f6dcccba8c76bb6c5d" +SRC_URI[sha256sum] = "1d4175278bf06000683656763a8b1d3282c61a314b6db41260c8efe92d621802" SECTION = "x11/libs" DEPENDS = "util-macros libxslt-native"
Signature · 1 line
2.17.1
Re: [OE-core] [PATCH v2] xkeyboard-config: upgrade 2.28 -> 2.29
Quoted 9 lines · Wang Mingyu
From: Wang Mingyu <[email protected]>
Signed-off-by Wang Mingyu <[email protected]>--- .../{xkeyboard-config_2.28.bb => xkeyboard-config_2.29.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/xorg-lib/{xkeyboard-config_2.28.bb =>xkeyboard-config_2.29.bb} (87%)
https://autobuilder.yoctoproject.org/typhoon/#/builders/106/builds/707
Cheers,
Richard
Quoted 19 lines · Wang Mingyu
From: Wang Mingyu <[email protected]>
Signed-off-by Wang Mingyu <[email protected]>--- .../libsolv/{libsolv_0.7.10.bb => libsolv_0.7.11.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-extended/libsolv/{libsolv_0.7.10.bb =>libsolv_0.7.11.bb} (94%)
meta/recipes-extended/libsolv/libsolv_0.7.11.bb renamed from meta/recipes-extended/libsolv/libsolv_0.7.10.bb +0
-0
meta/recipes-extended/libsolv/libsolv_0.7.11.bb DEPENDS = "expat zlib" · line 14
Quoted 6 lines
meta/recipes-extended/libsolv/libsolv_0.7.11.bb renamed from meta/recipes-extended/libsolv/libsolv_0.7.10.bb +1
-1@@ -10,7 +10,7 @@ DEPENDS = "expat zlib" SRC_URI = "git://github.com/openSUSE/libsolv.git \ " -SRCREV = "605dd2645ef899e2b7c95709476fb51e28d7e378" +SRCREV = "102ac552669181d3e43731aa275bdbbc7ddcb94c"
This doesn't work:
https://autobuilder.yoctoproject.org/typhoon/#/builders/61/builds/1798
https://autobuilder.yoctoproject.org/typhoon/#/builders/101/builds/701
and many other failures.
Cheers,
Richard