Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2012-03-19 09:50:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt4", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2012-02-28 19:24:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2012-03-19 09:52:03.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Mar 15 09:09:10 UTC 2012 - [email protected] + +- Fix build with gcc 4.7 (patch qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch + from Fedora). + +------------------------------------------------------------------- libqt4-sql-plugins.changes: same change libqt4.changes: same change New: ---- qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.BjB8ra/_old 2012-03-19 09:52:12.000000000 +0100 +++ /var/tmp/diff_new_pack.BjB8ra/_new 2012-03-19 09:52:12.000000000 +0100 @@ -14,6 +14,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + # nodebuginfo @@ -92,6 +93,7 @@ Patch128: build-qvfb-tool.diff Patch131: disable-im-for-password.diff Patch132: CVE-2011-3922.diff +Patch133: qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle @@ -146,6 +148,7 @@ %patch128 %patch131 -p1 %patch132 +%patch133 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them libqt4-sql-plugins.spec: same change ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.BjB8ra/_old 2012-03-19 09:52:12.000000000 +0100 +++ /var/tmp/diff_new_pack.BjB8ra/_new 2012-03-19 09:52:12.000000000 +0100 @@ -16,6 +16,7 @@ # + Name: libqt4 BuildRequires: Mesa-devel BuildRequires: alsa-devel @@ -108,6 +109,7 @@ Patch128: build-qvfb-tool.diff Patch131: disable-im-for-password.diff Patch132: CVE-2011-3922.diff +Patch133: qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle @@ -162,6 +164,7 @@ %patch128 %patch131 -p1 %patch132 +%patch133 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them ++++++ qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch ++++++ diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h --- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me 2012-01-24 11:24:14.729942043 +0100 +++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h 2012-01-24 14:28:39.848109534 +0100 @@ -57,9 +57,7 @@ namespace JSC { class JSGlobalObject : public JSVariableObject { protected: - using JSVariableObject::JSVariableObjectData; - - struct JSGlobalObjectData : public JSVariableObjectData { + struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData { // We use an explicit destructor function pointer instead of a // virtual destructor because we want to avoid adding a vtable // pointer to this struct. Adding a vtable pointer would force the diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h --- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me 2012-01-24 11:40:07.167856677 +0100 +++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-01-24 14:28:34.640306629 +0100 @@ -32,8 +32,7 @@ namespace JSC{ class JSStaticScopeObject : public JSVariableObject { protected: - using JSVariableObject::JSVariableObjectData; - struct JSStaticScopeObjectData : public JSVariableObjectData { + struct JSStaticScopeObjectData : public JSVariableObject::JSVariableObjectData { JSStaticScopeObjectData() : JSVariableObjectData(&symbolTable, ®isterStore + 1) { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
