API tools faq
paste
Advertisement
Guest User

Untitled

a guest
May 8th, 2018
218
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 8.61 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/PKGBUILD b/PKGBUILD
  2. index ca68ff5..26a4109 100644
  3. --- a/PKGBUILD
  4. +++ b/PKGBUILD
  5. @@ -16,7 +16,7 @@ _use_wayland=0 # Build Wayland NOTE: extremely experimental and don't
  6. ## -- Package and components information -- ##
  7. ##############################################
  8. pkgname=chromium-dev
  9. -pkgver=67.0.3396.10
  10. +pkgver=68.0.3418.2
  11. pkgrel=1
  12. pkgdesc="The open-source project behind Google Chrome (Dev Channel)"
  13. arch=('x86_64')
  14. @@ -78,26 +78,26 @@ source=( #"https://gsdview.appspot.com/chromium-browser-official/chromium-${pkgv
  15. 'git+https://github.com/foutrelis/chromium-launcher.git'
  16. 'chromium-dev.svg'
  17. # Patch form Gentoo
  18. - 'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-FORTIFY_SOURCE-r2.patch'
  19. + 'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-compiler-r1.patch'
  20. 'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-webrtc-r0.patch'
  21. - 'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-clang-r2.patch'
  22. 'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-ffmpeg-r1.patch'
  23. -
  24. # Misc Patches
  25. 'chromium-ffmpeg-clang.patch'
  26. 'chromium-intel-vaapi_r18.diff.base64::https://chromium-review.googlesource.com/changes/532294/revisions/18/patch?download'
  27. # Patch from crbug (chromium bugtracker) or Arch chromium package
  28. 'chromium-widevine-r1.patch'
  29. 'chromium-skia-harmony.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/chromium-skia-harmony.patch?h=packages/chromium'
  30. + 'fix_undeclared_char_bit.diff.base64::https://chromium-review.googlesource.com/changes/1043748/revisions/2/patch?download'
  31. + 'fix_undeclared_surface.diff.base64::https://chromium-review.googlesource.com/changes/1040847/revisions/3/patch?download'
  32. + 'fix_no_matching_find.diff.base64::https://chromium-review.googlesource.com/changes/1043749/revisions/2/patch?download'
  33. )
  34. sha256sums=( #"$(curl -sL https://gsdview.appspot.com/chromium-browser-official/chromium-${pkgver}.tar.xz.hashes | grep sha256 | cut -d ' ' -f3)"
  35. "$(curl -sL https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${pkgver}.tar.xz.hashes | grep sha256 | cut -d ' ' -f3)"
  36. 'SKIP'
  37. 'dd2b5c4191e468972b5ea8ddb4fa2e2fa3c2c94c79fc06645d0efc0e63ce7ee1'
  38. # Patch form Gentoo
  39. - 'fa3f703d599051135c5be24b81dfcb23190bb282db73121337ac76bc9638e8a5'
  40. + 'SKIP'
  41. 'bcb2f4588cf5dcf75cde855c7431e94fdcc34bdd68b876a90f65ab9938594562'
  42. - '4495e8b29dae242c79ffe4beefc5171eb3c7aacb7e9aebfd2d4d69b9d8c958d3'
  43. 'aa885330bc4180b78d915f9dfdfc3210038a0acab7b16735ea9828ab6a633bde'
  44. # Misc Patches
  45. '16741344288d200fadf74546855e00aa204122e744b4811a36155efd5537bd95'
  46. @@ -106,6 +106,9 @@ sha256sums=( #"$(curl -sL https://gsdview.appspot.com/chromium-browser-official/
  47. '0d537830944814fe0854f834b5dc41dc5fc2428f77b2ad61d4a5e76b0fe99880'
  48. # 'd4a99239701256edb37ef3a5504fa87ca2219349834cbf59b9fe42bf7ac496d8'
  49. 'feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3'
  50. + 'SKIP'
  51. + 'SKIP'
  52. + 'SKIP'
  53. )
  54. install=chromium-dev.install
  55.  
  56. @@ -138,8 +141,10 @@ _keeplibs=(
  57. 'courgette/third_party'
  58. 'native_client/src/third_party/dlmalloc'
  59. 'native_client_sdk/src/libraries/third_party/newlib-extras'
  60. + 'net/third_party/http2'
  61. 'net/third_party/mozilla_security_manager'
  62. 'net/third_party/nss'
  63. + 'net/third_party/spdy'
  64. 'third_party/WebKit'
  65. 'third_party/analytics'
  66. 'third_party/angle'
  67. @@ -203,6 +208,7 @@ _keeplibs=(
  68. 'third_party/libphonenumber'
  69. 'third_party/libsecret'
  70. 'third_party/libsrtp'
  71. + 'third_party/libsync'
  72. 'third_party/libudev'
  73. 'third_party/libvpx'
  74. 'third_party/libvpx/source/libvpx/third_party/x86inc'
  75. @@ -220,6 +226,7 @@ _keeplibs=(
  76. 'third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2'
  77. 'third_party/openmax_dl'
  78. 'third_party/ots'
  79. + 'third_party/perfetto'
  80. 'third_party/pdfium'
  81. 'third_party/pdfium/third_party/agg23'
  82. 'third_party/pdfium/third_party/base'
  83. @@ -241,6 +248,7 @@ _keeplibs=(
  84. 'third_party/shaderc'
  85. 'third_party/skia'
  86. 'third_party/skia/third_party/gif'
  87. + 'third_party/skia/third_party/skcms'
  88. 'third_party/skia/third_party/spirv-headers'
  89. 'third_party/skia/third_party/spirv-tools'
  90. 'third_party/skia/third_party/vulkan'
  91. @@ -263,11 +271,11 @@ _keeplibs=(
  92. 'third_party/widevine'
  93. 'third_party/woff2'
  94. 'third_party/zlib/google'
  95. -
  96. 'url/third_party/mozilla'
  97. 'v8/src/third_party/valgrind'
  98. 'v8/src/third_party/utf8-decoder'
  99. 'v8/third_party/inspector_protocol'
  100. + 'v8/third_party/antlr4'
  101.  
  102. # gyp -> gn leftovers
  103. 'base/third_party/libevent'
  104. @@ -380,10 +388,14 @@ elif [ "${_use_bundled_clang}" = "1" ]; then
  105. _flags+=(
  106. 'clang_use_chrome_plugins=true'
  107. )
  108. - _clang_path="${BUILDDIR}/${pkgname}/src/chromium-${pkgver}/third_party/llvm-build/Release+Asserts/bin/"
  109. # Bundled clang not like this.
  110. CXXFLAGS="${CXXFLAGS//-fno-plt/}"
  111. CFLAGS="${CFLAGS//-fno-plt/}"
  112. +
  113. + if [ ! -f "${BUILDDIR}/PKGBUILD" ]; then
  114. + _builddir="/${pkgname}"
  115. + fi
  116. + _clang_path="${BUILDDIR}${_builddir}/src/chromium-${pkgver}/third_party/llvm-build/Release+Asserts/bin/"
  117. fi
  118.  
  119. export CC="${_clang_path}clang"
  120. @@ -410,15 +422,23 @@ prepare() {
  121.  
  122. msg2 "Patching the sources"
  123. # Patch sources from Gentoo.
  124. - patch -p1 -i "${srcdir}/chromium-FORTIFY_SOURCE-r2.patch"
  125. + patch -p1 -i "${srcdir}/chromium-compiler-r1.patch"
  126. patch -p1 -i "${srcdir}/chromium-webrtc-r0.patch"
  127. - patch -p1 -i "${srcdir}/chromium-clang-r2.patch"
  128. patch -p1 -i "${srcdir}/chromium-ffmpeg-r1.patch"
  129.  
  130. # Misc patches
  131.  
  132. # Pats to chromium dev's about why always they forget add/remove missing build rules.
  133. - # Not this time
  134. + # Not this time :)
  135. +
  136. + # https://bugs.chromium.org/p/chromium/issues/detail?id=819294#c10
  137. + base64 -d "${srcdir}/fix_undeclared_char_bit.diff.base64" | patch -p1 -i -
  138. +
  139. + # https://bugs.chromium.org/p/chromium/issues/detail?id=819294#c12
  140. + base64 -d "${srcdir}/fix_no_matching_find.diff.base64" | patch -p1 -i -
  141. +
  142. + # https://chromium-review.googlesource.com/c/chromium/src/+/1040847
  143. + base64 -d "${srcdir}/fix_undeclared_surface.diff.base64" | patch -p1 -i -
  144.  
  145. # https://crbug.com/710701
  146. _chrome_build_hash=$(curl -s "https://chromium.googlesource.com/chromium/src.git/+/${pkgver}?format=TEXT")
  147. @@ -445,6 +465,9 @@ prepare() {
  148. -i third_party/ffmpeg/chromium/scripts/generate_gn.py
  149. export PNACLPYTHON=/usr/bin/python2
  150.  
  151. + (mkdir -p "${srcdir}/python"; cd ${srcdir}/python; ln -s /usr/bin/python2 python)
  152. + export PATH="${srcdir}/python:${PATH}"
  153. +
  154. # Setup vulkan
  155. export VULKAN_SDK="/usr"
  156. sed 's|/x86_64-linux-gnu||' -i gpu/vulkan/BUILD.gn
  157. @@ -470,7 +493,9 @@ prepare() {
  158. cat "${srcdir}/chromium-ffmpeg-clang.patch" | sed "s|__CLANG_PATH__|${_clang_path}|g" | patch -p1 -i -
  159. fi
  160. # use system opus in bundled ffmpeg.
  161. - sed -e "s|CHROMIUM_ROOT_DIR, 'third_party/opus/src/include'|'/usr/include/opus'|g" -i third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
  162. + sed -e "s|I' + os.path.join(CHROMIUM_ROOT_DIR,|I' + os.path.join\(|g" \
  163. + -e 's|third_party/opus/src/include|/usr/include/opus|g' \
  164. + -i third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
  165.  
  166. # Remove most bundled libraries. Some are still needed.
  167. msg2 "Removing unnecessary components to save space."
  168. @@ -482,11 +507,12 @@ prepare() {
  169. # Use the file at run time instead of effectively compiling it in.
  170. sed 's|//third_party/usb_ids/usb.ids|/usr/share/hwdata/usb.ids|g' -i device/usb/BUILD.gn
  171.  
  172. - msg2 "Setup NaCl/PNaCl SDK: Download and install NaCl/PNaCl toolchains"
  173. + msg2 "Setup NaCl/PNaCl SDK: Download and install toolchains"
  174. build/download_nacl_toolchains.py --packages nacl_x86_newlib,pnacl_newlib,pnacl_translator sync --extract
  175.  
  176. msg2 "Download external build components from google"
  177. tools/clang/scripts/update.py --without-android
  178. +
  179. }
  180.  
  181. build() {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!