Hello community, here is the log from the commit of package libQtWebKit4 for openSUSE:Factory checked in at 2012-01-06 11:45:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libQtWebKit4 (Old) and /work/SRC/openSUSE:Factory/.libQtWebKit4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libQtWebKit4", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libQtWebKit4/libQtWebKit4.changes 2011-10-08 22:03:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libQtWebKit4.new/libQtWebKit4.changes 2012-01-06 11:45:45.000000000 +0100 @@ -1,0 +2,31 @@ +Mon Jan 2 22:49:39 CET 2012 - [email protected] + +- fix license tags +- fix build with glib >= 2.31 + +------------------------------------------------------------------- +Fri Dec 16 16:00:39 UTC 2011 - [email protected] + +- Sync version with libqt4 + +------------------------------------------------------------------- +Wed Dec 14 14:03:42 UTC 2011 - [email protected] + +- add patch to reduce memory usage during linking (ARM only) + +------------------------------------------------------------------- +Mon Dec 5 21:59:30 UTC 2011 - [email protected] + +- do not force fixed optimization level + +------------------------------------------------------------------- +Mon Dec 5 00:34:29 UTC 2011 - [email protected] + +- compile with -O1 on armv7 because of compiler bug + +------------------------------------------------------------------- +Wed Nov 23 11:57:38 UTC 2011 - [email protected] + +- Bump version to match the libqt4 one. Fixes the libqt4-devel-doc build + +------------------------------------------------------------------- New: ---- build-with-glib-231.diff do-not-force-optimization-level.diff reduce-link-optimization.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libQtWebKit4.spec ++++++ --- /var/tmp/diff_new_pack.AgxDn1/_old 2012-01-06 11:46:00.000000000 +0100 +++ /var/tmp/diff_new_pack.AgxDn1/_new 2012-01-06 11:46:00.000000000 +0100 @@ -1,6 +1,7 @@ # -# spec file for package qtwebkit +# spec file for package libQtWebKit4 # +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 Asterios Dramis <[email protected]>. # # All modifications and additions to the file contributed by third parties @@ -12,15 +13,16 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Name: libQtWebKit4 %define tar_version 2.2.0 -Version: 4.7.4+%tar_version -Release: 1 +Version: 4.8.0+%tar_version +Release: 0 Summary: Open source Web Browser engine based on Qt4 - -License: LGPL-2.0 with exceptions or GPL-3.0 with exceptions +License: LGPL-2.1+ ; BSD-3-Clause +Group: Development/Libraries/C and C++ Url: http://trac.webkit.org/wiki/QtWebKit -Group: System/Libraries Source0: QtWebKit-%{tar_version}.tar.bz2 Source1: baselibs.conf # PATCH-FIX-OPENSUSE webkit-qtwebkit-2.2-tp1-pluginpath.patch [email protected] -- Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too (taken from Fedora) @@ -34,13 +36,16 @@ # PATCH-FIX-OPENSUSE 02_add_nostrip_for_debug_packages.diff [email protected] -- Set CONFIG += nostrip to avoid stripping (taken from Ubuntu) Patch6: 02_add_nostrip_for_debug_packages.diff # PATCH-FIX-OPENSUSE 03_hide_std_symbols.diff [email protected] -- Do not make the std:: symbols in webkit public (taken from Ubuntu) +Patch7: 03_hide_std_symbols.diff Patch8: 04_enable_debug_information.diff # PATCH-FIX-OPENSUSE defines_qt_webkit.diff [email protected] -- Defines QT_WEBKIT to display correctly documentation in Qt Creator Help plugin (taken from Ubuntu) Patch9: defines_qt_webkit.diff +Patch10: do-not-force-optimization-level.diff +Patch11: reduce-link-optimization.diff +Patch12: build-with-glib-231.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison -BuildRequires: chrpath BuildRequires: fdupes BuildRequires: flex BuildRequires: fontconfig-devel @@ -74,7 +79,6 @@ %package -n libQtWebKit-devel Summary: Development files for qtwebkit -License: GPLv2 ; GPLv3 Group: Development/Libraries/C and C++ Requires: libQtWebKit4 = %{version} %requires_ge libqt4-devel @@ -89,17 +93,35 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 +%ifarch %arm +%patch11 +%endif +%patch12 %build export QTDIR=%{_prefix} +%ifarch armv7l +# There is a bug in gcc 4.6 that triggers an ICE with vfpv3 and -O2/-O3. We can +# either work it around by forcing the FPU to neon (which breaks tegra2) or +# compiling with -O1. We do the latter. Can most likely be removed with gcc 4.7 +# +# https://bugs.launchpad.net/gcc-linaro/+bug/795131 +# +RPM_OPT_FLAGS="${RPM_OPT_FLAGS/-O2/-O1}" +# debug stuff uses too much memory so linking fails +RPM_OPT_FLAGS="${RPM_OPT_FLAGS/-g/}" +%endif + Tools/Scripts/build-webkit \ --release \ --qt \ --makeargs="%{?_smp_mflags}" \ - --qmakearg="CONFIG+=use_system_icu QMAKE_CFLAGS+=\"%{optflags}\" QMAKE_CXXFLAGS+=\"%{optflags}\" DEFINES+=USE_GSTREAMER=1" + --qmakearg="CONFIG+=use_system_icu QMAKE_CFLAGS+=\"${RPM_OPT_FLAGS}\" QMAKE_CXXFLAGS+=\"${RPM_OPT_FLAGS}\" DEFINES+=USE_GSTREAMER=1" %install make install INSTALL_ROOT=%{buildroot} -C WebKitBuild/Release @@ -109,12 +131,6 @@ find %{buildroot}%{_libdir} -type f -name '*prl' -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \; find %{buildroot}%{_libdir} -type f -name '*pc' -print -exec perl -pi -e "s, -L$RPM_BUILD_DIR/?\S+,,g" {} \; -exec sed -i -e "s,^moc_location=.*,moc_location=/usr/bin/moc," -e "s,uic_location=.*,uic_location=/usr/bin/uic," {} \; -# HACK, there has to be a better way -chrpath --list %{buildroot}%{_libdir}/libQtWebKit.so.4.9.0 ||: -chrpath --delete %{buildroot}%{_libdir}/libQtWebKit.so.4.9.0 ||: -chrpath --list %{buildroot}%{_libdir}/qt4/plugins/imports/QtWebKit/libqmlwebkitplugin.so ||: -chrpath --delete %{buildroot}%{_libdir}/qt4/plugins/imports/QtWebKit/libqmlwebkitplugin.so ||: - # Conflicts with libqt4-devel so remove it for now rm -rf %{buildroot}%{_datadir}/qt4/mkspecs/modules/qt_webkit_version.pri ++++++ build-with-glib-231.diff ++++++ --- configure.ac +++ configure.ac @@ -111,6 +111,9 @@ 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. --- Source/JavaScriptCore/ChangeLog +++ Source/JavaScriptCore/ChangeLog @@ -1,3 +1,17 @@ +2011-10-12 Gustavo Noronha Silva <[email protected]> + + Fix build with GLib 2.31 + https://bugs.webkit.org/show_bug.cgi?id=69840 + + Reviewed by Martin Robinson. + + * GNUmakefile.list.am: removed ThreadingGtk.cpp. + * wtf/ThreadingPrimitives.h: remove GTK+-specific definitions. + * wtf/gobject/GOwnPtr.cpp: remove GCond and GMutex specializations. + * wtf/gobject/GOwnPtr.h: ditto. + * wtf/gobject/GTypedefs.h: remove GCond and GMutex forward declarations. + * wtf/gtk/ThreadingGtk.cpp: Removed. + 2011-05-23 Thouraya ANDOLSI <[email protected]> Reviewed by Gavin Barraclough. --- Source/JavaScriptCore/GNUmakefile.list.am +++ Source/JavaScriptCore/GNUmakefile.list.am @@ -438,7 +438,6 @@ Source/JavaScriptCore/wtf/gobject/GRefPtr.h \ Source/JavaScriptCore/wtf/gobject/GTypedefs.h \ Source/JavaScriptCore/wtf/gtk/MainThreadGtk.cpp \ - Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp \ Source/JavaScriptCore/wtf/HashCountedSet.h \ Source/JavaScriptCore/wtf/HashFunctions.h \ Source/JavaScriptCore/wtf/HashIterators.h \ --- Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp +++ Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp @@ -37,18 +37,6 @@ g_list_free(ptr); } -template <> void freeOwnedGPtr<GCond>(GCond* ptr) -{ - if (ptr) - g_cond_free(ptr); -} - -template <> void freeOwnedGPtr<GMutex>(GMutex* ptr) -{ - if (ptr) - g_mutex_free(ptr); -} - template <> void freeOwnedGPtr<GPatternSpec>(GPatternSpec* ptr) { if (ptr) --- Source/JavaScriptCore/wtf/gobject/GOwnPtr.h +++ Source/JavaScriptCore/wtf/gobject/GOwnPtr.h @@ -35,8 +35,6 @@ template <typename T> inline void freeOwnedGPtr(T* ptr); template<> void freeOwnedGPtr<GError>(GError*); template<> void freeOwnedGPtr<GList>(GList*); -template<> void freeOwnedGPtr<GCond>(GCond*); -template<> void freeOwnedGPtr<GMutex>(GMutex*); template<> void freeOwnedGPtr<GPatternSpec>(GPatternSpec*); template<> void freeOwnedGPtr<GDir>(GDir*); --- Source/JavaScriptCore/wtf/gobject/GTypedefs.h +++ Source/JavaScriptCore/wtf/gobject/GTypedefs.h @@ -39,7 +39,6 @@ typedef struct _GAsyncResult GAsyncResult; typedef struct _GCancellable GCancellable; typedef struct _GCharsetConverter GCharsetConverter; -typedef struct _GCond GCond; typedef struct _GDir GDir; typedef struct _GdkAtom* GdkAtom; typedef struct _GdkCursor GdkCursor; @@ -52,7 +51,6 @@ typedef struct _GHashTable GHashTable; typedef struct _GInputStream GInputStream; typedef struct _GList GList; -typedef struct _GMutex GMutex; typedef struct _GPatternSpec GPatternSpec; typedef struct _GPollableOutputStream GPollableOutputStream; typedef struct _GSocketClient GSocketClient; --- Source/JavaScriptCore/wtf/ThreadingPrimitives.h +++ Source/JavaScriptCore/wtf/ThreadingPrimitives.h @@ -44,8 +44,6 @@ #if USE(PTHREADS) #include <pthread.h> -#elif PLATFORM(GTK) -#include "GOwnPtr.h" #endif #if PLATFORM(QT) @@ -66,10 +64,6 @@ typedef void* PlatformReadWriteLock; #endif typedef pthread_cond_t PlatformCondition; -#elif PLATFORM(GTK) -typedef GOwnPtr<GMutex> PlatformMutex; -typedef void* PlatformReadWriteLock; // FIXME: Implement. -typedef GOwnPtr<GCond> PlatformCondition; #elif PLATFORM(QT) typedef QT_PREPEND_NAMESPACE(QMutex)* PlatformMutex; typedef void* PlatformReadWriteLock; // FIXME: Implement. ++++++ do-not-force-optimization-level.diff ++++++ --- configure.ac.orig 2011-12-05 22:57:09.451158463 +0100 +++ configure.ac 2011-12-05 22:57:37.125587346 +0100 @@ -942,15 +942,6 @@ AC_DEFINE([NDEBUG], [1], [Define to disable debugging features]) fi -# Add the appropriate 'O' level for optimized builds -if test "$enable_optimizations" = "yes"; then - CXXFLAGS="$CXXFLAGS -O2" - CFLAGS="$CFLAGS -O2" -else - CXXFLAGS="$CXXFLAGS -O0" - CFLAGS="$CFLAGS -O0" -fi - PKG_CHECK_MODULES([LIBSOUP], [libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION]) AC_SUBST([LIBSOUP_CFLAGS]) --- Source/ThirdParty/gyp/test/cxxflags/gyptest-cxxflags.py.orig 2011-12-06 07:19:10.508957427 +0100 +++ Source/ThirdParty/gyp/test/cxxflags/gyptest-cxxflags.py 2011-12-06 07:19:19.155091506 +0100 @@ -28,7 +28,6 @@ try: PushEnv() - os.environ['CXXFLAGS'] = '-O0' test.run_gyp('cxxflags.gyp') finally: # We clear the environ after calling gyp. When the auto-regeneration happens, @@ -47,7 +46,6 @@ try: PushEnv() - os.environ['CXXFLAGS'] = '-O2' test.run_gyp('cxxflags.gyp') finally: # We clear the environ after calling gyp. When the auto-regeneration happens, --- Source/JavaScriptCore/JavaScriptCore.pro.orig 2011-12-06 07:21:30.056120087 +0100 +++ Source/JavaScriptCore/JavaScriptCore.pro 2011-12-06 07:21:38.125245164 +0100 @@ -26,9 +26,6 @@ # Remove the following 2 lines if you want debug information in JavaScriptCore } -*-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2 -*-g++*:QMAKE_CXXFLAGS_RELEASE += -O3 - # Rules when JIT enabled (not disabled) !contains(DEFINES, ENABLE_JIT=0) { linux*-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0) { --- Source/ThirdParty/gyp/test/cflags/gyptest-cflags.py.orig 2011-12-06 07:42:38.432776694 +0100 +++ Source/ThirdParty/gyp/test/cflags/gyptest-cflags.py 2011-12-06 07:42:47.822922219 +0100 @@ -28,7 +28,6 @@ try: PushEnv() - os.environ['CFLAGS'] = '-O0' test.run_gyp('cflags.gyp') finally: # We clear the environ after calling gyp. When the auto-regeneration happens, @@ -47,7 +47,7 @@ try: PushEnv() - os.environ['CFLAGS'] = '-O2' + os.environ['CFLAGS'] = '-O1' test.run_gyp('cflags.gyp') finally: # We clear the environ after calling gyp. When the auto-regeneration happens, --- Source/WebKit.pri +++ Source/WebKit.pri @@ -1,5 +1,8 @@ # Include file to make it easy to include WebKit into Qt projects +QMAKE_CFLAGS_RELEASE = "" +QMAKE_CXXFLAGS_RELEASE = "" + contains(QT_CONFIG, qpa)|contains(QT_CONFIG, embedded): CONFIG += embedded # Detect that we are building as a standalone package by the presence of --- Tools/Tools.pro.orig 2011-12-06 08:25:34.777703423 +0100 +++ Tools/Tools.pro 2011-12-06 08:26:19.511396680 +0100 @@ -2,6 +2,9 @@ TEMPLATE = subdirs CONFIG += ordered +QMAKE_CFLAGS_RELEASE = "" +QMAKE_CXXFLAGS_RELEASE = "" + include($$PWD/../Source/common.pri) include($$PWD/../Source/WebCore/features.pri) ++++++ reduce-link-optimization.diff ++++++ --- Source/WebCore/WebCore.pri +++ Source/WebCore/WebCore.pri 2011-12-13 16:41:25.860488165 +0100 @@ -327,7 +325,7 @@ unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections -unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections -linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF +#unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections +linux*-g++*:QMAKE_LFLAGS += -Wl,--reduce-memory-overheads -Wl,--no-keep-memory unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork unix:!mac:!symbian:CONFIG += link_pkgconfig -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
