commit libqt4

7 Dec 2006

Hello community,

here is the log from the commit of package libqt4
checked in at Thu Dec 7 20:52:19 CET 2006.

--------

--- libqt4/libqt4-devel-doc-data.changes	2006-11-20 15:15:31.000000000 +0100
+++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc-data.changes	2006-12-04 16:15:05.000000000 +0100
@@ -1,0 +2,17 @@
+Fri Dec  1 18:40:48 CET 2006 - dmueller@suse.de
+
+- update to 4.2.2 (#222624):
+   * includes just bugfixes, see changes-4.2.2 for details
+
+-------------------------------------------------------------------
+Tue Nov 28 11:07:21 CET 2006 - dmueller@suse.de
+
+- shuffle around libs to fix cyclic dependencies
+
+-------------------------------------------------------------------
+Mon Nov 27 20:21:11 CET 2006 - dmueller@suse.de
+
+- add patch to fix QGraphicsView eventhandling
+- disable dbus-1 subpackage for older distributions
+
+-------------------------------------------------------------------
libqt4-sql-plugins.changes: same change
libqt4.changes: same change

Old:
----
  0147-qbrush-detach-transform.diff
  0148-qdbus-4.2.2-fixes.diff
  disable-subpixel.diff
  qt-x11-opensource-src-4.2.1.tar.bz2

New:
----
  fix-rpath-4.diff
  qt-x11-opensource-src-4.2.2.tar.bz2
  use-freetype-default.diff

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

Other differences:
------------------
++++++ libqt4-devel-doc-data.spec ++++++
--- /var/tmp/diff_new_pack.zRkhqY/_old	2006-12-07 20:52:01.000000000 +0100
+++ /var/tmp/diff_new_pack.zRkhqY/_new	2006-12-07 20:52:01.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package libqt4-devel-doc-data (Version 4.2.1)
+# spec file for package libqt4-devel-doc-data (Version 4.2.2)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -24,10 +24,10 @@
 BuildArch:      noarch
 # COMMON-BEGIN
 # COMMON-BEGIN
-Version:        4.2.1
-Release:        5
+Version:        4.2.2
+Release:        1
 %define x11_free  -x11-opensource-src-
-%define rversion 4.2.1
+%define rversion 4.2.2
 Source:         qt%x11_free%rversion.tar.bz2
 Source10:       qt4config.desktop
 Source11:       designer4.desktop
@@ -36,12 +36,11 @@
 Patch2:         qt-never-strip.diff
 Patch3:         plastik-default.diff
 Patch5:         lib64.patch
-Patch6:         disable-subpixel.diff
+Patch6:         use-freetype-default.diff
 Patch10:        0145-qabstractitemview-dropindicator.diff
 Patch11:        0146-rasterpaint-qbrush-image.diff
-Patch12:        0147-qbrush-detach-transform.diff
-Patch13:        0148-qdbus-4.2.2-fixes.diff
 Patch14:        0149-qdbusconnection-nowarning.diff
+Patch15:        fix-rpath-4.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -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/libqt4 -examplesdir %_docdir/libqt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/
 
@@ -66,9 +65,8 @@
 %patch6
 %patch10
 %patch11
-%patch12
-%patch13
 %patch14
+%patch15
 # be sure not to use them
 rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib}
 # COMMON-END
@@ -106,6 +104,14 @@
 /usr/share/doc/packages/libqt4/examples
 
 %changelog -n libqt4-devel-doc-data
+* Fri Dec 01 2006 - dmueller@suse.de
+- update to 4.2.2 (#222624):
+  * includes just bugfixes, see changes-4.2.2 for details
+* Tue Nov 28 2006 - dmueller@suse.de
+- shuffle around libs to fix cyclic dependencies
+* Mon Nov 27 2006 - dmueller@suse.de
+- add patch to fix QGraphicsView eventhandling
+- disable dbus-1 subpackage for older distributions
 * Mon Nov 20 2006 - schwab@suse.de
 - Provide/obsolete qt-sql only once.
 * Thu Nov 16 2006 - dmueller@suse.de

++++++ libqt4-sql-plugins.spec ++++++
--- /var/tmp/diff_new_pack.zRkhqY/_old	2006-12-07 20:52:01.000000000 +0100
+++ /var/tmp/diff_new_pack.zRkhqY/_new	2006-12-07 20:52:01.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package libqt4-sql-plugins (Version 4.2.1)
+# spec file for package libqt4-sql-plugins (Version 4.2.2)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -23,10 +23,10 @@
 Summary:        Qt 4 SQL-Related Libraries
 # COMMON-BEGIN
 # COMMON-BEGIN
-Version:        4.2.1
-Release:        6
+Version:        4.2.2
+Release:        1
 %define x11_free  -x11-opensource-src-
-%define rversion 4.2.1
+%define rversion 4.2.2
 Source:         qt%x11_free%rversion.tar.bz2
 Source10:       qt4config.desktop
 Source11:       designer4.desktop
@@ -35,12 +35,11 @@
 Patch2:         qt-never-strip.diff
 Patch3:         plastik-default.diff
 Patch5:         lib64.patch
-Patch6:         disable-subpixel.diff
+Patch6:         use-freetype-default.diff
 Patch10:        0145-qabstractitemview-dropindicator.diff
 Patch11:        0146-rasterpaint-qbrush-image.diff
-Patch12:        0147-qbrush-detach-transform.diff
-Patch13:        0148-qdbus-4.2.2-fixes.diff
 Patch14:        0149-qdbusconnection-nowarning.diff
+Patch15:        fix-rpath-4.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -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/libqt4 -examplesdir %_docdir/libqt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/
 
@@ -64,9 +63,8 @@
 %patch6
 %patch10
 %patch11
-%patch12
-%patch13
 %patch14
+%patch15
 # be sure not to use them
 rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib}
 # COMMON-END
@@ -205,6 +203,14 @@
 %plugindir/sqldrivers/libqsqlmysql*.so
 
 %changelog -n libqt4-sql-plugins
+* Fri Dec 01 2006 - dmueller@suse.de
+- update to 4.2.2 (#222624):
+  * includes just bugfixes, see changes-4.2.2 for details
+* Tue Nov 28 2006 - dmueller@suse.de
+- shuffle around libs to fix cyclic dependencies
+* Mon Nov 27 2006 - dmueller@suse.de
+- add patch to fix QGraphicsView eventhandling
+- disable dbus-1 subpackage for older distributions
 * Mon Nov 20 2006 - schwab@suse.de
 - Provide/obsolete qt-sql only once.
 * Thu Nov 16 2006 - dmueller@suse.de

++++++ libqt4.spec ++++++
--- /var/tmp/diff_new_pack.zRkhqY/_old	2006-12-07 20:52:01.000000000 +0100
+++ /var/tmp/diff_new_pack.zRkhqY/_new	2006-12-07 20:52:01.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package libqt4 (Version 4.2.1)
+# spec file for package libqt4 (Version 4.2.2)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,10 +11,13 @@
 # norootforbuild
 
 Name:           libqt4
-BuildRequires:  Mesa-devel cups-devel dbus-1-devel freetype2-devel gcc-c++ libjpeg-devel libmng-devel libpng-devel pkgconfig
+BuildRequires:  Mesa-devel cups-devel freetype2-devel gcc-c++ libjpeg-devel libmng-devel libpng-devel pkgconfig
 %if 0%{?suse_version}
 BuildRequires:  update-desktop-files
 %endif
+%if %suse_version > 1010
+BuildRequires:  dbus-1-devel
+%endif
 URL:            http://www.trolltech.com
 License:        GNU General Public License (GPL)
 Group:          System/Libraries
@@ -23,10 +26,10 @@
 Obsoletes:      qt
 Provides:       qt
 # COMMON-BEGIN
-Version:        4.2.1
-Release:        16
+Version:        4.2.2
+Release:        1
 %define x11_free  -x11-opensource-src-
-%define rversion 4.2.1
+%define rversion 4.2.2
 Source:         qt%x11_free%rversion.tar.bz2
 Source10:       qt4config.desktop
 Source11:       designer4.desktop
@@ -35,12 +38,11 @@
 Patch2:         qt-never-strip.diff
 Patch3:         plastik-default.diff
 Patch5:         lib64.patch
-Patch6:         disable-subpixel.diff
+Patch6:         use-freetype-default.diff
 Patch10:        0145-qabstractitemview-dropindicator.diff
 Patch11:        0146-rasterpaint-qbrush-image.diff
-Patch12:        0147-qbrush-detach-transform.diff
-Patch13:        0148-qdbus-4.2.2-fixes.diff
 Patch14:        0149-qdbusconnection-nowarning.diff
+Patch15:        fix-rpath-4.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -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/libqt4 -examplesdir %_docdir/libqt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/
 
@@ -66,9 +68,8 @@
 %patch6
 %patch10
 %patch11
-%patch12
-%patch13
 %patch14
+%patch15
 # be sure not to use them
 rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib}
 # COMMON-END
