Index: branches/2020Q2/graphics/waffle/Makefile =================================================================== --- branches/2020Q2/graphics/waffle/Makefile (revision 535245) +++ branches/2020Q2/graphics/waffle/Makefile (revision 535246) @@ -1,58 +1,58 @@ # Created by: Jean-Sébastien Pédron # $FreeBSD$ PORTNAME= waffle DISTVERSION= 1.6.0-7 CATEGORIES= graphics # Wayland xdg-shell support (to run on sway/wayfire/etc. that have removed wl-shell) PATCH_SITES= https://gitlab.freedesktop.org/oreaus/${PORTNAME}/commit/ -PATCHFILES= 3cdce7b38cbd91cd7288e21940b279bf7ddc5757.patch:-p1 +PATCHFILES= 3cdce7b38cbd91cd7288e21940b279bf7ddc5757.diff:-p1 MAINTAINER= x11@FreeBSD.org COMMENT= Library that allows to defer selection of an OpenGL API until runtime LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= cmake:devel/cmake USES= compiler:c11 gl localbase meson pkgconfig python:3.5+,build USE_GITLAB= yes GL_SITE= https://gitlab.freedesktop.org GL_ACCOUNT= mesa GL_COMMIT= b71cfa674db5828a2be04a42ce9996d6677629ee USE_GL= egl gl USE_LDCONFIG= yes DOCSDIR= ${PREFIX}/share/doc/waffle1 BINARY_ALIAS= python3=${PYTHON_CMD} OPTIONS_DEFINE= DOCS GBM MANPAGES SURFACELESS WAYLAND X11 OPTIONS_DEFAULT= GBM MANPAGES SURFACELESS WAYLAND X11 OPTIONS_SUB= yes GBM_DESC= GBM/DRM/KMS direct-on-hardware support SURFACELESS_DESC= Surfaceless EGL support GBM_LIB_DEPENDS= libudev.so:devel/libudev-devd GBM_USE= GL=gbm GBM_MESON_ENABLED= gbm MANPAGES_BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl MANPAGES_USES= gnome MANPAGES_USE= GNOME=libxslt:build MANPAGES_MESON_TRUE= build-manpages SURFACELESS_MESON_ENABLED= surfaceless_egl WAYLAND_BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols \ wayland-scanner:graphics/wayland WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland WAYLAND_MESON_ENABLED= wayland X11_USES= xorg X11_USE= XORG=x11,xcb X11_MESON_ENABLED= glx x11_egl .include Index: branches/2020Q2/graphics/waffle/distinfo =================================================================== --- branches/2020Q2/graphics/waffle/distinfo (revision 535245) +++ branches/2020Q2/graphics/waffle/distinfo (revision 535246) @@ -1,5 +1,5 @@ TIMESTAMP = 1577365999 SHA256 (mesa-waffle-b71cfa674db5828a2be04a42ce9996d6677629ee_GL0.tar.gz) = d1081c6f8fc1dd74edebbda9e095eac42df95ed1428a628914222d4233b6be44 SIZE (mesa-waffle-b71cfa674db5828a2be04a42ce9996d6677629ee_GL0.tar.gz) = 340730 -SHA256 (3cdce7b38cbd91cd7288e21940b279bf7ddc5757.patch) = 9f70634f734fdfa6a253abb82223566bef2a2f0e8df3da94b3da62f159e3ea90 -SIZE (3cdce7b38cbd91cd7288e21940b279bf7ddc5757.patch) = 13119 +SHA256 (3cdce7b38cbd91cd7288e21940b279bf7ddc5757.diff) = ccb72de1cc065fc24f8670f63db37ebf5f32c39020736b2bac11237882f54108 +SIZE (3cdce7b38cbd91cd7288e21940b279bf7ddc5757.diff) = 12960 Index: branches/2020Q2/graphics/wayland/Makefile =================================================================== --- branches/2020Q2/graphics/wayland/Makefile (revision 535245) +++ branches/2020Q2/graphics/wayland/Makefile (revision 535246) @@ -1,33 +1,33 @@ # Created by: kwm@FreeBSD.org # $FreeBSD$ PORTNAME= wayland PORTVERSION= 1.18.0 PORTREVISION= 3 CATEGORIES= graphics wayland MASTER_SITES= https://wayland.freedesktop.org/releases/ PATCH_SITES= https://gitlab.freedesktop.org/${PORTNAME}/${PORTNAME}/commit/ -PATCHFILES+= 0fc00fff3015.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/60 -PATCHFILES+= 1283d54dac97.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61 -PATCHFILES+= 3a3dd0820de3.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61 -PATCHFILES+= 230885ebb40b.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61 +PATCHFILES+= 0fc00fff3015.diff:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/60 +PATCHFILES+= 1283d54dac97.diff:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61 +PATCHFILES+= 3a3dd0820de3.diff:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61 +PATCHFILES+= 230885ebb40b.diff:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61 MAINTAINER= x11@FreeBSD.org COMMENT= Wayland composite "server" LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libexpat.so:textproc/expat2 \ libffi.so:devel/libffi \ libepoll-shim.so:devel/libepoll-shim CFLAGS+= "-I${LOCALBASE}/include/libepoll-shim" USES= meson pkgconfig tar:xz USE_GNOME= libxslt:build USE_LDCONFIG= yes MESON_ARGS= -Ddocumentation=false .include Index: branches/2020Q2/graphics/wayland/distinfo =================================================================== --- branches/2020Q2/graphics/wayland/distinfo (revision 535245) +++ branches/2020Q2/graphics/wayland/distinfo (revision 535246) @@ -1,11 +1,11 @@ TIMESTAMP = 1581464763 SHA256 (wayland-1.18.0.tar.xz) = 4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d SIZE (wayland-1.18.0.tar.xz) = 453968 -SHA256 (0fc00fff3015.patch) = 86a6b0fa90e7290468dc366760959fcf01f208974cbacfb254e03fe07a8960cf -SIZE (0fc00fff3015.patch) = 3870 -SHA256 (1283d54dac97.patch) = da207d23eff1821e9fa6adb3f331c4943d24b97c8a1ced1e21166979250d271c -SIZE (1283d54dac97.patch) = 1181 -SHA256 (3a3dd0820de3.patch) = f07b7d928d7aa935ce5508dbc692a369b623031357ceded8caed04d2643dbff6 -SIZE (3a3dd0820de3.patch) = 1140 -SHA256 (230885ebb40b.patch) = 95867f593314ae2d2491654665fe06205a7c8a16c8b85ac09262af718fb84ee2 -SIZE (230885ebb40b.patch) = 2711 +SHA256 (0fc00fff3015.diff) = dc8f664d9caa14916eb1fee231eb268eccf988cc03fdde191d18ab3b2860240d +SIZE (0fc00fff3015.diff) = 1998 +SHA256 (1283d54dac97.diff) = 3fe0d7e4811c2114683b10b9dfa99552f896dc4b8873278bcef2db3e7221a4af +SIZE (1283d54dac97.diff) = 776 +SHA256 (3a3dd0820de3.diff) = f24073844535cbaa4e217c5ad6354a506b8d0340122c9a96f0326b94394619eb +SIZE (3a3dd0820de3.diff) = 811 +SHA256 (230885ebb40b.diff) = 451a1c269f19db787fa4667106dd77b1d8b254359b7b892dfa1517fe5cfbb7da +SIZE (230885ebb40b.diff) = 2415 Index: branches/2020Q2/multimedia/dav1d/Makefile =================================================================== --- branches/2020Q2/multimedia/dav1d/Makefile (revision 535245) +++ branches/2020Q2/multimedia/dav1d/Makefile (revision 535246) @@ -1,53 +1,53 @@ # $FreeBSD$ PORTNAME= dav1d DISTVERSION= 0.6.0 CATEGORIES= multimedia PATCH_SITES= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/commit/ -PATCHFILES+= e04227c5f672.patch:-p1 # https://code.videolan.org/videolan/dav1d/-/merge_requests/934 +PATCHFILES+= e04227c5f672.diff:-p1 # https://code.videolan.org/videolan/dav1d/-/merge_requests/934 MAINTAINER= jbeich@FreeBSD.org COMMENT= Small and fast AV1 decoder LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${BUILD_DEPENDS_${ARCH}} BUILD_DEPENDS_amd64= nasm:devel/nasm BUILD_DEPENDS_i386= nasm:devel/nasm USES= compiler:c11 meson USE_GITLAB= yes USE_LDCONFIG= yes GL_SITE= https://code.videolan.org GL_ACCOUNT= videolan GL_COMMIT= efd9e5518e0ed5114f8b4579debd7ee6dbede21f OPTIONS_DEFINE= SDL TEST OPTIONS_SUB= yes SDL_USES= pkgconfig sdl SDL_USE= SDL=sdl2 SDL_BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers SDL_LIB_DEPENDS= libplacebo.so:graphics/libplacebo \ libvulkan.so:graphics/vulkan-loader SDL_MESON_TRUE= enable_examples TEST_GL_TUPLE= videolan:dav1d-test-data:0b9501d258b50dcf2b86f97214f14f079a1528d0:testdata/tests/dav1d-test-data TEST_MESON_TRUE=enable_tests testdata_tests .if make(makesum) # for optional distfiles .MAKEFLAGS: WITH="${OPTIONS_DEFINE}" .endif # https://bugs.llvm.org/show_bug.cgi?id=40635 .if !empty(CFLAGS:M-flto*) MESON_ARGS+= ${MESON_ARGS_${CHOSEN_COMPILER_TYPE}_${ARCH}} MESON_ARGS_clang_amd64= -Dstack_alignment=16 MESON_ARGS_clang_i386= -Dstack_alignment=4 .endif pre-install-TEST-on: do-test .include Index: branches/2020Q2/multimedia/dav1d/distinfo =================================================================== --- branches/2020Q2/multimedia/dav1d/distinfo (revision 535245) +++ branches/2020Q2/multimedia/dav1d/distinfo (revision 535246) @@ -1,7 +1,7 @@ TIMESTAMP = 1583450213 SHA256 (videolan-dav1d-efd9e5518e0ed5114f8b4579debd7ee6dbede21f_GL0.tar.gz) = f4afcab8460dc805aec60e8430ee89bef25ef6eff6e5971c5064b55ed6c6eb67 SIZE (videolan-dav1d-efd9e5518e0ed5114f8b4579debd7ee6dbede21f_GL0.tar.gz) = 785514 SHA256 (videolan-dav1d-test-data-0b9501d258b50dcf2b86f97214f14f079a1528d0_GL0.tar.gz) = 1982f7494c00314bbd9d62fe3ae182fa5b8aa7104e74728d5291fe315744b758 SIZE (videolan-dav1d-test-data-0b9501d258b50dcf2b86f97214f14f079a1528d0_GL0.tar.gz) = 50232790 -SHA256 (e04227c5f672.patch) = fc0bf961c32f545e5dc1d17ef2f0085b41a1e5fc0fefc7687d10f432c18d907d -SIZE (e04227c5f672.patch) = 1153 +SHA256 (e04227c5f672.diff) = 0ee58a490cbeb5ff9a9fd78442eb749e83f2c005e4d3a433e13f8cfc236d7d6a +SIZE (e04227c5f672.diff) = 534 Index: branches/2020Q2/net/waypipe/Makefile =================================================================== --- branches/2020Q2/net/waypipe/Makefile (revision 535245) +++ branches/2020Q2/net/waypipe/Makefile (revision 535246) @@ -1,53 +1,53 @@ # $FreeBSD$ PORTNAME= waypipe DISTVERSIONPREFIX= v DISTVERSION= 0.6.1 PORTREVISION= 1 CATEGORIES= net PATCH_SITES= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/commit/ -PATCHFILES+= 9f0b9f2e8929.patch:-p1 +PATCHFILES+= 9f0b9f2e8929.diff:-p1 MAINTAINER= jbeich@FreeBSD.org COMMENT= Network transparency with Wayland LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= wayland-protocols>=1.12:graphics/wayland-protocols \ wayland>=1.15:graphics/wayland USES= compiler:c11 localbase:ldflags meson pkgconfig USE_GITLAB= yes GL_SITE= https://gitlab.freedesktop.org GL_ACCOUNT= mstoeckl GL_COMMIT= f78ad85b04ef95daa9a1671aa0375d0e77d19b2f PLIST_FILES= bin/${PORTNAME} OPTIONS_DEFINE= FFMPEG LZ4 MANPAGES OPENGL VAAPI ZSTD OPTIONS_DEFAULT=FFMPEG LZ4 MANPAGES OPENGL VAAPI ZSTD FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_MESON_ENABLED= with_video LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 LZ4_MESON_ENABLED= with_lz4 MANPAGES_BUILD_DEPENDS= scdoc:textproc/scdoc MANPAGES_MESON_ENABLED= man-pages MANPAGES_PLIST_FILES= man/man1/${PORTNAME}.1.gz OPENGL_USES= gl OPENGL_USE= GL=gbm OPENGL_LIB_DEPENDS= libdrm.so:graphics/libdrm OPENGL_MESON_ENABLED= with_dmabuf VAAPI_LIB_DEPENDS= libva.so:multimedia/libva VAAPI_MESON_ENABLED= with_vaapi VAAPI_IMPLIES= FFMPEG ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd ZSTD_MESON_ENABLED= with_zstd .include Index: branches/2020Q2/net/waypipe/distinfo =================================================================== --- branches/2020Q2/net/waypipe/distinfo (revision 535245) +++ branches/2020Q2/net/waypipe/distinfo (revision 535246) @@ -1,5 +1,5 @@ TIMESTAMP = 1566861480 SHA256 (mstoeckl-waypipe-f78ad85b04ef95daa9a1671aa0375d0e77d19b2f_GL0.tar.gz) = 4bbfcc046ebde67e210433ab7efbb2d92cea62d7088fc2a95405caf8d93d5593 SIZE (mstoeckl-waypipe-f78ad85b04ef95daa9a1671aa0375d0e77d19b2f_GL0.tar.gz) = 143440 -SHA256 (9f0b9f2e8929.patch) = 78dcbb8255507a83789bb7188c93cab8c853442c36aa424092ff3678bce042a5 -SIZE (9f0b9f2e8929.patch) = 2774 +SHA256 (9f0b9f2e8929.diff) = 729192f4f8ed77b6f0f1c247fce602711be09c50bc6fe292d16e30621191a7c3 +SIZE (9f0b9f2e8929.diff) = 2201 Index: branches/2020Q2/x11/virtboard/Makefile =================================================================== --- branches/2020Q2/x11/virtboard/Makefile (revision 535245) +++ branches/2020Q2/x11/virtboard/Makefile (revision 535246) @@ -1,37 +1,37 @@ # $FreeBSD$ PORTNAME= virtboard DISTVERSIONPREFIX= v DISTVERSION= 0.0.6 CATEGORIES= x11 PATCH_SITES= ${GL_SITE}/jbeich/${GL_PROJECT}/commit/ -PATCHFILES+= 42e698964e42.patch:-p1 -PATCHFILES+= 86e6915d4920.patch:-p1 +PATCHFILES+= 42e698964e42.diff:-p1 +PATCHFILES+= 86e6915d4920.diff:-p1 MAINTAINER= jbeich@FreeBSD.org COMMENT= Basic keyboard, blazing the path of modern Wayland keyboards LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.14:graphics/wayland-protocols LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ libpng.so:graphics/png \ libwayland-client.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas USES= compiler:c11 gettext-tools gnome meson pkgconfig xorg USE_GITLAB= yes USE_GNOME= cairo glib20 USE_XORG= pixman GL_SITE= https://source.puri.sm GL_ACCOUNT= Librem5 GL_COMMIT= 1d30b07870bf6138395d6529ab496e321b8b3938 PLIST_FILES= bin/${PORTNAME} \ share/applications/sm.puri.Virtboard.desktop \ share/dbus-1/interfaces/sm.puri.OSK0.xml .include Index: branches/2020Q2/x11/virtboard/distinfo =================================================================== --- branches/2020Q2/x11/virtboard/distinfo (revision 535245) +++ branches/2020Q2/x11/virtboard/distinfo (revision 535246) @@ -1,7 +1,7 @@ TIMESTAMP = 1575000289 SHA256 (Librem5-virtboard-1d30b07870bf6138395d6529ab496e321b8b3938_GL0.tar.gz) = 1ebfe7253ca0320efe15781c0878393cd9b2a3113b0ec05c4e48e039a685503d SIZE (Librem5-virtboard-1d30b07870bf6138395d6529ab496e321b8b3938_GL0.tar.gz) = 128682 -SHA256 (42e698964e42.patch) = fe40a73d1d6019ed5b57d3f0054f108387304cc934a3289bb51267cbc04f71a4 -SIZE (42e698964e42.patch) = 832 -SHA256 (86e6915d4920.patch) = 1257a63990de236e3c29bc2eccb31d0658d25aadd87a6c1c086e2e839ab6fd04 -SIZE (86e6915d4920.patch) = 1696 +SHA256 (42e698964e42.diff) = 5f00bc9f2555f7fa2c6abefb669a94482480fde7d1b5efa73bf3edd4a7c6116e +SIZE (42e698964e42.diff) = 456 +SHA256 (86e6915d4920.diff) = bfdd80dcda3b5b2c900b70a00668913933d6f8f3523281b665afc308ef603a1d +SIZE (86e6915d4920.diff) = 1160 Index: branches/2020Q2/x11-servers/xwayland-devel/Makefile =================================================================== --- branches/2020Q2/x11-servers/xwayland-devel/Makefile (revision 535245) +++ branches/2020Q2/x11-servers/xwayland-devel/Makefile (revision 535246) @@ -1,73 +1,73 @@ # $FreeBSD$ PORTNAME= xwayland DISTVERSIONPREFIX= xorg-server- DISTVERSION= 1.20.0-626 DISTVERSIONSUFFIX= -g${GL_COMMIT:C/(.{12}).*/\1/} PORTREVISION= 1 CATEGORIES= x11-servers PKGNAMESUFFIX= -devel PATCH_SITES= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/commit/ -PATCHFILES+= 71749de24509.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/merge_requests/393 -PATCHFILES+= 1e897704c822.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/merge_requests/393 -PATCHFILES+= 83cda3ce3195.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/merge_requests/393 +PATCHFILES+= 71749de24509.diff:-p1 # https://gitlab.freedesktop.org/xorg/xserver/merge_requests/393 +PATCHFILES+= 1e897704c822.diff:-p1 # https://gitlab.freedesktop.org/xorg/xserver/merge_requests/393 +PATCHFILES+= 83cda3ce3195.diff:-p1 # https://gitlab.freedesktop.org/xorg/xserver/merge_requests/393 MAINTAINER= jbeich@FreeBSD.org COMMENT= X11 server as Wayland client (development snapshot) LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ ${LOCALBASE}/include/GL/internal/dri_interface.h:graphics/mesa-dri \ wayland-protocols>=1.18:graphics/wayland-protocols LIB_DEPENDS= libdrm.so:graphics/libdrm \ libepoxy.so:graphics/libepoxy \ libwayland-client.so:graphics/wayland RUN_DEPENDS= xkbcomp:x11/xkbcomp \ xkeyboard-config>0:x11/xkeyboard-config CONFLICTS_INSTALL= ${PORTNAME} USES= compiler:c11 gl meson pkgconfig xorg USE_GITLAB= yes USE_GL= gbm gl USE_XORG= pixman xau xdmcp xfont2 xkbfile xshmfence xtrans GL_SITE= https://gitlab.freedesktop.org GL_ACCOUNT= xorg GL_PROJECT= xserver GL_COMMIT= 5e91587302e85fd6f0e8d5ffbe30182e18c6913f MESON_ARGS= -Dxwayland=true \ -Dxorg=false \ -Dxnest=false \ -Dxvfb=false \ -Dudev=false \ -Dudev_kms=false \ -Ddefault_font_path="${DEFAULT_FONTPATH_LIST:ts,}" PLIST_FILES= bin/Xwayland # Keep in sync with xorg-server FONTPATH_ROOT?= ${LOCALBASE}/share/fonts FONTPATHD?= ${PREFIX}/etc/X11/fontpath.d DEFAULT_FONTPATH_LIST= \ ${FONTPATH_ROOT}/misc/ \ ${FONTPATH_ROOT}/TTF/ \ ${FONTPATH_ROOT}/OTF/ \ ${FONTPATH_ROOT}/Type1/ \ ${FONTPATH_ROOT}/100dpi/ \ ${FONTPATH_ROOT}/75dpi/ \ catalogue:${FONTPATHD} OPTIONS_DEFINE= NVIDIA NVIDIA_DESC= EGLStream support for glamor on Xwayland NVIDIA_BUILD_DEPENDS= egl-wayland>0:graphics/egl-wayland NVIDIA_MESON_TRUE= xwayland_eglstream do-install: # Wayland compositors only use the binary ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/hw/xwayland/Xwayland \ ${STAGEDIR}${PREFIX}/bin .include Index: branches/2020Q2/x11-servers/xwayland-devel/distinfo =================================================================== --- branches/2020Q2/x11-servers/xwayland-devel/distinfo (revision 535245) +++ branches/2020Q2/x11-servers/xwayland-devel/distinfo (revision 535246) @@ -1,9 +1,9 @@ TIMESTAMP = 1584441922 SHA256 (xorg-xserver-5e91587302e85fd6f0e8d5ffbe30182e18c6913f_GL0.tar.gz) = 662edf94da493f40604635a2501dee2e3812d261efff2845a9a83598d9ba287b SIZE (xorg-xserver-5e91587302e85fd6f0e8d5ffbe30182e18c6913f_GL0.tar.gz) = 5109416 -SHA256 (71749de24509.patch) = 9b51d61335f128c5fa8f477a647dc68c3088910a77564b438b19991aacaaa5a4 -SIZE (71749de24509.patch) = 1392 -SHA256 (1e897704c822.patch) = bd0ff1fdc6dd89df0e4589d5adba2e164b6426ba31422f7280ee73cc06b39d31 -SIZE (1e897704c822.patch) = 969 -SHA256 (83cda3ce3195.patch) = 38443a8c5011ebebcbce92200264a3b48ebcf3576b2cd32656995e23ab3675ee -SIZE (83cda3ce3195.patch) = 4513 +SHA256 (71749de24509.diff) = 03735bd385487becee29ce4aea7795007da0fc08db6477018862653e4df575ac +SIZE (71749de24509.diff) = 585 +SHA256 (1e897704c822.diff) = 74142d8b7046ee3741e063bddc161449a26300203e497b9b421d2361bee35557 +SIZE (1e897704c822.diff) = 550 +SHA256 (83cda3ce3195.diff) = 93a6c9edcff5d3438fa6d9aeeb128cd5c891a158cb0c22c772217846f9404e1b +SIZE (83cda3ce3195.diff) = 3340 Index: branches/2020Q2 =================================================================== --- branches/2020Q2 (revision 535245) +++ branches/2020Q2 (revision 535246) Property changes on: branches/2020Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r534935