commit chromium for openSUSE:Factory

Hello community, here is the log from the commit of package chromium for openSUSE:Factory checked in at 2013-04-01 11:28:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chromium (Old) and /work/SRC/openSUSE:Factory/.chromium.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "chromium", Maintainer is "orphaned@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2013-03-27 19:23:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.chromium.new/chromium.changes 2013-04-01 11:29:27.000000000 +0200 @@ -1,0 +2,12 @@ +Sun Mar 24 12:56:12 UTC 2013 - tittiatcoke@gmail.com + +- Update to 27.0.1452 + * Bug and stability fixes + +- Change buoldsystem to ninja for additional speed + * Dropped patch chromium_use_gold.patch + +- Removed obsolete 11.4 bits and pieces in the spec-file + * includes chromium.easy patch + +------------------------------------------------------------------- Old: ---- chromium.27.0.1447.0.svn189031.tar.bz2 chromium.easy chromium_use_gold.patch New: ---- chromium.27.0.1452.0.svn190259.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chromium.spec ++++++ --- /var/tmp/diff_new_pack.S6Z4Cj/_old 2013-04-01 11:30:04.000000000 +0200 +++ /var/tmp/diff_new_pack.S6Z4Cj/_new 2013-04-01 11:30:04.000000000 +0200 @@ -16,23 +16,18 @@ # -%define svn_revision 189031 +%define svn_revision 190259 %define chromium_no_dlopen 1 -#define chromium_system_libs 0%{?suse_version} > 1220 -%define chromium_system_libs 0 +%define chromium_system_libs 0%{?suse_version} > 1220 Name: chromium -Version: 27.0.1447.0 +Version: 27.0.1452.0 Release: 0 Summary: Google's opens source browser project License: BSD-3-Clause and LGPL-2.1+ Group: Productivity/Networking/Web/Browsers Url: http://code.google.com/p/chromium/ Source0: %{name}.%{version}.svn%{svn_revision}.tar.bz2 -%if 0%{?suse_version} == 1140 -Source1: %{name}.easy -Source2: %{name}-rpmlintrc -%endif Source20: chromium-vendor.patch.in Source30: master_preferences Source31: default_bookmarks.html @@ -63,12 +58,8 @@ Patch64: chromium-more-codec-aliases.patch # PATCH-FIX-OPENSUSE Compile the sandbox with -fPIE settings Patch66: chromium-sandbox-pie.patch -# PATCH-FIX-OPENSUSE Compile with the standard gold linker -Patch67: chromium_use_gold.patch -BuildRequires: Mesa-devel BuildRequires: alsa-devel -BuildRequires: binutils-gold BuildRequires: bison BuildRequires: cups-devel BuildRequires: desktop-file-utils @@ -76,27 +67,11 @@ BuildRequires: flac-devel BuildRequires: flex BuildRequires: freetype2-devel -BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gperf +BuildRequires: hicolor-icon-theme BuildRequires: hunspell-devel BuildRequires: krb5-devel -BuildRequires: libgnutls-devel -BuildRequires: libspeechd-devel -BuildRequires: libstdc++-devel -BuildRequires: lzma -BuildRequires: mozilla-nspr-devel -BuildRequires: mozilla-nss-devel -BuildRequires: pam-devel -BuildRequires: pkg-config -BuildRequires: subversion -%if 0%{?suse_version} > 1210 -BuildRequires: perl-Switch -%else -BuildRequires: perl(Switch) -%endif -BuildRequires: dbus-1-glib-devel -BuildRequires: hicolor-icon-theme BuildRequires: libbz2-devel BuildRequires: libelf-devel BuildRequires: libexpat-devel @@ -104,33 +79,33 @@ BuildRequires: libgnome-keyring-devel BuildRequires: libicu-devel >= 4.0 BuildRequires: libpulse-devel +BuildRequires: libspeechd-devel +BuildRequires: mozilla-nspr-devel +BuildRequires: mozilla-nss-devel +BuildRequires: ninja +BuildRequires: pam-devel BuildRequires: pciutils-devel +BuildRequires: pkg-config BuildRequires: python BuildRequires: python-devel BuildRequires: python-xml BuildRequires: sqlite3-devel +BuildRequires: subversion BuildRequires: update-desktop-files BuildRequires: wdiff +BuildRequires: perl(Switch) BuildRequires: pkgconfig(cairo) >= 1.6 BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxslt) -%if 0%{?chromium_system_libs} -BuildRequires: pkgconfig(libevent) -BuildRequires: pkgconfig(libmtp) -BuildRequires: pkgconfig(libsrtp) -BuildRequires: pkgconfig(libusb-1.0) -BuildRequires: pkgconfig(libwebp) -BuildRequires: pkgconfig(opus) -BuildRequires: pkgconfig(speex) -%endif -BuildRequires: pkgconfig(webkit-1.0) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcomposite) BuildRequires: pkgconfig(xcursor) +BuildRequires: pkgconfig(xdamage) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xi) @@ -139,9 +114,17 @@ BuildRequires: pkgconfig(xscrnsaver) BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xtst) -%if 0%{?suse_version} < 1210 -BuildRequires: libudev-devel +%if 0%{?chromium_system_libs} +BuildRequires: pkgconfig(libevent) +BuildRequires: pkgconfig(libmtp) +BuildRequires: pkgconfig(libsrtp) +BuildRequires: pkgconfig(libusb-1.0) +BuildRequires: pkgconfig(libwebp) +BuildRequires: pkgconfig(libxslt) +BuildRequires: pkgconfig(opus) +BuildRequires: pkgconfig(speex) %endif + # For NaCl %ifarch x86_64 BuildRequires: gcc-c++-32bit @@ -243,7 +226,6 @@ %patch14 -p1 %patch20 -p1 %patch66 -p1 -%patch67 -p1 echo "svn%{svn_revision}" > src/build/LASTCHANGE.in @@ -255,41 +237,35 @@ %build -## create make files - -PARSED_OPT_FLAGS=`echo \'%{optflags} -D_GNU_SOURCE -fPIC -fno-ipa-cp -fno-strict-aliasing \' | sed "s/ /',/g" | sed "s/',/', '/g"` +PARSED_OPT_FLAGS=`echo \'%{optflags} -D_GNU_SOURCE\' | sed "s/ /',/g" | sed "s/',/', '/g"` for i in src/build/common.gypi; do - sed -i "s|'-march=pentium4',||g" $i -%ifnarch x86_64 - sed -i "s|'-mfpmath=sse',||g" $i -%endif - sed -i "s|'-O<(debug_optimize)',||g" $i - sed -i "s|'-m32',||g" $i - sed -i "s|'-fno-exceptions',|$PARSED_OPT_FLAGS|g" $i + sed -i "s|'-O<(release_optimize)'|$PARSED_OPT_FLAGS|g" $i sed -i "s|'-Werror'|'-Wno-error'|g" $i done # ' pushd src -./build/gyp_chromium -f make build/all.gyp \ +export GYP_GENERATORS='ninja' +./build/gyp_chromium build/all.gyp \ -Dlinux_sandbox_path=%{_prefix}/lib/chrome_sandbox \ -Dlinux_sandbox_chrome_path=%{_libdir}/chromium/chromium \ -Duse_openssl=0 \ +-Duse_system_ffmpeg=0 \ -Dbuild_ffmpegsumo=1 \ -Dremove_webcore_debug_symbols=1 \ --Dproprietary_codecs=1 \ --Dlinux_fpic=1 \ -Duse_system_libxml=1 \ +%ifnarch x86_64 +-Ddisable_sse2=1 \ +%else +-Dtarget_arch=x64 \ +%endif %if 0%{?chromium_system_libs} -Duse_system_flac=1 \ -Duse_system_speex=1 \ -Duse_system_libusb=1 \ -Duse_system_libexif=1 \ -Duse_system_libevent=1 \ -%ifarch x86_64 --Duse_system_mesa=1 \ -%endif -Duse_system_libsrtp=1 \ -Duse_system_libmtp=1 \ -Duse_system_opus=1 \ @@ -301,26 +277,13 @@ -Dlinux_link_gnome_keyring=1 \ -Dlinux_link_gsettings=1 \ -Dlinux_link_libspeechd=1 \ +%ifnarch %ix86 -Dlinux_link_kerberos=1 \ --Dlinux_link_libgps=1 \ %endif -%ifnarch x86_64 --Ddisable_sse2=1 \ +-Dlinux_link_libgps=1 \ %endif %ifarch x86_64 --Dtarget_arch=x64 \ -%endif -%if 0%{?suse_version} == 1140 -%ifnarch x86_64 --Dlinux_use_gold_flags=0 \ --Dlinux_use_gold_binary=0 \ -%else --Dlinux_use_gold_flags=1 \ --Dlinux_use_gold_binary=1 \ -%endif -%else -Dlinux_use_gold_flags=1 \ --Dlinux_use_gold_binary=1 \ %endif -Djavascript_engine=v8 \ -Dgoogle_api_key='AIzaSyD1hTe85_a14kr1Ks8T3Ce75rvbR1_Dx7Q' \ @@ -330,15 +293,13 @@ # Note: these are for the openSUSE Chromium builds ONLY. For your own distribution, # please get your own set of keys. -make -r %{?_smp_mflags} chrome V=1 BUILDTYPE=Release +ninja -C out/Release chrome # Build the required SUID_SANDBOX helper -make -r %{?_smp_mflags} chrome_sandbox V=1 BUILDTYPE=Release +ninja -C out/Release chrome_sandbox # Build the ChromeDriver test suite -make -r %{?_smp_mflags} chromedriver V=1 BUILDTYPE=Release - -popd +ninja -C out/Release chromedriver %install mkdir -p %{buildroot}%{_libdir}/chromium/ @@ -346,15 +307,10 @@ mkdir -p %{buildroot}%{_prefix}/lib/ %endif 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 -%if 0%{?suse_version} == 1140 -# Set the permissions file for distro version equal or lower than 11.4. (bnc#718016) -mkdir -p %{buildroot}%{_sysconfdir}/permissions.d -install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/permissions.d/chromium -%endif - #update the password-store settings for each alternative sed "s|password-store=basic|password-store=kwallet|g" %{buildroot}%{_libdir}/chromium/chromium-generic > %{buildroot}%{_libdir}/chromium/chromium-kde sed "s|password-store=basic|password-store=gnome|g" %{buildroot}%{_libdir}/chromium/chromium-generic > %{buildroot}%{_libdir}/chromium/chromium-gnome @@ -497,9 +453,6 @@ %files suid-helper %defattr(-,root,root,-) -%if 0%{?suse_version} == 1140 -%config %{_sysconfdir}/permissions.d/chromium -%endif %verify(not mode) %{_prefix}/lib/chrome_sandbox %files -n chromedriver ++++++ chromium.27.0.1447.0.svn189031.tar.bz2 -> chromium.27.0.1452.0.svn190259.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/chromium/chromium.27.0.1447.0.svn189031.tar.bz2 /work/SRC/openSUSE:Factory/.chromium.new/chromium.27.0.1452.0.svn190259.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de