Date: Thursday, December 17, 2009 @ 03:11:18 Author: pierre Revision: 61503
Merged revisions 61485,61502 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/chromium/trunk ........ r61485 | pierre | 2009-12-16 20:01:52 +0100 (Mi, 16 Dez 2009) | 1 line update desktop file from chrome upstream; remove unneeded files ........ r61502 | pierre | 2009-12-17 09:10:37 +0100 (Do, 17 Dez 2009) | 2 lines Update to Beta 2 ........ Modified: chromium/repos/extra-i686/ (properties) chromium/repos/extra-i686/PKGBUILD chromium/repos/extra-i686/chromium.desktop chromium/repos/extra-i686/chromium.sh chromium/repos/extra-i686/drop_sse2.patch chromium/repos/extra-i686/ffmpeg_branding_mime.patch ----------------------------+ PKGBUILD | 25 +++++----- chromium.desktop | 103 +++++++++++++++++++++++++++++++++++++++++++ chromium.sh | 1 drop_sse2.patch | 32 +------------ ffmpeg_branding_mime.patch | 2 5 files changed, 121 insertions(+), 42 deletions(-) Property changes on: chromium/repos/extra-i686 ___________________________________________________________________ Modified: svnmerge-integrated - /chromium/trunk:1-61244 + /chromium/trunk:1-61502 Modified: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2009-12-17 08:10:37 UTC (rev 61502) +++ extra-i686/PKGBUILD 2009-12-17 08:11:18 UTC (rev 61503) @@ -2,13 +2,13 @@ # Maintainer: Pierre Schmitz <[email protected]> pkgname=chromium -pkgver=4.0.249.30 -pkgrel=2 +pkgver=4.0.249.43 +pkgrel=1 pkgdesc='An open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web' arch=('i686' 'x86_64') url='http://www.chromium.org/' license=('BSD') -depends=('nss' 'gconf' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme') +depends=('nss' 'gconf' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme' 'bzip2' 'libxslt') makedepends=('python' 'perl' 'gperf') provides=('chromium-browser') conflicts=('chromium-browser') @@ -18,11 +18,11 @@ source=("ftp://ftp.archlinux.org/other/chromium/chromium-${pkgver}.tar.xz"; 'chromium.desktop' 'chromium.sh' 'drop_sse2.patch' 'ffmpeg_branding_mime.patch') -md5sums=('59d316bd0f319178e1faffce7b2c81d2' - '312df68330d6e288cbb2260bad620a32' - '2689154f4a41511e136d9594a0086aa0' - 'a4a920d7b198c0a2f6e39d60ec75abd5' - '5e36845dd9e053da3bf5fc814e502d68') +md5sums=('c8a5b5f918a0ea8a56f9c74bce2524f2' + '897de25e9c25a01f8b1b67abe554a6b7' + '93cd6f5f53b15546dc9d3de49118534c' + 'ddc1d741d50e8d46765a6b76e8faad32' + '95567a364197237dcefa3fabb5631822') build() { cd ${srcdir}/chromium-${pkgver} @@ -34,7 +34,12 @@ linux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ linux_strip_binary=1 \ release_extra_cflags='${CFLAGS}' \ - ffmpeg_branding=Chrome" + ffmpeg_branding=Chrome \ + use_system_libjpeg=1 \ + use_system_libxml=1 \ + use_system_libxslt=1 \ + use_system_bzip2=1 \ + use_system_libpng=1" patch -p0 -i ${srcdir}/ffmpeg_branding_mime.patch || return 1 @@ -56,8 +61,6 @@ install -m 4555 -o root -g root -D src/out/Release/chrome_sandbox ${pkgdir}/usr/lib/chromium/chromium-sandbox install -m 0644 -D src/out/Release/chrome.pak ${pkgdir}/usr/lib/chromium/chrome.pak install -m 0644 -D src/out/Release/libffmpegsumo.so ${pkgdir}/usr/lib/chromium/libffmpegsumo.so - install -m 0644 -D src/out/Release/product_logo_48.png ${pkgdir}/usr/lib/chromium/product_logo_48.png - install -m 0755 -D src/out/Release/xdg-settings ${pkgdir}/usr/lib/chromium/xdg-settings cp -a src/out/Release/locales src/out/Release/resources ${pkgdir}/usr/lib/chromium/ find ${pkgdir}/usr/lib/chromium/ -name '*.d' -type f -delete Modified: extra-i686/chromium.desktop =================================================================== --- extra-i686/chromium.desktop 2009-12-17 08:10:37 UTC (rev 61502) +++ extra-i686/chromium.desktop 2009-12-17 08:11:18 UTC (rev 61503) @@ -2,7 +2,110 @@ Version=1.0 Encoding=UTF-8 Name=Chromium +# Only KDE 4 seems to use GenericName, so we reuse the KDE strings. +# From Ubuntu's language-pack-kde-XX-base packages, version 9.04-20090413. GenericName=Web Browser +GenericName[ar]=متصفح الشبكة +GenericName[bg]=Уеб браузър +GenericName[ca]=Navegador web +GenericName[cs]=WWW prohlížeč +GenericName[da]=Browser +GenericName[de]=Web-Browser +GenericName[el]=Περιηγητής ιστού +GenericName[en_GB]=Web Browser +GenericName[es]=Navegador web +GenericName[et]=Veebibrauser +GenericName[fi]=WWW-selain +GenericName[fr]=Navigateur Web +GenericName[gu]=વેબ બ્રાઉઝર +GenericName[he]=דפדפן אינטרנט +GenericName[hi]=वेब ब्राउज़र +GenericName[hu]=Webböngésző +GenericName[it]=Browser Web +GenericName[ja]=ウェブブラウザ +GenericName[kn]=ಜಾಲ ವೀಕ್ಷಕ +GenericName[ko]=웹 브라우저 +GenericName[lt]=Žiniatinklio naršyklė +GenericName[lv]=Tīmekļa pārlūks +GenericName[ml]=വെബ് ബ്രൌസര് +GenericName[mr]=वेब ब्राऊजर +GenericName[nb]=Nettleser +GenericName[nl]=Webbrowser +GenericName[pl]=Przeglądarka WWW +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador da Internet +GenericName[ro]=Navigator de Internet +GenericName[ru]=Веб-браузер +GenericName[sl]=Spletni brskalnik +GenericName[sv]=Webbläsare +GenericName[ta]=இணைய உலாவி +GenericName[th]=เว็บเบราว์เซอร์ +GenericName[tr]=Web Tarayıcı +GenericName[uk]=Навігатор Тенет +GenericName[zh_CN]=网页浏览器 +GenericName[zh_HK]=網頁瀏覽器 +GenericName[zh_TW]=網頁瀏覽器 +# Not translated in KDE, from Epiphany 2.26.1-0ubuntu1. +GenericName[bn]=ওয়েব ব্রাউজার +GenericName[fil]=Web Browser +GenericName[hr]=Web preglednik +GenericName[id]=Browser Web +GenericName[or]=ଓ୍ବେବ ବ୍ରାଉଜର +GenericName[sk]=WWW prehliadač +GenericName[sr]=Интернет прегледник +GenericName[te]=మహాతల అన్వేషి +GenericName[vi]=Bộ duyệt Web +# Gnome and KDE 3 uses Comment. +Comment=Access the Internet +Comment[ar]=الدخول إلى الإنترنت +Comment[bg]=Достъп до интернет +Comment[bn]=ইন্টারনেটটি অ্যাক্সেস করুন +Comment[ca]=Accedeix a Internet +Comment[cs]=Přístup k internetu +Comment[da]=Få adgang til internettet +Comment[de]=Internetzugriff +Comment[el]=Πρόσβαση στο Διαδίκτυο +Comment[en_GB]=Access the Internet +Comment[es]=Accede a Internet. +Comment[et]=Pääs Internetti +Comment[fi]=Käytä internetiä +Comment[fil]=I-access ang Internet +Comment[fr]=Accéder à Internet +Comment[gu]=ઇંટરનેટ ઍક્સેસ કરો +Comment[he]=גישה אל האינטרנט +Comment[hi]=इंटरनेट तक पहुंच स्थापित करें +Comment[hr]=Pristup Internetu +Comment[hu]=Internetelérés +Comment[id]=Akses Internet +Comment[it]=Accesso a Internet +Comment[ja]=インターネットにアクセス +Comment[kn]=ಇಂಟರ್ನೆಟ್ ಅನ್ನು ಪ್ರವೇಶಿಸಿ +Comment[ko]=인터넷 연결 +Comment[lt]=Interneto prieiga +Comment[lv]=Piekļūt internetam +Comment[ml]=ഇന്റര്നെറ്റ് ആക്സസ് ചെയ്യുക +Comment[mr]=इंटरनेटमध्ये प्रवेश करा +Comment[nb]=Gå til Internett +Comment[nl]=Verbinding maken met internet +Comment[or]=ଇଣ୍ଟର୍ନେଟ୍ ପ୍ରବେଶ କରନ୍ତୁ +Comment[pl]=Skorzystaj z internetu +Comment[pt]=Aceder à Internet +Comment[pt_BR]=Acessar a internet +Comment[ro]=Accesaţi Internetul +Comment[ru]=Доступ в Интернет +Comment[sk]=Prístup do siete Internet +Comment[sl]=Dostop do interneta +Comment[sr]=Приступите Интернету +Comment[sv]=Gå ut på Internet +Comment[ta]=இணையத்தை அணுகுதல் +Comment[te]=ఇంటర్నెట్ను ఆక్సెస్ చెయ్యండి +Comment[th]=เข้าถึงอินเทอร์เน็ต +Comment[tr]=İnternet'e erişin +Comment[uk]=Доступ до Інтернету +Comment[vi]=Truy cập Internet +Comment[zh_CN]=访问互联网 +Comment[zh_HK]=連線到網際網路 +Comment[zh_TW]=連線到網際網路 Exec=chromium %U Terminal=false Icon=chromium Modified: extra-i686/chromium.sh =================================================================== --- extra-i686/chromium.sh 2009-12-17 08:10:37 UTC (rev 61502) +++ extra-i686/chromium.sh 2009-12-17 08:11:18 UTC (rev 61503) @@ -1,5 +1,4 @@ #!/bin/sh -export PATH=$PATH:/usr/lib/chromium export CHROME_WRAPPER=/usr/lib/chromium/chromium export CHROME_DESKTOP=chromium.desktop exec /usr/lib/chromium/chromium $@ Modified: extra-i686/drop_sse2.patch =================================================================== --- extra-i686/drop_sse2.patch 2009-12-17 08:10:37 UTC (rev 61502) +++ extra-i686/drop_sse2.patch 2009-12-17 08:11:18 UTC (rev 61503) @@ -1,17 +1,6 @@ ---- - build/common.gypi | 19 ++++++++++--------- - 1 file changed, 10 insertions(+), 9 deletions(-) - -Index: src/build/common.gypi -=================================================================== ---- src.orig/build/common.gypi -+++ src/build/common.gypi -@@ -386,25 +386,26 @@ - # - # -mfpmath=sse -msse2 makes the compiler use SSE instructions - # which keep floating-point values in SSE registers in its - # native precision (32-bit for single precision, and 64-bit for - # double precision values). This means the floating-point value +--- src/build/common.gypi 2009-12-17 01:57:20.000000000 +0100 ++++ src/build/common.gypi 2009-12-17 02:37:05.663568345 +0100 +@@ -652,15 +652,6 @@ # used during computation does not change depending on how the # compiler optimized the code, since the value is always kept # in its specified precision. @@ -24,21 +13,6 @@ - ], - }], - ], -+ # Disabled: see http://code.google.com/p/chromium/issues/detail?id=9007 -+ # 'conditions': [ -+ # ['branding=="Chromium"', { -+ # 'cflags': [ -+ # '-march=pentium4', -+ # '-msse2', -+ # '-mfpmath=sse', -+ # ], -+ # }], -+ # ], 'cflags': [ '-m32', ], - 'ldflags': [ - '-m32', - ], - }], - ], Modified: extra-i686/ffmpeg_branding_mime.patch =================================================================== --- extra-i686/ffmpeg_branding_mime.patch 2009-12-17 08:10:37 UTC (rev 61502) +++ extra-i686/ffmpeg_branding_mime.patch 2009-12-17 08:11:18 UTC (rev 61503) @@ -1,4 +1,4 @@ ---- src/net/base/mime_util.cc.orig 2009-12-13 19:09:26.467781732 +0100 +--- src/net/base/mime_util.cc 2009-12-13 19:09:26.467781732 +0100 +++ src/net/base/mime_util.cc 2009-12-13 19:10:14.967931404 +0100 @@ -188,7 +188,6 @@ "audio/ogg",
