commit libqt4 for openSUSE:Factory

31 Mar 2010

Hello community,

here is the log from the commit of package libqt4 for openSUSE:Factory
checked in at Wed Mar 31 18:10:56 CEST 2010.



--------

--- libqt4/libqt4-devel-doc-data.changes	2010-02-17 17:17:53.000000000 +0100
+++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc-data.changes	2010-03-23 21:16:48.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Mar 23 21:15:42 CET 2010 - dmueller@suse.de
+
+- fix crash in QGtkStyle when no Gtk is available (bnc#580478)
+
+-------------------------------------------------------------------
libqt4-devel-doc.changes: same change
libqt4-sql-plugins.changes: same change
libqt4.changes: same change

calling whatdependson for head-i586


New:
----
  qgtkstyle-no-gtk-crash.diff

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

Other differences:
------------------
++++++ libqt4-devel-doc-data.spec ++++++
--- /var/tmp/diff_new_pack.vyfSbj/_old	2010-03-31 18:09:36.000000000 +0200
+++ /var/tmp/diff_new_pack.vyfSbj/_new	2010-03-31 18:09:36.000000000 +0200
@@ -28,7 +28,7 @@
 # COMMON-VERSION-BEGIN
 # COMMON-VERSION-BEGIN
 Version:        4.6.2
-Release:        1
+Release:        2
 %define base_name libqt4
 %define x11_free  -everywhere-opensource-src-
 %define rversion 4.6.2
@@ -75,6 +75,7 @@
 Patch112:       s390-qatomic-fixes.diff
 Patch113:       ppc64-webkit-link-fix.diff
 Patch114:       fix-sequence-error.diff
+Patch115:       qgtkstyle-no-gtk-crash.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
   %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -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 -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -xsync -xinput -gtkstyle
 %define check_config \
@@ -126,6 +127,7 @@
 %patch112
 %patch113
 %patch114
+%patch115
 # be sure not to use them
 rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
 # COMMON-END
@@ -180,6 +182,7 @@
 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
 #for d in html-api html-assistant html-designer html-linguist html-qmake; do
 #  for f in doc/$d/*; do

++++++ libqt4-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.vyfSbj/_old	2010-03-31 18:09:36.000000000 +0200
+++ /var/tmp/diff_new_pack.vyfSbj/_new	2010-03-31 18:09:37.000000000 +0200
@@ -31,7 +31,7 @@
 # COMMON-VERSION-BEGIN
 # COMMON-VERSION-BEGIN
 Version:        4.6.2
-Release:        1
+Release:        2
 %define base_name libqt4
 %define x11_free  -everywhere-opensource-src-
 %define rversion 4.6.2
@@ -82,6 +82,7 @@
 Patch112:       s390-qatomic-fixes.diff
 Patch113:       ppc64-webkit-link-fix.diff
 Patch114:       fix-sequence-error.diff
+Patch115:       qgtkstyle-no-gtk-crash.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
   %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -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 -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -xsync -xinput -gtkstyle
 %define check_config \
@@ -133,6 +134,7 @@
 %patch112
 %patch113
 %patch114
+%patch115
 # be sure not to use them
 rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
 # COMMON-END
@@ -199,11 +201,13 @@
 mv $RPM_BUILD_ROOT/%_libdir/qt4/demos/browser/browser $RPM_BUILD_ROOT/%_bindir/qt4-browser
 ln -s %_bindir/svgviewer $RPM_BUILD_ROOT/%_libdir/qt4/examples/painting/svgviewer/svgviewer
 ln -s %_bindir/qt4-browser $RPM_BUILD_ROOT/%_libdir/qt4/demos/browser/browser
+
 # 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 \;
@@ -214,6 +218,7 @@
 mkdir -p $RPM_BUILD_ROOT/%_docdir/%base_name/
 ln -s %_libdir/qt4/demos $RPM_BUILD_ROOT/%_docdir/%base_name/demos
 ln -s %_libdir/qt4/examples $RPM_BUILD_ROOT/%_docdir/%base_name/examples
+
 # packaged in %name-devel-doc-data
 rm -rf $RPM_BUILD_ROOT/%_docdir/%base_name/{doc,html}
 rm -f $RPM_BUILD_ROOT/%_libdir/libQt{3,A,C,G,H,N,S,T}*
@@ -222,6 +227,7 @@
 %if %suse_version > 1020
 %fdupes $RPM_BUILD_ROOT/usr/include
 %endif
+
 %suse_update_desktop_file -i assistant4 Qt Development Documentation
 
 %clean

++++++ libqt4-sql-plugins.spec ++++++
--- /var/tmp/diff_new_pack.vyfSbj/_old	2010-03-31 18:09:37.000000000 +0200
+++ /var/tmp/diff_new_pack.vyfSbj/_new	2010-03-31 18:09:37.000000000 +0200
@@ -29,7 +29,7 @@
 # COMMON-VERSION-BEGIN
 # COMMON-VERSION-BEGIN
 Version:        4.6.2
-Release:        1
+Release:        2
 %define base_name libqt4
 %define x11_free  -everywhere-opensource-src-
 %define rversion 4.6.2
@@ -74,6 +74,7 @@
 Patch112:       s390-qatomic-fixes.diff
 Patch113:       ppc64-webkit-link-fix.diff
 Patch114:       fix-sequence-error.diff
+Patch115:       qgtkstyle-no-gtk-crash.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
   %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -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 -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -xsync -xinput -gtkstyle
 %define check_config \
@@ -125,6 +126,7 @@
 %patch112
 %patch113
 %patch114
+%patch115
 # be sure not to use them
 rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
 # COMMON-END
@@ -256,16 +258,19 @@
 %files -n libqt4-sql-unixODBC
 %defattr(-,root,root,755)
 %dir %plugindir/sqldrivers
+
 %plugindir/sqldrivers/libqsqlodbc*.so
 
 %files -n libqt4-sql-postgresql
 %defattr(-,root,root,755)
 %dir %plugindir/sqldrivers
+
 %plugindir/sqldrivers/libqsqlpsql*.so
 
 %files -n libqt4-sql-mysql
 %defattr(-,root,root,755)
 %dir %plugindir/sqldrivers
+
 %plugindir/sqldrivers/libqsqlmysql*.so
 
 %changelog

++++++ libqt4.spec ++++++
--- /var/tmp/diff_new_pack.vyfSbj/_old	2010-03-31 18:09:37.000000000 +0200
+++ /var/tmp/diff_new_pack.vyfSbj/_new	2010-03-31 18:09:37.000000000 +0200
@@ -54,7 +54,7 @@
 Obsoletes:      libqt4-dbus-1 < 4.4.0
 # COMMON-VERSION-BEGIN
 Version:        4.6.2
-Release:        1
+Release:        2
 %define base_name libqt4
 %define x11_free  -everywhere-opensource-src-
 %define rversion 4.6.2
@@ -92,6 +92,7 @@
 Patch112:       s390-qatomic-fixes.diff
 Patch113:       ppc64-webkit-link-fix.diff
 Patch114:       fix-sequence-error.diff
+Patch115:       qgtkstyle-no-gtk-crash.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
   %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -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 -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -xsync -xinput -gtkstyle
 %define check_config \
@@ -143,6 +144,7 @@
 %patch112
 %patch113
 %patch114
+%patch115
 # be sure not to use them
 rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
 # COMMON-END




++++++ qgtkstyle-no-gtk-crash.diff ++++++
--- src/gui/styles/qgtkstyle.cpp
+++ src/gui/styles/qgtkstyle.cpp
@@ -3404,7 +3404,7 @@ QRect QGtkStyle::subElementRect(SubElement element, const QStyleOption *option,
     case SE_ProgressBarGroove:
         return option->rect;
     case SE_PushButtonContents:
-        if (!d->gtk_check_version(2, 10, 0)) {
+        if (d->isThemeAvailable() && !d->gtk_check_version(2, 10, 0)) {
             GtkWidget *gtkButton = d->gtkWidget(QLS("GtkButton"));
             GtkBorder *border = 0;
             d->gtk_widget_style_get(gtkButton, "inner-border", &border, NULL);

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



Remember to have fun...

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

    

root＠Hilbert.suse.de

tags

participants (1)