[qtwebkit] respin tarball using upstream make-package.py tool
Rex Dieter
rdieter at fedoraproject.org
Fri May 11 16:39:12 UTC 2012
commit 9985f39d6494b9c1a48a4580be442fecf05b34b9
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Fri May 11 11:41:38 2012 -0500
respin tarball using upstream make-package.py tool
.gitignore | 2 +-
qtwebkit-2.2.x-glib231-wk#69840.patch | 13 ---------
qtwebkit.spec | 48 ++++++++++++++++++---------------
sources | 2 +-
webkit-qtwebkit-gcc-4.7.patch | 11 -------
5 files changed, 28 insertions(+), 48 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bbe35dd..f2a577f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
/qtwebkit-developers-qtwebkit-qtwebkit-2.1.1.tar.xz
-/qtwebkit-2.2.0.tar.xz
/qtwebkit-2.2.1.tar.xz
+/qtwebkit-2.2.1-source.tar.xz
diff --git a/qtwebkit-2.2.x-glib231-wk#69840.patch b/qtwebkit-2.2.x-glib231-wk#69840.patch
index 1051449..bd7cb94 100644
--- a/qtwebkit-2.2.x-glib231-wk#69840.patch
+++ b/qtwebkit-2.2.x-glib231-wk#69840.patch
@@ -1,16 +1,3 @@
-diff -up webkit-qtwebkit/configure.ac.glib231 webkit-qtwebkit/configure.ac
---- webkit-qtwebkit/configure.ac.glib231 2011-12-21 12:52:38.000000000 +0100
-+++ webkit-qtwebkit/configure.ac 2011-12-21 12:53:27.000000000 +0100
-@@ -111,6 +111,9 @@ if test "$os_win32" = "no"; then
- AC_CHECK_HEADERS([pthread.h],
- AC_DEFINE([HAVE_PTHREAD_H],[1],[Define if pthread exists]),
- AC_MSG_ERROR([pthread support is required to build WebKit]))
-+AC_CHECK_LIB(pthread, pthread_rwlock_init,
-+ AC_DEFINE([HAVE_PTHREAD_RWLOCK],[1],[Define if pthread rwlock is present]),
-+ AC_MSG_WARN([pthread rwlock support is not available]))
- fi
-
- # check for libjpeg the way Gtk does it.
diff -up webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am.glib231 webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am
--- webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am.glib231 2011-11-09 16:32:47.000000000 +0100
+++ webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am 2011-12-21 12:50:19.000000000 +0100
diff --git a/qtwebkit.spec b/qtwebkit.spec
index 705d622..7b29118 100644
--- a/qtwebkit.spec
+++ b/qtwebkit.spec
@@ -1,15 +1,24 @@
Name: qtwebkit
Version: 2.2.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Qt WebKit bindings
Group: System Environment/Libraries
License: LGPLv2 with exceptions or GPLv3 with exceptions
URL: http://trac.webkit.org/wiki/QtWebKit
-# git clone git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git ; cd qtwebkit
-# git archive --prefix=webkit-qtwebkit/ qtwebkit-2.2.1 \
-# autogen.sh ChangeLog configure.ac GNUmakefile.am Makefile Source/ Tools/ | xz -9
-Source0: qtwebkit-%{version}.tar.xz
+# get make-package.py:
+# $ git clone git://qt.gitorious.org/qtwebkit/tools.git
+# get Qt WebKit source code:
+# $ git clone git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git
+# create a branch from a tag (e.g. qtwebkit-2.2.1):
+# $ git checkout -b qtwebkit-2.2.1 qtwebkit-2.2.1
+# generate the tarball (requires: bison flex gperf):
+# $ make-package.py
+# fix/repack the generated tarball:
+# $ tar xzf qtwebkit-2.2-source.tar.gz
+# $ mv qtwebkit-2.2.1-source/include qtwebkit-2.2.1-source/Source/
+# $ tar cJf qtwebkit-2.2.1-source.tar.xz qtwebkit-2.2.1-source/
+Source0: qtwebkit-%{version}-source.tar.xz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
# search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too
@@ -32,13 +41,7 @@ Patch6: qtwebkit-2.2.x-glib231-wk#69840.patch
# gcc doesn't support flag -fuse-ld=gold
Patch7: webkit-qtwebkit-ld.gold.patch
-# fix build gcc-4.7 issue
-Patch8: webkit-qtwebkit-gcc-4.7.patch
-
-BuildRequires: bison
BuildRequires: chrpath
-BuildRequires: flex
-BuildRequires: gperf
BuildRequires: libicu-devel
BuildRequires: libjpeg-devel
BuildRequires: pkgconfig(gio-2.0) pkgconfig(glib-2.0)
@@ -50,7 +53,6 @@ BuildRequires: pkgconfig(QtCore) pkgconfig(QtNetwork)
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xrender)
-BuildRequires: perl
%if 0%{?fedora}
# for QtLocation, QtSensors
BuildRequires: qt-mobility-devel >= 1.2
@@ -81,7 +83,7 @@ Provides: qt4-webkit-devel%{?_isa} = 2:%{version}-%{release}
%prep
-%setup -q -n webkit-qtwebkit
+%setup -q -n qtwebkit-%{version}-source
%patch1 -p1 -b .pluginpath
%patch3 -p1 -b .debuginfo
@@ -89,26 +91,24 @@ Provides: qt4-webkit-devel%{?_isa} = 2:%{version}-%{release}
%patch5 -p1 -b .qt46
%patch6 -p1 -b .glib231
%patch7 -p1 -b .ld.gold
-%patch8 -p1 -b .gcc-4.7
+
%build
PATH=%{_qt4_bindir}:$PATH; export PATH
QTDIR=%{_qt4_prefix}; export QTDIR
-# --install-headers=%{_qt4_headerdir} \
-# --install-libs=%{_qt4_libdir} \
-Tools/Scripts/build-webkit \
- --makeargs="%{?_smp_mflags}" \
- --qmake=%{_qt4_qmake} \
- --qt \
- --release
+pushd Source
+%{_qt4_qmake}
+popd
+
+make %{?_smp_mflags} -C Source
%install
rm -rf %{buildroot}
-make install INSTALL_ROOT=%{buildroot} -C WebKitBuild/Release
+make install INSTALL_ROOT=%{buildroot} -C Source
## HACK, there has to be a better way
chrpath --list %{buildroot}%{_qt4_libdir}/libQtWebKit.so.4.9.0 ||:
@@ -118,6 +118,7 @@ chrpath --list %{buildroot}%{_qt4_importdir}/QtWebKit/libqmlwebkitplugin.so ||
chrpath --delete %{buildroot}%{_qt4_importdir}/QtWebKit/libqmlwebkitplugin.so ||:
%endif
+
%clean
rm -rf %{buildroot}
@@ -142,6 +143,9 @@ rm -rf %{buildroot}
%changelog
+* Fri May 11 2012 Rex Dieter <rdieter at fedoraproject.org> 2.2.1-5
+- respin tarball using upstream make-package.py tool
+
* Tue Jan 24 2012 Than Ngo <than at redhat.com> - 2.2.1-4
- gcc doesn't support flag -fuse-ld=gold yet
- fix build failure with gcc-4.7
diff --git a/sources b/sources
index 338e212..ab1c26e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7ca591ef308d0a025fe9b466ec04c9a9 qtwebkit-2.2.1.tar.xz
+f9669cf1f28ba4020377d7d8266a225b qtwebkit-2.2.1-source.tar.xz
More information about the scm-commits
mailing list