From c031fd115a267199aa9cd9ee7d4a790ac6d27c03 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Mon, 11 May 2020 19:50:28 +0000 Subject: [PATCH] Convert GitLab patches to simple diffs GitLab unlike GitHub keeps the footer from git-format-patch(1) which frequently changes on Git version upgrades. So, switch to git-diff(1) which lacks header/footer. Approved by: x11 (zeising via Gitter) MFH: 2020Q2 (avoid bustage over time due to upstream infra upgrades) Differential Revision: https://reviews.freebsd.org/D24810 --- graphics/waffle/Makefile | 2 +- graphics/waffle/distinfo | 4 ++-- graphics/wayland/Makefile | 8 ++++---- graphics/wayland/distinfo | 16 ++++++++-------- multimedia/dav1d/Makefile | 2 +- multimedia/dav1d/distinfo | 4 ++-- net/waypipe/Makefile | 2 +- net/waypipe/distinfo | 4 ++-- x11-servers/xwayland-devel/Makefile | 6 +++--- x11-servers/xwayland-devel/distinfo | 12 ++++++------ x11-wm/twm/Makefile | 2 +- x11-wm/twm/distinfo | 4 ++-- x11/virtboard/Makefile | 4 ++-- x11/virtboard/distinfo | 8 ++++---- 14 files changed, 39 insertions(+), 39 deletions(-) diff --git a/graphics/waffle/Makefile b/graphics/waffle/Makefile index 8e12aa86d0e3..89aa7074f6e9 100644 --- a/graphics/waffle/Makefile +++ b/graphics/waffle/Makefile @@ -7,7 +7,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 diff --git a/graphics/waffle/distinfo b/graphics/waffle/distinfo index d75368790726..465978979a88 100644 --- a/graphics/waffle/distinfo +++ b/graphics/waffle/distinfo @@ -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 diff --git a/graphics/wayland/Makefile b/graphics/wayland/Makefile index 5747ec83dba5..2e5124a625dd 100644 --- a/graphics/wayland/Makefile +++ b/graphics/wayland/Makefile @@ -8,10 +8,10 @@ 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" diff --git a/graphics/wayland/distinfo b/graphics/wayland/distinfo index 13bafc019af2..e0b2f40976c4 100644 --- a/graphics/wayland/distinfo +++ b/graphics/wayland/distinfo @@ -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 diff --git a/multimedia/dav1d/Makefile b/multimedia/dav1d/Makefile index dc3753c0c72a..2ddfc9344a89 100644 --- a/multimedia/dav1d/Makefile +++ b/multimedia/dav1d/Makefile @@ -6,7 +6,7 @@ PORTREVISION= 1 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 diff --git a/multimedia/dav1d/distinfo b/multimedia/dav1d/distinfo index 35ecadbd5c33..e07babb224ed 100644 --- a/multimedia/dav1d/distinfo +++ b/multimedia/dav1d/distinfo @@ -3,5 +3,5 @@ SHA256 (videolan-dav1d-efd9e5518e0ed5114f8b4579debd7ee6dbede21f_GL0.tar.gz) = f4 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 diff --git a/net/waypipe/Makefile b/net/waypipe/Makefile index 6cecacd06f49..d7146c1a379f 100644 --- a/net/waypipe/Makefile +++ b/net/waypipe/Makefile @@ -7,7 +7,7 @@ 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 diff --git a/net/waypipe/distinfo b/net/waypipe/distinfo index 059181e2c224..cdcd6ab3c814 100644 --- a/net/waypipe/distinfo +++ b/net/waypipe/distinfo @@ -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 diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile index 44c2307c2765..6465602e5679 100644 --- a/x11-servers/xwayland-devel/Makefile +++ b/x11-servers/xwayland-devel/Makefile @@ -9,9 +9,9 @@ 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) diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo index d2b4a7ba4f53..ca28825589a2 100644 --- a/x11-servers/xwayland-devel/distinfo +++ b/x11-servers/xwayland-devel/distinfo @@ -1,9 +1,9 @@ TIMESTAMP = 1587980533 SHA256 (xorg-xserver-785e59060c00129e47da6c0877604a56d7e0e32f_GL0.tar.gz) = 5b51c08f2dfdbf5e266500421976615b82daa7cd7311263c72a5445038154358 SIZE (xorg-xserver-785e59060c00129e47da6c0877604a56d7e0e32f_GL0.tar.gz) = 5108563 -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 diff --git a/x11-wm/twm/Makefile b/x11-wm/twm/Makefile index eb67fcbdfc92..6ffdf4646732 100644 --- a/x11-wm/twm/Makefile +++ b/x11-wm/twm/Makefile @@ -6,7 +6,7 @@ PORTREVISION= 1 CATEGORIES= x11-wm PATCH_SITES= https://gitlab.freedesktop.org/xorg/app/${PORTNAME}/commit/ -PATCHFILES+= e2a533d16e04.patch:-p1 +PATCHFILES+= e2a533d16e04.diff:-p1 MAINTAINER= x11@FreeBSD.org COMMENT= Tab Window Manager for the X Window System diff --git a/x11-wm/twm/distinfo b/x11-wm/twm/distinfo index 783aaba32df2..c67dac9a6fe9 100644 --- a/x11-wm/twm/distinfo +++ b/x11-wm/twm/distinfo @@ -1,5 +1,5 @@ TIMESTAMP = 1588446762 SHA256 (xorg/app/twm-1.0.10.tar.bz2) = 6449eadca16ce0f0d900605b0cc020b95f40619261b7beccfb46bcc1836445d7 SIZE (xorg/app/twm-1.0.10.tar.bz2) = 287094 -SHA256 (xorg/app/e2a533d16e04.patch) = cfc521776662a4ef1363b39be900b7c7e3c37be88aa8808d53633203910e81fd -SIZE (xorg/app/e2a533d16e04.patch) = 652 +SHA256 (xorg/app/e2a533d16e04.diff) = 88b3e5165c42f8f134cff4d48b7c7b657a87e9bfbe6b722223641147a19e5b66 +SIZE (xorg/app/e2a533d16e04.diff) = 439 diff --git a/x11/virtboard/Makefile b/x11/virtboard/Makefile index 5c81a1f1b6c0..da3c7e4dd697 100644 --- a/x11/virtboard/Makefile +++ b/x11/virtboard/Makefile @@ -6,8 +6,8 @@ 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 diff --git a/x11/virtboard/distinfo b/x11/virtboard/distinfo index ce0b45de9988..c1aa0a5cde6a 100644 --- a/x11/virtboard/distinfo +++ b/x11/virtboard/distinfo @@ -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