commit qt3

31 May 2006

Hello community,

here is the log from the commit of package qt3
checked in at Wed May 31 17:13:07 CEST 2006.

--------

--- KDE/qt3/qt3-devel-doc.changes	2006-05-29 12:56:05.000000000 +0200
+++ qt3/qt3-devel-doc.changes	2006-05-31 17:12:26.000000000 +0200
@@ -1,0 +2,7 @@
+Wed May 31 13:24:56 CEST 2006 - dmueller@suse.de
+
+- fix xpm image loading problem
+- add performance regression fix
+- add asian font loading fix 
+
+-------------------------------------------------------------------
qt3-extensions.changes: same change
qt3-static.changes: same change
qt3.changes: same change

New:
----
  0070-fix-broken-fonts.patch
  restore-qtextedit-performance.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ qt3-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.6faYTH/_old	2006-05-31 17:12:38.000000000 +0200
+++ /var/tmp/diff_new_pack.6faYTH/_new	2006-05-31 17:12:38.000000000 +0200
@@ -18,7 +18,7 @@
 Summary:        Qt 3 Development Kit
 Group:          Documentation/HTML
 Version:        3.3.6
-Release:        3
+Release:        5
 PreReq:         /bin/grep
 BuildArch:      noarch 
 Provides:       qt3-devel-tutorial
@@ -85,6 +85,8 @@
 Patch111:       qt-x11-immodule-focus-handling.diff
 Patch112:       qt-x11-immodule-fix-inputcontext-crash.diff
 Patch113:       fix-assistant-path.patch
+Patch114:       0070-fix-broken-fonts.patch
+Patch115:       restore-qtextedit-performance.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -149,6 +151,8 @@
 %patch111
 %patch112
 %patch113
+%patch114
+%patch115
 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/
 ln -sf $PWD/src/inputmethod/qinputcontextplugin.h  include/
 ln -sf $PWD/src/kernel/qinputcontext.h       include/
@@ -232,6 +236,10 @@
 /usr/share/pixmaps/assistant3.png
 
 %changelog -n qt3-devel-doc
+* Wed May 31 2006 - dmueller@suse.de
+- fix xpm image loading problem
+- add performance regression fix
+- add asian font loading fix
 * Mon May 29 2006 - adrian@suse.de
 - revert requires macro, this breaks the build system mapping
 - require right packages in -devel for < 10.1

++++++ qt3-extensions.spec ++++++
--- /var/tmp/diff_new_pack.6faYTH/_old	2006-05-31 17:12:38.000000000 +0200
+++ /var/tmp/diff_new_pack.6faYTH/_new	2006-05-31 17:12:38.000000000 +0200
@@ -14,7 +14,7 @@
 BuildRequires:  cups-devel krb5-devel libdrm-devel libjpeg-devel mysql-devel postgresql-devel qt3-devel sqlite2-devel unixODBC-devel update-desktop-files
 License:        GPL, QPL
 Version:        3.3.6
-Release:        3
+Release:        5
 Autoreqprov:    on
 Requires:       qt3 = %version
 Group:          Development/Tools/Other
@@ -80,6 +80,8 @@
 Patch111:       qt-x11-immodule-focus-handling.diff
 Patch112:       qt-x11-immodule-fix-inputcontext-crash.diff
 Patch113:       fix-assistant-path.patch
+Patch114:       0070-fix-broken-fonts.patch
+Patch115:       restore-qtextedit-performance.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -142,6 +144,8 @@
 %patch111
 %patch112
 %patch113
+%patch114
+%patch115
 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/
 ln -sf $PWD/src/inputmethod/qinputcontextplugin.h  include/
 ln -sf $PWD/src/kernel/qinputcontext.h       include/
@@ -472,6 +476,10 @@
 %{_mandir}/man*/*
 
 %changelog -n qt3-extensions
+* Wed May 31 2006 - dmueller@suse.de
+- fix xpm image loading problem
+- add performance regression fix
+- add asian font loading fix
 * Mon May 29 2006 - adrian@suse.de
 - revert requires macro, this breaks the build system mapping
 - require right packages in -devel for < 10.1

++++++ qt3-static.spec ++++++
--- /var/tmp/diff_new_pack.6faYTH/_old	2006-05-31 17:12:38.000000000 +0200
+++ /var/tmp/diff_new_pack.6faYTH/_new	2006-05-31 17:12:38.000000000 +0200
@@ -17,7 +17,7 @@
 Autoreqprov:    on
 Summary:        static program library for developing applications with graphical user interfaces
 Version:        3.3.6
-Release:        3
+Release:        5
 %define x11_free -x11-free-
 %define rversion %version
 # COMMON-BEGIN
@@ -79,6 +79,8 @@
 Patch111:       qt-x11-immodule-focus-handling.diff
 Patch112:       qt-x11-immodule-fix-inputcontext-crash.diff
 Patch113:       fix-assistant-path.patch
+Patch114:       0070-fix-broken-fonts.patch
+Patch115:       restore-qtextedit-performance.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -152,6 +154,8 @@
 %patch111
 %patch112
 %patch113
+%patch114
+%patch115
 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/
 ln -sf $PWD/src/inputmethod/qinputcontextplugin.h  include/
 ln -sf $PWD/src/kernel/qinputcontext.h       include/
@@ -241,6 +245,10 @@
 #/usr/lib/qt3/%{_lib}/libqt-mini.a
 
 %changelog -n qt3-static
+* Wed May 31 2006 - dmueller@suse.de
+- fix xpm image loading problem
+- add performance regression fix
+- add asian font loading fix
 * Mon May 29 2006 - adrian@suse.de
 - revert requires macro, this breaks the build system mapping
 - require right packages in -devel for < 10.1

++++++ qt3.spec ++++++
--- /var/tmp/diff_new_pack.6faYTH/_old	2006-05-31 17:12:38.000000000 +0200
+++ /var/tmp/diff_new_pack.6faYTH/_new	2006-05-31 17:12:38.000000000 +0200
@@ -19,7 +19,7 @@
 Autoreqprov:    on
 Summary:        A library for developing applications with graphical user interfaces
 Version:        3.3.6
-Release:        3
+Release:        5
 Provides:       qt_library_%version
 PreReq:         /bin/grep
 %define x11_free -x11-free-
@@ -82,6 +82,8 @@
 Patch111:       qt-x11-immodule-focus-handling.diff
 Patch112:       qt-x11-immodule-fix-inputcontext-crash.diff
 Patch113:       fix-assistant-path.patch
+Patch114:       0070-fix-broken-fonts.patch
+Patch115:       restore-qtextedit-performance.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -153,6 +155,8 @@
 %patch111
 %patch112
 %patch113
+%patch114
+%patch115
 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/
 ln -sf $PWD/src/inputmethod/qinputcontextplugin.h  include/
 ln -sf $PWD/src/kernel/qinputcontext.h       include/
@@ -372,6 +376,10 @@
 /etc/profile.d/qt3.*
 
 %changelog -n qt3
+* Wed May 31 2006 - dmueller@suse.de
+- fix xpm image loading problem
+- add performance regression fix
+- add asian font loading fix
 * Mon May 29 2006 - adrian@suse.de
 - revert requires macro, this breaks the build system mapping
 - require right packages in -devel for < 10.1

++++++ 0070-fix-broken-fonts.patch ++++++

--- include/private/qfontengine_p.h	2006-03-08 17:47:45.000000000 +0100
+++ include/private/qfontengine_p.h	2006-05-31 12:59:58.000000000 +0200
@@ -491,7 +491,7 @@
     }
     void selectScript(unsigned int script, const Features *features = 0);
     
-    void shape(QShaperItem *item, const unsigned int *properties = 0);
+    bool shape(QShaperItem *item, const unsigned int *properties = 0);
     bool positionAndAdd(QShaperItem *item, bool doLogClusters = TRUE);
 
     OTL_GlyphItem glyphs() const { return otl_buffer->in_string; }

--- src/kernel/qfontengine_p.h	2006-03-08 17:47:45.000000000 +0100
+++ src/kernel/qfontengine_p.h	2006-05-31 12:59:58.000000000 +0200
@@ -491,7 +491,7 @@
     }
     void selectScript(unsigned int script, const Features *features = 0);
     
-    void shape(QShaperItem *item, const unsigned int *properties = 0);
+    bool shape(QShaperItem *item, const unsigned int *properties = 0);
     bool positionAndAdd(QShaperItem *item, bool doLogClusters = TRUE);
 
     OTL_GlyphItem glyphs() const { return otl_buffer->in_string; }

--- src/kernel/qfontengine_x11.cpp	2006-03-08 17:47:49.000000000 +0100
+++ src/kernel/qfontengine_x11.cpp	2006-05-31 12:59:58.000000000 +0200
@@ -2544,7 +2544,7 @@
 
 extern void qt_heuristicPosition(QShaperItem *item);
 
-void QOpenType::shape(QShaperItem *item, const unsigned int *properties)
+bool QOpenType::shape(QShaperItem *item, const unsigned int *properties)
 {
     length = item->num_glyphs;
 
@@ -2571,8 +2571,11 @@
 
     loadFlags = FT_LOAD_DEFAULT;
 
-    if (gsub)
-        TT_GSUB_Apply_String(gsub, otl_buffer);
+    if (gsub) {
+        uint error = TT_GSUB_Apply_String(gsub, otl_buffer);
+        if (error && error != TTO_Err_Not_Covered)
+            return false;
+    }
 
 #ifdef OT_DEBUG
 //     qDebug("log clusters before shaping:");
@@ -2584,6 +2587,8 @@
     qDebug("-----------------------------------------");
 //     dump_string(otl_buffer);
 #endif
+
+    return true;
 }
 
 bool QOpenType::positionAndAdd(QShaperItem *item, bool doLogClusters)

--- src/kernel/qscriptengine.cpp	2006-03-08 17:47:45.000000000 +0100
+++ src/kernel/qscriptengine.cpp	2006-05-31 12:59:58.000000000 +0200
@@ -1504,8 +1504,10 @@
     {0, 0}
 };
 
-static bool arabicSyriacOpenTypeShape(QOpenType *openType, QShaperItem *item)
+static bool arabicSyriacOpenTypeShape(QOpenType *openType, QShaperItem *item, bool *ot_ok)
 {
+    *ot_ok = true;
+
     openType->selectScript(item->script, item->script == QFont::Arabic ? arabic_features : syriac_features);
     int nglyphs = item->num_glyphs;
     if (item->font->stringToCMap(item->string->unicode()+item->from, item->length, item->glyphs, item->advances,
@@ -1562,7 +1564,10 @@
             apply[i] |= IsolProperty|MediProperty|FinaProperty;
     }
 
-    openType->shape(item, apply.data());
+    if (!openType->shape(item, apply.data())) {
+        *ot_ok = false;
+        return false;
+    }
     item->num_glyphs = nglyphs;
     return openType->positionAndAdd(item);
 }
@@ -1577,8 +1582,14 @@
 #if defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE)
     QOpenType *openType = item->font->openType();
 
-    if (openType && openType->supportsScript(QFont::Arabic))
-        return arabicSyriacOpenTypeShape(openType, item);
+    if (openType && openType->supportsScript(QFont::Arabic)) {
+        bool ot_ok;
+        if (arabicSyriacOpenTypeShape(openType, item, &ot_ok))
+            return true;
+        if (ot_ok)
+            return false;
+        // fall through to the non OT code
+    }
 #endif
 
     QVarLengthArray<ushort> shapedChars(item->length);

--- src/kernel/qscriptengine_x11.cpp	2006-03-08 17:47:47.000000000 +0100
+++ src/kernel/qscriptengine_x11.cpp	2006-05-31 12:59:58.000000000 +0200
@@ -45,7 +45,12 @@
 #ifndef QT_NO_XFTFREETYPE
     QOpenType *openType = item->font->openType();
     if (openType && openType->supportsScript(QFont::Syriac)) {
-        return arabicSyriacOpenTypeShape(openType, item);
+        bool ot_ok;
+        if (arabicSyriacOpenTypeShape(openType, item, &ot_ok))
+            return true;
+        if (ot_ok)
+            return false;
+        // fall through to the non OT code
     }
 #endif
     return basic_shape(item);



++++++ limit-image-size.diff ++++++
--- /var/tmp/diff_new_pack.6faYTH/_old	2006-05-31 17:12:38.000000000 +0200
+++ /var/tmp/diff_new_pack.6faYTH/_new	2006-05-31 17:12:38.000000000 +0200
@@ -96,30 +96,12 @@
      if ( depth == 1 && bitOrder == IgnoreEndian ) {
  #if defined(QT_CHECK_RANGE)
  	qWarning( "QImage::create: Bit order is required for 1 bpp images" );
-@@ -5722,6 +5754,8 @@ static void read_xpm_image_or_array( QIm
-     } else {
- 	image.create( w, h, 8, ncols );
-     }
-+    if ( image.isNull() )
-+	return;
- 
-     QMap<QString, int> colorMap;
-     int currentColor;
-Index: kernel/qimage.h
 ===================================================================
 RCS file: /home/kde/qt-copy/src/kernel/qimage.h,v
 retrieving revision 1.49
 diff -u -p -r1.49 qimage.h
 --- src/kernel/qimage.h	16 May 2003 13:02:41 -0000	1.49
 +++ src/kernel/qimage.h	30 Sep 2004 11:20:41 -0000
-@@ -61,7 +61,6 @@ public:
- };
- #endif //QT_NO_IMAGE_TEXT
- 
--
- class Q_EXPORT QImage
- {
- public:
 @@ -194,6 +193,10 @@ public:
  		      int quality=-1 ) const;
      bool	save( QIODevice * device, const char* format,











++++++ restore-qtextedit-performance.diff ++++++
Index: src/kernel/qtextengine.cpp
===================================================================
--- src/kernel/qtextengine.cpp	(revision 544824)
+++ src/kernel/qtextengine.cpp	(working copy)
@@ -1108,7 +1108,7 @@ void QTextEngine::itemize( int mode )
     if ( string.length() == 0 )
 	return;
 
-    if ( 1 || !(mode & NoBidi) ) {
+    if ( !(mode & NoBidi) ) {
 	if ( direction == QChar::DirON )
 	    direction = basicDirection( string );
 	bidiItemize( this, direction == QChar::DirR, mode );

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)