|
|
@@ -3,7 +3,6 @@
|
|
|
# Thanks to jhaygood for most of the icu patch
|
|
|
|
|
|
# norootforbuild
|
|
|
-%define with_devel_pkg 0
|
|
|
|
|
|
%define pkgname chromium
|
|
|
|
|
|
@@ -15,14 +14,12 @@
|
|
|
# -lvpx is sufficient.
|
|
|
%define with_system_vpx 1
|
|
|
|
|
|
-#% define v8_ver 3.2.0
|
|
|
-
|
|
|
-#Name: chromium11
|
|
|
+#Name: chromium12
|
|
|
Name: chromium
|
|
|
Summary: Google's opens source browser project
|
|
|
Summary(ja): Googleのオープンソースウェブブラウザ
|
|
|
#'
|
|
|
-Version: 11.0.696.50
|
|
|
+Version: 12.0.742.6
|
|
|
Release: 1%{?_dist_release}
|
|
|
License: BSD
|
|
|
Group: Applications/Internet
|
|
|
@@ -39,7 +36,7 @@ Source1: http://src.chromium.org/svn/trunk/tools/depot_tools.tar.gz
|
|
|
# Script used to create the %{pkgname}-%{version}.tar.xz archive from
|
|
|
# a official tarball:
|
|
|
# http://build.chromium.org/official/chromium-10.0.644.0.tar.bz2
|
|
|
-Source3: pack_chromium11_source-vine.sh
|
|
|
+Source3: pack_chromium12_source-vine.sh
|
|
|
# Official ffmpeg headers
|
|
|
Source8: ffmpeg-0.6-headers.tar.xz
|
|
|
#Source10: chromium.desktop
|
|
|
@@ -59,6 +56,7 @@ Source100: chromium-browser-vine.sh
|
|
|
Source101: chromium-browser-vine.desktop
|
|
|
Source102: chromium-browser.xml
|
|
|
Source103: chromium-browser-rpmlintrc
|
|
|
+##!!Source104: chromium-icons.tar.bz2
|
|
|
|
|
|
%{?nosrc:NoSource: 0}
|
|
|
%{?nosrc:NoSource: 1}
|
|
|
@@ -70,10 +68,7 @@ Provides: chromium-browser = %{version}
|
|
|
|
|
|
## Start Patches
|
|
|
# Many changes to the gyp systems so we can use system libraries
|
|
|
-# My first ever patch set. I hope I did well.
|
|
|
Patch4: chromium-no-sqlite-debug.patch
|
|
|
-Patch5: chromium-gyp-system-04-nss-nspr.patch
|
|
|
-Patch7: chromium-codechanges-nss-nspr.patch
|
|
|
Patch8: chromium-codechanges-zlib.patch
|
|
|
Patch12: chromium-no-test-sources.patch
|
|
|
Patch13: chromium-no-courgette.patch
|
|
|
@@ -91,12 +86,9 @@ Patch32: chromium-7.0.542.0-system-libvpx.patch
|
|
|
Patch34: chromium-7.0.542.0-codechanges-system-minizip-v8.patch
|
|
|
Patch62: chromium-norpath.patch
|
|
|
Patch63: chromium-6.0.406.0-system-gyp-v8.patch
|
|
|
-# Patches for MeeGo Netbook
|
|
|
-Patch80: chromium-browser-window-focus.patch
|
|
|
-Patch83: chromium-fix-toolbar-icon-size.patch
|
|
|
|
|
|
# Vine
|
|
|
-Patch100: chromium-11.0.696.15-no-tests.patch
|
|
|
+Patch100: chromium-12.0.742.6-no-tests.patch
|
|
|
|
|
|
|
|
|
BuildRequires: gcc gcc-c++
|
|
|
@@ -212,11 +204,7 @@ xz -dc %{SOURCE0} | %__tar -xf - || exit 1
|
|
|
%patch62 -p1
|
|
|
%{?with_system_v8:%patch63 -p1}
|
|
|
%patch100 -p1 -b .vine
|
|
|
-# %patch80 -p1
|
|
|
-# %patch83 -p1
|
|
|
%patch4 -p1
|
|
|
-%patch5 -p1
|
|
|
-%patch7 -p1
|
|
|
%patch8 -p1
|
|
|
%patch12 -p1
|
|
|
%patch13 -p1
|
|
|
@@ -260,7 +248,6 @@ popd
|
|
|
PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS -DUSE_SYSTEM_LIBEVENT -fPIC -fno-ipa-cp -fno-strict-aliasing \' | %__sed "s/ /',/g" | %__sed "s/',/', '/g"`
|
|
|
for i in src/build/common.gypi; do
|
|
|
%__sed -i "s|'-march=pentium4',||g" $i
|
|
|
- %__sed -i "s|'-msse2',||g" $i
|
|
|
%__sed -i "s|'-mfpmath=sse',||g" $i
|
|
|
%__sed -i "s|'-O<(debug_optimize)',||g" $i
|
|
|
%__sed -i "s|'-m32',||g" $i
|
|
|
@@ -328,44 +315,11 @@ pushd src/out/Release
|
|
|
%__cp -a chrome %{buildroot}%{_libdir}/chromium/chromium
|
|
|
%__cp -a lib.target/lib*.so %{buildroot}%{_libdir}/chromium/
|
|
|
%__cp -a lib.host/lib*.so %{buildroot}%{_libdir}/chromium/
|
|
|
-#%__cp -a chrome_sandbox %{buildroot}%{_libdir}/chromium/chrome-sandbox
|
|
|
%__cp -a chrome.1 %{buildroot}%{_mandir}/man1/chrome.1
|
|
|
%__cp -a chrome.1 %{buildroot}%{_mandir}/man1/chromium.1
|
|
|
fdupes %{buildroot}%{_mandir}/man1/
|
|
|
popd
|
|
|
|
|
|
-# devel package install
|
|
|
-%if %{with_devel_pkg}
|
|
|
-mkdir -p %{buildroot}%{_libdir}/chromium/include
|
|
|
-pushd src
|
|
|
-find base -name "*.h" -exec %__cp --parents {} %{buildroot}%{_libdir}/chromium/include \;
|
|
|
-find app -name "*.h" -exec %__cp --parents {} %{buildroot}%{_libdir}/chromium/include \;
|
|
|
-find chrome -name "*.h" -exec %__cp --parents {} %{buildroot}%{_libdir}/chromium/include \;
|
|
|
-find skia -name "*.h" -exec %__cp --parents {} %{buildroot}%{_libdir}/chromium/include \;
|
|
|
-find build -name "*.h" -exec %__cp --parents {} %{buildroot}%{_libdir}/chromium/include \;
|
|
|
-find googleurl -name "*.h" -exec %__cp --parents {} %{buildroot}%{_libdir}/chromium/include \;
|
|
|
-find ipc -name "*.h" -exec %__cp --parents {} %{buildroot}%{_libdir}/chromium/include \;
|
|
|
-find testing -name "*.h" -exec %__cp --parents {} %{buildroot}%{_libdir}/chromium/include \;
|
|
|
-find net -name "*.h" -exec %__cp --parents {} %{buildroot}%{_libdir}/chromium/include \;
|
|
|
-find third_party/skia -name "*.h" -exec %__cp --parents {} %{buildroot}%{_libdir}/chromium/include \;
|
|
|
-find third_party/WebKit -name "*.h" -exec %__cp --parents {} %{buildroot}%{_libdir}/chromium/include \;
|
|
|
-find webkit -name "*.h" -exec %__cp --parents {} %{buildroot}%{_libdir}/chromium/include \;
|
|
|
-#find gfx -name "*.h" -exec %__cp --parents {} %{buildroot}%{_libdir}/chromium/include \;
|
|
|
-popd
|
|
|
-find %{buildroot}%{_libdir}/chromium/include -name "*.h" -exec chmod 644 {} \;
|
|
|
-fdupes %{buildroot}%{_libdir}/chromium/include
|
|
|
-
|
|
|
-%__mkdir_p %{buildroot}/%{_libdir}/pkgconfig
|
|
|
-cat <<EOF > %{buildroot}/%{_libdir}/pkgconfig/chromium-browser.pc
|
|
|
-Name: Chromium browser
|
|
|
-Description: Chromium browser development package
|
|
|
-Version: 1.0.1
|
|
|
-Libs: -L%{_libdir}/chromium -lapp_base -lappcache -lbase_i18n -lbase -lblob -lbrowser -lcacheinvalidation -lchrome_gpu -lchromoting_base -lchromoting_client -lchromoting_host -lchromoting_jingle_glue -lchromoting_protocol -lchromotocol_proto_lib -lcld -lcommon_constants -lcommon_net -lcommon -ldatabase -ldebugger -ldefault_plugin -ldynamic_annotations -lffmpeg -lfileapi -lgfx -lglue -lgoogleurl -lgtest -lharfbuzz_interface -lharfbuzz -lhttp_listen_socket -lhunspell -liccjpeg -lil -linstaller_util -lipc -ljingle_p2p -ljingle -lmedia -lmodp_b64 -lnet_base -lnet -lnotifier -lomx_wrapper -lots -lpcre -lppapi_plugin -lplugin -lprinting -lprofile_import -lprotobuf_lite -lrenderer -lsandbox -lsdch -lservice -lskia_opts -lskia -lsqlite3 -lsrtp -lssl_host_info -lssl -lsymbolize -lsyncapi -lsync_notifier -lsync -ltrace_proto_lib -lundoview -lutility -lwebcore_bindings -lwebcore_html -lwebcore_platform -lwebcore_remaining -lwebcore_svg -lwebkit -lwebkit_user_agent -lwebp -lworker -lwtf -lxdg_mime -lzlib
|
|
|
-Cflags: -I%{_libdir}/chromium/include -I%{_libdir}/chromium/include/skia/config
|
|
|
-EOF
|
|
|
-%endif
|
|
|
-
|
|
|
-
|
|
|
# %__mkdir_p %{buildroot}%{_datadir}/pixmaps/
|
|
|
# %__cp -a src/chrome/app/theme/chromium/product_logo_48.png %{buildroot}%{_datadir}/pixmaps/chromium-browser.png
|
|
|
for i in 16 22 24 32 48 64 128 256; do
|
|
|
@@ -431,8 +385,6 @@ fi || :
|
|
|
%dir %{_datadir}/gnome-control-center/default-apps
|
|
|
%{_bindir}/chromium
|
|
|
%{_libdir}/chromium/chromium
|
|
|
-# These unique permissions are intentional and necessary for the sandboxing
|
|
|
-#%attr(4555, root, root) %{_libdir}/chromium/chrome-sandbox
|
|
|
%{_libdir}/chromium/plugins/
|
|
|
%{_libdir}/chromium/resources/
|
|
|
%{_libdir}/chromium/xdg-settings
|
|
|
@@ -454,14 +406,12 @@ fi || :
|
|
|
%{_libdir}/chromium/locales/
|
|
|
%{_libdir}/chromium/lib*.so
|
|
|
|
|
|
-%if %{with_devel_pkg}
|
|
|
-%files devel
|
|
|
-%defattr(-,root,root,-)
|
|
|
-%{_libdir}/chromium/include/
|
|
|
-%{_libdir}/pkgconfig/chromium-browser.pc
|
|
|
-%endif
|
|
|
-
|
|
|
%changelog
|
|
|
+* Sun Apr 23 2011 Munehiro Yamamoto <munepi@vinelinux.org> 12.0.742.6-1
|
|
|
+- updated to 12.0.742.6
|
|
|
+- dropped/upstreamed patches
|
|
|
+- updated our no-tests patch (chromium-12.0.742.6-no-tests.patch)
|
|
|
+
|
|
|
* Wed Apr 13 2011 Munehiro Yamamoto <munepi@vinelinux.org> 11.0.696.50-1
|
|
|
- updated to 11.0.696.50
|
|
|
- dropped some Patches for MeeGo Netbook
|
munepi