Date: Friday, October 14, 2016 @ 05:35:15 Author: bpiotrowski Revision: 278812
Make 54 build on x86_64 Added: chromium/trunk/chromium-53.0.2785.92-last-commit-position.patch Modified: chromium/trunk/PKGBUILD.54 --------------------------------------------------+ PKGBUILD.54 | 167 +++++++++++++++++++-- chromium-53.0.2785.92-last-commit-position.patch | 121 +++++++++++++++ 2 files changed, 280 insertions(+), 8 deletions(-) Modified: PKGBUILD.54 =================================================================== --- PKGBUILD.54 2016-10-14 04:42:06 UTC (rev 278811) +++ PKGBUILD.54 2016-10-14 05:35:15 UTC (rev 278812) @@ -17,7 +17,9 @@ 'speech-dispatcher' 'pciutils' 'libpulse' 'harfbuzz' 'libsecret' 'libvpx' 'perl' 'perl-file-basedir' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('python2' 'gperf' 'yasm' 'mesa' 'ninja' 'clang') +makedepends=('python2' 'gperf' 'yasm' 'mesa' 'ninja' 'python2-jinja' + 'python2-markupsafe' 'python2-ply' 'python2-beautifulsoup4' + 'python2-html5lib') optdepends=('kdebase-kdialog: needed for file dialogs in KDE' 'gnome-keyring: for storing passwords in GNOME keyring' 'kwallet: for storing passwords in KWallet') @@ -27,11 +29,13 @@ chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz chromium.desktop chromium-52.0.2743.116-unset-madv_free.patch + chromium-53.0.2785.92-last-commit-position.patch chromium-widevine.patch) sha256sums=('df89c284b0109566acc6a5a1a84d94a5ab0509cc3a86a31299a50328991edcde' '8b01fb4efe58146279858a754d90b49e5a38c9a0b36a1f84cbb7d12f92b84c28' '028a748a5c275de9b8f776f97909f999a8583a4b77fd1cd600b4fc5c0c3e91e9' '3b3aa9e28f29e6f539ed1c7832e79463b13128863a02e9c6fecd16c30d61c227' + '9502a4d7e825a21ae63cced5715e5f06d983033b623cd41d94d1e38a70f29310' 'd6fdcb922e5a7fbe15759d39ccc8ea4225821c44d98054ce0f23f9d1f00c9808') # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) @@ -46,7 +50,7 @@ # instructions on how to build the toolchain from source don't work that well # (at least not from within the Chromium 39 source tree). # https://sites.google.com/a/chromium.org/dev/nativeclient/pnacl/building-pnacl-components-for-distribution-packagers -_build_nacl=1 +_build_nacl=0 _nacl="false" if [[ $CARCH == i686 ]]; then _build_nacl=0 @@ -54,7 +58,8 @@ fi prepare() { - _system_libs=( + # These are few system libraries that can be safely used + local _system_libs=( 'bzip2' 'flac' 'harfbuzz' @@ -63,16 +68,150 @@ 'libjpeg' 'libpng' 'libvpx' + 'libwebp' + 'libxml' + 'libxslt' + 're2' 'snappy' 'yasm' 'zlib' ) + # List of required bundled libraries + local _keeplibs=( + 'base/third_party/dmg_fp' + 'base/third_party/dynamic_annotations' + 'base/third_party/icu' + 'base/third_party/libevent' + 'base/third_party/nspr' + 'base/third_party/superfasthash' + 'base/third_party/symbolize' + 'base/third_party/valgrind' + 'base/third_party/xdg_mime' + 'base/third_party/xdg_user_dirs' + 'breakpad/src/third_party/curl' + 'buildtools/third_party/libc++' + 'buildtools/third_party/libc++abi' + 'chrome/third_party/mozilla_security_manager' + 'courgette/third_party' + 'native_client/src/third_party/dlmalloc' + 'native_client/src/third_party/valgrind' + 'net/third_party/mozilla_security_manager' + 'net/third_party/nss' + 'third_party/WebKit' + 'third_party/adobe' + 'third_party/analytics' + 'third_party/angle' + 'third_party/angle/src/common/third_party/numerics' + 'third_party/angle/src/third_party/compiler' + 'third_party/angle/src/third_party/libXNVCtrl' + 'third_party/angle/src/third_party/murmurhash' + 'third_party/angle/src/third_party/trace_event' + 'third_party/boringssl' + 'third_party/brotli' + 'third_party/cacheinvalidation' + 'third_party/catapult' + 'third_party/catapult/third_party/polymer' + 'third_party/catapult/third_party/py_vulcanize' + 'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' + 'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' + 'third_party/catapult/tracing/third_party/d3' + 'third_party/catapult/tracing/third_party/gl-matrix' + 'third_party/catapult/tracing/third_party/jszip' + 'third_party/catapult/tracing/third_party/mannwhitneyu' + 'third_party/ced' + 'third_party/cld_2' + 'third_party/cld_3' + 'third_party/cros_system_api' + 'third_party/cython/python_flags.py' + 'third_party/devscripts' + 'third_party/dom_distiller_js' + 'third_party/ffmpeg' + 'third_party/fips181' + 'third_party/flac' + 'third_party/flatbuffers' + 'third_party/flot' + 'third_party/google_input_tools' + 'third_party/google_input_tools/third_party/closure_library' + 'third_party/google_input_tools/third_party/closure_library/third_party/closure' + 'third_party/harfbuzz-ng' + 'third_party/hunspell' + 'third_party/iccjpeg' + 'third_party/icu' + 'third_party/jstemplate' + 'third_party/khronos' + 'third_party/leveldatabase' + 'third_party/libXNVCtrl' + 'third_party/libaddressinput' + 'third_party/libjingle' + 'third_party/libjpeg_turbo' + 'third_party/libphonenumber' + 'third_party/libpng' + 'third_party/libsecret' + 'third_party/libsrtp' + 'third_party/libudev' + 'third_party/libusb' + 'third_party/libvpx' + 'third_party/libvpx/source/libvpx/third_party/x86inc' + 'third_party/libwebm' + 'third_party/libwebp' + 'third_party/libxml' + 'third_party/libxml/chromium' + 'third_party/libxslt' + 'third_party/libyuv' + 'third_party/lss' + 'third_party/lzma_sdk' + 'third_party/mesa' + 'third_party/mesa' + 'third_party/modp_b64' + 'third_party/mt19937ar' + 'third_party/openh264' + 'third_party/openmax_dl' + 'third_party/opus' + 'third_party/ots' + 'third_party/pdfium' + 'third_party/pdfium/third_party/agg23' + 'third_party/pdfium/third_party/base' + 'third_party/pdfium/third_party/bigint' + 'third_party/pdfium/third_party/freetype' + 'third_party/pdfium/third_party/lcms2-2.6' + 'third_party/pdfium/third_party/libjpeg' + 'third_party/pdfium/third_party/libopenjpeg20' + 'third_party/pdfium/third_party/libpng16' + 'third_party/pdfium/third_party/libtiff' + 'third_party/pdfium/third_party/zlib_v128' + 'third_party/polymer' + 'third_party/protobuf' + 'third_party/protobuf/third_party/six' + 'third_party/protobuf/third_party/six' + 'third_party/qcms' + 'third_party/re2' + 'third_party/sfntly' + 'third_party/skia' + 'third_party/smhasher' + 'third_party/snappy' + 'third_party/speech-dispatcher' + 'third_party/sqlite' + 'third_party/tcmalloc' + 'third_party/usb_ids' + 'third_party/usrsctp' + 'third_party/web-animations-js' + 'third_party/webdriver' + 'third_party/webrtc' + 'third_party/widevine' + 'third_party/woff2' + 'third_party/x86inc' + 'third_party/xdg-utils' + 'third_party/yasm' + 'third_party/yasm/run_yasm.py' + 'third_party/zlib' + 'third_party/zlib/google' + 'url/third_party/mozilla' + 'v8/src/third_party/valgrind' + ) + cd "$srcdir/$pkgname-$pkgver" - # https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/9JX1N2nf4PU/discussion - touch chrome/test/data/webui/i18n_process_css_test.html - # Enable support for the Widevine CDM plugin # libwidevinecdm.so is not included, but can be copied over from Chrome # (Version string doesn't seem to matter so let's go with "Pinkie Pie") @@ -83,6 +222,9 @@ # https://bugzilla.redhat.com/show_bug.cgi?id=1361157 patch -Np1 -i ../chromium-52.0.2743.116-unset-madv_free.patch + # Disable last_commit_position as we don't build from git repository + patch -Np1 -i ../chromium-53.0.2785.92-last-commit-position.patch + # Use Python 2 find . -name '*.py' -exec sed -i -r 's|/usr/bin/python$|&2|g' {} + @@ -98,9 +240,18 @@ #python2 tools/clang/scripts/update.py fi - # Use system libraries - python2 build/linux/unbundle/replace_gn_files.py --system-libraries ${_use_system[@]} + # Remove bundled and switch to system libraries (where possible) + python2 build/linux/unbundle/remove_bundled_libraries.py \ + --do-remove "${_keeplibs[@]}" + python2 build/linux/unbundle/replace_gn_files.py \ + --system-libraries "${_use_system[@]}" + # Another inexplicable hacks + rm -rf third_party/{jinja2,markupsafe,ply} + ln -s /usr/lib/python2.7/site-packages/jinja2 third_party/jinja2 + ln -s /usr/lib/python2.7/site-packages/markupsafe third_party/markupsafe + ln -s /usr/lib/python2.7/site-packages/ply third_party/ply + # Use the file at run time instead of effectively compiling it in. sed 's|//third_party/usb_ids/usb.ids|/usr/share/hwdata/usb.ids|g' -i device/usb/BUILD.gn } Added: chromium-53.0.2785.92-last-commit-position.patch =================================================================== --- chromium-53.0.2785.92-last-commit-position.patch (rev 0) +++ chromium-53.0.2785.92-last-commit-position.patch 2016-10-14 05:35:15 UTC (rev 278812) @@ -0,0 +1,121 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'> +<head> +<title>rpms/chromium.git - rpms/chromium</title> +<meta name='generator' content='cgit v0.12'/> +<meta name='robots' content='index, nofollow'/> +<link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/> +<link rel='shortcut icon' href='/favicon.ico'/> +<link rel='alternate' title='Atom feed' href='http://pkgs.fedoraproject.org/cgit/rpms/chromium.git/atom/chromium-53.0.2785.92-last-commit-position.patch?h=master' type='application/atom+xml'/> +<link rel='vcs-git' href='git://pkgs.fedoraproject.org/rpms/chromium.git' title='rpms/chromium.git Git repository'/> +<link rel='vcs-git' href='ssh://pkgs.fedoraproject.org/rpms/chromium.git' title='rpms/chromium.git Git repository'/> +<link rel='vcs-git' href='http://pkgs.fedoraproject.org/git/rpms/chromium.git' title='rpms/chromium.git Git repository'/> +</head> +<body> +<script src="https://apps.fedoraproject.org/fedmenu/js/jquery-1.11.2.min.js"></script> +<script src="https://apps.fedoraproject.org/fedmenu/js/fedmenu.js"></script> + +<script> + var base = 'https://apps.fedoraproject.org/'; + var tokens = window.location.href.split('/'); + var repo = null; + if (tokens.length > 4 && tokens[4] != '') { + repo = tokens[4].split('.')[0]; + } + fedmenu({ + 'url': base + 'js/data.js', + 'mimeType': 'application/javascript', + 'position': 'bottom-right', + 'package': repo, + }); +</script> +<div id='cgit'><table id='header'> +<tr> +<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td> +<td class='main'><a href='/cgit/'>index</a> : <a title='rpms/chromium.git' href='/cgit/rpms/chromium.git/'>rpms/chromium.git</a></td><td class='form'><form method='get' action=''> +<select name='h' onchange='this.form.submit();'> +<option value='epel7'>epel7</option> +<option value='f23'>f23</option> +<option value='f24'>f24</option> +<option value='f25'>f25</option> +<option value='master' selected='selected'>master</option> +</select> <input type='submit' name='' value='switch'/></form></td></tr> +<tr><td class='sub'>rpms/chromium</td><td class='sub right'>root</td></tr></table> +<table class='tabs'><tr><td> +<a href='/cgit/rpms/chromium.git/'>summary</a><a href='/cgit/rpms/chromium.git/refs/'>refs</a><a href='/cgit/rpms/chromium.git/log/chromium-53.0.2785.92-last-commit-position.patch'>log</a><a class='active' href='/cgit/rpms/chromium.git/tree/chromium-53.0.2785.92-last-commit-position.patch'>tree</a><a href='/cgit/rpms/chromium.git/commit/chromium-53.0.2785.92-last-commit-position.patch'>commit</a><a href='/cgit/rpms/chromium.git/diff/chromium-53.0.2785.92-last-commit-position.patch'>diff</a><a href='/cgit/rpms/chromium.git/stats/chromium-53.0.2785.92-last-commit-position.patch'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/rpms/chromium.git/log/chromium-53.0.2785.92-last-commit-position.patch'> +<select name='qt'> +<option value='grep'>log msg</option> +<option value='author'>author</option> +<option value='committer'>committer</option> +<option value='range'>range</option> +</select> +<input class='txt' type='text' size='10' name='q' value=''/> +<input type='submit' value='search'/> +</form> +</td></tr></table> +<div class='path'>path: <a href='/cgit/rpms/chromium.git/tree/'>root</a>/<a href='/cgit/rpms/chromium.git/tree/chromium-53.0.2785.92-last-commit-position.patch'>chromium-53.0.2785.92-last-commit-position.patch</a></div><div class='content'>blob: 46806f755aa0196d3d00bee7de1056991897b65f (<a href='/cgit/rpms/chromium.git/plain/chromium-53.0.2785.92-last-commit-position.patch'>plain</a>) +<table summary='blob content' class='blob'> +<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a> +<a id='n2' href='#n2'>2</a> +<a id='n3' href='#n3'>3</a> +<a id='n4' href='#n4'>4</a> +<a id='n5' href='#n5'>5</a> +<a id='n6' href='#n6'>6</a> +<a id='n7' href='#n7'>7</a> +<a id='n8' href='#n8'>8</a> +<a id='n9' href='#n9'>9</a> +<a id='n10' href='#n10'>10</a> +<a id='n11' href='#n11'>11</a> +<a id='n12' href='#n12'>12</a> +<a id='n13' href='#n13'>13</a> +<a id='n14' href='#n14'>14</a> +<a id='n15' href='#n15'>15</a> +<a id='n16' href='#n16'>16</a> +<a id='n17' href='#n17'>17</a> +<a id='n18' href='#n18'>18</a> +<a id='n19' href='#n19'>19</a> +<a id='n20' href='#n20'>20</a> +<a id='n21' href='#n21'>21</a> +<a id='n22' href='#n22'>22</a> +<a id='n23' href='#n23'>23</a> +<a id='n24' href='#n24'>24</a> +<a id='n25' href='#n25'>25</a> +<a id='n26' href='#n26'>26</a> +<a id='n27' href='#n27'>27</a> +<a id='n28' href='#n28'>28</a> +</pre></td> +<td class='lines'><pre><code>diff -up chromium-53.0.2785.92/tools/gn/BUILD.gn.lastcommitfix chromium-53.0.2785.92/tools/gn/BUILD.gn +--- chromium-53.0.2785.92/tools/gn/BUILD.gn.lastcommitfix 2016-09-06 13:50:17.540459136 -0400 ++++ chromium-53.0.2785.92/tools/gn/BUILD.gn 2016-09-06 13:50:27.380269110 -0400 +@@ -259,7 +259,6 @@ executable("gn") { + + deps = [ + ":gn_lib", +- ":last_commit_position", + "//base", + "//build/config/sanitizers:deps", + "//build/win:default_exe_manifest", +diff -up chromium-53.0.2785.92/tools/gn/gn_main.cc.lastcommitfix chromium-53.0.2785.92/tools/gn/gn_main.cc +--- chromium-53.0.2785.92/tools/gn/gn_main.cc.lastcommitfix 2016-09-06 13:49:34.620288177 -0400 ++++ chromium-53.0.2785.92/tools/gn/gn_main.cc 2016-09-06 13:49:47.316042652 -0400 +@@ -12,13 +12,7 @@ + #include "tools/gn/standard_out.h" + #include "tools/gn/switches.h" + +-// Only the GN-generated build makes this header for now. +-// TODO(brettw) consider adding this if we need it in GYP. +-#if defined(GN_BUILD) +-#include "tools/gn/last_commit_position.h" +-#else + #define LAST_COMMIT_POSITION "UNKNOWN" +-#endif + + namespace { + +</code></pre></td></tr></table> +</div> <!-- class=content --> +<div class='footer'>generated by <a href='http://git.zx2c4.com/cgit/about/'>cgit v0.12</a> at 2016-10-13 19:26:26 (GMT)</div> +</div> <!-- id=cgit --> +</body> +</html>