rpms/WebKit/F-8 WebKit-TCSpinLock-use-pthread-stubs.patch, NONE, 1.1 WebKit.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Peter Gordon (pgordon)]

Author: pgordon

Update of /cvs/pkgs/rpms/WebKit/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13295/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	WebKit-TCSpinLock-use-pthread-stubs.patch WebKit.spec 
Log Message:
Initial import (bug 415211).

WebKit-TCSpinLock-use-pthread-stubs.patch:

--- NEW FILE WebKit-TCSpinLock-use-pthread-stubs.patch ---
diff -up ./JavaScriptCore/wtf/TCSpinLock.h.old ./JavaScriptCore/wtf/TCSpinLock.h
--- ./JavaScriptCore/wtf/TCSpinLock.h.old	2007-12-07 11:40:02.000000000 -0800
+++ ./JavaScriptCore/wtf/TCSpinLock.h	2007-12-07 11:40:17.000000000 -0800
@@ -33,7 +33,7 @@
 #ifndef TCMALLOC_INTERNAL_SPINLOCK_H__
 #define TCMALLOC_INTERNAL_SPINLOCK_H__
 
-#if (PLATFORM(X86) || PLATFORM(PPC)) && (COMPILER(GCC) || COMPILER(MSVC))
+#if 0
 
 #include <time.h>       /* For nanosleep() */
 


--- NEW FILE WebKit.spec ---
%define 	add_to_doc_files()	\
	mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}; \
	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	28482

Name:		WebKit
Version:	1.0.0
Release:	0.3.svn%{svn_revision}%{?dist}
Summary:	Web content engine library

Group:		Development/Libraries
License:	LGPLv2+ and BSD
URL:		http://webkit.org/

Source0:	http://nightly.webkit.org/files/trunk/src/WebKit-r%{svn_revision}.tar.bz2

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

## Currently does not build by default on PPC due to some assembly issues in
## the JavaScriptCore/wtf/TCSystemAlloc.cpp code. We disable the assembly
## usage and opt for using the portable pthread implementation instead.
Patch0: 	%{name}-TCSpinLock-use-pthread-stubs.patch

BuildRequires:	bison
BuildRequires:	curl-devel
BuildRequires:	flex
BuildRequires:	gperf
BuildRequires:	gtk2-devel
BuildRequires:	libicu-devel
BuildRequires:	libxslt-devel
## Necessary for qmake and friends.
BuildRequires:	qt4-devel
BuildRequires:	sqlite-devel

%description 
WebKit is an open source web browser engine.    

%package	gtk
Summary:	GTK+ port of WebKit 
Group:		Development/Libraries

%description	gtk
%{name} is an open-source Web content engine library. This package contains
the shared libraries for the WebKit GTK+ port as well as the sample
GtkLauncher tool. 


%package	gtk-devel
Summary:	Development files for %{name}
Group:		Development/Libraries
Requires:	%{name}-gtk = %{version}-%{release}
Requires:	pkgconfig
Requires:	gtk2-devel
## Uses qmake, so needs the Qt4 development stuff too.
Requires:	qt4-devel

%description	gtk-devel
The %{name}-gtk-devel package contains libraries, build data, and header
files for developing applications that use %{name}-gtk.
Please note that the WebKit/GTK+ API is not yet stable. This should
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

%description	doc
%{name} is an open-source Web content engine library. This package contains
the documentation for %{name}, including various LICENSE, README, and
AUTHORS files.


%prep
%setup -qn "%{name}-r%{svn_revision}"
%patch0 -p0 -b .TCSpinLock-pthread-stubs

%build
## We don't like pre-built binaries, especially ones for other OSes. =)
rm -r WebKitLibraries/{*.a,win/}

## Fix permissions for the debuginfo generation.
chmod a-x WebCore/dom/Clipboard.cpp