@@ -95,6 +96,7 @@
 --------
     Troll Tech AS, Norway
 
+%if %suse_version > 1010
 %package dbus-1
 Group:          System/Libraries
 Summary:        C++ Program Library, D-BUS Bindings
@@ -115,6 +117,7 @@
 --------
     Troll Tech AS, Norway
 
+%endif
 %package devel-doc
 Group:          Documentation/HTML
 Summary:        Qt documentation
@@ -214,9 +217,11 @@
   cp -a changes-* \
       $RPM_BUILD_ROOT/usr/share/doc/packages/%name/
 fi
-mv $RPM_BUILD_ROOT/%_libdir/qt4/demos/dbus-viewer/dbus-viewer $RPM_BUILD_ROOT/usr/bin
 ln -s %_libdir/qt4/demos $RPM_BUILD_ROOT/%_docdir/libqt4/demos
+%if %suse_version > 1010
+mv $RPM_BUILD_ROOT/%_libdir/qt4/demos/dbus-viewer/dbus-viewer $RPM_BUILD_ROOT/usr/bin
 rm -rf $RPM_BUILD_ROOT/%_libdir/qt4/demos/dbus-viewer
+%endif
 # packaged in libqt4-devel-doc-data
 rm -rf $RPM_BUILD_ROOT/%_docdir/libqt4/{html,examples}
 #
@@ -278,13 +283,17 @@
 %defattr(-,root,root,755)
 %exclude %plugindir/accessible/libqtaccessiblecompatwidgets.so
 /usr/bin/qtconfig
+%if %suse_version > 1010
 /usr/bin/dbus-viewer
+%endif
 /usr/share/applications/qt4config.desktop
 # designer.png is referenced by qt4config.desktop
 /usr/share/pixmaps/designer.png
 %_libdir/libQtGui*.so.*
 %_libdir/libQtOpenGL*.so.*
 %_libdir/libQtSvg.so.*
+%_libdir/libQtDesigner*.so.*
+%_libdir/libQtAssistantClient.so.*
 
 %plugindir/codecs
 
@@ -301,10 +310,12 @@
 %_libdir/libQt3Support*.so.*
 
 %plugindir/accessible/libqtaccessiblecompatwidgets.so
+%if %suse_version > 1010
 
 %files dbus-1
 %defattr(-,root,root,755)
 %_libdir/libQtDBus*.so.*
+%endif
 
 %files devel
 %defattr(-,root,root,755)
@@ -319,19 +330,21 @@
 /usr/bin/lupdate
 /usr/bin/pixeltool
 /usr/bin/qt3to4
+%if %suse_version > 1010
 /usr/bin/qdbus
 /usr/bin/qdbuscpp2xml
 /usr/bin/qdbusxml2cpp
