Mailinglist Archive: opensuse-commit (2130 mails)

< Previous Next >
commit libqt4
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Wed, 02 Apr 2008 20:46:41 +0200
  • Message-id: <20080402184641.94A01678182@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package libqt4
checked in at Wed Apr 2 20:46:41 CEST 2008.

--------
--- libqt4/libqt4.changes 2008-03-28 13:19:18.000000000 +0100
+++ libqt4/libqt4.changes 2008-04-02 15:45:40.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Apr 2 15:08:46 CEST 2008 - dmueller@xxxxxxx
+
+- fix crashes on starting qt4 apps (bnc#360405, bnc#372726)
+- add patch for artifical font styles (bnc#374073)
+
+-------------------------------------------------------------------
libqt4-devel-doc-data.changes: same change
libqt4-sql-plugins.changes: same change
libQtWebKit-devel.changes: same change

New:
----
qt4-fake-bold.patch

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

Other differences:
------------------
++++++ libqt4-devel-doc-data.spec ++++++
--- /var/tmp/diff_new_pack.RF6305/_old 2008-04-02 20:45:28.000000000 +0200
+++ /var/tmp/diff_new_pack.RF6305/_new 2008-04-02 20:45:28.000000000 +0200
@@ -24,6 +24,7 @@
AutoReqProv: on
Summary: Qt Documentation (Architecture Independent Files)
BuildArch: noarch
+%requires_eq libqt4
# COMMON-BEGIN
# COMMON-BEGIN
%define snapshot 20080325
@@ -59,12 +60,14 @@
Patch57: s390-pedantic-compile.diff
Patch58: prefer-linked-opengl.diff
Patch60: 0180-window-role.diff
+Patch61: qt4-fake-bold.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 910
- %define common_options -fast -no-separate-debug-info -shared -xkb -tablet
-xrender -xrandr -xinerama -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/%{base_name} -examplesdir
%_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir
-translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings
-datadir /usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions
-system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns
-system-sqlite
+ %define common_options -fast -no-separate-debug-info -shared -xkb -tablet
-xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -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/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir
%_libdir/qt4/demos -plugindir %plugindir -translationdir
/usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir
/usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions -system-libtiff
-no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite
%else
%define common_options -fast -no-separate-debug-info -shared -xkb -no-tablet
-no-xrender -no-xrandr -no-xinerama -no-xshape -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/%{base_name}
-examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir
%plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir
/etc/settings -datadir /usr/share/qt4/ -no-pch -no-exceptions -system-libtiff
-no-sm -no-opengl -no-xcursor -no-webkit -no-xmlpatterns
%endif
+%define check_config grep '# define' src/corelib/global/qconfig.h | egrep -v
'QT_(ARCH|USE)'

%description
The package contains documentation and examples to develop Qt
@@ -98,6 +101,7 @@
%patch57
%patch58
%patch60
+%patch61
#%patch56
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
@@ -119,6 +123,7 @@
%endif
export MAKEFLAGS="%{?jobs:-j %jobs}"
echo yes | ./configure %common_options $OPTIONS -plugin-sql-sqlite -nomake
demos
+%check_config
pushd src
make %{?jobs:-j%jobs} sub-moc sub-rcc sub-uic
popd
@@ -156,6 +161,9 @@
/usr/share/doc/packages/%base_name/src

%changelog
+* Wed Apr 02 2008 dmueller@xxxxxxx
+- fix crashes on starting qt4 apps (bnc#360405, bnc#372726)
+- add patch for artifical font styles (bnc#374073)
* Fri Mar 28 2008 dmueller@xxxxxxx
- update to 20080325:
* lots of optional-features compile fixes
@@ -177,7 +185,7 @@
* Sat Mar 01 2008 dmueller@xxxxxxx
- update to 20080301
* fix deleteLater() regression
-* Tue Feb 26 2008 dmueller@xxxxxxx
+* Wed Feb 27 2008 dmueller@xxxxxxx
- update to 20080226
* fixes in packaging
* QFile bugfixes among many others
@@ -204,9 +212,9 @@
- update to 4.4 snapshot 20080202:
* also licensed under the GPLv3, in addition to GPLv2
* bugfixes
-* Thu Jan 31 2008 dmueller@xxxxxxx
+* Fri Feb 01 2008 dmueller@xxxxxxx
- fix ppc miscompile due to wrong asm constraints (bnc #356200)
-* Wed Jan 30 2008 schwab@xxxxxxx
+* Thu Jan 31 2008 schwab@xxxxxxx
- Fix asm constraints.
* Wed Jan 30 2008 dmueller@xxxxxxx
- workaround ppc issue to unblock installation (bnc#356200)
@@ -276,7 +284,7 @@
* Fri Jun 01 2007 dmueller@xxxxxxx
- update to final 4.3.0 release:
* for changelog, see included changes-4.3.0
-* Mon May 28 2007 dmueller@xxxxxxx
+* Tue May 29 2007 dmueller@xxxxxxx
- update to 4.3.0-20070528
* Wed May 23 2007 stbinner@xxxxxxx
- add %%post/postun dbus-1 ldconfig call
@@ -345,7 +353,7 @@
- disable dbus-1 subpackage for older distributions
* Mon Nov 20 2006 schwab@xxxxxxx
- Provide/obsolete qt-sql only once.
-* Thu Nov 16 2006 dmueller@xxxxxxx
+* Fri Nov 17 2006 dmueller@xxxxxxx
- split devel-doc-data from devel-doc
* Tue Nov 14 2006 dmueller@xxxxxxx
- move dbus-viewer from demos to /usr/bin
@@ -825,7 +833,7 @@
- install arthurplugin into plugin designer path (#151529)
- add patch to make parallel builds work
- enable parallel builds
-* Wed Feb 15 2006 dmueller@xxxxxxx
+* Thu Feb 16 2006 dmueller@xxxxxxx
- Fix qt-devel requires
- Add patch to make it usable for KDE 4
* Sun Feb 12 2006 stbinner@xxxxxxx

++++++ libqt4.spec ++++++
--- /var/tmp/diff_new_pack.RF6305/_old 2008-04-02 20:45:28.000000000 +0200
+++ /var/tmp/diff_new_pack.RF6305/_new 2008-04-02 20:45:28.000000000 +0200
@@ -69,12 +69,14 @@
Patch57: s390-pedantic-compile.diff
Patch58: prefer-linked-opengl.diff
Patch60: 0180-window-role.diff
+Patch61: qt4-fake-bold.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 910
- %define common_options -fast -no-separate-debug-info -shared -xkb -tablet
-xrender -xrandr -xinerama -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/%{base_name} -examplesdir
%_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir
-translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings
-datadir /usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions
-system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns
-system-sqlite
+ %define common_options -fast -no-separate-debug-info -shared -xkb -tablet
-xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -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/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir
%_libdir/qt4/demos -plugindir %plugindir -translationdir
/usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir
/usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions -system-libtiff
-no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite
%else
%define common_options -fast -no-separate-debug-info -shared -xkb -no-tablet
-no-xrender -no-xrandr -no-xinerama -no-xshape -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/%{base_name}
-examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir
%plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir
/etc/settings -datadir /usr/share/qt4/ -no-pch -no-exceptions -system-libtiff
-no-sm -no-opengl -no-xcursor -no-webkit -no-xmlpatterns
%endif
+%define check_config grep '# define' src/corelib/global/qconfig.h | egrep -v
'QT_(ARCH|USE)'

%description
Qt is a set of libraries for developing applications.
@@ -109,6 +111,7 @@
%patch57
%patch58
%patch60
+%patch61
#%patch56
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
@@ -131,8 +134,8 @@
Requires: %name = %version
Provides: dbus-1-qt-devel < 0.63
Obsoletes: dbus-1-qt-devel < 0.63
-Obsoletes: qt-devel
-Provides: qt-devel
+Obsoletes: qt-devel < 4.4.0
+Provides: qt-devel < 4.4.0
Provides: dbus-1-qt < 0.63
Provides: qt-dbus-1 < 4.2.0
Obsoletes: dbus-1-qt < 0.63
@@ -232,6 +235,7 @@
export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
export MAKEFLAGS="%{?jobs:-j %jobs}"
echo yes | ./configure %common_options -plugin-sql-sqlite -nomake examples
-nomake demos
+%check_config
make %{?jobs:-j %jobs}

%install
@@ -401,6 +405,9 @@
%plugindir/sqldrivers/libqsqlite*.so

%changelog
+* Wed Apr 02 2008 dmueller@xxxxxxx
+- fix crashes on starting qt4 apps (bnc#360405, bnc#372726)
+- add patch for artifical font styles (bnc#374073)
* Fri Mar 28 2008 dmueller@xxxxxxx
- update to 20080325:
* lots of optional-features compile fixes
@@ -422,7 +429,7 @@
* Sat Mar 01 2008 dmueller@xxxxxxx
- update to 20080301
* fix deleteLater() regression
-* Tue Feb 26 2008 dmueller@xxxxxxx
+* Wed Feb 27 2008 dmueller@xxxxxxx
- update to 20080226
* fixes in packaging
* QFile bugfixes among many others
@@ -449,9 +456,9 @@
- update to 4.4 snapshot 20080202:
* also licensed under the GPLv3, in addition to GPLv2
* bugfixes
-* Thu Jan 31 2008 dmueller@xxxxxxx
+* Fri Feb 01 2008 dmueller@xxxxxxx
- fix ppc miscompile due to wrong asm constraints (bnc #356200)
-* Wed Jan 30 2008 schwab@xxxxxxx
+* Thu Jan 31 2008 schwab@xxxxxxx
- Fix asm constraints.
* Wed Jan 30 2008 dmueller@xxxxxxx
- workaround ppc issue to unblock installation (bnc#356200)
@@ -521,7 +528,7 @@
* Fri Jun 01 2007 dmueller@xxxxxxx
- update to final 4.3.0 release:
* for changelog, see included changes-4.3.0
-* Mon May 28 2007 dmueller@xxxxxxx
+* Tue May 29 2007 dmueller@xxxxxxx
- update to 4.3.0-20070528
* Wed May 23 2007 stbinner@xxxxxxx
- add %%post/postun dbus-1 ldconfig call
@@ -590,7 +597,7 @@
- disable dbus-1 subpackage for older distributions
* Mon Nov 20 2006 schwab@xxxxxxx
- Provide/obsolete qt-sql only once.
-* Thu Nov 16 2006 dmueller@xxxxxxx
+* Fri Nov 17 2006 dmueller@xxxxxxx
- split devel-doc-data from devel-doc
* Tue Nov 14 2006 dmueller@xxxxxxx
- move dbus-viewer from demos to /usr/bin
@@ -1070,7 +1077,7 @@
- install arthurplugin into plugin designer path (#151529)
- add patch to make parallel builds work
- enable parallel builds
-* Wed Feb 15 2006 dmueller@xxxxxxx
+* Thu Feb 16 2006 dmueller@xxxxxxx
- Fix qt-devel requires
- Add patch to make it usable for KDE 4
* Sun Feb 12 2006 stbinner@xxxxxxx

++++++ libqt4-sql-plugins.spec ++++++
--- /var/tmp/diff_new_pack.RF6305/_old 2008-04-02 20:45:28.000000000 +0200
+++ /var/tmp/diff_new_pack.RF6305/_new 2008-04-02 20:45:28.000000000 +0200
@@ -65,12 +65,14 @@
Patch57: s390-pedantic-compile.diff
Patch58: prefer-linked-opengl.diff
Patch60: 0180-window-role.diff
+Patch61: qt4-fake-bold.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 910
- %define common_options -fast -no-separate-debug-info -shared -xkb -tablet
-xrender -xrandr -xinerama -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/%{base_name} -examplesdir
%_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir
-translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings
-datadir /usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions
-system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns
-system-sqlite
+ %define common_options -fast -no-separate-debug-info -shared -xkb -tablet
-xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -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/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir
%_libdir/qt4/demos -plugindir %plugindir -translationdir
/usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir
/usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions -system-libtiff
-no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite
%else
%define common_options -fast -no-separate-debug-info -shared -xkb -no-tablet
-no-xrender -no-xrandr -no-xinerama -no-xshape -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/%{base_name}
-examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir
%plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir
/etc/settings -datadir /usr/share/qt4/ -no-pch -no-exceptions -system-libtiff
-no-sm -no-opengl -no-xcursor -no-webkit -no-xmlpatterns
%endif
+%define check_config grep '# define' src/corelib/global/qconfig.h | egrep -v
'QT_(ARCH|USE)'

%description
Qt 4 libraries that are used for connection with an SQL server. You
@@ -103,6 +105,7 @@
%patch57
%patch58
%patch60
+%patch61
#%patch56
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
@@ -174,6 +177,7 @@
-plugin-sql-psql -I/usr/include -I/usr/include/pgsql/
-I/usr/include/pgsql/server \
-plugin-sql-odbc \
-plugin-sql-mysql -I/usr/include/mysql/ -no-sql-sqlite -no-sql-sqlite2
+%check_config
make %{?jobs:-j%jobs} sub-src

%install
@@ -221,6 +225,9 @@
%plugindir/sqldrivers/libqsqlmysql*.so

%changelog
+* Wed Apr 02 2008 dmueller@xxxxxxx
+- fix crashes on starting qt4 apps (bnc#360405, bnc#372726)
+- add patch for artifical font styles (bnc#374073)
* Fri Mar 28 2008 dmueller@xxxxxxx
- update to 20080325:
* lots of optional-features compile fixes
@@ -242,7 +249,7 @@
* Sat Mar 01 2008 dmueller@xxxxxxx
- update to 20080301
* fix deleteLater() regression
-* Tue Feb 26 2008 dmueller@xxxxxxx
+* Wed Feb 27 2008 dmueller@xxxxxxx
- update to 20080226
* fixes in packaging
* QFile bugfixes among many others
@@ -269,9 +276,9 @@
- update to 4.4 snapshot 20080202:
* also licensed under the GPLv3, in addition to GPLv2
* bugfixes
-* Thu Jan 31 2008 dmueller@xxxxxxx
+* Fri Feb 01 2008 dmueller@xxxxxxx
- fix ppc miscompile due to wrong asm constraints (bnc #356200)
-* Wed Jan 30 2008 schwab@xxxxxxx
+* Thu Jan 31 2008 schwab@xxxxxxx
- Fix asm constraints.
* Wed Jan 30 2008 dmueller@xxxxxxx
- workaround ppc issue to unblock installation (bnc#356200)
@@ -341,7 +348,7 @@
* Fri Jun 01 2007 dmueller@xxxxxxx
- update to final 4.3.0 release:
* for changelog, see included changes-4.3.0
-* Mon May 28 2007 dmueller@xxxxxxx
+* Tue May 29 2007 dmueller@xxxxxxx
- update to 4.3.0-20070528
* Wed May 23 2007 stbinner@xxxxxxx
- add %%post/postun dbus-1 ldconfig call
@@ -410,7 +417,7 @@
- disable dbus-1 subpackage for older distributions
* Mon Nov 20 2006 schwab@xxxxxxx
- Provide/obsolete qt-sql only once.
-* Thu Nov 16 2006 dmueller@xxxxxxx
+* Fri Nov 17 2006 dmueller@xxxxxxx
- split devel-doc-data from devel-doc
* Tue Nov 14 2006 dmueller@xxxxxxx
- move dbus-viewer from demos to /usr/bin
@@ -890,7 +897,7 @@
- install arthurplugin into plugin designer path (#151529)
- add patch to make parallel builds work
- enable parallel builds
-* Wed Feb 15 2006 dmueller@xxxxxxx
+* Thu Feb 16 2006 dmueller@xxxxxxx
- Fix qt-devel requires
- Add patch to make it usable for KDE 4
* Sun Feb 12 2006 stbinner@xxxxxxx

++++++ libQtWebKit-devel.spec ++++++
--- /var/tmp/diff_new_pack.RF6305/_old 2008-04-02 20:45:28.000000000 +0200
+++ /var/tmp/diff_new_pack.RF6305/_new 2008-04-02 20:45:28.000000000 +0200
@@ -63,12 +63,14 @@
Patch57: s390-pedantic-compile.diff
Patch58: prefer-linked-opengl.diff
Patch60: 0180-window-role.diff
+Patch61: qt4-fake-bold.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 910
- %define common_options -fast -no-separate-debug-info -shared -xkb -tablet
-xrender -xrandr -xinerama -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/%{base_name} -examplesdir
%_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir
-translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings
-datadir /usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions
-system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns
-system-sqlite
+ %define common_options -fast -no-separate-debug-info -shared -xkb -tablet
-xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -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/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir
%_libdir/qt4/demos -plugindir %plugindir -translationdir
/usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir
/usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions -system-libtiff
-no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite
%else
%define common_options -fast -no-separate-debug-info -shared -xkb -no-tablet
-no-xrender -no-xrandr -no-xinerama -no-xshape -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/%{base_name}
-examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir
%plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir
/etc/settings -datadir /usr/share/qt4/ -no-pch -no-exceptions -system-libtiff
-no-sm -no-opengl -no-xcursor -no-webkit -no-xmlpatterns
%endif
+%define check_config grep '# define' src/corelib/global/qconfig.h | egrep -v
'QT_(ARCH|USE)'

%description
Qt is a set of libraries for developing applications.
@@ -103,6 +105,7 @@
%patch57
%patch58
%patch60
+%patch61
#%patch56
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
@@ -173,6 +176,7 @@
sed -i -e "s,^CXXFLAGS[ \t]*=,& $RPM_OPT_FLAGS," qmake/Makefile.unix
export MAKEFLAGS="%{?jobs:-j %jobs}"
echo yes | ./configure %common_options -webkit -exceptions -xmlpatterns
-no-sql-sqlite -no-sql-sqlite2 -no-sql-mysql
+%check_config
make %{?jobs:-j%jobs} sub-src
make %{?jobs:-j%jobs} -C tools/assistant
make %{?jobs:-j%jobs} -C src/3rdparty/webkit/WebCore
@@ -268,6 +272,9 @@
/usr/bin/svgviewer

%changelog
+* Wed Apr 02 2008 dmueller@xxxxxxx
+- fix crashes on starting qt4 apps (bnc#360405, bnc#372726)
+- add patch for artifical font styles (bnc#374073)
* Fri Mar 28 2008 dmueller@xxxxxxx
- update to 20080325:
* lots of optional-features compile fixes
@@ -289,7 +296,7 @@
* Sat Mar 01 2008 dmueller@xxxxxxx
- update to 20080301
* fix deleteLater() regression
-* Tue Feb 26 2008 dmueller@xxxxxxx
+* Wed Feb 27 2008 dmueller@xxxxxxx
- update to 20080226
* fixes in packaging
* QFile bugfixes among many others
@@ -316,9 +323,9 @@
- update to 4.4 snapshot 20080202:
* also licensed under the GPLv3, in addition to GPLv2
* bugfixes
-* Thu Jan 31 2008 dmueller@xxxxxxx
+* Fri Feb 01 2008 dmueller@xxxxxxx
- fix ppc miscompile due to wrong asm constraints (bnc #356200)
-* Wed Jan 30 2008 schwab@xxxxxxx
+* Thu Jan 31 2008 schwab@xxxxxxx
- Fix asm constraints.
* Wed Jan 30 2008 dmueller@xxxxxxx
- workaround ppc issue to unblock installation (bnc#356200)
@@ -388,7 +395,7 @@
* Fri Jun 01 2007 dmueller@xxxxxxx
- update to final 4.3.0 release:
* for changelog, see included changes-4.3.0
-* Mon May 28 2007 dmueller@xxxxxxx
+* Tue May 29 2007 dmueller@xxxxxxx
- update to 4.3.0-20070528
* Wed May 23 2007 stbinner@xxxxxxx
- add %%post/postun dbus-1 ldconfig call
@@ -457,7 +464,7 @@
- disable dbus-1 subpackage for older distributions
* Mon Nov 20 2006 schwab@xxxxxxx
- Provide/obsolete qt-sql only once.
-* Thu Nov 16 2006 dmueller@xxxxxxx
+* Fri Nov 17 2006 dmueller@xxxxxxx
- split devel-doc-data from devel-doc
* Tue Nov 14 2006 dmueller@xxxxxxx
- move dbus-viewer from demos to /usr/bin
@@ -937,7 +944,7 @@
- install arthurplugin into plugin designer path (#151529)
- add patch to make parallel builds work
- enable parallel builds
-* Wed Feb 15 2006 dmueller@xxxxxxx
+* Thu Feb 16 2006 dmueller@xxxxxxx
- Fix qt-devel requires
- Add patch to make it usable for KDE 4
* Sun Feb 12 2006 stbinner@xxxxxxx





++++++ libqt4-devel-doc-data.spec.in ++++++
--- libqt4/libqt4-devel-doc-data.spec.in 2008-03-28 12:59:16.000000000
+0100
+++ libqt4/libqt4-devel-doc-data.spec.in 2008-04-02 15:08:30.000000000
+0200
@@ -23,6 +23,7 @@
Autoreqprov: on
Summary: Qt documentation (architecture independent files)
BuildArch: noarch
+%requires_eq libqt4
# COMMON-BEGIN
# COMMON-END

@@ -41,6 +42,7 @@
%endif
export MAKEFLAGS="%{?jobs:-j %jobs}"
echo yes | ./configure %common_options $OPTIONS -plugin-sql-sqlite -nomake
demos
+%check_config
pushd src
make %{?jobs:-j%jobs} sub-moc sub-rcc sub-uic
popd

++++++ libqt4-sql-plugins.spec.in ++++++
--- libqt4/libqt4-sql-plugins.spec.in 2008-02-19 01:37:18.000000000 +0100
+++ libqt4/libqt4-sql-plugins.spec.in 2008-04-02 15:08:43.000000000 +0200
@@ -94,6 +94,7 @@
-plugin-sql-psql -I/usr/include -I/usr/include/pgsql/
-I/usr/include/pgsql/server \
-plugin-sql-odbc \
-plugin-sql-mysql -I/usr/include/mysql/ -no-sql-sqlite -no-sql-sqlite2
+%check_config
make %{?jobs:-j%jobs} sub-src

%install

++++++ libQtWebKit-devel.spec.in ++++++
--- libqt4/libQtWebKit-devel.spec.in 2008-03-28 13:07:14.000000000 +0100
+++ libqt4/libQtWebKit-devel.spec.in 2008-04-02 15:08:10.000000000 +0200
@@ -93,6 +93,7 @@
sed -i -e "s,^CXXFLAGS[ \t]*=,& $RPM_OPT_FLAGS," qmake/Makefile.unix
export MAKEFLAGS="%{?jobs:-j %jobs}"
echo yes | ./configure %common_options -webkit -exceptions -xmlpatterns
-no-sql-sqlite -no-sql-sqlite2 -no-sql-mysql
+%check_config
make %{?jobs:-j%jobs} sub-src
make %{?jobs:-j%jobs} -C tools/assistant
make %{?jobs:-j%jobs} -C src/3rdparty/webkit/WebCore





++++++ qt4-fake-bold.patch ++++++
--- src/gui/text/qfontdatabase_x11.cpp
+++ src/gui/text/qfontdatabase_x11.cpp
@@ -783,6 +783,11 @@
? QFont::StyleOblique
: QFont::StyleNormal);

+ FcBool embolden;
+ if (FcPatternGetBool(pattern, FC_EMBOLDEN, 0, &embolden) != FcResultMatch)
+ embolden = false;
+ if(embolden)
+ fontDef.weight=QFont::Bold;

FcBool scalable;
if (FcPatternGetBool(pattern, FC_SCALABLE, 0, &scalable) != FcResultMatch)
@@ -1329,10 +1334,25 @@
if (! enc) continue; // should not happen either

QtFontStyle::Key key = style->key;
-
+ // does this style have a bold equivalent?
+ key.weight = QFont::Bold;
+ QtFontStyle *equiv = foundry->style(key);
+ if (!equiv) {
+ // let's fake one...
+ equiv = foundry->style(key, true);
+ equiv->smoothScalable = true;
+
+ QtFontSize *equiv_size = equiv->pixelSize(SMOOTH_SCALABLE,
true);
+ QtFontEncoding *equiv_enc = equiv_size->encodingID(-1, 0,
0, 0, 0, true);
+
+ // keep the same pitch
+ equiv_enc->pitch = enc->pitch;
+ key.weight = QFont::Normal;
+ }
// does this style have an italic equivalent?
key.style = QFont::StyleItalic;
- QtFontStyle *equiv = foundry->style(key);
+// QtFontStyle *equiv = foundry->style(key);
+ equiv = foundry->style( key );
if (equiv) continue;

// does this style have an oblique equivalent?
@@ -1449,7 +1469,8 @@
else if (request.weight < (QFont::Bold + QFont::Black) / 2)
weight_value = FC_WEIGHT_BOLD;
FcPatternAddInteger(pattern, FC_WEIGHT, weight_value);
-
+ if(request.weight == QFont::Bold)
+ FcPatternAddBool(pattern, FC_EMBOLDEN, true);
int slant_value = FC_SLANT_ROMAN;
if (request.style == QFont::StyleItalic)
slant_value = FC_SLANT_ITALIC;
--- src/gui/text/qfontengine_ft.cpp
+++ src/gui/text/qfontengine_ft.cpp
@@ -65,7 +65,10 @@
#include FT_TRUETYPE_TABLES_H
#include FT_TYPE1_TABLES_H
#include FT_GLYPH_H
-
+#ifdef FT_SYNTHESIS_H
+#define HAVE_FT_GLYPHSLOT_EMBOLDEN 1
+#include FT_SYNTHESIS_H
+#endif
QT_BEGIN_NAMESPACE

/*
@@ -516,6 +519,7 @@
kerning_pairs_loaded = false;
transform = false;
antialias = true;
+ embolden = false;
default_load_flags = FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH;
subpixelType = Subpixel_None;
defaultGlyphFormat = Format_None;
@@ -536,10 +540,11 @@
freeServerGlyphSet(transformedGlyphSets.at(i).id);
}

-bool QFontEngineFT::init(FaceId faceId, bool antialias, GlyphFormat
defaultFormat)
+bool QFontEngineFT::init(FaceId faceId, bool antialias, GlyphFormat
defaultFormat, bool embolden)
{
defaultGlyphFormat = defaultFormat;
this->antialias = antialias;
+ this->embolden = embolden;
face_id = faceId;
freetype = QFreetypeFace::getFace(face_id);
if (!freetype) {
@@ -680,7 +685,52 @@
return 0;

FT_GlyphSlot slot = face->glyph;
-
+ if(embolden && (face->style_flags & FT_STYLE_FLAG_BOLD) == 0)
+ {
+ //if not antialias and no bitmap, for example, dongwensong
English characters.
+ //for DongWenSong Chinese character, if it not antialias, it
will use bitmap output.
+ if(!antialias && slot->format == FT_GLYPH_FORMAT_OUTLINE)
+ {
+ int left = slot->metrics.horiBearingX;
+ int right = slot->metrics.horiBearingX +
slot->metrics.width;
+ int top = slot->metrics.horiBearingY;
+ int bottom = slot->metrics.horiBearingY -
slot->metrics.height;
+ int hpixels = TRUNC(right - left)+4;
+ if (hsubpixel)
+ hpixels = hpixels*3 + 8;
+ int width = hpixels;
+ int height = TRUNC(top - bottom);
+ if (hsubpixel) {
+ width /= 3;
+ }
+ int pitch = (format == Format_Mono ? ((width + 31) &
~31) >> 3 :
+ (format == Format_A8 ? (width + 3) & ~3
: width * 4));
+ int size = pitch * height;
+ uchar *glyph_buffer = new uchar[size];
+
+ slot->bitmap.rows = height*vfactor;
+ slot->bitmap.width = hpixels;
+ slot->bitmap.pitch = format == Format_Mono ? (((width +
31) & ~31) >> 3) : ((slot->bitmap.width + 3) & ~3);
+ slot->bitmap.buffer = new
uchar[slot->bitmap.rows*slot->bitmap.pitch];
+ if (!hsubpixel && vfactor == 1)
+ slot->bitmap.buffer = glyph_buffer;
+ else
+ slot->bitmap.buffer = new
uchar[slot->bitmap.rows*slot->bitmap.pitch];
+ memset(slot->bitmap.buffer, 0,
slot->bitmap.rows*slot->bitmap.pitch);
+ slot->bitmap.pixel_mode = ft_pixel_mode_mono;
+ FT_Matrix matrix;
+ matrix.xx = (hsubpixel ? 3 : 1) << 16;
+ matrix.yy = vfactor << 16;
+ matrix.yx = matrix.xy = 0;
+ FT_Outline_Transform(&slot->outline, &matrix);
+ FT_Outline_Translate (&slot->outline, (hsubpixel ?
-3*left +(4<<6) : -left), -bottom*vfactor);
+ FT_Outline_Get_Bitmap(qt_getFreetype(), &slot->outline,
&slot->bitmap);
+ slot->format = FT_GLYPH_FORMAT_BITMAP;
+ FT_GlyphSlot_Embolden(slot);
+ }
+ else
+ FT_GlyphSlot_Embolden(slot);
+ }
int left = slot->metrics.horiBearingX;
int right = slot->metrics.horiBearingX + slot->metrics.width;
int top = slot->metrics.horiBearingY;
@@ -725,6 +775,8 @@
top = CEIL(top);

int hpixels = TRUNC(right - left);
+ if(!antialias && embolden && (face->style_flags & FT_STYLE_FLAG_BOLD) == 0
&& transform)
+ hpixels += 4;
if (hsubpixel)
hpixels = hpixels*3 + 8;
info.width = hpixels;
@@ -1301,6 +1353,9 @@
FT_GlyphSlot g = face->glyph;
if (g->format != FT_GLYPH_FORMAT_OUTLINE)
continue;
+ if (embolden && (face->style_flags & FT_STYLE_FLAG_BOLD) == 0) {
+ FT_GlyphSlot_Embolden (g);
+ }
QFreetypeFace::addGlyphToPath(face, g, positions[gl], path, xsize,
ysize);
}
unlockFace();
--- src/gui/text/qfontengine_ft_p.h
+++ src/gui/text/qfontengine_ft_p.h
@@ -257,7 +257,7 @@
QFontEngineFT(const QFontDef &fd);
virtual ~QFontEngineFT();

- bool init(FaceId faceId, bool antiaalias, GlyphFormat defaultFormat =
Format_None);
+ bool init(FaceId faceId, bool antiaalias, GlyphFormat defaultFormat =
Format_None, bool embolden=false);

virtual HB_Error getPointInOutline(HB_Glyph glyph, int flags, hb_uint32
point, HB_Fixed *xpos, HB_Fixed *ypos, hb_uint32 *nPoints);

@@ -273,6 +273,7 @@
int default_load_flags;

bool antialias;
+ bool embolden;
bool outline_drawing;
bool transform;
SubpixelAntialiasingType subpixelType;
--- src/gui/text/qfontengine_x11.cpp
+++ src/gui/text/qfontengine_x11.cpp
@@ -878,7 +878,7 @@



-Q_GUI_EXPORT void qt_x11ft_convert_pattern(FcPattern *pattern, QByteArray
*file_name, int *index, bool *antialias)
+Q_GUI_EXPORT void qt_x11ft_convert_pattern(FcPattern *pattern, QByteArray
*file_name, int *index, bool *antialias, bool *embolden)
{
FcChar8 *fileName;
FcPatternGetString(pattern, FC_FILE, 0, &fileName);
@@ -888,6 +888,8 @@
FcBool b;
if (FcPatternGetBool(pattern, FC_ANTIALIAS, 0, &b) == FcResultMatch)
*antialias = b;
+ if (FcPatternGetBool (pattern,FC_EMBOLDEN, 0, &b) == FcResultMatch)
+ *embolden = b;
}


@@ -897,9 +899,10 @@
// FcPatternPrint(pattern);

bool antialias = X11->fc_antialias;
+ bool embolden = false;
QByteArray file_name;
int face_index;
- qt_x11ft_convert_pattern(pattern, &file_name, &face_index, &antialias);
+ qt_x11ft_convert_pattern(pattern, &file_name, &face_index, &antialias,
&embolden);
QFontEngine::FaceId face_id;
face_id.filename = file_name;
face_id.index = face_index;
@@ -972,8 +975,8 @@
defaultFormat = Format_Mono;
}
#endif
-
- if (!init(face_id, antialias, defaultFormat)) {
+//cjacker
+ if (!init(face_id, antialias, defaultFormat, embolden)) {
FcPatternDestroy(pattern);
return;
}

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



Remember to have fun...

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

< Previous Next >