Hello community,
here is the log from the commit of package libqt4
checked in at Thu Feb 28 02:00:12 CET 2008.
--------
--- libqt4/libqt4.changes 2008-02-21 21:08:23.000000000 +0100
+++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2008-02-27 15:52:19.000000000 +0100
@@ -1,0 +2,9 @@
+Tue Feb 26 22:54:03 CET 2008 - dmueller@suse.de
+
+- update to 20080226
+ * fixes in packaging
+ * QFile bugfixes among many others
+- add patch to ignore bogus global advance width (#359984)
+- fixes SVG rendering regression (#364936)
+
+-------------------------------------------------------------------
libqt4-devel-doc-data.changes: same change
libqt4-sql-plugins.changes: same change
libQtWebKit-devel.changes: same change
Old:
----
0172-prefer-xrandr-over-xinerama.diff
no-documentation-test.diff
qt-x11-opensource-src-4.4.0-snapshot-20080221.tar.bz2
New:
----
ignore-global-advance-width-in-fots.diff
qatomic-no-barrier.diff
qt-x11-opensource-src-4.4.0-snapshot-20080226.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt4-devel-doc-data.spec ++++++
--- /var/tmp/diff_new_pack.W13772/_old 2008-02-28 01:59:52.000000000 +0100
+++ /var/tmp/diff_new_pack.W13772/_new 2008-02-28 01:59:52.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package libqt4-devel-doc-data (Version 4.3.92)
+# spec file for package libqt4-devel-doc-data (Version 4.3.93)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -26,11 +26,11 @@
BuildArch: noarch
# COMMON-BEGIN
# COMMON-BEGIN
-Version: 4.3.92
-Release: 2
+Version: 4.3.93
+Release: 1
%define base_name libqt4
%define x11_free -x11-opensource-src-
-%define rversion 4.4.0-snapshot-20080221
+%define rversion 4.4.0-snapshot-20080226
Source: qt%x11_free%rversion.tar.bz2
Source10: qt4config.desktop
Source11: designer4.desktop
@@ -49,11 +49,11 @@
Patch39: 0191-listview-alternate-row-colors.diff
Patch40: 0188-fix-moc-parser-same-name-header.diff
Patch43: 0195-compositing-properties.diff
-Patch46: 0172-prefer-xrandr-over-xinerama.diff
Patch48: 0203-qtexthtmlparser-link-color.diff
Patch49: javascriptcore-bufferoverflow.diff
-Patch52: no-documentation-test.diff
Patch53: allow-shlib-undefined.diff
+Patch54: qatomic-no-barrier.diff
+Patch55: ignore-global-advance-width-in-fots.diff
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 %_docdir/%{base_name}/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
@@ -85,13 +85,11 @@
%patch39
%patch40
%patch43
-%patch46
%patch48
%patch49
-%if "%name" == "libqt4"
-%patch52
-%endif
%patch53
+%patch54
+%patch55
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
# COMMON-END
@@ -111,20 +109,23 @@
OPTIONS=""
%endif
export MAKEFLAGS="%{?jobs:-j %jobs}"
-echo yes | ./configure %common_options $OPTIONS -exceptions -xmlpatterns -webkit -plugin-sql-sqlite -nomake demos
+echo yes | ./configure %common_options $OPTIONS -plugin-sql-sqlite -nomake demos
pushd src
make %{?jobs:-j%jobs} sub-moc sub-rcc sub-uic
popd
pushd tools
make %{?jobs:-j%jobs} sub-assistant
popd
-make %{?jobs:-j%jobs} docs
+pushd tools/qdoc3
+make %{?jobs:-j%jobs}
+popd
+test -d doc/qch || make %{?jobs:-j%jobs} docs
./config.status
%install
export QTDIR=$PWD
# htmldocs are not generated - why?
-for d in docimages qchdocs; do
+for d in docimages qchdocs htmldocs ; do
make INSTALL_ROOT=$RPM_BUILD_ROOT install_${d}
done
#mkdir -p $RPM_BUILD_ROOT/%_docdir/%base_name/html
@@ -144,10 +145,17 @@
%defattr(-,root,root,755)
%dir /usr/share/doc/packages/%base_name
/usr/share/doc/packages/%base_name/qch
+/usr/share/doc/packages/%base_name/html*
/usr/share/doc/packages/%base_name/src
/usr/share/doc/packages/%base_name/examples
%changelog
+* Tue Feb 26 2008 dmueller@suse.de
+- update to 20080226
+ * fixes in packaging
+ * QFile bugfixes among many others
+- add patch to ignore bogus global advance width (#359984)
+- fixes SVG rendering regression (#364936)
* Thu Feb 21 2008 dmueller@suse.de
- update to 20080221 snapshot:
* restore compatibility with Qt 4.3
++++++ libqt4.spec ++++++
--- /var/tmp/diff_new_pack.W13772/_old 2008-02-28 01:59:52.000000000 +0100
+++ /var/tmp/diff_new_pack.W13772/_new 2008-02-28 01:59:52.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package libqt4 (Version 4.3.92)
+# spec file for package libqt4 (Version 4.3.93)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -33,12 +33,14 @@
Summary: C++ Program Library, Core Components
Obsoletes: qt
Provides: qt
+Provides: libqt4-dbus-1 <= 4.4.0
+Obsoletes: libqt4-dbus-1 < 4.4.0
# COMMON-BEGIN
-Version: 4.3.92
-Release: 3
+Version: 4.3.93
+Release: 1
%define base_name libqt4
%define x11_free -x11-opensource-src-
-%define rversion 4.4.0-snapshot-20080221
+%define rversion 4.4.0-snapshot-20080226
Source: qt%x11_free%rversion.tar.bz2
Source10: qt4config.desktop
Source11: designer4.desktop
@@ -57,11 +59,11 @@
Patch39: 0191-listview-alternate-row-colors.diff
Patch40: 0188-fix-moc-parser-same-name-header.diff
Patch43: 0195-compositing-properties.diff
-Patch46: 0172-prefer-xrandr-over-xinerama.diff
Patch48: 0203-qtexthtmlparser-link-color.diff
Patch49: javascriptcore-bufferoverflow.diff
-Patch52: no-documentation-test.diff
Patch53: allow-shlib-undefined.diff
+Patch54: qatomic-no-barrier.diff
+Patch55: ignore-global-advance-width-in-fots.diff
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 %_docdir/%{base_name}/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
@@ -94,13 +96,11 @@
%patch39
%patch40
%patch43
-%patch46
%patch48
%patch49
-%if "%name" == "libqt4"
-%patch52
-%endif
%patch53
+%patch54
+%patch55
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
# COMMON-END
@@ -127,8 +127,6 @@
Provides: qt-dbus-1 < 4.2.0
Obsoletes: dbus-1-qt < 0.63
Obsoletes: qt-dbus-1 < 4.2.0
-Provides: libqt4-dbus-1 <= 4.4.0
-Obsoletes: libqt4-dbus-1 < 4.4.0
%description devel
You need this package, if you want to compile programs with Qt. It
@@ -389,6 +387,12 @@
%plugindir/sqldrivers/libqsqlite*.so
%changelog
+* Tue Feb 26 2008 dmueller@suse.de
+- update to 20080226
+ * fixes in packaging
+ * QFile bugfixes among many others
+- add patch to ignore bogus global advance width (#359984)
+- fixes SVG rendering regression (#364936)
* Thu Feb 21 2008 dmueller@suse.de
- update to 20080221 snapshot:
* restore compatibility with Qt 4.3
++++++ libqt4-sql-plugins.spec ++++++
--- /var/tmp/diff_new_pack.W13772/_old 2008-02-28 01:59:52.000000000 +0100
+++ /var/tmp/diff_new_pack.W13772/_new 2008-02-28 01:59:52.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package libqt4-sql-plugins (Version 4.3.92)
+# spec file for package libqt4-sql-plugins (Version 4.3.93)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -32,11 +32,11 @@
Summary: Qt 4 SQL-Related Libraries
# COMMON-BEGIN
# COMMON-BEGIN
-Version: 4.3.92
-Release: 2
+Version: 4.3.93
+Release: 1
%define base_name libqt4
%define x11_free -x11-opensource-src-
-%define rversion 4.4.0-snapshot-20080221
+%define rversion 4.4.0-snapshot-20080226
Source: qt%x11_free%rversion.tar.bz2
Source10: qt4config.desktop
Source11: designer4.desktop
@@ -55,11 +55,11 @@
Patch39: 0191-listview-alternate-row-colors.diff
Patch40: 0188-fix-moc-parser-same-name-header.diff
Patch43: 0195-compositing-properties.diff
-Patch46: 0172-prefer-xrandr-over-xinerama.diff
Patch48: 0203-qtexthtmlparser-link-color.diff
Patch49: javascriptcore-bufferoverflow.diff
-Patch52: no-documentation-test.diff
Patch53: allow-shlib-undefined.diff
+Patch54: qatomic-no-barrier.diff
+Patch55: ignore-global-advance-width-in-fots.diff
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 %_docdir/%{base_name}/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
@@ -90,13 +90,11 @@
%patch39
%patch40
%patch43
-%patch46
%patch48
%patch49
-%if "%name" == "libqt4"
-%patch52
-%endif
%patch53
+%patch54
+%patch55
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
# COMMON-END
@@ -211,6 +209,12 @@
%plugindir/sqldrivers/libqsqlmysql*.so
%changelog
+* Tue Feb 26 2008 dmueller@suse.de
+- update to 20080226
+ * fixes in packaging
+ * QFile bugfixes among many others
+- add patch to ignore bogus global advance width (#359984)
+- fixes SVG rendering regression (#364936)
* Thu Feb 21 2008 dmueller@suse.de
- update to 20080221 snapshot:
* restore compatibility with Qt 4.3
++++++ libQtWebKit-devel.spec ++++++
--- /var/tmp/diff_new_pack.W13772/_old 2008-02-28 01:59:52.000000000 +0100
+++ /var/tmp/diff_new_pack.W13772/_new 2008-02-28 01:59:52.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package libQtWebKit-devel (Version 4.3.92)
+# spec file for package libQtWebKit-devel (Version 4.3.93)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -23,13 +23,14 @@
Group: System/Libraries
AutoReqProv: on
Summary: C++ Program Library, Core Components
+Requires: libQtWebKit4 = %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`)
# COMMON-BEGIN
# COMMON-BEGIN
-Version: 4.3.92
-Release: 3
+Version: 4.3.93
+Release: 1
%define base_name libqt4
%define x11_free -x11-opensource-src-
-%define rversion 4.4.0-snapshot-20080221
+%define rversion 4.4.0-snapshot-20080226
Source: qt%x11_free%rversion.tar.bz2
Source10: qt4config.desktop
Source11: designer4.desktop
@@ -48,11 +49,11 @@
Patch39: 0191-listview-alternate-row-colors.diff
Patch40: 0188-fix-moc-parser-same-name-header.diff
Patch43: 0195-compositing-properties.diff
-Patch46: 0172-prefer-xrandr-over-xinerama.diff
Patch48: 0203-qtexthtmlparser-link-color.diff
Patch49: javascriptcore-bufferoverflow.diff
-Patch52: no-documentation-test.diff
Patch53: allow-shlib-undefined.diff
+Patch54: qatomic-no-barrier.diff
+Patch55: ignore-global-advance-width-in-fots.diff
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 %_docdir/%{base_name}/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
@@ -85,13 +86,11 @@
%patch39
%patch40
%patch43
-%patch46
%patch48
%patch49
-%if "%name" == "libqt4"
-%patch52
-%endif
%patch53
+%patch54
+%patch55
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
# COMMON-END
@@ -121,6 +120,7 @@
Provides: qt-devel-doc
Requires: %base_name = %version
Requires: %base_name-devel-doc-data = %version
+Requires: %base_name-sql-sqlite >= %version
%description -n libqt4-devel-doc
The package contains documentation and examples to develop Qt
@@ -155,7 +155,13 @@
make INSTALL_ROOT=$RPM_BUILD_ROOT -C src/3rdparty/webkit/WebCore install
make INSTALL_ROOT=$RPM_BUILD_ROOT -C src/xmlpatterns install
make INSTALL_ROOT=$RPM_BUILD_ROOT -C demos install
+# install all headers
#make INSTALL_ROOT=$RPM_BUILD_ROOT install
+# reduce fileconflicts
+for f in $(rpm -ql libqt4-devel) $(rpm -ql libqt4-x11) $(rpm -ql libqt4); do
+ test -f $RPM_BUILD_ROOT/$f && rm $RPM_BUILD_ROOT/$f
+done
+find $RPM_BUILD_ROOT -type d -print0 | xargs -0 --no-run-if-empty rmdir --ignore-fail-on-non-empty
# argggh, qmake is such a piece of <censored>
mkdir -p $RPM_BUILD_ROOT/%_libdir/pkgconfig
find $RPM_BUILD_ROOT/%_libdir -type f -name '*.pc' -exec mv {} $RPM_BUILD_ROOT/%_libdir/pkgconfig \;
@@ -163,8 +169,6 @@
mkdir -p $RPM_BUILD_ROOT/%_libdir/qt
find $RPM_BUILD_ROOT/%_libdir -type f -name '*la' -print -exec perl -pi -e 's, -L/usr/src/packages/BUILD/\S+,,g' {} \;
find $RPM_BUILD_ROOT/%_libdir/pkgconfig -type f -name '*pc' -print -exec perl -pi -e 's, -L/usr/src/packages/BUILD/\S+,,g' {} \;
-rm -rf $RPM_BUILD_ROOT/usr/include
-rm -rf $RPM_BUILD_ROOT/usr/%_lib/pkgconfig
mkdir -p $RPM_BUILD_ROOT/%_docdir/%base_name/
ln -s %_libdir/qt4/demos $RPM_BUILD_ROOT/%_docdir/%base_name/demos
# packaged in %name-devel-doc-data
@@ -193,13 +197,17 @@
%files
%defattr(-,root,root,755)
-#/usr/include/QtWebKit
+/usr/include/Qt/*
+/usr/include/QtWebKit
+/usr/include/QtXmlPatterns
%_libdir/libQtXmlPatterns.so
%_libdir/libQtXmlPatterns.prl
%_libdir/libQtXmlPatterns.la
%_libdir/libQtWebKit.so
%_libdir/libQtWebKit.prl
%_libdir/libQtWebKit.la
+%_libdir/pkgconfig/QtWebKit.pc
+%_libdir/pkgconfig/QtXmlPatterns.pc
%files -n libqt4-devel-doc
%defattr(-,root,root,755)
@@ -218,6 +226,12 @@
%_docdir/%base_name/demos
%changelog
+* Tue Feb 26 2008 dmueller@suse.de
+- update to 20080226
+ * fixes in packaging
+ * QFile bugfixes among many others
+- add patch to ignore bogus global advance width (#359984)
+- fixes SVG rendering regression (#364936)
* Thu Feb 21 2008 dmueller@suse.de
- update to 20080221 snapshot:
* restore compatibility with Qt 4.3
++++++ ignore-global-advance-width-in-fots.diff ++++++
--- src/gui/text/qfontengine_ft.cpp
+++ src/gui/text/qfontengine_ft.cpp
@@ -507,7 +507,7 @@
kerning_pairs_loaded = false;
transform = false;
antialias = true;
- default_load_flags = 0;
+ default_load_flags = FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH;
subpixelType = Subpixel_None;
defaultGlyphFormat = Format_None;
canUploadGlyphsToServer = false;
++++++ libqt4-devel-doc-data.spec.in ++++++
--- libqt4/libqt4-devel-doc-data.spec.in 2008-02-21 19:29:53.000000000 +0100
+++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc-data.spec.in 2008-02-27 02:09:31.000000000 +0100
@@ -40,20 +40,23 @@
OPTIONS=""
%endif
export MAKEFLAGS="%{?jobs:-j %jobs}"
-echo yes | ./configure %common_options $OPTIONS -exceptions -xmlpatterns -webkit -plugin-sql-sqlite -nomake demos
+echo yes | ./configure %common_options $OPTIONS -plugin-sql-sqlite -nomake demos
pushd src
make %{?jobs:-j%jobs} sub-moc sub-rcc sub-uic
popd
pushd tools
make %{?jobs:-j%jobs} sub-assistant
popd
-make %{?jobs:-j%jobs} docs
+pushd tools/qdoc3
+make %{?jobs:-j%jobs}
+popd
+test -d doc/qch || make %{?jobs:-j%jobs} docs
./config.status
%install
export QTDIR=$PWD
# htmldocs are not generated - why?
-for d in docimages qchdocs; do
+for d in docimages qchdocs htmldocs ; do
make INSTALL_ROOT=$RPM_BUILD_ROOT install_${d}
done
@@ -74,6 +77,7 @@
%defattr(-,root,root,755)
%dir /usr/share/doc/packages/%base_name
/usr/share/doc/packages/%base_name/qch
+/usr/share/doc/packages/%base_name/html*
/usr/share/doc/packages/%base_name/src
/usr/share/doc/packages/%base_name/examples
++++++ libQtWebKit-devel.spec.in ++++++
--- libqt4/libQtWebKit-devel.spec.in 2008-02-19 09:47:28.000000000 +0100
+++ /mounts/work_src_done/STABLE/libqt4/libQtWebKit-devel.spec.in 2008-02-27 13:49:51.000000000 +0100
@@ -22,6 +22,7 @@
Group: System/Libraries
Autoreqprov: on
Summary: Qt 4 SQL related libraries
+Requires: libQtWebKit4 = %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`)
# COMMON-BEGIN
# COMMON-END
@@ -47,6 +48,7 @@
Provides: qt-devel-doc
Requires: %base_name = %version
Requires: %base_name-devel-doc-data = %version
+Requires: %base_name-sql-sqlite >= %version
%description -n libqt4-devel-doc
The package contains documentation and examples to develop Qt
@@ -81,8 +83,15 @@
make INSTALL_ROOT=$RPM_BUILD_ROOT -C src/3rdparty/webkit/WebCore install
make INSTALL_ROOT=$RPM_BUILD_ROOT -C src/xmlpatterns install
make INSTALL_ROOT=$RPM_BUILD_ROOT -C demos install
+# install all headers
#make INSTALL_ROOT=$RPM_BUILD_ROOT install
+# reduce fileconflicts
+for f in $(rpm -ql libqt4-devel) $(rpm -ql libqt4-x11) $(rpm -ql libqt4); do
+ test -f $RPM_BUILD_ROOT/$f && rm $RPM_BUILD_ROOT/$f
+done
+find $RPM_BUILD_ROOT -type d -print0 | xargs -0 --no-run-if-empty rmdir --ignore-fail-on-non-empty
+
# argggh, qmake is such a piece of <censored>
mkdir -p $RPM_BUILD_ROOT/%_libdir/pkgconfig
find $RPM_BUILD_ROOT/%_libdir -type f -name '*.pc' -exec mv {} $RPM_BUILD_ROOT/%_libdir/pkgconfig \;
@@ -90,8 +99,6 @@
mkdir -p $RPM_BUILD_ROOT/%_libdir/qt
find $RPM_BUILD_ROOT/%_libdir -type f -name '*la' -print -exec perl -pi -e 's, -L/usr/src/packages/BUILD/\S+,,g' {} \;
find $RPM_BUILD_ROOT/%_libdir/pkgconfig -type f -name '*pc' -print -exec perl -pi -e 's, -L/usr/src/packages/BUILD/\S+,,g' {} \;
-rm -rf $RPM_BUILD_ROOT/usr/include
-rm -rf $RPM_BUILD_ROOT/usr/%_lib/pkgconfig
mkdir -p $RPM_BUILD_ROOT/%_docdir/%base_name/
ln -s %_libdir/qt4/demos $RPM_BUILD_ROOT/%_docdir/%base_name/demos
@@ -123,13 +130,17 @@
%files
%defattr(-,root,root,755)
-#/usr/include/QtWebKit
+/usr/include/Qt/*
+/usr/include/QtWebKit
+/usr/include/QtXmlPatterns
%_libdir/libQtXmlPatterns.so
%_libdir/libQtXmlPatterns.prl
%_libdir/libQtXmlPatterns.la
%_libdir/libQtWebKit.so
%_libdir/libQtWebKit.prl
%_libdir/libQtWebKit.la
+%_libdir/pkgconfig/QtWebKit.pc
+%_libdir/pkgconfig/QtXmlPatterns.pc
%files -n libqt4-devel-doc
%defattr(-,root,root,755)
++++++ qatomic-no-barrier.diff ++++++
--- src/corelib/arch/qatomic_i386.h
+++ src/corelib/arch/qatomic_i386.h
@@ -114,19 +114,18 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPoint
inline bool QBasicAtomicInt::ref()
{
unsigned char ret;
- asm volatile("lock\n"
+ asm ( "lock\n"
"incl %0\n"
"setne %1"
: "=m" (_q_value), "=qm" (ret)
- : "m" (_q_value)
- : "memory");
+ : "m" (_q_value));
return ret != 0;
}
inline bool QBasicAtomicInt::deref()
{
- unsigned char ret;
- asm volatile("lock\n"
+ unsigned char ret;
+ asm ( "lock\n"
"decl %0\n"
"setne %1"
: "=m" (_q_value), "=qm" (ret)
@@ -138,7 +137,7 @@ inline bool QBasicAtomicInt::deref()
inline bool QBasicAtomicInt::testAndSetOrdered(int expectedValue, int newValue)
{
unsigned char ret;
- asm volatile("lock\n"
+ asm ( "lock\n"
"cmpxchgl %3,%2\n"
"sete %1\n"
: "=a" (newValue), "=qm" (ret), "+m" (_q_value)
@@ -149,20 +148,18 @@ inline bool QBasicAtomicInt::testAndSetO
inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue)
{
- asm volatile("xchgl %0,%1"
+ asm ( "xchgl %0,%1"
: "=r" (newValue), "+m" (_q_value)
- : "0" (newValue)
- : "memory");
+ : "0" (newValue));
return newValue;
}
inline int QBasicAtomicInt::fetchAndAddOrdered(int valueToAdd)
{
- asm volatile("lock\n"
+ asm ( "lock\n"
"xaddl %0,%1"
: "=r" (valueToAdd), "+m" (_q_value)
- : "0" (valueToAdd)
- : "memory");
+ : "0" (valueToAdd));
return valueToAdd;
}
@@ -170,33 +167,30 @@ template <typename T>
Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T *expectedValue, T *newValue)
{
unsigned char ret;
- asm volatile("lock\n"
+ asm ( "lock\n"
"cmpxchgl %3,%2\n"
"sete %1\n"
: "=a" (newValue), "=qm" (ret), "+m" (_q_value)
- : "r" (newValue), "0" (expectedValue)
- : "memory");
+ : "r" (newValue), "0" (expectedValue));
return ret != 0;
}
template <typename T>
Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue)
{
- asm volatile("xchgl %0,%1"
+ asm ( "xchgl %0,%1"
: "=r" (newValue), "+m" (_q_value)
- : "0" (newValue)
- : "memory");
+ : "0" (newValue));
return newValue;
}
template <typename T>
Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueToAdd)
{
- asm volatile("lock\n"
+ asm ( "lock\n"
"xaddl %0,%1"
: "=r" (valueToAdd), "+m" (_q_value)
- : "0" (valueToAdd * sizeof(T))
- : "memory");
+ : "0" (valueToAdd * sizeof(T)));
return reinterpret_cast