## Build the GTK+ port...
install -d build-gtk
pushd build-gtk
	%{_qt4_qmake} -r 				\
		OUTPUT_DIR="$PWD"			\
		QMAKE_STRIP=/bin/true			\
		QMAKE_RPATH=				\
		QMAKE_CFLAGS="%{optflags}"		\
		QMAKE_CXXFLAGS="%{optflags}"		\
		VERSION=%{version}			\
		CONFIG-=qt				\
		CONFIG+=gtk-port			\
		WEBKIT_INC_DIR=%{_includedir}/WebKit	\
		WEBKIT_LIB_DIR=%{_libdir}		\
		../WebKit.pro
	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_INC_DIR=%{_includedir}/WebKit	\
		WEBKIT_LIB_DIR=%{_libdir}		\
		../WebKit.pro
	make %{?_smp_mflags}
popd


%install
rm -rf %{buildroot}

make -C build-gtk install INSTALL_ROOT=%{buildroot}
install -d -m 755 %{buildroot}%{_libexecdir}/%{name}
install -m 755 build-gtk/WebKitTools/GtkLauncher/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 WebKitGtk; 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

## Finally, copy over and rename the various files for %%doc inclusion.
rm -f docfiles.list
%add_to_doc_files JavaScriptCore/icu/LICENSE
%add_to_doc_files JavaScriptGlue/LICENSE
%add_to_doc_files WebKit/LICENSE
%add_to_doc_files WebCore/LICENSE-APPLE
%add_to_doc_files WebCore/LICENSE-LGPL-2.1
%add_to_doc_files WebCore/icu/LICENSE

%add_to_doc_files JavaScriptCore/icu/README
%add_to_doc_files WebCore/README
%add_to_doc_files WebCore/icu/README

%add_to_doc_files JavaScriptCore/AUTHORS
%add_to_doc_files JavaScriptCore/pcre/AUTHORS   


%clean
rm -rf %{buildroot}


%post	gtk -p /sbin/ldconfig

%postun	gtk -p /sbin/ldconfig


%post	qt -p /sbin/ldconfig

%postun	qt -p /sbin/ldconfig


%files	gtk
%defattr(-,root,root,-)
%doc
%{_libdir}/libWebKitGtk.so.*
%dir %{_libexecdir}/WebKit/
%{_libexecdir}/WebKit/GtkLauncher

%files	gtk-devel
%defattr(-,root,root,-)
%{_includedir}/WebKit
%{_libdir}/libWebKitGtk.prl
%{_libdir}/libWebKitGtk.so
%{_libdir}/pkgconfig/WebKitGtk.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_plugindir}/imageformats/libqtwebico.so
%{_qt4_prefix}/mkspecs/features/qtwebkit.prf

%files	doc -f docfiles.list
%defattr(-,root,root,-)


%changelog
* Thu Dec 06 2007 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.3.svn28482
- Add proper %%defattr line to qt, qt-devel, and doc subpackages.
- Add patch to forcibly build the TCSpinLock code using the pthread
  implementation:
  + TCSpinLock-use-pthread-stubs.patch

* Thu Dec 06 2007 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.2.svn28482
- Package renamed from WebKitGtk.
- Update to SVN 28482.
- Build both the GTK and Qt ports, putting each into their own respective
  subpackages.
- Invoke qmake-qt4 and make directly (with SMP build flags) instead of using
  the build-webkit script from upstream.
- Add various AUTHORS, README, and LICENSE files (via the doc subpackage). 

* Tue Dec 04 2007 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.1.svn28383
- Initial packaging for Fedora.

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Dec 2007 21:22:23 -0000	1.1
+++ .cvsignore	12 Dec 2007 00:40:47 -0000	1.2
@@ -0,0 +1 @@
+WebKit-r28482.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Dec 2007 21:22:23 -0000	1.1
+++ sources	12 Dec 2007 00:40:47 -0000	1.2
@@ -0,0 +1 @@
+e2e8dcae34e6c06aa410c3abefc3fff0  WebKit-r28482.tar.bz2