Hello community, here is the log from the commit of package libQtWebKit4 for openSUSE:Factory checked in at 2012-01-31 10:20:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libQtWebKit4 (Old) and /work/SRC/openSUSE:Factory/.libQtWebKit4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libQtWebKit4", Maintainer is "DMueller@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libQtWebKit4/libQtWebKit4.changes 2012-01-06 11:45:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libQtWebKit4.new/libQtWebKit4.changes 2012-01-31 10:21:09.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Jan 20 15:34:57 CET 2012 - dmueller@suse.de + +- fix build + +------------------------------------------------------------------- New: ---- avoid-rpath.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libQtWebKit4.spec ++++++ --- /var/tmp/diff_new_pack.O1wuhE/_old 2012-01-31 10:21:21.000000000 +0100 +++ /var/tmp/diff_new_pack.O1wuhE/_new 2012-01-31 10:21:21.000000000 +0100 @@ -43,6 +43,7 @@ Patch10: do-not-force-optimization-level.diff Patch11: reduce-link-optimization.diff Patch12: build-with-glib-231.diff +Patch13: avoid-rpath.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison @@ -101,6 +102,7 @@ %patch11 %endif %patch12 +%patch13 %build export QTDIR=%{_prefix} ++++++ avoid-rpath.diff ++++++ Binärdateien a/QtWebKit-2.2.0/LayoutTests/platform/chromium-win/svg/dynamic-updates/SVGForeignObjectElement-svgdom-x-prop-expected.png and b/QtWebKit-2.2.0/LayoutTests/platform/chromium-win/svg/dynamic-updates/SVGForeignObjectElement-svgdom-x-prop-expected.png sind verschieden. --- Source/WebKit/qt/declarative/declarative.pro +++ Source/WebKit/qt/declarative/declarative.pro @@ -41,21 +41,6 @@ QT += declarative -!CONFIG(standalone_package) { - linux-* { - # From Creator's src/rpath.pri: - # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR - # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var. - QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR - MY_RPATH = $$join(QMAKE_RPATHDIR, ":") - - QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\' - QMAKE_RPATHDIR = - } else { - QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR - } -} - SOURCES += qdeclarativewebview.cpp plugin.cpp HEADERS += qdeclarativewebview_p.h --- Source/WebKit2/WebProcess.pro +++ Source/WebKit2/WebProcess.pro @@ -20,19 +20,6 @@ QT += network macx:QT+=xml -linux-* { - # From Creator's src/rpath.pri: - # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR - # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var. - QMAKE_RPATHDIR = \$\$ORIGIN/../lib $$QMAKE_RPATHDIR - MY_RPATH = $$join(QMAKE_RPATHDIR, ":") - - QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\' -Wl,--no-undefined - QMAKE_RPATHDIR = -} else { - QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR -} - symbian { TARGET.UID3 = 0xA000E544 MMP_RULES += pageddata --- Tools/MiniBrowser/qt/MiniBrowser.pro +++ Tools/MiniBrowser/qt/MiniBrowser.pro @@ -33,19 +33,6 @@ QT += network macx:QT+=xml -linux-* { - # From Creator's src/rpath.pri: - # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR - # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var. - QMAKE_RPATHDIR = \$\$ORIGIN/../lib $$QMAKE_RPATHDIR - MY_RPATH = $$join(QMAKE_RPATHDIR, ":") - - QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\' - QMAKE_RPATHDIR = -} else { - QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR -} - symbian { TARGET.UID3 = 0xA000E545 MMP_RULES += pageddata --- Tools/QtTestBrowser/QtTestBrowser.pro +++ Tools/QtTestBrowser/QtTestBrowser.pro @@ -39,19 +39,6 @@ PKGCONFIG += fontconfig } -linux-* { - # From Creator's src/rpath.pri: - # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR - # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var. - QMAKE_RPATHDIR = \$\$ORIGIN/../lib $$QMAKE_RPATHDIR - MY_RPATH = $$join(QMAKE_RPATHDIR, ":") - - QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\' - QMAKE_RPATHDIR = -} else { - QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR -} - symbian { TARGET.UID3 = 0xA000E543 TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices Location --- Tools/WebKitTestRunner/qt/WebKitTestRunner.pro +++ Tools/WebKitTestRunner/qt/WebKitTestRunner.pro @@ -50,18 +50,5 @@ PREFIX_HEADER = $$BASEDIR/WebKitTestRunnerPrefix.h *-g++*:QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER" -linux-* { - # From Creator's src/rpath.pri: - # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR - # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var. - QMAKE_RPATHDIR = \$\$ORIGIN/../lib $$QMAKE_RPATHDIR - MY_RPATH = $$join(QMAKE_RPATHDIR, ":") - - QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\' -Wl,--no-undefined - QMAKE_RPATHDIR = -} else { - QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR -} - include(../../../Source/JavaScriptCore/JavaScriptCore.pri) prependJavaScriptCoreLib(../../JavaScriptCore) ++++++ build-with-glib-231.diff ++++++ --- /var/tmp/diff_new_pack.O1wuhE/_old 2012-01-31 10:21:21.000000000 +0100 +++ /var/tmp/diff_new_pack.O1wuhE/_new 2012-01-31 10:21:21.000000000 +0100 @@ -10,26 +10,6 @@ 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 <gustavo.noronha@collabora.co.uk> -+ -+ 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 <thouraya.andolsi@st.com> - - Reviewed by Gavin Barraclough. --- Source/JavaScriptCore/GNUmakefile.list.am +++ Source/JavaScriptCore/GNUmakefile.list.am @@ -438,7 +438,6 @@ @@ -112,3 +92,46 @@ #elif PLATFORM(QT) typedef QT_PREPEND_NAMESPACE(QMutex)* PlatformMutex; typedef void* PlatformReadWriteLock; // FIXME: Implement. +--- Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp ++++ Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp +@@ -34,4 +34,5 @@ + #include <gst/gst.h> + #include <gst/video/video.h> ++#include <wtf/FastAllocBase.h> + + static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE("sink", +@@ -106,6 +107,13 @@ + + sink->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE(sink, WEBKIT_TYPE_VIDEO_SINK, WebKitVideoSinkPrivate); ++#if GLIB_CHECK_VERSION(2, 31, 0) ++ priv->data_cond = WTF::fastNew<GCond>(); ++ g_cond_init(priv->data_cond); ++ priv->buffer_mutex = WTF::fastNew<GMutex>(); ++ g_mutex_init(priv->buffer_mutex); ++#else + priv->data_cond = g_cond_new(); + priv->buffer_mutex = g_mutex_new(); ++#endif + } + +@@ -243,10 +251,20 @@ + + if (priv->data_cond) { ++#if GLIB_CHECK_VERSION(2, 31, 0) ++ g_cond_clear(priv->data_cond); ++ WTF::fastDelete(priv->data_cond); ++#else + g_cond_free(priv->data_cond); ++#endif + priv->data_cond = 0; + } + + if (priv->buffer_mutex) { ++#if GLIB_CHECK_VERSION(2, 31, 0) ++ g_mutex_clear(priv->buffer_mutex); ++ WTF::fastDelete(priv->buffer_mutex); ++#else + g_mutex_free(priv->buffer_mutex); ++#endif + priv->buffer_mutex = 0; + } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org