Hello community, here is the log from the commit of package libqt4 checked in at Mon Apr 7 00:39:36 CEST 2008. -------- --- libqt4/libqt4.changes 2008-04-02 15:45:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2008-04-05 00:50:17.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Apr 3 23:23:49 CEST 2008 - dmueller@suse.de + +- fix x error recursion (bnc#368456) +- fix build on sles10 or older +- update to 4.4.0 rc1: + * no changelog available + +------------------------------------------------------------------- libqt4-devel-doc-data.changes: same change libqt4-sql-plugins.changes: same change libQtWebKit-devel.changes: same change Old: ---- qt-x11-opensource-src-4.4.0-snapshot-20080325.tar.bz2 New: ---- qdbus-enable-on-sles10.diff qt-x11-opensource-src-4.4.0-rc1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.IZ6404/_old 2008-04-07 00:39:03.000000000 +0200 +++ /var/tmp/diff_new_pack.IZ6404/_new 2008-04-07 00:39:03.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-devel-doc-data (Version 4.3.93.) +# spec file for package libqt4-devel-doc-data (Version 4.3.95+4.4.0rc1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -28,11 +28,11 @@ # COMMON-BEGIN # COMMON-BEGIN %define snapshot 20080325 -Version: 4.3.93.%snapshot +Version: 4.3.95+4.4.0rc1 Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.4.0-snapshot-%snapshot +%define rversion 4.4.0-rc1 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -61,6 +61,7 @@ Patch58: prefer-linked-opengl.diff Patch60: 0180-window-role.diff Patch61: qt4-fake-bold.patch +Patch62: qdbus-enable-on-sles10.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 @@ -101,7 +102,10 @@ %patch57 %patch58 %patch60 +%if %suse_version > 910 %patch61 +%endif +%patch62 #%patch56 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} @@ -161,6 +165,11 @@ /usr/share/doc/packages/%base_name/src %changelog +* Fri Apr 04 2008 dmueller@suse.de +- fix x error recursion (bnc#368456) +- fix build on sles10 or older +- update to 4.4.0 rc1: + * no changelog available * Wed Apr 02 2008 dmueller@suse.de - fix crashes on starting qt4 apps (bnc#360405, bnc#372726) - add patch for artifical font styles (bnc#374073) ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.IZ6404/_old 2008-04-07 00:39:03.000000000 +0200 +++ /var/tmp/diff_new_pack.IZ6404/_new 2008-04-07 00:39:03.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libqt4 (Version 4.3.93.) +# spec file for package libqt4 (Version 4.3.95+4.4.0rc1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,13 +16,10 @@ BuildRequires: libpng-devel libtiff-devel pkgconfig sqlite-devel BuildRequires: update-desktop-files %if %suse_version > 910 -BuildRequires: xorg-x11-devel +BuildRequires: dbus-1-devel openssl-devel xorg-x11-devel %else BuildRequires: XFree86-devel XFree86-libs %endif -%if %suse_version > 1010 -BuildRequires: dbus-1-devel openssl-devel -%endif %if %suse_version > 1020 BuildRequires: clucene-core-devel fdupes %endif @@ -37,11 +34,11 @@ Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-BEGIN %define snapshot 20080325 -Version: 4.3.93.%snapshot +Version: 4.3.95+4.4.0rc1 Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.4.0-snapshot-%snapshot +%define rversion 4.4.0-rc1 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -70,6 +67,7 @@ Patch58: prefer-linked-opengl.diff Patch60: 0180-window-role.diff Patch61: qt4-fake-bold.patch +Patch62: qdbus-enable-on-sles10.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,7 +109,10 @@ %patch57 %patch58 %patch60 +%if %suse_version > 910 %patch61 +%endif +%patch62 #%patch56 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} @@ -124,13 +125,10 @@ Requires: zlib-devel c++_compiler pkgconfig Requires: freetype2-devel libmng-devel libpng-devel libtiff-devel %if %suse_version > 910 -Requires: xorg-x11-devel +Requires: xorg-x11-devel Mesa-devel dbus-1-devel openssl-devel %else Requires: XFree86-devel %endif -%if %suse_version > 1010 -Requires: Mesa-devel dbus-1-devel openssl-devel -%endif Requires: %name = %version Provides: dbus-1-qt-devel < 0.63 Obsoletes: dbus-1-qt-devel < 0.63 @@ -300,7 +298,7 @@ %_libdir/libQtXml*.so.* %_libdir/libQtTest.so.* %_libdir/libQtCLucene.so.* -%if %suse_version > 1010 +%if %suse_version > 910 /usr/bin/qdbus %_libdir/libQtDBus*.so.* %endif @@ -311,7 +309,7 @@ %defattr(-,root,root,755) %exclude %plugindir/accessible/libqtaccessiblecompatwidgets.so /usr/bin/qtconfig -%if %suse_version > 1010 +%if %suse_version > 910 /usr/bin/qdbusviewer %endif /usr/share/applications/qt4config.desktop @@ -333,9 +331,6 @@ %plugindir/imageformats %plugindir/inputmethods %plugindir/accessible -#%if %suse_version > 1010 -#%plugindir/script -#%endif %files qt3support %defattr(-,root,root,755) @@ -355,7 +350,7 @@ /usr/bin/lupdate /usr/bin/pixeltool /usr/bin/qt3to4 -%if %suse_version > 1010 +%if %suse_version > 910 /usr/bin/qdbuscpp2xml /usr/bin/qdbusxml2cpp %endif @@ -368,7 +363,7 @@ /usr/include/Qt3Support /usr/include/QtAssistant /usr/include/QtCore -%if %suse_version > 1010 +%if %suse_version > 910 /usr/include/QtDBus %endif /usr/include/QtDesigner @@ -405,6 +400,11 @@ %plugindir/sqldrivers/libqsqlite*.so %changelog +* Fri Apr 04 2008 dmueller@suse.de +- fix x error recursion (bnc#368456) +- fix build on sles10 or older +- update to 4.4.0 rc1: + * no changelog available * Wed Apr 02 2008 dmueller@suse.de - fix crashes on starting qt4 apps (bnc#360405, bnc#372726) - add patch for artifical font styles (bnc#374073) ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.IZ6404/_old 2008-04-07 00:39:03.000000000 +0200 +++ /var/tmp/diff_new_pack.IZ6404/_new 2008-04-07 00:39:03.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-sql-plugins (Version 4.3.93.) +# spec file for package libqt4-sql-plugins (Version 4.3.95+4.4.0rc1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -33,11 +33,11 @@ # COMMON-BEGIN # COMMON-BEGIN %define snapshot 20080325 -Version: 4.3.93.%snapshot +Version: 4.3.95+4.4.0rc1 Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.4.0-snapshot-%snapshot +%define rversion 4.4.0-rc1 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -66,6 +66,7 @@ Patch58: prefer-linked-opengl.diff Patch60: 0180-window-role.diff Patch61: qt4-fake-bold.patch +Patch62: qdbus-enable-on-sles10.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,7 +106,10 @@ %patch57 %patch58 %patch60 +%if %suse_version > 910 %patch61 +%endif +%patch62 #%patch56 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} @@ -225,6 +229,11 @@ %plugindir/sqldrivers/libqsqlmysql*.so %changelog +* Fri Apr 04 2008 dmueller@suse.de +- fix x error recursion (bnc#368456) +- fix build on sles10 or older +- update to 4.4.0 rc1: + * no changelog available * Wed Apr 02 2008 dmueller@suse.de - fix crashes on starting qt4 apps (bnc#360405, bnc#372726) - add patch for artifical font styles (bnc#374073) ++++++ libQtWebKit-devel.spec ++++++ --- /var/tmp/diff_new_pack.IZ6404/_old 2008-04-07 00:39:03.000000000 +0200 +++ /var/tmp/diff_new_pack.IZ6404/_new 2008-04-07 00:39:03.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libQtWebKit-devel (Version 4.3.93.) +# spec file for package libQtWebKit-devel (Version 4.3.95+4.4.0rc1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -31,11 +31,11 @@ # COMMON-BEGIN # COMMON-BEGIN %define snapshot 20080325 -Version: 4.3.93.%snapshot +Version: 4.3.95+4.4.0rc1 Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.4.0-snapshot-%snapshot +%define rversion 4.4.0-rc1 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -64,6 +64,7 @@ Patch58: prefer-linked-opengl.diff Patch60: 0180-window-role.diff Patch61: qt4-fake-bold.patch +Patch62: qdbus-enable-on-sles10.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,7 +106,10 @@ %patch57 %patch58 %patch60 +%if %suse_version > 910 %patch61 +%endif +%patch62 #%patch56 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} @@ -272,6 +276,11 @@ /usr/bin/svgviewer %changelog +* Fri Apr 04 2008 dmueller@suse.de +- fix x error recursion (bnc#368456) +- fix build on sles10 or older +- update to 4.4.0 rc1: + * no changelog available * Wed Apr 02 2008 dmueller@suse.de - fix crashes on starting qt4 apps (bnc#360405, bnc#372726) - add patch for artifical font styles (bnc#374073) ++++++ qdbus-enable-on-sles10.diff ++++++ --- configure +++ configure @@ -474,7 +474,7 @@ unset QTDIR # the minimum version of libdbus-1 that we require: -MIN_DBUS_1_VERSION=0.62 +MIN_DBUS_1_VERSION=0.60 # initalize internal variables CFG_CONFIGURE_EXIT_ON_ERROR=yes ++++++ qt4-fake-bold.patch ++++++ --- /var/tmp/diff_new_pack.IZ6404/_old 2008-04-07 00:39:03.000000000 +0200 +++ /var/tmp/diff_new_pack.IZ6404/_new 2008-04-07 00:39:03.000000000 +0200 @@ -1,18 +1,20 @@ --- src/gui/text/qfontdatabase_x11.cpp +++ src/gui/text/qfontdatabase_x11.cpp -@@ -783,6 +783,11 @@ +@@ -783,6 +783,13 @@ ? QFont::StyleOblique : QFont::StyleNormal); + FcBool embolden; ++#ifdef FC_EMBOLDEN + if (FcPatternGetBool(pattern, FC_EMBOLDEN, 0, &embolden) != FcResultMatch) ++#endif + embolden = false; -+ if(embolden) -+ fontDef.weight=QFont::Bold; ++ if(embolden) ++ fontDef.weight=QFont::Bold; FcBool scalable; if (FcPatternGetBool(pattern, FC_SCALABLE, 0, &scalable) != FcResultMatch) -@@ -1329,10 +1334,25 @@ +@@ -1329,10 +1336,25 @@ if (! enc) continue; // should not happen either QtFontStyle::Key key = style->key; @@ -30,7 +32,7 @@ + + // keep the same pitch + equiv_enc->pitch = enc->pitch; -+ key.weight = QFont::Normal; ++ key.weight = QFont::Normal; + } // does this style have an italic equivalent? key.style = QFont::StyleItalic; @@ -40,13 +42,15 @@ if (equiv) continue; // does this style have an oblique equivalent? -@@ -1449,7 +1469,8 @@ +@@ -1449,7 +1471,10 @@ else if (request.weight < (QFont::Bold + QFont::Black) / 2) weight_value = FC_WEIGHT_BOLD; FcPatternAddInteger(pattern, FC_WEIGHT, weight_value); - -+ if(request.weight == QFont::Bold) -+ FcPatternAddBool(pattern, FC_EMBOLDEN, true); ++#ifdef FC_EMBOLDEN ++ if(request.weight == QFont::Bold) ++ FcPatternAddBool(pattern, FC_EMBOLDEN, true); ++#endif int slant_value = FC_SLANT_ROMAN; if (request.style == QFont::StyleItalic) slant_value = FC_SLANT_ITALIC; @@ -91,51 +95,51 @@ FT_GlyphSlot slot = face->glyph; - + if(embolden && (face->style_flags & FT_STYLE_FLAG_BOLD) == 0) -+ { -+ //if not antialias and no bitmap, for example, dongwensong English characters. -+ //for DongWenSong Chinese character, if it not antialias, it will use bitmap output. -+ if(!antialias && slot->format == FT_GLYPH_FORMAT_OUTLINE) -+ { -+ int left = slot->metrics.horiBearingX; -+ int right = slot->metrics.horiBearingX + slot->metrics.width; -+ int top = slot->metrics.horiBearingY; -+ int bottom = slot->metrics.horiBearingY - slot->metrics.height; -+ int hpixels = TRUNC(right - left)+4; -+ if (hsubpixel) -+ hpixels = hpixels*3 + 8; -+ int width = hpixels; -+ int height = TRUNC(top - bottom); -+ if (hsubpixel) { -+ width /= 3; -+ } -+ int pitch = (format == Format_Mono ? ((width + 31) & ~31) >> 3 : -+ (format == Format_A8 ? (width + 3) & ~3 : width * 4)); -+ int size = pitch * height; -+ uchar *glyph_buffer = new uchar[size]; ++ { ++ //if not antialias and no bitmap, for example, dongwensong English characters. ++ //for DongWenSong Chinese character, if it not antialias, it will use bitmap output. ++ if(!antialias && slot->format == FT_GLYPH_FORMAT_OUTLINE) ++ { ++ int left = slot->metrics.horiBearingX; ++ int right = slot->metrics.horiBearingX + slot->metrics.width; ++ int top = slot->metrics.horiBearingY; ++ int bottom = slot->metrics.horiBearingY - slot->metrics.height; ++ int hpixels = TRUNC(right - left)+4; ++ if (hsubpixel) ++ hpixels = hpixels*3 + 8; ++ int width = hpixels; ++ int height = TRUNC(top - bottom); ++ if (hsubpixel) { ++ width /= 3; ++ } ++ int pitch = (format == Format_Mono ? ((width + 31) & ~31) >> 3 : ++ (format == Format_A8 ? (width + 3) & ~3 : width * 4)); ++ int size = pitch * height; ++ uchar *glyph_buffer = new uchar[size]; + -+ slot->bitmap.rows = height*vfactor; -+ slot->bitmap.width = hpixels; -+ slot->bitmap.pitch = format == Format_Mono ? (((width + 31) & ~31) >> 3) : ((slot->bitmap.width + 3) & ~3); -+ slot->bitmap.buffer = new uchar[slot->bitmap.rows*slot->bitmap.pitch]; -+ if (!hsubpixel && vfactor == 1) -+ slot->bitmap.buffer = glyph_buffer; -+ else -+ slot->bitmap.buffer = new uchar[slot->bitmap.rows*slot->bitmap.pitch]; -+ memset(slot->bitmap.buffer, 0, slot->bitmap.rows*slot->bitmap.pitch); -+ slot->bitmap.pixel_mode = ft_pixel_mode_mono; -+ FT_Matrix matrix; -+ matrix.xx = (hsubpixel ? 3 : 1) << 16; -+ matrix.yy = vfactor << 16; -+ matrix.yx = matrix.xy = 0; -+ FT_Outline_Transform(&slot->outline, &matrix); -+ FT_Outline_Translate (&slot->outline, (hsubpixel ? -3*left +(4<<6) : -left), -bottom*vfactor); -+ FT_Outline_Get_Bitmap(qt_getFreetype(), &slot->outline, &slot->bitmap); -+ slot->format = FT_GLYPH_FORMAT_BITMAP; -+ FT_GlyphSlot_Embolden(slot); -+ } -+ else -+ FT_GlyphSlot_Embolden(slot); -+ } ++ slot->bitmap.rows = height*vfactor; ++ slot->bitmap.width = hpixels; ++ slot->bitmap.pitch = format == Format_Mono ? (((width + 31) & ~31) >> 3) : ((slot->bitmap.width + 3) & ~3); ++ slot->bitmap.buffer = new uchar[slot->bitmap.rows*slot->bitmap.pitch]; ++ if (!hsubpixel && vfactor == 1) ++ slot->bitmap.buffer = glyph_buffer; ++ else ++ slot->bitmap.buffer = new uchar[slot->bitmap.rows*slot->bitmap.pitch]; ++ memset(slot->bitmap.buffer, 0, slot->bitmap.rows*slot->bitmap.pitch); ++ slot->bitmap.pixel_mode = ft_pixel_mode_mono; ++ FT_Matrix matrix; ++ matrix.xx = (hsubpixel ? 3 : 1) << 16; ++ matrix.yy = vfactor << 16; ++ matrix.yx = matrix.xy = 0; ++ FT_Outline_Transform(&slot->outline, &matrix); ++ FT_Outline_Translate (&slot->outline, (hsubpixel ? -3*left +(4<<6) : -left), -bottom*vfactor); ++ FT_Outline_Get_Bitmap(qt_getFreetype(), &slot->outline, &slot->bitmap); ++ slot->format = FT_GLYPH_FORMAT_BITMAP; ++ FT_GlyphSlot_Embolden(slot); ++ } ++ else ++ FT_GlyphSlot_Embolden(slot); ++ } int left = slot->metrics.horiBearingX; int right = slot->metrics.horiBearingX + slot->metrics.width; int top = slot->metrics.horiBearingY; @@ -148,13 +152,12 @@ if (hsubpixel) hpixels = hpixels*3 + 8; info.width = hpixels; -@@ -1301,6 +1353,9 @@ +@@ -1301,6 +1353,8 @@ FT_GlyphSlot g = face->glyph; if (g->format != FT_GLYPH_FORMAT_OUTLINE) continue; -+ if (embolden && (face->style_flags & FT_STYLE_FLAG_BOLD) == 0) { -+ FT_GlyphSlot_Embolden (g); -+ } ++ if (embolden && (face->style_flags & FT_STYLE_FLAG_BOLD) == 0) ++ FT_GlyphSlot_Embolden (g); QFreetypeFace::addGlyphToPath(face, g, positions[gl], path, xsize, ysize); } unlockFace(); @@ -184,20 +187,23 @@ -Q_GUI_EXPORT void qt_x11ft_convert_pattern(FcPattern *pattern, QByteArray *file_name, int *index, bool *antialias) -+Q_GUI_EXPORT void qt_x11ft_convert_pattern(FcPattern *pattern, QByteArray *file_name, int *index, bool *antialias, bool *embolden) ++static void qt_x11ft_convert_pattern(FcPattern *pattern, QByteArray *file_name, int *index, bool *antialias, bool *embolden) { FcChar8 *fileName; FcPatternGetString(pattern, FC_FILE, 0, &fileName); -@@ -888,6 +888,8 @@ +@@ -888,6 +888,11 @@ FcBool b; if (FcPatternGetBool(pattern, FC_ANTIALIAS, 0, &b) == FcResultMatch) *antialias = b; ++ b = false; ++#ifdef FC_EMBOLDEN + if (FcPatternGetBool (pattern,FC_EMBOLDEN, 0, &b) == FcResultMatch) -+ *embolden = b; ++#endif ++ *embolden = b; } -@@ -897,9 +899,10 @@ +@@ -897,9 +902,10 @@ // FcPatternPrint(pattern); bool antialias = X11->fc_antialias; @@ -209,13 +215,12 @@ QFontEngine::FaceId face_id; face_id.filename = file_name; face_id.index = face_index; -@@ -972,8 +975,8 @@ +@@ -972,8 +978,7 @@ defaultFormat = Format_Mono; } #endif - - if (!init(face_id, antialias, defaultFormat)) { -+//cjacker + if (!init(face_id, antialias, defaultFormat, embolden)) { FcPatternDestroy(pattern); return; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org