Mailinglist Archive: opensuse-commit (2130 mails)

< Previous Next >
commit libqt4
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Thu, 10 Apr 2008 11:51:04 +0200
  • Message-id: <20080410095104.DF87D678182@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package libqt4
checked in at Thu Apr 10 11:51:04 CEST 2008.

--------
--- libqt4/libqt4.changes 2008-04-07 12:59:33.000000000 +0200
+++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2008-04-08
13:54:54.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Apr 8 13:54:40 CEST 2008 - dmueller@xxxxxxx
+
+- restore binary compatibility with Qt 4.3
+
+-------------------------------------------------------------------
libqt4-devel-doc-data.changes: same change
libqt4-sql-plugins.changes: same change
libQtWebKit-devel.changes: same change

New:
----
restore-bc-with-qt-4.3.diff

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

Other differences:
------------------
++++++ libqt4-devel-doc-data.spec ++++++
--- /var/tmp/diff_new_pack.Ln5701/_old 2008-04-10 11:48:46.000000000 +0200
+++ /var/tmp/diff_new_pack.Ln5701/_new 2008-04-10 11:48:46.000000000 +0200
@@ -29,7 +29,7 @@
# COMMON-BEGIN
%define snapshot 20080325
Version: 4.3.95+4.4.0rc1
-Release: 3
+Release: 4
%define base_name libqt4
%define x11_free -x11-opensource-src-
%define rversion 4.4.0-rc1
@@ -63,6 +63,7 @@
Patch61: qt4-fake-bold.patch
Patch62: qdbus-enable-on-sles10.diff
Patch63: 0220-no-x-recursion-in-xerrhandler.diff
+Patch64: restore-bc-with-qt-4.3.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 910
%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
@@ -108,6 +109,7 @@
%endif
%patch62
%patch63
+%patch64
#%patch56
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
@@ -167,6 +169,8 @@
/usr/share/doc/packages/%base_name/src

%changelog
+* Tue Apr 08 2008 dmueller@xxxxxxx
+- restore binary compatibility with Qt 4.3
* Mon Apr 07 2008 dmueller@xxxxxxx
- add patch from last .changes (bnc#368456)
- re-establish workaround for postgresql-devel (bnc#361431)

++++++ libqt4.spec ++++++
--- /var/tmp/diff_new_pack.Ln5701/_old 2008-04-10 11:48:46.000000000 +0200
+++ /var/tmp/diff_new_pack.Ln5701/_new 2008-04-10 11:48:46.000000000 +0200
@@ -35,7 +35,7 @@
# COMMON-BEGIN
%define snapshot 20080325
Version: 4.3.95+4.4.0rc1
-Release: 3
+Release: 4
%define base_name libqt4
%define x11_free -x11-opensource-src-
%define rversion 4.4.0-rc1
@@ -69,6 +69,7 @@
Patch61: qt4-fake-bold.patch
Patch62: qdbus-enable-on-sles10.diff
Patch63: 0220-no-x-recursion-in-xerrhandler.diff
+Patch64: restore-bc-with-qt-4.3.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 910
%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
@@ -115,6 +116,7 @@
%endif
%patch62
%patch63
+%patch64
#%patch56
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
@@ -304,8 +306,6 @@
/usr/bin/qdbus
%_libdir/libQtDBus*.so.*
%endif
-/usr/share/qt4/phrasebooks
-/usr/share/qt4/translations

%files x11
%defattr(-,root,root,755)
@@ -333,6 +333,8 @@
%plugindir/imageformats
%plugindir/inputmethods
%plugindir/accessible
+/usr/share/qt4/translations
+/usr/share/qt4/phrasebooks

%files qt3support
%defattr(-,root,root,755)
@@ -402,6 +404,8 @@
%plugindir/sqldrivers/libqsqlite*.so

%changelog
+* Tue Apr 08 2008 dmueller@xxxxxxx
+- restore binary compatibility with Qt 4.3
* Mon Apr 07 2008 dmueller@xxxxxxx
- add patch from last .changes (bnc#368456)
- re-establish workaround for postgresql-devel (bnc#361431)

++++++ libqt4-sql-plugins.spec ++++++
--- /var/tmp/diff_new_pack.Ln5701/_old 2008-04-10 11:48:46.000000000 +0200
+++ /var/tmp/diff_new_pack.Ln5701/_new 2008-04-10 11:48:46.000000000 +0200
@@ -35,7 +35,7 @@
# COMMON-BEGIN
%define snapshot 20080325
Version: 4.3.95+4.4.0rc1
-Release: 2
+Release: 3
%define base_name libqt4
%define x11_free -x11-opensource-src-
%define rversion 4.4.0-rc1
@@ -69,6 +69,7 @@
Patch61: qt4-fake-bold.patch
Patch62: qdbus-enable-on-sles10.diff
Patch63: 0220-no-x-recursion-in-xerrhandler.diff
+Patch64: restore-bc-with-qt-4.3.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 910
%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
@@ -113,6 +114,7 @@
%endif
%patch62
%patch63
+%patch64
#%patch56
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
@@ -232,6 +234,8 @@
%plugindir/sqldrivers/libqsqlmysql*.so

%changelog
+* Tue Apr 08 2008 dmueller@xxxxxxx
+- restore binary compatibility with Qt 4.3
* Mon Apr 07 2008 dmueller@xxxxxxx
- add patch from last .changes (bnc#368456)
- re-establish workaround for postgresql-devel (bnc#361431)

++++++ libQtWebKit-devel.spec ++++++
--- /var/tmp/diff_new_pack.Ln5701/_old 2008-04-10 11:48:46.000000000 +0200
+++ /var/tmp/diff_new_pack.Ln5701/_new 2008-04-10 11:48:46.000000000 +0200
@@ -32,7 +32,7 @@
# COMMON-BEGIN
%define snapshot 20080325
Version: 4.3.95+4.4.0rc1
-Release: 3
+Release: 4
%define base_name libqt4
%define x11_free -x11-opensource-src-
%define rversion 4.4.0-rc1
@@ -66,6 +66,7 @@
Patch61: qt4-fake-bold.patch
Patch62: qdbus-enable-on-sles10.diff
Patch63: 0220-no-x-recursion-in-xerrhandler.diff
+Patch64: restore-bc-with-qt-4.3.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 910
%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
@@ -112,6 +113,7 @@
%endif
%patch62
%patch63
+%patch64
#%patch56
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
@@ -278,6 +280,8 @@
/usr/bin/svgviewer

%changelog
+* Tue Apr 08 2008 dmueller@xxxxxxx
+- restore binary compatibility with Qt 4.3
* Mon Apr 07 2008 dmueller@xxxxxxx
- add patch from last .changes (bnc#368456)
- re-establish workaround for postgresql-devel (bnc#361431)












++++++ restore-bc-with-qt-4.3.diff ++++++
--- src/gui/kernel/qpalette.h
+++ src/gui/kernel/qpalette.h
@@ -88,7 +88,7 @@ public:
Text, BrightText, ButtonText, Base, Window, Shadow,
Highlight, HighlightedText,
Link, LinkVisited, // ### Qt 5: remove
- AlternateBase, ToolTipBase, ToolTipText, NoRole,
NColorRoles = NoRole,
+ AlternateBase, NoRole, ToolTipBase, ToolTipText,
NColorRoles,
Foreground = WindowText, Background = Window // ### Qt 5:
remove
};



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



Remember to have fun...

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

< Previous Next >