- 15.0.867.0, r98911 builds now; cleanups

Changed files:
    chromium-browser.spec -> 1.133
    search-workaround.patch -> 1.6

diff --git a/chromium-browser.spec b/chromium-browser.spec
index 2f76d5c6c71b46523ccb7bc4e0d00b18d72e1151..6039dbe73fb906837bfb22b0c1148403764e1c9a 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -47,19 +47,19 @@
 # or:
 # http://carme.pld-linux.org/~glen/chromium-browser/th/x86_64/chromium-nightly.conf
 
-%define                svndate 20110830
-%define                svnver  98749
-%define                rel             0.1
+%define                svndate 20110831
+%define                svnver  98911
+%define                rel             1
 
 %define                gyp_rev 1014
 Summary:       A WebKit powered web browser
 Name:          chromium-browser
-Version:       15.0.866.0
+Version:       15.0.867.0
 Release:       0.%{svnver}.%{rel}
 License:       BSD, LGPL v2+ (ffmpeg)
 Group:         X11/Applications/Networking
 Source0:       http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser/%{name}_%{version}~svn%{svndate}r%{svnver}.orig.tar.gz
-# Source0-md5: 1e329b92d89e1a668b29101c2c91378b
+# Source0-md5: ff99ac06796cf69e19a89f89e9e1f898
 Source2:       %{name}.sh
 Source3:       %{name}.desktop
 Source4:       find-lang.sh
@@ -68,8 +68,6 @@ Patch0:               system-libs.patch
 Patch1:                plugin-searchdirs.patch
 Patch2:                gyp-system-minizip.patch
 Patch3:                disable_dlog_and_dcheck_in_release_builds.patch
-# http://aur.archlinux.org/packages/chromium-browser-svn/chromium-browser-svn/search-workaround.patch
-#Patch4:               search-workaround.patch
 Patch5:                options-support.patch
 Patch6:                get-webkit_revision.patch
 Patch7:                dlopen_sonamed_gl.patch
@@ -194,7 +192,6 @@ sed -e 's/@BUILD_DIST@/PLD %{pld_version}/g' \
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-#%patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1

diff --git a/search-workaround.patch b/search-workaround.patch
deleted file mode 100644 (file)
index b0ea0c2..0000000
--- a/search-workaround.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- chromium-browser-13.0.763.0~svn20110512r85088/src/chrome/browser/search_engines/template_url.cc.orig       2011-05-12 04:00:22.000000000 +0200
-+++ chromium-browser-13.0.763.0~svn20110512r85088/src/chrome/browser/search_engines/template_url.cc    2011-05-12 18:20:21.260874114 +0200
-@@ -347,28 +347,28 @@
-        i != replacements_.rend(); ++i) {
-     switch (i->type) {
-       case ENCODING:
--        url.insert(i->index, input_encoding);
-+        /* Temporary workaround according to http://crbug.com/41887 */
-+        url.replace(i->index, 0, input_encoding);
-         break;
- 
-       case GOOGLE_ACCEPTED_SUGGESTION:
-         if (accepted_suggestion == NO_SUGGESTION_CHOSEN)
--          url.insert(i->index, "aq=f&");
-+          url.replace(i->index, 0, "aq=f&");
-         else if (accepted_suggestion != NO_SUGGESTIONS_AVAILABLE)
--          url.insert(i->index,
--                     base::StringPrintf("aq=%d&", accepted_suggestion));
-+          url.replace(i->index, 0, base::StringPrintf("aq=%d&", accepted_suggestion));
-         break;
- 
-       case GOOGLE_BASE_URL:
--        url.insert(i->index, search_terms_data.GoogleBaseURLValue());
-+        url.replace(i->index, 0, search_terms_data.GoogleBaseURLValue());
-         break;
- 
-       case GOOGLE_BASE_SUGGEST_URL:
--        url.insert(i->index, search_terms_data.GoogleBaseSuggestURLValue());
-+        url.replace(i->index, 0, search_terms_data.GoogleBaseSuggestURLValue());
-         break;
- 
-       case GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION:
-         if (accepted_suggestion >= 0)
--          url.insert(i->index, "oq=" + UTF16ToUTF8(encoded_original_query) +
-+          url.replace(i->index, 0, "oq=" +UTF16ToUTF8(encoded_original_query) +
-                                "&");
-         break;
- 
-@@ -392,17 +392,17 @@
-         base::UTF16ToCodepage(terms, input_encoding.c_str(),
-                               base::OnStringConversionError::SKIP,
-                               &unescaped_terms);
--        url.insert(i->index, std::string(unescaped_terms.begin(),
-+        url.replace(i->index, 0, std::string(unescaped_terms.begin(),
-                                          unescaped_terms.end()));
-         break;
-       }
- 
-       case LANGUAGE:
--        url.insert(i->index, search_terms_data.GetApplicationLocale());
-+        url.replace(i->index, 0, search_terms_data.GetApplicationLocale());
-         break;
- 
-       case SEARCH_TERMS:
--        url.insert(i->index, UTF16ToUTF8(encoded_terms));
-+        url.replace(i->index, 0, UTF16ToUTF8(encoded_terms));
-         break;
- 
-       default: