]> git.pld-linux.org Git - packages/chromium-browser.git/commitdiff
up to 34.0.1847.116
authorElan Ruusamäe <glen@delfi.ee>
Wed, 23 Apr 2014 17:04:58 +0000 (20:04 +0300)
committerElan Ruusamäe <glen@delfi.ee>
Wed, 23 Apr 2014 17:05:36 +0000 (20:05 +0300)
Merge branch 'dev-34'

chromium-browser.spec
clean-source.sh
depot-tools.patch [new file with mode: 0644]
gn.patch
system-ffmpeg.patch [deleted file]
system-jinja.patch
system-libxnvctrl.patch [deleted file]
system-mesa.patch
system-ply.patch

index d0e0a596df6b4c7002c72f2c7410b0187a032680..3a384af65ebd14e48880a2a6b04d11df209d8b9f 100644 (file)
@@ -60,9 +60,9 @@
 # - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites
 # - to look for new tarball, use update-source.sh script
 
-%define                branch          33.0.1750
-%define                basever         117
-%define                patchver        152
+%define                branch          34.0.1847
+%define                basever         116
+#define                patchver        152
 %define                gyp_rev 1014
 Summary:       A WebKit powered web browser
 Name:          chromium-browser
@@ -75,7 +75,7 @@ Release:      1
 License:       BSD%{!?with_system_ffmpeg:, LGPL v2+ (ffmpeg)}
 Group:         X11/Applications/Networking
 Source0:       http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{branch}.%{basever}.tar.xz
-# Source0-md5: 0811b1c65f2b8d1ebf00664ddb2f5e05
+# Source0-md5: a9b5e04e9a5d45154de1f5dfeb5bf98c
 %if "%{?patchver}" != ""
 Patch0:                http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
 # Patch0-md5:  194579901c234fbce9e1538e7956d36c
@@ -93,11 +93,9 @@ Patch2:              enable-video-decode-accel.patch
 Patch4:                path-libpdf.patch
 Patch7:                dlopen_sonamed_gl.patch
 Patch8:                chromium_useragent.patch.in
-Patch10:       system-libxnvctrl.patch
 # https://bugs.gentoo.org/show_bug.cgi?id=393471
 # libjpeg-turbo >= 1.1.90 supports that feature
 Patch11:       chromium-revert-jpeg-swizzle-r2.patch
-Patch12:       system-ffmpeg.patch
 Patch15:       nacl-build-irt.patch
 Patch16:       nacl-linkingfix.patch
 Patch18:       nacl-no-untar.patch
@@ -109,6 +107,7 @@ Patch30:    system-ply.patch
 Patch31:       system-jinja.patch
 Patch32:       remove_bundled_libraries-stale.patch
 Patch33:       gn.patch
+Patch34:       depot-tools.patch
 URL:           http://www.chromium.org/Home
 %{?with_gconf:BuildRequires:   GConf2-devel}
 %{?with_system_mesa:BuildRequires:     Mesa-libGL-devel >= 9.1}
@@ -272,11 +271,11 @@ zh-TW
 %prep
 %setup -qc
 %if "%{?patchver}" != ""
-cd %{name}-%{branch}.%{basever}
+cd chromium*-%{branch}.%{basever}
 %patch0 -p1
 cd ..
 %endif
-mv %{name}-%{branch}.%{basever}/* .
+mv chromium*-%{branch}.%{basever}/* .
 
 # Google's versioning is interesting. They never reset "BUILD", which is how we jumped
 # from 3.0.201.0 to 4.0.202.0 as they moved to a new major branch
@@ -287,9 +286,6 @@ test "$chrome" = %{version}
 gyp_rev=$(grep googlecode_url.*gyp DEPS | cut -d'"' -f6 | cut -d@ -f2)
 test "$gyp_rev" = %{gyp_rev} || :
 
-. ./v8.sh
-v8=$MAJOR_VERSION.$MINOR_VERSION.$BUILD_NUMBER.$PATCH_LEVEL
-
 # add chromium and pld to useragent
 %define pld_version %(echo %{pld_release} | sed -e 'y/[at]/[AT]/')
 sed -e 's/@BUILD_DIST@/PLD %{pld_version}/g' \
@@ -304,20 +300,19 @@ ln -s %{SOURCE7} .
 #%patch2 -p1 NOT COMPILING
 %patch4 -p3
 %patch7 -p1
-%patch10 -p1
 %patch15 -p2
 %{!?with_libjpegturbo:%patch11 -p0}
-%patch12 -p1
 %patch16 -p1
 %patch28 -p1
 %patch25 -p1
 %{?with_nacl:%patch18 -p1}
 %patch24 -p2
 %patch26 -p2
-%patch30 -p1
-%patch31 -p0
+#%patch30 -p1
+#%patch31 -p0
 %patch32 -p1
-%patch33 -p0
+%patch33 -p1
+%patch34 -p0
 
 sh -x clean-source.sh \
        %{!?with_nacl:nacl=0} \
@@ -393,7 +388,7 @@ flags="
        %{!?debuginfo:-Dfastbuild=1 -Dremove_webcore_debug_symbols=1} \
        %{?with_shared_libs:-Dlibrary=shared_library} \
        %{!?with_system_ffmpeg:-Dbuild_ffmpegsumo=1} -Dproprietary_codecs=1 \
-       -Dinclude_tests=0 \
+       -Dinclude_tests__=0 \
 %if %{with nacl}
        -Dnaclsdk_mode=custom:/usr/x86_64-nacl \
        -Ddisable_glibc_untar=1 \
index ec2968965a112168def8fd81417fda6a2eda7c21..5b0afb7598405964866b9d5ffba1f9012711b8c5 100755 (executable)
@@ -41,7 +41,6 @@ remove_nonessential_dirs() {
        for dir in \
        v8/benchmarks \
        v8/src/arm \
-       v8/src/d8* \
        third_party/chromite \
        android_webview \
        ash/resources/default_100_percent/cros_ \
@@ -432,6 +431,7 @@ remove_nonessential_dirs() {
                base/win \
                build/android \
                chrome/browser/chromeos_ \
+               v8/src/d8* \
                chrome/browser/component/web_contents_delegate_android \
                chrome/tools \
                chromeos_ \
@@ -462,10 +462,10 @@ remove_nonessential_dirs() {
        ) '!' -type d '(' \
                '!' -name '*.grd' \
                '!' -name '*.gyp*' \
+               '!' -name '*.isolate' \
                '!' -path 'base/mac/bundle_locations.h' \
                '!' -path 'base/mac/crash_logging.h' \
                '!' -path 'base/win/windows_version.h' \
-               '!' -path 'build/android/cpufeatures.gypi' \
                '!' -path 'chrome/browser/chromeos/attestation/platform_verification_flow.h' \
                '!' -path 'chrome/browser/chromeos/contacts/contact.proto' \
                '!' -path 'chrome/browser/chromeos/extensions/*.h' \
@@ -587,13 +587,18 @@ clean_third_party() {
 
        find third_party -type f \
                '!' -iname '*.gyp*' \
+               '!' -iname '*.isolate' \
                '!' -path 'third_party/WebKit/*' \
+               '!' -path 'third_party/libwebm/*' \
                '!' -path 'third_party/adobe/flash/*' \
                '!' -path 'third_party/angle/include/EGL/*' \
                '!' -path 'third_party/angle/include/GLSLANG/*' \
                '!' -path 'third_party/angle/src/common/*' \
                '!' -path 'third_party/angle/src/compiler/*' \
+               '!' -path 'third_party/angle/src/enumerate_files.py' \
                '!' -path 'third_party/angle/src/third_party/compiler/*' \
+               '!' -path 'third_party/angle/src/*' \
+               '!' -path 'third_party/brotli/*' \
                '!' -path 'third_party/cacheinvalidation/*' \
                '!' -path 'third_party/cld/*' \
                '!' -path 'third_party/cld_2/*' \
@@ -603,6 +608,8 @@ clean_third_party() {
                '!' -path 'third_party/hunspell/*' \
                '!' -path 'third_party/hyphen/*' \
                '!' -path 'third_party/iccjpeg/*' \
+               '!' -path 'third_party/icu/*' \
+               '!' -path 'third_party/jinja2/*' \
                '!' -path 'third_party/jstemplate/*' \
                '!' -path 'third_party/khronos/*' \
                '!' -path 'third_party/leveldatabase/*' \
@@ -618,6 +625,7 @@ clean_third_party() {
                '!' -path 'third_party/libyuv/*' \
                '!' -path 'third_party/lss/*.h' \
                '!' -path 'third_party/lzma_sdk/*' \
+               '!' -path 'third_party/markupsafe/*' \
                '!' -path 'third_party/mesa/src/include/GL/gl.h' \
                '!' -path 'third_party/mesa/src/include/GL/glext.h' \
                '!' -path 'third_party/mesa/src/include/GL/glx.h' \
@@ -627,6 +635,7 @@ clean_third_party() {
                '!' -path 'third_party/mt19937ar/*' \
                '!' -path 'third_party/npapi/*' \
                '!' -path 'third_party/ots/*' \
+               '!' -path 'third_party/polymer/*' \
                '!' -path 'third_party/protobuf/*' \
                '!' -path 'third_party/qcms/*' \
                '!' -path 'third_party/re2/*' \
@@ -685,7 +694,7 @@ strip_system_dirs() {
                # skip already removed dirs
                test -d $dir || continue
 
-               find $dir -depth -mindepth 1 '!' '(' -name '*.gyp' -o -name '*.gypi' -o -path $dir/$lib.h $args ')' -print -delete || :
+               find $dir -depth -mindepth 1 '!' '(' -name '*.gyp' -o -name '*.gypi' -o -name '*.isolate' -o -path $dir/$lib.h $args ')' -print -delete || :
        done
        set +f
 }
@@ -696,7 +705,7 @@ strip_system_dirs() {
 remove_tests() {
        local dir
 
-       # full remove
+       echo '> full remove'
        for dir in \
        ash/test \
        base/test_ \
@@ -728,7 +737,7 @@ remove_tests() {
        chrome_frame/tools/test \
        content/browser/worker_host/test \
        content/common/gpu/testdata \
-       content/public/test \
+       content/public/test_ \
        content/test \
        courgette/testdata \
        device/bluetooth/test \
@@ -892,7 +901,7 @@ remove_tests() {
                rm -vfr "$dir"
        done
 
-       # partial remove (keep .gyp)
+       echo '> partial remove (keep .gyp)'
        for dir in \
                chrome/browser/nacl_host/test \
                chrome/test/data \
@@ -929,17 +938,18 @@ remove_tests() {
 #      install -d testing/gtest/include
 #      ln -s /usr/include/gtest testing/gtest/include/gtest
 
-       # delete unittest files
+       echo '> delete unittest files'
        find . '(' \
-               -name '*_unittest*.*' \
-               -o -name '*_unittest.*' \
-               -o -name '*_unittest' \
-               -o -name 'test_*.*' \
-               -o -name '*_test.*' \
-               -o -path './testing/' \
-       ')' '!' -name '*.gyp*' \
-               '!' -name '*.isolate' \
+               -name '*_unittest*.*' -o \
+               -name '*_unittest.*' -o \
+               -name '*_unittest' -o \
+               -name 'test_*.*' -o \
+               -name '*_test.*' -o \
+               -path './testing/' \
+       ')' '!' -type d '(' \
                '!' -name '*.grd' \
+               '!' -name '*.gyp*' \
+               '!' -name '*.isolate' \
                '!' -path './base/test/*' \
                '!' -path './base/test/launcher/*' \
                '!' -path './base/test/launcher/test_launcher.*' \
@@ -959,6 +969,7 @@ remove_tests() {
                '!' -path './chrome/test/base/test_switches.*' \
                '!' -path './chrome/test/perf/browser_perf_test.*' \
                '!' -path './chrome/test/perf/perf_test.*' \
+               '!' -path './content/public/test/test_utils.h' \
                '!' -path './media/cast/rtcp/test_rtcp_packet_builder.*' \
                '!' -path './native_client/src/trusted/fault_injection/test_injection.*' \
                '!' -path './native_client/src/trusted/service_runtime/env_cleanser_test.h' \
@@ -971,6 +982,11 @@ remove_tests() {
                '!' -path './third_party/skia/src/gpu/gr_unittests.*' \
                '!' -path './third_party/trace-viewer/src/base/unittest/test_error.js' \
                '!' -path './third_party/trace-viewer/src/tracing/test_utils.js' \
+               '!' -path './third_party/trace-viewer/third_party/tvcm/src/tvcm/unittest/test_case.js' \
+               '!' -path './third_party/trace-viewer/third_party/tvcm/src/tvcm/unittest/test_error.js' \
+               '!' -path './third_party/trace-viewer/third_party/tvcm/src/tvcm/unittest/test_runner.js' \
+               '!' -path './third_party/trace-viewer/third_party/tvcm/src/tvcm/unittest/*.js' \
+               '!' -path './tools/compile_test/compile_test.py' \
                '!' -path './tools/compile_test/compile_test.py' \
                '!' -path './ui/compositor/test_web_graphics_context_3d.*' \
                '!' -path './ui/webui/resources/js/webui_resource_test.js' \
@@ -980,15 +996,21 @@ remove_tests() {
                '!' -path './webkit/gpu/test_context_provider_factory.*' \
                '!' -path './webkit/support/test_webkit_platform_support.h' \
                '!' -path './webkit/tools/test_shell/*.h' \
-       -print -delete || :
+       ')' \
+               -print -delete || :
 }
 
 # Remove most bundled libraries. Some are still needed.
 # Sync this with gentoo/chromium-*.ebuild
 # NOTE: argument list to script specifies paths to preserve
 remove_bundled_libraries() {
+       # ninja: error: '../../third_party/jinja2/__init__.py', needed by 'gen/blink/InternalSettingsGenerated.idl', missing and no known rule to make it
+       # ninja: error: '../../third_party/markupsafe/__init__.py', needed by 'gen/blink/InternalSettingsGenerated.idl', missing and no known rule to make it
+
        build/linux/unbundle/remove_bundled_libraries.py \
                third_party/adobe/flash/flapper_version.h \
+               third_party/jinja2 \
+               third_party/markupsafe/ \
                'base/third_party/dmg_fp' \
                'base/third_party/dynamic_annotations' \
                'base/third_party/icu' \
@@ -1004,6 +1026,7 @@ remove_bundled_libraries() {
                'net/third_party/nss' \
                'third_party/WebKit' \
                'third_party/angle' \
+               'third_party/brotli' \
                'third_party/cacheinvalidation' \
                'third_party/cld' \
                'third_party/cros_system_api' \
@@ -1011,16 +1034,18 @@ remove_bundled_libraries() {
                'third_party/flot' \
                '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/libphonenumber' \
                'third_party/libsrtp' \
                'third_party/libusb' \
+               'third_party/libwebm' \
                'third_party/libxml/chromium' \
-               'third_party/libXNVCtrl' \
                'third_party/libyuv' \
                'third_party/lss' \
                'third_party/lzma_sdk' \
@@ -1028,8 +1053,10 @@ remove_bundled_libraries() {
                'third_party/modp_b64' \
                'third_party/mt19937ar' \
                'third_party/npapi' \
+               'third_party/nss.isolate' \
                'third_party/ots' \
                'third_party/polymer' \
+               'third_party/protobuf' \
                'third_party/pywebsocket' \
                'third_party/qcms' \
                'third_party/readability' \
@@ -1060,7 +1087,7 @@ strip_system_dirs \
        third_party/bzip2 \
        third_party/ffmpeg_ \
        third_party/flac \
-       third_party/icu \
+       third_party/icu_ \
        third_party/jsoncpp \
        third_party/libXNVCtrl \
        third_party/libevent \
diff --git a/depot-tools.patch b/depot-tools.patch
new file mode 100644 (file)
index 0000000..19b92ce
--- /dev/null
@@ -0,0 +1,11 @@
+--- build/gyp_chromium.orig    2014-01-29 01:22:52.527247671 +0000
++++ build/gyp_chromium 2014-01-29 01:23:49.857623290 +0000
+@@ -38,8 +38,6 @@
+ sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit',
+     'Source', 'build', 'scripts'))
+-import find_depot_tools
+-
+ # On Windows, Psyco shortens warm runs of build/gyp_chromium by about
+ # 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70
+ # seconds.  Conversely, memory usage of build/gyp_chromium with Psyco
index 5cb8c0ebc82ab46c9aeb2c8c639a0c0593bfd25c..6fd32cb99867f33aab876f72e913f19582bbd8ba 100644 (file)
--- a/gn.patch
+++ b/gn.patch
@@ -1,12 +1,12 @@
---- build/gyp_chromium.orig    2013-12-11 03:07:03.941915587 +0000
-+++ build/gyp_chromium 2013-12-11 03:07:29.812073301 +0000
-@@ -221,9 +221,6 @@
+--- chromium-browser-34.0.1847.116/build/gyp_chromium~ 2014-04-02 22:03:54.000000000 +0300
++++ chromium-browser-34.0.1847.116/build/gyp_chromium  2014-04-12 01:46:51.740436678 +0300
+@@ -477,8 +477,7 @@
+     args.append('--check')
  
    supplemental_includes = GetSupplementalFiles()
 -  if not RunGN(supplemental_includes):
 -    sys.exit(1)
--
++
    args.extend(
        ['-I' + i for i in additional_include_files(supplemental_includes, args)])
  
diff --git a/system-ffmpeg.patch b/system-ffmpeg.patch
deleted file mode 100644 (file)
index da7ea1c..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-Fix HOST_OS detection in build_ffpeg.sh
-https://bugs.gentoo.org/show_bug.cgi?id=491466
-
-Enable gold linker
-https://bugs.gentoo.org/show_bug.cgi?id=491850
-
---- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.sh
-+++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.sh
-@@ -75,7 +75,7 @@
- LIBAVUTIL_VERSION_MAJOR=52
- case $(uname -sm) in
--  Linux\ i386)
-+  Linux\ i?86)
-     HOST_OS=linux
-     HOST_ARCH=ia32
-     JOBS=$(grep processor /proc/cpuinfo | wc -l)
-@@ -85,6 +85,11 @@
-     HOST_ARCH=x64
-     JOBS=$(grep processor /proc/cpuinfo | wc -l)
-     ;;
-+  Linux\ arm*)
-+    HOST_OS=linux
-+    HOST_ARCH=arm
-+    JOBS=$(grep processor /proc/cpuinfo | wc -l)
-+    ;;
-   Darwin\ i386)
-     HOST_OS=mac
-     HOST_ARCH=ia32
-@@ -117,14 +122,6 @@
- echo "LD          = $(ld --version | head -n1)"
- echo
--# As of this writing gold 2.20.1-system.20100303 is unable to link FFmpeg.
--if ld --version | grep -q gold; then
--  echo "gold is unable to link FFmpeg"
--  echo
--  echo "Switch /usr/bin/ld to the regular binutils ld and try again"
--  exit 1
--fi
--
- # We want to use a sufficiently recent version of yasm on Windows.
- if [[ "$TARGET_OS" == "win" || "$TARGET_OS" == "win-vs2013" ]]; then
-   if !(which yasm 2>&1 > /dev/null); then
-@@ -292,14 +289,16 @@
-     add_flag_common --extra-cflags=-m32
-     add_flag_common --extra-ldflags=-m32
-   elif [ "$TARGET_ARCH" = "arm" ]; then
--    # This if-statement essentially is for chroot tegra2.
--    add_flag_common --enable-cross-compile
-+    if [ "$HOST_ARCH" != "arm" ]; then
-+      # This if-statement essentially is for chroot tegra2.
-+      add_flag_common --enable-cross-compile
--    # Location is for CrOS chroot. If you want to use this, enter chroot
--    # and copy ffmpeg to a location that is reachable.
--    add_flag_common --cross-prefix=/usr/bin/armv7a-cros-linux-gnueabi-
--    add_flag_common --target-os=linux
--    add_flag_common --arch=arm
-+      # Location is for CrOS chroot. If you want to use this, enter chroot
-+      # and copy ffmpeg to a location that is reachable.
-+      add_flag_common --cross-prefix=/usr/bin/armv7a-cros-linux-gnueabi-
-+      add_flag_common --target-os=linux
-+      add_flag_common --arch=arm
-+    fi
-     # TODO(ihf): ARM compile flags are tricky. The final options
-     # overriding everything live in chroot /build/*/etc/make.conf
-@@ -322,11 +321,13 @@
-     # NOTE: softfp/hardfp selected at gyp time.
-     add_flag_common --extra-cflags=-mfloat-abi=hard
-   elif [ "$TARGET_ARCH" = "arm-neon" ]; then
--    # This if-statement is for chroot arm-generic.
--    add_flag_common --enable-cross-compile
--    add_flag_common --cross-prefix=/usr/bin/armv7a-cros-linux-gnueabi-
--    add_flag_common --target-os=linux
--    add_flag_common --arch=arm
-+    if [ "$HOST_ARCH" != "arm" ]; then
-+      # This if-statement is for chroot arm-generic.
-+      add_flag_common --enable-cross-compile
-+      add_flag_common --cross-prefix=/usr/bin/armv7a-cros-linux-gnueabi-
-+      add_flag_common --target-os=linux
-+      add_flag_common --arch=arm
-+    fi
-     add_flag_common --enable-armv6
-     add_flag_common --enable-armv6t2
-     add_flag_common --enable-vfp
index be9cc53de9167eefbbb47caee6032b30ff030cb3..e301016124e6753e4ae55f6c0396d1805b070346 100644 (file)
@@ -1,17 +1,17 @@
---- third_party/WebKit/Source/bindings/derived_sources.gyp~    2014-01-18 20:26:07.000000000 +0200
-+++ third_party/WebKit/Source/bindings/derived_sources.gyp     2014-01-19 22:00:26.276535989 +0200
-@@ -53,9 +53,6 @@
-     ],
-     'compiler_module_files': [
-         'scripts/idl_compiler.py',
--        # jinja2/__init__.py contains version string, so sufficient for package
--        '<(DEPTH)/third_party/jinja2/__init__.py',
--        '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-         '<(DEPTH)/tools/idl_parser/idl_lexer.py',
-         '<(DEPTH)/tools/idl_parser/idl_node.py',
-         '<(DEPTH)/tools/idl_parser/idl_parser.py',
---- third_party/WebKit/Source/build/scripts/scripts.gypi.orig  2013-11-06 18:42:10.042086211 +0000
-+++ third_party/WebKit/Source/build/scripts/scripts.gypi       2013-11-06 18:42:19.412146455 +0000
+--- third_party/WebKit/Source/bindings/generated_bindings.gyp.orig     2014-02-20 03:49:21.821527295 +0000
++++ third_party/WebKit/Source/bindings/generated_bindings.gyp  2014-02-20 03:49:34.401607238 +0000
+@@ -110,9 +110,6 @@
+       'scripts/unstable/idl_compiler.py',
+       '<(DEPTH)/third_party/ply/lex.py',
+       '<(DEPTH)/third_party/ply/yacc.py',
+-      # jinja2/__init__.py contains version string, so sufficient for package
+-      '<(DEPTH)/third_party/jinja2/__init__.py',
+-      '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
+       '<(DEPTH)/tools/idl_parser/idl_lexer.py',
+       '<(DEPTH)/tools/idl_parser/idl_node.py',
+       '<(DEPTH)/tools/idl_parser/idl_parser.py',
+--- third_party/WebKit/Source/build/scripts/scripts.gypi.orig  2014-02-20 03:49:59.351765796 +0000
++++ third_party/WebKit/Source/build/scripts/scripts.gypi       2014-02-20 03:50:08.111821470 +0000
 @@ -1,10 +1,6 @@
  {
      'variables': {
diff --git a/system-libxnvctrl.patch b/system-libxnvctrl.patch
deleted file mode 100644 (file)
index 8d063f0..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
---- /dev/null  2008-07-21 16:46:52.000000000 +0300
-+++ chromium-browser-28.0.1500.20/build/linux/unbundle/libXNVCtrl.gyp  2013-05-31 13:26:23.840330832 +0300
-@@ -0,0 +1,35 @@
-+# Copyright (c) 2013 The Chromium Authors. All rights reserved.
-+# Use of this source code is governed by a BSD-style license that can be
-+# found in the LICENSE file.
-+
-+{
-+  'targets': [
-+    {
-+      'target_name': 'libXNVCtrl',
-+      'type': 'none',
-+      'variables': {
-+        'headers_root_path': '.',
-+        'header_filenames': [
-+          'NVCtrlLib.h',
-+          'NVCtrl.h',
-+        ],
-+      },
-+      'includes': [
-+        '../../build/shim_headers.gypi',
-+      ],
-+      'direct_dependent_settings': {
-+        'cflags': [
-+            '<!@(pkg-config --cflags libXNVCtrl)',
-+        ],
-+      },
-+      'link_settings': {
-+        'ldflags': [
-+          '<!@(pkg-config --libs-only-L --libs-only-other libXNVCtrl)',
-+        ],
-+        'libraries': [
-+          '<!@(pkg-config --libs-only-l libXNVCtrl)',
-+        ],
-+      },
-+    }
-+  ],
-+}
---- chromium-browser-28.0.1500.20/build/linux/unbundle/replace_gyp_files.py~   2013-05-21 05:47:31.000000000 +0300
-+++ chromium-browser-28.0.1500.20/build/linux/unbundle/replace_gyp_files.py    2013-05-29 23:15:43.738468072 +0300
-@@ -29,6 +29,7 @@
-   'use_system_libvpx': 'third_party/libvpx/libvpx.gyp',
-   'use_system_libwebp': 'third_party/libwebp/libwebp.gyp',
-   'use_system_libxml': 'third_party/libxml/libxml.gyp',
-+  'use_system_libxnvctrl' : 'third_party/libXNVCtrl/libXNVCtrl.gyp',
-   'use_system_libxslt': 'third_party/libxslt/libxslt.gyp',
-   'use_system_opus': 'third_party/opus/opus.gyp',
-   'use_system_re2': 'third_party/re2/re2.gyp',
index 61f0d80397899b6088d00e6fa128a6a02f7120a0..0b4a2087ef24007e0f0b59f0570517b9e8d0deb0 100644 (file)
@@ -1,13 +1,13 @@
 in PLD Linux, windows includes are not packaged
 http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2013-February/023459.html
---- chromium-browser-26.0.1410.12/ui/gl/generate_bindings.py~  2013-02-21 12:18:08.000000000 +0200
-+++ chromium-browser-26.0.1410.12/ui/gl/generate_bindings.py   2013-02-28 11:54:36.763395432 +0200
-@@ -1172,7 +1172,7 @@
+--- chromium-browser-34.0.1847.116/ui/gl/generate_bindings.py~ 2014-04-02 22:04:03.000000000 +0300
++++ chromium-browser-34.0.1847.116/ui/gl/generate_bindings.py  2014-04-12 01:25:38.714510242 +0300
+@@ -1283,7 +1283,7 @@
        'EGL_ANGLE_surface_d3d_texture_2d_share_handle',
      ],
    ],
--  [WGL_FUNCTIONS, 'wgl', ['GL/wglext.h'], []],
-+  #[WGL_FUNCTIONS, 'wgl', ['GL/wglext.h'], []],
-   [GLX_FUNCTIONS, 'glx', ['GL/glx.h', 'GL/glxext.h'], []],
+-  [WGL_FUNCTIONS, [], 'wgl', ['GL/wglext.h'], []],
++#  [WGL_FUNCTIONS, [], 'wgl', ['GL/wglext.h'], []],
+   [GLX_FUNCTIONS, [], 'glx', ['GL/glx.h', 'GL/glxext.h'], []],
  ]
  
index 787bee8675bcb4548ebde05e0dc5a91233b9f24d..068eaadfba75919cb2ba566f31feb3f73fd10528 100644 (file)
@@ -1,11 +1,11 @@
---- chromium-browser-31.0.1650.48/third_party/WebKit/Source/bindings/derived_sources.gyp~      2013-11-08 08:50:07.000000000 +0200
-+++ chromium-browser-31.0.1650.48/third_party/WebKit/Source/bindings/derived_sources.gyp       2013-11-13 19:07:02.379771691 +0200
-@@ -44,8 +44,6 @@
+--- ./third_party/WebKit/Source/bindings/derived_sources.gyp.orig      2013-09-09 17:53:37.709978765 +0000
++++ ./third_party/WebKit/Source/bindings/derived_sources.gyp   2013-09-09 17:53:50.540054303 +0000
+@@ -57,8 +57,6 @@
      ],
      'compiler_module_files': [
          'scripts/idl_compiler.py',
 -        '<(DEPTH)/third_party/ply/lex.py',
 -        '<(DEPTH)/third_party/ply/yacc.py',
-         # jinja2/__init__.py contains version string, so sufficient for package
-         '<(DEPTH)/third_party/jinja2/__init__.py',
-         '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
+         '<(DEPTH)/tools/idl_parser/idl_lexer.py',
+         '<(DEPTH)/tools/idl_parser/idl_node.py',
+         '<(DEPTH)/tools/idl_parser/idl_parser.py',
This page took 0.125495 seconds and 4 git commands to generate.