Hello community, here is the log from the commit of package libqt4 checked in at Mon Jan 8 22:54:28 CET 2007. -------- --- libqt4/libqt4.changes 2006-12-04 16:15:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2007-01-08 21:27:15.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 8 21:26:51 CET 2007 - dmueller@suse.de + +- add patch to fix moc path issue +- add patch to fix indic script rendering buglet + +------------------------------------------------------------------- libqt4-devel-doc-data.changes: same change libqt4-sql-plugins.changes: same change New: ---- 0154-qdbuscpp2xml-moc_path.diff 0155-indic-script-fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.U29233/_old 2007-01-08 22:53:43.000000000 +0100 +++ /var/tmp/diff_new_pack.U29233/_new 2007-01-08 22:53:43.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqt4-devel-doc-data (Version 4.2.2) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -25,7 +25,7 @@ # COMMON-BEGIN # COMMON-BEGIN Version: 4.2.2 -Release: 1 +Release: 11 %define x11_free -x11-opensource-src- %define rversion 4.2.2 Source: qt%x11_free%rversion.tar.bz2 @@ -41,6 +41,8 @@ Patch11: 0146-rasterpaint-qbrush-image.diff Patch14: 0149-qdbusconnection-nowarning.diff Patch15: fix-rpath-4.diff +Patch16: 0154-qdbuscpp2xml-moc_path.diff +Patch17: 0155-indic-script-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -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/libqt4 -examplesdir %_docdir/libqt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ @@ -67,6 +69,8 @@ %patch11 %patch14 %patch15 +%patch16 +%patch17 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib} # COMMON-END @@ -104,6 +108,9 @@ /usr/share/doc/packages/libqt4/examples %changelog -n libqt4-devel-doc-data +* Mon Jan 08 2007 - dmueller@suse.de +- add patch to fix moc path issue +- add patch to fix indic script rendering buglet * Fri Dec 01 2006 - dmueller@suse.de - update to 4.2.2 (#222624): * includes just bugfixes, see changes-4.2.2 for details ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.U29233/_old 2007-01-08 22:53:43.000000000 +0100 +++ /var/tmp/diff_new_pack.U29233/_new 2007-01-08 22:53:43.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqt4 (Version 4.2.2) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -27,7 +27,7 @@ Provides: qt # COMMON-BEGIN Version: 4.2.2 -Release: 1 +Release: 11 %define x11_free -x11-opensource-src- %define rversion 4.2.2 Source: qt%x11_free%rversion.tar.bz2 @@ -43,6 +43,8 @@ Patch11: 0146-rasterpaint-qbrush-image.diff Patch14: 0149-qdbusconnection-nowarning.diff Patch15: fix-rpath-4.diff +Patch16: 0154-qdbuscpp2xml-moc_path.diff +Patch17: 0155-indic-script-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -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/libqt4 -examplesdir %_docdir/libqt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ @@ -70,6 +72,8 @@ %patch11 %patch14 %patch15 +%patch16 +%patch17 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib} # COMMON-END @@ -363,6 +367,9 @@ %_libdir/libQtSql*.so.* %changelog -n libqt4 +* Mon Jan 08 2007 - dmueller@suse.de +- add patch to fix moc path issue +- add patch to fix indic script rendering buglet * Fri Dec 01 2006 - dmueller@suse.de - update to 4.2.2 (#222624): * includes just bugfixes, see changes-4.2.2 for details ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.U29233/_old 2007-01-08 22:53:43.000000000 +0100 +++ /var/tmp/diff_new_pack.U29233/_new 2007-01-08 22:53:43.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqt4-sql-plugins (Version 4.2.2) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -24,7 +24,7 @@ # COMMON-BEGIN # COMMON-BEGIN Version: 4.2.2 -Release: 1 +Release: 2 %define x11_free -x11-opensource-src- %define rversion 4.2.2 Source: qt%x11_free%rversion.tar.bz2 @@ -40,6 +40,8 @@ Patch11: 0146-rasterpaint-qbrush-image.diff Patch14: 0149-qdbusconnection-nowarning.diff Patch15: fix-rpath-4.diff +Patch16: 0154-qdbuscpp2xml-moc_path.diff +Patch17: 0155-indic-script-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -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/libqt4 -examplesdir %_docdir/libqt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ @@ -65,6 +67,8 @@ %patch11 %patch14 %patch15 +%patch16 +%patch17 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib} # COMMON-END @@ -203,6 +207,9 @@ %plugindir/sqldrivers/libqsqlmysql*.so %changelog -n libqt4-sql-plugins +* Mon Jan 08 2007 - dmueller@suse.de +- add patch to fix moc path issue +- add patch to fix indic script rendering buglet * Fri Dec 01 2006 - dmueller@suse.de - update to 4.2.2 (#222624): * includes just bugfixes, see changes-4.2.2 for details ++++++ 0154-qdbuscpp2xml-moc_path.diff ++++++ qt-bugs@ issue: none Trolltech task ID: none applied: yes author: Thiago Macieira qdbuscpp2xml invokes moc in order to do the C++ parsing. But it used to assume moc was in $PATH, which is not always the case. This patch makes it use the moc that is in the same bindir as argv[0], falling back to $PATH if qdbuscpp2xml was also invoked with it. Note: this does NOT solve the problem of having Qt3's moc ahead in $PATH if qdbuscpp2xml is also invoked using $PATH. === tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp ================================================================== --- tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp (revision 167) +++ tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp (local) @@ -351,10 +351,20 @@ QCoreApplication app(argc, argv); QStringList args = app.arguments(); + QString mocExecutable = QFile::encodeName(argv[0]); + int i = mocExecutable.lastIndexOf(QLatin1Char('/')); + if (i == -1) { + // we were called with a relative path + mocExecutable = QLatin1String("moc"); + } else { + mocExecutable.truncate(i + 1); + mocExecutable.append(QLatin1String("moc")); + } + MocParser parser; parseCmdLine(args); - for (int i = 1; i < args.count(); ++i) { + for (i = 1; i < args.count(); ++i) { const QString arg = args.at(i); if (arg.startsWith(QLatin1Char('-'))) continue; @@ -375,7 +385,7 @@ else { // run moc on this file QProcess proc; - proc.start(QLatin1String("moc"), QStringList() << QFile::decodeName(argv[i])); + proc.start(mocExecutable, QStringList() << QFile::decodeName(argv[i])); if (!proc.waitForStarted()) { fprintf(stderr, PROGRAMNAME ": could not execute moc! Aborting.\n"); ++++++ 0155-indic-script-fix.diff ++++++ qt-bugs@ issue: none Trolltech task ID: none applied: no author: from Trolltech This patch fixes a rendering issue in bn_IN locale --- src/gui/text/qscriptengine.cpp Mon Jan 8 14:08:29 CET 2007 +++ src/gui/text/qscriptengine.cpp Mon Jan 8 14:08:29 CET 2007 @@ -3055,7 +3057,7 @@ unsigned char pos = position[i]; for (int j = i+1; j > to+1; j--) { uc[j] = uc[j-2]; - position[j] = uc[j-2]; + position[j] = position[j-2]; } uc[to] = ch; uc[to+1] = ch2; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org