Hello community,
here is the log from the commit of package libqt4
checked in at Sat Aug 2 00:11:55 CEST 2008.
--------
--- libqt4/libqt4.changes 2008-07-22 22:51:21.000000000 +0200
+++ libqt4/libqt4.changes 2008-07-31 18:51:21.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Jul 31 17:07:45 CEST 2008 - dmueller(a)suse.de
+
+- update to 4.4.1:
+ * for detailed changelog, see included changes-4.4.1
+- detect freetype build during runtime (bnc#378801)
+
+-------------------------------------------------------------------
libqt4-devel-doc-data.changes: same change
libqt4-sql-plugins.changes: same change
libQtWebKit-devel.changes: same change
Old:
----
0223-fix-qpixmap-hasalpha.diff
0227-qdatastream-regression.diff
0228-qsortfilterproxymodel-invalidate-noscroll.diff
0237-printdialog-assert.diff
javascriptcore-bufferoverflow.diff
qatomic-no-barrier.diff
qstroke-endless-loop.diff
qtextstream-locale-parsing.diff
qt-qfatal-abort.diff
qt-x11-opensource-src-4.4.0.tar.bz2
xim-callback-crash.diff
New:
----
qt-x11-opensource-src-4.4.1.tar.bz2
use-freetype-default-legacy.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt4-devel-doc-data.spec ++++++
--- /var/tmp/diff_new_pack.E15627/_old 2008-08-02 00:03:46.000000000 +0200
+++ /var/tmp/diff_new_pack.E15627/_new 2008-08-02 00:03:46.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libqt4-devel-doc-data (Version 4.4.0)
+# spec file for package libqt4-devel-doc-data (Version 4.4.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -27,11 +27,11 @@
%requires_eq libqt4
# COMMON-BEGIN
# COMMON-BEGIN
-Version: 4.4.0
-Release: 26
+Version: 4.4.1
+Release: 1
%define base_name libqt4
%define x11_free -x11-opensource-src-
-%define rversion 4.4.0
+%define rversion 4.4.1
Source: qt%x11_free%rversion.tar.bz2
Source10: qt4config.desktop
Source11: designer4.desktop
@@ -44,6 +44,7 @@
Patch3: plastik-default.diff
Patch5: lib64.patch
Patch6: use-freetype-default.diff
+Patch1006: use-freetype-default-legacy.diff
Patch8: link-tools-shared.diff
Patch20: qt-font-choose.diff
Patch27: 0167-fix-group-reading.diff
@@ -51,33 +52,23 @@
Patch40: 0188-fix-moc-parser-same-name-header.diff
Patch43: 0195-compositing-properties.diff
Patch48: 0203-qtexthtmlparser-link-color.diff
-Patch49: javascriptcore-bufferoverflow.diff
-Patch53: qstroke-endless-loop.diff
-Patch54: qatomic-no-barrier.diff
Patch55: ignore-global-advance-width-in-fots.diff
Patch60: 0180-window-role.diff
Patch61: qt4-fake-bold.patch
Patch62: qdbus-enable-on-sles10.diff
Patch66: statusbar-recursion.diff
Patch67: postgresql83-support.diff
-Patch68: xim-callback-crash.diff
-Patch69: 0223-fix-qpixmap-hasalpha.diff
Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch
-Patch71: 0227-qdatastream-regression.diff
-Patch72: 0228-qsortfilterproxymodel-invalidate-noscroll.diff
Patch73: 0232-fix-qdesktopwidget-screen-merge.diff
Patch74: ppc-atomic.diff
Patch75: qt-debug-timer.diff
-Patch76: qt-qfatal-abort.diff
Patch77: qt4-input-method-lazy-load.patch
-Patch78: qtextstream-locale-parsing.diff
Patch79: aliasing.diff
Patch80: memset.diff
Patch81: 0230-qtextcontrol-selectnextword.diff
Patch82: 0234-fix-mysql-threaded.diff
Patch83: 0235-qdbus-dispatch-async-timeout.diff
Patch84: 0236-qtoolbararealayout-restore.diff
-Patch85: 0237-printdialog-assert.diff
Patch86: 0238-fix-qt-qttabbar-size.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 910
@@ -104,7 +95,11 @@
%patch2
%patch3
%patch5
+%if %suse_version > 1010
%patch6
+%else
+%patch1006
+%endif
# needs rediffing
#%patch8
%patch27
@@ -112,9 +107,6 @@
%patch40
%patch43
%patch48
-%patch49
-%patch53
-%patch54
%patch55
%patch60
%if %suse_version > 910
@@ -124,24 +116,17 @@
%patch62
%patch66
%patch67 -p1
-%patch68
-%patch69
%patch70
-%patch71
-%patch72
%patch73
%patch74
%patch75
-%patch76
%patch77
-%patch78
%patch79
%patch80
%patch81
%patch82
%patch83
%patch84
-%patch85
%patch86
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
@@ -198,6 +183,10 @@
/usr/share/doc/packages/%base_name/src
%changelog
+* Thu Jul 31 2008 dmueller(a)suse.de
+- update to 4.4.1:
+ * for detailed changelog, see included changes-4.4.1
+- detect freetype build during runtime (bnc#378801)
* Tue Jul 22 2008 dmueller(a)suse.de
- add more patches from KDE's qt-copy
- fix -devel/-x11 fileconflict
++++++ libqt4.spec ++++++
--- /var/tmp/diff_new_pack.E15627/_old 2008-08-02 00:03:46.000000000 +0200
+++ /var/tmp/diff_new_pack.E15627/_new 2008-08-02 00:03:46.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libqt4 (Version 4.4.0)
+# spec file for package libqt4 (Version 4.4.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -33,11 +33,11 @@
Provides: libqt4-dbus-1 = 4.4.0
Obsoletes: libqt4-dbus-1 < 4.4.0
# COMMON-BEGIN
-Version: 4.4.0
-Release: 26
+Version: 4.4.1
+Release: 1
%define base_name libqt4
%define x11_free -x11-opensource-src-
-%define rversion 4.4.0
+%define rversion 4.4.1
Source: qt%x11_free%rversion.tar.bz2
Source10: qt4config.desktop
Source11: designer4.desktop
@@ -50,6 +50,7 @@
Patch3: plastik-default.diff
Patch5: lib64.patch
Patch6: use-freetype-default.diff
+Patch1006: use-freetype-default-legacy.diff
Patch8: link-tools-shared.diff
Patch20: qt-font-choose.diff
Patch27: 0167-fix-group-reading.diff
@@ -57,33 +58,23 @@
Patch40: 0188-fix-moc-parser-same-name-header.diff
Patch43: 0195-compositing-properties.diff
Patch48: 0203-qtexthtmlparser-link-color.diff
-Patch49: javascriptcore-bufferoverflow.diff
-Patch53: qstroke-endless-loop.diff
-Patch54: qatomic-no-barrier.diff
Patch55: ignore-global-advance-width-in-fots.diff
Patch60: 0180-window-role.diff
Patch61: qt4-fake-bold.patch
Patch62: qdbus-enable-on-sles10.diff
Patch66: statusbar-recursion.diff
Patch67: postgresql83-support.diff
-Patch68: xim-callback-crash.diff
-Patch69: 0223-fix-qpixmap-hasalpha.diff
Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch
-Patch71: 0227-qdatastream-regression.diff
-Patch72: 0228-qsortfilterproxymodel-invalidate-noscroll.diff
Patch73: 0232-fix-qdesktopwidget-screen-merge.diff
Patch74: ppc-atomic.diff
Patch75: qt-debug-timer.diff
-Patch76: qt-qfatal-abort.diff
Patch77: qt4-input-method-lazy-load.patch
-Patch78: qtextstream-locale-parsing.diff
Patch79: aliasing.diff
Patch80: memset.diff
Patch81: 0230-qtextcontrol-selectnextword.diff
Patch82: 0234-fix-mysql-threaded.diff
Patch83: 0235-qdbus-dispatch-async-timeout.diff
Patch84: 0236-qtoolbararealayout-restore.diff
-Patch85: 0237-printdialog-assert.diff
Patch86: 0238-fix-qt-qttabbar-size.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 910
@@ -111,7 +102,11 @@
%patch2
%patch3
%patch5
+%if %suse_version > 1010
%patch6
+%else
+%patch1006
+%endif
# needs rediffing
#%patch8
%patch27
@@ -119,9 +114,6 @@
%patch40
%patch43
%patch48
-%patch49
-%patch53
-%patch54
%patch55
%patch60
%if %suse_version > 910
@@ -131,24 +123,17 @@
%patch62
%patch66
%patch67 -p1
-%patch68
-%patch69
%patch70
-%patch71
-%patch72
%patch73
%patch74
%patch75
-%patch76
%patch77
-%patch78
%patch79
%patch80
%patch81
%patch82
%patch83
%patch84
-%patch85
%patch86
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
@@ -456,6 +441,10 @@
%plugindir/sqldrivers/libqsqlite*.so
%changelog
+* Thu Jul 31 2008 dmueller(a)suse.de
+- update to 4.4.1:
+ * for detailed changelog, see included changes-4.4.1
+- detect freetype build during runtime (bnc#378801)
* Tue Jul 22 2008 dmueller(a)suse.de
- add more patches from KDE's qt-copy
- fix -devel/-x11 fileconflict
++++++ libqt4-sql-plugins.spec ++++++
--- /var/tmp/diff_new_pack.E15627/_old 2008-08-02 00:03:46.000000000 +0200
+++ /var/tmp/diff_new_pack.E15627/_new 2008-08-02 00:03:46.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libqt4-sql-plugins (Version 4.4.0)
+# spec file for package libqt4-sql-plugins (Version 4.4.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -26,11 +26,11 @@
Summary: Qt 4 SQL-Related Libraries
# COMMON-BEGIN
# COMMON-BEGIN
-Version: 4.4.0
-Release: 10
+Version: 4.4.1
+Release: 1
%define base_name libqt4
%define x11_free -x11-opensource-src-
-%define rversion 4.4.0
+%define rversion 4.4.1
Source: qt%x11_free%rversion.tar.bz2
Source10: qt4config.desktop
Source11: designer4.desktop
@@ -43,6 +43,7 @@
Patch3: plastik-default.diff
Patch5: lib64.patch
Patch6: use-freetype-default.diff
+Patch1006: use-freetype-default-legacy.diff
Patch8: link-tools-shared.diff
Patch20: qt-font-choose.diff
Patch27: 0167-fix-group-reading.diff
@@ -50,33 +51,23 @@
Patch40: 0188-fix-moc-parser-same-name-header.diff
Patch43: 0195-compositing-properties.diff
Patch48: 0203-qtexthtmlparser-link-color.diff
-Patch49: javascriptcore-bufferoverflow.diff
-Patch53: qstroke-endless-loop.diff
-Patch54: qatomic-no-barrier.diff
Patch55: ignore-global-advance-width-in-fots.diff
Patch60: 0180-window-role.diff
Patch61: qt4-fake-bold.patch
Patch62: qdbus-enable-on-sles10.diff
Patch66: statusbar-recursion.diff
Patch67: postgresql83-support.diff
-Patch68: xim-callback-crash.diff
-Patch69: 0223-fix-qpixmap-hasalpha.diff
Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch
-Patch71: 0227-qdatastream-regression.diff
-Patch72: 0228-qsortfilterproxymodel-invalidate-noscroll.diff
Patch73: 0232-fix-qdesktopwidget-screen-merge.diff
Patch74: ppc-atomic.diff
Patch75: qt-debug-timer.diff
-Patch76: qt-qfatal-abort.diff
Patch77: qt4-input-method-lazy-load.patch
-Patch78: qtextstream-locale-parsing.diff
Patch79: aliasing.diff
Patch80: memset.diff
Patch81: 0230-qtextcontrol-selectnextword.diff
Patch82: 0234-fix-mysql-threaded.diff
Patch83: 0235-qdbus-dispatch-async-timeout.diff
Patch84: 0236-qtoolbararealayout-restore.diff
-Patch85: 0237-printdialog-assert.diff
Patch86: 0238-fix-qt-qttabbar-size.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 910
@@ -102,7 +93,11 @@
%patch2
%patch3
%patch5
+%if %suse_version > 1010
%patch6
+%else
+%patch1006
+%endif
# needs rediffing
#%patch8
%patch27
@@ -110,9 +105,6 @@
%patch40
%patch43
%patch48
-%patch49
-%patch53
-%patch54
%patch55
%patch60
%if %suse_version > 910
@@ -122,24 +114,17 @@
%patch62
%patch66
%patch67 -p1
-%patch68
-%patch69
%patch70
-%patch71
-%patch72
%patch73
%patch74
%patch75
-%patch76
%patch77
-%patch78
%patch79
%patch80
%patch81
%patch82
%patch83
%patch84
-%patch85
%patch86
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
@@ -259,6 +244,10 @@
%plugindir/sqldrivers/libqsqlmysql*.so
%changelog
+* Thu Jul 31 2008 dmueller(a)suse.de
+- update to 4.4.1:
+ * for detailed changelog, see included changes-4.4.1
+- detect freetype build during runtime (bnc#378801)
* Tue Jul 22 2008 dmueller(a)suse.de
- add more patches from KDE's qt-copy
- fix -devel/-x11 fileconflict
++++++ libQtWebKit-devel.spec ++++++
--- /var/tmp/diff_new_pack.E15627/_old 2008-08-02 00:03:46.000000000 +0200
+++ /var/tmp/diff_new_pack.E15627/_new 2008-08-02 00:03:46.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libQtWebKit-devel (Version 4.4.0)
+# spec file for package libQtWebKit-devel (Version 4.4.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -30,11 +30,11 @@
%requires_eq libqt4-devel
# COMMON-BEGIN
# COMMON-BEGIN
-Version: 4.4.0
-Release: 26
+Version: 4.4.1
+Release: 1
%define base_name libqt4
%define x11_free -x11-opensource-src-
-%define rversion 4.4.0
+%define rversion 4.4.1
Source: qt%x11_free%rversion.tar.bz2
Source10: qt4config.desktop
Source11: designer4.desktop
@@ -47,6 +47,7 @@
Patch3: plastik-default.diff
Patch5: lib64.patch
Patch6: use-freetype-default.diff
+Patch1006: use-freetype-default-legacy.diff
Patch8: link-tools-shared.diff
Patch20: qt-font-choose.diff
Patch27: 0167-fix-group-reading.diff
@@ -54,33 +55,23 @@
Patch40: 0188-fix-moc-parser-same-name-header.diff
Patch43: 0195-compositing-properties.diff
Patch48: 0203-qtexthtmlparser-link-color.diff
-Patch49: javascriptcore-bufferoverflow.diff
-Patch53: qstroke-endless-loop.diff
-Patch54: qatomic-no-barrier.diff
Patch55: ignore-global-advance-width-in-fots.diff
Patch60: 0180-window-role.diff
Patch61: qt4-fake-bold.patch
Patch62: qdbus-enable-on-sles10.diff
Patch66: statusbar-recursion.diff
Patch67: postgresql83-support.diff
-Patch68: xim-callback-crash.diff
-Patch69: 0223-fix-qpixmap-hasalpha.diff
Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch
-Patch71: 0227-qdatastream-regression.diff
-Patch72: 0228-qsortfilterproxymodel-invalidate-noscroll.diff
Patch73: 0232-fix-qdesktopwidget-screen-merge.diff
Patch74: ppc-atomic.diff
Patch75: qt-debug-timer.diff
-Patch76: qt-qfatal-abort.diff
Patch77: qt4-input-method-lazy-load.patch
-Patch78: qtextstream-locale-parsing.diff
Patch79: aliasing.diff
Patch80: memset.diff
Patch81: 0230-qtextcontrol-selectnextword.diff
Patch82: 0234-fix-mysql-threaded.diff
Patch83: 0235-qdbus-dispatch-async-timeout.diff
Patch84: 0236-qtoolbararealayout-restore.diff
-Patch85: 0237-printdialog-assert.diff
Patch86: 0238-fix-qt-qttabbar-size.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 910
@@ -108,7 +99,11 @@
%patch2
%patch3
%patch5
+%if %suse_version > 1010
%patch6
+%else
+%patch1006
+%endif
# needs rediffing
#%patch8
%patch27
@@ -116,9 +111,6 @@
%patch40
%patch43
%patch48
-%patch49
-%patch53
-%patch54
%patch55
%patch60
%if %suse_version > 910
@@ -128,24 +120,17 @@
%patch62
%patch66
%patch67 -p1
-%patch68
-%patch69
%patch70
-%patch71
-%patch72
%patch73
%patch74
%patch75
-%patch76
%patch77
-%patch78
%patch79
%patch80
%patch81
%patch82
%patch83
%patch84
-%patch85
%patch86
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
@@ -315,6 +300,10 @@
/usr/bin/qt4-browser
%changelog
+* Thu Jul 31 2008 dmueller(a)suse.de
+- update to 4.4.1:
+ * for detailed changelog, see included changes-4.4.1
+- detect freetype build during runtime (bnc#378801)
* Tue Jul 22 2008 dmueller(a)suse.de
- add more patches from KDE's qt-copy
- fix -devel/-x11 fileconflict
++++++ 0167-fix-group-reading.diff ++++++
--- /var/tmp/diff_new_pack.E15627/_old 2008-08-02 00:03:46.000000000 +0200
+++ /var/tmp/diff_new_pack.E15627/_new 2008-08-02 00:03:46.000000000 +0200
@@ -7,25 +7,22 @@
in big user environments, getgrgid_r() needs more memory than sysconf() returns.
Try a bit harder.
---- src/corelib/io/qfsfileengine_unix.cpp
-+++ src/corelib/io/qfsfileengine_unix.cpp
-@@ -831,9 +831,16 @@ QString QFSFileEngine::owner(FileOwner o
- } else if (own == OwnerGroup) {
- struct group *gr = 0;
- #if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD)
-- buf.resize(sysconf(_SC_GETGR_R_SIZE_MAX));
+--- src/corelib//io/qfsfileengine_unix.cpp
++++ src/corelib//io/qfsfileengine_unix.cpp
+@@ -835,9 +835,13 @@
+ size_max = sysconf(_SC_GETGR_R_SIZE_MAX);
+ if (size_max == -1)
+ size_max = 1024;
+- buf.resize(size_max);
- struct group entry;
- getgrgid_r(ownerId(own), &entry, buf.data(), buf.size(), &gr);
-+ for (unsigned size = sysconf(_SC_GETGR_R_SIZE_MAX); size < 256000; size += size)
-+ {
-+ buf.resize(size);
++ for (;size_max < 256000; size_max += size_max) {
++ buf.resize(size_max);
+ struct group entry;
-+ // ERANGE indicates that the buffer was too small
-+ if (!getgrgid_r(ownerId(own), &entry, buf.data(), buf.size(), &gr)
-+ || errno != ERANGE)
++ if (!getgrgid_r(ownerId(own), &entry, buf.data(), buf.size(), &gr) || errno != ERANGE)
+ break;
-+ }
+
++ }
#else
gr = getgrgid(ownerId(own));
#endif
++++++ ppc-atomic.diff ++++++
--- /var/tmp/diff_new_pack.E15627/_old 2008-08-02 00:03:47.000000000 +0200
+++ /var/tmp/diff_new_pack.E15627/_new 2008-08-02 00:03:47.000000000 +0200
@@ -84,7 +84,7 @@
@@ -180,15 +176,14 @@ inline bool QBasicAtomicInt::testAndSetR
{
register int result;
- asm volatile("lwsync\n"
+ asm volatile("eieio\n"
- "lwarx %[result], 0, %[_q_value]\n"
+ "lwarx %[result], %y[_q_value]\n"
"xor. %[result], %[result], %[expectedValue]\n"
@@ -141,7 +141,7 @@
@@ -227,13 +220,12 @@ inline int QBasicAtomicInt::fetchAndStor
{
register int originalValue;
- asm volatile("lwsync\n"
+ asm volatile("eieio\n"
- "lwarx %[originalValue], 0, %[_q_value]\n"
- "stwcx. %[newValue], 0, %[_q_value]\n"
+ "lwarx %[originalValue], %y[_q_value]\n"
@@ -200,7 +200,7 @@
@@ -278,15 +268,14 @@ inline int QBasicAtomicInt::fetchAndAddR
register int originalValue;
register int newValue;
- asm volatile("lwsync\n"
+ asm volatile("eieio\n"
- "lwarx %[originalValue], 0, %[_q_value]\n"
+ "lwarx %[originalValue], %y[_q_value]\n"
"add %[newValue], %[originalValue], %[valueToAdd]\n"
@@ -261,7 +261,7 @@
@@ -341,15 +328,14 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPoint
{
register void *result;
- asm volatile("lwsync\n"
+ asm volatile("eieio\n"
- LPARX" %[result], 0, %[_q_value]\n"
+ LPARX" %[result], %y[_q_value]\n"
"xor. %[result], %[result], %[expectedValue]\n"
@@ -318,7 +318,7 @@
@@ -391,13 +375,12 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer
{
register T *originalValue;
- asm volatile("lwsync\n"
+ asm volatile("eieio\n"
- LPARX" %[originalValue], 0, %[_q_value]\n"
- STPCX" %[newValue], 0, %[_q_value]\n"
+ LPARX" %[originalValue], %y[_q_value]\n"
@@ -377,7 +377,7 @@
@@ -445,15 +426,14 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer
register T *originalValue;
register T *newValue;
- asm volatile("lwsync\n"
+ asm volatile("eieio\n"
- LPARX" %[originalValue], 0, %[_q_value]\n"
+ LPARX" %[originalValue], %y[_q_value]\n"
"add %[newValue], %[originalValue], %[valueToAdd]\n"
++++++ qt-x11-opensource-src-4.4.0.tar.bz2 -> qt-x11-opensource-src-4.4.1.tar.bz2 ++++++
libqt4/qt-x11-opensource-src-4.4.0.tar.bz2 libqt4/qt-x11-opensource-src-4.4.1.tar.bz2 differ: byte 11, line 1
++++++ use-freetype-default.diff ++++++
--- /var/tmp/diff_new_pack.E15627/_old 2008-08-02 00:03:47.000000000 +0200
+++ /var/tmp/diff_new_pack.E15627/_new 2008-08-02 00:03:47.000000000 +0200
@@ -1,26 +1,40 @@
--- src/gui/text/qfontengine_x11.cpp
+++ src/gui/text/qfontengine_x11.cpp
-@@ -809,6 +809,7 @@ Q_GUI_EXPORT void qt_x11ft_convert_patte
+@@ -890,6 +890,27 @@ Q_GUI_EXPORT void qt_x11ft_convert_patte
*antialias = b;
}
-+#include <freetype/config/ftoption.h>
++#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);
++}
++
QFontEngineX11FT::QFontEngineX11FT(FcPattern *pattern, const QFontDef &fd, int screen)
: QFontEngineFT(fd)
-@@ -824,6 +825,7 @@ QFontEngineX11FT::QFontEngineX11FT(FcPat
- face_id.index = face_index;
+@@ -907,7 +928,8 @@ QFontEngineX11FT::QFontEngineX11FT(FcPat
+ canUploadGlyphsToServer = qApp->thread() == QThread::currentThread();
subpixelType = Subpixel_None;
-+#ifdef FT_CONFIG_OPTION_SUBPIXEL_RENDERING
- if (antialias) {
+- if (antialias) {
++
++ if (subpixel_rendering_available() && antialias) {
int subpixel = 0;
if (FcPatternGetInteger(pattern, FC_RGBA, 0, &subpixel) == FcResultNoMatch
-@@ -841,6 +843,7 @@ QFontEngineX11FT::QFontEngineX11FT(FcPat
- default: break;
- }
- }
-+#endif
-
- #ifdef FC_HINT_STYLE
- {
+ && X11->display)
++++++ use-freetype-default-legacy.diff ++++++
--- src/gui/text/qfontengine_x11.cpp
+++ src/gui/text/qfontengine_x11.cpp
@@ -809,6 +809,7 @@ Q_GUI_EXPORT void qt_x11ft_convert_patte
*antialias = b;
}
+#include <freetype/config/ftoption.h>
QFontEngineX11FT::QFontEngineX11FT(FcPattern *pattern, const QFontDef &fd, int screen)
: QFontEngineFT(fd)
@@ -824,6 +825,7 @@ QFontEngineX11FT::QFontEngineX11FT(FcPat
face_id.index = face_index;
subpixelType = Subpixel_None;
+#ifdef FT_CONFIG_OPTION_SUBPIXEL_RENDERING
if (antialias) {
int subpixel = 0;
if (FcPatternGetInteger(pattern, FC_RGBA, 0, &subpixel) == FcResultNoMatch
@@ -841,6 +843,7 @@ QFontEngineX11FT::QFontEngineX11FT(FcPat
default: break;
}
}
+#endif
#ifdef FC_HINT_STYLE
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
