Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2011-10-24 12:51:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2011-10-13 00:07:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2011-10-24 13:41:22.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Oct 21 16:25:23 CEST 2011 - [email protected] + +- do not use /usr/src/packages in specfile + +------------------------------------------------------------------- +Fri Oct 21 12:11:43 CEST 2011 - [email protected] + +- disable IM for password entry (bnc#725471) + +------------------------------------------------------------------- libqt4-sql-plugins.changes: same change libqt4.changes: same change New: ---- disable-im-for-password.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.QOqTtk/_old 2011-10-24 13:41:31.000000000 +0200 +++ /var/tmp/diff_new_pack.QOqTtk/_new 2011-10-24 13:41:31.000000000 +0200 @@ -88,6 +88,7 @@ Patch128: build-qvfb-tool.diff Patch129: blacklist-diginotar-certs.diff Patch130: fix-arm-assembler-for-thumb2.diff +Patch131: disable-im-for-password.diff 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 @@ -142,6 +143,7 @@ %patch128 %patch129 -p1 %patch130 +%patch131 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them @@ -243,8 +245,8 @@ find $RPM_BUILD_ROOT/%_libdir -type f -name '*.pc' -exec mv {} $RPM_BUILD_ROOT/%_libdir/pkgconfig \; # fix more qmake errors mkdir -p $RPM_BUILD_ROOT/%_libdir/qt -find $RPM_BUILD_ROOT/%_libdir -type f -name '*la' -print -exec perl -pi -e 's, -L/usr/src/packages/BUILD/\S+,,g' {} \; -find $RPM_BUILD_ROOT/%_libdir/pkgconfig -type f -name '*pc' -print -exec perl -pi -e 's, -L/usr/src/packages/BUILD/\S+,,g' {} \; +find $RPM_BUILD_ROOT/%_libdir -type f -name '*la' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \; +find $RPM_BUILD_ROOT/%_libdir/pkgconfig -type f -name '*pc' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \; mkdir -p $RPM_BUILD_ROOT/%_docdir/%base_name/ ln -s %_libdir/qt4/demos $RPM_BUILD_ROOT/%_docdir/%base_name/demos ln -s %_libdir/qt4/examples $RPM_BUILD_ROOT/%_docdir/%base_name/examples ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.QOqTtk/_old 2011-10-24 13:41:31.000000000 +0200 +++ /var/tmp/diff_new_pack.QOqTtk/_new 2011-10-24 13:41:31.000000000 +0200 @@ -80,6 +80,7 @@ Patch128: build-qvfb-tool.diff Patch129: blacklist-diginotar-certs.diff Patch130: fix-arm-assembler-for-thumb2.diff +Patch131: disable-im-for-password.diff 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 @@ -134,6 +135,7 @@ %patch128 %patch129 -p1 %patch130 +%patch131 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them @@ -240,8 +242,8 @@ find $RPM_BUILD_ROOT/%_libdir -type f -name '*.pc' -exec mv {} $RPM_BUILD_ROOT/%_libdir/pkgconfig \; # fix more qmake errors mkdir -p $RPM_BUILD_ROOT/%_libdir/qt -find $RPM_BUILD_ROOT/%_libdir -type f -name '*la' -print -exec perl -pi -e 's, -L/usr/src/packages/BUILD/\S+,,g' {} \; -find $RPM_BUILD_ROOT/%_libdir/pkgconfig -type f -name '*pc' -print -exec perl -pi -e 's, -L/usr/src/packages/BUILD/\S+,,g' {} \; +find $RPM_BUILD_ROOT/%_libdir -type f -name '*la' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \; +find $RPM_BUILD_ROOT/%_libdir/pkgconfig -type f -name '*pc' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \; rm -rf $RPM_BUILD_ROOT/usr/include rm -rf $RPM_BUILD_ROOT/usr/%_lib/pkgconfig mkdir $RPM_BUILD_ROOT/%_libdir/backup ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.QOqTtk/_old 2011-10-24 13:41:31.000000000 +0200 +++ /var/tmp/diff_new_pack.QOqTtk/_new 2011-10-24 13:41:31.000000000 +0200 @@ -98,6 +98,7 @@ Patch128: build-qvfb-tool.diff Patch129: blacklist-diginotar-certs.diff Patch130: fix-arm-assembler-for-thumb2.diff +Patch131: disable-im-for-password.diff 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 @@ -152,6 +153,7 @@ %patch128 %patch129 -p1 %patch130 +%patch131 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them ++++++ disable-im-for-password.diff ++++++ --- src/gui/widgets/qlineedit.cpp | 5 +++++ 1 file changed, 5 insertions(+) --- a/src/gui/widgets/qlineedit.cpp +++ b/src/gui/widgets/qlineedit.cpp @@ -554,6 +554,11 @@ } setInputMethodHints(imHints); d->control->setEchoMode(mode); + // disable IM for password or noecho + if (mode == Password || mode == NoEcho) + setAttribute(Qt::WA_InputMethodEnabled, false); + else + setAttribute(Qt::WA_InputMethodEnabled, d->shouldEnableInputMethod()); update(); #ifdef Q_WS_MAC if (hasFocus()) ++++++ libqt4-devel-doc.spec.in ++++++ --- /var/tmp/diff_new_pack.QOqTtk/_old 2011-10-24 13:41:31.000000000 +0200 +++ /var/tmp/diff_new_pack.QOqTtk/_new 2011-10-24 13:41:31.000000000 +0200 @@ -138,8 +138,8 @@ find $RPM_BUILD_ROOT/%_libdir -type f -name '*.pc' -exec mv {} $RPM_BUILD_ROOT/%_libdir/pkgconfig \; # fix more qmake errors mkdir -p $RPM_BUILD_ROOT/%_libdir/qt -find $RPM_BUILD_ROOT/%_libdir -type f -name '*la' -print -exec perl -pi -e 's, -L/usr/src/packages/BUILD/\S+,,g' {} \; -find $RPM_BUILD_ROOT/%_libdir/pkgconfig -type f -name '*pc' -print -exec perl -pi -e 's, -L/usr/src/packages/BUILD/\S+,,g' {} \; +find $RPM_BUILD_ROOT/%_libdir -type f -name '*la' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \; +find $RPM_BUILD_ROOT/%_libdir/pkgconfig -type f -name '*pc' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \; mkdir -p $RPM_BUILD_ROOT/%_docdir/%base_name/ ln -s %_libdir/qt4/demos $RPM_BUILD_ROOT/%_docdir/%base_name/demos ln -s %_libdir/qt4/examples $RPM_BUILD_ROOT/%_docdir/%base_name/examples ++++++ libqt4-sql-plugins.spec.in ++++++ --- /var/tmp/diff_new_pack.QOqTtk/_old 2011-10-24 13:41:31.000000000 +0200 +++ /var/tmp/diff_new_pack.QOqTtk/_new 2011-10-24 13:41:31.000000000 +0200 @@ -135,8 +135,8 @@ find $RPM_BUILD_ROOT/%_libdir -type f -name '*.pc' -exec mv {} $RPM_BUILD_ROOT/%_libdir/pkgconfig \; # fix more qmake errors mkdir -p $RPM_BUILD_ROOT/%_libdir/qt -find $RPM_BUILD_ROOT/%_libdir -type f -name '*la' -print -exec perl -pi -e 's, -L/usr/src/packages/BUILD/\S+,,g' {} \; -find $RPM_BUILD_ROOT/%_libdir/pkgconfig -type f -name '*pc' -print -exec perl -pi -e 's, -L/usr/src/packages/BUILD/\S+,,g' {} \; +find $RPM_BUILD_ROOT/%_libdir -type f -name '*la' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \; +find $RPM_BUILD_ROOT/%_libdir/pkgconfig -type f -name '*pc' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \; rm -rf $RPM_BUILD_ROOT/usr/include rm -rf $RPM_BUILD_ROOT/usr/%_lib/pkgconfig mkdir $RPM_BUILD_ROOT/%_libdir/backup -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
