Hello community, here is the log from the commit of package qt3 checked in at Thu Mar 15 01:49:07 CET 2007. -------- --- KDE/qt3/qt3.changes 2007-03-06 19:47:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/qt3/qt3.changes 2007-03-13 12:57:39.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 12 16:09:29 CET 2007 - dmueller@suse.de + +- enable tablet support (#253392) +- add default substitution for font queries (#244579) + +------------------------------------------------------------------- qt3-devel-doc.changes: same change qt3-extensions.changes: same change qt3-static.changes: same change New: ---- qt-font-default-subst.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.g24602/_old 2007-03-15 01:48:49.000000000 +0100 +++ /var/tmp/diff_new_pack.g24602/_new 2007-03-15 01:48:49.000000000 +0100 @@ -15,10 +15,10 @@ Url: http://www.trolltech.com/ License: GNU General Public License (GPL), THE Q PUBLIC LICENSE (QPL) Autoreqprov: on -Summary: Qt 3 Development Kit +Summary: Documentation for the Qt 3 Development Kit Group: Documentation/HTML Version: 3.3.8 -Release: 3 +Release: 5 PreReq: /bin/grep BuildArch: noarch Provides: qt3-devel-tutorial @@ -81,14 +81,15 @@ Patch113: fix-assistant-path.patch Patch117: qtimer-debug.diff Patch119: xinerama-qpopupmenu.diff +Patch120: qt-font-default-subst.diff Patch121: qt3-warnings.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -You need this package if you want to compile programs with Qt 3. It -contains the "Qt Crossplatform Development Kit 2". You will find -include files, documentation, precompiled examples, and a tutorial for -getting started with Qt in /usr/lib/qt3. +This package contains the documentation for the Qt 3 Development Kit. + +You will find documentation, precompiled examples, and a tutorial for +getting started with Qt in /usr/lib/qt3/doc. @@ -141,6 +142,7 @@ %patch113 %patch117 %patch119 +%patch120 %patch121 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/ ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/ @@ -162,10 +164,10 @@ # COMMON-END %description -You need this package if you want to compile programs with Qt 3. It -contains the "Qt Crossplatform Development Kit 2". You will find -include files, documentation, precompiled examples, and a tutorial for -getting started with Qt in /usr/lib/qt3. +This package contains the documentation for the Qt 3 Development Kit. + +You will find documentation, precompiled examples, and a tutorial for +getting started with Qt in /usr/lib/qt3/doc. @@ -224,6 +226,9 @@ /usr/share/pixmaps/assistant3.png %changelog +* Mon Mar 12 2007 - dmueller@suse.de +- enable tablet support (#253392) +- add default substitution for font queries (#244579) * Tue Mar 06 2007 - dmueller@suse.de - fix mysql driver crash on shutdown (#251222) * Sun Feb 25 2007 - dmueller@suse.de ++++++ qt3-extensions.spec ++++++ --- /var/tmp/diff_new_pack.g24602/_old 2007-03-15 01:48:49.000000000 +0100 +++ /var/tmp/diff_new_pack.g24602/_new 2007-03-15 01:48:49.000000000 +0100 @@ -14,7 +14,7 @@ BuildRequires: cups-devel krb5-devel libjpeg-devel mysql-devel postgresql-devel qt3-devel sqlite2-devel unixODBC-devel update-desktop-files License: GNU General Public License (GPL), THE Q PUBLIC LICENSE (QPL) Version: 3.3.8 -Release: 3 +Release: 6 Autoreqprov: on Requires: qt3 = %version Group: Development/Tools/Other @@ -76,6 +76,7 @@ Patch113: fix-assistant-path.patch Patch117: qtimer-debug.diff Patch119: xinerama-qpopupmenu.diff +Patch120: qt-font-default-subst.diff Patch121: qt3-warnings.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -134,6 +135,7 @@ %patch113 %patch117 %patch119 +%patch120 %patch121 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/ ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/ @@ -468,6 +470,9 @@ %{_mandir}/man*/* %changelog +* Mon Mar 12 2007 - dmueller@suse.de +- enable tablet support (#253392) +- add default substitution for font queries (#244579) * Tue Mar 06 2007 - dmueller@suse.de - fix mysql driver crash on shutdown (#251222) * Sun Feb 25 2007 - dmueller@suse.de ++++++ qt3.spec ++++++ --- /var/tmp/diff_new_pack.g24602/_old 2007-03-15 01:48:49.000000000 +0100 +++ /var/tmp/diff_new_pack.g24602/_new 2007-03-15 01:48:49.000000000 +0100 @@ -19,7 +19,7 @@ Autoreqprov: on Summary: A library for developing applications with graphical user interfaces Version: 3.3.8 -Release: 3 +Release: 5 Provides: qt_library_%version PreReq: /bin/grep %define x11_free -x11-free- @@ -78,6 +78,7 @@ Patch113: fix-assistant-path.patch Patch117: qtimer-debug.diff Patch119: xinerama-qpopupmenu.diff +Patch120: qt-font-default-subst.diff Patch121: qt3-warnings.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -145,6 +146,7 @@ %patch113 %patch117 %patch119 +%patch120 %patch121 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/ ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/ @@ -180,8 +182,7 @@ %description devel You need this package if you want to compile programs with Qt 3. It contains the "Qt Crossplatform Development Kit 2". Under /usr/lib/qt3 -you will find include files, documentation, precompiled examples, and a -tutorial for getting started with Qt. +you will find include files. You need a license for using Qt with a non-GPL application. A license can be acquired at sales@trolltech.com. @@ -360,6 +361,9 @@ /etc/profile.d/qt3.* %changelog +* Mon Mar 12 2007 - dmueller@suse.de +- enable tablet support (#253392) +- add default substitution for font queries (#244579) * Tue Mar 06 2007 - dmueller@suse.de - fix mysql driver crash on shutdown (#251222) * Sun Feb 25 2007 - dmueller@suse.de ++++++ qt3-static.spec ++++++ --- /var/tmp/diff_new_pack.g24602/_old 2007-03-15 01:48:49.000000000 +0100 +++ /var/tmp/diff_new_pack.g24602/_new 2007-03-15 01:48:49.000000000 +0100 @@ -17,7 +17,7 @@ Autoreqprov: on Summary: static program library for developing applications with graphical user interfaces Version: 3.3.8 -Release: 3 +Release: 5 %define x11_free -x11-free- %define rversion %version # COMMON-BEGIN @@ -75,6 +75,7 @@ Patch113: fix-assistant-path.patch Patch117: qtimer-debug.diff Patch119: xinerama-qpopupmenu.diff +Patch120: qt-font-default-subst.diff Patch121: qt3-warnings.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -144,6 +145,7 @@ %patch113 %patch117 %patch119 +%patch120 %patch121 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/ ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/ @@ -214,6 +216,9 @@ /usr/lib/qt3/%{_lib}/libqt-mt.a %changelog +* Mon Mar 12 2007 - dmueller@suse.de +- enable tablet support (#253392) +- add default substitution for font queries (#244579) * Tue Mar 06 2007 - dmueller@suse.de - fix mysql driver crash on shutdown (#251222) * Sun Feb 25 2007 - dmueller@suse.de ++++++ build_script.sh ++++++ --- KDE/qt3/build_script.sh 2007-02-06 22:47:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/qt3/build_script.sh 2007-03-12 15:42:06.000000000 +0100 @@ -27,7 +27,6 @@ XCURSOR="-xcursor" XFT="-xft -xrender -I/usr/include/freetype2/ " [ -e /usr/$WLIB/libmng.so ] && LIBMNG="-system-libmng -plugin-imgfmt-mng" || LIBMNG="-qt-libmng " - [ -e /usr/X11R6/include/X11/extensions/XInput.h ] && TABLET="-tablet" || TABLET="" PGSQL="-plugin-sql-psql -I/usr/include -I/usr/include/pgsql/ -I/usr/include/pgsql/server" ODBC="-plugin-sql-odbc" @@ -69,7 +68,7 @@ -xkb $LIBMNG -no-g++-exceptions $LARGEFILE $XCURSOR \ $XFT $XINERAMA -sm -L/usr/$WLIB -L/usr/X11R6/$WLIB \ -plugin-sql-mysql -I/usr/include/mysql/ \ - $TABLET $ORACLE $PGSQL $ODBC -plugin-sql-sqlite $NEWABI \ + -tablet $ORACLE $PGSQL $ODBC -plugin-sql-sqlite $NEWABI \ -prefix $PREFIX -libdir $PREFIX/$WLIB" # use styles as plugins, beside platinum. leave windowsxp disabled ++++++ qt-font-default-subst.diff ++++++ --- src/kernel/qfontdatabase_x11.cpp +++ src/kernel/qfontdatabase_x11.cpp @@ -1847,6 +1847,7 @@ static QFontEngine *loadFontConfigFont(c value.u.s = (const FcChar8 *)cs.data(); FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue); } + FcDefaultSubstitute(pattern); #ifdef FONT_MATCH_DEBUG printf("final pattern contains:\n"); FcPatternPrint(pattern); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org