From fe5ca6e6869b458e7e4ee58b832664c7c798d962 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 16 Jul 2020 18:04:19 -0400 Subject: [PATCH] local copy of xcb-proto for the python bits --- .gitignore | 1 + chromium.spec | 7 ++++++- sources | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e0cf9392..692d52e8 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /Ahem.ttf /node-v8.9.1-linux-x64.tar.gz /node-v10.15.3-linux-x64.tar.gz +/xcb-proto-1.14.tar.xz diff --git a/chromium.spec b/chromium.spec index 2010f384..30af4420 100644 --- a/chromium.spec +++ b/chromium.spec @@ -340,6 +340,8 @@ Source18: GardinerModCat.ttf %if 0%{?rhel} == 7 Source19: https://nodejs.org/dist/v10.15.3/node-v10.15.3-linux-x64.tar.gz %endif +# Bring xcb-proto with us (might need more than python on EPEL?) +Source20: https://www.x.org/releases/individual/proto/xcb-proto-1.14.tar.xz # We can assume gcc and binutils. BuildRequires: gcc-c++ @@ -1407,6 +1409,9 @@ sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"Fedora Project"/' $FILE # Turning the buildsystem up to 11. ulimit -n 4096 +# unpack a local copy of the xcb-proto bits +tar xf %{SOURCE20} + %if 0%{?rhel} == 7 . /opt/rh/devtoolset-%{dts_version}/enable %endif @@ -1416,7 +1421,7 @@ ulimit -n 4096 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /') %endif -export PYTHONPATH="../../third_party/pyjson5/src:../../third_party/catapult/third_party/google-endpoints" +export PYTHONPATH="../../third_party/pyjson5/src:../../third_party/catapult/third_party/google-endpoints:../../xcb-proto-1.14" echo # Now do the full browser diff --git a/sources b/sources index 828c4994..34fff2d3 100644 --- a/sources +++ b/sources @@ -18,3 +18,4 @@ SHA512 (Tinos-Regular.ttf) = 58085c5dac6d067d60ba2ab3220c4a0cc1efcf279cadfcfb874 SHA512 (Ahem.ttf) = aeb64b10ab9c87860714cb60b4900254b13dc52c51319256a1a3722c882026ab7c616bf628fbc2fe14e38a6003f3a481af60b52a7ed62071d28ddaf428e4e3fd SHA512 (node-v10.15.3-linux-x64.tar.gz) = 5eb544ef706562981340a82acc79e2162c6a3e4049b4a95f69ce353ee5b0f929c60b1fc457e8249b3fb0696f82fc28c5f543f5947db19fae4e9d5c21b906bb20 SHA512 (chromium-84.0.4147.89-clean.tar.xz) = 4daa866c086142c496a924d6630da202195d7db2853987b2e81c828ffccfe281499cf85562d2ea48f1304f2f4de2fef0a385e7979e6ad46323b4ab34fa2f3f8b +SHA512 (xcb-proto-1.14.tar.xz) = de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690