mirror of
https://abf.rosa.ru/djam/chromium-browser-stable-test.git
synced 2025-02-24 10:02:47 +00:00
update to 30.0.1599.66
This commit is contained in:
parent
48dc9fa43d
commit
bed247d46d
8 changed files with 19 additions and 86 deletions
2
.abf.yml
2
.abf.yml
|
@ -1,3 +1,3 @@
|
|||
sources:
|
||||
"icons.tar.bz2": a835954af164bf38f8ea4ea80608839bed7800a3
|
||||
chromium-29.0.1547.65.tar.xz: 391679dead54ddc20ed0a3b95becd697b59d9d48
|
||||
chromium-30.0.1599.66.tar.xz: b6970ad5972906ac9cf482700d54209ffda50ea2
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
diff -urN chromium-20.0.1132.47.orig/chrome/browser/first_run/first_run_linux.cc chromium-20.0.1132.47/chrome/browser/first_run/first_run_linux.cc
|
||||
--- chromium-20.0.1132.47.orig/chrome/browser/first_run/first_run_linux.cc 2012-07-09 18:31:56.482914645 +0400
|
||||
+++ chromium-20.0.1132.47/chrome/browser/first_run/first_run_linux.cc 2012-07-09 18:34:30.879943380 +0400
|
||||
@@ -101,8 +101,7 @@
|
||||
FilePath MasterPrefsPath() {
|
||||
// The standard location of the master prefs is next to the chrome binary.
|
||||
FilePath master_prefs;
|
||||
- if (!PathService::Get(base::DIR_EXE, &master_prefs))
|
||||
- return FilePath();
|
||||
+ master_prefs = FilePath("/etc/chromium-browser");
|
||||
return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- chromium-21.0.1171.0/third_party/WebKit/Source/WTF/wtf/RefPtr.h.orig 2012-06-15 20:48:49.000000000 +0000
|
||||
+++ chromium-21.0.1171.0/third_party/WebKit/Source/WTF/wtf/RefPtr.h 2012-06-15 20:49:00.000000000 +0000
|
||||
@@ -53,7 +53,7 @@ namespace WTF {
|
||||
RefPtr(HashTableDeletedValueType) : m_ptr(hashTableDeletedValue()) { }
|
||||
bool isHashTableDeletedValue() const { return m_ptr == hashTableDeletedValue(); }
|
||||
|
||||
- ALWAYS_INLINE ~RefPtr() { derefIfNotNull(m_ptr); }
|
||||
+ /*ALWAYS_INLINE*/ ~RefPtr() { derefIfNotNull(m_ptr); }
|
||||
|
||||
T* get() const { return m_ptr; }
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
diff -p -up chromium/src/chrome/browser/resources/uber/uber.js.webkitTransform-exception chromium/src/chrome/browser/resources/uber/uber.js
|
||||
--- chromium/src/chrome/browser/resources/uber/uber.js.webkitTransform-exception 2012-12-09 04:07:44.241173447 +0100
|
||||
+++ chromium/src/chrome/browser/resources/uber/uber.js 2012-12-09 04:09:24.435987728 +0100
|
||||
@@ -320,6 +320,7 @@ cr.define('uber', function() {
|
||||
var navWidth = Math.max(0, +navFrame.dataset.width + scrollOffset);
|
||||
navFrame.style.width = navWidth + 'px';
|
||||
} else {
|
||||
+ var foo = "bar" + scrollOffset;
|
||||
navFrame.style.webkitTransform = 'translateX(' + -scrollOffset + 'px)';
|
||||
}
|
||||
}
|
||||
diff -p -up chromium/src/chrome/browser/resources/uber/uber_utils.js.webkitTransform-exception chromium/src/chrome/browser/resources/uber/uber_utils.js
|
||||
--- chromium/src/chrome/browser/resources/uber/uber_utils.js.webkitTransform-exception 2012-12-09 04:07:47.937092823 +0100
|
||||
+++ chromium/src/chrome/browser/resources/uber/uber_utils.js 2012-12-09 04:09:52.865367531 +0100
|
||||
@@ -35,6 +35,7 @@ cr.define('uber', function() {
|
||||
* @private
|
||||
*/
|
||||
function handleScroll() {
|
||||
+ var foo = "bar" + document.body.scrollLeft;
|
||||
var offset = document.body.scrollLeft * -1;
|
||||
for (var i = 0; i < headerElements.length; i++)
|
||||
headerElements[i].style.webkitTransform = 'translateX(' + offset + 'px)';
|
|
@ -1,13 +0,0 @@
|
|||
diff -urN chromium-26.0.1410.46.orig/third_party/WebKit/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp chromium-26.0.1410.46/third_party/WebKit/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp
|
||||
--- chromium-26.0.1410.46.orig/third_party/WebKit/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp 2013-04-17 18:09:26.031613138 +0400
|
||||
+++ chromium-26.0.1410.46/third_party/WebKit/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp 2013-04-17 18:12:13.263019259 +0400
|
||||
@@ -329,6 +329,9 @@
|
||||
hb_buffer_set_script(harfBuzzBuffer.get(), currentRun->script());
|
||||
if (shouldSetDirection)
|
||||
hb_buffer_set_direction(harfBuzzBuffer.get(), currentRun->rtl() ? HB_DIRECTION_RTL : HB_DIRECTION_LTR);
|
||||
+ else
|
||||
+ // Leaving direction to HarfBuzz to guess is *really* bad, but will do for now.
|
||||
+ hb_buffer_guess_segment_properties(harfBuzzBuffer.get());
|
||||
|
||||
// Add a space as pre-context to the buffer. This prevents showing dotted-circle
|
||||
// for combining marks at the beginning of runs.
|
|
@ -1,13 +0,0 @@
|
|||
diff -urN chromium-26.0.1410.46.orig/chrome/browser/first_run/first_run_linux.cc chromium-26.0.1410.46/chrome/browser/first_run/first_run_linux.cc
|
||||
--- chromium-26.0.1410.46.orig/chrome/browser/first_run/first_run_linux.cc 2013-03-24 17:04:54.631372548 +0400
|
||||
+++ chromium-26.0.1410.46/chrome/browser/first_run/first_run_linux.cc 2013-03-24 17:08:25.165502064 +0400
|
||||
@@ -71,8 +71,7 @@
|
||||
base::FilePath MasterPrefsPath() {
|
||||
// The standard location of the master prefs is next to the chrome binary.
|
||||
base::FilePath master_prefs;
|
||||
- if (!PathService::Get(base::DIR_EXE, &master_prefs))
|
||||
- return base::FilePath();
|
||||
+ master_prefs = base::FilePath("/etc/chromium-browser");
|
||||
return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
|
||||
}
|
||||
|
13
chromium-30.0.1599.66-master-prefs-path.patch
Normal file
13
chromium-30.0.1599.66-master-prefs-path.patch
Normal file
|
@ -0,0 +1,13 @@
|
|||
diff -urN chromium-30.0.1599.66.orig/chrome/browser/first_run/first_run_internal_linux.cc chromium-30.0.1599.66/chrome/browser/first_run/first_run_internal_linux.cc
|
||||
--- chromium-30.0.1599.66.orig/chrome/browser/first_run/first_run_internal_linux.cc 2013-10-04 13:51:55.589208095 +0400
|
||||
+++ chromium-30.0.1599.66/chrome/browser/first_run/first_run_internal_linux.cc 2013-10-04 13:52:49.035210352 +0400
|
||||
@@ -20,8 +20,7 @@
|
||||
base::FilePath MasterPrefsPath() {
|
||||
// The standard location of the master prefs is next to the chrome binary.
|
||||
base::FilePath master_prefs;
|
||||
- if (!PathService::Get(base::DIR_EXE, &master_prefs))
|
||||
- return base::FilePath();
|
||||
+ master_prefs = base::FilePath("/etc/chromium");
|
||||
return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
|
||||
}
|
||||
|
|
@ -1,10 +1,9 @@
|
|||
%define revision 220622
|
||||
%define crname chromium-browser
|
||||
%define _crdir %{_libdir}/%{crname}
|
||||
%define _src %{_topdir}/SOURCES
|
||||
|
||||
Name: chromium-browser-stable
|
||||
Version: 29.0.1547.65
|
||||
Version: 30.0.1599.66
|
||||
Release: 1
|
||||
Summary: A fast webkit-based web browser
|
||||
Group: Networking/WWW
|
||||
|
@ -16,14 +15,8 @@ Source30: master_preferences
|
|||
Source31: default_bookmarks.html
|
||||
Source2: chromium-browser.desktop
|
||||
Source100: icons.tar.bz2
|
||||
#Patch0: chromium-21.0.1171.0-remove-inline.patch
|
||||
Patch4: chromium-27.0.1453.93-master-prefs-path.patch
|
||||
Patch4: chromium-30.0.1599.66-master-prefs-path.patch
|
||||
Patch5: chromium-browser-big-icon.patch
|
||||
# (cjw) fix "Uncaught exception" in 2 calls to webkitTransform (hack, need to test if this is still needed)
|
||||
# http://code.google.com/p/chromium/issues/detail?id=152407
|
||||
#Patch6: chromium-25-webkitTransform-exception.patch
|
||||
# (cjw) fix "Unable to set period time" alsa error, taken from chromiumOS
|
||||
|
||||
# PATCH-FIX-OPENSUSE patches in system glew library
|
||||
Patch13: chromium-25.0.1364.172-system-glew.patch
|
||||
# PATCH-FIX-OPENSUSE removes build part for courgette
|
||||
|
@ -95,17 +88,13 @@ members of the Chromium and WebDriver teams.
|
|||
|
||||
%prep
|
||||
%setup -q -n chromium-%{version}
|
||||
#patch0 -p1 -b .remove-inline
|
||||
%patch4 -p1 -b .prefs
|
||||
%patch5 -p1 -b .big-icon
|
||||
#patch6 -p2 -b .webkitTransform-exception
|
||||
|
||||
%patch13 -p1
|
||||
%patch14 -p1
|
||||
%patch15 -p1
|
||||
|
||||
echo "%{revision}" > build/LASTCHANGE.in
|
||||
|
||||
# Hard code extra version
|
||||
FILE=chrome/common/chrome_version_info_posix.cc
|
||||
sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"%{product_vendor} %{product_version}"/' $FILE
|
||||
|
@ -268,6 +257,9 @@ rm -rf %{buildroot}
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Oct 7 2013 Arkady L. Shane <arkady.shane@rosalab.ru> 30.0.1599.66-1
|
||||
- update to 30.0.1599.66
|
||||
|
||||
* Wed Sep 4 2013 Arkady L. Shane <arkady.shane@rosalab.ru> 29.0.1547.65-1
|
||||
- update to 29.0.1547.65
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue