Hello community, here is the log from the commit of package libqt4 checked in at Fri Apr 25 16:31:17 CEST 2008. -------- --- libqt4/libqt4.changes 2008-04-21 11:39:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2008-04-22 12:42:21.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 22 12:42:11 CEST 2008 - dmueller@suse.de + +- fix crash in xim destroy callback (bnc#382254) + +------------------------------------------------------------------- libqt4-devel-doc-data.changes: same change libqt4-sql-plugins.changes: same change libQtWebKit-devel.changes: same change New: ---- xim-callback-crash.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.y17859/_old 2008-04-25 16:30:55.000000000 +0200 +++ /var/tmp/diff_new_pack.y17859/_new 2008-04-25 16:30:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-devel-doc-data (Version 4.3.95+20080419) +# spec file for package libqt4-devel-doc-data (Version 4.3.95+20080424) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -27,7 +27,7 @@ %requires_eq libqt4 # COMMON-BEGIN # COMMON-BEGIN -Version: 4.3.95+20080419 +Version: 4.3.95+20080424 Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- @@ -61,6 +61,7 @@ Patch65: qt-4.4-update.diff Patch66: statusbar-recursion.diff Patch67: revert-psql-detection.diff +Patch68: xim-callback-crash.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -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 -no-exceptions -system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite @@ -107,6 +108,7 @@ %patch65 %patch66 %patch67 +%patch68 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -165,6 +167,8 @@ /usr/share/doc/packages/%base_name/src %changelog +* Tue Apr 22 2008 dmueller@suse.de +- fix crash in xim destroy callback (bnc#382254) * Mon Apr 21 2008 dmueller@suse.de - update to 20080419 of release branch: * some patches were upstreamed ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.y17859/_old 2008-04-25 16:30:55.000000000 +0200 +++ /var/tmp/diff_new_pack.y17859/_new 2008-04-25 16:30:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libqt4 (Version 4.3.95+20080419) +# spec file for package libqt4 (Version 4.3.95+20080424) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -33,7 +33,7 @@ Provides: libqt4-dbus-1 <= 4.4.0 Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-BEGIN -Version: 4.3.95+20080419 +Version: 4.3.95+20080424 Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- @@ -67,6 +67,7 @@ Patch65: qt-4.4-update.diff Patch66: statusbar-recursion.diff Patch67: revert-psql-detection.diff +Patch68: xim-callback-crash.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -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 -no-exceptions -system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite @@ -114,6 +115,7 @@ %patch65 %patch66 %patch67 +%patch68 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -407,6 +409,8 @@ %plugindir/sqldrivers/libqsqlite*.so %changelog +* Tue Apr 22 2008 dmueller@suse.de +- fix crash in xim destroy callback (bnc#382254) * Mon Apr 21 2008 dmueller@suse.de - update to 20080419 of release branch: * some patches were upstreamed ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.y17859/_old 2008-04-25 16:30:55.000000000 +0200 +++ /var/tmp/diff_new_pack.y17859/_new 2008-04-25 16:30:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-sql-plugins (Version 4.3.95+20080419) +# spec file for package libqt4-sql-plugins (Version 4.3.95+20080424) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -26,7 +26,7 @@ Summary: Qt 4 SQL-Related Libraries # COMMON-BEGIN # COMMON-BEGIN -Version: 4.3.95+20080419 +Version: 4.3.95+20080424 Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- @@ -60,6 +60,7 @@ Patch65: qt-4.4-update.diff Patch66: statusbar-recursion.diff Patch67: revert-psql-detection.diff +Patch68: xim-callback-crash.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -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 -no-exceptions -system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite @@ -105,6 +106,7 @@ %patch65 %patch66 %patch67 +%patch68 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -223,6 +225,8 @@ %plugindir/sqldrivers/libqsqlmysql*.so %changelog +* Tue Apr 22 2008 dmueller@suse.de +- fix crash in xim destroy callback (bnc#382254) * Mon Apr 21 2008 dmueller@suse.de - update to 20080419 of release branch: * some patches were upstreamed ++++++ libQtWebKit-devel.spec ++++++ --- /var/tmp/diff_new_pack.y17859/_old 2008-04-25 16:30:55.000000000 +0200 +++ /var/tmp/diff_new_pack.y17859/_new 2008-04-25 16:30:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libQtWebKit-devel (Version 4.3.95+20080419) +# spec file for package libQtWebKit-devel (Version 4.3.95+20080424) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -30,7 +30,7 @@ %requires_eq libqt4-devel # COMMON-BEGIN # COMMON-BEGIN -Version: 4.3.95+20080419 +Version: 4.3.95+20080424 Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- @@ -64,6 +64,7 @@ Patch65: qt-4.4-update.diff Patch66: statusbar-recursion.diff Patch67: revert-psql-detection.diff +Patch68: xim-callback-crash.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -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 -no-exceptions -system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite @@ -111,6 +112,7 @@ %patch65 %patch66 %patch67 +%patch68 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -276,6 +278,8 @@ /usr/bin/svgviewer %changelog +* Tue Apr 22 2008 dmueller@suse.de +- fix crash in xim destroy callback (bnc#382254) * Mon Apr 21 2008 dmueller@suse.de - update to 20080419 of release branch: * some patches were upstreamed ++++++ qt-4.4-update.diff ++++++ ++++ 4228 lines (skipped) ++++ between libqt4/qt-4.4-update.diff ++++ and /mounts/work_src_done/STABLE/libqt4/qt-4.4-update.diff ++++++ xim-callback-crash.diff ++++++ --- src/gui/inputmethod/qximinputcontext_x11.cpp +++ src/gui/inputmethod/qximinputcontext_x11.cpp @@ -388,7 +388,7 @@ void QXIMInputContext::create_xim() #ifdef USE_X11R6_XIM XIMCallback destroy; destroy.callback = (XIMProc) xim_destroy_callback; - destroy.client_data = 0; + destroy.client_data = (char*) this; if (XSetIMValues(xim, XNDestroyCallback, &destroy, (char *) 0) != 0) qWarning("Xlib dosn't support destroy callback"); #endif // USE_X11R6_XIM ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org