Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2014-11-28 08:46:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt4" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2014-10-14 08:59:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2014-11-28 08:46:06.000000000 +0100 @@ -1,0 +2,20 @@ +Wed Nov 19 21:00:07 UTC 2014 - hrvoje.senjan@gmail.com + +- Update use-freetype-default.diff to use same method as with + libqt5-qtbase package: Qt itself already does runtime check + whether subpixel rendering is available, but only when + FT_CONFIG_OPTION_SUBPIXEL_RENDERING is defined. Thus it is enough + to only remove that condition + +------------------------------------------------------------------- +Tue Nov 11 10:49:35 UTC 2014 - alarrosa@suse.com + +- The -devel subpackage requires Mesa-devel, not only at build time + +------------------------------------------------------------------- +Mon Nov 10 13:35:30 UTC 2014 - alarrosa@suse.com + +- Fixed compilation on SLE_11_SP3 by making it build against + Mesa-devel on that system + +------------------------------------------------------------------- libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes 2014-11-13 09:17:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2014-11-28 08:46:06.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Nov 19 21:00:07 UTC 2014 - hrvoje.senjan@gmail.com + +- Update use-freetype-default.diff to use same method as with + libqt5-qtbase package: Qt itself already does runtime check + whether subpixel rendering is available, but only when + FT_CONFIG_OPTION_SUBPIXEL_RENDERING is defined. Thus it is enough + to only remove that condition + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ libqt4-sql-plugins.spec: same change libqt4.spec: same change ++++++ use-freetype-default.diff ++++++ --- /var/tmp/diff_new_pack.J83IT5/_old 2014-11-28 08:46:11.000000000 +0100 +++ /var/tmp/diff_new_pack.J83IT5/_new 2014-11-28 08:46:11.000000000 +0100 @@ -1,40 +1,13 @@ -Index: src/gui/text/qfontengine_x11.cpp +Index: src/gui/text/qfontengine_ft.cpp =================================================================== ---- src/gui/text/qfontengine_x11.cpp.orig -+++ src/gui/text/qfontengine_x11.cpp -@@ -967,6 +967,26 @@ Q_GUI_EXPORT void qt_x11ft_convert_patte - *antialias = b; - } +--- src/gui/text/qfontengine_ft.cpp.orig ++++ src/gui/text/qfontengine_ft.cpp +@@ -70,7 +70,7 @@ + #include FT_CONFIG_OPTIONS_H + #endif -+#include <ft2build.h> -+#include FT_FREETYPE_H -+#include FT_LCD_FILTER_H -+ -+static bool subpixel_rendering_available() -+{ -+ static int implemented = -1; -+ -+ if (implemented >= 0) -+ return implemented; -+ -+ extern FT_Library qt_getFreetype(); -+ FT_Library lib = qt_getFreetype(); -+ -+ if (FT_Err_Unimplemented_Feature == -+ FT_Library_SetLcdFilter(lib, FT_LCD_FILTER_DEFAULT )) -+ return (implemented = false); -+ -+ return (implemented = true); -+} +-#if defined(FT_LCD_FILTER_H) && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING) ++#if defined(FT_LCD_FILTER_H) + #define QT_USE_FREETYPE_LCDFILTER + #endif - QFontEngineX11FT::QFontEngineX11FT(FcPattern *pattern, const QFontDef &fd, int screen) - : QFontEngineFT(fd) -@@ -984,7 +1004,7 @@ QFontEngineX11FT::QFontEngineX11FT(FcPat - canUploadGlyphsToServer = QApplication::testAttribute(Qt::AA_X11InitThreads) || (qApp->thread() == QThread::currentThread()); - - subpixelType = Subpixel_None; -- if (antialias) { -+ if (subpixel_rendering_available() && antialias) { - int subpixel = X11->display ? X11->screens[screen].subpixel : FC_RGBA_UNKNOWN; - if (subpixel == FC_RGBA_UNKNOWN) - (void) FcPatternGetInteger(pattern, FC_RGBA, 0, &subpixel); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org