[meego-commits] 7340: Changes to Trunk:Testing/qtwebkit

[Fathi Boudra]

Hi,
I have made the following changes to qtwebkit in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Fathi Boudra

[This message was auto-generated]

---

Request #7340:

  submit:   devel:qt-mtf/qtwebkit(r4) -> Trunk:Testing/qtwebkit


Message:
    NOTE: exception request for a new Qt WebKit upstream release.
Qt WebKit 2.1 is a build requirement for the upcoming Qt Web Runtime package
(feature bug #2772; part of MeeGo 1.1 API).

* Sat Sep 04 2010 Fathi Boudra <fathi.boudra at nokia.com> - 2.1~week35
- Update Qt WebKit to 2.1 weekly build 35
- Use %qmake and %qmake_install macros
- Remove 0002_add_webkit_qt_config.patch - merged upstream
- Update devel package files: add qwebkitplatformplugin.h

State:   new          2010-09-06T01:01:03 boudra
Comment: None



changes files:
--------------
--- qtwebkit.changes
+++ qtwebkit.changes
@@ -0,0 +1,6 @@
+* Sat Sep 04 2010 Fathi Boudra <fathi.boudra at nokia.com> - 2.1~week35
+- Update Qt WebKit to 2.1 weekly build 35
+- Use %qmake and %qmake_install macros
+- Remove 0002_add_webkit_qt_config.patch - merged upstream
+- Update devel package files: add qwebkitplatformplugin.h
+

old:
----
  0002_add_webkit_qt_config.patch
  qtwebkit-2.0-source.tar.gz

new:
----
  qtwebkit-2.1-source.tar.gz

spec files:
-----------
--- qtwebkit.spec
+++ qtwebkit.spec
@@ -1,7 +1,7 @@
-# spec file for package qtwebkit (Version 2.0 week build 32)
+# spec file for package qtwebkit (Version 2.1 week build 35)
 
-%define upstream_short_version 2.0
-%define upstream_extra_version week32
+%define upstream_short_version 2.1
+%define upstream_extra_version week35
 
 Name:           qtwebkit
 Version:        %{upstream_short_version}~%{upstream_extra_version}
@@ -12,11 +12,10 @@
 Group:          System/Libraries
 Source0:        http://pepper.troll.no/%{name}/weekly-builds/%{upstream_short_version}/%{upstream_extra_version}/%{name}-%{upstream_short_version}-source.tar.gz
 Patch0:         0001_fix_symbols_visibility_for_webcore.patch
-Patch1:         0002_add_webkit_qt_config.patch
-Patch2:         01_lflags_as-needed.patch
-Patch3:         02_add_nostrip_for_debug_packages.patch
-Patch4:         03_hide_std_symbols.patch
-Patch5:         04_enable_debug_information.patch
+Patch1:         01_lflags_as-needed.patch
+Patch2:         02_add_nostrip_for_debug_packages.patch
+Patch3:         03_hide_std_symbols.patch
+Patch4:         04_enable_debug_information.patch
 BuildRequires:  gcc-c++
 BuildRequires:  gperf
 BuildRequires:  pkgconfig(QtGui)
@@ -67,21 +66,23 @@
 
 %prep
 %setup -n %{name}-%{upstream_short_version}-source -q
+# 0001_fix_symbols_visibility_for_webcore.patch
 %patch0 -p1
+# 01_lflags_as-needed.patch
 %patch1 -p1
+# 02_add_nostrip_for_debug_packages.patch
 %patch2 -p1
+# 03_hide_std_symbols.patch
 %patch3 -p1
+# 04_enable_debug_information.patch
 %patch4 -p1
-%patch5 -p1
 
 %build
-qmake -makefile -nocache \
-      "QMAKE_CFLAGS_RELEASE=%{optflags}" "QMAKE_CXXFLAGS_RELEASE=%{optflags}" \
-      QMAKE_STRIP=: PREFIX=%{_prefix} DEFINES+=ENABLE_VIDEO
+%qmake DEFINES+=ENABLE_VIDEO
 make %{?_smp_mflags}
 
 %install
-make install INSTALL_ROOT=%{buildroot}
+%qmake_install
 
 %post -n lib%{name}4 -p /sbin/ldconfig
 %postun -n lib%{name}4 -p /sbin/ldconfig
@@ -116,6 +117,7 @@
 %{_includedir}/qt4/QtWebKit/qwebhistoryinterface.h
 %{_includedir}/qt4/QtWebKit/qwebinspector.h
 %{_includedir}/qt4/QtWebKit/qwebkitglobal.h
+%{_includedir}/qt4/QtWebKit/qwebkitplatformplugin.h
 %{_includedir}/qt4/QtWebKit/qwebkitversion.h
 %{_includedir}/qt4/QtWebKit/qwebpage.h
 %{_includedir}/qt4/QtWebKit/qwebpluginfactory.h

other changes:
--------------

++++++ 0001_fix_symbols_visibility_for_webcore.patch
--- 0001_fix_symbols_visibility_for_webcore.patch
+++ 0001_fix_symbols_visibility_for_webcore.patch
@@ -4,7 +4,7 @@
 
 --- a/WebCore/WebCore.pro
 +++ b/WebCore/WebCore.pro
-@@ -93,7 +93,7 @@ unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffun
+@@ -94,7 +94,7 @@ unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffun
  unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
  linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
  

++++++ 01_lflags_as-needed.patch
--- 01_lflags_as-needed.patch
+++ 01_lflags_as-needed.patch
@@ -3,9 +3,9 @@
 
 --- a/WebKit.pri
 +++ b/WebKit.pri
-@@ -58,6 +58,8 @@ symbian {
+@@ -60,6 +60,8 @@ symbian {
  CONFIG -= warn_on
- *-g++*:QMAKE_CXXFLAGS += -Wall -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self
+ *-g++*:QMAKE_CXXFLAGS += -Wall -Wextra -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self
  
 +*-g++*:QMAKE_LFLAGS += -Wl,--as-needed
 +

++++++ 02_add_nostrip_for_debug_packages.patch
--- 02_add_nostrip_for_debug_packages.patch
+++ 02_add_nostrip_for_debug_packages.patch
@@ -4,7 +4,7 @@
 
 --- a/WebKit.pri
 +++ b/WebKit.pri
-@@ -8,6 +8,8 @@ else:exists($$PWD/WebCore/generated): CO
+@@ -10,6 +10,8 @@ CONFIG += production
  
  CONFIG += depend_includepath
  

++++++ 03_hide_std_symbols.patch
--- 03_hide_std_symbols.patch
+++ 03_hide_std_symbols.patch
@@ -4,8 +4,8 @@
 
 --- a/WebKit.pri
 +++ b/WebKit.pri
-@@ -61,6 +61,7 @@ CONFIG -= warn_on
- *-g++*:QMAKE_CXXFLAGS += -Wall -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self
+@@ -63,6 +63,7 @@ CONFIG -= warn_on
+ *-g++*:QMAKE_CXXFLAGS += -Wall -Wextra -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self
  
  *-g++*:QMAKE_LFLAGS += -Wl,--as-needed
 +*-g++*:QMAKE_LFLAGS += -Wl,--version-script,$$BASE_DIR/symbols.filter

++++++ 04_enable_debug_information.patch
--- 04_enable_debug_information.patch
+++ 04_enable_debug_information.patch
@@ -4,7 +4,7 @@
 
 --- a/WebCore/WebCore.pro
 +++ b/WebCore/WebCore.pro
-@@ -2943,8 +2943,6 @@ HEADERS += $$WEBKIT_API_HEADERS
+@@ -3158,8 +3158,6 @@ HEADERS += $$WEBKIT_API_HEADERS
  
  CONFIG(QTDIR_build) {
      # Remove the following 2 lines if you want debug information in WebCore

++++++ qtwebkit-2.1-source.tar.gz (new)

++++++ deleted files:
--- 0002_add_webkit_qt_config.patch
--- qtwebkit-2.0-source.tar.gz