Hello community, here is the log from the commit of package qt3 checked in at Sun Mar 18 06:50:00 CET 2007. -------- --- KDE/qt3/qt3.changes 2007-03-15 11:07:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/qt3/qt3.changes 2007-03-16 14:57:11.041485000 +0100 @@ -1,0 +2,5 @@ +Fri Mar 16 14:52:22 CET 2007 - dmueller@suse.de + +- call XftDefaultSubstitute (#255330) + +------------------------------------------------------------------- qt3-devel-doc.changes: same change qt3-extensions.changes: same change qt3-static.changes: same change New: ---- 0076-fix-qprocess.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.o14725/_old 2007-03-18 06:49:45.000000000 +0100 +++ /var/tmp/diff_new_pack.o14725/_new 2007-03-18 06:49:45.000000000 +0100 @@ -18,7 +18,7 @@ Summary: Documentation for the Qt 3 Development Kit Group: Documentation/HTML Version: 3.3.8 -Release: 6 +Release: 7 PreReq: /bin/grep BuildArch: noarch Provides: qt3-devel-tutorial @@ -83,6 +83,7 @@ Patch119: xinerama-qpopupmenu.diff Patch120: qt-font-default-subst.diff Patch121: qt3-warnings.diff +Patch122: 0076-fix-qprocess.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -144,6 +145,7 @@ %patch119 %patch120 %patch121 +%patch122 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/ ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/ ln -sf $PWD/src/kernel/qinputcontext.h include/ @@ -226,6 +228,8 @@ /usr/share/pixmaps/assistant3.png %changelog +* Fri Mar 16 2007 - dmueller@suse.de +- call XftDefaultSubstitute (#255330) * Thu Mar 15 2007 - dmueller@suse.de - update font fix patch (#244579) * Mon Mar 12 2007 - dmueller@suse.de ++++++ qt3-extensions.spec ++++++ --- /var/tmp/diff_new_pack.o14725/_old 2007-03-18 06:49:45.000000000 +0100 +++ /var/tmp/diff_new_pack.o14725/_new 2007-03-18 06:49:45.000000000 +0100 @@ -14,7 +14,7 @@ BuildRequires: cups-devel krb5-devel libjpeg-devel mysql-devel postgresql-devel qt3-devel sqlite2-devel unixODBC-devel update-desktop-files License: GNU General Public License (GPL), THE Q PUBLIC LICENSE (QPL) Version: 3.3.8 -Release: 7 +Release: 8 Autoreqprov: on Requires: qt3 = %version Group: Development/Tools/Other @@ -78,6 +78,7 @@ Patch119: xinerama-qpopupmenu.diff Patch120: qt-font-default-subst.diff Patch121: qt3-warnings.diff +Patch122: 0076-fix-qprocess.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -137,6 +138,7 @@ %patch119 %patch120 %patch121 +%patch122 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/ ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/ ln -sf $PWD/src/kernel/qinputcontext.h include/ @@ -470,6 +472,8 @@ %{_mandir}/man*/* %changelog +* Fri Mar 16 2007 - dmueller@suse.de +- call XftDefaultSubstitute (#255330) * Thu Mar 15 2007 - dmueller@suse.de - update font fix patch (#244579) * Mon Mar 12 2007 - dmueller@suse.de ++++++ qt3.spec ++++++ --- /var/tmp/diff_new_pack.o14725/_old 2007-03-18 06:49:45.000000000 +0100 +++ /var/tmp/diff_new_pack.o14725/_new 2007-03-18 06:49:45.000000000 +0100 @@ -19,7 +19,7 @@ Autoreqprov: on Summary: A library for developing applications with graphical user interfaces Version: 3.3.8 -Release: 6 +Release: 7 Provides: qt_library_%version PreReq: /bin/grep %define x11_free -x11-free- @@ -80,6 +80,7 @@ Patch119: xinerama-qpopupmenu.diff Patch120: qt-font-default-subst.diff Patch121: qt3-warnings.diff +Patch122: 0076-fix-qprocess.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -148,6 +149,7 @@ %patch119 %patch120 %patch121 +%patch122 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/ ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/ ln -sf $PWD/src/kernel/qinputcontext.h include/ @@ -361,6 +363,8 @@ /etc/profile.d/qt3.* %changelog +* Fri Mar 16 2007 - dmueller@suse.de +- call XftDefaultSubstitute (#255330) * Thu Mar 15 2007 - dmueller@suse.de - update font fix patch (#244579) * Mon Mar 12 2007 - dmueller@suse.de ++++++ qt3-static.spec ++++++ --- /var/tmp/diff_new_pack.o14725/_old 2007-03-18 06:49:45.000000000 +0100 +++ /var/tmp/diff_new_pack.o14725/_new 2007-03-18 06:49:45.000000000 +0100 @@ -17,7 +17,7 @@ Autoreqprov: on Summary: static program library for developing applications with graphical user interfaces Version: 3.3.8 -Release: 6 +Release: 7 %define x11_free -x11-free- %define rversion %version # COMMON-BEGIN @@ -77,6 +77,7 @@ Patch119: xinerama-qpopupmenu.diff Patch120: qt-font-default-subst.diff Patch121: qt3-warnings.diff +Patch122: 0076-fix-qprocess.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -147,6 +148,7 @@ %patch119 %patch120 %patch121 +%patch122 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/ ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/ ln -sf $PWD/src/kernel/qinputcontext.h include/ @@ -216,6 +218,8 @@ /usr/lib/qt3/%{_lib}/libqt-mt.a %changelog +* Fri Mar 16 2007 - dmueller@suse.de +- call XftDefaultSubstitute (#255330) * Thu Mar 15 2007 - dmueller@suse.de - update font fix patch (#244579) * Mon Mar 12 2007 - dmueller@suse.de ++++++ 0076-fix-qprocess.diff ++++++ qt-bugs@ issue : none bugs.kde.org number : none applied: no author: from trolltech Fixes a regression in QProgress::writeToStdin() --- src/kernel/qprocess.cpp +++ src/kernel/qprocess.cpp @@ -727,7 +727,7 @@ void QProcess::closeStdinLaunch() void QProcess::writeToStdin( const QString& buf ) { QByteArray tmp = buf.local8Bit(); - tmp.resize( tmp.size() - 1 ); // drop the implicit \0 + tmp.resize( qstrlen( tmp.data() ) ); writeToStdin( tmp ); } ++++++ qt-font-default-subst.diff ++++++ --- /var/tmp/diff_new_pack.o14725/_old 2007-03-18 06:49:46.000000000 +0100 +++ /var/tmp/diff_new_pack.o14725/_new 2007-03-18 06:49:46.000000000 +0100 @@ -1,17 +1,6 @@ ---- src/kernel/qfontdatabase.cpp -+++ src/kernel/qfontdatabase.cpp -@@ -554,7 +554,7 @@ - // GeometricSymbols, - { 0x2500, 0x0 }, - // MiscellaneousSymbols, -- { 0x2640, 0x0 }, -+ { 0x2640, 0x2714, 0x0 }, - // EnclosedAndSquare, - { 0x2460, 0x0 }, - // Braille, --- src/kernel/qfontdatabase_x11.cpp +++ src/kernel/qfontdatabase_x11.cpp -@@ -1589,15 +1589,6 @@ +@@ -1589,15 +1589,6 @@ QFontEngine *loadEngine( QFont::Script s if (script == QFont::Latin) // add Euro character FcCharSetAddChar(cs, 0x20ac); @@ -27,7 +16,19 @@ FcPatternAddCharSet(pattern, FC_CHARSET, cs); FcCharSetDestroy(cs); } -@@ -1847,10 +1838,6 @@ +@@ -1813,7 +1804,11 @@ static QFontEngine *loadFontConfigFont(c + FcPatternPrint(pattern); + #endif + ++ // XftFontMatch calls the right ConfigSubstitute variants, but as we use ++ // FcFontMatch/Sort here we have to do it manually. + FcConfigSubstitute(0, pattern, FcMatchPattern); ++ XftDefaultSubstitute(QPaintDevice::x11AppDisplay(), QPaintDevice::x11AppScreen(), pattern); ++ + // qDebug("1: pattern contains:"); + // FcPatternPrint(pattern); + +@@ -1847,10 +1842,6 @@ static QFontEngine *loadFontConfigFont(c value.u.s = (const FcChar8 *)cs.data(); FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue); } @@ -38,7 +39,7 @@ } if (script != QFont::Unicode) { -@@ -1860,18 +1847,16 @@ +@@ -1860,19 +1851,15 @@ static QFontEngine *loadFontConfigFont(c if (script == QFont::Latin) // add Euro character FcCharSetAddChar(cs, 0x20ac); @@ -54,13 +55,23 @@ FcPatternAddCharSet(pattern, FC_CHARSET, cs); FcCharSetDestroy(cs); } -+ FcDefaultSubstitute(pattern); -+ + +#ifdef FONT_MATCH_DEBUG + printf("final pattern contains:\n"); + FcPatternPrint(pattern); +#endif -+ - ++ QFontEngine *fe = 0; + for( int jj = (FcGetVersion() >= 20392 ? 0 : 1); jj < 2; ++jj ) { +--- src/kernel/qfontdatabase.cpp ++++ src/kernel/qfontdatabase.cpp +@@ -554,7 +554,7 @@ static const unsigned short sample_chars + // GeometricSymbols, + { 0x2500, 0x0 }, + // MiscellaneousSymbols, +- { 0x2640, 0x0 }, ++ { 0x2640, 0x2714, 0x0 }, + // EnclosedAndSquare, + { 0x2460, 0x0 }, + // Braille, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org