commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2019-05-16 22:01:39 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new.5148 (New) Package is "libqt4" Thu May 16 22:01:39 2019 rev:231 rq:703090 version:4.8.7 Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes2019-05-08 15:15:34.508869487 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new.5148/libqt4.changes 2019-05-16 22:01:41.558720585 +0200 @@ -1,0 +2,5 @@ +Fri May 10 09:31:36 UTC 2019 - Dominique Leuenberger + +- Move RPM macros to %_rpmmacrodir. + +--- Other differences: -- ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.mFzw5Z/_old 2019-05-16 22:01:47.250717008 +0200 +++ /var/tmp/diff_new_pack.mFzw5Z/_new 2019-05-16 22:01:47.254717006 +0200 @@ -558,8 +558,8 @@ %install make INSTALL_ROOT=%{buildroot} install # install macros and replace version placeholder with current version -install -D -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm/macros.qt4 -sed -i 's/QTVER/%{version}/g' %{buildroot}%{_sysconfdir}/rpm/macros.qt4 +install -D -m644 %{SOURCE3} %{buildroot}%{_rpmmacrodir}/macros.qt4 +sed -i 's/QTVER/%{version}/g' %{buildroot}%{_rpmmacrodir}/macros.qt4 %if %with_qtwebkit cp -p src/3rdparty/webkit/JavaScriptCore/release/libjscore.a \ src/3rdparty/webkit/JavaScriptCore/release/libjscore.prl \ @@ -715,7 +715,7 @@ %{_libdir}/libQtScriptTools.so.* %{_libdir}/libQtSvg.so.* -%{_sysconfdir}/rpm/macros.qt4 +%{_rpmmacrodir}/macros.qt4 %if %with_qt3support %exclude %plugindir/accessible/libqtaccessiblecompatwidgets.so
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2019-05-08 15:15:32 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new.5148 (New) Package is "libqt4" Wed May 8 15:15:32 2019 rev:230 rq:701221 version:4.8.7 Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes2019-02-28 21:25:22.613893503 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new.5148/libqt4.changes 2019-05-08 15:15:34.508869487 +0200 @@ -1,0 +2,5 @@ +Wed Apr 24 17:15:07 UTC 2019 - Martin Liška + +- Disable LTO (boo#1133239). + +--- Other differences: -- ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.AXmqUG/_old 2019-05-08 15:15:38.860879181 +0200 +++ /var/tmp/diff_new_pack.AXmqUG/_new 2019-05-08 15:15:38.864879189 +0200 @@ -513,6 +513,7 @@ # COMMON-PREP-END %build +%define _lto_cflags %{nil} export QTDIR=$PWD export PATH=$PWD/bin:$PATH export LD_LIBRARY_PATH=$PWD/lib/
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2019-02-28 21:25:20 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new.28833 (New) Package is "libqt4" Thu Feb 28 21:25:20 2019 rev:229 rq:679783 version:4.8.7 Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes2019-01-21 11:07:07.378754111 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new.28833/libqt4.changes 2019-02-28 21:25:22.613893503 +0100 @@ -1,0 +2,11 @@ +Wed Feb 27 10:28:51 UTC 2019 - Fabian Vogt + +- Drop libqt4-devel-doc, fails to build with GCC9 + +--- +Fri Feb 22 13:22:20 UTC 2019 - Fabian Vogt + +- Add patch to fix build with GCC 9 (boo#1121214): + * 0001-Redo-the-Q_FOREACH-loop-control-without-GCC-statemen.patch + +--- Old: libqt4-devel-doc.changes libqt4-devel-doc.spec New: 0001-Redo-the-Q_FOREACH-loop-control-without-GCC-statemen.patch Other differences: -- ++ libqt4-sql-plugins.spec ++ --- /var/tmp/diff_new_pack.eRZB99/_old 2019-02-28 21:25:26.549892186 +0100 +++ /var/tmp/diff_new_pack.eRZB99/_new 2019-02-28 21:25:26.553892184 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # # nodebuginfo ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.eRZB99/_old 2019-02-28 21:25:26.573892178 +0100 +++ /var/tmp/diff_new_pack.eRZB99/_new 2019-02-28 21:25:26.581892176 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -164,6 +164,8 @@ Patch170: fix-build-icu59.patch # PATCH-FIX-UPSTREAM fix bolder fonts in qt4 apps [boo#956357] [QTBUG#27301] Patch171: fix-medium-font.diff +# PATCH-FIX-UPSTREAM +Patch172: 0001-Redo-the-Q_FOREACH-loop-control-without-GCC-statemen.patch # PATCH-FIX-OPENSUSE no-ssl3.patch Patch200: no-ssl3.patch # PATCH-FIX-OPENSUSE qt4-openssl-1.1.0pre-3.patch @@ -498,6 +500,7 @@ %patch169 -p1 %patch170 -p1 %patch171 -p1 +%patch172 -p1 %if 0%{?suse_version} >= 1330 %patch200 -p1 %patch201 -p1 ++ 0001-Redo-the-Q_FOREACH-loop-control-without-GCC-statemen.patch ++ >From c35a3f519007af44c3b364b9af86f6a336f6411b Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 11 Feb 2014 16:17:46 -0800 Subject: [PATCH] Redo the Q_FOREACH loop control without GCC statement expressions It's possible to do without them, which probably makes the number of supported compilers a lot bigger: they just need to support decltype() or __typeof__. That includes the Intel compiler. The old code was also apparently working, but no one had realized the old workaround for some old version was still in place. The loop overhead is more or less the same. I have not done benchmarks, but inspection of the generated assembly shows more or less the same number of instructions. Change-Id: I32d499c84a6ddd19d994b49f17a469acb5c3a3f1 Reviewed-by: Olivier Goffart Reviewed-by: Marc Mutz --- src/corelib/global/qglobal.h | 24 +--- 1 file changed, 17 insertions(+), 7 deletions(-) Index: qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h === --- qt-everywhere-opensource-src-4.8.7.orig/src/corelib/global/qglobal.h +++ qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h @@ -2483,22 +2483,32 @@ typedef uint Flags; #endif /* Q_NO_TYPESAFE_FLAGS */ -#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_RVCT) +#if (defined(Q_CC_GNU) && !defined(Q_CC_RVCT)) /* make use of typeof-extension */ template class QForeachContainer { public: -inline QForeachContainer(const T& t) : c(t), brk(0), i(c.begin()), e(c.end()) { } +inline QForeachContainer(const T& t) : c(t), i(c.begin()), e(c.end()), control(1) { } const T c; int brk; typename T::const_iterator i, e; +int control; }; -#define Q_FOREACH(variable, container)\ -for (QForeachContainer<__typeof__(container)> _container_(container); \ - !_container_.brk && _container_.i != _container_.e; \ - __extension__ ({ ++_container_.brk; ++_container_.i; })) \ -for (variable = *_containe
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2019-01-21 11:06:45 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new.28833 (New) Package is "libqt4" Mon Jan 21 11:06:45 2019 rev:228 rq:664580 version:4.8.7 Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2018-03-04 11:54:19.542424576 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new.28833/libqt4-devel-doc.changes 2019-01-21 11:07:07.298754212 +0100 @@ -1,0 +2,7 @@ +Wed Jan 9 09:38:38 UTC 2019 - rguent...@suse.com + +- Add libqt4-toplevel-asm.patch to adhere to stricter + toplevel asm parsing, dropping volatile qualification that has no + effect. (boo#1121214) + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change Old: libqt4-devel-doc.spec.in libqt4-sql-plugins.spec.in New: libqt4-toplevel-asm.patch Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.FtPwvz/_old 2019-01-21 11:07:11.198749258 +0100 +++ /var/tmp/diff_new_pack.FtPwvz/_new 2019-01-21 11:07:11.198749258 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqt4-devel-doc # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -134,6 +134,8 @@ Patch201: qt4-openssl-1.1.0pre-3.patch # PATCH-FIX-OPENSUSE qt-everywhere-opensource-src-4.8.7-openssl.patch Patch202: qt-everywhere-opensource-src-4.8.7-openssl.patch +# PATCH-FIX-OPENSUSE libqt4-toplevel-asm.patch +Patch203: libqt4-toplevel-asm.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 @@ -228,6 +230,7 @@ %patch201 -p1 %patch202 -p1 %endif +%patch203 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts} libqt4-sql-plugins.spec: same change ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.FtPwvz/_old 2019-01-21 11:07:11.234749213 +0100 +++ /var/tmp/diff_new_pack.FtPwvz/_new 2019-01-21 11:07:11.238749208 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqt4 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -170,6 +170,8 @@ Patch201: qt4-openssl-1.1.0pre-3.patch # PATCH-FIX-OPENSUSE qt-everywhere-opensource-src-4.8.7-openssl.patch Patch202: qt-everywhere-opensource-src-4.8.7-openssl.patch +# PATCH-FIX-OPENSUSE libqt4-toplevel-asm.patch +Patch203: libqt4-toplevel-asm.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 @@ -501,6 +503,7 @@ %patch201 -p1 %patch202 -p1 %endif +%patch203 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts} ++ libqt4-toplevel-asm.patch ++ Subject: Adhere to stricter asm parsing rules, toplevel asms do not have qualifiers From: Richard Biener Refe
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2018-03-04 11:54:16 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4" Sun Mar 4 11:54:16 2018 rev:227 rq:581812 version:4.8.7 Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2018-03-01 12:04:48.836546963 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2018-03-04 11:54:19.542424576 +0100 @@ -1,0 +2,6 @@ +Thu Mar 1 17:55:12 UTC 2018 - fab...@ritter-vogt.de + +- Restore Qt4 WebKit removal +- Remove pre_checkin.sh, it only breaks stuff + +--- libqt4.changes: same change Old: pre_checkin.sh Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.z2KfYc/_old 2018-03-04 11:54:23.814270804 +0100 +++ /var/tmp/diff_new_pack.z2KfYc/_new 2018-03-04 11:54:23.818270660 +0100 @@ -45,7 +45,6 @@ Release:0 # COMMON-VERSION-END # COMMON-VERSION-END -BuildRequires: libQtWebKit-devel >= %{version} BuildRequires: libqt4-devel >= %{version} Requires: libqt4 = %{version} Requires: libqt4-devel-doc-data = %{version} @@ -252,7 +251,7 @@ platform="" %endif echo yes | ./configure %common_options $platform \ - -webkit -xmlpatterns -no-sql-sqlite -no-sql-sqlite2 -no-sql-mysql + -no-webkit -xmlpatterns -no-sql-sqlite -no-sql-sqlite2 -no-sql-mysql %check_config # Simply use the binaries from the -devel package instead of building it again @@ -260,10 +259,6 @@ ( while read file; do test -e bin/$file || ln -s %{_bindir}/$file bin/ ; done ) rpm -ql libqt4-devel | grep %{_libdir}/lib | sed 's#%{_libdir}/##' | \ ( while read file; do test -e lib/$file || ln -s %{_libdir}/$file lib/ ; done ) -rpm -ql libQtWebKit-devel | grep %{_bindir}/ | sed 's#%{_bindir}/##' | \ -( while read file; do test -e bin/$file || ln -s %{_bindir}/$file bin/ ; done ) -rpm -ql libQtWebKit-devel | grep %{_libdir}/lib | sed 's#%{_libdir}/##' | \ -( while read file; do test -e lib/$file || ln -s %{_libdir}/$file lib/ ; done ) make %{?_smp_mflags} -C tools/assistant make %{?_smp_mflags} -C demos @@ -276,9 +271,7 @@ make INSTALL_ROOT=%{buildroot} -C demos install make INSTALL_ROOT=%{buildroot} -C examples install mv %{buildroot}/%{_libdir}/qt4/examples/painting/svgviewer/svgviewer %{buildroot}/%{_bindir} -mv %{buildroot}/%{_libdir}/qt4/demos/browser/browser %{buildroot}/%{_bindir}/qt4-browser ln -s %{_bindir}/svgviewer %{buildroot}/%{_libdir}/qt4/examples/painting/svgviewer/svgviewer -ln -s %{_bindir}/qt4-browser %{buildroot}/%{_libdir}/qt4/demos/browser/browser # htmldocs are not generated - why? for d in docimages qchdocs htmldocs ; do @@ -348,7 +341,6 @@ %files -n qt4-x11-tools %defattr(-,root,root,755) -%{_bindir}/qt4-browser %{_bindir}/svgviewer %files data libqt4.spec: same change
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2018-03-01 12:04:46 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4" Thu Mar 1 12:04:46 2018 rev:226 rq:580072 version:4.8.7 Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2017-12-05 01:25:12.560260147 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2018-03-01 12:04:48.836546963 +0100 @@ -1,0 +2,35 @@ +Thu Feb 15 18:39:18 UTC 2018 - crrodrig...@opensuse.org + +- Do not use xorg-x11-devel metapackage, instead use individual + libraries. +- libqt4-devel Requires have been adjusted to require all X11 + libs which were used for build, none of them are actually + required but remain there in order not to break hundreds + of packages that may have counted on xorg-x11-devel being + pulled. + +--- +Tue Dec 26 12:42:05 UTC 2017 - fab...@ritter-vogt.de + +- Change fix-build-icu59.patch to build qlocale_icu.cpp with + -std=c++11 to support ICU60 headers + +--- +Wed Dec 6 16:56:06 UTC 2017 - fab...@ritter-vogt.de + +- Add proper patch headers to: + * no-ssl3.patch + * qt4-openssl-1.1.0pre-3.patch +- Remove patch, not needed: + * qt-everywhere-opensource-src-4.8.7-gcc7.patch + +--- +Tue Dec 5 01:45:40 CET 2017 - r...@suse.de + +- add patches from mageia to fix build with openssl-1.1 +- add no-ssl3.patch +- add qt4-openssl-1.1.0pre-3.patch +- add qt-everywhere-opensource-src-4.8.7-openssl.patch +- add qt-everywhere-opensource-src-4.8.7-gcc7.patch + +--- libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes2018-01-09 14:48:08.414016437 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2018-03-01 12:04:49.036539788 +0100 @@ -1,0 +2,21 @@ +Mon Feb 26 09:12:04 UTC 2018 - fab...@ritter-vogt.de + +- Actually clean up openssl BuildReq: use pkgconfig(openssl) + +--- +Wed Feb 21 09:36:31 UTC 2018 - vci...@suse.com + +- Clean up openssl BuildRequires + +--- +Thu Feb 15 18:39:18 UTC 2018 - crrodrig...@opensuse.org + +- Do not use xorg-x11-devel metapackage, instead use individual + libraries. +- libqt4-devel Requires have been adjusted to require all X11 + libs which were used for build, none of them are actually + required but remain there in order not to break hundreds + of packages that may have counted on xorg-x11-devel being + pulled. + +--- Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.fR0OkA/_old 2018-03-01 12:04:55.116321651 +0100 +++ /var/tmp/diff_new_pack.fR0OkA/_new 2018-03-01 12:04:55.120321508 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqt4-devel-doc # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,17 +24,17 @@ BuildRequires: freeglut-devel BuildRequires: gtk2-devel BuildRequires: libjpeg-devel +BuildRequires: pkgconfig(gl) %if 0%{?suse_version} >= 1330 BuildRequires: libnsl-devel %endif BuildRequires: libpng-devel BuildRequires: sqlite3-devel -BuildRequires: pkgconfig(gl) %if 0%{?suse_version} BuildRequires: update-desktop-files %endif Summary:Qt documentation -License:SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 +License:SUSE-LGPL-2.1-with-digia-exception-1.1 OR GPL-3.0-only Group: Documentation/HTML Url:http://qt.digia.com/ # COMMON-VERSION-BEGIN @@ -45,6 +45,7 @@ Release:0 # COMMON-VERSION-END # COMMON-VERSION-END +BuildRequires: libQtWebKit-devel >= %{version} BuildRequires: libqt4-devel >= %{version} Requires: libqt4 = %{version} Requires: libqt4-devel-doc-data = %{version} @@ -128,6 +129,12 @@ Patch170: fix-build-icu59.patch # PATCH-FIX-UPSTREAM fix bolder fonts in qt4 apps [boo#956357] [QTBUG#27301] Patch171: fix-medium-font.diff +# PATCH-FIX-OPENSUSE no-ssl3.patch +Patch200: no-ssl3.patch +# PATCH-FIX-OPENSUSE qt4-openssl-1.1.0pre-3.patch +Patch201: qt4-openssl-1.1.0pre-3.patch +# PATCH-FIX-OPENSUSE qt-ev
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2018-01-09 14:48:07 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4" Tue Jan 9 14:48:07 2018 rev:225 rq:560556 version:4.8.7 Changes: libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes2017-12-16 20:44:49.930280056 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2018-01-09 14:48:08.414016437 +0100 @@ -1,0 +2,6 @@ +Tue Dec 26 12:42:05 UTC 2017 - fab...@ritter-vogt.de + +- Change fix-build-icu59.patch to build qlocale_icu.cpp with + -std=c++11 to support ICU60 headers + +--- Other differences: -- libqt4-sql-plugins.spec: same change libqt4.spec: same change ++ fix-build-icu59.patch ++ --- /var/tmp/diff_new_pack.RjpybD/_old 2018-01-09 14:48:13.945757066 +0100 +++ /var/tmp/diff_new_pack.RjpybD/_new 2018-01-09 14:48:13.945757066 +0100 @@ -1,29 +1,28 @@ -From: Fabian Vogt +From: Fabian Vogt Subject: Fix build with ICU >= 59 -This works around the C++11 requirement of ICU4C >= 59, -resulting in -/usr/include/unicode/umachine.h:347:13: error: 'char16_t' does not name a type -and ultimately: -/usr/include/unicode/uversion.h:167:55: error: 'UChar' does not name a type +ICU >= 59 requires C++11 for its header files. +Qt can't be compiled with -std=c++11 as a whole, so only enable +it for qlocale_icu.cpp. - src/corelib/tools/qlocale_icu.cpp |3 +++ - 1 file changed, 3 insertions(+) - -Index: qt-everywhere-opensource-src-4.8.7/src/corelib/tools/qlocale_icu.cpp +Index: qt-everywhere-opensource-src-4.8.7/src/corelib/tools/tools.pri === qt-everywhere-opensource-src-4.8.7.orig/src/corelib/tools/qlocale_icu.cpp -+++ qt-everywhere-opensource-src-4.8.7/src/corelib/tools/qlocale_icu.cpp -@@ -43,6 +43,11 @@ - #include "qlibrary.h" - #include "qdebug.h" +--- qt-everywhere-opensource-src-4.8.7.orig/src/corelib/tools/tools.pri qt-everywhere-opensource-src-4.8.7/src/corelib/tools/tools.pri +@@ -102,7 +102,15 @@ contains(QT_CONFIG, zlib):include($$PWD/ + else:include($$PWD/../../3rdparty/zlib_dependency.pri) -+#if __cplusplus < 201103L -+// ICU59 requires C++11, work around that -+typedef qint16 char16_t; -+#endif + contains(QT_CONFIG,icu) { +-SOURCES += tools/qlocale_icu.cpp ++cpp11.name = cpp11 ++cpp11.input = SOURCES_CPP11 ++cpp11.dependency_type = TYPE_C ++cpp11.variable_out = OBJECTS ++cpp11.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_IN_BASE}$${first(QMAKE_EXT_OBJ)} ++cpp11.commands = $${QMAKE_CXX} $(CXXFLAGS) -std=c++11 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} ++QMAKE_EXTRA_COMPILERS += cpp11 + - #include "unicode/uversion.h" - #include "unicode/ucol.h" ++SOURCES_CPP11 += tools/qlocale_icu.cpp + DEFINES += QT_USE_ICU + }
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2017-12-16 20:44:45 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4" Sat Dec 16 20:44:45 2017 rev:224 rq:554902 version:4.8.7 Changes: libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes2017-10-23 16:21:46.641193196 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2017-12-16 20:44:49.930280056 +0100 @@ -1,0 +2,18 @@ +Wed Dec 6 16:56:06 UTC 2017 - fab...@ritter-vogt.de + +- Add proper patch headers to: + * no-ssl3.patch + * qt4-openssl-1.1.0pre-3.patch +- Remove patch, not needed: + * qt-everywhere-opensource-src-4.8.7-gcc7.patch + +--- +Tue Dec 5 01:45:40 CET 2017 - r...@suse.de + +- add patches from mageia to fix build with openssl-1.1 +- add no-ssl3.patch +- add qt4-openssl-1.1.0pre-3.patch +- add qt-everywhere-opensource-src-4.8.7-openssl.patch +- add qt-everywhere-opensource-src-4.8.7-gcc7.patch + +--- New: no-ssl3.patch qt-everywhere-opensource-src-4.8.7-openssl.patch qt4-openssl-1.1.0pre-3.patch Other differences: -- libqt4-sql-plugins.spec: same change ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.zbTnrd/_old 2017-12-16 20:44:57.009938291 +0100 +++ /var/tmp/diff_new_pack.zbTnrd/_new 2017-12-16 20:44:57.013938098 +0100 @@ -35,7 +35,7 @@ BuildRequires: libjpeg-devel BuildRequires: libmng-devel %if 0%{?suse_version} >= 1330 -BuildRequires: libopenssl-1_0_0-devel +BuildRequires: libopenssl-1_1_0-devel # libnsl has been split out of glibc for CODE15 BuildRequires: libnsl-devel %else @@ -154,6 +154,12 @@ Patch170: fix-build-icu59.patch # PATCH-FIX-UPSTREAM fix bolder fonts in qt4 apps [boo#956357] [QTBUG#27301] Patch171: fix-medium-font.diff +# PATCH-FIX-OPENSUSE no-ssl3.patch +Patch200: no-ssl3.patch +# PATCH-FIX-OPENSUSE qt4-openssl-1.1.0pre-3.patch +Patch201: qt4-openssl-1.1.0pre-3.patch +# PATCH-FIX-OPENSUSE qt-everywhere-opensource-src-4.8.7-openssl.patch +Patch202: qt-everywhere-opensource-src-4.8.7-openssl.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 @@ -193,7 +199,7 @@ Requires: glib2-devel Requires: libmng-devel %if 0%{?suse_version} >= 1330 -Requires: libopenssl-1_0_0-devel +Requires: libopenssl-1_1_0-devel %else Requires: openssl-devel %endif @@ -473,6 +479,11 @@ %patch169 -p1 %patch170 -p1 %patch171 -p1 +%if 0%{?suse_version} >= 1330 +%patch200 -p1 +%patch201 -p1 +%patch202 -p1 +%endif # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts} @@ -485,8 +496,13 @@ %ifarch ppc64 RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc" %endif -export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF -std=gnu++98" -export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF" +%if 0%{?suse_version} >= 1330 +NO_SSL2="-DOPENSSL_NO_SSL2" +%else +NO_SSL2="" +%endif +export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF $NO_SSL2 -std=gnu++98" +export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF $NO_SSL2" export MAKEFLAGS="%{?_smp_mflags}" touch translations/qt_de.qm %ifarch sparc64 ++ no-ssl3.patch ++ From: Jon DeVree Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=806505 Reviewed-by: Lisandro Damián Nicanor Pérez Meyer Last-Update: 2015-11-30 Description: Do not use SSLv3 methods in Qt4 >From https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=806505 This patch makes the use of SSLv3 methods optional at compile time. On Debian this means they will not be used and will return a null ctx if the SSLv3 method is deliberately selected. --- diff -Nru qt4-x11-4.8.7+dfsg.orig/src/network/ssl/qsslsocket_openssl.cpp qt4-x11-4.8.7+dfsg/src/network/ssl/qsslsocket_openssl.cp
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2017-12-05 01:25:11 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4" Tue Dec 5 01:25:11 2017 rev:223 rq:547666 version:4.8.7 Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2017-10-23 16:21:45.989223720 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2017-12-05 01:25:12.560260147 +0100 @@ -1,0 +2,6 @@ +Sat Dec 2 13:32:21 UTC 2017 - fab...@ritter-vogt.de + +- Do not require Qt4 WebKit: + * Vade retro satana + +--- libqt4.changes: same change Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.diNGJE/_old 2017-12-05 01:25:18.360049438 +0100 +++ /var/tmp/diff_new_pack.diNGJE/_new 2017-12-05 01:25:18.364049293 +0100 @@ -45,7 +45,6 @@ Release:0 # COMMON-VERSION-END # COMMON-VERSION-END -BuildRequires: libQtWebKit-devel >= %{version} BuildRequires: libqt4-devel >= %{version} Requires: libqt4 = %{version} Requires: libqt4-devel-doc-data = %{version} @@ -241,7 +240,7 @@ platform="" %endif echo yes | ./configure %common_options $platform \ - -webkit -xmlpatterns -no-sql-sqlite -no-sql-sqlite2 -no-sql-mysql + -no-webkit -xmlpatterns -no-sql-sqlite -no-sql-sqlite2 -no-sql-mysql %check_config # Simply use the binaries from the -devel package instead of building it again @@ -249,10 +248,6 @@ ( while read file; do test -e bin/$file || ln -s %{_bindir}/$file bin/ ; done ) rpm -ql libqt4-devel | grep %{_libdir}/lib | sed 's#%{_libdir}/##' | \ ( while read file; do test -e lib/$file || ln -s %{_libdir}/$file lib/ ; done ) -rpm -ql libQtWebKit-devel | grep %{_bindir}/ | sed 's#%{_bindir}/##' | \ -( while read file; do test -e bin/$file || ln -s %{_bindir}/$file bin/ ; done ) -rpm -ql libQtWebKit-devel | grep %{_libdir}/lib | sed 's#%{_libdir}/##' | \ -( while read file; do test -e lib/$file || ln -s %{_libdir}/$file lib/ ; done ) make %{?_smp_mflags} -C tools/assistant make %{?_smp_mflags} -C demos @@ -265,9 +260,7 @@ make INSTALL_ROOT=%{buildroot} -C demos install make INSTALL_ROOT=%{buildroot} -C examples install mv %{buildroot}/%{_libdir}/qt4/examples/painting/svgviewer/svgviewer %{buildroot}/%{_bindir} -mv %{buildroot}/%{_libdir}/qt4/demos/browser/browser %{buildroot}/%{_bindir}/qt4-browser ln -s %{_bindir}/svgviewer %{buildroot}/%{_libdir}/qt4/examples/painting/svgviewer/svgviewer -ln -s %{_bindir}/qt4-browser %{buildroot}/%{_libdir}/qt4/demos/browser/browser # htmldocs are not generated - why? for d in docimages qchdocs htmldocs ; do @@ -337,7 +330,6 @@ %files -n qt4-x11-tools %defattr(-,root,root,755) -%{_bindir}/qt4-browser %{_bindir}/svgviewer %files data libqt4.spec: same change
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2017-10-23 16:21:44 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4" Mon Oct 23 16:21:44 2017 rev:222 rq:534394 version:4.8.7 Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2017-09-14 21:09:46.936462811 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2017-10-23 16:21:45.989223720 +0200 @@ -62 +62 @@ -- update to 4.8.7: +- update to 4.8.7 (bsc#1039291): libqt4-sql-plugins.changes: same change libqt4.changes: same change Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.DKxwjr/_old 2017-10-23 16:21:51.688956873 +0200 +++ /var/tmp/diff_new_pack.DKxwjr/_new 2017-10-23 16:21:51.688956873 +0200 @@ -1,7 +1,7 @@ # # spec file for package libqt4-devel-doc # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,8 @@ # # nodebuginfo + Name: libqt4-devel-doc -BuildRequires: pkgconfig(gl) BuildRequires: alsa-devel BuildRequires: cups-devel BuildRequires: fdupes @@ -29,13 +29,14 @@ %endif BuildRequires: libpng-devel BuildRequires: sqlite3-devel +BuildRequires: pkgconfig(gl) %if 0%{?suse_version} BuildRequires: update-desktop-files %endif -License:SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Summary:Qt documentation -Url:http://qt.digia.com/ +License:SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Group: Documentation/HTML +Url:http://qt.digia.com/ # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN %define base_name libqt4 ++ libqt4-sql-plugins.spec ++ --- /var/tmp/diff_new_pack.DKxwjr/_old 2017-10-23 16:21:51.712955749 +0200 +++ /var/tmp/diff_new_pack.DKxwjr/_new 2017-10-23 16:21:51.712955749 +0200 @@ -1,7 +1,7 @@ # # spec file for package libqt4-sql-plugins # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,7 @@ # # nodebuginfo + %if 0%{?suse_version} >= 1330 %bcond_with mysql %else @@ -23,10 +24,10 @@ %endif Name: libqt4-sql-plugins -BuildRequires: pkgconfig(gl) BuildRequires: alsa-devel BuildRequires: cups-devel BuildRequires: gtk2-devel +BuildRequires: pkgconfig(gl) %if %{with mysql} BuildRequires: libmysqlclient-devel %endif @@ -39,10 +40,10 @@ %if 0%{?suse_version} BuildRequires: update-desktop-files %endif -License:SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Summary:Qt 4 SQL related libraries -Url:http://qt.digia.com/ +License:SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Group: System/Libraries +Url:http://qt.digia.com/ # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN %define base_name libqt4 ++ libqt4-devel-doc.spec.in ++ --- /var/tmp/diff_new_pack.DKxwjr/_old 2017-10-23 16:21:51.888947510 +0200 +++ /var/tmp/diff_new_pack.DKxwjr/_new 2017-10-23 16:21:51.892947322 +0200 @@ -24,6 +24,9 @@ BuildRequires: freeglut-devel BuildRequires: gtk2-devel BuildRequires: libjpeg-devel +%if 0%{?suse_version} >= 1330 +BuildRequires: libnsl-devel +%endif BuildRequires: libpng-devel BuildRequires: sqlite3-devel %if 0%{?suse_version} ++ libqt4-sql-plugins.spec.in ++ --- /var/tmp/diff_new_pack.DKxwjr/_old 2017-10-23 16:21:51.920946011 +0200 +++ /var/tmp/diff_new_pack.DKxwjr/_new 2017-10-23 16:21:51.920946011 +0200 @@ -30,6 +30,9 @@ %if %{with mysql} BuildRequires: libmysqlclient-devel %endif +%if 0%{?suse_version} >= 1330 +BuildRequires: libnsl-devel +%endif BuildRequires: pkgconfig BuildRequires: postgresql-devel BuildRequires: unixODBC-devel
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2017-09-14 21:09:40 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4" Thu Sep 14 21:09:40 2017 rev:221 rq:523214 version:4.8.7 Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2017-03-09 01:28:06.407071361 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2017-09-14 21:09:46.936462811 +0200 @@ -1,0 +2,28 @@ +Sun Sep 10 18:19:39 UTC 2017 - dims...@opensuse.org + +- BuildRequire libnsl-devel on current TW and CODE15 targets. The + library has been deprecated in glibc and is now in an own + package. + +--- +Mon Sep 4 13:41:22 UTC 2017 - corne...@solcon.nl + +- Add fix-medium-font.diff (taken from ubuntu) to fix bolder font + in Qt4 apps (boo#956357) + +--- +Thu Aug 24 13:50:50 UTC 2017 - fv...@suse.com + +- Force building against openSSL 1.0 (boo#1042657) +- Do not build the MySQL plugin on TW, it would cause an openSSL + version conflict +- Adjust fix-build-icu59.patch to also work if built with c++11 + support + +--- +Wed May 10 09:04:37 UTC 2017 - fab...@ritter-vogt.de + +- Add fix-build-icu59.patch to fix building with ICU4C >= 59 +- Invoke configure with sh to fix build on some older distros + +--- libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes2017-05-18 20:44:08.862590720 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2017-09-14 21:09:47.272415520 +0200 @@ -1,0 +2,22 @@ +Sun Sep 10 18:19:39 UTC 2017 - dims...@opensuse.org + +- BuildRequire libnsl-devel on current TW and CODE15 targets. The + library has been deprecated in glibc and is now in an own + package. + +--- +Mon Sep 4 13:41:22 UTC 2017 - corne...@solcon.nl + +- Add fix-medium-font.diff (taken from ubuntu) to fix bolder font + in Qt4 apps (boo#956357) + +--- +Thu Aug 24 13:50:50 UTC 2017 - fv...@suse.com + +- Force building against openSSL 1.0 (boo#1042657) +- Do not build the MySQL plugin on TW, it would cause an openSSL + version conflict +- Adjust fix-build-icu59.patch to also work if built with c++11 + support + +--- New: fix-medium-font.diff Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.V2MBlj/_old 2017-09-14 21:10:21.799555345 +0200 +++ /var/tmp/diff_new_pack.V2MBlj/_new 2017-09-14 21:10:21.807554220 +0200 @@ -1,7 +1,7 @@ # # spec file for package libqt4-devel-doc # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,24 +16,26 @@ # # nodebuginfo - Name: libqt4-devel-doc +BuildRequires: pkgconfig(gl) BuildRequires: alsa-devel BuildRequires: cups-devel BuildRequires: fdupes BuildRequires: freeglut-devel BuildRequires: gtk2-devel BuildRequires: libjpeg-devel +%if 0%{?suse_version} >= 1330 +BuildRequires: libnsl-devel +%endif BuildRequires: libpng-devel BuildRequires: sqlite3-devel -BuildRequires: pkgconfig(gl) %if 0%{?suse_version} BuildRequires: update-desktop-files %endif -Summary:Qt documentation License:SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 -Group: Documentation/HTML +Summary:Qt documentation Url:http://qt.digia.com/ +Group: Documentation/HTML # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN %define base_name libqt4 @@ -122,6 +124,10 @@ Patch168: fix-gcc6-detection.diff # PATCH-FIX-UPSTREAM fix-moc-parsing-with-glibc-2.25.patch -- Fixes moc parsing correctly glibc 2.25 system headers Patch169: fix-moc-parsing-with-glibc-2.25.patch +# PATCH-FIX-OPENSUSE fix-build-icu59.patch -- Workaround C++11 requirement +Patch170: fix-build-icu59.patch +# PATCH-FIX-UPSTREAM fix bolder fonts in qt4 apps [boo#956357] [QTBUG#27301] +Patch171: fix-medium-font.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -openssl-linked -xrender -xcursor -dbus-linked
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2017-05-18 20:44:07 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4" Thu May 18 20:44:07 2017 rev:220 rq:494381 version:4.8.7 Changes: libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes2017-03-09 01:28:06.467062864 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2017-05-18 20:44:08.862590720 +0200 @@ -1,0 +2,6 @@ +Wed May 10 09:04:37 UTC 2017 - fab...@ritter-vogt.de + +- Add fix-build-icu59.patch to fix building with ICU4C >= 59 +- Invoke configure with sh to fix build on some older distros + +--- New: fix-build-icu59.patch Other differences: -- libqt4-sql-plugins.spec: same change ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.gJWzJw/_old 2017-05-18 20:44:14.177840606 +0200 +++ /var/tmp/diff_new_pack.gJWzJw/_new 2017-05-18 20:44:14.181840042 +0200 @@ -144,6 +144,8 @@ Patch168: fix-gcc6-detection.diff # PATCH-FIX-UPSTREAM fix-moc-parsing-with-glibc-2.25.patch -- Fixes moc parsing correctly glibc 2.25 system headers Patch169: fix-moc-parsing-with-glibc-2.25.patch +# PATCH-FIX-OPENSUSE fix-build-icu59.patch -- Workaround C++11 requirement +Patch170: fix-build-icu59.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 @@ -457,6 +459,7 @@ %patch167 -p1 %patch168 -p1 %patch169 -p1 +%patch170 -p1 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts} @@ -482,7 +485,7 @@ CHANGES=`stat --format="%y" %{SOURCE1}|cut --characters=1-10` sed -i -e "s/qt_instdate=\$TODAY/qt_instdate=$CHANGES/" configure -echo yes | ./configure %common_options $platform \ +echo yes | sh ./configure %common_options $platform \ -plugin-sql-sqlite -nomake examples -nomake demos -nomake docs \ %ifarch %arm -no-neon \ ++ fix-build-icu59.patch ++ From: Fabian Vogt Subject: Fix build with ICU >= 59 This works around the C++11 requirement of ICU4C >= 59, resulting in /usr/include/unicode/umachine.h:347:13: error: 'char16_t' does not name a type and ultimately: /usr/include/unicode/uversion.h:167:55: error: 'UChar' does not name a type --- src/corelib/tools/qlocale_icu.cpp |3 +++ 1 file changed, 3 insertions(+) --- a/src/corelib/tools/qlocale_icu.cpp +++ b/src/corelib/tools/qlocale_icu.cpp @@ -43,6 +43,9 @@ #include "qlibrary.h" #include "qdebug.h" +// ICU59 requires C++11, work around that +typedef qint16 char16_t; + #include "unicode/uversion.h" #include "unicode/ucol.h"
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2017-03-09 01:28:05 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4" Thu Mar 9 01:28:05 2017 rev:219 rq:456158 version:4.8.7 Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2016-08-03 11:40:54.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2017-03-09 01:28:06.407071361 +0100 @@ -1,0 +2,6 @@ +Fri Feb 10 21:02:26 UTC 2017 - alarr...@suse.com + +- Add fix-moc-parsing-with-glibc-2.25.patch to fix moc parsing + system headers from glibc 2.25 correctly. + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change New: fix-moc-parsing-with-glibc-2.25.patch Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.V9ffBX/_old 2017-03-09 01:28:16.237678983 +0100 +++ /var/tmp/diff_new_pack.V9ffBX/_new 2017-03-09 01:28:16.241678416 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqt4-devel-doc # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -120,6 +120,8 @@ Patch167: disable-rc4-ciphers-bnc865241.diff # PATCH-FIX-OPENSUSE fix-gcc6-detection.diff -- Fix GCC6 detection Patch168: fix-gcc6-detection.diff +# PATCH-FIX-UPSTREAM fix-moc-parsing-with-glibc-2.25.patch -- Fixes moc parsing correctly glibc 2.25 system headers +Patch169: fix-moc-parsing-with-glibc-2.25.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 @@ -206,6 +208,7 @@ %patch166 -p1 %patch167 -p1 %patch168 -p1 +%patch169 -p1 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts} libqt4-sql-plugins.spec: same change libqt4.spec: same change ++ fix-moc-parsing-with-glibc-2.25.patch ++ Fixes moc parsing of (#__VA_ARGS__) expressions glibc 2.25 introduced code like the following in /usr/include/sys/sysmacros.h: #define __SYSMACROS_DM(symbol) __SYSMACROS_DM1 \ (In the GNU C Library, symbol is defined\n\ by . For historical compatibility, it is\n\ currently defined by as well, but we plan to\n\ remove this soon. To use #symbol, include \n\ directly. If you did not intend to use a system-defined macro\n\ #symbol, you should undefine it after including .) (where __SYSMACROS_DM1 is defined as: #define __SYSMACROS_DM1(...) __glibc_macro_warning (#__VA_ARGS__) ) when parsing that with moc, it gives the following parse error: /usr/include/glib-2.0/gobject/gtype.h:52: Parse error at "defined" This patch fixes this, so it ignores arguments passed to (#__VA_ARGS__) since they're supposed to be strings anyway. Index: qt-everywhere-opensource-src-4.8.7/src/tools/moc/preprocessor.cpp === --- qt-everywhere-opensource-src-4.8.7.orig/src/tools/moc/preprocessor.cpp +++ qt-everywhere-opensource-src-4.8.7/src/tools/moc/preprocessor.cpp @@ -535,6 +535,21 @@ void Preprocessor::substituteUntilNewlin MacroName macro = symbol(); if (macros.contains(macro) && !safeset.contains(macro)) { substituteMacro(macro, substituted, safeset); +if (substituted.count()>4) +{ +int i=substituted.count()-4; +if (substituted.at(i).lexem()=="(" + && substituted.at(i+1).lexem()=="#" + && substituted.at(i+2).lexem()=="__VA_ARGS__" + && substituted.at(i+3).lexem()==")") +{ + // Let's ignore the following expression, since it'll considered a string, and so, it's bet
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2016-08-03 11:40:52 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 2016-02-17 12:14:35.0 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2016-08-03 11:40:54.0 +0200 @@ -1,0 +2,10 @@ +Fri Jun 24 05:12:34 UTC 2016 - lbeltr...@kde.org + +- Add fix-gcc6-detection.diff to fix GCC6 detection (boo#986350) + +--- +Thu Jun 2 16:35:38 UTC 2016 - matwey.korni...@gmail.com + +- Enable libqt4-devel-32bit to fix boo#982826 + +--- libqt4-sql-plugins.changes: same change Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.0AKZJU/_old 2016-08-03 11:40:59.0 +0200 +++ /var/tmp/diff_new_pack.0AKZJU/_new 2016-08-03 11:40:59.0 +0200 @@ -118,6 +118,8 @@ Patch166: 0001-Fix-exclusion-of-anonymous-ciphers.patch # PATCH-FIX-OPENSUSE disable-insecure-ciphers-bnc865241.diff -- Disable insecure ciphers (rc4, aecdh, adh, exp-adh, <128 bits) Patch167: disable-rc4-ciphers-bnc865241.diff +# PATCH-FIX-OPENSUSE fix-gcc6-detection.diff -- Fix GCC6 detection +Patch168: fix-gcc6-detection.diff 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 @@ -203,6 +205,7 @@ %patch165 -p1 %patch166 -p1 %patch167 -p1 +%patch168 -p1 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts} libqt4-sql-plugins.spec: same change
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2016-06-25 01:56:22 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4" Changes: libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes2016-06-07 23:43:47.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2016-06-25 01:56:24.0 +0200 @@ -1,0 +2,5 @@ +Fri Jun 24 05:12:34 UTC 2016 - lbeltr...@kde.org + +- Add fix-gcc6-detection.diff to fix GCC6 detection (boo#986350) + +--- New: fix-gcc6-detection.diff Other differences: -- libqt4-sql-plugins.spec: same change ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.e1cq7H/_old 2016-06-25 01:56:35.0 +0200 +++ /var/tmp/diff_new_pack.e1cq7H/_new 2016-06-25 01:56:35.0 +0200 @@ -140,6 +140,8 @@ Patch166: 0001-Fix-exclusion-of-anonymous-ciphers.patch # PATCH-FIX-OPENSUSE disable-insecure-ciphers-bnc865241.diff -- Disable insecure ciphers (rc4, aecdh, adh, exp-adh, <128 bits) Patch167: disable-rc4-ciphers-bnc865241.diff +# PATCH-FIX-OPENSUSE fix-gcc6-detection.diff -- Fix GCC6 detection +Patch168: fix-gcc6-detection.diff 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 @@ -451,6 +453,7 @@ %patch165 -p1 %patch166 -p1 %patch167 -p1 +%patch168 -p1 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts} ++ fix-gcc6-detection.diff ++ diff --git a/configure b/configure index 10ad7ca..3cdae43 100644 --- a/configure +++ b/configure @@ -8050,7 +8050,7 @@ g++*) 3.*) COMPILER_VERSION="3.*" ;; -5*|4.*) +[56789]*|4.*) COMPILER_VERSION="4" ;; *)
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2016-06-07 23:43:46 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4" Changes: libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes2016-02-17 12:14:35.0 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2016-06-07 23:43:47.0 +0200 @@ -1,0 +2,5 @@ +Thu Jun 2 16:35:38 UTC 2016 - matwey.korni...@gmail.com + +- Enable libqt4-devel-32bit to fix boo#982826 + +--- Other differences: -- libqt4-sql-plugins.spec: same change libqt4.spec: same change ++ baselibs.conf ++ --- /var/tmp/diff_new_pack.aNTF0x/_old 2016-06-07 23:43:53.0 +0200 +++ /var/tmp/diff_new_pack.aNTF0x/_new 2016-06-07 23:43:53.0 +0200 @@ -19,3 +19,8 @@ libqt4-sql-mysql supplements "packageand(libqt4-sql-mysql:libqt4-sql-)" + +libqt4-devel + requires "libqt4- = " + requires "libqt4-x11- = " + requires "libqt4-sql- = "
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2016-02-17 10:32:26 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 2015-05-24 19:30:34.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2016-02-17 12:14:35.0 +0100 @@ -1,0 +2,37 @@ +Thu Feb 11 14:45:23 UTC 2016 - rguent...@suse.com + +- Explicitely build with -std=gnu++98. [bnc#964458] + +--- +Wed Feb 10 12:28:49 UTC 2016 - alarr...@suse.com + +- Added 0001-Fix-exclusion-of-anonymous-ciphers.patch from upstream + to disable exp-adh and aecdh ciphers. +- Added disable-rc4-ciphers-bnc865241.diff to disable <128 bits and + RC4 based ciphers which are now considered insecure. This + makes konqueror pass the https://www.howsmyssl.com test (bnc#865241) + +--- +Thu May 28 21:45:10 UTC 2015 - dmuel...@suse.com + +- update to 4.8.7: + * see http://download.qt.io/official_releases/qt/4.8/4.8.7/changes-4.8.7 + +- remove 0001-Don-t-crash-on-broken-GIF-images.patch, + 0001-Don-t-leak-RENDER-Pictures-in-QPixmap-paintEngine.patch, + 0001-Fix-DateTime-with-recent-versions-of-tzdata.patch, + 0001-Fix-crash-when-deleting-top-level-windows-embedded-i.patch, + 0001-Fixes-crash-in-gif-image-decoder.patch, + 0001-Ignore-expired-certificate-during-certificate-valida.patch, + 0001-Memory-and-file-descriptor-leak-in-QFontCache.patch, + 0001-QDbus-Fix-a-b-comparison.patch, + 0001-QDeclarativeTextEdit-fix-use-of-uninitialised-value.patch, + 0001-QPdf-addImage-avoid-a-QImage-detach-when-it-s-in-an-.patch, + 0001-QSslCertificate-blacklist-NIC-certificates-from-Indi.patch, + 0002-Fixes-crash-in-bmp-and-ico-image-decoding.patch, + fix-a-division-by-zero.patch, + fix-detection-of-GCC5.patch, + fix-upload-corruptions-when-server-closes-connection.patch: + * upstreamed + +--- libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes2015-06-03 08:15:29.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2016-02-17 12:14:35.0 +0100 @@ -1,0 +2,14 @@ +Thu Feb 11 14:45:23 UTC 2016 - rguent...@suse.com + +- Explicitely build with -std=gnu++98. [bnc#964458] + +--- +Wed Feb 10 12:28:49 UTC 2016 - alarr...@suse.com + +- Added 0001-Fix-exclusion-of-anonymous-ciphers.patch from upstream + to disable exp-adh and aecdh ciphers. +- Added disable-rc4-ciphers-bnc865241.diff to disable <128 bits and + RC4 based ciphers which are now considered insecure. This + makes konqueror pass the https://www.howsmyssl.com test (bnc#865241) + +--- New: 0001-Fix-exclusion-of-anonymous-ciphers.patch disable-rc4-ciphers-bnc865241.diff Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.Qzc6r2/_old 2016-02-17 12:14:40.0 +0100 +++ /var/tmp/diff_new_pack.Qzc6r2/_new 2016-02-17 12:14:40.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqt4-devel-doc # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -114,6 +114,10 @@ Patch164: l-qclipboard_delay.patch # PATCH-FIX-OPENSUSE fix_qrasterpixmapdata_bnc847880.diff -- fix image rect copy optimization that copied "garbage" when used in qemu/cirrus (bnc#847880) Patch165: fix_qrasterpixmapdata_bnc847880.diff +# PATCH-FIX-UPSTREAM 0001-Fix-exclusion-of-anonymous-ciphers.patch -- Exclude more ciphers from being used by default +Patch166: 0001-Fix-exclusion-of-anonymous-ciphers.patch +# PATCH-FIX-OPENSUSE disable-insecure-ciphers-bnc865241.diff -- Disable insecure ciphers (rc4, aecdh, adh, exp-adh, <128 bits) +Patch167: disable-rc4-ciphers-bnc865241.diff 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/
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2015-06-03 08:15:28 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4" Changes: libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes2015-05-24 19:30:35.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2015-06-03 08:15:29.0 +0200 @@ -1,0 +2,23 @@ +Thu May 28 21:45:10 UTC 2015 - dmuel...@suse.com + +- update to 4.8.7: + * see http://download.qt.io/official_releases/qt/4.8/4.8.7/changes-4.8.7 + +- remove 0001-Don-t-crash-on-broken-GIF-images.patch, + 0001-Don-t-leak-RENDER-Pictures-in-QPixmap-paintEngine.patch, + 0001-Fix-DateTime-with-recent-versions-of-tzdata.patch, + 0001-Fix-crash-when-deleting-top-level-windows-embedded-i.patch, + 0001-Fixes-crash-in-gif-image-decoder.patch, + 0001-Ignore-expired-certificate-during-certificate-valida.patch, + 0001-Memory-and-file-descriptor-leak-in-QFontCache.patch, + 0001-QDbus-Fix-a-b-comparison.patch, + 0001-QDeclarativeTextEdit-fix-use-of-uninitialised-value.patch, + 0001-QPdf-addImage-avoid-a-QImage-detach-when-it-s-in-an-.patch, + 0001-QSslCertificate-blacklist-NIC-certificates-from-Indi.patch, + 0002-Fixes-crash-in-bmp-and-ico-image-decoding.patch, + fix-a-division-by-zero.patch, + fix-detection-of-GCC5.patch, + fix-upload-corruptions-when-server-closes-connection.patch: + * upstreamed + +--- Old: 0001-Don-t-crash-on-broken-GIF-images.patch 0001-Don-t-leak-RENDER-Pictures-in-QPixmap-paintEngine.patch 0001-Fix-DateTime-with-recent-versions-of-tzdata.patch 0001-Fix-crash-when-deleting-top-level-windows-embedded-i.patch 0001-Fixes-crash-in-gif-image-decoder.patch 0001-Ignore-expired-certificate-during-certificate-valida.patch 0001-Memory-and-file-descriptor-leak-in-QFontCache.patch 0001-QDbus-Fix-a-b-comparison.patch 0001-QDeclarativeTextEdit-fix-use-of-uninitialised-value.patch 0001-QPdf-addImage-avoid-a-QImage-detach-when-it-s-in-an-.patch 0001-QSslCertificate-blacklist-NIC-certificates-from-Indi.patch 0002-Fixes-crash-in-bmp-and-ico-image-decoding.patch fix-a-division-by-zero.patch fix-detection-of-GCC5.patch fix-upload-corruptions-when-server-closes-connection.patch qt-everywhere-opensource-src-4.8.6.tar.gz New: qt-everywhere-opensource-src-4.8.7.tar.gz Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.UnfYz1/_old 2015-06-03 08:15:40.0 +0200 +++ /var/tmp/diff_new_pack.UnfYz1/_new 2015-06-03 08:15:40.0 +0200 @@ -38,7 +38,7 @@ # COMMON-VERSION-BEGIN %define base_name libqt4 %define tar_version everywhere-opensource-src-%{version} -Version:4.8.6 +Version:4.8.7 Release:0 # COMMON-VERSION-END # COMMON-VERSION-END @@ -105,7 +105,6 @@ # 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 @@ -115,21 +114,6 @@ Patch164: l-qclipboard_delay.patch # PATCH-FIX-OPENSUSE fix_qrasterpixmapdata_bnc847880.diff -- fix image rect copy optimization that copied "garbage" when used in qemu/cirrus (bnc#847880) Patch165: fix_qrasterpixmapdata_bnc847880.diff -# PATCH-FIX-UPSTREAM fix-detection-of-GCC5.patch -- properly detect gcc5 -Patch166: fix-detection-of-GCC5.patch -Patch167: fix-a-division-by-zero.patch -Patch168: fix-upload-corruptions-when-server-closes-connection.patch -Patch169: 0001-Fixes-crash-in-gif-image-decoder.patch -Patch170: 0002-Fixes-crash-in-bmp-and-ico-image-decoding.patch -Patch171: 0001-Don-t-leak-RENDER-Pictures-in-QPixmap-paintEngine.patch -Patch172: 0001-Fix-crash-when-deleting-top-level-windows-embedded-i.patch -Patch173: 0001-QDbus-Fix-a-b-comparison.patch -Patch174: 0001-Memory-and-file-descriptor-leak-in-QFontCache.patch -Patch175: 0001-QSslCertificate-blacklist-NIC-certificates-from-Indi.patch -Patch176: 0001-QPdf-addImage-avoid-a-QImage-detach-when-it-s-in-an-.patch -Patch177: 0001-Fix-DateTime-with-recent-versions-of-tzdata.patch -Patch178: 0001-QDeclarativeTextEdit-fix-use-of-uninitialised-value.patch -Patch179: 0001-Ignore-expired-certificate-during-certificate-valida.patch BuildRoot: %{_tmppath}
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2015-05-24 19:30:33 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 2015-05-10 10:44:25.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2015-05-24 19:30:34.0 +0200 @@ -1,0 +2,7 @@ +Fri May 22 19:35:04 UTC 2015 - tittiatc...@gmail.com + +- Update patch fix-moc-from-choking-on-boost-headers.patch to + include an additiona boost header due to the upgrade to + Boost 1.58 + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change Other differences: -- libqt4-sql-plugins.spec: same change libqt4.spec: same change ++ fix-moc-from-choking-on-boost-headers.patch ++ --- /var/tmp/diff_new_pack.vX24A5/_old 2015-05-24 19:30:40.0 +0200 +++ /var/tmp/diff_new_pack.vX24A5/_new 2015-05-24 19:30:40.0 +0200 @@ -1,11 +1,12 @@ --- qt-snapshot/src/tools/moc/main.cpp 2013-03-16 19:09:31.954011186 +0100 +++ qt-snapshot/src/tools/moc/main.cpp 2013-05-28 22:38:39.781681541 +0200 -@@ -190,6 +190,8 @@ int runMoc(int _argc, char **_argv) +@@ -190,6 +190,9 @@ int runMoc(int _argc, char **_argv) // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829 pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; +pp.macros["BOOST_LEXICAL_CAST_INCLUDED"]; +pp.macros["BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION"]; ++pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"]; QByteArray filename; QByteArray output;
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2015-05-10 10:44:24 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 2015-05-07 09:21:14.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2015-05-10 10:44:25.0 +0200 @@ -1,0 +2,17 @@ +Thu May 7 10:50:00 UTC 2015 - dmuel...@suse.com + +- add 0001-Fixes-crash-in-gif-image-decoder.patch, + 0002-Fixes-crash-in-bmp-and-ico-image-decoding.patch + (bnc#927806, bnc#927807, bnc#927808, + CVE-2015-1858, CVE-2015-1859, CVE-2015-1860) +- add 0001-Don-t-leak-RENDER-Pictures-in-QPixmap-paintEngine.patch +- add 0001-Fix-DateTime-with-recent-versions-of-tzdata.patch +- add 0001-Fix-crash-when-deleting-top-level-windows-embedded-i.patch +- add 0001-Ignore-expired-certificate-during-certificate-valida.patch +- add 0001-Memory-and-file-descriptor-leak-in-QFontCache.patch +- add 0001-QDbus-Fix-a-b-comparison.patch +- add 0001-QDeclarativeTextEdit-fix-use-of-uninitialised-value.patch +- add 0001-QPdf-addImage-avoid-a-QImage-detach-when-it-s-in-an-.patch +- add 0001-QSslCertificate-blacklist-NIC-certificates-from-Indi.patch + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change New: 0001-Don-t-leak-RENDER-Pictures-in-QPixmap-paintEngine.patch 0001-Fix-DateTime-with-recent-versions-of-tzdata.patch 0001-Fix-crash-when-deleting-top-level-windows-embedded-i.patch 0001-Fixes-crash-in-gif-image-decoder.patch 0001-Ignore-expired-certificate-during-certificate-valida.patch 0001-Memory-and-file-descriptor-leak-in-QFontCache.patch 0001-QDbus-Fix-a-b-comparison.patch 0001-QDeclarativeTextEdit-fix-use-of-uninitialised-value.patch 0001-QPdf-addImage-avoid-a-QImage-detach-when-it-s-in-an-.patch 0001-QSslCertificate-blacklist-NIC-certificates-from-Indi.patch 0002-Fixes-crash-in-bmp-and-ico-image-decoding.patch Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.xmJBlO/_old 2015-05-10 10:44:29.0 +0200 +++ /var/tmp/diff_new_pack.xmJBlO/_new 2015-05-10 10:44:29.0 +0200 @@ -119,6 +119,17 @@ Patch166: fix-detection-of-GCC5.patch Patch167: fix-a-division-by-zero.patch Patch168: fix-upload-corruptions-when-server-closes-connection.patch +Patch169: 0001-Fixes-crash-in-gif-image-decoder.patch +Patch170: 0002-Fixes-crash-in-bmp-and-ico-image-decoding.patch +Patch171: 0001-Don-t-leak-RENDER-Pictures-in-QPixmap-paintEngine.patch +Patch172: 0001-Fix-crash-when-deleting-top-level-windows-embedded-i.patch +Patch173: 0001-QDbus-Fix-a-b-comparison.patch +Patch174: 0001-Memory-and-file-descriptor-leak-in-QFontCache.patch +Patch175: 0001-QSslCertificate-blacklist-NIC-certificates-from-Indi.patch +Patch176: 0001-QPdf-addImage-avoid-a-QImage-detach-when-it-s-in-an-.patch +Patch177: 0001-Fix-DateTime-with-recent-versions-of-tzdata.patch +Patch178: 0001-QDeclarativeTextEdit-fix-use-of-uninitialised-value.patch +Patch179: 0001-Ignore-expired-certificate-during-certificate-valida.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 @@ -206,6 +217,17 @@ %patch166 -p1 %patch167 -p1 %patch168 -p1 +%patch169 -p1 +%patch170 -p1 +%patch171 -p1 +%patch172 -p1 +%patch173 -p1 +%patch174 -p1 +%patch175 -p1 +%patch176 -p1 +%patch177 -p1 +%patch178 -p1 +%patch179 -p1 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts} libqt4-sql-plugins.spec: same change libqt4.spec: same change ++ 0001-Don-t-leak-RENDER-Pictures-in-QPixmap-paintEngine.patch ++ >From 2b7758a8763a8fe6ca13a2f04e0137df79c849d2 Mon Sep 17 00:00:00 2001 From: "Pierre-Loup A. Griffais" Date: Fri, 17 May 2013 20:18:01 -0700 Subject: [PATCH]
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2015-05-07 09:21:13 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 2015-02-27 11:09:22.0 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2015-05-07 09:21:14.0 +0200 @@ -1,0 +2,11 @@ +Wed May 6 01:25:25 UTC 2015 - hrvoje.sen...@gmail.com + +- Added fix-upload-corruptions-when-server-closes-connection.patch + (boo#929688) + +--- +Mon Mar 9 20:47:26 UTC 2015 - hrvoje.sen...@gmail.com + +- Added fix-a-division-by-zero.patch (bnc#921999, CVE-2015-0295) + +--- @@ -71,0 +83 @@ + * see also http://blog.qt.digia.com/blog/2014/04/24/qt-4-8-6-released/ libqt4-sql-plugins.changes: same change libqt4.changes: same change New: fix-a-division-by-zero.patch fix-upload-corruptions-when-server-closes-connection.patch Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.eqNFQL/_old 2015-05-07 09:21:20.0 +0200 +++ /var/tmp/diff_new_pack.eqNFQL/_new 2015-05-07 09:21:20.0 +0200 @@ -117,6 +117,8 @@ Patch165: fix_qrasterpixmapdata_bnc847880.diff # PATCH-FIX-UPSTREAM fix-detection-of-GCC5.patch -- properly detect gcc5 Patch166: fix-detection-of-GCC5.patch +Patch167: fix-a-division-by-zero.patch +Patch168: fix-upload-corruptions-when-server-closes-connection.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 @@ -202,6 +204,8 @@ %patch164 %patch165 -p1 %patch166 -p1 +%patch167 -p1 +%patch168 -p1 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts} libqt4-sql-plugins.spec: same change libqt4.spec: same change ++ fix-a-division-by-zero.patch ++ From: Richard J. Moore Date: Tue, 24 Feb 2015 19:02:35 + Subject: Fix a division by zero when processing malformed BMP files. X-Git-Url: http://quickgit.kde.org/?p=qt.git&a=commitdiff&h=e50aa2252cdd5cb53eef7d8c4503c7edff634f68 --- Fix a division by zero when processing malformed BMP files. This fixes a division by 0 when processing a maliciously crafted BMP file. No impact beyond DoS. Backport of 661f6bfd032dacc62841037732816a583640e187 Task-number: QTBUG-44547 Change-Id: I43f06e752b11cb50669101460902a82b885ae618 Reviewed-by: Thiago Macieira --- --- a/src/gui/image/qbmphandler.cpp +++ b/src/gui/image/qbmphandler.cpp @@ -319,10 +319,16 @@ } } else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) { red_shift = calc_shift(red_mask); +if (((red_mask >> red_shift) + 1) == 0) +return false; red_scale = 256 / ((red_mask >> red_shift) + 1); green_shift = calc_shift(green_mask); +if (((green_mask >> green_shift) + 1) == 0) +return false; green_scale = 256 / ((green_mask >> green_shift) + 1); blue_shift = calc_shift(blue_mask); +if (((blue_mask >> blue_shift) + 1) == 0) +return false; blue_scale = 256 / ((blue_mask >> blue_shift) + 1); } else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) { blue_mask = 0x00ff; ++ fix-upload-corruptions-when-server-closes-connection.patch ++ >From fa81aa6d027049e855b76f5408586a288f160575 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Tue, 28 Apr 2015 11:57:36 +0200 Subject: QNAM: Fix upload corruptions when server closes connection This patch fixes several upload corruptions if the server closes the connection while/before we send data into it. They happen inside multiple places in the HTTP layer and are explained in the comments. Corruptions are: * The upload byte device has an in-flight signal with pending upload data, if it gets reset (b
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2015-02-27 11:09:20 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-11-28 08:46:06.0 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2015-02-27 11:09:22.0 +0100 @@ -1,0 +2,5 @@ +Sun Feb 22 16:47:30 UTC 2015 - hrvoje.sen...@gmail.com + +- Added fix-detection-of-GCC5.patch + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change New: fix-detection-of-GCC5.patch Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.DrFDxJ/_old 2015-02-27 11:09:28.0 +0100 +++ /var/tmp/diff_new_pack.DrFDxJ/_new 2015-02-27 11:09:28.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqt4-devel-doc # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -115,6 +115,8 @@ Patch164: l-qclipboard_delay.patch # PATCH-FIX-OPENSUSE fix_qrasterpixmapdata_bnc847880.diff -- fix image rect copy optimization that copied "garbage" when used in qemu/cirrus (bnc#847880) Patch165: fix_qrasterpixmapdata_bnc847880.diff +# PATCH-FIX-UPSTREAM fix-detection-of-GCC5.patch -- properly detect gcc5 +Patch166: fix-detection-of-GCC5.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 @@ -199,6 +201,7 @@ %patch163 -p0 %patch164 %patch165 -p1 +%patch166 -p1 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts} libqt4-sql-plugins.spec: same change libqt4.spec: same change ++ fix-detection-of-GCC5.patch ++ --- a/configure 2015-02-16 11:33:02.0 +0100 +++ b/configure 2015-02-18 13:17:22.0 +0100 @@ -7729,7 +7729,7 @@ case "$XPLATFORM" in *-g++*) # Check gcc's version case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in - 4*|3.4*) + 5*|4*|3.4*) ;; 3.3*) canBuildWebKit="no" @@ -8031,6 +8031,11 @@ g++*) QT_GCC_MINOR_VERSION=`echo $COMPILER_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\).*,\2,'` QT_GCC_PATCH_VERSION=0 ;; +*) +QT_GCC_MAJOR_VERSION=$COMPILER_VERSION +QT_GCC_MINOR_VERSION=0 +QT_GCC_PATCH_VERSION=0 +;; esac case "$COMPILER_VERSION" in @@ -8040,7 +8045,7 @@ g++*) 3.*) COMPILER_VERSION="3.*" ;; -4.*) +5*|4.*) COMPILER_VERSION="4" ;; *) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2014-11-28 08:46:01 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-10-14 08:59:06.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2014-11-28 08:46:06.0 +0100 @@ -1,0 +2,20 @@ +Wed Nov 19 21:00:07 UTC 2014 - hrvoje.sen...@gmail.com + +- Update use-freetype-default.diff to use same method as with + libqt5-qtbase package: Qt itself already does runtime check + whether subpixel rendering is available, but only when + FT_CONFIG_OPTION_SUBPIXEL_RENDERING is defined. Thus it is enough + to only remove that condition + +--- +Tue Nov 11 10:49:35 UTC 2014 - alarr...@suse.com + +- The -devel subpackage requires Mesa-devel, not only at build time + +--- +Mon Nov 10 13:35:30 UTC 2014 - alarr...@suse.com + +- Fixed compilation on SLE_11_SP3 by making it build against + Mesa-devel on that system + +--- libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes2014-11-13 09:17:11.0 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2014-11-28 08:46:06.0 +0100 @@ -1,0 +2,9 @@ +Wed Nov 19 21:00:07 UTC 2014 - hrvoje.sen...@gmail.com + +- Update use-freetype-default.diff to use same method as with + libqt5-qtbase package: Qt itself already does runtime check + whether subpixel rendering is available, but only when + FT_CONFIG_OPTION_SUBPIXEL_RENDERING is defined. Thus it is enough + to only remove that condition + +--- Other differences: -- libqt4-sql-plugins.spec: same change libqt4.spec: same change ++ use-freetype-default.diff ++ --- /var/tmp/diff_new_pack.J83IT5/_old 2014-11-28 08:46:11.0 +0100 +++ /var/tmp/diff_new_pack.J83IT5/_new 2014-11-28 08:46:11.0 +0100 @@ -1,40 +1,13 @@ -Index: src/gui/text/qfontengine_x11.cpp +Index: src/gui/text/qfontengine_ft.cpp === src/gui/text/qfontengine_x11.cpp.orig -+++ src/gui/text/qfontengine_x11.cpp -@@ -967,6 +967,26 @@ Q_GUI_EXPORT void qt_x11ft_convert_patte - *antialias = b; - } +--- src/gui/text/qfontengine_ft.cpp.orig src/gui/text/qfontengine_ft.cpp +@@ -70,7 +70,7 @@ + #include FT_CONFIG_OPTIONS_H + #endif -+#include -+#include FT_FREETYPE_H -+#include FT_LCD_FILTER_H -+ -+static bool subpixel_rendering_available() -+{ -+static int implemented = -1; -+ -+if (implemented >= 0) -+return implemented; -+ -+extern FT_Library qt_getFreetype(); -+FT_Library lib = qt_getFreetype(); -+ -+if (FT_Err_Unimplemented_Feature == -+FT_Library_SetLcdFilter(lib, FT_LCD_FILTER_DEFAULT )) -+return (implemented = false); -+ -+return (implemented = true); -+} +-#if defined(FT_LCD_FILTER_H) && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING) ++#if defined(FT_LCD_FILTER_H) + #define QT_USE_FREETYPE_LCDFILTER + #endif - QFontEngineX11FT::QFontEngineX11FT(FcPattern *pattern, const QFontDef &fd, int screen) - : QFontEngineFT(fd) -@@ -984,7 +1004,7 @@ QFontEngineX11FT::QFontEngineX11FT(FcPat - canUploadGlyphsToServer = QApplication::testAttribute(Qt::AA_X11InitThreads) || (qApp->thread() == QThread::currentThread()); - - subpixelType = Subpixel_None; --if (antialias) { -+if (subpixel_rendering_available() && antialias) { - int subpixel = X11->display ? X11->screens[screen].subpixel : FC_RGBA_UNKNOWN; - if (subpixel == FC_RGBA_UNKNOWN) - (void) FcPatternGetInteger(pattern, FC_RGBA, 0, &subpixel); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2014-11-13 09:16:56 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4" Changes: libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes2014-10-14 08:59:06.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2014-11-13 09:17:11.0 +0100 @@ -1,0 +2,11 @@ +Tue Nov 11 10:49:35 UTC 2014 - alarr...@suse.com + +- The -devel subpackage requires Mesa-devel, not only at build time + +--- +Mon Nov 10 13:35:30 UTC 2014 - alarr...@suse.com + +- Fixed compilation on SLE_11_SP3 by making it build against + Mesa-devel on that system + +--- Other differences: -- libqt4-sql-plugins.spec: same change ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.mqGgEL/_old 2014-11-13 09:17:16.0 +0100 +++ /var/tmp/diff_new_pack.mqGgEL/_new 2014-11-13 09:17:16.0 +0100 @@ -41,7 +41,11 @@ BuildRequires: sqlite3-devel BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel +%if 0%{?suse_version} == 1110 +BuildRequires: Mesa-devel +%else BuildRequires: pkgconfig(gl) +%endif %if %with_phonon && %with_phonon_backend BuildRequires: gstreamer-0_10-plugins-base-devel @@ -180,7 +184,11 @@ Requires: sqlite3-devel Requires: xorg-x11-devel Requires: zlib-devel +%if 0%{?suse_version} == 1110 +Requires: Mesa-devel +%else Requires: pkgconfig(gl) +%endif # bug437293 %ifarch ppc64 Obsoletes: qt-devel-64bit -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2014-10-14 08:59:01 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-09-10 07:27:56.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2014-10-14 08:59:06.0 +0200 @@ -1,0 +2,17 @@ +Thu Oct 2 10:49:53 UTC 2014 - tittiatc...@gmail.com + +- Replace patch l-qclipboard_fix_recursive.patch with + qtcore-4.8.5-qeventdispatcher-recursive.patch. The later one + seems to work better and really resolves the issue in LibreOffice + +--- +Thu Sep 18 18:38:07 UTC 2014 - alarr...@suse.com + +- Added fix_qrasterpixmapdata_bnc847880.diff (bnc#847880). + When extracting a region of a QRasterPixmapData an optimization + was using the wrong bit depth for some calculations thus copying + a different section of the image than requested. This breaks + specially the oxygen kde theme under qemu when using a cirrus driver. +- Removed workaround for bnc#847880 which is no longer needed. + +--- libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes2014-09-20 15:50:45.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2014-10-14 08:59:06.0 +0200 @@ -1,0 +2,7 @@ +Thu Oct 2 10:49:53 UTC 2014 - tittiatc...@gmail.com + +- Replace patch l-qclipboard_fix_recursive.patch with + qtcore-4.8.5-qeventdispatcher-recursive.patch. The later one + seems to work better and really resolves the issue in LibreOffice + +--- Old: l-qclipboard_fix_recursive.patch New: qtcore-4.8.5-qeventdispatcher-recursive.patch Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.51NYUa/_old 2014-10-14 08:59:12.0 +0200 +++ /var/tmp/diff_new_pack.51NYUa/_new 2014-10-14 08:59:12.0 +0200 @@ -110,9 +110,11 @@ # 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 +Patch163: qtcore-4.8.5-qeventdispatcher-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 +# PATCH-FIX-OPENSUSE fix_qrasterpixmapdata_bnc847880.diff -- fix image rect copy optimization that copied "garbage" when used in qemu/cirrus (bnc#847880) +Patch165: fix_qrasterpixmapdata_bnc847880.diff 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 @@ -194,8 +196,9 @@ %patch160 %patch161 -p1 %patch162 -p1 -%patch163 +%patch163 -p0 %patch164 +%patch165 -p1 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts} libqt4-sql-plugins.spec: same change ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.51NYUa/_old 2014-10-14 08:59:12.0 +0200 +++ /var/tmp/diff_new_pack.51NYUa/_new 2014-10-14 08:59:12.0 +0200 @@ -128,7 +128,7 @@ # 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 +Patch163: qtcore-4.8.5-qeventdispatcher-recursive.patch # PATCH-FIX-OPENSUSE fix clipboard delay when pasting w
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2014-09-20 15:50:41 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4" Changes: libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes2014-09-10 07:27:56.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2014-09-20 15:50:45.0 +0200 @@ -1,0 +2,10 @@ +Thu Sep 18 18:38:07 UTC 2014 - alarr...@suse.com + +- Added fix_qrasterpixmapdata_bnc847880.diff (bnc#847880). + When extracting a region of a QRasterPixmapData an optimization + was using the wrong bit depth for some calculations thus copying + a different section of the image than requested. This breaks + specially the oxygen kde theme under qemu when using a cirrus driver. +- Removed workaround for bnc#847880 which is no longer needed. + +--- New: fix_qrasterpixmapdata_bnc847880.diff Other differences: -- libqt4-sql-plugins.spec: same change ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.3lScZX/_old 2014-09-20 15:50:51.0 +0200 +++ /var/tmp/diff_new_pack.3lScZX/_new 2014-09-20 15:50:51.0 +0200 @@ -131,6 +131,8 @@ 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 +# PATCH-FIX-OPENSUSE fix_qrasterpixmapdata_bnc847880.diff -- fix image rect copy optimization that copied "garbage" when used in qemu/cirrus (bnc#847880) +Patch165: fix_qrasterpixmapdata_bnc847880.diff 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 @@ -436,6 +438,7 @@ %patch162 -p1 %patch163 %patch164 +%patch165 -p1 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts} @@ -506,27 +509,6 @@ ln -s %{_libdir} %{buildroot}/%{_libdir}/qt4/lib ln -s %{_bindir} %{buildroot}/%{_libdir}/qt4/bin -#BNC847880 -mkdir -p %{buildroot}%{_sysconfdir}/profile.d/ -cat <%{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 <%{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%%/*} @@ -661,8 +643,6 @@ %{_sysconfdir}/rpm/macros.qt4 -%{_sysconfdir}/profile.d/qt-graphicssystem.*sh - %if %with_qt3support %exclude %plugindir/accessible/libqtaccessiblecompatwidgets.so %endif ++ fix_qrasterpixmapdata_bnc847880.diff ++ Index: qt-everywhere-opensource-src-4.8.6/src/gui/image/qpixmap_raster.cpp === --- qt-everywhere-opensource-src-4.8.6.orig/src/gui/image/qpixmap_raster.cpp +++ qt-everywhere-opensource-src-4.8.6/src/gui/image/qpixmap_raster.cpp @@ -330,7 +330,7 @@ QImage QRasterPixmapData::toImage(const return image; QRect clipped = rect.intersected(QRect(0, 0, w, h)); -const uint du = uint(d); +const uint du = uint(image.depth()); if ((du % 8 == 0) && (((uint(clipped.x()) * du)) % 32 == 0)) return QImage(image.scanLine(clipped.y()) + clipped.x() * (du / 8), clipped.width(), clipped.height(), -- To unsu
commit libqt4 for openSUSE:Factory
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.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2014-09-10 07:27:56.0 +0200 @@ -1,0 +2,23 @@ +Sun Sep 7 20:13:48 UTC 2014 - hrvoje.sen...@gmail.com + +- 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 - behl...@suse.de + +- 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 - lbeltr...@kde.org + +- 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.changes2014-08-25 11:03:15.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2014-09-10 07:27:56.0 +0200 @@ -1,0 +2,8 @@ +Sun Sep 7 20:13:48 UTC 2014 - hrvoje.sen...@gmail.com + +- 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.0 +0200 +++ /var/tmp/diff_new_pack.4GRRSS/_new 2014-09-10 07:28:02.0 +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.0 +0200 +++ /var/tmp/diff_new_pack.4GRRSS/_new 2014-09-10 07:28:02.0 +0200 @@ -120,6 +120,8 @@ Patch152: fix-moc-from-choking-on-boost-headers.patch # PATCH-FIX-OPENSUSE qlocale_icu-no-warning-outp
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2014-08-25 11:02:55 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4" Changes: libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes2014-06-19 13:14:54.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2014-08-25 11:03:15.0 +0200 @@ -1,0 +2,6 @@ +Wed Aug 20 13:58:19 CEST 2014 - behl...@suse.de + +- added _constraints. building took up to 7GB of disk space on + s390x, and more than 6GB on x86_64 + +--- New: _constraints Other differences: -- libqt4-sql-plugins.spec: same change libqt4.spec: same change -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2014-05-11 18:30:59 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-03-16 08:05:06.0 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2014-05-11 18:31:01.0 +0200 @@ -1,0 +2,26 @@ +Tue Apr 29 21:58:40 UTC 2014 - dmuel...@suse.com + +- update to 4.8.6: + * long list of bugfixes, forward and backward compatible + * for detailed list of changes, see included changes-4.8.6 +- remove patches that went upstream: + * 0001-Disallow-deep-or-widely-nested-entity-references.patch + * 0001-Don-t-crash-if-the-relayed-signal-was-emitted-from-t.patch + * 0001-Fully-expand-entities-to-ensure-deep-or-widely-neste.patch + * 0001-Mitigate-performance-regression-in-isExpandedEntityV.patch + * 0002-QDBusPendingCall-add-a-missing-QWaitCondition-wakeAl.patch + * 0003-Fix-unprotected-access-to-QDBusPendingCallPrivate-pe.patch + * 0004-Remove-QDBusPendingCallPrivate-autoDelete-logic.patch + * 0005-Change-QDBusPendingCallPrivate-to-full-reference-cou.patch + * 0006-Revert-QTBUG-15319-fix-shortcuts-with-secondary-Xkb-layout.patch + * aarch64-support.diff + * qt-everywhere-opensource-src-4.8.5.tar.gz + * webkit-sparc64.diff + +--- +Mon Apr 28 15:26:07 UTC 2014 - dmuel...@suse.com + +- add 0001-Don-t-crash-on-broken-GIF-images.patch (bnc#875470, + CVE-2014-0190) + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change Old: 0001-Disallow-deep-or-widely-nested-entity-references.patch 0001-Don-t-crash-if-the-relayed-signal-was-emitted-from-t.patch 0001-Fully-expand-entities-to-ensure-deep-or-widely-neste.patch 0001-Mitigate-performance-regression-in-isExpandedEntityV.patch 0002-QDBusPendingCall-add-a-missing-QWaitCondition-wakeAl.patch 0003-Fix-unprotected-access-to-QDBusPendingCallPrivate-pe.patch 0004-Remove-QDBusPendingCallPrivate-autoDelete-logic.patch 0005-Change-QDBusPendingCallPrivate-to-full-reference-cou.patch 0006-Revert-QTBUG-15319-fix-shortcuts-with-secondary-Xkb-layout.patch aarch64-support.diff qt-everywhere-opensource-src-4.8.5.tar.gz webkit-sparc64.diff New: 0001-Don-t-crash-on-broken-GIF-images.patch qt-everywhere-opensource-src-4.8.6.tar.gz Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.fSAAuB/_old 2014-05-11 18:31:18.0 +0200 +++ /var/tmp/diff_new_pack.fSAAuB/_new 2014-05-11 18:31:18.0 +0200 @@ -38,7 +38,7 @@ # COMMON-VERSION-BEGIN %define base_name libqt4 %define tar_version everywhere-opensource-src-%{version} -Version:4.8.5 +Version:4.8.6 Release:0 # COMMON-VERSION-END # COMMON-VERSION-END @@ -86,7 +86,6 @@ Patch118: rcc-stable-dirlisting.diff Patch119: hppa_ldcw_fix.diff Patch120: hppa_unaligned_access_fix_458133.diff -Patch121: webkit-sparc64.diff Patch123: use-cups-default-print-settings-bnc552218.diff Patch128: build-qvfb-tool.diff Patch131: disable-im-for-password.diff @@ -100,26 +99,11 @@ # PATCH-FEATURE-OPENSUSE QSystemTrayicon.diff -- adds support for sni-qt plugin, which allows Qt applications to communicate via KStatusNotifier spec -- needed for # Plasma Next Patch150: QSystemTrayicon.diff -Patch151: aarch64-support.diff 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-UPSTREAM 0001-Don-t-crash-if-the-relayed-signal-was-emitted-from-t.patch (QTBUG#31932,kde#234484) -Patch154: 0001-Don-t-crash-if-the-relayed-signal-was-emitted-from-t.patch -# PATCH-FIX-UPSTREAM 0002-QDBusPendingCall-add-a-missing-QWaitCondition-wakeAl.patch (QTBUG#27809) -Patch155: 0002-QDBusPendingCall-add-a-missing-QWaitCondition-wakeAl.patch -# PATCH-FIX-UPSTREAM 0003-Fix-unprotected-access-to-QDBusPendingCallPrivate-pe.patch (QTBUG#27809) -Patch156: 0003-Fix-unprotected-access-to-QDBusPendingCallPrivate-pe.patch -# PATCH-FIX-UPSTREAM 0004-Remove-QDBusPendingCallPrivate-autoDelete-logic.patch (QTBUG#27809) -Patch157: 0004-Remove-QDBusPendingCallPrivate-autoDelete-logic.patch -# PATCH-FIX-UPSTREAM 0005-Change-QDBusPendingCallPrivate-to-full-reference-cou.patch (QTBUG#27809) -Patch158: 0005-Change-QDB
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2014-03-16 08:05:05 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-01-29 07:15:35.0 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2014-03-16 08:05:06.0 +0100 @@ -1,0 +2,7 @@ +Mon Mar 10 23:18:52 UTC 2014 - hrvoje.sen...@gmail.com + +- Added QSystemTrayicon.diff: adds support for sni-qt plugin, which + allows Qt applications to communicate via KStatusNotifier spec, + will/is needed for Plasma Next + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change New: QSystemTrayicon.diff Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.OnnntP/_old 2014-03-16 08:05:10.0 +0100 +++ /var/tmp/diff_new_pack.OnnntP/_new 2014-03-16 08:05:10.0 +0100 @@ -97,6 +97,9 @@ # PATCH-FIX-OPENSUSE fix build on s390x failing to link in qnetworkconfigmanager.o Patch141: qt4-fix-s390x-build.diff Patch149: qatomic-generic.patch +# PATCH-FEATURE-OPENSUSE QSystemTrayicon.diff -- adds support for sni-qt plugin, which allows Qt applications to communicate via KStatusNotifier spec -- needed for +# Plasma Next +Patch150: QSystemTrayicon.diff Patch151: aarch64-support.diff 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 @@ -190,6 +193,7 @@ %patch140 -p1 %patch141 -p0 %patch149 -p1 +%patch150 -p1 %patch151 %patch152 -p1 %patch153 -p1 libqt4-sql-plugins.spec: same change libqt4.spec: same change ++ QSystemTrayicon.diff ++ 1474 lines (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2014-01-29 07:15:33 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 2013-12-11 11:28:54.0 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2014-01-29 07:15:35.0 +0100 @@ -1,0 +2,13 @@ +Mon Jan 20 10:24:08 UTC 2014 - dmuel...@suse.com + +- add 0001-Mitigate-performance-regression-in-isExpandedEntityV.patch + (bnc#859158) + +--- +Tue Jan 7 13:48:11 UTC 2014 - dmuel...@suse.com + +- add 0001-Disallow-deep-or-widely-nested-entity-references.patch, + 0001-Fully-expand-entities-to-ensure-deep-or-widely-neste.patch + (bnc#856832, CVE-2013-4549) + +--- libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes2014-01-23 15:48:15.0 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2014-01-29 07:15:35.0 +0100 @@ -1,0 +2,6 @@ +Mon Jan 20 10:24:08 UTC 2014 - dmuel...@suse.com + +- add 0001-Mitigate-performance-regression-in-isExpandedEntityV.patch + (bnc#859158) + +--- New: 0001-Mitigate-performance-regression-in-isExpandedEntityV.patch Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.rJfWcO/_old 2014-01-29 07:15:39.0 +0100 +++ /var/tmp/diff_new_pack.rJfWcO/_new 2014-01-29 07:15:39.0 +0100 @@ -116,6 +116,7 @@ Patch160: ppc64le.diff Patch161: 0001-Disallow-deep-or-widely-nested-entity-references.patch Patch162: 0001-Fully-expand-entities-to-ensure-deep-or-widely-neste.patch +Patch163: 0001-Mitigate-performance-regression-in-isExpandedEntityV.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 \ @@ -201,6 +202,7 @@ %patch160 %patch161 -p1 %patch162 -p1 +%patch163 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them libqt4-sql-plugins.spec: same change libqt4.spec: same change ++ 0001-Mitigate-performance-regression-in-isExpandedEntityV.patch ++ >From 718fae50a4509c2cfc07552e6b1187ed2502f9b9 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Fri, 10 Jan 2014 11:19:08 +0100 Subject: [PATCH] Mitigate performance regression in isExpandedEntityValueTooLarge(). 512a1ce0698d370c313bb561bbf078935fa0342e fixed a security issue [1], but also caused a large performance regression. This patch improves the performance from ~196 seconds to ~.23 seconds for 1000 entities, using the benchmark in the bug report: "0": 0 msecs per iteration (total: 0, iterations: 1) "250": 2,952 msecs per iteration (total: 2,952, iterations: 1) "500": 23,418 msecs per iteration (total: 23,418, iterations: 1) "750": 79,913 msecs per iteration (total: 79,913, iterations: 1) "1000": 196,335 msecs per iteration (total: 196,335, iterations: 1) "0": 0 msecs per iteration (total: 0, iterations: 1) "250": 16 msecs per iteration (total: 16, iterations: 1) "500": 59 msecs per iteration (total: 59, iterations: 1) "750": 132 msecs per iteration (total: 132, iterations: 1) "1000": 232 msecs per iteration (total: 232, iterations: 1) This is a cherry-pick of 62c4e288a11769bde45c9c74d731ed8628303f19. [1] http://lists.qt-project.org/pipermail/announce/2013-December/36.html Task-number: QTBUG-35919 Change-Id: Ibc2fc94dc0d88b227b9510e15bac9c07f4600591 Reviewed-by: Richard J. Moore --- src/xml/sax/qxml.cpp | 85 +++- 1 file changed, 57 insertions(+), 28 deletions(-) diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp index befa801..ffc07b5 100644 --- a/src/xml/sax/qxml.cpp +++ b/src/xml/sax/qxml.cpp @@ -44,6 +44,7 @@ #include "qbuffer.
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2014-01-16 15:37:54 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4" Changes: libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes2013-12-11 11:28:54.0 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2014-01-23 15:48:15.0 +0100 @@ -1,0 +2,7 @@ +Tue Jan 7 13:48:11 UTC 2014 - dmuel...@suse.com + +- add 0001-Disallow-deep-or-widely-nested-entity-references.patch, + 0001-Fully-expand-entities-to-ensure-deep-or-widely-neste.patch + (bnc#856832, CVE-2013-4549) + +--- New: 0001-Disallow-deep-or-widely-nested-entity-references.patch 0001-Fully-expand-entities-to-ensure-deep-or-widely-neste.patch Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.eu26y9/_old 2014-01-23 15:48:19.0 +0100 +++ /var/tmp/diff_new_pack.eu26y9/_new 2014-01-23 15:48:19.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqt4-devel-doc # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -114,6 +114,8 @@ # PATCH-FIX-UPSTREAM 0006-Revert-QTBUG-15319-fix-shortcuts-with-secondary-Xkb-layout.patch (QTBUG#32908) Patch159: 0006-Revert-QTBUG-15319-fix-shortcuts-with-secondary-Xkb-layout.patch Patch160: ppc64le.diff +Patch161: 0001-Disallow-deep-or-widely-nested-entity-references.patch +Patch162: 0001-Fully-expand-entities-to-ensure-deep-or-widely-neste.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 \ @@ -197,6 +199,8 @@ %patch158 -p1 %patch159 -p1 %patch160 +%patch161 -p1 +%patch162 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them libqt4-sql-plugins.spec: same change libqt4.spec: same change ++ 0001-Disallow-deep-or-widely-nested-entity-references.patch ++ >From 512a1ce0698d370c313bb561bbf078935fa0342e Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 7 Nov 2013 09:36:29 +0100 Subject: [PATCH] Disallow deep or widely nested entity references. Nested references with a depth of 2 or greater will fail. References that partially expand to greater than 1024 characters will also fail. This is a backport of 46a8885ae486e238a39efa5119c2714f328b08e4. Change-Id: I0c2e1fa13d6ccb5f88641dae2ed3f28bfdeaf609 Reviewed-by: Richard J. Moore Reviewed-by: Lars Knoll --- src/xml/sax/qxml.cpp | 51 +++ .../auto/qxmlsimplereader/tst_qxmlsimplereader.cpp | 58 ++ .../xmldocs/1-levels-nested-dtd.xml| 12 + .../xmldocs/2-levels-nested-dtd.xml| 13 + .../internal-entity-polynomial-attribute.xml | 13 + 5 files changed, 147 insertions(+) create mode 100644 tests/auto/qxmlsimplereader/xmldocs/1-levels-nested-dtd.xml create mode 100644 tests/auto/qxmlsimplereader/xmldocs/2-levels-nested-dtd.xml create mode 100644 tests/auto/qxmlsimplereader/xmldocs/internal-entity-polynomial-attribute.xml diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp index a1777c5..3904632 100644 --- a/src/xml/sax/qxml.cpp +++ b/src/xml/sax/qxml.cpp @@ -424,6 +424,10 @@ private: int stringValueLen; QString emptyStr; +// The limit to the amount of times the DTD parsing functions can be called +// for the DTD currently being parsed. +int dtdRecursionLimit; + const QString &string(); void stringClear(); void stringAddC(QChar); @@ -492,6 +496,7 @@ private: void unexpectedEof(ParseFunction where, int state); void parseFailed(ParseFunction
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2013-12-11 11:28:53 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 2013-10-08 10:55:38.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2013-12-11 11:28:54.0 +0100 @@ -1,0 +2,6 @@ +Fri Dec 6 14:33:33 CET 2013 - m...@suse.de + +- add ppc64le.diff to make the configure script recognize + ppc64le as 'powerpc' + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change New: ppc64le.diff Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.T1Hi5U/_old 2013-12-11 11:28:58.0 +0100 +++ /var/tmp/diff_new_pack.T1Hi5U/_new 2013-12-11 11:28:58.0 +0100 @@ -113,6 +113,7 @@ Patch158: 0005-Change-QDBusPendingCallPrivate-to-full-reference-cou.patch # PATCH-FIX-UPSTREAM 0006-Revert-QTBUG-15319-fix-shortcuts-with-secondary-Xkb-layout.patch (QTBUG#32908) Patch159: 0006-Revert-QTBUG-15319-fix-shortcuts-with-secondary-Xkb-layout.patch +Patch160: ppc64le.diff 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 \ @@ -195,6 +196,7 @@ %patch157 -p1 %patch158 -p1 %patch159 -p1 +%patch160 # ### 47 rediff #%patch121 -p1 # be sure not to use them libqt4-sql-plugins.spec: same change libqt4.spec: same change ++ ppc64le.diff ++ --- ./configure.orig2013-12-06 13:27:48.591433470 + +++ ./configure 2013-12-06 13:29:28.583433293 + @@ -3234,6 +3234,12 @@ if [ -z "${CFG_HOST_ARCH}" ]; then fi CFG_HOST_ARCH=powerpc ;; +*:*:ppc64le) +if [ "$OPT_VERBOSE" = "yes" ]; then +echo "64-bit PowerPC LE (powerpc)" +fi +CFG_HOST_ARCH=powerpc +;; *:*:s390*) if [ "$OPT_VERBOSE" = "yes" ]; then echo "IBM S/390 (s390)" -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2013-10-08 10:55:37 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 2013-09-14 19:09:55.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2013-10-08 10:55:38.0 +0200 @@ -1,0 +2,7 @@ +Mon Oct 7 13:06:08 UTC 2013 - hrvoje.sen...@gmail.com + +- Drop 0007-postgresql-driver-escape-backslashes-only-when-serve.patch + bug has been fixed properly with akonadi 1.10.3, and the patch + conflicts with the resolution in akonadi + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change Old: 0007-postgresql-driver-escape-backslashes-only-when-serve.patch Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.f6XZY5/_old 2013-10-08 10:55:42.0 +0200 +++ /var/tmp/diff_new_pack.f6XZY5/_new 2013-10-08 10:55:42.0 +0200 @@ -113,8 +113,6 @@ Patch158: 0005-Change-QDBusPendingCallPrivate-to-full-reference-cou.patch # PATCH-FIX-UPSTREAM 0006-Revert-QTBUG-15319-fix-shortcuts-with-secondary-Xkb-layout.patch (QTBUG#32908) Patch159: 0006-Revert-QTBUG-15319-fix-shortcuts-with-secondary-Xkb-layout.patch -# PATCH-UNFIX-UPSTREAM 0007-postgresql-driver-escape-backslashes-only-when-serve.patch (QTBUG#30076) -Patch160: 0007-postgresql-driver-escape-backslashes-only-when-serve.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 \ @@ -197,7 +195,6 @@ %patch157 -p1 %patch158 -p1 %patch159 -p1 -%patch160 -Rp1 # ### 47 rediff #%patch121 -p1 # be sure not to use them libqt4-sql-plugins.spec: same change libqt4.spec: same change -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2013-09-14 19:09: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 2013-09-02 15:00:14.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2013-09-14 19:09:55.0 +0200 @@ -1,0 +2,8 @@ +Fri Sep 13 08:52:05 UTC 2013 - hrvoje.sen...@gmail.com + +- Added patch from upstream for resolving bnc#835384, QTBUG#32908 + 0006-Revert-QTBUG-15319-fix-shortcuts-with-secondary-Xkb-layout.patch +- Revert upstream commit that breaks akonadi PostgreSQL backend (QTBUG#30076): + 0007-postgresql-driver-escape-backslashes-only-when-serve.patch + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change New: 0006-Revert-QTBUG-15319-fix-shortcuts-with-secondary-Xkb-layout.patch 0007-postgresql-driver-escape-backslashes-only-when-serve.patch Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.UgHpoq/_old 2013-09-14 19:09:59.0 +0200 +++ /var/tmp/diff_new_pack.UgHpoq/_new 2013-09-14 19:09:59.0 +0200 @@ -111,6 +111,10 @@ Patch157: 0004-Remove-QDBusPendingCallPrivate-autoDelete-logic.patch # PATCH-FIX-UPSTREAM 0005-Change-QDBusPendingCallPrivate-to-full-reference-cou.patch (QTBUG#27809) Patch158: 0005-Change-QDBusPendingCallPrivate-to-full-reference-cou.patch +# PATCH-FIX-UPSTREAM 0006-Revert-QTBUG-15319-fix-shortcuts-with-secondary-Xkb-layout.patch (QTBUG#32908) +Patch159: 0006-Revert-QTBUG-15319-fix-shortcuts-with-secondary-Xkb-layout.patch +# PATCH-UNFIX-UPSTREAM 0007-postgresql-driver-escape-backslashes-only-when-serve.patch (QTBUG#30076) +Patch160: 0007-postgresql-driver-escape-backslashes-only-when-serve.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 \ @@ -192,6 +196,8 @@ %patch156 -p1 %patch157 -p1 %patch158 -p1 +%patch159 -p1 +%patch160 -Rp1 # ### 47 rediff #%patch121 -p1 # be sure not to use them libqt4-sql-plugins.spec: same change libqt4.spec: same change ++ 0006-Revert-QTBUG-15319-fix-shortcuts-with-secondary-Xkb-layout.patch ++ >From 0c03af0d4d928bdbb32b09eedb1dba3ce59e5278 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Sat, 31 Aug 2013 21:22:47 +0200 Subject: [PATCH 1/1] Revert "QTBUG-15319: fix shortcuts with secondary Xkb layout." The change which attempted to fix QTBUG-15319 broke keyboard shortcuts for non latin keyboard layouts. This patch reverts QTBUG-15319 (f45cdeda8) since it caused a regression. Task-number: QTBUG-32908 Change-Id: I47d7984fa7986d5218d1f3ff1fc36d2ec67c9ba7 Reviewed-by: David Faure --- src/gui/kernel/qkeymapper_x11.cpp | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp index 005ff3f..7daa41d 100644 --- a/src/gui/kernel/qkeymapper_x11.cpp +++ b/src/gui/kernel/qkeymapper_x11.cpp @@ -282,12 +282,9 @@ QList QKeyMapperPrivate::possibleKeysXKB(QKeyEvent *event) // first, translate key only using lock modifiers (there are no Qt equivalents for these, so we must // always use them when determining the baseKeySym) -// Note: the Xkb group to be used for the conversion keycode->keysym has to be given to -// XkbLookupKeySym(). This information is contained in the bits 8 to 15 of xmodifiers. -// See https://bugreports.qt-project.org/browse/QTBUG-15319 . KeySym baseKeySym; uint consumedModifiers; -if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (0xff00 | LockMask | qt_num_lock_mask)), +if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (LockMask | qt_num_lock_mask)), &consumedModifiers, &baseKeySym)) return QList(
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2013-09-02 15:00:12 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 2013-08-12 14:22:54.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2013-09-02 15:00:14.0 +0200 @@ -1,0 +2,17 @@ +Fri Aug 30 00:58:13 UTC 2013 - hrvoje.sen...@gmail.com + +- Added patches from upstream for resolving QtDbus bugs and crashes: + 0001-Don-t-crash-if-the-relayed-signal-was-emitted-from-t.patch + (QTBUG#31932,kde#234484) + 0002-QDBusPendingCall-add-a-missing-QWaitCondition-wakeAl.patch + (QTBUG#27809) + 0003-Fix-unprotected-access-to-QDBusPendingCallPrivate-pe.patch + (QTBUG#27809) + 0004-Remove-QDBusPendingCallPrivate-autoDelete-logic.patch + (QTBUG#27809) + 0005-Change-QDBusPendingCallPrivate-to-full-reference-cou.patch + (QTBUG#27809) +- Don't BuildRequire Mesa-devel, pkgconfig(gl) is enough, and it + doesn't pull the whole Mesa egl/gles stack + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change New: 0001-Don-t-crash-if-the-relayed-signal-was-emitted-from-t.patch 0002-QDBusPendingCall-add-a-missing-QWaitCondition-wakeAl.patch 0003-Fix-unprotected-access-to-QDBusPendingCallPrivate-pe.patch 0004-Remove-QDBusPendingCallPrivate-autoDelete-logic.patch 0005-Change-QDBusPendingCallPrivate-to-full-reference-cou.patch Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.mJHxHi/_old 2013-09-02 15:00:19.0 +0200 +++ /var/tmp/diff_new_pack.mJHxHi/_new 2013-09-02 15:00:19.0 +0200 @@ -18,7 +18,6 @@ Name: libqt4-devel-doc -BuildRequires: Mesa-devel BuildRequires: alsa-devel BuildRequires: cups-devel BuildRequires: fdupes @@ -27,6 +26,7 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: sqlite3-devel +BuildRequires: pkgconfig(gl) %if 0%{?suse_version} BuildRequires: update-desktop-files %endif @@ -101,6 +101,16 @@ 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-UPSTREAM 0001-Don-t-crash-if-the-relayed-signal-was-emitted-from-t.patch (QTBUG#31932,kde#234484) +Patch154: 0001-Don-t-crash-if-the-relayed-signal-was-emitted-from-t.patch +# PATCH-FIX-UPSTREAM 0002-QDBusPendingCall-add-a-missing-QWaitCondition-wakeAl.patch (QTBUG#27809) +Patch155: 0002-QDBusPendingCall-add-a-missing-QWaitCondition-wakeAl.patch +# PATCH-FIX-UPSTREAM 0003-Fix-unprotected-access-to-QDBusPendingCallPrivate-pe.patch (QTBUG#27809) +Patch156: 0003-Fix-unprotected-access-to-QDBusPendingCallPrivate-pe.patch +# PATCH-FIX-UPSTREAM 0004-Remove-QDBusPendingCallPrivate-autoDelete-logic.patch (QTBUG#27809) +Patch157: 0004-Remove-QDBusPendingCallPrivate-autoDelete-logic.patch +# PATCH-FIX-UPSTREAM 0005-Change-QDBusPendingCallPrivate-to-full-reference-cou.patch (QTBUG#27809) +Patch158: 0005-Change-QDBusPendingCallPrivate-to-full-reference-cou.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 \ @@ -177,6 +187,11 @@ %patch151 %patch152 -p1 %patch153 -p1 +%patch154 -p1 +%patch155 -p1 +%patch156 -p1 +%patch157 -p1 +%patch158 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them libqt4-sql-plugins.spec: same change ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.mJHxHi/_old 2013-09-02 15:00:19.0 +0200 +++ /var/tmp/diff_new_pack.mJHxHi/_new 2013-09-02 15:00:19.0 +0200 @@ -23,7 +23,6 @@ %define with_phonon_backend 0 %define with_qtwebkit 0 -BuildRequires: Mesa-devel BuildRequires: a
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2013-08-12 14:22:53 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 2013-07-08 07:12:44.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2013-08-12 14:22:54.0 +0200 @@ -1,0 +2,9 @@ +Mon Jul 29 23:12:10 UTC 2013 - hrvoje.sen...@gmail.com + +- Added qlocale_icu-no-warning-output.patch -- since openSUSE + now has it's own icu so versioning, and we can't predict what will + happen in future, qWarnings about icu libraries and symbols are now + only emmited in debug builds. This will be usefull regardless of + icu versioning. + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change New: qlocale_icu-no-warning-output.patch Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.Toul2s/_old 2013-08-12 14:22:57.0 +0200 +++ /var/tmp/diff_new_pack.Toul2s/_new 2013-08-12 14:22:57.0 +0200 @@ -99,6 +99,8 @@ Patch149: qatomic-generic.patch Patch151: aarch64-support.diff 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 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 \ @@ -174,6 +176,7 @@ %patch149 -p1 %patch151 %patch152 -p1 +%patch153 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them libqt4-sql-plugins.spec: same change libqt4.spec: same change ++ qlocale_icu-no-warning-output.patch ++ >From b924fb26f14b38c5a92d7271b2eba73080cfb337 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Tue, 30 Jul 2013 01:02:38 +0200 Subject: [PATCH 1/1] qlocale_icu-no-warning-output.patch Since openSUSE now has it's own icu so versioning, and we can't predict what will happen in future, qWarnings about icu libraries and symbols are now only emmited in debug builds. This will be usefull regardless of icu versioning. --- src/corelib/tools/qlocale_icu.cpp | 8 1 file changed, 8 insertions(+) diff --git a/src/corelib/tools/qlocale_icu.cpp b/src/corelib/tools/qlocale_icu.cpp index c3e2907..ce09677 100644 --- a/src/corelib/tools/qlocale_icu.cpp +++ b/src/corelib/tools/qlocale_icu.cpp @@ -84,7 +84,9 @@ bool qt_initIcu(const QString &localeString) QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT)); lib.setLoadHints(QLibrary::ImprovedSearchHeuristics); if (!lib.load()) { +#ifndef QT_NO_DEBUG qWarning() << "Unable to load library icui18n" << lib.errorString(); +#endif status = ErrorLoading; return false; } @@ -105,7 +107,9 @@ bool qt_initIcu(const QString &localeString) ptr_ucol_close = 0; ptr_ucol_strcoll = 0; +#ifndef QT_NO_DEBUG qWarning("Unable to find symbols in icui18n"); +#endif status = ErrorLoading; return false; } @@ -114,7 +118,9 @@ bool qt_initIcu(const QString &localeString) QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT)); ucLib.setLoadHints(QLibrary::ImprovedSearchHeuristics); if (!ucLib.load()) { +#ifndef QT_NO_DEBUG qWarning() << "Unable to load library icuuc" << ucLib.errorString(); +#endif status = ErrorLoading; return false; } @@ -131,7 +137,9 @@ bool qt_initIcu(const QString &localeString) ptr_u_strToUpper = 0; ptr_u_strToLower = 0; +#ifndef QT_NO_DEBUG qWarning("Unable to find symbols in icuuc"); +#endif status
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2013-07-08 07:12:42 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 2013-04-23 11:32:56.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2013-07-08 07:12:44.0 +0200 @@ -1,0 +2,40 @@ +Tue Jul 2 16:07:16 UTC 2013 - hrvoje.sen...@gmail.com + +- Readd re-aranged fix-moc-from-choking-on-boost-headers.patch, it + is still needed for newer boost versions + +--- +Tue Jul 2 11:33:30 UTC 2013 - dmuel...@suse.com + +- update to 4.8.5: + * Qt 4.8.5 provides overall close to 400 improvements, for example: + * 35 fixes to Qt Core module + * 65 fixes to Qt Gui module + * 21 Mac OS X specific fixes + * 15 Windows specific fixes + * 8 Linux/X11 specific fixes + * Webkit upgrade to 2.2.4 (minor improvements) + * Change all shmget calls to user-only memory (security) + A detailed list of the fixes and improvements in Qt 4.8.5 compared + to Qt 4.8.4 can be found in the included changes-4.8.5 file. + +- remove CVE-2011-3922.diff +- remove undo-fix-jit-crash-on-x86_64.patch +- remove openssl-incompatibility-fix.diff +- remove cert-blacklist-tuerktrust.diff +- remove cert-blacklist-more.diff +- remove garbage-collect-deleted-objects.patch +- remove libqt4-CVE-2013-0254.patch +- remove Fix-call-to-QMetaObject.patch +- remove check-return-value-of-qt_safe_pipe.patch +- remove moc-boost148-workaround.diff +- remove fix-moc-from-choking-on-boost-headers.patch +- remove slovak-zero.patch +- remove qdbusviewer.patch + +--- +Wed May 29 09:27:12 UTC 2013 - jsl...@suse.com + +- separate linguist to a separate package (bnc#738543). + +--- libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes2013-06-05 11:54:29.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2013-07-08 07:12:44.0 +0200 @@ -1,0 +2,35 @@ +Tue Jul 2 16:07:16 UTC 2013 - hrvoje.sen...@gmail.com + +- Readd re-aranged fix-moc-from-choking-on-boost-headers.patch, it + is still needed for newer boost versions + +--- +Tue Jul 2 11:33:30 UTC 2013 - dmuel...@suse.com + +- update to 4.8.5: + * Qt 4.8.5 provides overall close to 400 improvements, for example: + * 35 fixes to Qt Core module + * 65 fixes to Qt Gui module + * 21 Mac OS X specific fixes + * 15 Windows specific fixes + * 8 Linux/X11 specific fixes + * Webkit upgrade to 2.2.4 (minor improvements) + * Change all shmget calls to user-only memory (security) + A detailed list of the fixes and improvements in Qt 4.8.5 compared + to Qt 4.8.4 can be found in the included changes-4.8.5 file. + +- remove CVE-2011-3922.diff +- remove undo-fix-jit-crash-on-x86_64.patch +- remove openssl-incompatibility-fix.diff +- remove cert-blacklist-tuerktrust.diff +- remove cert-blacklist-more.diff +- remove garbage-collect-deleted-objects.patch +- remove libqt4-CVE-2013-0254.patch +- remove Fix-call-to-QMetaObject.patch +- remove check-return-value-of-qt_safe_pipe.patch +- remove moc-boost148-workaround.diff +- remove fix-moc-from-choking-on-boost-headers.patch +- remove slovak-zero.patch +- remove qdbusviewer.patch + +--- Old: CVE-2011-3922.diff Fix-call-to-QMetaObject.patch cert-blacklist-more.diff cert-blacklist-tuerktrust.diff check-return-value-of-qt_safe_pipe.patch garbage-collect-deleted-objects.patch libqt4-CVE-2013-0254.patch moc-boost148-workaround.diff openssl-incompatibility-fix.diff qdbusviewer.patch qt-everywhere-opensource-src-4.8.4.tar.gz slovak-zero.patch undo-fix-jit-crash-on-x86_64.patch New: qt-everywhere-opensource-src-4.8.5.tar.gz Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.X4Yl8m/_old 2013-07-08 07:13:07.0 +0200 +++ /var/tmp/diff_new_pack.X4Yl8m/_new 2013-07-08 07:13:07.0 +0200 @@ -38,7 +38,7 @@ # COMMON-VERSION-BEGIN %define base_name libqt4 %define tar_version everywhere-opensource-src-%{version} -Version:4.8.4 +Version:4.8.5 Release:0 # COMMON-VERSION-END # COMMON-VERSION-END @@ -53,7 +53,7 @@ Obsoletes: qt-devel-doc < 4.4.0 # COMMON-BEGIN # COMMON-BEGIN -Source: http://releases.qt-project.org/qt4/source/qt-%{tar_ver
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2013-06-05 11:54:28 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4" Changes: libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes2013-04-23 11:32:56.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2013-06-05 11:54:29.0 +0200 @@ -1,0 +2,5 @@ +Wed May 29 09:27:12 UTC 2013 - jsl...@suse.com + +- separate linguist to a separate package (bnc#738543). + +--- Other differences: -- libqt4-sql-plugins.spec: same change ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.CLZgpP/_old 2013-06-05 11:54:33.0 +0200 +++ /var/tmp/diff_new_pack.CLZgpP/_new 2013-06-05 11:54:33.0 +0200 @@ -151,11 +151,23 @@ handling. # COMMON-END +%package linguist +Summary:Qt Linguist +License:GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1 +Group: Development/Tools/Other +Requires: %{name} = %{version} + +%description linguist +Qt provides excellent support for translating applications into local +languages. Qt Linguist is a program to deal with them. Yoy need this if you +want to translate your (or other's) projects into your native language. + %package devel Summary:Qt Development Kit License:GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1 Group: Development/Libraries/X11 Requires: %{name} = %{version} +Requires: %{name}-linguist = %{version} Requires: Mesa-devel Requires: c++_compiler Requires: dbus-1-devel @@ -669,6 +681,16 @@ %{_libdir}/pkgconfig/QtWebKit.pc %endif +%files linguist +%defattr(-,root,root,755) +%{_bindir}/lconvert +%{_bindir}/linguist +%{_bindir}/lrelease +%{_bindir}/lupdate +%{_datadir}/applications/linguist4.desktop +%{_datadir}/pixmaps/linguist.png +%{_datadir}/qt4/translations/linguist_*.qm + %files devel %defattr(-,root,root,755) %dir %plugindir/designer @@ -676,10 +698,6 @@ %dir %{_datadir}/qt4 %{_bindir}/designer -%{_bindir}/lconvert -%{_bindir}/linguist -%{_bindir}/lrelease -%{_bindir}/lupdate %{_bindir}/moc %{_bindir}/pixeltool %{_bindir}/qdbuscpp2xml @@ -722,12 +740,9 @@ %{_includedir}/QtXmlPatterns/ %{_datadir}/applications/designer4.desktop -%{_datadir}/applications/linguist4.desktop -%{_datadir}/pixmaps/linguist.png %{_datadir}/qt4/mkspecs %{_datadir}/qt4/q3porting.xml %{_datadir}/qt4/translations/designer_*.qm -%{_datadir}/qt4/translations/linguist_*.qm %{_libdir}/lib*.prl %{_libdir}/lib*.so -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2013-04-23 11:32:53 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4", Maintainer is "dmuel...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2013-04-14 10:33:21.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2013-04-23 11:32:56.0 +0200 @@ -1,0 +2,11 @@ +Mon Apr 22 06:40:35 UTC 2013 - pgaj...@suse.com + +- Added slovak-zero.patch, fixes bug [bnc#812528]. + +--- +Sat Apr 20 16:32:12 UTC 2013 - hrvoje.sen...@gmail.com + +- Added fix-moc-from-choking-on-boost-headers.patch, workaround for + QTBUG#22829 + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change New: fix-moc-from-choking-on-boost-headers.patch slovak-zero.patch Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.g3h2Og/_old 2013-04-23 11:33:10.0 +0200 +++ /var/tmp/diff_new_pack.g3h2Og/_new 2013-04-23 11:33:10.0 +0200 @@ -112,6 +112,11 @@ Patch150: check-return-value-of-qt_safe_pipe.patch Patch151: aarch64-support.diff Patch152: moc-boost148-workaround.diff +# PATCH-FIX-UPSTREAM fix-moc-from-choking-on-boost-headers.patch -- Workaround for QTBUG-22829 +Patch153: fix-moc-from-choking-on-boost-headers.patch +# following patch fixes slovak locale data, e. g. position of slovak zero symbol in unicode +# (to be upstreamed) +Patch154: slovak-zero.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 @@ -198,6 +203,8 @@ %patch150 -p1 %patch151 %patch152 +%patch153 -p1 +%patch154 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them libqt4-sql-plugins.spec: same change libqt4.spec: same change ++ fix-moc-from-choking-on-boost-headers.patch ++ diff -urNB qt-everywhere-opensource-src-4.8.4.orig/src/tools/moc/main.cpp qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp --- qt-everywhere-opensource-src-4.8.4.orig/src/tools/moc/main.cpp 2013-04-20 18:19:50.777477986 +0200 +++ qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp 2013-04-20 18:20:41.070849233 +0200 @@ -187,7 +187,12 @@ Moc moc; pp.macros["Q_MOC_RUN"]; pp.macros["__cplusplus"]; + +// Workaround a bugs while parsing some boost headers. See QTBUG-22829 +pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; +pp.macros["BOOST_LEXICAL_CAST_INCLUDED"]; pp.macros["BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION"]; + QByteArray filename; QByteArray output; FILE *in = 0; ++ slovak-zero.patch ++ Index: qt-everywhere-opensource-src-4.8.4/src/corelib/tools/qlocale_data_p.h === --- qt-everywhere-opensource-src-4.8.4.orig/src/corelib/tools/qlocale_data_p.h +++ qt-everywhere-opensource-src-4.8.4/src/corelib/tools/qlocale_data_p.h @@ -562,7 +562,7 @@ static const QLocalePrivate locale_data[ {106, 0, 198,46,44,59,37,48,45,43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 572,10 , 959,17 , 522,7 , 25,12 , 12541,59 , 12600,96 , 12696,32 , 12808,61 , 12869,96 , 12965,32 , 8367,30 , 8397,62 , 8459,19 , 8367,30 , 8397,62 , 8459,19 , 293,5 , 276,4 , {76,75,82}, 256,3 , 6172,19 , 4,4 , 13,6 , 2496,5 , 2501,11 , 2, 1, 1, 6, 7 }, // Singhalese/AnyScript/SriLanka {107, 0, 195,44, 160,59,37,48,45,43, 101, 8216, 8217, 8220, 8221, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 12728,48 , 12776,114 , 1381,27 , 12997,48 , 13045,114 , 134,27 , 8478,27 , 8505,68 , 708,14 , 8478,27 , 8505,68 , 708,14 , 0,2 , 0,2 , {90,65,82}, 11,1 , 0,7 , 4,4 , 4,0 , 2512,7 , 0,0
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2013-04-14 10:33:19 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4", Maintainer is "dmuel...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2013-03-22 11:50:04.0 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2013-04-14 10:33:21.0 +0200 @@ -1,0 +2,11 @@ +Thu Apr 11 11:36:55 UTC 2013 - dmuel...@suse.com + +- add moc-boost148-workaround.diff: + * add workaround for moc issues with boost148 + +--- +Fri Apr 5 13:07:27 UTC 2013 - idon...@suse.com + +- Add Source URL, see https://en.opensuse.org/SourceUrls + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change Old: qt-everywhere-opensource-src-4.8.4.tar.bz2 New: moc-boost148-workaround.diff qt-everywhere-opensource-src-4.8.4.tar.gz Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.jGMLfe/_old 2013-04-14 10:33:53.0 +0200 +++ /var/tmp/diff_new_pack.jGMLfe/_new 2013-04-14 10:33:53.0 +0200 @@ -53,7 +53,7 @@ Obsoletes: qt-devel-doc < 4.4.0 # COMMON-BEGIN # COMMON-BEGIN -Source: qt-%{tar_version}.tar.bz2 +Source: http://releases.qt-project.org/qt4/source/qt-%{tar_version}.tar.gz # to get mtime of file: Source1:libqt4.changes Source2:baselibs.conf @@ -111,6 +111,7 @@ Patch149: qatomic-generic.patch Patch150: check-return-value-of-qt_safe_pipe.patch Patch151: aarch64-support.diff +Patch152: moc-boost148-workaround.diff 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 @@ -196,6 +197,7 @@ %patch149 -p1 %patch150 -p1 %patch151 +%patch152 # ### 47 rediff #%patch121 -p1 # be sure not to use them ++ libqt4-sql-plugins.spec ++ --- /var/tmp/diff_new_pack.jGMLfe/_old 2013-04-14 10:33:53.0 +0200 +++ /var/tmp/diff_new_pack.jGMLfe/_new 2013-04-14 10:33:53.0 +0200 @@ -44,7 +44,7 @@ BuildRequires: libqt4-devel >= %{version} # COMMON-BEGIN # COMMON-BEGIN -Source: qt-%{tar_version}.tar.bz2 +Source: http://releases.qt-project.org/qt4/source/qt-%{tar_version}.tar.gz # to get mtime of file: Source1:libqt4.changes Source2:baselibs.conf @@ -102,6 +102,7 @@ Patch149: qatomic-generic.patch Patch150: check-return-value-of-qt_safe_pipe.patch Patch151: aarch64-support.diff +Patch152: moc-boost148-workaround.diff 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 @@ -201,6 +202,7 @@ %patch149 -p1 %patch150 -p1 %patch151 +%patch152 # ### 47 rediff #%patch121 -p1 # be sure not to use them ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.jGMLfe/_old 2013-04-14 10:33:53.0 +0200 +++ /var/tmp/diff_new_pack.jGMLfe/_new 2013-04-14 10:33:53.0 +0200 @@ -71,7 +71,7 @@ Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-BEGIN -Source: qt-%{tar_version}.tar.bz2 +Source: http://releases.qt-project.org/qt4/source/
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2013-03-22 11:50:02 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4", Maintainer is "dmuel...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2013-02-25 21:40:26.0 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2013-03-22 11:50:04.0 +0100 @@ -1,0 +2,18 @@ +Tue Mar 5 21:42:55 UTC 2013 - dmuel...@suse.com + +- Add aarch64-support.diff: + * Fix aarch64 support in webkit tree + +--- +Tue Mar 5 13:42:52 UTC 2013 - sch...@suse.de + +- Add qatomic_generic.patch: + * Fix generic qatomic for const pointers + +--- +Sun Mar 3 13:26:53 UTC 2013 - hrvoje.sen...@gmail.com + +- Add check-return-value-of-qt_safe_pipe.patch: + * fixes QTBUG#18934 and kde#310777 + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change New: aarch64-support.diff check-return-value-of-qt_safe_pipe.patch qatomic-generic.patch Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.s3HRA8/_old 2013-03-22 11:50:19.0 +0100 +++ /var/tmp/diff_new_pack.s3HRA8/_new 2013-03-22 11:50:19.0 +0100 @@ -108,6 +108,9 @@ Patch147: libqt4-CVE-2013-0254.patch # PATCH-FIX-UPSTREAM Fix-call-to-QMetaObject.patch Fixes qtbug29082 and kde#311751, crashing of plasma-desktop on QML systray Patch148: Fix-call-to-QMetaObject.patch +Patch149: qatomic-generic.patch +Patch150: check-return-value-of-qt_safe_pipe.patch +Patch151: aarch64-support.diff 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 @@ -190,6 +193,9 @@ %patch146 -p1 %patch147 -p1 %patch148 -p1 +%patch149 -p1 +%patch150 -p1 +%patch151 # ### 47 rediff #%patch121 -p1 # be sure not to use them libqt4-sql-plugins.spec: same change ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.s3HRA8/_old 2013-03-22 11:50:19.0 +0100 +++ /var/tmp/diff_new_pack.s3HRA8/_new 2013-03-22 11:50:19.0 +0100 @@ -126,6 +126,9 @@ Patch147: libqt4-CVE-2013-0254.patch # PATCH-FIX-UPSTREAM Fix-call-to-QMetaObject.patch Fixes qtbug29082 and kde#311751, crashing of plasma-desktop on QML systray Patch148: Fix-call-to-QMetaObject.patch +Patch149: qatomic-generic.patch +Patch150: check-return-value-of-qt_safe_pipe.patch +Patch151: aarch64-support.diff 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 @@ -418,6 +421,9 @@ %patch146 -p1 %patch147 -p1 %patch148 -p1 +%patch149 -p1 +%patch150 -p1 +%patch151 # ### 47 rediff #%patch121 -p1 # be sure not to use them ++ 0180-window-role.diff ++ --- /var/tmp/diff_new_pack.s3HRA8/_old 2013-03-22 11:50:19.0 +0100 +++ /var/tmp/diff_new_pack.s3HRA8/_new 2013-03-22 11:50:19.0 +0100 @@ -26,7 +26,7 @@ === --- src/corelib/kernel/qobject_p.h.orig +++ src/corelib/kernel/qobject_p.h -@@
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2013-02-25 21:40:25 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4", Maintainer is "dmuel...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2013-02-21 14:55:58.0 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2013-02-25 21:40:26.0 +0100 @@ -1,0 +2,6 @@ +Fri Feb 22 16:33:27 UTC 2013 - hrvoje.sen...@gmail.com + +- Added Fix-call-to-QMetaObject.patch, fixes qtbug29082 and kde#311751, + crashing of plasma-desktop on QML systray + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change New: Fix-call-to-QMetaObject.patch Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.s6DbJu/_old 2013-02-25 21:40:37.0 +0100 +++ /var/tmp/diff_new_pack.s6DbJu/_new 2013-02-25 21:40:37.0 +0100 @@ -106,6 +106,8 @@ # and deregister objects very frequently (like nepomukstorage) Patch146: garbage-collect-deleted-objects.patch Patch147: libqt4-CVE-2013-0254.patch +# PATCH-FIX-UPSTREAM Fix-call-to-QMetaObject.patch Fixes qtbug29082 and kde#311751, crashing of plasma-desktop on QML systray +Patch148: Fix-call-to-QMetaObject.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 @@ -187,6 +189,7 @@ %patch145 -p1 %patch146 -p1 %patch147 -p1 +%patch148 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them libqt4-sql-plugins.spec: same change ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.s6DbJu/_old 2013-02-25 21:40:37.0 +0100 +++ /var/tmp/diff_new_pack.s6DbJu/_new 2013-02-25 21:40:37.0 +0100 @@ -124,6 +124,8 @@ # and deregister objects very frequently (like nepomukstorage) Patch146: garbage-collect-deleted-objects.patch Patch147: libqt4-CVE-2013-0254.patch +# PATCH-FIX-UPSTREAM Fix-call-to-QMetaObject.patch Fixes qtbug29082 and kde#311751, crashing of plasma-desktop on QML systray +Patch148: Fix-call-to-QMetaObject.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 @@ -415,6 +417,7 @@ %patch145 -p1 %patch146 -p1 %patch147 -p1 +%patch148 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them ++ Fix-call-to-QMetaObject.patch ++ --- a/src/corelib/animation/qpropertyanimation.cpp +++ b/src/corelib/animation/qpropertyanimation.cpp @@ -135,8 +135,11 @@ if (newValue.userType() == propertyType) { //no conversion is needed, we directly call the QMetaObject::metacall -void *data = const_cast(newValue.constData()); -QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, &data); +//check QMetaProperty::write for an explanation of these +int status = -1; +int flags = 0; +void *argv[] = { const_cast(newValue.constData()), const_cast(&newValue), &status, &flags }; +QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, argv); } else { targetValue->setProperty(propertyName.constData(), newValue); }
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2013-02-21 14:55:55 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4", Maintainer is "dmuel...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2013-01-20 12:17:42.0 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2013-02-21 14:55:58.0 +0100 @@ -1,0 +2,6 @@ +Thu Feb 21 09:56:04 UTC 2013 - mvysko...@suse.com + +- fix bnc#802634: information disclosure via QSharedMemory (CVE-2013-0254) + * libqt4-CVE-2013-0254.patch + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change New: libqt4-CVE-2013-0254.patch Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.h85jIh/_old 2013-02-21 14:56:10.0 +0100 +++ /var/tmp/diff_new_pack.h85jIh/_new 2013-02-21 14:56:10.0 +0100 @@ -105,6 +105,7 @@ # PATCH-FIX-UPSTREAM garbage-collect-deleted-objects.patch Fixes performance issues in apps which register # and deregister objects very frequently (like nepomukstorage) Patch146: garbage-collect-deleted-objects.patch +Patch147: libqt4-CVE-2013-0254.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 @@ -185,6 +186,7 @@ %patch144 -p1 %patch145 -p1 %patch146 -p1 +%patch147 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them libqt4-sql-plugins.spec: same change ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.h85jIh/_old 2013-02-21 14:56:10.0 +0100 +++ /var/tmp/diff_new_pack.h85jIh/_new 2013-02-21 14:56:10.0 +0100 @@ -123,6 +123,7 @@ # PATCH-FIX-UPSTREAM garbage-collect-deleted-objects.patch Fixes performance issues in apps which register # and deregister objects very frequently (like nepomukstorage) Patch146: garbage-collect-deleted-objects.patch +Patch147: libqt4-CVE-2013-0254.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 @@ -413,6 +414,7 @@ %patch144 -p1 %patch145 -p1 %patch146 -p1 +%patch147 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them ++ libqt4-CVE-2013-0254.patch ++ >From 57756e72adf2081137b97f0e689dd16c770d10b1 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 22 Dec 2012 08:32:12 -0800 Subject: [PATCH] Change all shmget calls to user-only memory Drop the read and write permissions for group and other users in the system. Change-Id: I8fc753f09126651af3fb82df3049050f0b14e876 (cherry-picked from Qt 5 commit 856f209fb63ae336bfb389a12d2a75fa886dc1c5) Reviewed-by: Richard J. Moore (cherry picked from commit 20b26bdb3dd5e46b01b9a7e1ce8342074df3c89c) --- >From 57756e72adf2081137b97f0e689dd16c770d10b1 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 22 Dec 2012 08:32:12 -0800 Subject: [PATCH] Change all shmget calls to user-only memory Drop the read and write permissions for group and other users in the system. Change-Id: I8fc753f09126651af3fb82df3049050f0b14e876 (cherry-picked from Qt 5 commit 856f209fb63ae336bfb389a12d2a75fa886dc1c5) Reviewed-by: Richard J. Moore (cherry picked from commit
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2013-01-20 12:17:40 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4", Maintainer is "dmuel...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2013-01-10 15:25:35.0 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2013-01-20 12:17:42.0 +0100 @@ -1,0 +2,7 @@ +Fri Jan 18 18:23:22 UTC 2013 - hrvoje.sen...@gmail.com + +- Added garbage-collect-deleted-objects.patch from upstream, + Fixes performance issues in apps which register + and deregister objects very frequently (like nepomukstorage) + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change New: garbage-collect-deleted-objects.patch Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.8YMEBn/_old 2013-01-20 12:17:50.0 +0100 +++ /var/tmp/diff_new_pack.8YMEBn/_new 2013-01-20 12:17:50.0 +0100 @@ -102,6 +102,9 @@ Patch143: openssl-incompatibility-fix.diff Patch144: cert-blacklist-tuerktrust.diff Patch145: cert-blacklist-more.diff +# PATCH-FIX-UPSTREAM garbage-collect-deleted-objects.patch Fixes performance issues in apps which register +# and deregister objects very frequently (like nepomukstorage) +Patch146: garbage-collect-deleted-objects.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 @@ -181,6 +184,7 @@ %patch143 %patch144 -p1 %patch145 -p1 +%patch146 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them libqt4-sql-plugins.spec: same change libqt4.spec: same change ++ garbage-collect-deleted-objects.patch ++ From: David Faure Date: Tue, 15 Jan 2013 17:41:27 + Subject: QtDBus: Garbage collect deleted objects now and then. X-Git-Url: http://quickgit.kde.org/?p=qt.git&a=commitdiff&h=cf5442551196c3e7e06e6de85c5f8a198b0ff001 --- QtDBus: Garbage collect deleted objects now and then. Fixes performance issues in apps which register and deregister objects very frequently (like nepomukstorage). Change-Id: Id7d6ef508336758c55fa894868241f143b3e30e0 Backport-Of: ac9ab9703ff299c94dca7585d5a12ecde28931bb Reviewed-by: Thiago Macieira --- --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -2216,6 +2216,19 @@ return signalHooks.erase(it); } + +static void cleanupDeletedNodes(QDBusConnectionPrivate::ObjectTreeNode &parent) +{ +QMutableVectorIterator it(parent.children); +while (it.hasNext()) { +QDBusConnectionPrivate::ObjectTreeNode& node = it.next(); +if (node.obj == 0 && node.children.isEmpty()) +it.remove(); +else +cleanupDeletedNodes(node); +} +} + void QDBusConnectionPrivate::registerObject(const ObjectTreeNode *node) { connect(node->obj, SIGNAL(destroyed(QObject*)), SLOT(objectDestroyed(QObject*)), @@ -2239,6 +2252,10 @@ this, SLOT(relaySignal(QObject*,const QMetaObject*,int,QVariantList)), Qt::DirectConnection); } + +static int counter = 0; +if ((++counter % 20) == 0) +cleanupDeletedNodes(rootNode); } void QDBusConnectionPrivate::connectRelay(const QString &service, -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2013-01-10 15:25:33 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4", Maintainer is "dmuel...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2012-11-28 11:00:53.0 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2013-01-10 15:25:35.0 +0100 @@ -1,0 +2,33 @@ +Mon Jan 7 16:09:50 UTC 2013 - dmuel...@suse.com + +- Add cert-blacklist-more.diff, cert-blacklist-tuerktrust.diff: + * blacklist more evil certificates + +--- +Mon Jan 7 12:38:48 UTC 2013 - dmuel...@suse.com + +- enable linked support for OpenSSL + +--- +Fri Jan 4 15:16:33 UTC 2013 - dmuel...@suse.com + +- qdbusviewer.patch: Add fix for qdbusviewer not matching args (bnc#784197) +- openssl-incompatibility-fix.diff: Fix wrong error reporting when using + a binary incompatible version of openSSL (bnc#797006, CVE-2012-6093) + +--- +Sun Dec 16 18:59:51 CET 2012 - r...@suse.de + +- fix build on s390x by adding + qt4-fix-s390x-build.diff + +--- +Mon Dec 3 07:56:00 UTC 2012 - stephan.bin...@basyskom.com + +- Update to version 4.8.4: + * long list of forward and backward compatible + bug fixes. see included changes-4.8.4 for details +- remove obsolete backport disable-ssl-compression-by-default.patch +- update License and URL to Digia + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change Old: disable-ssl-compression-by-default.patch qt-everywhere-opensource-src-4.8.3.tar.gz New: cert-blacklist-more.diff cert-blacklist-tuerktrust.diff openssl-incompatibility-fix.diff qdbusviewer.patch qt-everywhere-opensource-src-4.8.4.tar.bz2 qt4-fix-s390x-build.diff Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.YUBJ4V/_old 2013-01-10 15:25:49.0 +0100 +++ /var/tmp/diff_new_pack.YUBJ4V/_new 2013-01-10 15:25:49.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqt4-devel-doc # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,14 +31,14 @@ BuildRequires: update-desktop-files %endif Summary:Qt documentation -License:SUSE-LGPL-2.1-with-nokia-exception-1.1 or GPL-3.0 +License:SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Group: Documentation/HTML -Url:http://www.trolltech.com +Url:http://qt.digia.com/ # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN %define base_name libqt4 %define tar_version everywhere-opensource-src-%{version} -Version:4.8.3 +Version:4.8.4 Release:0 # COMMON-VERSION-END # COMMON-VERSION-END @@ -53,7 +53,7 @@ Obsoletes: qt-devel-doc < 4.4.0 # COMMON-BEGIN # COMMON-BEGIN -Source: qt-%{tar_version}.tar.gz +Source: qt-%{tar_version}.tar.bz2 # to get mtime of file: Source1:libqt4.changes Source2:baselibs.conf @@ -94,12 +94,17 @@ Patch136: handle-tga-files-properly.diff Patch137: qdbusconnection-no-warning-output.patch Patch138: undo-fix-jit-crash-on-x86_64.patch -Patch139: disable-ssl-compression-by-default.patch # PATCH-FIX-UPSTREAM fix_assistant_segfault_QTBUG-25324.patch [bnc#780763] [QTBUG#25324] Patch140: fix_assistant_segfault_QTBUG-25324.patch +# PATCH-FIX-OPENSUSE fix build on s390x failing to link in qnetworkconfigmanager.o +Patch141: qt4-fix-s390x-build.diff +Patch142: qdbusviewer.patch +Patch143: openssl-incompatibility-fix.diff +Patch144: cert-blacklist-tuerktrust.diff +Patch145: cert-blacklist-more.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 -prefix /usr -L %{_libdir} -libdir %{_libdir} -docdir %_docdir/%{base_name} -examplesdir %{_libdir}/qt4/examples -demosdir %{_libdir}/qt4/demos -plugindir %plugindir -translationdir
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2012-11-28 11:00:52 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4", Maintainer is "dmuel...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2012-11-22 16:35:32.0 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2012-11-28 11:00:53.0 +0100 @@ -1,0 +2,5 @@ +Tue Nov 27 10:11:35 UTC 2012 - dmuel...@suse.com + +- revert optflags breakage in last change + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change Other differences: -- libqt4-sql-plugins.spec: same change ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.9dZYpe/_old 2012-11-28 11:01:11.0 +0100 +++ /var/tmp/diff_new_pack.9dZYpe/_new 2012-11-28 11:01:11.0 +0100 @@ -411,10 +411,10 @@ export PATH=$PWD/bin:$PATH export LD_LIBRARY_PATH=$PWD/lib/ %ifarch ppc64 - RPM_OPT_FLAGS="%{optflags} -mminimal-toc" + RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc" %endif -export CXXFLAGS="$CXXFLAGS %{optflags} -DOPENSSL_LOAD_CONF" -export CFLAGS="$CFLAGS %{optflags} -DOPENSSL_LOAD_CONF" +export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF" +export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF" export MAKEFLAGS="%{?_smp_mflags}" touch translations/qt_de.qm %ifarch sparc64 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2012-10-19 08:46:56 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4", Maintainer is "dmuel...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2012-10-06 18:38:29.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2012-10-19 08:46:57.0 +0200 @@ -1,0 +2,6 @@ +Tue Oct 16 13:12:43 UTC 2012 - kok...@gmail.com + ++ Added upstream patch to resolve an assistant segfault + fix_assistant_segfault_QTBUG-25324.patch + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change New: fix_assistant_segfault_QTBUG-25324.patch Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.UDS6Q6/_old 2012-10-19 08:47:03.0 +0200 +++ /var/tmp/diff_new_pack.UDS6Q6/_new 2012-10-19 08:47:03.0 +0200 @@ -97,6 +97,8 @@ Patch137: qdbusconnection-no-warning-output.patch Patch138: undo-fix-jit-crash-on-x86_64.patch Patch139: disable-ssl-compression-by-default.patch +# PATCH-FIX-UPSTREAM fix_assistant_segfault_QTBUG-25324.patch [bnc#780763] [QTBUG#25324] +Patch140: fix_assistant_segfault_QTBUG-25324.patch 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 -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 -importdir %plugindir/imports -xsync -xinput -gtkstyle @@ -155,6 +157,7 @@ %patch137 %patch138 -Rp1 %patch139 -p1 +%patch140 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them libqt4-sql-plugins.spec: same change libqt4.spec: same change ++ fix_assistant_segfault_QTBUG-25324.patch ++ Index: qt-everywhere-opensource-src-4.8.3/tools/assistant/tools/assistant/mainwindow.cpp === --- qt-everywhere-opensource-src-4.8.3.orig/tools/assistant/tools/assistant/mainwindow.cpp +++ qt-everywhere-opensource-src-4.8.3/tools/assistant/tools/assistant/mainwindow.cpp @@ -945,8 +945,7 @@ void MainWindow::updateApplicationFont() if (helpEngine.usesAppFont()) font = helpEngine.appFont(); -const QWidgetList &widgets = qApp->allWidgets(); -foreach (QWidget* widget, widgets) +foreach (QWidget* widget, QApplication::allWidgets()) widget->setFont(font); } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2012-10-05 13:45:21 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4", Maintainer is "dmuel...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2012-09-17 13:58:21.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2012-10-06 18:38:29.0 +0200 @@ -1,0 +2,23 @@ +Thu Oct 4 09:25:36 UTC 2012 - dmuel...@suse.com + +- Disable compression by default to mitigate CRIME attack (CVE-2012-4929) + +--- +Tue Oct 2 23:03:48 UTC 2012 - hrvoje.sen...@gmail.com + +- Revert fix-jit-crash commit responsible for kde#305718 +undo-fix-jit-crash-on-x86_64.patch + +--- +Tue Sep 18 15:04:13 UTC 2012 - dmuel...@suse.com + +- update to 4.8.3: + * long list of forward and backward compatible + bug fixes. see included changes-4.8.3 for details + +--- +Wed Aug 22 00:20:20 UTC 2012 - hrvoje.sen...@gmail.com + +- Omit qdbusconnection warnings in release/no-debug mode + +--- libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes2012-09-17 13:58:21.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2012-10-06 18:38:29.0 +0200 @@ -1,0 +2,18 @@ +Thu Oct 4 09:25:36 UTC 2012 - dmuel...@suse.com + +- Disable compression by default to mitigate CRIME attack (CVE-2012-4929) + +--- +Tue Oct 2 23:03:48 UTC 2012 - hrvoje.sen...@gmail.com + +- Revert fix-jit-crash commit responsible for kde#305718 +undo-fix-jit-crash-on-x86_64.patch + +--- +Tue Sep 18 15:04:13 UTC 2012 - dmuel...@suse.com + +- update to 4.8.3: + * long list of forward and backward compatible + bug fixes. see included changes-4.8.3 for details + +--- Old: qt-everywhere-opensource-src-4.8.1-qdbusconnection_no_debug.patch qt-everywhere-opensource-src-4.8.2.tar.gz New: disable-ssl-compression-by-default.patch qdbusconnection-no-warning-output.patch qt-everywhere-opensource-src-4.8.3.tar.gz undo-fix-jit-crash-on-x86_64.patch Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.k9Gjss/_old 2012-10-06 18:38:41.0 +0200 +++ /var/tmp/diff_new_pack.k9Gjss/_new 2012-10-06 18:38:41.0 +0200 @@ -34,7 +34,7 @@ %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN -Version:4.8.2 +Version:4.8.3 Release:0 %define base_name libqt4 %define tar_version everywhere-opensource-src-%{version} @@ -94,6 +94,9 @@ Patch131: disable-im-for-password.diff Patch132: CVE-2011-3922.diff Patch136: handle-tga-files-properly.diff +Patch137: qdbusconnection-no-warning-output.patch +Patch138: undo-fix-jit-crash-on-x86_64.patch +Patch139: disable-ssl-compression-by-default.patch 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 -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 -importdir %plugindir/imports -xsync -xinput -gtkstyle @@ -149,6 +152,9 @@ %patch131 -p1 %patch132 %patch136 +%patch137 +%patch138 -Rp1 +%patch139 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them libqt4-sql-plugins.spec: same change ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.k9Gjss/_old 2012-10-06 18:38:41.0 +0200 +++ /var/tmp/diff_new_pack.k9Gjss/_new 2012-10-06 18:38:41.0 +0200 @@ -65,7 +65,7 @@ Provides: qt = 4.4.0 Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-VERSION-BEGIN -Version:4.8.2 +Version:4.8.3 Release:0 %define base_name libqt4 %define tar_version everywhere-opensource-src-%{version}
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2012-09-17 13:58:16 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4", Maintainer is "dmuel...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2012-06-25 14:21:44.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2012-09-17 13:58:21.0 +0200 @@ -1,0 +2,5 @@ +Sun Aug 5 12:41:12 UTC 2012 - toddrme2...@gmail.com + +- Add rpm macros file with commonly-needed folders and other macros + +--- libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes2012-06-25 14:21:44.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2012-09-17 13:58:21.0 +0200 @@ -1,0 +2,10 @@ +Wed Aug 22 00:20:20 UTC 2012 - hrvoje.sen...@gmail.com + +- Omit qdbusconnection warnings in release/no-debug mode + +--- +Sun Aug 5 12:41:12 UTC 2012 - toddrme2...@gmail.com + +- Add rpm macros file with commonly-needed folders and other macros + +--- New: macros.qt4 qt-everywhere-opensource-src-4.8.1-qdbusconnection_no_debug.patch Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.FPtE2P/_old 2012-09-17 13:58:27.0 +0200 +++ /var/tmp/diff_new_pack.FPtE2P/_new 2012-09-17 13:58:27.0 +0200 @@ -59,6 +59,7 @@ # to get mtime of file: Source1:libqt4.changes Source2:baselibs.conf +Source3:macros.qt4 Source10: qt4config.desktop Source11: designer4.desktop Source12: linguist4.desktop libqt4-sql-plugins.spec: same change ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.FPtE2P/_old 2012-09-17 13:58:27.0 +0200 +++ /var/tmp/diff_new_pack.FPtE2P/_new 2012-09-17 13:58:27.0 +0200 @@ -75,6 +75,7 @@ # to get mtime of file: Source1:libqt4.changes Source2:baselibs.conf +Source3:macros.qt4 Source10: qt4config.desktop Source11: designer4.desktop Source12: linguist4.desktop @@ -109,6 +110,7 @@ Patch131: disable-im-for-password.diff Patch132: CVE-2011-3922.diff Patch136: handle-tga-files-properly.diff +Patch137: qt-everywhere-opensource-src-4.8.1-qdbusconnection_no_debug.patch 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 -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 -importdir %plugindir/imports -xsync -xinput -gtkstyle @@ -164,6 +166,7 @@ %patch131 -p1 %patch132 %patch136 +%patch137 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them @@ -455,6 +458,9 @@ %install make INSTALL_ROOT=$RPM_BUILD_ROOT install +# install macros and replace version placeholder with current version +install -D -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm/macros.qt4 +sed -i 's/QTVER/%{version}/g' %{buildroot}%{_sysconfdir}/rpm/macros.qt4 %if %with_qtwebkit cp -p src/3rdparty/webkit/JavaScriptCore/release/libjscore.a \ src/3rdparty/webkit/JavaScriptCore/release/libjscore.prl \ @@ -615,6 +621,7 @@ %if !%with_qtwebkit %plugindir/designer/libqdeclarativeview.so %endif +%{_sysconfdir}/rpm/macros.qt4 %if %with_qt3support ++ macros.qt4 ++ %_libqt4_pluginsdir %{_libdir}/qt4/plugins %_libqt4_accessibledir %{_libqt4_pluginsdir}/accessible %_libqt4_bearerdir %{_libqt4_pluginsdir}/bearer %_libqt4_codecsdir %{_libqt4_pluginsdir}/codecs %_libqt4_designerdir%{_libqt4_pluginsdir}/designer %_libqt4_iconenginesdir %{_libqt4_pluginsdir}/iconengines %_libqt4_imageformatsdir%{_libqt4_pluginsdir}/imageformats %_libqt4_importsdir %{_libqt4_pluginsdir}/imports %_libqt4_inputmethodsdir%{_libqt4_pluginsdir}/inputmethods %_libqt4_graphicssystemsdir %{_libqt4_pluginsdir}/graphicssystems %_libqt4_phonon_backenddir %{_libqt4_pluginsdir}/phonon_back
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2012-06-25 14:13:57 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4", Maintainer is "dmuel...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2012-04-17 21:59:19.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2012-06-25 14:21:44.0 +0200 @@ -1,0 +2,13 @@ +Thu Jun 7 16:57:26 UTC 2012 - dmuel...@suse.com + +- update to 4.8.2: + * long list of forward and backward compatible + bug fixes. see included changes-4.8.2 for details +- remove upstreamed patches + +--- +Thu Apr 5 11:22:02 UTC 2012 - dmuel...@suse.com + +- make tga reader compatible + +--- libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes2012-04-17 21:59:19.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2012-06-25 14:21:44.0 +0200 @@ -1,0 +2,8 @@ +Thu Jun 7 16:57:26 UTC 2012 - dmuel...@suse.com + +- update to 4.8.2: + * long list of forward and backward compatible + bug fixes. see included changes-4.8.2 for details +- remove upstreamed patches + +--- Old: qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch qt-everywhere-opensource-src-4.8.1.tar.gz qtextlayout-cursorto.patch New: qt-everywhere-opensource-src-4.8.2.tar.gz Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.cEAwAR/_old 2012-06-25 14:21:59.0 +0200 +++ /var/tmp/diff_new_pack.cEAwAR/_new 2012-06-25 14:21:59.0 +0200 @@ -34,7 +34,7 @@ %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN -Version:4.8.1 +Version:4.8.2 Release:0 %define base_name libqt4 %define tar_version everywhere-opensource-src-%{version} @@ -92,8 +92,6 @@ Patch128: build-qvfb-tool.diff Patch131: disable-im-for-password.diff Patch132: CVE-2011-3922.diff -Patch133: qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch -Patch134: qtextlayout-cursorto.patch Patch136: handle-tga-files-properly.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -149,8 +147,6 @@ %patch128 %patch131 -p1 %patch132 -%patch133 -p1 -%patch134 -p1 %patch136 # ### 47 rediff #%patch121 -p1 libqt4-sql-plugins.spec: same change ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.cEAwAR/_old 2012-06-25 14:21:59.0 +0200 +++ /var/tmp/diff_new_pack.cEAwAR/_new 2012-06-25 14:21:59.0 +0200 @@ -65,7 +65,7 @@ Provides: qt = 4.4.0 Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-VERSION-BEGIN -Version:4.8.1 +Version:4.8.2 Release:0 %define base_name libqt4 %define tar_version everywhere-opensource-src-%{version} @@ -108,8 +108,6 @@ Patch128: build-qvfb-tool.diff Patch131: disable-im-for-password.diff Patch132: CVE-2011-3922.diff -Patch133: qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch -Patch134: qtextlayout-cursorto.patch Patch136: handle-tga-files-properly.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -165,8 +163,6 @@ %patch128 %patch131 -p1 %patch132 -%patch133 -p1 -%patch134 -p1 %patch136 # ### 47 rediff #%patch121 -p1 ++ build-qvfb-tool.diff ++ --- /var/tmp/diff_new_pack.cEAwAR/_old 2012-06-25 14:21:59.0 +0200 +++ /var/tmp/diff_new_pack.cEAwAR/_new 2012-06-25 14:21:59.0 +0200 @@ -9,14 +9,3 @@ contains(QT_CONFIG, dbus):SUBDIRS += qdbus # We don't need these command line utilities on embedded platforms. !wince*:!symbian:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns xmlpatternsvalidator tools/qvfb/qvfb.pro -+++ tools/qvfb/qvfb.pro -@@ -38,8 +38,6 @@ - - !embedded { - DEFINES += QT_NO_QWS_SIGNALHANDLER --HEADERS += ../../src/gui/embedded/qlock_p.h --SOURCES += ../../src/gui/embedded/qlock.cpp - } - - include(../shared/deviceskin/deviceskin.pri) ++ qt-everywhere-opensource-src-4.8.1.tar.gz -> qt-everywhere-opensource-src-4.8.2.tar.gz ++ /work/SRC/openSUSE:Factory/libqt4/qt-everywhere-opensource-src-4.8.1.tar.gz /work/SRC/openSUSE:Factory/.libqt4.new/qt-everywhere-opensource-src-4.8.2.tar.gz differ: char 4, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2012-04-17 21:59:13 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4", Maintainer is "dmuel...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2012-03-19 09:52:03.0 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2012-04-17 21:59:19.0 +0200 @@ -1,0 +2,12 @@ +Tue Apr 3 16:38:22 CEST 2012 - dmuel...@suse.de + +- add fix for qtextlayout crash triggered in calligra (qt bug 24718) + +--- +Thu Mar 29 22:43:47 CEST 2012 - dmuel...@suse.de + +- update to 4.8.1: + * extremely long list of forward and backward compatible + bug fixes. see included changes-4.8.1 for details + +--- libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes2012-03-19 09:52:03.0 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2012-04-17 21:59:19.0 +0200 @@ -1,0 +2,17 @@ +Thu Apr 5 11:22:02 UTC 2012 - dmuel...@suse.com + +- make tga reader compatible + +--- +Tue Apr 3 16:38:22 CEST 2012 - dmuel...@suse.de + +- add fix for qtextlayout crash triggered in calligra (qt bug 24718) + +--- +Thu Mar 29 22:43:47 CEST 2012 - dmuel...@suse.de + +- update to 4.8.1: + * extremely long list of forward and backward compatible + bug fixes. see included changes-4.8.1 for details + +--- Old: qt-everywhere-opensource-src-4.8.0.tar.gz New: handle-tga-files-properly.diff qt-everywhere-opensource-src-4.8.1.tar.gz qtextlayout-cursorto.patch Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.4jaed2/_old 2012-04-17 21:59:34.0 +0200 +++ /var/tmp/diff_new_pack.4jaed2/_new 2012-04-17 21:59:34.0 +0200 @@ -14,7 +14,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - # nodebuginfo @@ -35,7 +34,7 @@ %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN -Version:4.8.0 +Version:4.8.1 Release:0 %define base_name libqt4 %define tar_version everywhere-opensource-src-%{version} @@ -94,6 +93,8 @@ Patch131: disable-im-for-password.diff Patch132: CVE-2011-3922.diff Patch133: qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch +Patch134: qtextlayout-cursorto.patch +Patch136: handle-tga-files-properly.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 -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 -importdir %plugindir/imports -xsync -xinput -gtkstyle @@ -149,6 +150,8 @@ %patch131 -p1 %patch132 %patch133 -p1 +%patch134 -p1 +%patch136 # ### 47 rediff #%patch121 -p1 # be sure not to use them libqt4-sql-plugins.spec: same change ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.4jaed2/_old 2012-04-17 21:59:34.0 +0200 +++ /var/tmp/diff_new_pack.4jaed2/_new 2012-04-17 21:59:34.0 +0200 @@ -16,7 +16,6 @@ # - Name: libqt4 BuildRequires: Mesa-devel BuildRequires: alsa-devel @@ -66,7 +65,7 @@ Provides: qt = 4.4.0 Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-VERSION-BEGIN -Version:4.8.0 +Version:4.8.1 Release:0 %define base_name libqt4 %define tar_version everywhere-opensource-src-%{version} @@ -110,6 +109,8 @@ Patch131: disable-im-for-password.diff Patch132: CVE-2011-3922.diff Patch133: qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch +Patch134: qtextlayout-cursorto.patch +Patch136: handle-tga-files-properly.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2012-03-19 09:50:50 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4", Maintainer is "dmuel...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2012-02-28 19:24:29.0 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2012-03-19 09:52:03.0 +0100 @@ -1,0 +2,6 @@ +Thu Mar 15 09:09:10 UTC 2012 - a...@suse.de + +- Fix build with gcc 4.7 (patch qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch + from Fedora). + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change New: qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.BjB8ra/_old 2012-03-19 09:52:12.0 +0100 +++ /var/tmp/diff_new_pack.BjB8ra/_new 2012-03-19 09:52:12.0 +0100 @@ -14,6 +14,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + # nodebuginfo @@ -92,6 +93,7 @@ Patch128: build-qvfb-tool.diff Patch131: disable-im-for-password.diff Patch132: CVE-2011-3922.diff +Patch133: qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch 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 -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 -importdir %plugindir/imports -xsync -xinput -gtkstyle @@ -146,6 +148,7 @@ %patch128 %patch131 -p1 %patch132 +%patch133 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them libqt4-sql-plugins.spec: same change ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.BjB8ra/_old 2012-03-19 09:52:12.0 +0100 +++ /var/tmp/diff_new_pack.BjB8ra/_new 2012-03-19 09:52:12.0 +0100 @@ -16,6 +16,7 @@ # + Name: libqt4 BuildRequires: Mesa-devel BuildRequires: alsa-devel @@ -108,6 +109,7 @@ Patch128: build-qvfb-tool.diff Patch131: disable-im-for-password.diff Patch132: CVE-2011-3922.diff +Patch133: qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch 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 -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 -importdir %plugindir/imports -xsync -xinput -gtkstyle @@ -162,6 +164,7 @@ %patch128 %patch131 -p1 %patch132 +%patch133 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them ++ qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch ++ diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h --- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me 2012-01-24 11:24:14.729942043 +0100 +++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h 2012-01-24 14:28:39.848109534 +0100 @@ -57,9 +57,7 @@ namespace JSC { class JSGlobalObject : public JSVariableObject { protected: -using JSVariableObject::JSVariableObjectData; - -struct JSGlobalObjectData : public JSVariableObjectData { +struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData { // We use an explicit destructor function pointer instead of a // virtual destructor becaus
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2012-02-28 19:24:27 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4", Maintainer is "dmuel...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2012-01-11 15:38:13.0 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2012-02-28 19:24:29.0 +0100 @@ -1,0 +2,5 @@ +Mon Feb 27 10:52:07 CET 2012 - dmuel...@suse.de + +- fix update conflict with libqt4-devel-doc (bnc#746098) + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.yAdf2r/_old 2012-02-28 19:24:37.0 +0100 +++ /var/tmp/diff_new_pack.yAdf2r/_new 2012-02-28 19:24:37.0 +0100 @@ -266,6 +266,12 @@ %suse_update_desktop_file -i assistant4 Qt Development Documentation +%pre +# used to be a directory, is now a binary +if [ $1 -gt 1 -a -d %_libdir/qt4/examples/declarative/i18n/i18n ]; then + rm -rf %_libdir/qt4/examples/declarative/i18n/i18n || true +fi + %clean rm -rf $RPM_BUILD_ROOT # no baselibs supplements for older distros ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.yAdf2r/_old 2012-02-28 19:24:37.0 +0100 +++ /var/tmp/diff_new_pack.yAdf2r/_new 2012-02-28 19:24:37.0 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: libqt4 BuildRequires: Mesa-devel BuildRequires: alsa-devel @@ -60,8 +61,8 @@ Conflicts: %{name}-x11 <= 4.5.1-2.5 # Obsoletes: qt < 4.4.0 -Provides: qt = 4.4.0 Provides: libqt4-dbus-1 = 4.4.0 +Provides: qt = 4.4.0 Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-VERSION-BEGIN Version:4.8.0 @@ -171,27 +172,37 @@ Summary:Qt Development Kit License:GPL-3.0 or SUSE-LGPL-2.1-with-nokia-exception-1.1 Group: Development/Libraries/X11 -Requires: zlib-devel c++_compiler pkgconfig -Requires: freetype2-devel libmng-devel libpng-devel libtiff-devel -Requires: xorg-x11-devel Mesa-devel dbus-1-devel openssl-devel -Requires: glib2-devel sqlite3-devel make Requires: %name = %version +Requires: Mesa-devel +Requires: c++_compiler +Requires: dbus-1-devel +Requires: freetype2-devel +Requires: glib2-devel +Requires: libmng-devel +Requires: libpng-devel Requires: libqt4-sql-sqlite >= %version +Requires: libtiff-devel +Requires: make +Requires: openssl-devel +Requires: pkgconfig +Requires: sqlite3-devel +Requires: xorg-x11-devel +Requires: zlib-devel # bug437293 %ifarch ppc64 Obsoletes: qt-devel-64bit %endif # -Provides: dbus-1-qt-devel = 0.63 -Provides: qt-devel = 4.4.0 Provides: dbus-1-qt = 0.63 -Provides: qt-dbus-1 = 4.2.0 +Provides: dbus-1-qt-devel = 0.63 Provides: libQtDeclarative-devel = 4.6.0 +Provides: qt-dbus-1 = 4.2.0 +Provides: qt-devel = 4.4.0 Obsoletes: dbus-1-qt < 0.63 -Obsoletes: qt-dbus-1 < 4.2.0 Obsoletes: dbus-1-qt-devel < 0.63 -Obsoletes: qt-devel < 4.4.0 Obsoletes: libQtDeclarative-devel < 4.6.0 +Obsoletes: qt-dbus-1 < 4.2.0 +Obsoletes: qt-devel < 4.4.0 %description devel You need this package, if you want to compile programs with Qt. It @@ -315,7 +326,8 @@ Summary:Non-ABI stabile experimental API License:GPL-3.0 or SUSE-LGPL-2.1-with-nokia-exception-1.1 Group: Development/Libraries/C and C++ -Requires: libqt4-x11 = %version libqt4-devel = %version +Requires: libqt4-devel = %version +Requires: libqt4-x11 = %version %description private-headers-devel This package provides private headers of libqt4-devel that are normally @@ -329,8 +341,8 @@ Summary:Phonon Multimedia Platform Abstraction License:LGPL-2.0+ Group: Development/Libraries/KDE -Requires: phonon-backend = %version Requires: libphonon4 = %version +Requires: phonon-backend = %version %description -n phonon Phonon is a cross-platform portable Multimedia Support Abstraction, ++ libqt4-devel-doc.spec.in ++ --- /var/tmp/diff_new_pack.yAdf2r/_old 2012-02-28 19:24:38.0 +0100 +++ /var/tmp/diff_new_pack.yAdf2r/_new 2012-02-28 19:24:38.0 +0100 @@ -163,6 +163,12 @@ %suse_update_desktop_file -i assistant4 Qt Development Documentation +%pre +# used to be a directory, is now a binary +if [ $1 -gt 1 -a
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2012-01-11 15:37:15 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4", Maintainer is "dmuel...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2012-01-06 11:45:38.0 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2012-01-11 15:38:13.0 +0100 @@ -1,0 +2,14 @@ +Fri Jan 6 17:06:22 CET 2012 - dmuel...@suse.de + +- add patch for rare stack based overflow in harbuzz parser + (bnc#739904, CVE-2011-3922). + +--- +Fri Dec 16 11:04:43 CET 2011 - dmuel...@suse.de + +- update to 4.8.0 (final): + * only minimal change over rc1 + * too many changes to list here, see http://qt.nokia.com/doc/4.8 + and included changes-4.8.0 + +--- @@ -4 +18 @@ -- fix license to LGPL-2.1-with-nokia-exception-1.1 or GPL-3.0 (bnc#736425) +- fix license to SUSE-LGPL-2.1-with-nokia-exception-1.1 or GPL-3.0 (bnc#736425) libqt4-sql-plugins.changes: same change libqt4.changes: same change Old: qt-everywhere-opensource-src-4.8.0-rc1.tar.gz New: CVE-2011-3922.diff qt-everywhere-opensource-src-4.8.0.tar.gz Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.Fiyopo/_old 2012-01-11 15:38:35.0 +0100 +++ /var/tmp/diff_new_pack.Fiyopo/_new 2012-01-11 15:38:35.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqt4-devel-doc # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,17 +34,17 @@ %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN -Version:4.7.90 +Version:4.8.0 Release:0 %define base_name libqt4 -%define tar_version everywhere-opensource-src-4.8.0 +%define tar_version everywhere-opensource-src-%{version} # COMMON-VERSION-END # COMMON-VERSION-END BuildRequires: libQtWebKit-devel >= %version BuildRequires: libqt4-devel >= %version Url:http://www.trolltech.com Summary:Qt documentation -License:GPL-3.0 or LGPL-2.1-with-nokia-exception-1.1 +License:SUSE-LGPL-2.1-with-nokia-exception-1.1 or GPL-3.0 Group: Documentation/HTML Requires: libqt4 = %version Requires: libqt4-devel-doc-data = %version @@ -55,7 +55,7 @@ Obsoletes: qt-devel-doc < 4.4.0 # COMMON-BEGIN # COMMON-BEGIN -Source: qt-everywhere-opensource-src-4.8.0-rc1.tar.gz +Source: qt-%{tar_version}.tar.gz # to get mtime of file: Source1:libqt4.changes Source2:baselibs.conf @@ -91,6 +91,7 @@ Patch123: use-cups-default-print-settings-bnc552218.diff Patch128: build-qvfb-tool.diff Patch131: disable-im-for-password.diff +Patch132: CVE-2011-3922.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 -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 -importdir %plugindir/imports -xsync -xinput -gtkstyle @@ -144,6 +145,7 @@ cp %{SOURCE17} translations/ %patch128 %patch131 -p1 +%patch132 # ### 47 rediff #%patch121 -p1 # be sure not to use them ++ libqt4-sql-plugins.spec ++ --- /var/tmp/diff_new_pack.Fiyopo/_old 2012-01-11 15:38:35.0 +0100 +++ /var/tmp/diff_new_pack.Fiyopo/_new 2012-01-11 15:38:35.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqt4-sql-plugins # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,20 +31,20 @@ %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN -Version:4.7.90 +Version:
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2012-01-06 11:45:35 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4", Maintainer is "dmuel...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2011-12-02 13:21:46.0 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2012-01-06 11:45:38.0 +0100 @@ -1,0 +2,10 @@ +Wed Dec 14 00:26:42 CET 2011 - dmuel...@suse.de + +- fix license to LGPL-2.1-with-nokia-exception-1.1 or GPL-3.0 (bnc#736425) + +--- +Thu Dec 8 13:12:43 UTC 2011 - co...@suse.com + +- sync license in devel-doc and plugins spec file + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.AsHsLM/_old 2012-01-06 11:45:45.0 +0100 +++ /var/tmp/diff_new_pack.AsHsLM/_new 2012-01-06 11:45:45.0 +0100 @@ -14,14 +14,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -# norootforbuild # nodebuginfo Name: libqt4-devel-doc -BuildRequires: Mesa-devel cups-devel freeglut-devel libjpeg-devel libpng-devel -BuildRequires: alsa-devel gtk2-devel sqlite3-devel +BuildRequires: Mesa-devel +BuildRequires: alsa-devel +BuildRequires: cups-devel +BuildRequires: freeglut-devel +BuildRequires: gtk2-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: sqlite3-devel %if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif @@ -31,16 +35,17 @@ # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN Version:4.7.90 -Release:1 +Release:0 %define base_name libqt4 %define tar_version everywhere-opensource-src-4.8.0 # COMMON-VERSION-END # COMMON-VERSION-END -BuildRequires: libQtWebKit-devel >= %version libqt4-devel >= %version +BuildRequires: libQtWebKit-devel >= %version +BuildRequires: libqt4-devel >= %version Url:http://www.trolltech.com -License:QPL, GPL -Group: Documentation/HTML Summary:Qt documentation +License:GPL-3.0 or LGPL-2.1-with-nokia-exception-1.1 +Group: Documentation/HTML Requires: libqt4 = %version Requires: libqt4-devel-doc-data = %version Requires: libqt4-sql-sqlite >= %version @@ -147,9 +152,8 @@ # COMMON-END %package -n qt4-x11-tools -License:QPL, GPL -Group: System/Libraries Summary:C++ Program Library, Core Components +Group: System/Libraries Requires: libqt4-x11 >= %version %description -n qt4-x11-tools @@ -159,12 +163,11 @@ handling. %package data -License:QPL, GPL -Group: System/Libraries %if %suse_version > 1110 BuildArch: noarch %endif Summary:C++ Program Library, Core Components +Group: System/Libraries Requires: %name = %version %description data ++ libqt4-sql-plugins.spec ++ --- /var/tmp/diff_new_pack.AsHsLM/_old 2012-01-06 11:45:45.0 +0100 +++ /var/tmp/diff_new_pack.AsHsLM/_new 2012-01-06 11:45:45.0 +0100 @@ -14,32 +14,34 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -# norootforbuild # nodebuginfo Name: libqt4-sql-plugins +BuildRequires: Mesa-devel +BuildRequires: alsa-devel BuildRequires: cups-devel -BuildRequires: libmysqlclient-devel pkgconfig postgresql-devel unixODBC-devel -BuildRequires: Mesa-devel alsa-devel gtk2-devel +BuildRequires: gtk2-devel +BuildRequires: libmysqlclient-devel +BuildRequires: pkgconfig +BuildRequires: postgresql-devel +BuildRequires: unixODBC-devel %if 0%{?suse_version} BuildRequires: update-desktop-files %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN Version:4.7.90 -Release:1 +Release:0 %define base_name libqt4 %define tar_version everywhere-opensource-src-4.8.0 # COMMON-VERSION-END # COMMON-VERSION-END BuildRequires: libqt4-devel >= %version Url:http://www.trolltech.com -License:QPL, GPL -Group: System/Libraries -AutoReqProv:on Summary:Qt 4 SQL related libraries +License:GPL-3.0 or LGPL-2.1-with-nokia-exception-1.1 +Group: System/Libraries # COMMON-BEGIN # COMMON-BEGIN Source: qt-everywhere-opensource-src-4.8.0-rc1.tar.gz @@ -139,9 +141,8 @@ # COMMON-END %package -n libqt4-sql-unixODBC -License:QPL, GPL -Group: Development/Libraries/C and C++ Summary:Qt 4 unixODBC p
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2011-12-06 18:25:21 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4", Maintainer is "dmuel...@suse.com" Changes: libqt4-sql-plugins.changes: same change libqt4.changes: same change Other differences: -- libqt4-sql-plugins.spec: same change ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.np04Ws/_old 2011-12-06 18:44:16.0 +0100 +++ /var/tmp/diff_new_pack.np04Ws/_new 2011-12-06 18:44:16.0 +0100 @@ -37,7 +37,7 @@ %endif %endif Url:http://www.qtsoftware.com -License:GPLv3 ; LGPLv2.1+ +License:GPL-3.0 ; LGPL-2.1+ Group: System/Libraries AutoReqProv:on Summary:C++ Program Library, Core Components @@ -156,7 +156,7 @@ # COMMON-END %package devel -License:GPLv2 ; GPLv3 +License:GPL-2.0 ; GPL-3.0 Group: Development/Libraries/X11 Summary:Qt Development Kit Requires: zlib-devel c++_compiler pkgconfig @@ -190,7 +190,7 @@ %package -n libqt4-sql-sqlite -License:GPLv2 ; GPLv3 +License:GPL-2.0 ; GPL-3.0 Group: Development/Libraries/C and C++ Summary:Qt 4 sqlite plugin Requires: libqt4-sql = %version @@ -205,7 +205,7 @@ %package x11 -License:GPLv2 ; GPLv3 +License:GPL-2.0 ; GPL-3.0 Group: Development/Libraries/C and C++ Summary:Qt 4 GUI related libraries # bug437293 @@ -225,7 +225,7 @@ %if %with_qt3support %package qt3support -License:GPLv2 ; GPLv3 +License:GPL-2.0 ; GPL-3.0 Group: System/Libraries Summary:C++ Program Library, Core Components # bug437293 @@ -247,7 +247,7 @@ %endif %package sql -License:GPLv2 ; GPLv3 +License:GPL-2.0 ; GPL-3.0 Group: Development/Libraries/C and C++ Summary:Qt 4 SQL related libraries # bug437293 @@ -268,7 +268,7 @@ %if %with_qtwebkit %package -n libQtWebKit4 -License:GPLv2 ; GPLv3 +License:GPL-2.0 ; GPL-3.0 Group: Development/Libraries/C and C++ Summary:Open source Web Browser engine based on Qt4 Requires: libqt4-x11 = %version @@ -284,7 +284,7 @@ %package -n libQtWebKit-devel -License:GPLv2 ; GPLv3 +License:GPL-2.0 ; GPL-3.0 Group: Development/Libraries/C and C++ Summary:Open source Web Browser engine based on Qt4 Requires: libQtWebKit4 = %version @@ -300,7 +300,7 @@ %endif %package private-headers-devel -License:GPLv2 ; GPLv3 +License:GPL-2.0 ; GPL-3.0 Group: Development/Libraries/C and C++ Summary:Non-ABI stabile experimental API Requires: libqt4-x11 = %version libqt4-devel = %version @@ -315,7 +315,7 @@ %package -n phonon -License:LGPLv2.0+ +License:LGPL-2.0+ Summary:Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE Requires: phonon-backend = %version @@ -330,7 +330,7 @@ %package -n phonon-devel -License:LGPLv2.0+ +License:LGPL-2.0+ Summary:Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE Requires: %name = %version @@ -346,7 +346,7 @@ %package -n libphonon4 -License:LGPLv2.0+ +License:LGPL-2.0+ Summary:Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE %requires_gelibqt4-x11 @@ -363,7 +363,7 @@ %package -n phonon-backend-gstreamer-0_10 -License:LGPLv2.0+ +License:LGPL-2.0+ Summary:Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE Provides: phonon-backend = %version @@ -378,7 +378,7 @@ %package -n phonon-backend-xine -License:LGPLv2.0+ +License:LGPL-2.0+ Summary:Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE Provides: phonon-backend = %version -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2011-12-02 13:21:42 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4", Maintainer is "dmuel...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2011-10-24 13:41:22.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2011-12-02 13:21:46.0 +0100 @@ -1,0 +2,19 @@ +Mon Nov 28 14:08:59 UTC 2011 - idoen...@suse.de + +- Fix duplicate files + +--- +Mon Nov 21 19:17:33 CET 2011 - dmuel...@suse.de + +- update to 4.8.0 rc1: + * too many changes to list here, see http://qt.nokia.com/doc/4.8 + and included changes-4.8.0 +- remove patches that went upstream +- rediff patches and adjust filelist + +--- +Mon Nov 21 00:21:24 CET 2011 - r...@suse.de + +- rediffed webkit-ia64_s390x.patch and reactivated patch + +--- libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes2011-11-21 15:47:37.0 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2011-12-02 13:21:46.0 +0100 @@ -1,0 +2,14 @@ +Mon Nov 28 14:08:59 UTC 2011 - idoen...@suse.de + +- Fix duplicate files + +--- +Mon Nov 21 19:17:33 CET 2011 - dmuel...@suse.de + +- update to 4.8.0 rc1: + * too many changes to list here, see http://qt.nokia.com/doc/4.8 + and included changes-4.8.0 +- remove patches that went upstream +- rediff patches and adjust filelist + +--- Old: blacklist-diginotar-certs.diff fix-arm-assembler-for-thumb2.diff qsslsocket-QTBUG-14985.patch qt-everywhere-opensource-src-4.7.4.tar.bz2 New: qt-everywhere-opensource-src-4.8.0-rc1.tar.gz Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.qT92sB/_old 2011-12-02 13:22:07.0 +0100 +++ /var/tmp/diff_new_pack.qT92sB/_new 2011-12-02 13:22:07.0 +0100 @@ -30,10 +30,10 @@ %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN -Version:4.7.4 +Version:4.7.90 Release:1 %define base_name libqt4 -%define tar_version everywhere-opensource-src-%{version} +%define tar_version everywhere-opensource-src-4.8.0 # COMMON-VERSION-END # COMMON-VERSION-END BuildRequires: libQtWebKit-devel >= %version libqt4-devel >= %version @@ -50,7 +50,7 @@ Obsoletes: qt-devel-doc < 4.4.0 # COMMON-BEGIN # COMMON-BEGIN -Source: qt-%tar_version.tar.bz2 +Source: qt-everywhere-opensource-src-4.8.0-rc1.tar.gz # to get mtime of file: Source1:libqt4.changes Source2:baselibs.conf @@ -84,10 +84,7 @@ Patch120: hppa_unaligned_access_fix_458133.diff Patch121: webkit-sparc64.diff Patch123: use-cups-default-print-settings-bnc552218.diff -Patch126: qsslsocket-QTBUG-14985.patch Patch128: build-qvfb-tool.diff -Patch129: blacklist-diginotar-certs.diff -Patch130: fix-arm-assembler-for-thumb2.diff Patch131: disable-im-for-password.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -128,10 +125,11 @@ %patch75 %patch87 %patch101 -# ### 47 rediff -%patch107 +# ### 48 rediff +# %patch107 %patch109 -%patch113 +# ### 48 rediff +# %patch113 %patch118 -p1 %ifarch hppa %patch119 @@ -139,10 +137,7 @@ %endif %patch123 cp %{SOURCE17} translations/ -%patch126 %patch128 -%patch129 -p1 -%patch130 %patch131 -p1 # ### 47 rediff #%patch121 -p1 ++ libqt4-sql-plugins.spec ++ --- /var/tmp/diff_new_pack.qT92sB/_old 2011-12-02 13:22:07.0 +0100 +++ /var/tmp/diff_new_pack.qT92sB/_new 2011-12-02 13:22:07.0 +0100 @@ -28,10 +28,10 @@ %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN -Version:4.7.4 +Version:4.7.90 Release:1 %define base_name libqt4 -%define tar_version everywhere-opensource-src-%{version} +%define tar_version everywhere-opensource-src-4.8.0 # COMMON-VERSION-END # COMMON-VERSION-END BuildRequires: libqt4-devel >= %version @@ -42,7 +42,7 @@ Summary:Qt 4 SQL related libraries # COMMON-BEGIN # COMMON-BEGIN -Source: qt-%tar_version.tar.bz2 +Source: qt-everywhere-opensource-src-4.8.0-rc1.tar.gz # to get mtime of file: Source1:libqt4.changes Source2:baselibs.conf @@ -76,10 +76,7 @@ Patch120: hppa_unaligned_access_fix_458133.diff Patch121: webkit-spar
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2011-11-21 15:47:36 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4", Maintainer is "dmuel...@suse.com" Changes: libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes2011-10-24 13:41:22.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2011-11-21 15:47:37.0 +0100 @@ -1,0 +2,5 @@ +Mon Nov 21 00:21:24 CET 2011 - r...@suse.de + +- rediffed webkit-ia64_s390x.patch and reactivated patch + +--- Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.Wy9Glf/_old 2011-11-21 15:47:46.0 +0100 +++ /var/tmp/diff_new_pack.Wy9Glf/_new 2011-11-21 15:47:46.0 +0100 @@ -129,7 +129,7 @@ %patch87 %patch101 # ### 47 rediff -# %patch107 +%patch107 %patch109 %patch113 %patch118 -p1 libqt4-sql-plugins.spec: same change libqt4.spec: same change ++ webkit-ia64_s390x.patch ++ --- /var/tmp/diff_new_pack.Wy9Glf/_old 2011-11-21 15:47:46.0 +0100 +++ /var/tmp/diff_new_pack.Wy9Glf/_new 2011-11-21 15:47:46.0 +0100 @@ -1,46 +1,44 @@ --- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -@@ -322,6 +322,11 @@ - #define WTF_PLATFORM_ALPHA 1 +@@ -123,6 +123,11 @@ + #define WTF_CPU_ALPHA 1 #endif +/* PLATFORM(S390X) */ +#if defined(__s390x__) -+#define WTF_PLATFORM_S390X 1 ++#define WTF_CPU_S390X 1 +#endif + - /* PLATFORM(SH4) */ - #if defined(__SH4__) - #define WTF_PLATFORM_SH4 1 -@@ -725,7 +730,7 @@ + /* CPU(IA64) - Itanium / IA-64 */ + #if defined(__ia64__) || defined(__ia64) || defined(_M_IA64) + #define WTF_CPU_IA64 1 +@@ -870,7 +875,7 @@ + #endif + #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) - #if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(SOLARIS) || PLATFORM(HPUX)) - #define WTF_USE_JSVALUE64 1 --#elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64) || PLATFORM(ALPHA) -+#elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64) || PLATFORM(ALPHA) || PLATFORM(S390X) - #define WTF_USE_JSVALUE64 1 - #elif PLATFORM(AIX64) +-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) ++#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(S390X) #define WTF_USE_JSVALUE64 1 + #elif CPU(ARM) || CPU(PPC64) + #define WTF_USE_JSVALUE32 1 --- src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h +++ src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h -@@ -367,6 +367,11 @@ - #define WTF_PLATFORM_ALPHA 1 +@@ -113,6 +113,10 @@ + #define WTF_CPU_ALPHA 1 #endif -+/* PLATFORM(S390X) */ -+#if defined(__s390x__) -+#define WTF_PLATFORM_S390X 1 ++#if defined(__s390x__) ++#define WTF_CPU_S390X 1 +#endif + - /* PLATFORM(SH4) */ - #if defined(__SH4__) - #define WTF_PLATFORM_SH4 1 -@@ -729,7 +734,7 @@ - #endif - - #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) --#if (PLATFORM(X86_64) && (PLATFORM(UNIX) || PLATFORM(WIN_OS))) || PLATFORM(IA64) || PLATFORM(ALPHA) -+#if (PLATFORM(X86_64) && (PLATFORM(UNIX) || PLATFORM(WIN_OS))) || PLATFORM(IA64) || PLATFORM(ALPHA) || PLATFORM(S390X) + /* CPU(IA64) - Itanium / IA-64 */ + #if defined(__ia64__) + #define WTF_CPU_IA64 1 +@@ -885,6 +889,7 @@ + #if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \ + || (CPU(IA64) && !CPU(IA64_32)) \ + || CPU(ALPHA) \ ++|| CPU(S390X) \ + || CPU(SPARC64) #define WTF_USE_JSVALUE64 1 - #elif PLATFORM(ARM) || PLATFORM(PPC64) - #define WTF_USE_JSVALUE32 1 + #elif CPU(ARM) || CPU(PPC64) || CPU(MIPS) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2011-10-24 12:51:19 Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) Package is "libqt4", Maintainer is "dmuel...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2011-10-13 00:07:15.0 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2011-10-24 13:41:22.0 +0200 @@ -1,0 +2,10 @@ +Fri Oct 21 16:25:23 CEST 2011 - m...@suse.de + +- do not use /usr/src/packages in specfile + +--- +Fri Oct 21 12:11:43 CEST 2011 - ti...@suse.de + +- disable IM for password entry (bnc#725471) + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change New: disable-im-for-password.diff Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.QOqTtk/_old 2011-10-24 13:41:31.0 +0200 +++ /var/tmp/diff_new_pack.QOqTtk/_new 2011-10-24 13:41:31.0 +0200 @@ -88,6 +88,7 @@ Patch128: build-qvfb-tool.diff Patch129: blacklist-diginotar-certs.diff Patch130: fix-arm-assembler-for-thumb2.diff +Patch131: disable-im-for-password.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 -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 -importdir %plugindir/imports -xsync -xinput -gtkstyle @@ -142,6 +143,7 @@ %patch128 %patch129 -p1 %patch130 +%patch131 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them @@ -243,8 +245,8 @@ find $RPM_BUILD_ROOT/%_libdir -type f -name '*.pc' -exec mv {} $RPM_BUILD_ROOT/%_libdir/pkgconfig \; # fix more qmake errors 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' {} \; +find $RPM_BUILD_ROOT/%_libdir -type f -name '*la' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \; +find $RPM_BUILD_ROOT/%_libdir/pkgconfig -type f -name '*pc' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \; 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 ++ libqt4-sql-plugins.spec ++ --- /var/tmp/diff_new_pack.QOqTtk/_old 2011-10-24 13:41:31.0 +0200 +++ /var/tmp/diff_new_pack.QOqTtk/_new 2011-10-24 13:41:31.0 +0200 @@ -80,6 +80,7 @@ Patch128: build-qvfb-tool.diff Patch129: blacklist-diginotar-certs.diff Patch130: fix-arm-assembler-for-thumb2.diff +Patch131: disable-im-for-password.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 -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 -importdir %plugindir/imports -xsync -xinput -gtkstyle @@ -134,6 +135,7 @@ %patch128 %patch129 -p1 %patch130 +%patch131 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them @@ -240,8 +242,8 @@ find $RPM_BUILD_ROOT/%_libdir -type f -name '*.pc' -exec mv {} $RPM_BUILD_ROOT/%_libdir/pkgconfig \; # fix more qmake errors 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_RO
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Wed Oct 12 23:59:53 CEST 2011. --- openSUSE:Factory/libqt4/libqt4-devel-doc.changes2011-10-07 16:08:01.0 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc.changes 2011-10-11 23:17:53.0 +0200 @@ -1,0 +2,11 @@ +Tue Oct 11 23:11:43 CEST 2011 - dmuel...@suse.de + +- require the right QtWebKit version again + +--- +Fri Oct 7 15:57:50 UTC 2011 - adr...@suse.de + +- fix arm assembler when using thumb2 +- disable neon support, seems we lack header definitions atm + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change calling whatdependson for head-i586 New: fix-arm-assembler-for-thumb2.diff Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.ZgvUco/_old 2011-10-12 23:59:44.0 +0200 +++ /var/tmp/diff_new_pack.ZgvUco/_new 2011-10-12 23:59:44.0 +0200 @@ -36,7 +36,7 @@ %define tar_version everywhere-opensource-src-%{version} # COMMON-VERSION-END # COMMON-VERSION-END -BuildRequires: libQtWebKit-devel libqt4-devel >= %version +BuildRequires: libQtWebKit-devel >= %version libqt4-devel >= %version Url:http://www.trolltech.com License:QPL, GPL Group: Documentation/HTML @@ -87,6 +87,7 @@ Patch126: qsslsocket-QTBUG-14985.patch Patch128: build-qvfb-tool.diff Patch129: blacklist-diginotar-certs.diff +Patch130: fix-arm-assembler-for-thumb2.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 -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 -importdir %plugindir/imports -xsync -xinput -gtkstyle @@ -140,6 +141,7 @@ %patch126 %patch128 %patch129 -p1 +%patch130 # ### 47 rediff #%patch121 -p1 # be sure not to use them ++ libqt4-sql-plugins.spec ++ --- /var/tmp/diff_new_pack.ZgvUco/_old 2011-10-12 23:59:44.0 +0200 +++ /var/tmp/diff_new_pack.ZgvUco/_new 2011-10-12 23:59:44.0 +0200 @@ -79,6 +79,7 @@ Patch126: qsslsocket-QTBUG-14985.patch Patch128: build-qvfb-tool.diff Patch129: blacklist-diginotar-certs.diff +Patch130: fix-arm-assembler-for-thumb2.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 -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 -importdir %plugindir/imports -xsync -xinput -gtkstyle @@ -132,6 +133,7 @@ %patch126 %patch128 %patch129 -p1 +%patch130 # ### 47 rediff #%patch121 -p1 # be sure not to use them ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.ZgvUco/_old 2011-10-12 23:59:44.0 +0200 +++ /var/tmp/diff_new_pack.ZgvUco/_new 2011-10-12 23:59:44.0 +0200 @@ -97,6 +97,7 @@ Patch126: qsslsocket-QTBUG-14985.patch Patch128: build-qvfb-tool.diff Patch129: blacklist-diginotar-certs.diff +Patch130: fix-arm-assembler-for-thumb2.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 -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-xmlpat
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Fri Oct 7 16:08:00 CEST 2011. --- openSUSE:Factory/libqt4/libqt4-devel-doc.changes2011-10-06 17:23:19.0 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc.changes 2011-10-07 10:18:19.0 +0200 @@ -1,0 +2,5 @@ +Fri Oct 7 08:17:25 UTC 2011 - co...@suse.com + +- do not require specific QtWebKit versions - they are different now + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change calling whatdependson for head-i586 Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.HyKerI/_old 2011-10-07 16:07:55.0 +0200 +++ /var/tmp/diff_new_pack.HyKerI/_new 2011-10-07 16:07:55.0 +0200 @@ -36,7 +36,7 @@ %define tar_version everywhere-opensource-src-%{version} # COMMON-VERSION-END # COMMON-VERSION-END -BuildRequires: libQtWebKit-devel >= %version libqt4-devel >= %version +BuildRequires: libQtWebKit-devel libqt4-devel >= %version Url:http://www.trolltech.com License:QPL, GPL Group: Documentation/HTML libqt4.spec: same change ++ libqt4-devel-doc.spec.in ++ --- /var/tmp/diff_new_pack.HyKerI/_old 2011-10-07 16:07:56.0 +0200 +++ /var/tmp/diff_new_pack.HyKerI/_new 2011-10-07 16:07:56.0 +0200 @@ -29,7 +29,7 @@ %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-END -BuildRequires: libQtWebKit-devel >= %version libqt4-devel >= %version +BuildRequires: libQtWebKit-devel libqt4-devel >= %version Url:http://www.trolltech.com License:QPL, GPL Group: Documentation/HTML ++ pre_checkin.sh ++ --- /var/tmp/diff_new_pack.HyKerI/_old 2011-10-07 16:07:56.0 +0200 +++ /var/tmp/diff_new_pack.HyKerI/_new 2011-10-07 16:07:56.0 +0200 @@ -12,3 +12,5 @@ sed -n -e '/COMMON-END/,$p' $spec.in; } > $spec.tmp && mv $spec.tmp $spec done + +osc service localrun format_spec_file continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Thu Oct 6 17:23:21 CEST 2011. --- openSUSE:Factory/libqt4/libqt4-devel-doc.changes2011-09-23 02:09:19.0 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc.changes 2011-10-06 13:33:03.0 +0200 @@ -1,0 +2,16 @@ +Thu Oct 6 11:24:29 UTC 2011 - co...@suse.com + +- reenable fix for bnc#656144 - I reviewed the patch one more time + +--- +Sun Sep 25 10:54:07 UTC 2011 - tittiatc...@gmail.com + +- libQtWebKit4 is now delivered through its separate package, + therefore libqt4 should not build it from the qt4 sources anymore + +--- +Sat Sep 17 14:27:00 UTC 2011 - em...@users.berlios.de + +- Add qt_lt.ts - Lithuanian translation (bnc#713143) + +--- libqt4-sql-plugins.changes: same change --- openSUSE:Factory/libqt4/libqt4.changes 2011-09-23 02:09:19.0 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2011-10-06 13:33:04.0 +0200 @@ -0,0 +1,12 @@ +--- +Thu Oct 6 11:24:29 UTC 2011 - co...@suse.com + +- reenable fix for bnc#656144 - I reviewed the patch one more time + +--- +Sun Sep 25 10:54:07 UTC 2011 - tittiatc...@gmail.com + +- libQtWebKit4 is now delivered through its separate package, + therefore libqt4 should not build it from the qt4 sources anymore + +--- calling whatdependson for head-i586 Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.ZE6Dab/_old 2011-10-06 17:23:16.0 +0200 +++ /var/tmp/diff_new_pack.ZE6Dab/_new 2011-10-06 17:23:16.0 +0200 @@ -61,6 +61,7 @@ Source14: assistant.png Source15: designer.png Source16: linguist.png +Source17: qt_lt.ts Patch2: qt-never-strip.diff Patch3: plastik-default.diff Patch6: use-freetype-default.diff @@ -135,6 +136,7 @@ %patch120 %endif %patch123 +cp %{SOURCE17} translations/ %patch126 %patch128 %patch129 -p1 libqt4-sql-plugins.spec: same change ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.ZE6Dab/_old 2011-10-06 17:23:16.0 +0200 +++ /var/tmp/diff_new_pack.ZE6Dab/_new 2011-10-06 17:23:16.0 +0200 @@ -30,6 +30,7 @@ %define with_qt3support 1 %define with_phonon 0 %define with_phonon_backend 0 +%define with_qtwebkit 0 %if %with_phonon %if %with_phonon_backend BuildRequires: gstreamer-0_10-plugins-base-devel libxine-devel @@ -265,6 +266,7 @@ Qt 4 libraries which are used for connection with an SQL server. You will need also a plugin package for a supported SQL server. +%if %with_qtwebkit %package -n libQtWebKit4 License:GPLv2 ; GPLv3 @@ -296,6 +298,7 @@ engineers made WebKit toolkit independent. WebKit Qt is a project aiming at porting this fabulous engine back to Qt. +%endif %package private-headers-devel License:GPLv2 ; GPLv3 @@ -313,7 +316,6 @@ %package -n phonon - License:LGPLv2.0+ Summary:Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -329,7 +331,6 @@ %package -n phonon-devel - License:LGPLv2.0+ Summary:Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -346,7 +347,6 @@ %package -n libphonon4 - License:LGPLv2.0+ Summary:Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -364,7 +364,6 @@ %package -n phonon-backend-gstreamer-0_10 - License:LGPLv2.0+ Summary:Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -380,7 +379,6 @@ %package -n phonon-backend-xine - License:LGPLv2.0+ Summary:Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -419,7 +417,12 @@ sed -i -e "s/qt_instdate=\$TODAY/qt_instdate=$CHANGES/" configure echo yes | ./configure %common_options $platform \ - -plugin-sql-sqlite -nomake examples -nomake demos -nomake docs -webkit -xmlpatterns + -plugin-sql-sqlite -nomake examples -nomake demos -nomake docs \ +%if %with_qtwebkit +-webkit \ +%endif +-xmlpatterns + %check_config test -s translations/qt_de.qm || rm translations/qt_de.qm make %{?jobs:-j %jobs} @@ -429,9 +432,11 @@ %install make INSTALL_ROOT=$RPM_BUILD_ROOT install +%if %with_qtwebkit cp -p src/3rdparty/webkit/JavaScriptCore/release/libjscore.a \ src/3rdparty/webkit/JavaScriptCore/release/libjscore.prl \ $RPM_BUILD_ROOT/%_libdir +%endif # argggh, qmake
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Mon Sep 19 17:49:25 CEST 2011. libqt4-sql-plugins.changes: same change --- libqt4/libqt4.changes 2011-09-10 20:21:01.0 +0200 +++ libqt4/libqt4.changes 2011-09-17 16:29:21.0 +0200 @@ -0,0 +1,4 @@ +Sat Sep 17 14:27:00 UTC 2011 - em...@users.berlios.de + +- Add qt_lt.ts - Lithuanian translation (bnc#713143) + calling whatdependson for head-i586 New: qt_lt.ts Other differences: -- libqt4-sql-plugins.spec: same change ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.5HWFoy/_old 2011-09-19 17:49:09.0 +0200 +++ /var/tmp/diff_new_pack.5HWFoy/_new 2011-09-19 17:49:09.0 +0200 @@ -70,6 +70,7 @@ Source14: assistant.png Source15: designer.png Source16: linguist.png +Source17: qt_lt.ts Patch2: qt-never-strip.diff Patch3: plastik-default.diff Patch6: use-freetype-default.diff @@ -144,6 +145,7 @@ %patch120 %endif %patch123 +cp %{SOURCE17} translations/ %patch126 %patch128 %patch129 -p1 Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Wed Aug 17 09:57:24 CEST 2011. libqt4-sql-plugins.changes: same change --- libqt4/libqt4.changes 2011-08-12 11:55:41.0 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2011-08-15 06:29:39.0 +0200 @@ -2 +2 @@ -Fri Aug 12 09:54:52 UTC 2011 - adr...@suse.de +Mon Aug 15 04:28:53 UTC 2011 - crrodrig...@opensuse.org @@ -4,2 +4,7 @@ -- remove docdir before collecting files, %doc from 12.1 is not doing - this anymore on purpose +- Add fix for QTBUG-14985. + +--- +Fri Aug 12 15:29:24 CEST 2011 - dmuel...@suse.de + +- do not generate documentation in libqt4, it is supposed + to be in libqt4-devel-doc calling whatdependson for head-i586 New: qsslsocket-QTBUG-14985.patch Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.U08NYf/_old 2011-08-17 09:56:16.0 +0200 +++ /var/tmp/diff_new_pack.U08NYf/_new 2011-08-17 09:56:16.0 +0200 @@ -31,7 +31,7 @@ # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN Version:4.7.3 -Release:6 +Release:7 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version libqt4-sql-plugins.spec: same change ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.U08NYf/_old 2011-08-17 09:56:16.0 +0200 +++ /var/tmp/diff_new_pack.U08NYf/_new 2011-08-17 09:56:16.0 +0200 @@ -54,7 +54,7 @@ Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-VERSION-BEGIN Version:4.7.3 -Release:11 +Release:13 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -97,6 +97,7 @@ Patch123: use-cups-default-print-settings-bnc552218.diff Patch124: qtreeview-fix-QTBUG-16292.diff Patch125: tiff-samples-reader-crash.diff +Patch126: qsslsocket-QTBUG-14985.patch 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 -importdir %plugindir/imports -xsync -xinput -gtkstyle @@ -152,6 +153,7 @@ %patch123 %patch124 %patch125 +%patch126 # ### 47 rediff #%patch121 -p1 # be sure not to use them @@ -422,7 +424,7 @@ sed -i -e "s/qt_instdate=\$TODAY/qt_instdate=$CHANGES/" configure echo yes | ./configure %common_options $platform \ - -plugin-sql-sqlite -nomake examples -nomake demos -webkit -xmlpatterns + -plugin-sql-sqlite -nomake examples -nomake demos -nomake docs -webkit -xmlpatterns %check_config test -s translations/qt_de.qm || rm translations/qt_de.qm make %{?jobs:-j %jobs} @@ -468,8 +470,7 @@ %fdupes %{buildroot}/usr/include %fdupes %{buildroot}/usr/share/qt4 -fdupes %{buildroot}/usr/share/doc/packages/libqt4 -find %{buildroot}/usr/share/doc/packages/libqt4/src/images/* -type f |xargs chmod a-x +%fdupes %{buildroot}/usr/share/doc/packages/%base_name # # we do not package qvfb, and assistant in devel-doc # @@ -482,9 +483,6 @@ %suse_update_desktop_file -i designer4 Qt Development GUIDesigner %suse_update_desktop_file -i linguist4 Qt Development Translation -# rpm from SUSE 12.1 is not removing docdir on %doc usage anymore -rm -rf $RPM_BUILD_ROOT%_defaultdocdir - %clean rm -rf $RPM_BUILD_ROOT # no baselibs supplements for older distros ++ qsslsocket-QTBUG-14985.patch ++ --- src/network/ssl/qsslsocket_openssl.cpp.orig +++ src/network/ssl/qsslsocket_openssl.cpp @@ -278,7 +278,13 @@ init_context: // Enable all bug workarounds. q_SSL_CTX_set_options(ctx, SSL_OP_ALL); - +#if OPENSSL_VERSION_NUMBER >= 0x1000L +// Tell OpenSSL to release memory early +// http://www.openssl.org/docs/ssl/SSL_CTX_set_mode.html +// FIXME also do runtime SSL version checking or make Qt require 1.0.0 +// http://www.openssl.org/docs/crypto/OPENSSL_VERSION_NUMBER.html +q_SSL_CTX_set_mode(ctx, SSL_MODE_RELEASE_BUFFERS); +#endif // Initialize ciphers QByteArray cipherString; int first = true; --- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig +++ src/network/ssl/qsslsocket_openssl_symbols_p.h @@ -389,6 +389,7 @@ DSA *q_d2i_DSAPrivateKey(DSA **a, unsign
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Fri Aug 12 15:27:16 CEST 2011. --- libqt4/libqt4-devel-doc.changes 2011-07-09 10:25:27.0 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc.changes 2011-08-11 21:47:42.0 +0200 @@ -1,0 +2,18 @@ +Thu Aug 11 19:29:31 UTC 2011 - a...@suse.de + +- Fix provides/obsoletes. +- There are no jpegs, so remove line to make them non-executable. +- Properly run fdupes in libqt4-devel-doc to save 29 MB. + +--- +Thu Aug 11 10:13:06 CEST 2011 - mun...@googlemail.com + +- added libjscore.* from 3rdparty dir into libQtWebKit-devel package + (currently needed to compile eg. gambas3) + +--- +Tue Aug 9 09:41:57 UTC 2011 - meiss...@novell.com + +- run fdupes, images should not be executable + +--- libqt4-sql-plugins.changes: same change --- libqt4/libqt4.changes 2011-08-09 15:53:05.0 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2011-08-12 11:55:41.0 +0200 @@ -1,0 +2,19 @@ +Fri Aug 12 09:54:52 UTC 2011 - adr...@suse.de + +- remove docdir before collecting files, %doc from 12.1 is not doing + this anymore on purpose + +--- +Thu Aug 11 19:29:31 UTC 2011 - a...@suse.de + +- Fix provides/obsoletes. +- There are no jpegs, so remove line to make them non-executable. +- Properly run fdupes in libqt4-devel-doc to save 29 MB. + +--- +Thu Aug 11 10:13:06 CEST 2011 - mun...@googlemail.com + +- added libjscore.* from 3rdparty dir into libQtWebKit-devel package + (currently needed to compile eg. gambas3) + +--- calling whatdependson for head-i586 Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.fhApYF/_old 2011-08-12 15:26:31.0 +0200 +++ /var/tmp/diff_new_pack.fhApYF/_new 2011-08-12 15:26:31.0 +0200 @@ -31,7 +31,7 @@ # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN Version:4.7.3 -Release:5 +Release:6 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -46,9 +46,9 @@ Requires: libqt4-devel-doc-data = %version Requires: libqt4-sql-sqlite >= %version Provides: libqt4-examples = 4.4.0 -Obsoletes: libqt4-examples <= 4.4.0 +Obsoletes: libqt4-examples < 4.4.0 Provides: qt-devel-doc = 4.4.0 -Obsoletes: qt-devel-doc <= 4.4.0 +Obsoletes: qt-devel-doc < 4.4.0 # COMMON-BEGIN # COMMON-BEGIN Source: qt%x11_free%rversion.tar.bz2 @@ -227,7 +227,6 @@ # remove some executable flags from image files: find $RPM_BUILD_ROOT/usr/share -name "*.png" -print0 | xargs -0 chmod a-x -find $RPM_BUILD_ROOT/usr/share -name "*.jpg" -print0 | xargs -0 chmod a-x find $RPM_BUILD_ROOT/usr/share -name "*.css" -print0 | xargs -0 chmod a-x find $RPM_BUILD_ROOT/usr/share -name "*.js" -print0 | xargs -0 chmod a-x @@ -253,8 +252,8 @@ rm -rf $RPM_BUILD_ROOT/%_libdir/qt4/plugins %if %suse_version > 1020 %fdupes $RPM_BUILD_ROOT/usr/include -%fdupes $RPM_BUILD_ROOT/usr/%_lib/qt4/examples -%fdupes $RPM_BUILD_ROOT/usr/%_lib/qt4/demos +%fdupes $RPM_BUILD_ROOT/usr/%_lib/qt4/ +%fdupes $RPM_BUILD_ROOT%_docdir/%base_name %endif # remove some executable flags from source files: ++ libqt4-sql-plugins.spec ++ --- /var/tmp/diff_new_pack.fhApYF/_old 2011-08-12 15:26:31.0 +0200 +++ /var/tmp/diff_new_pack.fhApYF/_new 2011-08-12 15:26:31.0 +0200 @@ -29,7 +29,7 @@ # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN Version:4.7.3 -Release:5 +Release:6 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -148,8 +148,8 @@ Summary:Qt 4 unixODBC plugin Requires: libqt4-sql = %version Provides: libqt4_sql_backend = %version -Obsoletes: qt-sql-unixODBC -Provides: qt-sql-unixODBC +Obsoletes: qt-sql-unixODBC < 4.6.0 +Provides: qt-sql-unixODBC = 4.6.0 %description -n libqt4-sql-unixODBC Qt unixODBC plugin to support databases via unixODBC within Qt @@ -167,8 +167,8 @@ Summary:Qt 4 PostgreSQL plugin Requires: libqt4-sql = %version Provides: libqt4_sql_backend = %version -Obsoletes: qt-sql-postgresql -Provides: qt-sql-postgresql +Obsoletes: qt-sql-postgresql < 4.6.0 +Provides: qt-sql-postgresql = 4.6.0 %description -n libqt4-sql-postgresql Qt SQL plugin to support PostgreSQL servers in Qt applications. @@ -185,8 +185,8 @@ Summary:Qt 4 MySQL support
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Thu Aug 11 09:57:18 CEST 2011. libqt4-sql-plugins.changes: same change --- libqt4/libqt4.changes 2011-07-09 10:25:27.0 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2011-08-09 15:53:05.0 +0200 @@ -1,0 +2,5 @@ +Tue Aug 9 09:41:57 UTC 2011 - meiss...@novell.com + +- run fdupes, images should not be executable + +--- calling whatdependson for head-i586 Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.V9DbuG/_old 2011-08-11 09:48:12.0 +0200 +++ /var/tmp/diff_new_pack.V9DbuG/_new 2011-08-11 09:48:12.0 +0200 @@ -31,7 +31,7 @@ # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN Version:4.7.3 -Release:4 +Release:5 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version libqt4-sql-plugins.spec: same change ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.V9DbuG/_old 2011-08-11 09:48:12.0 +0200 +++ /var/tmp/diff_new_pack.V9DbuG/_new 2011-08-11 09:48:12.0 +0200 @@ -54,7 +54,7 @@ Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-VERSION-BEGIN Version:4.7.3 -Release:7 +Release:9 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -315,6 +315,7 @@ %if %with_phonon %package -n phonon + License:LGPLv2.0+ Summary:Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -329,6 +330,7 @@ %package -n phonon-devel + License:LGPLv2.0+ Summary:Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -344,6 +346,7 @@ %package -n libphonon4 + License:LGPLv2.0+ Summary:Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -360,6 +363,7 @@ %if %with_phonon_backend %package -n phonon-backend-gstreamer-0_10 + License:LGPLv2.0+ Summary:Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -374,6 +378,7 @@ %package -n phonon-backend-xine + License:LGPLv2.0+ Summary:Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -454,6 +459,9 @@ done %fdupes %{buildroot}/usr/include +%fdupes %{buildroot}/usr/share/qt4 +%fdupes %{buildroot}/usr/share/doc/packages/libqt4 +find %{buildroot}/usr/share/doc/packages/libqt4/src/images/* -type f |xargs chmod a-x # # we do not package qvfb, and assistant in devel-doc # Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Tue Jul 12 11:45:07 CEST 2011. --- libqt4/libqt4-devel-doc.changes 2011-06-13 17:33:16.0 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc.changes 2011-07-09 10:25:27.0 +0200 @@ -1,0 +2,10 @@ +Sat Jul 9 10:23:56 CEST 2011 - dmuel...@suse.de + +- fix reading of tiff images with multiple samples (bnc#637275) + +--- +Mon Jun 20 16:05:53 UTC 2011 - dmuel...@suse.de + +- build a libqt4-private-headers-devel for qt-creator build + +--- libqt4-sql-plugins.changes: same change --- libqt4/libqt4.changes 2011-06-20 18:07:16.0 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2011-07-09 10:25:27.0 +0200 @@ -1,0 +2,5 @@ +Sat Jul 9 10:23:56 CEST 2011 - dmuel...@suse.de + +- fix reading of tiff images with multiple samples (bnc#637275) + +--- calling whatdependson for head-i586 New: tiff-samples-reader-crash.diff Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.OhB7L9/_old 2011-07-12 11:44:36.0 +0200 +++ /var/tmp/diff_new_pack.OhB7L9/_new 2011-07-12 11:44:36.0 +0200 @@ -31,7 +31,7 @@ # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN Version:4.7.3 -Release:3 +Release:4 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -87,6 +87,7 @@ Patch121: webkit-sparc64.diff Patch123: use-cups-default-print-settings-bnc552218.diff Patch124: qtreeview-fix-QTBUG-16292.diff +Patch125: tiff-samples-reader-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 -importdir %plugindir/imports -xsync -xinput -gtkstyle @@ -103,6 +104,7 @@ handling. + %prep %define plugindir %_libdir/qt4/plugins %setup -q -n qt%x11_free%rversion @@ -140,6 +142,7 @@ %endif %patch123 %patch124 +%patch125 # ### 47 rediff #%patch121 -p1 # be sure not to use them @@ -224,6 +227,7 @@ # remove some executable flags from image files: find $RPM_BUILD_ROOT/usr/share -name "*.png" -print0 | xargs -0 chmod a-x +find $RPM_BUILD_ROOT/usr/share -name "*.jpg" -print0 | xargs -0 chmod a-x find $RPM_BUILD_ROOT/usr/share -name "*.css" -print0 | xargs -0 chmod a-x find $RPM_BUILD_ROOT/usr/share -name "*.js" -print0 | xargs -0 chmod a-x ++ libqt4-sql-plugins.spec ++ --- /var/tmp/diff_new_pack.OhB7L9/_old 2011-07-12 11:44:36.0 +0200 +++ /var/tmp/diff_new_pack.OhB7L9/_new 2011-07-12 11:44:36.0 +0200 @@ -29,7 +29,7 @@ # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN Version:4.7.3 -Release:3 +Release:4 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -79,6 +79,7 @@ Patch121: webkit-sparc64.diff Patch123: use-cups-default-print-settings-bnc552218.diff Patch124: qtreeview-fix-QTBUG-16292.diff +Patch125: tiff-samples-reader-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 -importdir %plugindir/imports -xsync -xinput -gtkstyle @@ -95,6 +96,7 @@ handling. + %prep %define plugindir %_libdir/qt4/plugins %setup -q -n qt%x11_free%rversion @@ -132,6 +134,7 @@ %endif %patch123 %patch124 +%patch125 # ### 47 rediff #%patch121 -p1 # be sure not to use them ++ l
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Mon Jun 27 15:26:41 CEST 2011. --- libqt4/libqt4.changes 2011-05-30 15:01:45.0 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2011-06-20 18:07:16.0 +0200 @@ -1,0 +2,10 @@ +Mon Jun 20 16:05:53 UTC 2011 - dmuel...@suse.de + +- build a libqt4-private-headers-devel for qt-creator build + +--- +Mon Jun 13 17:33:04 CEST 2011 - dmuel...@suse.de + +- remove spurious executable permissions + +--- --- libqt4/libqt4-devel-doc.changes 2011-05-30 15:01:44.0 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc.changes 2011-06-13 17:33:16.0 +0200 @@ -1,0 +2,5 @@ +Mon Jun 13 17:33:04 CEST 2011 - dmuel...@suse.de + +- remove spurious executable permissions + +--- libqt4-sql-plugins.changes: same change calling whatdependson for head-i586 Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.aZlMHg/_old 2011-06-27 15:21:26.0 +0200 +++ /var/tmp/diff_new_pack.aZlMHg/_new 2011-06-27 15:21:26.0 +0200 @@ -31,7 +31,7 @@ # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN Version:4.7.3 -Release:2 +Release:3 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -205,6 +205,7 @@ make %{?_smp_mflags} -C tools/assistant make %{?_smp_mflags} -C demos make %{?_smp_mflags} -C examples +make %{?_smp_mflags} docs %install export QTDIR=$PWD @@ -223,6 +224,8 @@ # remove some executable flags from image files: find $RPM_BUILD_ROOT/usr/share -name "*.png" -print0 | xargs -0 chmod a-x +find $RPM_BUILD_ROOT/usr/share -name "*.css" -print0 | xargs -0 chmod a-x +find $RPM_BUILD_ROOT/usr/share -name "*.js" -print0 | xargs -0 chmod a-x # reduce fileconflicts for f in $(rpm -ql libqt4-devel) $(rpm -ql libqt4-x11) $(rpm -ql libqt4); do ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.aZlMHg/_old 2011-06-27 15:21:26.0 +0200 +++ /var/tmp/diff_new_pack.aZlMHg/_new 2011-06-27 15:21:26.0 +0200 @@ -54,7 +54,7 @@ Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-VERSION-BEGIN Version:4.7.3 -Release:2 +Release:5 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -112,6 +112,7 @@ handling. + %prep %define plugindir %_libdir/qt4/plugins %setup -q -n qt%x11_free%rversion @@ -174,10 +175,12 @@ Provides: qt-devel = 4.4.0 Provides: dbus-1-qt = 0.63 Provides: qt-dbus-1 = 4.2.0 +Provides: libQtDeclarative-devel = 4.6.0 Obsoletes: dbus-1-qt < 0.63 Obsoletes: qt-dbus-1 < 4.2.0 Obsoletes: dbus-1-qt-devel < 0.63 Obsoletes: qt-devel < 4.4.0 +Obsoletes: libQtDeclarative-devel <= 4.6.0 %description devel You need this package, if you want to compile programs with Qt. It @@ -187,10 +190,6 @@ -Authors: - -Qt Software - %package -n libqt4-sql-sqlite License:GPLv2 ; GPLv3 Group: Development/Libraries/C and C++ @@ -206,10 +205,6 @@ -Authors: - -Qt Software - %package x11 License:GPLv2 ; GPLv3 Group: Development/Libraries/C and C++ @@ -228,10 +223,6 @@ -Authors: - -Qt Software - %if %with_qt3support %package qt3support @@ -254,11 +245,6 @@ handling. - -Authors: - -Qt Software - %endif %package sql @@ -281,11 +267,6 @@ will need also a plugin package for a supported SQL server. - -Authors: - -Qt Software - %package -n libQtWebKit4 License:GPLv2 ; GPLv3 Group: Development/Libraries/C and C++ @@ -302,20 +283,12 @@ porting this fabulous engine back to Qt. - -Authors: - -Qt Software - - %package -n libQtWebKit-devel License:GPLv2 ; GPLv3 Group: Development/Libraries/C and C++ Summary:Open source Web Browser engine based on Qt4 Requires: libQtWebKit4 = %version Requires: libqt4-devel = %version -Provides: libQtDeclarative-devel = 4.6.0 -Obsoletes: libQtDeclarative-devel <= 4.6.0 %description -n libQtWebKit-devel WebKit is an open source web browser engine. WebKit's HTML and JavaScript @@ -325,10 +298,17 @@ porting this fabulous engine back to Qt. +%package private-headers-devel +License:GPLv2 ; GPLv3 +Group: Development/Libraries/C and C++ +Summary:Non-ABI stabile experimental API +Requires: libqt4-x11 = %version libqt4-devel = %version -Authors: - -Qt Software +%description private-headers-devel +This package provides private headers of libqt4-de
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Mon May 30 16:34:53 CEST 2011. --- libqt4/libqt4-devel-doc.changes 2011-05-17 12:44:27.0 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc.changes 2011-05-30 15:01:44.0 +0200 @@ -1,0 +2,15 @@ +Mon May 30 15:01:28 CEST 2011 - dmuel...@suse.de + +- fix buildrequires on subspecfiles + +--- +Sat May 28 14:15:16 UTC 2011 - idon...@novell.com + +- Use diff -u instead of cmp in check_config + +--- +Fri May 20 22:51:37 CEST 2011 - dmuel...@suse.de + +-fix build for older distros + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change calling whatdependson for head-i586 Old: libqt4-devel-doc-data.spec.in Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.HsUmPj/_old 2011-05-30 16:31:28.0 +0200 +++ /var/tmp/diff_new_pack.HsUmPj/_new 2011-05-30 16:31:28.0 +0200 @@ -21,7 +21,7 @@ Name: libqt4-devel-doc BuildRequires: Mesa-devel cups-devel freeglut-devel libjpeg-devel libpng-devel -BuildRequires: alsa-devel gtk2-devel libQtWebKit-devel libqt4-devel sqlite3-devel +BuildRequires: alsa-devel gtk2-devel sqlite3-devel %if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif @@ -31,12 +31,13 @@ # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN Version:4.7.3 -Release:1 +Release:2 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version # COMMON-VERSION-END # COMMON-VERSION-END +BuildRequires: libQtWebKit-devel >= %version libqt4-devel >= %version Url:http://www.trolltech.com License:QPL, GPL Group: Documentation/HTML @@ -92,7 +93,7 @@ %define check_config \ grep '# define' src/corelib/global/qconfig.h | egrep -v 'QT_(ARCH|USE)'; \ if test -f /usr/share/qt4/mkspecs/qconfig.pri ; then \ -cmp /usr/share/qt4/mkspecs/qconfig.pri mkspecs/qconfig.pri || exit 1; \ +diff -u /usr/share/qt4/mkspecs/qconfig.pri mkspecs/qconfig.pri || exit 1; \ fi \ %description @@ -161,7 +162,9 @@ %package data License:QPL, GPL Group: System/Libraries +%if %suse_version > 1110 BuildArch: noarch +%endif Summary:C++ Program Library, Core Components Requires: %name = %version ++ libqt4-sql-plugins.spec ++ --- /var/tmp/diff_new_pack.HsUmPj/_old 2011-05-30 16:31:28.0 +0200 +++ /var/tmp/diff_new_pack.HsUmPj/_new 2011-05-30 16:31:28.0 +0200 @@ -22,19 +22,20 @@ Name: libqt4-sql-plugins BuildRequires: cups-devel BuildRequires: libmysqlclient-devel pkgconfig postgresql-devel unixODBC-devel -BuildRequires: Mesa-devel alsa-devel gtk2-devel libqt4-devel +BuildRequires: Mesa-devel alsa-devel gtk2-devel %if 0%{?suse_version} BuildRequires: update-desktop-files %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN Version:4.7.3 -Release:1 +Release:2 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version # COMMON-VERSION-END # COMMON-VERSION-END +BuildRequires: libqt4-devel >= %version Url:http://www.trolltech.com License:QPL, GPL Group: System/Libraries @@ -84,7 +85,7 @@ %define check_config \ grep '# define' src/corelib/global/qconfig.h | egrep -v 'QT_(ARCH|USE)'; \ if test -f /usr/share/qt4/mkspecs/qconfig.pri ; then \ -cmp /usr/share/qt4/mkspecs/qconfig.pri mkspecs/qconfig.pri || exit 1; \ +diff -u /usr/share/qt4/mkspecs/qconfig.pri mkspecs/qconfig.pri || exit 1; \ fi \ %description ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.HsUmPj/_old 2011-05-30 16:31:28.0 +0200 +++ /var/tmp/diff_new_pack.HsUmPj/_new 2011-05-30 16:31:28.0 +0200 @@ -54,7 +54,7 @@ Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-VERSION-BEGIN Version:4.7.3 -Release:1 +Release:2 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -102,7 +102,7 @@ %define check_config \ grep '# define' src/corelib/global/qconfig.h | egrep -v 'QT_(ARCH|USE)'; \ if test -f /usr/share/qt4/mkspecs/qconfig.pri ; then \ -cmp /usr/share/qt4/mkspecs/qconfig.pri mkspecs/qconfig.pri || exit 1;
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Fri May 27 10:08:09 CEST 2011. --- libqt4/libqt4-devel-doc.changes 2011-03-28 12:54:59.0 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc.changes 2011-05-17 12:44:27.0 +0200 @@ -1,0 +2,10 @@ +Thu May 5 00:07:41 CEST 2011 - dmuel...@suse.de + +- update to 4.7.3: + * bugfixes only + * [QTBUG-18338] blacklist fraudulent SSL certificates + * More details see included changes-4.7.3 file +- merge libqt4-devel-doc-data main spec file back into + a subspecfile of libqt4-devel-doc + +--- libqt4-sql-plugins.changes: same change libqt4.changes: same change calling whatdependson for head-i586 Old: comodo-blacklisting.diff libqt4-devel-doc-data.changes libqt4-devel-doc-data.spec qt-everywhere-opensource-src-4.7.2.tar.bz2 New: qt-everywhere-opensource-src-4.7.3.tar.bz2 Other differences: -- ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.Qm9T6E/_old 2011-05-27 10:05:07.0 +0200 +++ /var/tmp/diff_new_pack.Qm9T6E/_new 2011-05-27 10:05:07.0 +0200 @@ -30,8 +30,8 @@ %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN -Version:4.7.2 -Release:3 +Version:4.7.3 +Release:1 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -86,7 +86,6 @@ Patch121: webkit-sparc64.diff Patch123: use-cups-default-print-settings-bnc552218.diff Patch124: qtreeview-fix-QTBUG-16292.diff -Patch125: comodo-blacklisting.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 -importdir %plugindir/imports -xsync -xinput -gtkstyle @@ -103,11 +102,6 @@ handling. - -Authors: - -Qt Software - %prep %define plugindir %_libdir/qt4/plugins %setup -q -n qt%x11_free%rversion @@ -145,7 +139,6 @@ %endif %patch123 %patch124 -%patch125 # ### 47 rediff #%patch121 -p1 # be sure not to use them @@ -165,14 +158,18 @@ This package contains base tools, like string, xml, and network handling. +%package data +License:QPL, GPL +Group: System/Libraries +BuildArch: noarch +Summary:C++ Program Library, Core Components +Requires: %name = %version - -Authors: - -Troll Tech AS, Norway - +%description data +The architecture independent data files for the documentation. %build + %ifarch ppc64 export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc" %endif @@ -216,6 +213,14 @@ 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 +# htmldocs are not generated - why? +for d in docimages qchdocs htmldocs ; do + make INSTALL_ROOT=$RPM_BUILD_ROOT install_${d} +done + +# remove some executable flags from image files: +find $RPM_BUILD_ROOT/usr/share -name "*.png" -print0 | xargs -0 chmod a-x + # 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 @@ -233,8 +238,6 @@ 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}* rm -f $RPM_BUILD_ROOT/%_libdir/libQtXml.* rm -rf $RPM_BUILD_ROOT/%_libdir/qt4/plugins @@ -276,4 +279,11 @@ /usr/bin/svgviewer /usr/bin/qt4-browser +%files data +%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 + %changelog ++ libqt4-sql-plugins.spec ++ --- /var/tmp/diff_new_pack.Qm9T6E/_old 2011-05-27 10:05:07.0 +0200 +++ /var/tmp/diff_new_pack.Qm9T6E/_new 2011-05-27 10:05:07.0 +0200 @@ -28,8 +28,8 @@ %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN -Version:4.7.2 -Release:3 +Version:4.7.3 +Release:
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Thu Apr 21 11:51:27 CEST 2011. --- libqt4/libqt4-devel-doc-data.changes2011-03-03 14:53:42.0 +0100 +++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc-data.changes 2011-03-28 12:54:59.0 +0200 @@ -1,0 +2,16 @@ +Mon Mar 28 11:59:33 CEST 2011 - dmuel...@suse.de + +- blacklist fraudulently issued certificates: + http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html + +--- +Fri Mar 11 14:15:20 CET 2011 - dmuel...@suse.de + +- revert last change temporarily + +--- +Thu Mar 10 00:29:48 CET 2011 - dmuel...@suse.de + +- remove Mesa-devel from libqt4-devel + +--- libqt4-devel-doc.changes: same change libqt4-sql-plugins.changes: same change libqt4.changes: same change calling whatdependson for head-i586 New: comodo-blacklisting.diff Other differences: -- ++ libqt4-devel-doc-data.spec ++ --- /var/tmp/diff_new_pack.xXHljP/_old 2011-04-21 11:50:14.0 +0200 +++ /var/tmp/diff_new_pack.xXHljP/_new 2011-04-21 11:50:14.0 +0200 @@ -21,14 +21,14 @@ Name: libqt4-devel-doc-data BuildRequires: cups-devel freeglut-devel freetype2-devel libQtWebKit-devel libqt4-devel pkgconfig -BuildRequires: alsa-devel gtk2-devel libqt4-sql-sqlite openssl-devel sqlite-devel +BuildRequires: Mesa-devel alsa-devel gtk2-devel libqt4-sql-sqlite openssl-devel sqlite-devel %if 0%{?suse_version} BuildRequires: fdupes update-desktop-files %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN Version:4.7.2 -Release:2 +Release:3 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -79,6 +79,7 @@ Patch121: webkit-sparc64.diff Patch123: use-cups-default-print-settings-bnc552218.diff Patch124: qtreeview-fix-QTBUG-16292.diff +Patch125: comodo-blacklisting.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 -importdir %plugindir/imports -xsync -xinput -gtkstyle @@ -137,6 +138,7 @@ %endif %patch123 %patch124 +%patch125 # ### 47 rediff #%patch121 -p1 # be sure not to use them ++ libqt4-devel-doc.spec ++ --- /var/tmp/diff_new_pack.xXHljP/_old 2011-04-21 11:50:14.0 +0200 +++ /var/tmp/diff_new_pack.xXHljP/_new 2011-04-21 11:50:14.0 +0200 @@ -20,7 +20,7 @@ Name: libqt4-devel-doc -BuildRequires: cups-devel freeglut-devel libjpeg-devel libpng-devel +BuildRequires: Mesa-devel cups-devel freeglut-devel libjpeg-devel libpng-devel BuildRequires: alsa-devel gtk2-devel libQtWebKit-devel libqt4-devel sqlite3-devel %if 0%{?suse_version} > 1020 BuildRequires: fdupes @@ -31,7 +31,7 @@ # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN Version:4.7.2 -Release:2 +Release:3 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -86,6 +86,7 @@ Patch121: webkit-sparc64.diff Patch123: use-cups-default-print-settings-bnc552218.diff Patch124: qtreeview-fix-QTBUG-16292.diff +Patch125: comodo-blacklisting.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 -importdir %plugindir/imports -xsync -xinput -gtkstyle @@ -144,6 +145,7 @@ %endif %patch123 %patch124 +%patch125 # ### 47 rediff #%patch121 -p1 # be sure not to use th
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Fri Mar 4 14:11:20 CET 2011. --- libqt4/libqt4-devel-doc-data.changes2011-03-02 17:45:31.0 +0100 +++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc-data.changes 2011-03-03 14:53:42.0 +0100 @@ -1,0 +2,7 @@ +Thu Mar 3 14:47 CET 2011 - cgiboude...@gmail.com +- Add qtreeview-fix-QTBUG-16292.diff (picked from http://bugreports.qt.nokia.com/browse/QTBUG-16292) + Fixes a crash inside QTreeView::indexRowSizeHint when the index was already deleted + Will be part of Qt 4.7.3. + Fixes various KDE crashes in KMail(kde#219964), KPackageKit, amarok(kde#260303) + +--- libqt4-devel-doc.changes: same change libqt4-sql-plugins.changes: same change libqt4.changes: same change calling whatdependson for head-i586 New: qtreeview-fix-QTBUG-16292.diff Other differences: -- ++ libqt4-devel-doc-data.spec ++ --- /var/tmp/diff_new_pack.tNCWWL/_old 2011-03-04 14:10:20.0 +0100 +++ /var/tmp/diff_new_pack.tNCWWL/_new 2011-03-04 14:10:20.0 +0100 @@ -28,7 +28,7 @@ # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN Version:4.7.2 -Release:1 +Release:2 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -78,6 +78,8 @@ Patch120: hppa_unaligned_access_fix_458133.diff Patch121: webkit-sparc64.diff Patch123: use-cups-default-print-settings-bnc552218.diff +Patch124: qtreeview-fix-QTBUG-16292.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 -importdir %plugindir/imports -xsync -xinput -gtkstyle %define check_config \ @@ -134,6 +136,7 @@ %patch120 %endif %patch123 +%patch124 # ### 47 rediff #%patch121 -p1 # be sure not to use them libqt4-devel-doc.spec: same change libqt4-sql-plugins.spec: same change ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.tNCWWL/_old 2011-03-04 14:10:20.0 +0100 +++ /var/tmp/diff_new_pack.tNCWWL/_new 2011-03-04 14:10:20.0 +0100 @@ -54,7 +54,7 @@ Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-VERSION-BEGIN Version:4.7.2 -Release:1 +Release:2 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -95,6 +95,8 @@ Patch120: hppa_unaligned_access_fix_458133.diff Patch121: webkit-sparc64.diff Patch123: use-cups-default-print-settings-bnc552218.diff +Patch124: qtreeview-fix-QTBUG-16292.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 -importdir %plugindir/imports -xsync -xinput -gtkstyle %define check_config \ @@ -151,6 +153,7 @@ %patch120 %endif %patch123 +%patch124 # ### 47 rediff #%patch121 -p1 # be sure not to use them ++ libqt4-devel-doc-data.spec.in ++ --- /var/tmp/diff_new_pack.tNCWWL/_old 2011-03-04 14:10:20.0 +0100 +++ /var/tmp/diff_new_pack.tNCWWL/_new 2011-03-04 14:10:20.0 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libqt4-devel-doc-data (Version 4.7.1) +# spec file for package libqt4-devel-doc-data # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ BuildRequires: cups-devel freeglut-devel freetype2-devel libQtWebKit-devel
commit libqt4 for openSUSE:Factory
Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Thu Mar 3 08:48:51 CET 2011. --- libqt4/libqt4.changes 2011-02-03 16:26:28.0 +0100 +++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2011-03-02 17:45:32.0 +0100 @@ -1,0 +2,18 @@ +Tue Mar 1 21:21:42 CET 2011 - dmuel...@suse.de + +- update to 4.7.2: + - Qt 4.7.2 is a bug-fix release. It maintains both forward and backward + compatibility (source and binary) with Qt 4.7.0. For more details, + refer to the online documentation included in this distribution. The + documentation is also available online: + + http://qt.nokia.com/doc/4.7 + + A detailed list of code fixes since 4.7.1 can be found in the + included changes-4.7.2 file. + +- Removed upstreamed patches: + * fix-psql.diff + * push-glib-context.diff + +--- libqt4-devel-doc.changes: same change libqt4-devel-doc-data.changes: same change libqt4-sql-plugins.changes: same change calling whatdependson for head-i586 Old: fix-psql.diff push-glib-context.diff qt-everywhere-opensource-src-4.7.1.tar.bz2 New: qt-everywhere-opensource-src-4.7.2.tar.bz2 Other differences: -- ++ libqt4-devel-doc-data.spec ++ --- /var/tmp/diff_new_pack.GHmlVA/_old 2011-03-03 08:45:25.0 +0100 +++ /var/tmp/diff_new_pack.GHmlVA/_new 2011-03-03 08:45:25.0 +0100 @@ -27,8 +27,8 @@ %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN -Version:4.7.1 -Release:3 +Version:4.7.2 +Release:1 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -77,9 +77,7 @@ Patch119: hppa_ldcw_fix.diff Patch120: hppa_unaligned_access_fix_458133.diff Patch121: webkit-sparc64.diff -Patch122: push-glib-context.diff Patch123: use-cups-default-print-settings-bnc552218.diff -Patch124: fix-psql.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 -importdir %plugindir/imports -xsync -xinput -gtkstyle %define check_config \ @@ -135,9 +133,7 @@ %patch119 %patch120 %endif -%patch122 %patch123 -%patch124 # ### 47 rediff #%patch121 -p1 # be sure not to use them libqt4-devel-doc.spec: same change ++ libqt4.spec ++ --- /var/tmp/diff_new_pack.GHmlVA/_old 2011-03-03 08:45:25.0 +0100 +++ /var/tmp/diff_new_pack.GHmlVA/_new 2011-03-03 08:45:25.0 +0100 @@ -53,8 +53,8 @@ Provides: libqt4-dbus-1 = 4.4.0 Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-VERSION-BEGIN -Version:4.7.1 -Release:3 +Version:4.7.2 +Release:1 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -94,9 +94,7 @@ Patch119: hppa_ldcw_fix.diff Patch120: hppa_unaligned_access_fix_458133.diff Patch121: webkit-sparc64.diff -Patch122: push-glib-context.diff Patch123: use-cups-default-print-settings-bnc552218.diff -Patch124: fix-psql.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 -importdir %plugindir/imports -xsync -xinput -gtkstyle %define check_config \ @@ -152,9 +150,7 @@ %patch119 %patch120 %endif -%patch122 %patch123 -%patch124 # ### 47 rediff #%patch121 -p1 # be sure not to use them @@ -543,6 +539,7 @@ %dir %plugindir %dir %plugindir/script %dir %plugindir/codecs +%dir %plugindir/qmltooling %dir /usr/share/qt4/translations %plugindir/codecs/* %dir /usr/share/qt4 @@ -612,6 +609,7 @@ %plugindi