rpms/WebKit/F-9 .cvsignore, 1.7, 1.8 WebKit.spec, 1.11, 1.12 sources, 1.7, 1.8
Peter Gordon (pgordon)
fedora-extras-commits at redhat.com
Sun Jul 6 06:01:20 UTC 2008
Author: pgordon
Update of /cvs/pkgs/rpms/WebKit/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4740/F-9
Modified Files:
.cvsignore WebKit.spec sources
Log Message:
* Sat Jul 05 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.11.svn34655
- Update to new upstream snapshot (SVN 34655)
- Resolves: CVE-2008-2307 (bug #454092: memory corruption in handling of
JavaScript arrays)
- Add some build-time conditionals for non-default features: debug, html5video,
pango, svg.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 3 Jun 2008 05:10:20 -0000 1.7
+++ .cvsignore 6 Jul 2008 06:00:35 -0000 1.8
@@ -1 +1 @@
-WebKit-r34279.tar.bz2
+WebKit-r34655.tar.bz2
Index: WebKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/F-9/WebKit.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- WebKit.spec 3 Jun 2008 05:10:20 -0000 1.11
+++ WebKit.spec 6 Jul 2008 06:00:35 -0000 1.12
@@ -3,11 +3,28 @@
cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') \
echo %%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') >> docfiles.list
-%define svn_revision 34279
+%define svn_revision 34655
+
+## Optional build modifications (for the GTK+ port only)
+## --with debug: Enable more verbose debugging. Makes runtime a bit slower.
+## (Default: No)
+##
+## --with html5video: HTML5 video element support using Gstreamer
+## (Default: No)
+##
+## --with pango: Use Pango instead of freetype2 as the font renderer
+## (Default: No - use freetype2)
+##
+## --with svg: Experimental SVG support (filters)
+## (Default: No)
+%bcond_with debug
+%bcond_with html5video
+%bcond_with pango
+%bcond_with svg
Name: WebKit
Version: 1.0.0
-Release: 0.10.svn%{svn_revision}%{?dist}
+Release: 0.11.svn%{svn_revision}%{?dist}
Summary: Web content engine library
Group: Development/Libraries
@@ -23,14 +40,29 @@
BuildRequires: flex
BuildRequires: gperf
BuildRequires: gtk2-devel
-BuildRequires: libicu-devel
+BuildRequires: libicu-devel
BuildRequires: libtool
BuildRequires: libxslt-devel
-BuildRequires: pango-devel
+BuildRequires: libXt-devel
BuildRequires: pcre-devel
+BuildRequires: sqlite-devel
## Necessary for qmake and friends.
BuildRequires: qt4-devel
-BuildRequires: sqlite-devel
+
+## Conditional dependencies...
+%if %{with html5video}
+BuildRequires: gnome-vfs2-devel
+BuildRequires: gstreamer-devel
+BuildRequires: gstreamer-plugins-base-devel
+%endif
+
+%if %{with pango}
+BuildRequires: pango-devel
+%else
+BuildRequires: cairo-devel
+BuildRequires: fontconfig-devel
+BuildRequires: freetype-devel
+%endif
%description
WebKit is an open source web browser engine.
@@ -95,6 +127,7 @@
%prep
%setup -qn "%{name}-r%{svn_revision}"
+
%build
## We don't like pre-built binaries, especially ones for other OSes. =)
rm -r WebKitLibraries/{*.a,win/}
@@ -102,17 +135,19 @@
## Fix permissions for the debuginfo generation.
chmod a-x WebCore/dom/Clipboard.cpp
-status=0
## Build the GTK+ port...
-
## Don't call configure automatically
sed -i.conf -e '$d' autogen.sh
-mkdir build-gtk
+./autogen.sh
+install -d build-gtk
pushd build-gtk
- ../autogen.sh
- ln -sf ../configure
- %configure --with-font-backend=pango --enable-icon-database
- make %{?_smp_mflags} -k || status=1
+ ln -sf ../configure
+ %configure \
+ %{?with_debug: --enable-debug } \
+ %{?with_html5video: --enable-video } \
+ %{?with_pango: --with-font-backend=pango } \
+ %{?with_svg: --enable-svg-filters }
+ make %{?_smp_mflags}
popd
@@ -130,13 +165,9 @@
CONFIG+=qt-port \
WEBKIT_LIB_DIR=%{_libdir} \
../WebKit.pro
- make %{?_smp_mflags} -k \
- || status=$((status+10))
+ make %{?_smp_mflags}
popd
-echo $status
-if [ $status -gt 0 ] ; then exit 1 ; fi
-
%install
rm -rf %{buildroot}
@@ -145,8 +176,6 @@
install -d -m 755 %{buildroot}%{_libexecdir}/%{name}
install -m 755 build-gtk/Programs/.libs/GtkLauncher %{buildroot}%{_libexecdir}/%{name}
-
-
make -C build-qt install INSTALL_ROOT=%{buildroot}
install -m 755 build-qt/bin/QtLauncher %{buildroot}%{_libexecdir}/%{name}
install -m 755 build-qt/bin/DumpRenderTree %{buildroot}%{_libexecdir}/%{name}
@@ -196,7 +225,7 @@
%files gtk
%defattr(-,root,root,-)
-%doc
+%{_bindir}/jsc
%{_libdir}/libwebkit-1.0.so.*
%dir %{_libexecdir}/WebKit/
%{_libexecdir}/WebKit/GtkLauncher
@@ -228,6 +257,13 @@
%changelog
+* Sat Jul 05 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.11.svn34655
+- Update to new upstream snapshot (SVN 34655)
+- Resolves: CVE-2008-2307 (bug #454092: memory corruption in handling of
+ JavaScript arrays)
+- Add some build-time conditionals for non-default features: debug, html5video,
+ pango, svg.
+
* Tue Jun 3 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0.0-0.10.svn34279
- Update to new upstream snapshot (SVN 34279) anyway
- libqtwebico.so is no longer supported.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 3 Jun 2008 05:10:20 -0000 1.7
+++ sources 6 Jul 2008 06:00:35 -0000 1.8
@@ -1 +1 @@
-dd20db02fbe7b60b3c5580287d4996a5 WebKit-r34279.tar.bz2
+0c4dcb3f69d9bd63817005a11a797425 WebKit-r34655.tar.bz2
More information about the scm-commits
mailing list