Hello community, here is the log from the commit of package qt3 checked in at Thu Mar 15 15:45:43 CET 2007. -------- --- KDE/qt3/qt3.changes 2007-03-13 12:57:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/qt3/qt3.changes 2007-03-15 11:07:58.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 15 11:07:44 CET 2007 - dmueller@suse.de + +- update font fix patch (#244579) + +------------------------------------------------------------------- qt3-devel-doc.changes: same change qt3-extensions.changes: same change qt3-static.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.r32531/_old 2007-03-15 15:44:50.000000000 +0100 +++ /var/tmp/diff_new_pack.r32531/_new 2007-03-15 15:44:50.000000000 +0100 @@ -18,7 +18,7 @@ Summary: Documentation for the Qt 3 Development Kit Group: Documentation/HTML Version: 3.3.8 -Release: 5 +Release: 6 PreReq: /bin/grep BuildArch: noarch Provides: qt3-devel-tutorial @@ -226,6 +226,8 @@ /usr/share/pixmaps/assistant3.png %changelog +* Thu Mar 15 2007 - dmueller@suse.de +- update font fix patch (#244579) * Mon Mar 12 2007 - dmueller@suse.de - enable tablet support (#253392) - add default substitution for font queries (#244579) ++++++ qt3-extensions.spec ++++++ --- /var/tmp/diff_new_pack.r32531/_old 2007-03-15 15:44:50.000000000 +0100 +++ /var/tmp/diff_new_pack.r32531/_new 2007-03-15 15:44:50.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: 6 +Release: 7 Autoreqprov: on Requires: qt3 = %version Group: Development/Tools/Other @@ -470,6 +470,8 @@ %{_mandir}/man*/* %changelog +* Thu Mar 15 2007 - dmueller@suse.de +- update font fix patch (#244579) * Mon Mar 12 2007 - dmueller@suse.de - enable tablet support (#253392) - add default substitution for font queries (#244579) ++++++ qt3.spec ++++++ --- /var/tmp/diff_new_pack.r32531/_old 2007-03-15 15:44:50.000000000 +0100 +++ /var/tmp/diff_new_pack.r32531/_new 2007-03-15 15:44:50.000000000 +0100 @@ -19,7 +19,7 @@ Autoreqprov: on Summary: A library for developing applications with graphical user interfaces Version: 3.3.8 -Release: 5 +Release: 6 Provides: qt_library_%version PreReq: /bin/grep %define x11_free -x11-free- @@ -361,6 +361,8 @@ /etc/profile.d/qt3.* %changelog +* Thu Mar 15 2007 - dmueller@suse.de +- update font fix patch (#244579) * Mon Mar 12 2007 - dmueller@suse.de - enable tablet support (#253392) - add default substitution for font queries (#244579) ++++++ qt3-static.spec ++++++ --- /var/tmp/diff_new_pack.r32531/_old 2007-03-15 15:44:50.000000000 +0100 +++ /var/tmp/diff_new_pack.r32531/_new 2007-03-15 15:44:50.000000000 +0100 @@ -17,7 +17,7 @@ Autoreqprov: on Summary: static program library for developing applications with graphical user interfaces Version: 3.3.8 -Release: 5 +Release: 6 %define x11_free -x11-free- %define rversion %version # COMMON-BEGIN @@ -216,6 +216,8 @@ /usr/lib/qt3/%{_lib}/libqt-mt.a %changelog +* Thu Mar 15 2007 - dmueller@suse.de +- update font fix patch (#244579) * Mon Mar 12 2007 - dmueller@suse.de - enable tablet support (#253392) - add default substitution for font queries (#244579) ++++++ qt-font-default-subst.diff ++++++ --- /var/tmp/diff_new_pack.r32531/_old 2007-03-15 15:44:51.000000000 +0100 +++ /var/tmp/diff_new_pack.r32531/_new 2007-03-15 15:44:51.000000000 +0100 @@ -1,10 +1,66 @@ +--- 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 -@@ -1847,6 +1847,7 @@ static QFontEngine *loadFontConfigFont(c - value.u.s = (const FcChar8 *)cs.data(); - FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue); - } -+ FcDefaultSubstitute(pattern); - #ifdef FONT_MATCH_DEBUG - printf("final pattern contains:\n"); - FcPatternPrint(pattern); +@@ -1589,15 +1589,6 @@ + if (script == QFont::Latin) + // add Euro character + FcCharSetAddChar(cs, 0x20ac); +- if (script == QFont::Han_SimplifiedChinese) +- FcCharSetAddChar(cs, 0x3400); +- if (script == QFont::Han_TraditionalChinese){ +- FcCharSetAddChar(cs, 0x3435); +- FcCharSetAddChar(cs, 0xE000); +- FcCharSetAddChar(cs, 0xF6B1); +- } +- if (script == QFont::MiscellaneousSymbols) +- FcCharSetAddChar(cs, 0x2714); + FcPatternAddCharSet(pattern, FC_CHARSET, cs); + FcCharSetDestroy(cs); + } +@@ -1847,10 +1838,6 @@ + value.u.s = (const FcChar8 *)cs.data(); + FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue); + } +-#ifdef FONT_MATCH_DEBUG +- printf("final pattern contains:\n"); +- FcPatternPrint(pattern); +-#endif + } + + if (script != QFont::Unicode) { +@@ -1860,18 +1847,16 @@ + if (script == QFont::Latin) + // add Euro character + FcCharSetAddChar(cs, 0x20ac); +- if (script == QFont::Han_SimplifiedChinese) +- FcCharSetAddChar(cs, 0x3400); +- if (script == QFont::Han_TraditionalChinese) { +- FcCharSetAddChar(cs, 0x3435); +- FcCharSetAddChar(cs, 0xE000); +- FcCharSetAddChar(cs, 0xF6B1); +- } +- if (script == QFont::MiscellaneousSymbols) +- FcCharSetAddChar(cs, 0x2714); + FcPatternAddCharSet(pattern, FC_CHARSET, cs); + FcCharSetDestroy(cs); + } ++ FcDefaultSubstitute(pattern); ++ ++#ifdef FONT_MATCH_DEBUG ++ printf("final pattern contains:\n"); ++ FcPatternPrint(pattern); ++#endif ++ + + QFontEngine *fe = 0; + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org