Git-Url: https://github.com/frugalware/frugalware-current/commit/46756d6a8a54954336cc8910384adb874fbc755b
commit 46756d6a8a54954336cc8910384adb874fbc755b Author: Devil505 <devil505li...@gmail.com> Date: Fri Nov 11 09:26:54 2011 +0100 chromium-browser-15.0.874.120-1-i686 * removed patch diff --git a/source/xapps-extra/chromium-browser/FrugalBuild b/source/xapps-extra/chromium-browser/FrugalBuild index dd773dd..715c986 100644 --- a/source/xapps-extra/chromium-browser/FrugalBuild +++ b/source/xapps-extra/chromium-browser/FrugalBuild @@ -19,13 +19,11 @@ _F_archive_name="chromium" up2date="Flasttar http://gsdview.appspot.com/chromium-browser-official/"; source=(http://commondatastorage.googleapis.com/chromium-browser-official/$_F_archive_name-$pkgver.tar.bz2 \ gcc-4.6.patch \ - fix-downloads-on-ntfs.patch \ nacl.gypi \ $pkgname.desktop \ $pkgname.sh) sha1sums=('ba1df188fc786334cee8d623b3d6123599a802f7' \ '39999918746524fff30e73dc656754733df5c2c2' \ - 'cafdd775e3de3e9818eca3f55ac37c97492bd166' \ 'df4cee39e1d49e10f9c075f5e6e9db28e8260926' \ '78ed8913b8a598de6a9e45d206973a846dbe8a51' \ 'e06de4aee77b3deb77e3b08ebb175ec02da42ced') diff --git a/source/xapps-extra/chromium-browser/fix-downloads-on-ntfs.patch b/source/xapps-extra/chromium-browser/fix-downloads-on-ntfs.patch deleted file mode 100644 index 2a994d8..0000000 --- a/source/xapps-extra/chromium-browser/fix-downloads-on-ntfs.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- trunk/src/content/browser/download/base_file.cc 2011/11/03 00:57:14 108379 -+++ trunk/src/content/browser/download/base_file.cc 2011/11/03 00:57:22 108380 -@@ -332,16 +332,19 @@ - int stat_error = stat(new_path.value().c_str(), &st); - bool stat_succeeded = (stat_error == 0); - if (!stat_succeeded) -- return LOG_ERROR("stat", net::MapSystemError(errno)); -+ LOG_ERROR("stat", net::MapSystemError(errno)); - - // TODO(estade): Move() falls back to copying and deleting when a simple - // rename fails. Copying sucks for large downloads. crbug.com/8737 - if (!file_util::Move(full_path_, new_path)) - return LOG_ERROR("Move", net::MapSystemError(errno)); - -- int chmod_error = chmod(new_path.value().c_str(), st.st_mode); -- if (chmod_error < 0) -- return LOG_ERROR("chmod", net::MapSystemError(errno)); -+ if (stat_succeeded) { -+ // On Windows file systems (FAT, NTFS), chmod fails. This is OK. -+ int chmod_error = chmod(new_path.value().c_str(), st.st_mode); -+ if (chmod_error < 0) -+ LOG_ERROR("chmod", net::MapSystemError(errno)); -+ } - } - #endif _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
