mirror of
https://abf.rosa.ru/djam/chromium-browser-stable-test.git
synced 2025-02-24 01:52:45 +00:00
Automatic import for version 20.0.1132.47
This commit is contained in:
Rosa
parent
a1fbc6e26c
commit
c369d70300
5 changed files with 87 additions and 130 deletions
14
.abf.yml
14
.abf.yml
|
|
@ -1,15 +1,3 @@
|
||||||
---
|
---
|
||||||
sources:
|
sources:
|
||||||
binary-19.0.1077.3-19.0.1081.2.tar.xz: c4b42d30236bc07eaf65856cc0df2e129f760723
|
chromium-20.0.1132.43.tar.xz: 1009b9ae52a76685abc8c8afadaf592387450a0a
|
||||||
binary-19.0.1081.2-19.0.1084.15.tar.xz: 13d9fd5f0c786f032054b94e44f7a43de3875c52
|
|
||||||
binary-19.0.1084.15-19.0.1084.24.tar.xz: 6a2f67e4dfddf016d42980e7d1488b769cb3537a
|
|
||||||
binary-19.0.1084.36-19.0.1084.41.tar.xz: 2c58c775a3881075e56d4d1eca0d13579c2d14fc
|
|
||||||
chromium-19.0.1077.3.tar.xz: 30a24623cb6cefe8d5427011d9d935376b525539
|
|
||||||
patch-19.0.1077.3-19.0.1081.2.diff.xz: 67152a736ab6d3cc4ec908c9ef860664c0b2615b
|
|
||||||
patch-19.0.1081.2-19.0.1084.15.diff.xz: 672f8155ec7fbdca23639bede51ccaf4fb9d27c5
|
|
||||||
patch-19.0.1084.15-19.0.1084.24.diff.xz: 57d67cc4ff1e1f594b5c69f483ad465a1aead06c
|
|
||||||
patch-19.0.1084.24-19.0.1084.30.diff.xz: a9ec9cb050ddf485a8606abc69e354cde3c62855
|
|
||||||
patch-19.0.1084.30-19.0.1084.36.diff.xz: cc42fc9a74738a19dff0210f7adf4176fb4931b6
|
|
||||||
patch-19.0.1084.36-19.0.1084.41.diff.xz: b0766472305c132f3db0e90db27600a950603322
|
|
||||||
patch-19.0.1084.41-19.0.1084.52.diff.xz: 6b52a4f1ff0af0e677ea18346abeec2376d294dd
|
|
||||||
patch-19.0.1084.52-19.0.1084.56.diff.xz: b4f1264d79906b8d139adc6fa490ba32c9d42dcd
|
|
||||||
|
|
|
||||||
49
chromium-20.0.1132.43-svnversion.patch
Normal file
49
chromium-20.0.1132.43-svnversion.patch
Normal file
|
|
@ -0,0 +1,49 @@
|
||||||
|
--- chromium-20.0.1132.43/native_client/tools/Makefile.orig 2012-07-03 17:54:36.000000000 +0000
|
||||||
|
+++ chromium-20.0.1132.43/native_client/tools/Makefile 2012-07-03 17:55:43.000000000 +0000
|
||||||
|
@@ -956,11 +956,11 @@ buildbot-build-with-newlib: | \
|
||||||
|
|
||||||
|
# Don't generate patch files for things like gmp or linux-headers-for-nacl
|
||||||
|
# because these are not changed from upstream.
|
||||||
|
-BINUTILS_PATCHNAME := naclbinutils-$(BINUTILS_VERSION)-r$(shell svnversion | tr : _)
|
||||||
|
-GCC_PATCHNAME := naclgcc-$(GCC_VERSION)-r$(shell svnversion | tr : _)
|
||||||
|
-#GDB_PATCHNAME := naclgdb-$(GDB_VERSION)-r$(shell svnversion | tr : _)
|
||||||
|
-GLIBC_PATCHNAME := naclglibc-$(GLIBC_VERSION)-r$(shell svnversion | tr : _)
|
||||||
|
-NEWLIB_PATCHNAME := naclnewlib-$(NEWLIB_VERSION)-r$(shell svnversion | tr : _)
|
||||||
|
+BINUTILS_PATCHNAME := naclbinutils-$(BINUTILS_VERSION)
|
||||||
|
+GCC_PATCHNAME := naclgcc-$(GCC_VERSION)
|
||||||
|
+#GDB_PATCHNAME := naclgdb-$(GDB_VERSION)
|
||||||
|
+GLIBC_PATCHNAME := naclglibc-$(GLIBC_VERSION)
|
||||||
|
+NEWLIB_PATCHNAME := naclnewlib-$(NEWLIB_VERSION)
|
||||||
|
|
||||||
|
patch-names = $(BINUTILS_PATCHNAME) $(GCC_PATCHNAME) \
|
||||||
|
$(GLIBC_PATCHNAME) $(NEWLIB_PATCHNAME)
|
||||||
|
@@ -1003,15 +1003,15 @@ buildbot-mark-version: | \
|
||||||
|
+++ SRC/binutils/bfd/version.h\n\
|
||||||
|
@@ -3 +3 @@\n\
|
||||||
|
-#define BFD_VERSION_STRING @bfd_version_package@ @bfd_version_string@\n\
|
||||||
|
- +#define BFD_VERSION_STRING @bfd_version_package@ @bfd_version_string@ \" `LC_ALL=C svn info | grep 'Last Changed Date' | sed -e s'+Last Changed Date: \(....\)-\(..\)-\(..\).*+\1\2\3+'` (Native Client r`LC_ALL=C svnversion`, Git Commit `cd SRC/binutils ; LC_ALL=C git rev-parse HEAD`)\"\n" |\
|
||||||
|
+ +#define BFD_VERSION_STRING @bfd_version_package@ @bfd_version_string@ \" `LC_ALL=C svn info | grep 'Last Changed Date' | sed -e s'+Last Changed Date: \(....\)-\(..\)-\(..\).*+\1\2\3+'`\"\n" |\
|
||||||
|
patch -p0
|
||||||
|
LC_ALL=C svn info | grep 'Last Changed Date' | sed -e s'+Last Changed Date: \(....\)-\(..\)-\(..\).*+\1\2\3+' > SRC/gcc/gcc/DATESTAMP
|
||||||
|
- echo "Native Client r`LC_ALL=C svnversion`, Git Commit `cd SRC/gcc ; LC_ALL=C git rev-parse HEAD`" > SRC/gcc/gcc/DEV-PHASE
|
||||||
|
+ echo "Native Client" > SRC/gcc/gcc/DEV-PHASE
|
||||||
|
printf -- "--- SRC/gdb/gdb/version.in\n\
|
||||||
|
+++ SRC/gdb/gdb/version.in\n\
|
||||||
|
@@ -1 +1 @@\n\
|
||||||
|
-`cat SRC/gdb/gdb/version.in`\n\
|
||||||
|
- +`cat SRC/gdb/gdb/version.in` `LC_ALL=C svn info | grep 'Last Changed Date' | sed -e s'+Last Changed Date: \(....\)-\(..\)-\(..\).*+\1\2\3+'` (Native Client r`LC_ALL=C svnversion`, Git Commit `cd SRC/gdb ; LC_ALL=C git rev-parse HEAD`)\n" |\
|
||||||
|
+ +`cat SRC/gdb/gdb/version.in` `LC_ALL=C svn info | grep 'Last Changed Date' | sed -e s'+Last Changed Date: \(....\)-\(..\)-\(..\).*+\1\2\3+'`\n" |\
|
||||||
|
patch -p0
|
||||||
|
endif
|
||||||
|
|
||||||
|
--- chromium-20.0.1132.43/third_party/webrtc/build/common.gypi.orig 2012-07-03 20:49:11.000000000 +0000
|
||||||
|
+++ chromium-20.0.1132.43/third_party/webrtc/build/common.gypi 2012-07-03 20:49:29.000000000 +0000
|
||||||
|
@@ -98,7 +98,7 @@
|
||||||
|
'defines': [
|
||||||
|
# TODO(leozwang): Most of team use git-svn, need to add
|
||||||
|
# git-svn support as well.
|
||||||
|
- 'WEBRTC_SVNREVISION="<!(svnversion -n)"',
|
||||||
|
+ 'WEBRTC_SVNREVISION="exported"',
|
||||||
|
],
|
||||||
|
'conditions': [
|
||||||
|
['build_with_chromium==1', {
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
%define revision 140965
|
%define revision 144678
|
||||||
%define crname chromium-browser
|
%define crname chromium-browser
|
||||||
%define _crdir %{_libdir}/%{crname}
|
%define _crdir %{_libdir}/%{crname}
|
||||||
%define _src %{_topdir}/SOURCES
|
%define _src %{_topdir}/SOURCES
|
||||||
%define basever 19.0.1077.3
|
%define basever 20.0.1132.43
|
||||||
%define patchver() ([ -f %{_src}/patch-%1-%2.diff.xz ] || exit 1; xz -dc %{_src}/patch-%1-%2.diff.xz|patch -p1);
|
%define patchver() ([ -f %{_src}/patch-%1-%2.diff.xz ] || exit 1; xz -dc %{_src}/patch-%1-%2.diff.xz|patch -p1);
|
||||||
|
|
||||||
Name: chromium-browser-stable
|
Name: chromium-browser-stable
|
||||||
Version: 19.0.1084.56
|
Version: 20.0.1132.47
|
||||||
Release: %mkrel 1
|
Release: %mkrel 1
|
||||||
Summary: A fast webkit-based web browser
|
Summary: A fast webkit-based web browser
|
||||||
Group: Networking/WWW
|
Group: Networking/WWW
|
||||||
|
|
@ -15,20 +15,10 @@ Source0: chromium-%{basever}.tar.xz
|
||||||
Source1: chromium-wrapper
|
Source1: chromium-wrapper
|
||||||
Source2: chromium-browser.desktop
|
Source2: chromium-browser.desktop
|
||||||
Patch0: chromium-19.0.1077.3-remove-inline.patch
|
Patch0: chromium-19.0.1077.3-remove-inline.patch
|
||||||
Source1000: patch-19.0.1077.3-19.0.1081.2.diff.xz
|
Patch1: chromium-20.0.1132.43-svnversion.patch
|
||||||
Source1001: binary-19.0.1077.3-19.0.1081.2.tar.xz
|
#Source1000: patch-20.0.1132.43-20.0.1132.47.diff.xz
|
||||||
Source1002: script-19.0.1077.3-19.0.1081.2.sh
|
#Source1001: binary-19.0.1077.3-19.0.1081.2.tar.xz
|
||||||
Source1003: patch-19.0.1081.2-19.0.1084.15.diff.xz
|
#Source1002: script-19.0.1077.3-19.0.1081.2.sh
|
||||||
Source1004: binary-19.0.1081.2-19.0.1084.15.tar.xz
|
|
||||||
Source1005: script-19.0.1081.2-19.0.1084.15.sh
|
|
||||||
Source1006: patch-19.0.1084.15-19.0.1084.24.diff.xz
|
|
||||||
Source1007: binary-19.0.1084.15-19.0.1084.24.tar.xz
|
|
||||||
Source1008: patch-19.0.1084.24-19.0.1084.30.diff.xz
|
|
||||||
Source1009: patch-19.0.1084.30-19.0.1084.36.diff.xz
|
|
||||||
Source1010: patch-19.0.1084.36-19.0.1084.41.diff.xz
|
|
||||||
Source1011: binary-19.0.1084.36-19.0.1084.41.tar.xz
|
|
||||||
Source1012: patch-19.0.1084.41-19.0.1084.52.diff.xz
|
|
||||||
Source1013: patch-19.0.1084.52-19.0.1084.56.diff.xz
|
|
||||||
Provides: %{crname}
|
Provides: %{crname}
|
||||||
Conflicts: chromium-browser-unstable
|
Conflicts: chromium-browser-unstable
|
||||||
Conflicts: chromium-browser-beta
|
Conflicts: chromium-browser-beta
|
||||||
|
|
@ -77,22 +67,12 @@ chromium-browser-unstable package instead.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n chromium-%{basever}
|
%setup -q -n chromium-%{basever}
|
||||||
%patchver 19.0.1077.3 19.0.1081.2
|
|
||||||
tar xvf %{_src}/binary-19.0.1077.3-19.0.1081.2.tar.xz
|
|
||||||
sh -x %{_src}/script-19.0.1077.3-19.0.1081.2.sh
|
|
||||||
%patchver 19.0.1081.2 19.0.1084.15
|
|
||||||
tar xvf %{_src}/binary-19.0.1081.2-19.0.1084.15.tar.xz
|
|
||||||
sh -x %{_src}/script-19.0.1081.2-19.0.1084.15.sh
|
|
||||||
%patchver 19.0.1084.15 19.0.1084.24
|
|
||||||
tar xvf %{_src}/binary-19.0.1084.15-19.0.1084.24.tar.xz
|
|
||||||
%patchver 19.0.1084.24 19.0.1084.30
|
|
||||||
%patchver 19.0.1084.30 19.0.1084.36
|
|
||||||
%patchver 19.0.1084.36 19.0.1084.41
|
|
||||||
tar xvf %{_src}/binary-19.0.1084.36-19.0.1084.41.tar.xz
|
|
||||||
%patchver 19.0.1084.41 19.0.1084.52
|
|
||||||
%patchver 19.0.1084.52 19.0.1084.56
|
|
||||||
|
|
||||||
%patch0 -p1 -b .remove-inline
|
%patch0 -p1 -b .remove-inline
|
||||||
|
%patch1 -p1 -b .svnversion
|
||||||
|
|
||||||
|
#%patchver 20.0.1132.43 20.0.1132.47
|
||||||
|
#tar xvf %{_src}/binary-19.0.1077.3-19.0.1081.2.tar.xz
|
||||||
|
#sh -x %{_src}/script-19.0.1077.3-19.0.1081.2.sh
|
||||||
|
|
||||||
echo "%{revision}" > build/LASTCHANGE.in
|
echo "%{revision}" > build/LASTCHANGE.in
|
||||||
|
|
||||||
|
|
@ -216,7 +196,31 @@ rm -rf %{buildroot}
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Jun 20 2012 Claudio Matsuoka <claudio@mandriva.com> 19.0.1084.56-1mdv2012.0
|
* Tue Jul 03 2012 Claudio Matsuoka <claudio@mandriva.com> 20.0.1132.47-1mdv2012.0
|
||||||
|
+ Revision: 807999
|
||||||
|
- new upstream release 20.0.1132.43 (135598)
|
||||||
|
* [118633] Low CVE-2012-2815: Leak of iframe fragment id.
|
||||||
|
* [120222] High CVE-2012-2817: Use-after-free in table section handling.
|
||||||
|
* [120944] High CVE-2012-2818: Use-after-free in counter layout.
|
||||||
|
* [120977] High CVE-2012-2819: Crash in texture handling.
|
||||||
|
* [121926] Medium CVE-2012-2820: Out-of-bounds read in SVG filter handling.
|
||||||
|
* [122925] Medium CVE-2012-2821: Autofill display problem.
|
||||||
|
* [various] Medium CVE-2012-2822: Misc. lower severity OOB read issues in PDF.
|
||||||
|
* [124356] High CVE-2012-2823: Use-after-free in SVG resource handling.
|
||||||
|
* [125374] High CVE-2012-2824: Use-after-free in SVG painting.
|
||||||
|
* [128688] Medium CVE-2012-2826: Out-of-bounds read in texture conversion.
|
||||||
|
* [129857] High CVE-2012-2828: Integer overflows in PDF.
|
||||||
|
* [129947] High CVE-2012-2829: Use-after-free in first-letter handling.
|
||||||
|
* [129951] High CVE-2012-2830: Wild pointer in array value setting.
|
||||||
|
* [130356] High CVE-2012-2831: Use-after-free in SVG reference handling.
|
||||||
|
* [131553] High CVE-2012-2832: Uninitialized pointer in PDF image codec.
|
||||||
|
* [132156] High CVE-2012-2833: Buffer overflow in PDF JS API.
|
||||||
|
* [132779] High CVE-2012-2834: Integer overflow in Matroska container.
|
||||||
|
* [127417] Medium CVE-2012-2825: Wild read in XSL handling.
|
||||||
|
* [64-bit Linux only] [129930] High CVE-2012-2807: Integer overflows in
|
||||||
|
libxml.
|
||||||
|
|
||||||
|
* Wed Jun 20 2012 Claudio Matsuoka <claudio@mandriva.com> 19.0.1084.56-1
|
||||||
+ Revision: 806474
|
+ Revision: 806474
|
||||||
- new upstream release 19.0.1084.56 (140965)
|
- new upstream release 19.0.1084.56 (140965)
|
||||||
- use system xdg utils
|
- use system xdg utils
|
||||||
|
|
|
||||||
|
|
@ -1,45 +0,0 @@
|
||||||
rm chrome/app/theme/app_list_settings.png
|
|
||||||
rm chrome/app/theme/chromium/sync_promo_info_graphic.png
|
|
||||||
rm chrome/app/theme/chromium/sync_promo_info_graphic_1.png
|
|
||||||
rm chrome/browser/resources/options/amex.png
|
|
||||||
rm chrome/browser/resources/options/cc-generic.png
|
|
||||||
rm chrome/browser/resources/options/chromeos/headset.png
|
|
||||||
rm chrome/browser/resources/options/chromeos/keyboard.png
|
|
||||||
rm chrome/browser/resources/options/chromeos/mouse.png
|
|
||||||
rm chrome/browser/resources/options/chromeos/warning.png
|
|
||||||
rm chrome/browser/resources/options/diners.png
|
|
||||||
rm chrome/browser/resources/options/discover.png
|
|
||||||
rm chrome/browser/resources/options/jcb.png
|
|
||||||
rm chrome/browser/resources/options/mastercard.png
|
|
||||||
rm chrome/browser/resources/options/show_password.png
|
|
||||||
rm chrome/browser/resources/options/solo.png
|
|
||||||
rm chrome/browser/resources/options/success-large.png
|
|
||||||
rm chrome/browser/resources/options/visa.png
|
|
||||||
rm chrome/browser/resources/options/zippy.png
|
|
||||||
rm chrome/browser/resources/options2/amex.png
|
|
||||||
rm chrome/browser/resources/options2/cc-generic.png
|
|
||||||
rm chrome/browser/resources/options2/diners.png
|
|
||||||
rm chrome/browser/resources/options2/discover.png
|
|
||||||
rm chrome/browser/resources/options2/jcb.png
|
|
||||||
rm chrome/browser/resources/options2/mastercard.png
|
|
||||||
rm chrome/browser/resources/options2/show_password.png
|
|
||||||
rm chrome/browser/resources/options2/solo.png
|
|
||||||
rm chrome/browser/resources/options2/visa.png
|
|
||||||
rm chrome/browser/resources/shared/images/google-logo-41.png
|
|
||||||
rm chrome/browser/resources/shared/images/google-mail.png
|
|
||||||
rm chrome/browser/resources/shared/images/sync-backup.png
|
|
||||||
rm chrome/browser/resources/shared/images/sync.png
|
|
||||||
rm ui/gfx/resources/chromeos_scroll_arrow_down.png
|
|
||||||
rm ui/gfx/resources/chromeos_scroll_arrow_down_h.png
|
|
||||||
rm ui/gfx/resources/chromeos_scroll_arrow_down_p.png
|
|
||||||
rm ui/gfx/resources/chromeos_scroll_arrow_up.png
|
|
||||||
rm ui/gfx/resources/chromeos_scroll_arrow_up_h.png
|
|
||||||
rm ui/gfx/resources/chromeos_scroll_arrow_up_p.png
|
|
||||||
rm ui/gfx/resources/chromeos_scroll_background.png
|
|
||||||
rm ui/gfx/resources/chromeos_scroll_background_border_down.png
|
|
||||||
rm ui/gfx/resources/chromeos_scroll_background_border_up.png
|
|
||||||
rm ui/gfx/resources/chromeos_scroll_thumb.png
|
|
||||||
rm ui/gfx/resources/chromeos_scroll_thumb_h.png
|
|
||||||
rm ui/gfx/resources/chromeos_scroll_thumb_p.png
|
|
||||||
rm ui/resources/aura/status_bluetooth_large.png
|
|
||||||
rm ui/resources/aura/status_bluetooth_small.png
|
|
||||||
|
|
@ -1,39 +0,0 @@
|
||||||
rm chrome/app/theme/icon_add_user20.png
|
|
||||||
rm chrome/app/theme/icon_power20.png
|
|
||||||
rm chrome/browser/resources/file_manager/images/icon_list_view_off.png
|
|
||||||
rm chrome/browser/resources/file_manager/images/icon_list_view_on.png
|
|
||||||
rm chrome/browser/resources/file_manager/images/icon_thumb_view_off.png
|
|
||||||
rm chrome/browser/resources/file_manager/images/icon_thumb_view_on.png
|
|
||||||
rm ui/resources/aura/system_update.png
|
|
||||||
rm ui/resources/aura/wallpapers/wallpaper_0.png
|
|
||||||
rm ui/resources/aura/wallpapers/wallpaper_0_thumb.png
|
|
||||||
rm ui/resources/aura/wallpapers/wallpaper_1.png
|
|
||||||
rm ui/resources/aura/wallpapers/wallpaper_10.png
|
|
||||||
rm ui/resources/aura/wallpapers/wallpaper_10_thumb.png
|
|
||||||
rm ui/resources/aura/wallpapers/wallpaper_11.png
|
|
||||||
rm ui/resources/aura/wallpapers/wallpaper_11_thumb.png
|
|
||||||
rm ui/resources/aura/wallpapers/wallpaper_12.png
|
|
||||||
rm ui/resources/aura/wallpapers/wallpaper_12_thumb.png
|
|
||||||
rm ui/resources/aura/wallpapers/wallpaper_1_thumb.png
|
|
||||||
rm ui/resources/aura/wallpapers/wallpaper_2.png
|
|
||||||
rm ui/resources/aura/wallpapers/wallpaper_2_thumb.png
|
|
||||||
rm ui/resources/aura/wallpapers/wallpaper_3.png
|
|
||||||
rm ui/resources/aura/wallpapers/wallpaper_3_thumb.png
|
|
||||||
rm ui/resources/aura/wallpapers/wallpaper_4.png
|
|
||||||
rm ui/resources/aura/wallpapers/wallpaper_4_thumb.png
|
|
||||||
rm ui/resources/aura/wallpapers/wallpaper_5.png
|
|
||||||
rm ui/resources/aura/wallpapers/wallpaper_5_thumb.png
|
|
||||||
rm ui/resources/aura/wallpapers/wallpaper_6.png
|
|
||||||
rm ui/resources/aura/wallpapers/wallpaper_6_thumb.png
|
|
||||||
rm ui/resources/aura/wallpapers/wallpaper_7.png
|
|
||||||
rm ui/resources/aura/wallpapers/wallpaper_7_thumb.png
|
|
||||||
rm ui/resources/aura/wallpapers/wallpaper_8.png
|
|
||||||
rm ui/resources/aura/wallpapers/wallpaper_8_thumb.png
|
|
||||||
rm ui/resources/aura/wallpapers/wallpaper_9.png
|
|
||||||
rm ui/resources/aura/wallpapers/wallpaper_9_thumb.png
|
|
||||||
rm ui/resources/aura/window_fullscreen_close.png
|
|
||||||
rm ui/resources/aura/window_fullscreen_restore.png
|
|
||||||
rm ui/resources/aura/window_maximized_restore_snap_left_p.png
|
|
||||||
rm ui/resources/aura/window_maximized_restore_snap_minimize_p.png
|
|
||||||
rm ui/resources/aura/window_maximized_restore_snap_p.png
|
|
||||||
rm ui/resources/aura/window_maximized_restore_snap_right_p.png
|
|
||||||
Loading…
Add table
Reference in a new issue