+%endif
 %_libdir/lib*.prl
 %_libdir/lib*a
 %_libdir/lib*.so
-%_libdir/libQtDesigner*.so.*
 %_libdir/pkgconfig/*
 
 %plugindir/designer
 /usr/include/*
 /usr/share/applications/designer4.desktop
 /usr/share/applications/linguist4.desktop
+/usr/share/pixmaps/linguist.png
 /usr/share/qt4/mkspecs
 /usr/share/qt4/q3porting.xml
 
@@ -341,10 +354,8 @@
 /usr/bin/qtdemo
 /usr/share/pixmaps/assistant.png
 /usr/share/applications/assistant4.desktop
-/usr/share/pixmaps/linguist.png
 /usr/%_lib/qt4/demos
 %_docdir/libqt4/demos
-%_libdir/libQtAssistantClient.so.*
 
 %files sql
 %defattr(-,root,root,755)
@@ -352,6 +363,14 @@
 %_libdir/libQtSql*.so.*
 
 %changelog -n libqt4
+* Fri Dec 01 2006 - dmueller@suse.de
+- update to 4.2.2 (#222624):
+  * includes just bugfixes, see changes-4.2.2 for details
+* Tue Nov 28 2006 - dmueller@suse.de
+- shuffle around libs to fix cyclic dependencies
+* Mon Nov 27 2006 - dmueller@suse.de
+- add patch to fix QGraphicsView eventhandling
+- disable dbus-1 subpackage for older distributions
 * Mon Nov 20 2006 - schwab@suse.de
 - Provide/obsolete qt-sql only once.
 * Thu Nov 16 2006 - dmueller@suse.de



++++++ fix-rpath-4.diff ++++++
--- configure	2006/11/20 09:26:05	1.1
+++ configure	2006/11/20 20:54:34
@@ -3178,9 +3178,15 @@
 END {
     if (length(var) > 0) {
         printf "%s = ", var
-        for (i = 1; i <= NR; ++i)
-            printf "$(%s_%s) ", var, i
-            printf "\n"
+        for (i = 1; i <= NR; ++i) {
+            if ( var == "QMAKE_RPATH" ) {
+                printf "$(%s_%s)", var, i
+            }
+            else {
+                printf "$(%s_%s) ", var, i
+            }
+        }
+        printf "\n"
     }
 }' >> "$mkfile"
 }




++++++ qt-x11-opensource-src-4.2.1.tar.bz2 -> qt-x11-opensource-src-4.2.2.tar.bz2 ++++++
libqt4/qt-x11-opensource-src-4.2.1.tar.bz2 /mounts/work_src_done/STABLE/libqt4/qt-x11-opensource-src-4.2.2.tar.bz2 differ: char 11, line 1


++++++ use-freetype-default.diff ++++++
--- src/gui/text/qfontengine_x11.cpp
+++ src/gui/text/qfontengine_x11.cpp
@@ -1201,6 +1201,8 @@
     return face_id;
 }
 
+#include <freetype/config/ftoption.h>
+
 QFontEngineFT::QFontEngineFT(FcPattern *pattern, const QFontDef &fd, int screen)
 {
     _openType = 0;
@@ -1218,9 +1220,10 @@
     FcBool b;
     if (FcPatternGetBool(pattern, FC_ANTIALIAS, 0, &b) == FcResultMatch)
         antialias = b;
-    if (FcPatternGetInteger(pattern, FC_RGBA, 0, &subpixel) == FcResultNoMatch)
-        subpixel = X11->screens[screen].subpixel;
-    if (!antialias || subpixel == FC_RGBA_UNKNOWN)
+#ifdef FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+    if (!antialias || FcPatternGetInteger(pattern, FC_RGBA, 0, &subpixel) == FcResultNoMatch
+        || subpixel == FC_RGBA_UNKNOWN)
+#endif
         subpixel = FC_RGBA_NONE;
 
 #ifdef FC_HINT_STYLE

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



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠suse.de

tags

participants (1)