home:rwooninck:chromium/chromium -> openSUSE:Factory:Contrib/chromium
https://build.opensuse.org/request/diff/78356 Description: Update to 15.0.846. Also two new packages are created that control which password store is being used. The changes are done by utilizing the update-alternatives changes files: -------------- --- chromium.changes +++ chromium.changes @@ -1,0 +2,14 @@ +Sun Aug 7 09:13:32 UTC 2011 - [email protected] + +- Introduce an option to switch the password store for Chromium in + a more friendlier way, by using the update-alternatives. The user + has now the option to install a new package (chromium-desktop-kde + or chromium-desktop-gnome) and based on this the respective + password store is selected. + +------------------------------------------------------------------- +Sat Aug 6 10:09:02 UTC 2011 - [email protected] + +- Update to 15.0.846 + +------------------------------------------------------------------- old: ---- chromium.15.0.839.0.svn94831.tar.lzma new: ---- chromium.15.0.846.0.svn95732.tar.lzma spec files: ----------- --- chromium.spec +++ chromium.spec @@ -3,11 +3,11 @@ # Thanks to jhaygood for most of the icu patch -%define svn_rev 94831 -%define v8_ver 3.5.1.0 +%define svn_rev 95732 +%define v8_ver 3.5.2.0 Name: chromium -Version: 15.0.839.0 +Version: 15.0.846.0 Release: 1 License: BSD Summary: Google's opens source browser project @@ -140,6 +140,9 @@ Requires: xdg-utils Requires: libv8-3 = %{v8_ver} Requires: hicolor-icon-theme +Requires: update-alternatives + +Recommends: Chromium-password # Recommends the chromium-ffmpeg library (available from packman) Recommends: chromium-ffmpeg = %{version} @@ -151,6 +154,30 @@ %description Chromium is the open-source project behind Google Chrome. We invite you to join us in our effort to help build a safer, faster, and more stable way for all Internet users to experience the web, and to create a powerful platform for developing a new generation of web applications. +%package desktop-kde +Summary: Update to chromium to use KDE's kwallet to store passwords +Group: Productivity/Networking/Web/Browsers +supplements: packageand(chromium:kdebase4-session) +conflicts: chromium-desktop-gnome +Provides: Chromium-password + +%description desktop-kde +By using the openSUSE update-alternatives the password store for Chromium is changed to utilize +KDE's kwallet. Please be aware that by this change the old password are no longer accessible and +are also not converted to kwallet. + +%package desktop-gnome +Summary: Update to chromium to use Gnome keyring to store passwords +Group: Productivity/Networking/Web/Browsers +supplements: packageand(chromium:gnome-session) +conflicts: chromium-desktop-kde +Provides: Chromium-password + +%description desktop-gnome +By using the openSUSE update-alternatives the password store for Chromium is changed to utilize +Gnome's Keyring. Please be aware that by this change the old password are no longer accessible and +are also not converted to Gnome's Keyring. + %prep lzma -cd %{SOURCE0} | tar xf - %setup -D -T -n %{name}-suse @@ -238,11 +265,13 @@ popd %install -mkdir -p %{buildroot}%{_bindir} -install -m 755 %{SOURCE100} %{buildroot}%{_bindir}/chromium -# x86_64 capable systems need this -sed -i "s|/usr/lib/chromium|%{_libdir}/chromium|g" %{buildroot}%{_bindir}/chromium mkdir -p %{buildroot}%{_libdir}/chromium/ +install -m 755 %{SOURCE100} %{buildroot}%{_libdir}/chromium/chromium-generic +# x86_64 capable systems need this +sed -i "s|/usr/lib/chromium|%{_libdir}/chromium|g" %{buildroot}%{_libdir}/chromium/chromium-generic +#update the password-store settings for each alternative +sed "s|password-store=detect|password-store=kwallet|g" %{buildroot}%{_libdir}/chromium/chromium-generic > %{buildroot}%{_libdir}/chromium/chromium-kde +sed "s|password-store=detect|password-store=gnome|g" %{buildroot}%{_libdir}/chromium/chromium-generic > %{buildroot}%{_libdir}/chromium/chromium-gnome mkdir -p %{buildroot}%{_mandir}/man1/ pushd src/out/Release cp -a chrome.pak locales resources xdg-settings %{buildroot}%{_libdir}/chromium/ @@ -284,11 +313,37 @@ %if 0%{?suse_version} >= 1140 %post %icon_theme_cache_post +update-alternatives --install %{_bindir}/chromium chromium %{_libdir}/chromium/chromium-generic 10 %postun %icon_theme_cache_postun +update-alternatives --remove all chromium +%endif + +%if 0%{?suse_version} < 1140 +%post +update-alternatives --install %{_bindir}/chromium chromium %{_libdir}/chromium/chromium-generic 10 + +%postun +update-alternatives --remove all chromium %endif +%post desktop-kde +update-alternatives --install %{_bindir}/chromium chromium %{_libdir}/chromium/chromium-kde 15 +update-alternatives --auto chromium + +%postun desktop-kde +update-alternatives --remove %{_bindir}/chromium %{_libdir}/chromium/chromium-kde +update-alternatives --auto chromium + +%post desktop-gnome +update-alternatives --install %{_bindir}/chromium chromium %{_libdir}/chromium/chromium-gnome 15 +update-alternatives --auto chromium + +%postun desktop-gnome +update-alternatives --remove %{_bindir}/chromium %{_libdir}/chromium/chromium-gnome +update-alternatives --auto chromium + # Files! %files @@ -297,8 +352,8 @@ %dir %{_datadir}/gnome-control-center %dir %{_datadir}/gnome-control-center/default-apps %dir %{_libdir}/chromium/ -%{_bindir}/chromium %{_libdir}/chromium/chromium +%{_libdir}/chromium/chromium-generic %{_libdir}/chromium/plugins/ %{_libdir}/chromium/resources/ %{_libdir}/chromium/xdg-settings @@ -309,6 +364,12 @@ %{_libdir}/chromium/chrome.pak %{_libdir}/chromium/resources.pak %{_libdir}/chromium/locales/ -#{_libdir}/chromium/lib*.so + +%files desktop-kde +%attr(755, root, root) %{_libdir}/chromium/chromium-kde + +%files desktop-gnome +%attr(755, root, root) %{_libdir}/chromium/chromium-gnome + %changelog other changes: -------------- ++++++ chromium-6.0.406.0-system-gyp-v8.patch --- chromium-6.0.406.0-system-gyp-v8.patch +++ chromium-6.0.406.0-system-gyp-v8.patch @@ -9,7 +9,7 @@ ], }], ['OS=="mac" or OS=="linux"', { -@@ -141,162 +141,6 @@ +@@ -142,156 +142,6 @@ }], ], }, # target_name: All @@ -136,15 +136,9 @@ - 'type': 'none', - 'dependencies': [ - 'chromium_builder_qa', # needed for pyauto -- '../chrome/chrome.gyp:memory_test', -- '../chrome/chrome.gyp:page_cycler_tests', - '../chrome/chrome.gyp:performance_ui_tests', - '../chrome/chrome.gyp:plugin_tests', -- '../chrome/chrome.gyp:startup_tests', - '../chrome/chrome.gyp:sync_performance_tests', -- '../chrome/chrome.gyp:tab_switching_test', -- '../chrome/chrome.gyp:ui_tests', # needed for dromaeo, sunspider, v8 -- '../chrome/chrome.gyp:url_fetch_test', - ], - }, # target_name: chromium_builder_perf - { ++++++ chromium-gcc46.patch --- chromium-gcc46.patch +++ chromium-gcc46.patch @@ -6,7 +6,7 @@ #include <vector> +#include <cstddef> - #include "ui/ui_api.h" + #include "ui/base/ui_export.h" --- chromium/src/chrome/browser/search_engines/template_url_prepopulate_data.h 2011-03-31 14:48:03.000000000 +0400 +++ chromium/src/chrome/browser/search_engines/template_url_prepopulate_data.h 2011-03-31 14:49:52.000000000 +0400 ++++++ chromium-no-courgette.patch --- chromium-no-courgette.patch +++ chromium-no-courgette.patch @@ -6,7 +6,7 @@ 'dependencies': [ '../breakpad/breakpad.gyp:*', - '../courgette/courgette.gyp:*', + '../dbus/dbus.gyp:*', '../sandbox/sandbox.gyp:*', '../cloud_print/virtual_driver/virtual_driver_linux.gyp:*', - ], diff -up chromium-20100218svn39394/src/chrome/chrome.gyp.no-courgette chromium-20100218svn39394/src/chrome/chrome.gyp ++++++ chromium.15.0.846.0.svn95732.tar.lzma (new) Binary files chromium.15.0.846.0.svn95732.tar.lzma added ++++++ deleted files: --- chromium.15.0.839.0.svn94831.tar.lzma To REVIEW against the previous version: osc request show --diff 78356 To ACCEPT the request: osc request accept 78356 --message="reviewed ok." To DECLINE the request: osc request decline 78356 --message="declined for reason xyz (see ... for background / policy / ...)." To REVOKE the request: osc request revoke 78356 --message="retracted because ..., sorry / thx / see better version ..." -- Hermes messaging (http://hermes.opensuse.org) openSUSE Build Service (https://build.opensuse.org/) Collaboration: http://en.opensuse.org/Build_Service/Collaboration -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
