Author: glen Date: Tue Feb 2 13:01:36 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to 5.0.313.0 r37790, using ubuntu ppa as source tarball
---- Files affected: packages/chromium-browser: chromium-browser.spec (1.14 -> 1.15) , system-libs.patch (1.1 -> 1.2) , libpng14.patch (NONE -> 1.1) (NEW), plugin-searchdirs.patch (NONE -> 1.1) (NEW), 64bit-plugin-path.patch (1.1 -> NONE) (REMOVED), chromium-daily-tarball.sh (1.4 -> NONE) (REMOVED), debug_util_posix-fix.patch (1.1 -> NONE) (REMOVED), gyp-system-icu.patch (1.1 -> NONE) (REMOVED), icu-code-changes.patch (1.1 -> NONE) (REMOVED), no-sqlite-debug.patch (1.1 -> NONE) (REMOVED), noffmpeg.patch (1.1 -> NONE) (REMOVED), system-libs-gyp.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/chromium-browser/chromium-browser.spec diff -u packages/chromium-browser/chromium-browser.spec:1.14 packages/chromium-browser/chromium-browser.spec:1.15 --- packages/chromium-browser/chromium-browser.spec:1.14 Wed Sep 23 13:45:46 2009 +++ packages/chromium-browser/chromium-browser.spec Tue Feb 2 14:01:26 2010 @@ -1,68 +1,87 @@ # $Revision$, $Date$ # # Conditional build: +%bcond_with verbose # verbose build (V=1) %bcond_with selinux # with SELinux (need policy first) +%bcond_with system_v8 # with system v8 +%bcond_without system_zlib # with system zlib +%bcond_with system_sqlite # with system sqlite +%bcond_with system_ffmpeg # with system ffmpeg_mt +%bcond_without sandboxing # with sandboxing +%bcond_with shared_libs # with shared libs # TODO -# - optflags and strip (-debuginfo is quite empty) -# - use tarballs from http://build.chromium.org/buildbot/tarball/ +# - check system sqlite linking problems # NOTES: -# - build - bp: ~1.3G GB bc: ~1.5 GB -# - keep eye on spec from http://spot.fedorapeople.org/chromium/ +# - use nosource until the package is ready to be stbr, no point poisioning distfiles +# - build i686: -bp: ~570MB; bc: ~928MB; -bb: ~1.0GB +# - build x86_64: -bp: ~570MB; bc: ~990MB; -bb: ~1.0GB +# - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites +# - lynx -dump http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser/ | grep orig.tar.gz + +%define svndate 20100202 +%define svnver 37790 +%define rel 0.16 -%define svndate 20090916 -%define svnver svn26424 Summary: A WebKit powered web browser Name: chromium-browser -Version: 4.0.212.0 -Release: 0.1.%{svndate}%{svnver}%{?dist} +Version: 5.0.313.0 +Release: 0.%{svnver}.%{rel} License: BSD, LGPL v2+ (ffmpeg) Group: X11/Applications/Networking Patch0: system-libs.patch -Patch1: system-libs-gyp.patch +Patch1: plugin-searchdirs.patch Patch2: gyp-system-minizip.patch -Patch3: noffmpeg.patch Patch5: options-support.patch -Patch6: 64bit-plugin-path.patch -Patch7: gyp-system-icu.patch -Patch8: icu-code-changes.patch -Patch9: no-sqlite-debug.patch -Patch10: debug_util_posix-fix.patch Patch11: memory_details-iceweasel.patch -Source0: chromium-%{svndate}%{svnver}.tar.bz2 -# Source0-md5: 20663b974249b35d7ab655ce21b8f868 -# Custom build tools for chromium, hammer is a fancy front-end for scons -Source1: http://src.chromium.org/svn/trunk/tools/depot_tools.tar.gz -# Source1-md5: 1f821101d5a6f26345dc22ae5e0cbe1e +Patch12: libpng14.patch +Source0: http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser/%{name}_%{version}~svn%{svndate}r%{svnver}.orig.tar.gz +# NoSource0-md5: 49d2d8f289facc215566a4f1aec37cb9 +NoSource: 0 Source2: %{name}.sh Source3: %{name}.desktop Source4: find-lang.sh -# We don't actually use this in the build, but it is included so you can make the tarball. -Source5: chromium-daily-tarball.sh +URL: http://code.google.com/chromium/ BuildRequires: GConf2-devel +BuildRequires: OpenGL +BuildRequires: OpenGL-GLU-devel +BuildRequires: OpenGL-devel BuildRequires: alsa-lib-devel BuildRequires: atk-devel BuildRequires: bison BuildRequires: bzip2-devel BuildRequires: dbus-devel -BuildRequires: desktop-file-utils BuildRequires: flex BuildRequires: fontconfig-devel +BuildRequires: glib2-devel BuildRequires: gperf BuildRequires: gtk+2-devel +BuildRequires: hunspell-devel BuildRequires: libevent-devel BuildRequires: libicu-devel >= 4.2.1-2 BuildRequires: libjpeg-devel BuildRequires: libpng-devel %{?with_selinux:BuildRequires: libselinux-devel} BuildRequires: libstdc++-devel +BuildRequires: libxml2-devel BuildRequires: libxslt-devel +BuildRequires: lsb-release +BuildRequires: lzma +BuildRequires: lzma-devel BuildRequires: minizip-devel BuildRequires: nspr-devel -BuildRequires: nss-devel -BuildRequires: scons +BuildRequires: nss-devel >= 1:3.12.3 +BuildRequires: pango-devel +BuildRequires: patchutils >= 0.2.25 +BuildRequires: pkg-config +BuildRequires: python +BuildRequires: python-gyp >= 0.1-0.770 +BuildRequires: rpmbuild(macros) >= 1.453 +BuildRequires: sqlite3-devel >= 3.6.1 BuildRequires: v8-devel +BuildRequires: xorg-lib-libXScrnSaver-devel +%{?with_system_zlib:BuildRequires: zlib-devel} Requires: browser-plugins >= 2.0 Provides: wwwbrowser ExclusiveArch: %{ix86} %{x8664} arm @@ -70,16 +89,43 @@ %define find_lang sh find-lang.sh %{buildroot} -%define _enable_debug_packages 0 -%define no_install_post_strip 1 - %description Chromium is an open-source web browser, powered by WebKit. -%prep -%setup -q -n chromium-%{svndate}%{svnver} -a 1 +%package inspector +Summary: Page inspector for the chromium-browser +Group: Development/Tools +Requires: %{name} = %{version}-%{release} + +%description inspector +Chromium is an open-source browser project that aims to build a safer, +faster, and more stable way for all Internet users to experience the +web. + +This package contains 'inspector', allowing web developpers to inspect +any element of a web page at runtime (html, javascript, css, ..) + +%package l10n +Summary: chromium-browser language packages +Group: I18n +Requires: %{name} = %{version}-%{release} + +%description l10n +Chromium is an open-source browser project that aims to build a safer, +faster, and more stable way for all Internet users to experience the +web. + +This package contains language packages for 50 languages: + +ar, bg, bn, ca, cs, da, de, el, en-GB, es-419, es, et, fi, fil, fr, +gu, he, hi, hr, hu, id, it, ja, kn, ko, lt, lv, ml, mr, nb, nl, or, +pl, pt-BR, pt-PT, ro, ru, sk, sl, sr, sv, ta, te, th, tr, uk, vi, +zh-CN, zh-TW -sed -e 's,@localedir@,%{_libdir}/%{name},' %{SOURCE4} > find-lang.sh +%prep +%setup -q -n %{name}-%{version}~svn%{svndate}r%{svnver} +lzma -dc %{name}-%{version}~svn%{svndate}r%{svnver}-source.tar.lzma | tar x +rm -f %{name}-%{version}~svn%{svndate}r%{svnver}-source.tar.lzma # Google's versioning is interesting. They never reset "BUILD", which is how we jumped # from 3.0.201.0 to 4.0.202.0 as they moved to a new major branch @@ -89,103 +135,144 @@ exit 1 fi +# Populate the LASTCHANGE file template as we no longer have the VCS files at this point +echo "%{svnver}" > src/build/LASTCHANGE.in + +sed -e 's,@localedir@,%{_libdir}/%{name},' %{SOURCE4} > find-lang.sh + %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 %patch11 -p1 - -# Scrape out incorrect optflags and hack in the correct ones -find -name '*\.scons' | xargs %{__sed} -i -e " - s|'-march=pentium4',||g - s|'-msse2',||g - s|'-mfpmath=sse',||g - s|'-m32',||g - s|'-O0',|'%{rpmcxxflags}'.split(' ')|g -" +%patch12 -p1 %build -cd src/build - -# Regenerate the scons files -# Also, set the sandbox paths correctly. -./gyp_chromium all.gyp \ - -D linux_sandbox_path=%{_libdir}/%{name}/chromium-sandbox \ - -D linux_sandbox_chrome_path=%{_libdir}/%{name}/chromium-browser \ -%ifarch x86_64 +cd src +%{__python} build/gyp_chromium --format=make build/all.gyp \ +%ifarch %{ix86} + -Dtarget_arch=ia32 \ +%endif +%ifarch %{x8664} -Dtarget_arch=x64 \ %endif - -Duse_system_libpng=1 \ +%if "%{cc_version}" >= "4.4.0" + -Dno_strict_aliasing=1 -Dgcc_version=44 \ +%endif +%if %{with sandboxing} + -Dlinux_sandbox_path=%{_libdir}/%{name}/chromium-sandbox \ + -Dlinux_sandbox_chrome_path=%{_libdir}/%{name}/%{name} \ +%endif + %{!?debug:-Dwerror=} \ + %{?with_shared_libs:-Dlibrary=shared_library} \ + -Djavascript_engine=%{?with_system_v8:system-v8}%{!?with_system_v8:v8} \ -Duse_system_bzip2=1 \ + -Duse_system_ffmpeg=%{?with_system_ffmpeg:1}%{!?with_system_ffmpeg:0} \ + -Duse_system_libevent=1 \ -Duse_system_libjpeg=1 \ - -Duse_system_zlib=1 \ + -Duse_system_libpng=1 \ + -Duse_system_libxml=1 \ + -Duse_system_libxslt=1 \ + -Duse_system_sqlite=%{?with_system_sqlite:1}%{!?with_system_sqlite:0} \ + -Duse_system_zlib=%{?with_system_zlib:1}%{!?with_system_zlib:0} \ +%if %{with arch} +-Duse_system_yasm=1 \ + -Dffmpeg_branding=Chrome \ +%endif %if %{with selinux} -Dselinux=1 \ %endif - -Djavascript_engine=v8 -LDFLAGS="${LDFLAGS:-%rpmldflags}" \ -CFLAGS="${CFLAGS:-%rpmcflags}" \ -CXXFLAGS="${CXXFLAGS:-%rpmcxxflags}" \ -CPPFLAGS="${CPPFLAGS:-%rpmcppflags}" \ -%{?__cc:CC="%{__cc}"} \ -%if %{with selinux} - ../../depot_tools/hammer --mode=Release chrome -%else - ../../depot_tools/hammer --mode=Release chrome chrome_sandbox -%endif +%{__make} chrome %{?with_sandboxing:chrome_sandbox} \ + BUILDTYPE=%{!?debug:Release}%{?debug:Debug} \ + %{?with_verbose:V=1} \ + CC="%{__cc}" \ + CXX="%{__cxx}" \ + CC.host="%{__cc}" \ + CXX.host="%{__cxx}" \ + CFLAGS="%{rpmcflags}" \ + CXXFLAGS="%{rpmcxxflags}" %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name},%{_mandir}/man1,%{_pixmapsdir},%{_desktopdir}} +install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name}/{themes,locales,plugins,extensions,resources},%{_mandir}/man1,%{_pixmapsdir},%{_desktopdir}} + +cd src/out/%{!?debug:Release}%{?debug:Debug} -cd src/sconsbuild/Release -install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/chromium-browser -%if "%{_lib}" != "lib" -%{__sed} -i -e 's,/usr/lib,%{_libdir},' $RPM_BUILD_ROOT%{_bindir}/chromium-browser -%endif -cp -a chrome.pak locales resources themes $RPM_BUILD_ROOT%{_libdir}/%{name} -cp -a chromium-browser.1 $RPM_BUILD_ROOT%{_mandir}/man1 -cp -a product_logo_48.png $RPM_BUILD_ROOT%{_pixmapsdir}/chromium-browser.png -install -p chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/chromium-browser +install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name} +%{__sed} -i -e 's,@libdir@,%{_libdir}/%{name},' $RPM_BUILD_ROOT%{_bindir}/%{name} +cp -a chrome.pak $RPM_BUILD_ROOT%{_libdir}/%{name} +cp -a locales/*.pak $RPM_BUILD_ROOT%{_libdir}/%{name}/locales +cp -a resources/* $RPM_BUILD_ROOT%{_libdir}/%{name}/resources +find $RPM_BUILD_ROOT%{_libdir}/%{name}/resources -name '*.d' | xargs rm +cp -a chrome.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 +cp -a product_logo_48.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png +install -p chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name} install -p chrome_sandbox $RPM_BUILD_ROOT%{_libdir}/%{name}/chromium-sandbox +install -p libffmpegsumo.so $RPM_BUILD_ROOT%{_libdir}/%{name} +install -p xdg-settings $RPM_BUILD_ROOT%{_libdir}/%{name} +cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir} cd - -desktop-file-install --dir $RPM_BUILD_ROOT%{_desktopdir} %{SOURCE3} +%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins # find locales %find_lang %{name}.lang +%{__sed} -i -e '/en-US.pak/d' %{name}.lang %clean rm -rf $RPM_BUILD_ROOT +%post +%update_browser_plugins + +%postun +if [ "$1" = 0 ]; then + %update_browser_plugins +fi + %files -f %{name}.lang %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/chromium-browser -%{_mandir}/man1/chromium-browser.1* -%{_pixmapsdir}/chromium-browser.png +%{_browserpluginsconfdir}/browsers.d/%{name}.* +%config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist +%attr(755,root,root) %{_bindir}/%{name} +%{_mandir}/man1/%{name}.1* +%{_pixmapsdir}/%{name}.png %{_desktopdir}/*.desktop %dir %{_libdir}/%{name} %{_libdir}/%{name}/chrome.pak %dir %{_libdir}/%{name}/locales -%{_libdir}/%{name}/resources -%{_libdir}/%{name}/themes -%attr(755,root,root) %{_libdir}/%{name}/chromium-browser +%{_libdir}/%{name}/locales/en-US.pak +%dir %{_libdir}/%{name}/resources +%dir %{_libdir}/%{name}/themes +%dir %{_libdir}/%{name}/extensions +%dir %{_libdir}/%{name}/plugins +%attr(755,root,root) %{_libdir}/%{name}/%{name} # These unique permissions are intentional and necessary for the sandboxing %attr(4555,root,root) %{_libdir}/%{name}/chromium-sandbox +# ffmpeg libs +%attr(755,root,root) %{_libdir}/%{name}/libffmpegsumo.so + +# bundle this copy until xdg-utils will have this itself +%attr(755,root,root) %{_libdir}/%{name}/xdg-settings + +%files inspector +%defattr(644,root,root,755) +%{_libdir}/%{name}/resources/inspector + +%files l10n -f %{name}.lang +%defattr(644,root,root,755) + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <feedb...@pld-linux.org> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.15 2010/02/02 13:01:26 glen +- up to 5.0.313.0 r37790, using ubuntu ppa as source tarball + Revision 1.14 2009/09/23 11:45:46 glen - consistency ================================================================ Index: packages/chromium-browser/system-libs.patch diff -u packages/chromium-browser/system-libs.patch:1.1 packages/chromium-browser/system-libs.patch:1.2 --- packages/chromium-browser/system-libs.patch:1.1 Sun Sep 20 12:31:28 2009 +++ packages/chromium-browser/system-libs.patch Tue Feb 2 14:01:26 2010 @@ -1,15 +1,3 @@ -diff -up chromium-20090827svn24640/src/base/message_pump_libevent.cc.system-code chromium-20090827svn24640/src/base/message_pump_libevent.cc ---- chromium-20090827svn24640/src/base/message_pump_libevent.cc.system-code 2009-08-27 15:21:27.000000000 -0400 -+++ chromium-20090827svn24640/src/base/message_pump_libevent.cc 2009-08-27 16:05:17.000000000 -0400 -@@ -12,7 +12,7 @@ - #include "base/scoped_nsautorelease_pool.h" - #include "base/scoped_ptr.h" - #include "base/time.h" --#include "third_party/libevent/event.h" -+#include <event.h> - - // Lifecycle of struct event - // Libevent uses two main data structures: diff -up chromium-20090827svn24640/src/base/pr_time_unittest.cc.system-code chromium-20090827svn24640/src/base/pr_time_unittest.cc --- chromium-20090827svn24640/src/base/pr_time_unittest.cc.system-code 2009-08-27 15:21:27.000000000 -0400 +++ chromium-20090827svn24640/src/base/pr_time_unittest.cc 2009-08-27 16:05:17.000000000 -0400 @@ -34,18 +22,6 @@ #include "base/logging.h" -diff -up chromium-20090827svn24640/src/chrome/browser/debugger/devtools_remote_listen_socket.cc.system-code chromium-20090827svn24640/src/chrome/browser/debugger/devtools_remote_listen_socket.cc ---- chromium-20090827svn24640/src/chrome/browser/debugger/devtools_remote_listen_socket.cc.system-code 2009-08-27 15:22:41.000000000 -0400 -+++ chromium-20090827svn24640/src/chrome/browser/debugger/devtools_remote_listen_socket.cc 2009-08-27 16:05:17.000000000 -0400 -@@ -18,7 +18,7 @@ - #include "base/message_loop.h" - #include "base/message_pump_libevent.h" - #include "net/base/net_errors.h" --#include "third_party/libevent/event.h" -+#include <event.h> - #endif - - #include "base/eintr_wrapper.h" diff -up chromium-20090827svn24640/src/chrome/common/zip.cc.system-code chromium-20090827svn24640/src/chrome/common/zip.cc --- chromium-20090827svn24640/src/chrome/common/zip.cc.system-code 2009-08-27 15:22:46.000000000 -0400 +++ chromium-20090827svn24640/src/chrome/common/zip.cc 2009-08-27 16:05:17.000000000 -0400 @@ -60,51 +36,25 @@ #if defined(OS_WIN) #include "third_party/zlib/contrib/minizip/iowin32.h" #endif -diff -up chromium-20090827svn24640/src/net/base/listen_socket.cc.system-code chromium-20090827svn24640/src/net/base/listen_socket.cc ---- chromium-20090827svn24640/src/net/base/listen_socket.cc.system-code 2009-08-27 15:20:57.000000000 -0400 -+++ chromium-20090827svn24640/src/net/base/listen_socket.cc 2009-08-27 16:05:17.000000000 -0400 -@@ -13,7 +13,7 @@ - #include <sys/socket.h> - #include <arpa/inet.h> - #include "net/base/net_errors.h" --#include "third_party/libevent/event.h" -+#include <event.h> - #endif - - #include "base/eintr_wrapper.h" -diff -up chromium-20090827svn24640/src/net/base/telnet_server.cc.system-code chromium-20090827svn24640/src/net/base/telnet_server.cc ---- chromium-20090827svn24640/src/net/base/telnet_server.cc.system-code 2009-08-27 15:20:57.000000000 -0400 -+++ chromium-20090827svn24640/src/net/base/telnet_server.cc 2009-08-27 16:05:17.000000000 -0400 -@@ -13,7 +13,7 @@ - #include <sys/socket.h> - #include "base/message_loop.h" - #include "net/base/net_errors.h" --#include "third_party/libevent/event.h" -+#include <event.h> - #include "base/message_pump_libevent.h" - #endif - -diff -up chromium-20090827svn24640/src/net/socket/tcp_client_socket_libevent.cc.system-code chromium-20090827svn24640/src/net/socket/tcp_client_socket_libevent.cc ---- chromium-20090827svn24640/src/net/socket/tcp_client_socket_libevent.cc.system-code 2009-08-27 15:20:55.000000000 -0400 -+++ chromium-20090827svn24640/src/net/socket/tcp_client_socket_libevent.cc 2009-08-27 16:05:17.000000000 -0400 -@@ -15,7 +15,7 @@ - #include "base/trace_event.h" - #include "net/base/io_buffer.h" - #include "net/base/net_errors.h" --#include "third_party/libevent/event.h" -+#include <event.h> - - - namespace net { -diff -up chromium-20090827svn24640/src/webkit/glue/plugins/plugin_lib_linux.cc.system-code chromium-20090827svn24640/src/webkit/glue/plugins/plugin_lib_linux.cc ---- chromium-20090827svn24640/src/webkit/glue/plugins/plugin_lib_linux.cc.system-code 2009-08-27 15:19:05.000000000 -0400 -+++ chromium-20090827svn24640/src/webkit/glue/plugins/plugin_lib_linux.cc 2009-08-27 16:10:57.000000000 -0400 +--- chromium-browser-5.0.312.0~svn20100201r37680/src/webkit/glue/plugins/plugin_lib_linux.cc~ 2010-01-07 23:19:11.000000000 +0200 ++++ chromium-browser-5.0.312.0~svn20100201r37680/src/webkit/glue/plugins/plugin_lib_linux.cc 2010-02-02 09:16:08.740140511 +0200 @@ -13,7 +13,7 @@ // These headers must be included in this order to make the declaration gods // happy. -#include "base/third_party/nspr/prcpucfg_linux.h" +#include <prcpucfg.h> - #include "third_party/mozilla/include/nsplugindefs.h" namespace { + +--- chromium-browser-5.0.312.0~svn20100201r37680/src/chrome/browser/metrics/metrics_log.cc~ 2010-01-20 05:02:33.000000000 +0200 ++++ chromium-browser-5.0.312.0~svn20100201r37680/src/chrome/browser/metrics/metrics_log.cc 2010-02-02 09:17:14.496849280 +0200 +@@ -12,7 +12,7 @@ + #include "base/scoped_ptr.h" + #include "base/string_util.h" + #include "base/sys_info.h" +-#include "base/third_party/nspr/prtime.h" ++#include <prtime.h> + #include "chrome/browser/autocomplete/autocomplete.h" + #include "chrome/browser/browser_process.h" + #include "chrome/common/logging_chrome.h" ================================================================ Index: packages/chromium-browser/libpng14.patch diff -u /dev/null packages/chromium-browser/libpng14.patch:1.1 --- /dev/null Tue Feb 2 14:01:36 2010 +++ packages/chromium-browser/libpng14.patch Tue Feb 2 14:01:26 2010 @@ -0,0 +1,43 @@ +--- chromium-browser-5.0.310.0~svn20100130r37603/src/app/gfx/codec/png_codec.cc~ 2010-02-01 16:49:14.000000000 +0200 ++++ chromium-browser-5.0.310.0~svn20100130r37603/src/app/gfx/codec/png_codec.cc 2010-02-01 16:49:18.876448844 +0200 +@@ -350,9 +350,9 @@ + return false; + + *png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, +- png_voidp_NULL, +- png_error_ptr_NULL, +- png_error_ptr_NULL); ++ NULL, ++ NULL, ++ NULL); + if (!*png_ptr) + return false; + +@@ -574,9 +574,9 @@ + DCHECK(input_color_components * w <= row_byte_width); + + png_struct* png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, +- png_voidp_NULL, +- png_error_ptr_NULL, +- png_error_ptr_NULL); ++ NULL, ++ NULL, ++ NULL); + if (!png_ptr) + return false; + png_info* info_ptr = png_create_info_struct(png_ptr); +--- chromium-browser-5.0.312.0~svn20100201r37680/src/third_party/WebKit/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp~ 2009-09-26 19:51:49.000000000 +0300 ++++ chromium-browser-5.0.312.0~svn20100201r37680/src/third_party/WebKit/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp 2010-02-01 20:35:48.945298200 +0200 +@@ -130,9 +130,9 @@ + } + + png_struct* pngPtr = png_create_write_struct(PNG_LIBPNG_VER_STRING, +- png_voidp_NULL, +- png_error_ptr_NULL, +- png_error_ptr_NULL); ++ NULL, ++ NULL, ++ NULL); + if (!pngPtr) + return false; + ================================================================ Index: packages/chromium-browser/plugin-searchdirs.patch diff -u /dev/null packages/chromium-browser/plugin-searchdirs.patch:1.1 --- /dev/null Tue Feb 2 14:01:36 2010 +++ packages/chromium-browser/plugin-searchdirs.patch Tue Feb 2 14:01:26 2010 @@ -0,0 +1,21 @@ +--- chromium-browser-5.0.312.0~svn20100201r37680/src/webkit/glue/plugins/plugin_list_linux.cc~ 2010-01-27 05:02:57.000000000 +0200 ++++ chromium-browser-5.0.312.0~svn20100201r37680/src/webkit/glue/plugins/plugin_list_linux.cc 2010-02-02 11:11:28.576140937 +0200 +@@ -65,6 +65,10 @@ + PathService::Get(base::DIR_EXE, &dir); + plugin_dirs->push_back(dir.Append("plugins")); + ++ // on PLD Linux we want to search only Chrome specific dirs, but as there is ++ // not user specific dir yet, this leaves us with Chrome system dir only. ++#if 0 ++ + // Mozilla code to reference: + // http://mxr.mozilla.org/firefox/ident?i=NS_APP_PLUGINS_DIR_LIST + // and tens of accompanying files (mxr is very helpful). +@@ -101,6 +105,7 @@ + plugin_dirs->push_back(FilePath("/usr/lib64/firefox/plugins")); + plugin_dirs->push_back(FilePath("/usr/lib64/xulrunner-addons/plugins")); + #endif ++#endif + } + + void PluginList::LoadPluginsFromDir(const FilePath& path, ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.14&r2=1.15&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/system-libs.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit