From 8152a6cab8f1d8364a773fadf606c4ce1053177d Mon Sep 17 00:00:00 2001 From: Rosa Date: Thu, 5 Jul 2012 00:44:59 +0000 Subject: [PATCH] Automatic import for version 19.0.1084.56 --- .abf.yml | 18 ++-- chromium-16.0.912.32-include-glib.patch | 11 --- ...> chromium-19.0.1077.3-remove-inline.patch | 4 +- chromium-browser-stable.spec | 89 +++++++++++++------ script-19.0.1077.3-19.0.1081.2.sh | 45 ++++++++++ script-19.0.1081.2-19.0.1084.15.sh | 39 ++++++++ 6 files changed, 161 insertions(+), 45 deletions(-) delete mode 100644 chromium-16.0.912.32-include-glib.patch rename chromium-17.0.963.12-remove-inline.patch => chromium-19.0.1077.3-remove-inline.patch (62%) create mode 100755 script-19.0.1077.3-19.0.1081.2.sh create mode 100755 script-19.0.1081.2-19.0.1084.15.sh diff --git a/.abf.yml b/.abf.yml index da268b3..784ad91 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,7 +1,15 @@ --- sources: - chromium-18.0.1025.113.tar.xz: eae684176def5386a3e157e1337ac230d29b6f04 - patch-18.0.1025.113-18.0.1025.142.diff.xz: 1c61dc8f5df0030d515a25dcdd369ba69cb7fff0 - patch-18.0.1025.142-18.0.1025.151.diff.xz: e49330864e6a91aeaea17f58a2410325fe228c6e - patch-18.0.1025.151-18.0.1025.162.diff.xz: 3f6cd43e556d604795dc7a92f5ba86e56f3534f5 - patch-18.0.1025.162-18.0.1025.168.diff.xz: 38d88d59e8eb008737f04808a2329a2108d1b479 + binary-19.0.1077.3-19.0.1081.2.tar.xz: c4b42d30236bc07eaf65856cc0df2e129f760723 + 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 diff --git a/chromium-16.0.912.32-include-glib.patch b/chromium-16.0.912.32-include-glib.patch deleted file mode 100644 index b09f2ec..0000000 --- a/chromium-16.0.912.32-include-glib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- chromium-16.0.904.0/ui/base/l10n/l10n_util.cc.orig 2011-11-12 10:20:13.000000000 +0000 -+++ chromium-16.0.904.0/ui/base/l10n/l10n_util.cc 2011-11-12 10:20:50.000000000 +0000 -@@ -5,7 +5,7 @@ - #include "ui/base/l10n/l10n_util.h" - - #if defined(USE_X11) --#include -+#include - #endif - - #include diff --git a/chromium-17.0.963.12-remove-inline.patch b/chromium-19.0.1077.3-remove-inline.patch similarity index 62% rename from chromium-17.0.963.12-remove-inline.patch rename to chromium-19.0.1077.3-remove-inline.patch index 6ba9ca1..ad64c7a 100644 --- a/chromium-17.0.963.12-remove-inline.patch +++ b/chromium-19.0.1077.3-remove-inline.patch @@ -1,5 +1,5 @@ ---- chromium-17.0.963.0/third_party/WebKit/Source/JavaScriptCore/wtf/RefPtr.h.orig 2011-12-16 16:20:36.000000000 +0000 -+++ chromium-17.0.963.0/third_party/WebKit/Source/JavaScriptCore/wtf/RefPtr.h 2011-12-16 16:21:21.000000000 +0000 +--- chromium-19.0.1077.3/third_party/WebKit/Source/WTF/wtf/RefPtr.h.orig 2012-06-19 17:57:14.000000000 +0000 ++++ chromium-19.0.1077.3/third_party/WebKit/Source/WTF/wtf/RefPtr.h 2012-06-19 17:57:25.000000000 +0000 @@ -55,7 +55,7 @@ namespace WTF { RefPtr(HashTableDeletedValueType) : m_ptr(hashTableDeletedValue()) { } bool isHashTableDeletedValue() const { return m_ptr == hashTableDeletedValue(); } diff --git a/chromium-browser-stable.spec b/chromium-browser-stable.spec index 4342080..ce4dbec 100644 --- a/chromium-browser-stable.spec +++ b/chromium-browser-stable.spec @@ -1,12 +1,12 @@ -%define revision 134367 +%define revision 140965 %define crname chromium-browser %define _crdir %{_libdir}/%{crname} %define _src %{_topdir}/SOURCES -%define basever 18.0.1025.113 +%define basever 19.0.1077.3 %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 -Version: 18.0.1025.168 +Version: 19.0.1084.56 Release: %mkrel 1 Summary: A fast webkit-based web browser Group: Networking/WWW @@ -14,12 +14,21 @@ License: BSD, LGPL Source0: chromium-%{basever}.tar.xz Source1: chromium-wrapper Source2: chromium-browser.desktop -Source1000: patch-18.0.1025.113-18.0.1025.142.diff.xz -Source1001: patch-18.0.1025.142-18.0.1025.151.diff.xz -Source1002: patch-18.0.1025.151-18.0.1025.162.diff.xz -Source1003: patch-18.0.1025.162-18.0.1025.168.diff.xz -Patch0: chromium-16.0.912.32-include-glib.patch -Patch1: chromium-17.0.963.12-remove-inline.patch +Patch0: chromium-19.0.1077.3-remove-inline.patch +Source1000: patch-19.0.1077.3-19.0.1081.2.diff.xz +Source1001: binary-19.0.1077.3-19.0.1081.2.tar.xz +Source1002: script-19.0.1077.3-19.0.1081.2.sh +Source1003: patch-19.0.1081.2-19.0.1084.15.diff.xz +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} Conflicts: chromium-browser-unstable Conflicts: chromium-browser-beta @@ -27,12 +36,12 @@ Obsoletes: chromium-browser < 1:9.0.597.94 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: bison, flex, gtk2-devel, atk-devel, libexpat-devel, gperf BuildRequires: nspr-devel, nss-devel, libalsa-devel -BuildRequires: libglib2-devel, libbzip2-devel, zlib-devel, libpng-devel -BuildRequires: libjpeg-devel, libmesagl-devel, libmesaglu-devel -BuildRequires: libxscrnsaver-devel, libdbus-glib-devel, cups-devel +BuildRequires: glib2-devel, bzip2-devel, zlib-devel, png-devel +BuildRequires: jpeg-devel, mesagl-devel, mesaglu-devel +BuildRequires: libxscrnsaver-devel, dbus-glib-devel, cups-devel BuildRequires: libgnome-keyring-devel libvpx-devel libxtst-devel BuildRequires: libxslt-devel libxml2-devel libxt-devel pam-devel -BuildRequires: libevent-devel libflac-devel libpulseaudio-devel +BuildRequires: libevent-devel libflac-devel pulseaudio-devel BuildRequires: elfutils-devel udev-devel ExclusiveArch: i586 x86_64 armv7l @@ -68,18 +77,27 @@ chromium-browser-unstable package instead. %prep %setup -q -n chromium-%{basever} -%patch0 -p1 -b .include-glib -# for 2010.1 -%patch1 -p1 -b .remove-inline -%patchver 18.0.1025.113 18.0.1025.142 -%patchver 18.0.1025.142 18.0.1025.151 -%patchver 18.0.1025.151 18.0.1025.162 -%patchver 18.0.1025.162 18.0.1025.168 +%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 echo "%{revision}" > build/LASTCHANGE.in # Hard code extra version -FILE=chrome/common/chrome_version_info_linux.cc +FILE=chrome/common/chrome_version_info_posix.cc sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"%{product_vendor} %{product_version}"/' $FILE cmp $FILE $FILE.orig && exit 1 @@ -95,6 +113,7 @@ build/gyp_chromium --depth=. \ -D use_system_libxml=1 \ -D use_system_zlib=1 \ -D use_system_bzip2=1 \ + -D use_system_xdg_utils=1 \ -D use_system_libpng=1 \ -D use_system_libjpeg=1 \ -D use_system_libevent=1 \ @@ -137,8 +156,8 @@ install -m 755 out/Release/nacl_helper %{buildroot}%{_crdir}/ install -m 644 out/Release/nacl_irt_*.nexe %{buildroot}%{_crdir}/ %endif install -m 644 out/Release/locales/*.pak %{buildroot}%{_crdir}/locales/ -install -m 755 out/Release/xdg-mime %{buildroot}%{_crdir}/ -install -m 755 out/Release/xdg-settings %{buildroot}%{_crdir}/ +#install -m 755 out/Release/xdg-mime %{buildroot}%{_crdir}/ +#install -m 755 out/Release/xdg-settings %{buildroot}%{_crdir}/ install -m 644 out/Release/resources.pak %{buildroot}%{_crdir}/ install -m 644 chrome/browser/resources/default_apps/* %{buildroot}%{_crdir}/default_apps/ ln -s %{_crdir}/chromium-wrapper %{buildroot}%{_bindir}/%{crname} @@ -146,6 +165,14 @@ ln -s %{_crdir}/chromium-wrapper %{buildroot}%{_bindir}/%{crname} find out/Release/resources/ -name "*.d" -exec rm {} \; cp -r out/Release/resources %{buildroot}%{_crdir} +# Strip NaCl IRT +%ifarch x86_64 +./native_client/toolchain/linux_x86_newlib/bin/x86_64-nacl-strip --strip-debug %{buildroot}%{_crdir}/nacl_irt_x86_64.nexe +%endif +%ifarch i586 +./native_client/toolchain/linux_x86_newlib/bin/i686-nacl-strip --strip-debug %{buildroot}%{_crdir}/nacl_irt_x86_32.nexe +%endif + # desktop file mkdir -p %{buildroot}%{_datadir}/applications install -m 644 %{_src}/%{crname}.desktop %{buildroot}%{_datadir}/applications/ @@ -181,16 +208,24 @@ rm -rf %{buildroot} %{_crdir}/resources %{_crdir}/themes %{_crdir}/default_apps -%{_crdir}/xdg-mime -%{_crdir}/xdg-settings +#%{_crdir}/xdg-mime +#%{_crdir}/xdg-settings %{_mandir}/man1/%{crname}* %{_datadir}/applications/*.desktop %{_iconsdir}/hicolor/*/apps/%{crname}.png %changelog -* Wed May 02 2012 Claudio Matsuoka 18.0.1025.168-1mdv2011.0 -+ Revision: 795190 +* Tue Jun 19 2012 Claudio Matsuoka 19.0.1084.56-1mdv2011.0 ++ Revision: 806274 +- new upstream release 19.0.1084.56 (140965) +- use system xdg utils +- strip debug from NaCl IRT files +- new upstream release 19.0.1084.52 (138391) +- new upstream release 19.0.1084.41 (134854) +- move chromium 19 from beta to stable +- remove chromium 18 +- fix pulseaudio-devel dependency package name - requires libudev devel - new upstream release 18.0.1025.168 (134367) * [106413] High CVE-2011-3078: Use after free in floats handling diff --git a/script-19.0.1077.3-19.0.1081.2.sh b/script-19.0.1077.3-19.0.1081.2.sh new file mode 100755 index 0000000..2fea6a3 --- /dev/null +++ b/script-19.0.1077.3-19.0.1081.2.sh @@ -0,0 +1,45 @@ +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 diff --git a/script-19.0.1081.2-19.0.1084.15.sh b/script-19.0.1081.2-19.0.1084.15.sh new file mode 100755 index 0000000..9e39a99 --- /dev/null +++ b/script-19.0.1081.2-19.0.1084.15.sh @@ -0,0 +1,39 @@ +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