Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2014-09-10 07:27:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt4" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2014-05-11 18:31:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2014-09-10 07:27:56.000000000 +0200 @@ -1,0 +2,23 @@ +Sun Sep 7 20:13:48 UTC 2014 - [email protected] + +- Added workaround for bnc#847880: if Cirrus graphics are detected, + export QT_GRAPHICSSYSTEM as native +- Added kde4_qt_plugin_path.patch, so kde4 plugins are magically + found/known outside kde4 enviroment/session + +------------------------------------------------------------------- +Wed Aug 20 13:58:19 CEST 2014 - [email protected] + +- added _constraints. building took up to 7GB of disk space on + s390x, and more than 6GB on x86_64 + +------------------------------------------------------------------- +Mon Jun 16 10:10:37 UTC 2014 - [email protected] + +- Add 3 patches for Qt bugs to make LibreOffice KDE4 file + picker work properly again: + * Add glib-honor-ExcludeSocketNotifiers-flag.diff (QTBUG-37380) + * Add l-qclipboard_fix_recursive.patch (QTBUG-34614) + * Add l-qclipboard_delay.patch (QTBUG-38585) + +------------------------------------------------------------------- libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes 2014-08-25 11:03:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2014-09-10 07:27:56.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Sep 7 20:13:48 UTC 2014 - [email protected] + +- Added workaround for bnc#847880: if Cirrus graphics are detected, + export QT_GRAPHICSSYSTEM as native +- Added kde4_qt_plugin_path.patch, so kde4 plugins are magically + found/known outside kde4 enviroment/session + +------------------------------------------------------------------- New: ---- kde4_qt_plugin_path.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.4GRRSS/_old 2014-09-10 07:28:02.000000000 +0200 +++ /var/tmp/diff_new_pack.4GRRSS/_new 2014-09-10 07:28:02.000000000 +0200 @@ -102,8 +102,18 @@ Patch152: fix-moc-from-choking-on-boost-headers.patch # PATCH-FIX-OPENSUSE qlocale_icu-no-warning-output.patch -- qWarnings about icu libraries and symbols are now only emmited in debug builds Patch153: qlocale_icu-no-warning-output.patch +# PATCH-FIX-OPENSUSE kde4_qt_plugin_path.patch +Patch154: kde4_qt_plugin_path.patch Patch160: ppc64le.diff Patch161: 0001-Don-t-crash-on-broken-GIF-images.patch +# LO filepicker integration (3 patches) +# PATCH-FIX-OPENSUSE exclude socket notifiers from the glib event loop - needed for LO KDE4 filepicker integration (1/3) +Patch162: glib-honor-ExcludeSocketNotifiers-flag.diff +# PATCH-FIX-OPENSUSE fix recursive repaint errors which lead to crashes - needed for LO KDE4 filepicker integration (2/3) +Patch163: l-qclipboard_fix_recursive.patch +# PATCH-FIX-OPENSUSE fix clipboard delay when pasting with LO and KFileDialog open - needed for LO KDE4 filepicker integration (3/3) +Patch164: l-qclipboard_delay.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -openssl-linked -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -prefix /usr -L %{_libdir} -libdir %{_libdir} -docdir %_docdir/%{base_name} -examplesdir %{_libdir}/qt4/examples -demosdir %{_libdir}/qt4/demos -plugindir %plugindir -translationdir %{_datadir}/qt4/translations -iconv -sysconfdir /etc/settings -datadir %{_datadir}/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle %define check_config \ @@ -180,8 +190,13 @@ %patch150 -p1 %patch152 -p1 %patch153 -p1 +%patch154 -p1 %patch160 %patch161 -p1 +%patch162 -p1 +%patch163 +%patch164 + # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts} # COMMON-PREP-END libqt4-sql-plugins.spec: same change ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.4GRRSS/_old 2014-09-10 07:28:02.000000000 +0200 +++ /var/tmp/diff_new_pack.4GRRSS/_new 2014-09-10 07:28:02.000000000 +0200 @@ -120,6 +120,8 @@ Patch152: fix-moc-from-choking-on-boost-headers.patch # PATCH-FIX-OPENSUSE qlocale_icu-no-warning-output.patch -- qWarnings about icu libraries and symbols are now only emmited in debug builds Patch153: qlocale_icu-no-warning-output.patch +# PATCH-FIX-OPENSUSE kde4_qt_plugin_path.patch +Patch154: kde4_qt_plugin_path.patch Patch160: ppc64le.diff Patch161: 0001-Don-t-crash-on-broken-GIF-images.patch # LO filepicker integration (3 patches) @@ -428,6 +430,7 @@ %patch150 -p1 %patch152 -p1 %patch153 -p1 +%patch154 -p1 %patch160 %patch161 -p1 %patch162 -p1 @@ -503,6 +506,27 @@ ln -s %{_libdir} %{buildroot}/%{_libdir}/qt4/lib ln -s %{_bindir} %{buildroot}/%{_libdir}/qt4/bin +#BNC847880 +mkdir -p %{buildroot}%{_sysconfdir}/profile.d/ +cat <<EOF >%{buildroot}%{_sysconfdir}/profile.d/qt-graphicssystem.sh +if [ -z "${QT_GRAPHICSSYSTEM_CHECKED}" -a -z "${QT_GRAPHICSSYSTEM}" ] ; then + QT_GRAPHICSSYSTEM_CHECKED=1 + export QT_GRAPHICSSYSTEM_CHECKED + if ( /sbin/lspci 2>/dev/null | grep -qi "VGA compatible controller: Cirrus" ) ; then + QT_GRAPHICSSYSTEM=native + export QT_GRAPHICSSYSTEM + fi +fi +EOF +cat <<EOF >%{buildroot}%{_sysconfdir}/profile.d/qt-graphicssystem.csh +if ( ! $?QT_GRAPHICSSYSTEM_CHECKED ) then + setenv QT_GRAPHICSSYSTEM_CHECKED 1 + if ( ! $?QT_GRAPHICSSYSTEM ) then + /sbin/lspci |& grep -qi "VGA compatible controller: Cirrus" && setenv QT_GRAPHICSSYSTEM native + endif +endif +EOF + # install private headers manually instead of using -developer-build for comb in QtDeclarative/declarative QtCore/corelib QtScript/script QtGui/gui; do d=${comb%%/*} @@ -637,6 +661,8 @@ %{_sysconfdir}/rpm/macros.qt4 +%{_sysconfdir}/profile.d/qt-graphicssystem.*sh + %if %with_qt3support %exclude %plugindir/accessible/libqtaccessiblecompatwidgets.so %endif ++++++ kde4_qt_plugin_path.patch ++++++ --- qt-everywhere-opensource-src-4.8.6.orig/src/corelib/kernel/qcoreapplication.cpp 2014-04-10 20:37:11.000000000 +0200 +++ qt-everywhere-opensource-src-4.8.6/src/corelib/kernel/qcoreapplication.cpp 2014-09-07 22:13:03.603316728 +0200 @@ -2529,6 +2529,13 @@ QStringList QCoreApplication::libraryPat if (!app_libpaths->contains(installPathPlugins)) app_libpaths->append(installPathPlugins); } + + // make kde4 plugins known to QtLibrariesPaths + QString kde4PathPlugins = QLibraryInfo::location(QLibraryInfo::LibrariesPath) + QLatin1String("/kde4/plugins"); + if (QFile::exists(kde4PathPlugins)) { + if (!app_libpaths->contains(kde4PathPlugins)) + app_libpaths->append(kde4PathPlugins); + } #endif // If QCoreApplication is not yet instantiated, -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
