rpms/WebKit/F-9 WebKit.spec,1.12,1.13 WebKit-gcc43.patch,1.2,NONE
Peter Gordon (pgordon)
fedora-extras-commits at redhat.com
Fri Jul 18 23:23:55 UTC 2008
Author: pgordon
Update of /cvs/pkgs/rpms/WebKit/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15569
Modified Files:
WebKit.spec
Removed Files:
WebKit-gcc43.patch
Log Message:
Remove Qt stuff, in preparation for Qt 4.4/KDE 4.1 bumps
Index: WebKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/F-9/WebKit.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- WebKit.spec 6 Jul 2008 06:00:35 -0000 1.12
+++ WebKit.spec 18 Jul 2008 23:23:08 -0000 1.13
@@ -24,7 +24,7 @@
Name: WebKit
Version: 1.0.0
-Release: 0.11.svn%{svn_revision}%{?dist}
+Release: 0.12.svn%{svn_revision}%{?dist}
Summary: Web content engine library
Group: Development/Libraries
@@ -41,13 +41,12 @@
BuildRequires: gperf
BuildRequires: gtk2-devel
BuildRequires: libicu-devel
+BuildRequires: libjpeg-devel
BuildRequires: libtool
BuildRequires: libxslt-devel
BuildRequires: libXt-devel
BuildRequires: pcre-devel
BuildRequires: sqlite-devel
-## Necessary for qmake and friends.
-BuildRequires: qt4-devel
## Conditional dependencies...
%if %{with html5video}
@@ -91,29 +90,6 @@
only be used as a "preview" rather than a stable platform library.
-%package qt
-Summary: Qt port of WebKit
-Group: Development/Libraries
-
-%description qt
-%{name} is an open-source Web content engine library. This package contains
-the shared libraries for the WebKit Qt port as well as the sample QtLauncher
-tool.
-
-
-%package qt-devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name}-qt = %{version}-%{release}
-Requires: pkgconfig
-Requires: qt4-devel
-
-%description qt-devel
-The %{name}-qt-devel package contains libraries, build data, and header files
-for developing applications that use %{name}-qt, as well as the DumpRenderTree
-tool.
-
-
%package doc
Summary: Documentation for %{name}
Group: Documentation
@@ -135,60 +111,24 @@
## Fix permissions for the debuginfo generation.
chmod a-x WebCore/dom/Clipboard.cpp
-## Build the GTK+ port...
## Don't call configure automatically
sed -i.conf -e '$d' autogen.sh
./autogen.sh
-install -d build-gtk
-pushd build-gtk
- 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
-
-
-## ...and the Qt port.
-install -d build-qt
-pushd build-qt
- %{_qt4_qmake} -r \
- OUTPUT_DIR="$PWD" \
- QMAKE_STRIP=/bin/true \
- QMAKE_RPATH= \
- QMAKE_CFLAGS="%{optflags}" \
- QMAKE_CXXFLAGS="%{optflags}" \
- VERSION=%{version} \
- CONFIG-=gtk \
- CONFIG+=qt-port \
- WEBKIT_LIB_DIR=%{_libdir} \
- ../WebKit.pro
- make %{?_smp_mflags}
-popd
+%configure \
+%{?with_debug: --enable-debug } \
+%{?with_html5video: --enable-video } \
+%{?with_pango: --with-font-backend=pango } \
+%{?with_svg: --enable-svg-filters }
+
+make %{?_smp_mflags}
%install
rm -rf %{buildroot}
-make -C build-gtk install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot}
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}
-
-
-## Cleanup the pkgconfig files a bit...
-pushd %{buildroot}%{_libdir}/pkgconfig/
- for WEBKIT_LIB in QtWebKit; do
- sed -i -e 's!prefix=.*!prefix=%{_prefix}!' ${WEBKIT_LIB}.pc
- ## We don't need linkage that the WebKit DSOs already ensure.
- sed -i -e "s/^Libs:.*$/Libs: -L\${libdir} -l${WEBKIT_LIB}/" ${WEBKIT_LIB}.pc
- done
-popd
+install -m 755 Programs/.libs/GtkLauncher %{buildroot}%{_libexecdir}/%{name}
## Finally, copy over and rename the various files for %%doc inclusion.
rm -f docfiles.list
@@ -218,17 +158,12 @@
%postun gtk -p /sbin/ldconfig
-%post qt -p /sbin/ldconfig
-
-%postun qt -p /sbin/ldconfig
-
-
%files gtk
%defattr(-,root,root,-)
+%doc
%{_bindir}/jsc
%{_libdir}/libwebkit-1.0.so.*
-%dir %{_libexecdir}/WebKit/
-%{_libexecdir}/WebKit/GtkLauncher
+%{_libexecdir}/WebKit/
%files gtk-devel
%defattr(-,root,root,-)
@@ -237,26 +172,16 @@
%{_libdir}/libwebkit-1.0.so
%{_libdir}/pkgconfig/webkit-1.0.pc
-%files qt
-%defattr(-,root,root,-)
-%{_libdir}/libQtWebKit.so.*
-%dir %{_libexecdir}/WebKit/
-%{_libexecdir}/WebKit/QtLauncher
-
-%files qt-devel
-%defattr(-,root,root,-)
-%{_includedir}/QtWebKit/
-%{_libdir}/libQtWebKit.prl
-%{_libdir}/libQtWebKit.so
-%{_libdir}/pkgconfig/QtWebKit.pc
-%{_libexecdir}/WebKit/DumpRenderTree
-%{_qt4_prefix}/mkspecs/features/qtwebkit.prf
-
%files doc -f docfiles.list
%defattr(-,root,root,-)
%changelog
+* Fri Jul 18 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.12.svn34655
+- Remove Qt subpackage stuff, in preparation for Qt 4.4 bump; thanks to Rex
+ Dieter/Ngo Than and crew.
+- Reference: bug 442200 (RFE: WebKit Migration)
+
* 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
--- WebKit-gcc43.patch DELETED ---
More information about the fedora-extras-commits
mailing list