Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Thu Dec 17 16:46:55 CET 2009. -------- --- libqt4/libqt4-devel-doc-data.changes 2009-11-13 13:52:29.000000000 +0100 +++ libqt4/libqt4-devel-doc-data.changes 2009-12-12 18:22:21.000000000 +0100 @@ -1,0 +2,21 @@ +Sat Dec 12 17:13:27 UTC 2009 - aj@suse.de + +- Add libqt4-libtool-nodate.diff to not write date to libtool generated files. + +------------------------------------------------------------------- +Fri Dec 4 23:16:01 UTC 2009 - dmueller@suse.de + +- fix filelist conflict libqt4-devel/libQtWebkit-devel + +------------------------------------------------------------------- +Thu Dec 3 01:18:34 CET 2009 - dmueller@suse.de + +- update to 4.6.0: + * for a detailed list of changes, see the included changes-4.6.0 + +------------------------------------------------------------------- +Wed Dec 2 10:00:00 CET 2009 - kruber@zib.de + +- fixed building of libqt4-devel-doc + +------------------------------------------------------------------- @@ -11,0 +33,13 @@ +Fri Oct 30 14:30:00 CET 2009 - Nico.Laus.2001@gmx.de + +- build && install qdoc3, needed for qt-creator + (patch from dmueller@suse.de that went into libqt = 4.5 but not here) + +------------------------------------------------------------------- +Thu Oct 22 11:56:41 UTC 2009 - tittiatcoke@gmail.com + +- Rearranged how the packages of Qt 4.6 are build + + Main libraries are now build from libqt4 + + New package that contains examples and demos + +------------------------------------------------------------------- @@ -16,0 +51,5 @@ +Thu Oct 15 23:54:46 CEST 2009 - dmueller@suse.de + +- backport for SLE11-SP1 (FATE#306930) + +------------------------------------------------------------------- @@ -108,0 +148,5 @@ + +------------------------------------------------------------------- +Thu Feb 5 12:53:42 CET 2009 - dmueller@suse.de + +- fix baselibs.conf (bnc#472311) New Changes file: --- /dev/null 2009-09-30 08:50:26.000000000 +0200 +++ libqt4/libqt4-devel-doc.changes 2009-12-12 18:22:21.000000000 +0100 @@ -0,0 +1,1594 @@ +------------------------------------------------------------------- +Sat Dec 12 17:13:27 UTC 2009 - aj@suse.de + +- Add libqt4-libtool-nodate.diff to not write date to libtool generated files. + +------------------------------------------------------------------- +Fri Dec 4 23:16:01 UTC 2009 - dmueller@suse.de + +- fix filelist conflict libqt4-devel/libQtWebkit-devel + +------------------------------------------------------------------- +Thu Dec 3 01:18:34 CET 2009 - dmueller@suse.de + +- update to 4.6.0: + * for a detailed list of changes, see the included changes-4.6.0 + +------------------------------------------------------------------- +Wed Dec 2 10:00:00 CET 2009 - kruber@zib.de + +- fixed building of libqt4-devel-doc + +------------------------------------------------------------------- +Fri Nov 13 13:51:36 CET 2009 - dmueller@suse.de + +- strip timestamp from rcc as well (bnc#554462) + +------------------------------------------------------------------- +Fri Nov 13 11:53:01 CET 2009 - dmueller@suse.de + +- refresh patches + +------------------------------------------------------------------- +Fri Oct 30 14:30:00 CET 2009 - Nico.Laus.2001@gmx.de + +- build && install qdoc3, needed for qt-creator + (patch from dmueller@suse.de that went into libqt = 4.5 but not here) + +------------------------------------------------------------------- +Thu Oct 22 11:56:41 UTC 2009 - tittiatcoke@gmail.com + +- Rearranged how the packages of Qt 4.6 are build + + Main libraries are now build from libqt4 + + New package that contains examples and demos + +------------------------------------------------------------------- +Mon Oct 19 15:20:51 CEST 2009 - dmueller@suse.de + +- fix memory leak in QPixmapFilter (bnc#547896) + +------------------------------------------------------------------- +Thu Oct 15 23:54:46 CEST 2009 - dmueller@suse.de + +- backport for SLE11-SP1 (FATE#306930) + +------------------------------------------------------------------- +Thu Oct 15 12:12:54 CEST 2009 - dmueller@suse.de + +- fix QTimer(0) regression + +------------------------------------------------------------------- +Mon Oct 12 18:05:50 CEST 2009 - dmueller@suse.de + +- compile with xsync support +- fix translation build + +------------------------------------------------------------------- +Mon Oct 12 16:03:29 CEST 2009 - dmueller@suse.de + +- update to 4.5.3: + * for detailed changelog see included changes-4.5.3 +- fix deadlock in dbus bindings (bnc#482749) + +------------------------------------------------------------------- +Tue Jul 28 18:31:05 CEST 2009 - dmueller@novell.com + +- disable use of x shared pixmaps, not supported by newer + drivers anymore and very slow anyway +- Fix QMenu not respecting minimum width, this affects + the Plasma taskabar +- Fix X11 timestamp issues which cause clipboard synchronisation + bugs + +------------------------------------------------------------------- +Wed Jun 24 17:32:40 CEST 2009 - sbrabec@suse.cz + +- Packageand supplement 32bit packages in baselibs.conf + (bnc#354164). +- %plugindir/codecs moved to libqt4, as it is used by QtCore. +- %plugindir subdirs moved to packages, where it logically belong. + +------------------------------------------------------------------- +Wed Jun 17 22:24:07 CEST 2009 - dmueller@suse.de + +- fix use-after-free issue (CVE-2009-0945, bnc#512559) + +------------------------------------------------------------------- +Sun May 31 17:31:45 CEST 2009 - dmueller@suse.de + +- add patches: + * Fix deserialization of values with custom types + * Make sure syncqt creates the Phonon/Global file. + * Fix huge memory leak in QPixmapCache + * Do not deduce scrollbar extent twice + +------------------------------------------------------------------- +Thu Apr 23 22:00:12 CEST 2009 - beineri@opensuse.org + +- update to 4.5.1: + * for detailed changelog see included changes-4.5.1 + +------------------------------------------------------------------- +Tue Mar 3 22:38:50 CET 2009 - beineri@opensuse.org + +- fix build + +------------------------------------------------------------------- +Tue Mar 3 10:34:50 CET 2009 - dmueller@suse.de + +- update to 4.5.0 final: + * licensing change. LGPLv2.1 or later is a new option + +------------------------------------------------------------------- +Sun Mar 1 22:07:48 CET 2009 - dmueller@suse.de + +- update to 4.5.0 RC2: + * for detailed changelog, see included changes-4.5.0 +- build && install qdoc3, needed for qt-creator + +------------------------------------------------------------------- +Wed Feb 11 19:40:26 CET 2009 - dmueller@suse.de + +- use minimal-toc for ppc64 + +------------------------------------------------------------------- +Wed Feb 11 17:02:13 CET 2009 - coolo@suse.de + +- do not include a timestamp in includeguards either + +------------------------------------------------------------------- +Fri Feb 6 19:01:05 CET 2009 - coolo@suse.de + +- do not include a timestamp in files generated from .ui either + +------------------------------------------------------------------- +Fri Feb 6 11:37:00 CET 2009 - dmueller@suse.de + +- fix QTestLib build again + +------------------------------------------------------------------- +Thu Feb 5 12:53:42 CET 2009 - dmueller@suse.de + +- fix baselibs.conf (bnc#472311) + +------------------------------------------------------------------- +Thu Feb 5 12:06:44 CET 2009 - dmueller@suse.de + +- update to 4.5.0 RC1: + * for detaled changelog, see included changes-4.5.0 + * add missing libqt4-sql-sqlite baselib (bnc#472311) + +------------------------------------------------------------------- +Tue Jan 27 23:12:29 CET 2009 - dmueller@suse.de + +- drop 0258-windowsxpstyle-qbrush.diff, rejected upstream +- fix qmake path separators +- fix zero height qpixmaps not being considered null +- fix crash in formlayouting + +------------------------------------------------------------------- +Thu Jan 15 12:08:02 CET 2009 - dmueller@suse.de + +- add libQtWebKit4 to baselibs.conf +- do not hardcode build date in generated moc files + +------------------------------------------------------------------- +Tue Jan 13 12:34:56 CET 2009 - olh@suse.de + +- obsolete old -XXbit packages (bnc#437293) + +------------------------------------------------------------------- +Mon Jan 5 16:24:36 CET 2009 - dmueller@suse.de + +- remove hardcoded legacy font mapping (bnc#448012) + +------------------------------------------------------------------- +Fri Dec 5 09:27:20 CET 2008 - dmueller@suse.de + +- add 32bit modules (bnc#354164) +- sync before setting own X error handler +- fix crashes caused by animation in QTreeView (kde#176045) + +------------------------------------------------------------------- +Mon Nov 17 20:38:09 CET 2008 - dmueller@suse.de + +- add patch for recursive painting crash (maybe fixes bnc#444591) +- fix major performance regression in QUrl +- fix windows xp style painting ++++ 1397 more lines (skipped) ++++ between /dev/null ++++ and libqt4/libqt4-devel-doc.changes --- libqt4/libqt4-sql-plugins.changes 2009-11-13 13:52:29.000000000 +0100 +++ libqt4/libqt4-sql-plugins.changes 2009-12-12 18:22:21.000000000 +0100 @@ -1,0 +2,21 @@ +Sat Dec 12 17:13:27 UTC 2009 - aj@suse.de + +- Add libqt4-libtool-nodate.diff to not write date to libtool generated files. + +------------------------------------------------------------------- +Fri Dec 4 23:16:01 UTC 2009 - dmueller@suse.de + +- fix filelist conflict libqt4-devel/libQtWebkit-devel + +------------------------------------------------------------------- +Thu Dec 3 01:18:34 CET 2009 - dmueller@suse.de + +- update to 4.6.0: + * for a detailed list of changes, see the included changes-4.6.0 + +------------------------------------------------------------------- +Wed Dec 2 10:00:00 CET 2009 - kruber@zib.de + +- fixed building of libqt4-devel-doc + +------------------------------------------------------------------- @@ -11,0 +33,13 @@ +Fri Oct 30 14:30:00 CET 2009 - Nico.Laus.2001@gmx.de + +- build && install qdoc3, needed for qt-creator + (patch from dmueller@suse.de that went into libqt = 4.5 but not here) + +------------------------------------------------------------------- +Thu Oct 22 11:56:41 UTC 2009 - tittiatcoke@gmail.com + +- Rearranged how the packages of Qt 4.6 are build + + Main libraries are now build from libqt4 + + New package that contains examples and demos + +------------------------------------------------------------------- @@ -16,0 +51,5 @@ +Thu Oct 15 23:54:46 CEST 2009 - dmueller@suse.de + +- backport for SLE11-SP1 (FATE#306930) + +------------------------------------------------------------------- @@ -108,0 +148,5 @@ + +------------------------------------------------------------------- +Thu Feb 5 12:53:42 CET 2009 - dmueller@suse.de + +- fix baselibs.conf (bnc#472311) libqt4.changes: same change calling whatdependson for head-i586 Old: ---- 0019-Make-QMenu-respect-the-minimum-width-set.patch 0280-deserialization-custom-dbus-properties.diff 0283-do-not-deduce-scrollbar-extent-twice.diff avoid-dbus-deadlock.diff disable-callgrind.diff display-key-support.diff filter-leak-fix.patch fix-xsync-flag.diff glib-eventloop-regression.diff ignore-global-advance-width-in-fots.diff libQtWebKit-devel.changes libQtWebKit-devel.spec libQtWebKit-devel.spec.in qt-x11-opensource-src-4.5.3.tar.bz2 New: ---- ignore-global-advance-width-in-fonts.diff libqt4-devel-doc.changes libqt4-devel-doc.spec libqt4-devel-doc.spec.in libqt4-libtool-nodate.diff minimal-toc-for-webkit.diff qt-everywhere-opensource-src-4.6.0.tar.bz2 webkit-ia64_s390x.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.MJKLd7/_old 2009-12-17 16:45:27.000000000 +0100 +++ /var/tmp/diff_new_pack.MJKLd7/_new 2009-12-17 16:45:27.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-devel-doc-data (Version 4.5.3) +# spec file for package libqt4-devel-doc-data (Version 4.6.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,6 +25,15 @@ %if 0%{?suse_version} BuildRequires: update-desktop-files %endif +# COMMON-VERSION-BEGIN +# COMMON-VERSION-BEGIN +Version: 4.6.0 +Release: 1 +%define base_name libqt4 +%define x11_free -everywhere-opensource-src- +%define rversion 4.6.0 +# COMMON-VERSION-END +# COMMON-VERSION-END Url: http://www.trolltech.com License: QPL, GPL Group: System/Libraries @@ -34,11 +43,6 @@ %requires_eq libqt4 # COMMON-BEGIN # COMMON-BEGIN -Version: 4.5.3 -Release: 4 -%define base_name libqt4 -%define x11_free -x11-opensource-src- -%define rversion 4.5.3 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -55,30 +59,20 @@ Patch39: 0191-listview-alternate-row-colors.diff Patch40: 0188-fix-moc-parser-same-name-header.diff Patch43: 0195-compositing-properties.diff -Patch55: ignore-global-advance-width-in-fots.diff +Patch55: ignore-global-advance-width-in-fonts.diff Patch60: 0180-window-role.diff Patch61: qt4-fake-bold.patch Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch Patch75: qt-debug-timer.diff Patch87: qfatal-noreturn.diff -Patch90: display-key-support.diff Patch101: no-moc-date.diff Patch102: 0253-qmake_correct_path_separators.diff -Patch105: disable-callgrind.diff Patch106: build-install-qdoc3.diff -Patch108: 0280-deserialization-custom-dbus-properties.diff -Patch111: 0283-do-not-deduce-scrollbar-extent-twice.diff -Patch113: 0019-Make-QMenu-respect-the-minimum-width-set.patch -Patch114: avoid-dbus-deadlock.diff -Patch116: fix-xsync-flag.diff -Patch117: glib-eventloop-regression.diff -Patch118: filter-leak-fix.patch +Patch107: webkit-ia64_s390x.patch +Patch108: minimal-toc-for-webkit.diff +Patch109: libqt4-libtool-nodate.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %suse_version > 910 - %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 -xsync -%else - %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -no-xrender -no-xrandr -no-xinerama -no-xshape -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 -no-exceptions -system-libtiff -no-sm -no-opengl -no-xcursor -no-webkit -no-xmlpatterns -%endif + %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -xsync -xinput -gtkstyle %define check_config \ grep '# define' src/corelib/global/qconfig.h | egrep -v 'QT_(ARCH|USE)'; \ if test -f /usr/share/qt4/mkspecs/qconfig.pri ; then \ @@ -114,25 +108,17 @@ %patch43 %patch55 %patch60 -%if %suse_version > 910 # bnc#374073 comment #8 # %patch61 -%endif %patch70 %patch75 %patch87 -%patch90 %patch101 %patch102 -%patch105 %patch106 +%patch107 %patch108 -%patch111 -%patch113 -p1 -%patch114 -p1 -%patch116 -%patch117 -p1 -%patch118 +%patch109 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END ++++++ libqt4-devel-doc.spec ++++++ # # spec file for package libqt4-devel-doc (Version 4.6.0) # # Copyright (c) 2009 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # 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/ # # norootforbuild # nodebuginfo Name: libqt4-devel-doc BuildRequires: cups-devel freeglut-devel libjpeg-devel libpng-devel BuildRequires: glib2-devel libqt4-devel sqlite3-devel %if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif %if 0%{?suse_version} BuildRequires: update-desktop-files %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN Version: 4.6.0 Release: 1 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion 4.6.0 # COMMON-VERSION-END # COMMON-VERSION-END Url: http://www.trolltech.com License: QPL, GPL Group: Documentation/HTML Summary: Qt documentation Requires: libqt4 = %version Requires: libqt4-devel-doc-data = %version Requires: libqt4-sql-sqlite >= %version Provides: 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 # COMMON-BEGIN # COMMON-BEGIN Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop Source12: linguist4.desktop Source13: assistant4.desktop Source14: assistant.png Source15: designer.png Source16: linguist.png Patch2: qt-never-strip.diff Patch3: plastik-default.diff Patch6: use-freetype-default.diff Patch1006: use-freetype-default-legacy.diff Patch8: link-tools-shared.diff Patch39: 0191-listview-alternate-row-colors.diff Patch40: 0188-fix-moc-parser-same-name-header.diff Patch43: 0195-compositing-properties.diff Patch55: ignore-global-advance-width-in-fonts.diff Patch60: 0180-window-role.diff Patch61: qt4-fake-bold.patch Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch Patch75: qt-debug-timer.diff Patch87: qfatal-noreturn.diff Patch101: no-moc-date.diff Patch102: 0253-qmake_correct_path_separators.diff Patch106: build-install-qdoc3.diff Patch107: webkit-ia64_s390x.patch Patch108: minimal-toc-for-webkit.diff Patch109: libqt4-libtool-nodate.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -xsync -xinput -gtkstyle %define check_config \ 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; \ fi \ %description Qt is a set of libraries for developing applications. This package contains base tools, like string, xml, and network handling. Authors: -------- Qt Software %prep %define plugindir %_libdir/qt4/plugins %setup -q -n qt%x11_free%rversion %patch2 %patch3 %if %suse_version > 1010 %patch6 %else %patch1006 %endif # needs rediffing #%patch8 %patch39 %patch40 %patch43 %patch55 %patch60 # bnc#374073 comment #8 # %patch61 %patch70 %patch75 %patch87 %patch101 %patch102 %patch106 %patch107 %patch108 %patch109 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END # COMMON-END %package -n qt4-x11-tools License: QPL, GPL Group: System/Libraries Summary: C++ Program Library, Core Components Requires: libqt4-x11 >= %version %description -n qt4-x11-tools Qt is a set of libraries for developing applications. This package contains base tools, like string, xml, and network handling. Authors: -------- Troll Tech AS, Norway %build %ifarch ppc64 export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc" %endif export QTDIR=$PWD export PATH=$PWD/bin:$PATH export LD_LIBRARY_PATH=$PWD/lib/ sed -i -e "/^QMAKE_CFLAGS_RELEASE[ \t]*+=/s,$, $RPM_OPT_FLAGS," mkspecs/common/g++.conf export MAKEFLAGS="%{?jobs:-j %jobs}" echo yes | ./configure %common_options -webkit -xmlpatterns -no-sql-sqlite -no-sql-sqlite2 -no-sql-mysql %check_config make %{?jobs:-j%jobs} sub-src make %{?jobs:-j%jobs} -C tools/assistant make %{?jobs:-j%jobs} -C demos make %{?jobs:-j%jobs} -C examples %install export QTDIR=$PWD make INSTALL_ROOT=$RPM_BUILD_ROOT -C tools/assistant install make INSTALL_ROOT=$RPM_BUILD_ROOT -C demos install make INSTALL_ROOT=$RPM_BUILD_ROOT -C examples install mv $RPM_BUILD_ROOT/%_libdir/qt4/examples/painting/svgviewer/svgviewer $RPM_BUILD_ROOT/%_bindir mv $RPM_BUILD_ROOT/%_libdir/qt4/demos/browser/browser $RPM_BUILD_ROOT/%_bindir/qt4-browser ln -s %_bindir/svgviewer $RPM_BUILD_ROOT/%_libdir/qt4/examples/painting/svgviewer/svgviewer ln -s %_bindir/qt4-browser $RPM_BUILD_ROOT/%_libdir/qt4/demos/browser/browser # reduce fileconflicts for f in $(rpm -ql libqt4-devel) $(rpm -ql libqt4-x11) $(rpm -ql libqt4); do test -f $RPM_BUILD_ROOT/$f && rm $RPM_BUILD_ROOT/$f done find $RPM_BUILD_ROOT -type d -print0 | xargs -0 --no-run-if-empty rmdir --ignore-fail-on-non-empty # argggh, qmake is such a piece of <censored> mkdir -p $RPM_BUILD_ROOT/%_libdir/pkgconfig find $RPM_BUILD_ROOT/%_libdir -type f -name '*.pc' -exec mv {} $RPM_BUILD_ROOT/%_libdir/pkgconfig ; # 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' {} ; mkdir -p $RPM_BUILD_ROOT/%_docdir/%base_name/ ln -s %_libdir/qt4/demos $RPM_BUILD_ROOT/%_docdir/%base_name/demos ln -s %_libdir/qt4/examples $RPM_BUILD_ROOT/%_docdir/%base_name/examples # packaged in %name-devel-doc-data rm -rf $RPM_BUILD_ROOT/%_docdir/%base_name/{doc,html} rm -f $RPM_BUILD_ROOT/%_libdir/libQt{3,A,C,G,H,N,S,T}* rm -f $RPM_BUILD_ROOT/%_libdir/libQtXml.* rm -rf $RPM_BUILD_ROOT/%_libdir/qt4/plugins %if %suse_version > 1020 %fdupes $RPM_BUILD_ROOT/usr/include %endif %suse_update_desktop_file -i assistant4 Qt Development Documentation %clean rm -rf $RPM_BUILD_ROOT # no baselibs supplements for older distros %if %suse_version < 1110 sed -i -e 's, supplements .*,,' $RPM_SOURCE_DIR/baselibs.conf %endif %files %defattr(-,root,root,755) /usr/bin/assistant /usr/bin/assistant_adp /usr/bin/qhelpgenerator /usr/bin/qhelpconverter /usr/bin/qcollectiongenerator /usr/bin/qtdemo /usr/share/applications/assistant4.desktop /usr/share/pixmaps/assistant.png #/usr/share/qt4/translations/assistant_*.qm /usr/%_lib/qt4/demos %dir %_docdir/%base_name %_docdir/%base_name/demos %_docdir/%base_name/examples %_libdir/qt4/examples %files -n qt4-x11-tools %defattr(-,root,root,755) /usr/bin/svgviewer /usr/bin/qt4-browser %changelog ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.MJKLd7/_old 2009-12-17 16:45:27.000000000 +0100 +++ /var/tmp/diff_new_pack.MJKLd7/_new 2009-12-17 16:45:27.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-sql-plugins (Version 4.5.3) +# spec file for package libqt4-sql-plugins (Version 4.6.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,6 +26,15 @@ %if 0%{?suse_version} BuildRequires: update-desktop-files %endif +# COMMON-VERSION-BEGIN +# COMMON-VERSION-BEGIN +Version: 4.6.0 +Release: 1 +%define base_name libqt4 +%define x11_free -everywhere-opensource-src- +%define rversion 4.6.0 +# COMMON-VERSION-END +# COMMON-VERSION-END Url: http://www.trolltech.com License: QPL, GPL Group: System/Libraries @@ -33,11 +42,6 @@ Summary: Qt 4 SQL related libraries # COMMON-BEGIN # COMMON-BEGIN -Version: 4.5.3 -Release: 4 -%define base_name libqt4 -%define x11_free -x11-opensource-src- -%define rversion 4.5.3 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -54,30 +58,20 @@ Patch39: 0191-listview-alternate-row-colors.diff Patch40: 0188-fix-moc-parser-same-name-header.diff Patch43: 0195-compositing-properties.diff -Patch55: ignore-global-advance-width-in-fots.diff +Patch55: ignore-global-advance-width-in-fonts.diff Patch60: 0180-window-role.diff Patch61: qt4-fake-bold.patch Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch Patch75: qt-debug-timer.diff Patch87: qfatal-noreturn.diff -Patch90: display-key-support.diff Patch101: no-moc-date.diff Patch102: 0253-qmake_correct_path_separators.diff -Patch105: disable-callgrind.diff Patch106: build-install-qdoc3.diff -Patch108: 0280-deserialization-custom-dbus-properties.diff -Patch111: 0283-do-not-deduce-scrollbar-extent-twice.diff -Patch113: 0019-Make-QMenu-respect-the-minimum-width-set.patch -Patch114: avoid-dbus-deadlock.diff -Patch116: fix-xsync-flag.diff -Patch117: glib-eventloop-regression.diff -Patch118: filter-leak-fix.patch +Patch107: webkit-ia64_s390x.patch +Patch108: minimal-toc-for-webkit.diff +Patch109: libqt4-libtool-nodate.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %suse_version > 910 - %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 -xsync -%else - %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -no-xrender -no-xrandr -no-xinerama -no-xshape -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 -no-exceptions -system-libtiff -no-sm -no-opengl -no-xcursor -no-webkit -no-xmlpatterns -%endif + %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -xsync -xinput -gtkstyle %define check_config \ grep '# define' src/corelib/global/qconfig.h | egrep -v 'QT_(ARCH|USE)'; \ if test -f /usr/share/qt4/mkspecs/qconfig.pri ; then \ @@ -113,25 +107,17 @@ %patch43 %patch55 %patch60 -%if %suse_version > 910 # bnc#374073 comment #8 # %patch61 -%endif %patch70 %patch75 %patch87 -%patch90 %patch101 %patch102 -%patch105 %patch106 +%patch107 %patch108 -%patch111 -%patch113 -p1 -%patch114 -p1 -%patch116 -%patch117 -p1 -%patch118 +%patch109 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END ++++++ libqt4.spec ++++++ ++++ 623 lines (skipped) ++++ between libqt4/libqt4.spec ++++ and libqt4/libqt4.spec ++++++ 0180-window-role.diff ++++++ --- /var/tmp/diff_new_pack.MJKLd7/_old 2009-12-17 16:45:27.000000000 +0100 +++ /var/tmp/diff_new_pack.MJKLd7/_new 2009-12-17 16:45:27.000000000 +0100 @@ -1,22 +1,24 @@ -qt-bugs@ issue : 167704 -Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refused) -bugs.kde.org number : none -applied: no -author: Lubos Lunak <l.lunak@kde.org> - -NOTE: It is suggested to apply patch #0209 as well when this patch is used. - -This patch uses object name as a fallback for window role if no window role -is set explicitly using setWindowRole(). Since Qt3 always used the object -name as the window role and most Qt3/KDE3 code is ported to call setObjectName(), -this makes the window role set in many cases (which KWin uses for window identifying). +commit c119289d63c7357c515c9ecf8f79393c806364b2 +Author: Lubos Lunak <l.lunak@kde.org> +Date: Sat Feb 23 16:44:52 2008 +0100 + This patch uses object name as a fallback for window role if no window + role is set explicitly using setWindowRole(). Since Qt3 always used + the object name as the window role and most Qt3/KDE3 code is ported to + call setObjectName(), + + this makes the window role set in many cases (which KWin uses for window identifying). + + NOTE: It is suggested to apply patch #0209 as well when this patch is used. + + qt-bugs@ issue : 167704 + Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refused) Index: src/corelib/kernel/qobject.cpp =================================================================== --- src/corelib/kernel/qobject.cpp.orig +++ src/corelib/kernel/qobject.cpp -@@ -986,9 +986,18 @@ void QObject::setObjectName(const QStrin +@@ -1136,8 +1136,16 @@ void QObject::setObjectName(const QStrin { Q_D(QObject); d->objectName = name; @@ -25,37 +27,35 @@ +#endif } - +#if defined(Q_WS_X11) +void QObjectPrivate::checkWindowRole() +{ +} +#endif -+ + #ifdef QT3_SUPPORT /*! \internal - QObject::child is compat but needs to call itself recursively, Index: src/corelib/kernel/qobject_p.h =================================================================== --- src/corelib/kernel/qobject_p.h.orig +++ src/corelib/kernel/qobject_p.h -@@ -144,6 +144,9 @@ public: - mutable quint32 connectedSignals; - - QString objectName; +@@ -157,6 +157,9 @@ public: + void sendPendingChildInsertedEvents(); + void removePendingChildInsertedEvents(QObject *child); + #endif +#if defined(Q_WS_X11) + virtual void checkWindowRole(); +#endif - // Note: you must hold the signalSlotLock() before accessing the lists below or calling the functions - struct Connection + static Sender *setCurrentSender(QObject *receiver, + Sender *sender); Index: src/gui/kernel/qwidget_p.h =================================================================== --- src/gui/kernel/qwidget_p.h.orig +++ src/gui/kernel/qwidget_p.h -@@ -360,6 +360,7 @@ public: +@@ -661,6 +661,7 @@ public: + static QWidget *keyboardGrabber; - #if defined(Q_WS_X11) void setWindowRole(); + virtual void checkWindowRole(); void sendStartupMessage(const char *message) const; @@ -65,7 +65,7 @@ =================================================================== --- src/gui/kernel/qwidget_x11.cpp.orig +++ src/gui/kernel/qwidget_x11.cpp -@@ -791,13 +791,17 @@ void QWidgetPrivate::create_sys(WId wind +@@ -838,13 +838,17 @@ void QWidgetPrivate::create_sys(WId wind // declare the widget's window role @@ -89,7 +89,7 @@ } // set client leader property -@@ -2772,6 +2776,17 @@ void QWidgetPrivate::setWindowRole() +@@ -2926,6 +2930,17 @@ void QWidgetPrivate::setWindowRole() XChangeProperty(X11->display, q->internalWinId(), ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace, (unsigned char *)windowRole.constData(), windowRole.length()); ++++++ 0191-listview-alternate-row-colors.diff ++++++ --- /var/tmp/diff_new_pack.MJKLd7/_old 2009-12-17 16:45:27.000000000 +0100 +++ /var/tmp/diff_new_pack.MJKLd7/_new 2009-12-17 16:45:27.000000000 +0100 @@ -13,7 +13,7 @@ =================================================================== --- src/gui/itemviews/qlistview.cpp.orig +++ src/gui/itemviews/qlistview.cpp -@@ -1137,7 +1137,7 @@ void QListView::paintEvent(QPaintEvent * +@@ -989,7 +989,7 @@ void QListView::paintEvent(QPaintEvent * option.state &= ~QStyle::State_Enabled; cg = QPalette::Disabled; } else { ++++++ 0195-compositing-properties.diff ++++++ --- /var/tmp/diff_new_pack.MJKLd7/_old 2009-12-17 16:45:27.000000000 +0100 +++ /var/tmp/diff_new_pack.MJKLd7/_new 2009-12-17 16:45:27.000000000 +0100 @@ -11,7 +11,7 @@ =================================================================== --- src/gui/kernel/qwidget_x11.cpp.orig +++ src/gui/kernel/qwidget_x11.cpp -@@ -719,6 +719,11 @@ void QWidgetPrivate::create_sys(WId wind +@@ -763,6 +763,11 @@ void QWidgetPrivate::create_sys(WId wind Q_ASSERT(id); XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder, &wsa); @@ -23,7 +23,7 @@ } else if (topLevel && !desktop) { // top-level widget if (!X11->wm_client_leader) create_wm_client_leader(); -@@ -769,13 +774,21 @@ void QWidgetPrivate::create_sys(WId wind +@@ -816,13 +821,21 @@ void QWidgetPrivate::create_sys(WId wind // set EWMH window types setNetWmWindowTypes(); @@ -47,7 +47,7 @@ // declare the widget's window role if (QTLWExtra *topData = maybeTopData()) { -@@ -791,10 +804,6 @@ void QWidgetPrivate::create_sys(WId wind +@@ -838,10 +851,6 @@ void QWidgetPrivate::create_sys(WId wind XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER), XA_WINDOW, 32, PropModeReplace, (unsigned char *)&X11->wm_client_leader, 1); ++++++ 0225-invalidate-tabbar-geometry-on-refresh.patch ++++++ --- /var/tmp/diff_new_pack.MJKLd7/_old 2009-12-17 16:45:27.000000000 +0100 +++ /var/tmp/diff_new_pack.MJKLd7/_new 2009-12-17 16:45:27.000000000 +0100 @@ -23,7 +23,7 @@ =================================================================== --- src/gui/widgets/qtabbar.cpp.orig +++ src/gui/widgets/qtabbar.cpp -@@ -675,8 +675,8 @@ void QTabBarPrivate::refresh() +@@ -678,8 +678,8 @@ void QTabBarPrivate::refresh() layoutTabs(); makeVisible(currentIndex); q->update(); ++++++ build-install-qdoc3.diff ++++++ --- /var/tmp/diff_new_pack.MJKLd7/_old 2009-12-17 16:45:27.000000000 +0100 +++ /var/tmp/diff_new_pack.MJKLd7/_new 2009-12-17 16:45:27.000000000 +0100 @@ -1,21 +1,17 @@ -Index: tools/qdoc3/qdoc3.pro -=================================================================== ---- tools/qdoc3/qdoc3.pro.orig +--- tools/qdoc3/qdoc3.pro +++ tools/qdoc3/qdoc3.pro -@@ -99,3 +99,6 @@ SOURCES += apigenerator.cpp \ +@@ -105,3 +105,6 @@ webxmlgenerator.cpp \ yyindent.cpp +target.path=$$[QT_INSTALL_BINS] +INSTALLS += target + -Index: tools/tools.pro -=================================================================== ---- tools/tools.pro.orig +--- tools/tools.pro +++ tools/tools.pro -@@ -25,6 +25,7 @@ mac { +@@ -30,6 +30,7 @@ contains(QT_CONFIG, dbus):SUBDIRS += qdbus - !wince*:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns + !wince*:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns xmlpatternsvalidator embedded: SUBDIRS += makeqpf +SUBDIRS += qdoc3 ++++++ ignore-global-advance-width-in-fonts.diff ++++++ --- src/gui/text/qfontengine_ft.cpp +++ src/gui/text/qfontengine_ft.cpp @@ -619,7 +619,7 @@ transform = false; antialias = true; freetype = 0; - default_load_flags = 0; + default_load_flags = FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; default_hint_style = HintNone; subpixelType = Subpixel_None; lcdFilterType = 0; ++++++ libqt4-devel-doc-data.spec.in ++++++ --- /var/tmp/diff_new_pack.MJKLd7/_old 2009-12-17 16:45:27.000000000 +0100 +++ /var/tmp/diff_new_pack.MJKLd7/_new 2009-12-17 16:45:27.000000000 +0100 @@ -24,6 +24,8 @@ %if 0%{?suse_version} BuildRequires: update-desktop-files %endif +# COMMON-VERSION-BEGIN +# COMMON-VERSION-END URL: http://www.trolltech.com License: QPL, GPL Group: System/Libraries ++++++ libqt4-devel-doc.spec.in ++++++ # # spec file for package qt-devel-doc (Version 4.1.3) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild # nodebuginfo Name: libqt4-devel-doc BuildRequires: cups-devel freeglut-devel libjpeg-devel libpng-devel BuildRequires: libqt4-devel glib2-devel sqlite3-devel %if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif %if 0%{?suse_version} BuildRequires: update-desktop-files %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-END URL: http://www.trolltech.com License: QPL, GPL Group: Documentation/HTML Summary: Qt documentation Requires: libqt4 = %version Requires: libqt4-devel-doc-data = %version Requires: libqt4-sql-sqlite >= %version Provides: 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 # COMMON-BEGIN # COMMON-END %package -n qt4-x11-tools Group: System/Libraries Summary: C++ Program Library, Core Components Requires: libqt4-x11 >= %version %description -n qt4-x11-tools Qt is a set of libraries for developing applications. This package contains base tools, like string, xml, and network handling. Authors: -------- Troll Tech AS, Norway %build %ifarch ppc64 export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc" %endif export QTDIR=$PWD export PATH=$PWD/bin:$PATH export LD_LIBRARY_PATH=$PWD/lib/ sed -i -e "/^QMAKE_CFLAGS_RELEASE[ \t]*+=/s,$, $RPM_OPT_FLAGS," mkspecs/common/g++.conf export MAKEFLAGS="%{?jobs:-j %jobs}" echo yes | ./configure %common_options -webkit -xmlpatterns -no-sql-sqlite -no-sql-sqlite2 -no-sql-mysql %check_config make %{?jobs:-j%jobs} sub-src make %{?jobs:-j%jobs} -C tools/assistant make %{?jobs:-j%jobs} -C demos make %{?jobs:-j%jobs} -C examples %install export QTDIR=$PWD make INSTALL_ROOT=$RPM_BUILD_ROOT -C tools/assistant install make INSTALL_ROOT=$RPM_BUILD_ROOT -C demos install make INSTALL_ROOT=$RPM_BUILD_ROOT -C examples install mv $RPM_BUILD_ROOT/%_libdir/qt4/examples/painting/svgviewer/svgviewer $RPM_BUILD_ROOT/%_bindir mv $RPM_BUILD_ROOT/%_libdir/qt4/demos/browser/browser $RPM_BUILD_ROOT/%_bindir/qt4-browser ln -s %_bindir/svgviewer $RPM_BUILD_ROOT/%_libdir/qt4/examples/painting/svgviewer/svgviewer ln -s %_bindir/qt4-browser $RPM_BUILD_ROOT/%_libdir/qt4/demos/browser/browser # reduce fileconflicts for f in $(rpm -ql libqt4-devel) $(rpm -ql libqt4-x11) $(rpm -ql libqt4); do test -f $RPM_BUILD_ROOT/$f && rm $RPM_BUILD_ROOT/$f done find $RPM_BUILD_ROOT -type d -print0 | xargs -0 --no-run-if-empty rmdir --ignore-fail-on-non-empty # argggh, qmake is such a piece of <censored> mkdir -p $RPM_BUILD_ROOT/%_libdir/pkgconfig find $RPM_BUILD_ROOT/%_libdir -type f -name '*.pc' -exec mv {} $RPM_BUILD_ROOT/%_libdir/pkgconfig ; # 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' {} ; mkdir -p $RPM_BUILD_ROOT/%_docdir/%base_name/ ln -s %_libdir/qt4/demos $RPM_BUILD_ROOT/%_docdir/%base_name/demos ln -s %_libdir/qt4/examples $RPM_BUILD_ROOT/%_docdir/%base_name/examples # packaged in %name-devel-doc-data rm -rf $RPM_BUILD_ROOT/%_docdir/%base_name/{doc,html} rm -f $RPM_BUILD_ROOT/%_libdir/libQt{3,A,C,G,H,N,S,T}* rm -f $RPM_BUILD_ROOT/%_libdir/libQtXml.* rm -rf $RPM_BUILD_ROOT/%_libdir/qt4/plugins %if %suse_version > 1020 %fdupes $RPM_BUILD_ROOT/usr/include %endif %suse_update_desktop_file -i assistant4 Qt Development Documentation %clean rm -rf $RPM_BUILD_ROOT # no baselibs supplements for older distros %if %suse_version < 1110 sed -i -e 's, supplements .*,,' $RPM_SOURCE_DIR/baselibs.conf %endif %files %defattr(-,root,root,755) /usr/bin/assistant /usr/bin/assistant_adp /usr/bin/qhelpgenerator /usr/bin/qhelpconverter /usr/bin/qcollectiongenerator /usr/bin/qtdemo /usr/share/applications/assistant4.desktop /usr/share/pixmaps/assistant.png #/usr/share/qt4/translations/assistant_*.qm /usr/%_lib/qt4/demos %dir %_docdir/%base_name %_docdir/%base_name/demos %_docdir/%base_name/examples %_libdir/qt4/examples %files -n qt4-x11-tools %defattr(-,root,root,755) /usr/bin/svgviewer /usr/bin/qt4-browser %changelog ++++++ libqt4-libtool-nodate.diff ++++++ Index: qmake/generators/unix/unixmake2.cpp =================================================================== --- qmake/generators/unix/unixmake2.cpp.orig +++ qmake/generators/unix/unixmake2.cpp @@ -1248,7 +1248,7 @@ UnixMakefileGenerator::writeLibtoolFile( QTextStream t(&ft); t << "# " << lname << " - a libtool library file\n"; t << "# Generated by qmake/libtool (" << qmake_version() << ") (Qt " - << QT_VERSION_STR << ") on: " << QDateTime::currentDateTime().toString(); + << QT_VERSION_STR << ")"; t << "\n"; t << "# The name that we can dlopen(3).\n" ++++++ libqt4-sql-plugins.spec.in ++++++ --- /var/tmp/diff_new_pack.MJKLd7/_old 2009-12-17 16:45:27.000000000 +0100 +++ /var/tmp/diff_new_pack.MJKLd7/_new 2009-12-17 16:45:27.000000000 +0100 @@ -25,6 +25,8 @@ %if 0%{?suse_version} BuildRequires: update-desktop-files %endif +# COMMON-VERSION-BEGIN +# COMMON-VERSION-END URL: http://www.trolltech.com License: QPL, GPL Group: System/Libraries ++++++ minimal-toc-for-webkit.diff ++++++ --- src/3rdparty/webkit/WebCore/WebCore.pro +++ src/3rdparty/webkit/WebCore/WebCore.pro @@ -3364,6 +3364,10 @@ CONFIG += no_debug_info } +contains(QMAKE_HOST.arch, ppc64): { + QMAKE_LFLAGS += -mminimal-toc +} + !win32-g++:win32:contains(QMAKE_HOST.arch, x86_64):{ asm_compiler.commands = ml64 /c asm_compiler.commands += /Fo ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN} ++++++ no-moc-date.diff ++++++ --- /var/tmp/diff_new_pack.MJKLd7/_old 2009-12-17 16:45:27.000000000 +0100 +++ /var/tmp/diff_new_pack.MJKLd7/_new 2009-12-17 16:45:27.000000000 +0100 @@ -1,64 +1,70 @@ ---- src/tools/moc/moc.cpp.orig +--- src/tools/moc/moc.cpp +++ src/tools/moc/moc.cpp -@@ -745,8 +745,8 @@ void Moc::generate(FILE *out) +@@ -732,9 +732,6 @@ + + void Moc::generate(FILE *out) + { +- +- QDateTime dt = QDateTime::currentDateTime(); +- QByteArray dstr = dt.toString().toLatin1(); + QByteArray fn = filename; + int i = filename.length()-1; + while (i>0 && filename[i-1] != '/' && filename[i-1] != '\') +@@ -743,8 +740,8 @@ fn = filename.mid(i); fprintf(out, "/****************************************************************************\n" "** Meta object code from reading C++ file '%s'\n**\n" , (const char*)fn); - fprintf(out, "** Created: %s\n" - "** by: The Qt Meta Object Compiler version %d (Qt %s)\n**\n" , dstr.data(), mocOutputRevision, QT_VERSION_STR); -+ fprintf(out, "** Created\n" ++ fprintf(out, "** Created:\n" + "** by: The Qt Meta Object Compiler version %d (Qt %s)\n**\n" , mocOutputRevision, QT_VERSION_STR); fprintf(out, "** WARNING! All changes made in this file will be lost!\n" "*****************************************************************************/\n\n"); ---- src/tools/uic/uic.cpp.orig +--- src/tools/rcc/rcc.cpp ++++ src/tools/rcc/rcc.cpp +@@ -712,7 +712,6 @@ + writeString("** Resource object code\n"); + writeString("**\n"); + writeString("** Created: "); +- writeByteArray(QDateTime::currentDateTime().toString().toLatin1()); + writeString("\n** by: The Resource Compiler for Qt version "); + writeByteArray(QT_VERSION_STR); + writeString("\n**\n"); +--- src/tools/uic/uic.cpp +++ src/tools/uic/uic.cpp -@@ -139,7 +139,7 @@ void Uic::writeCopyrightHeader(DomUI *ui +@@ -139,7 +139,7 @@ out << "/********************************************************************************\n"; - out << "** Form generated from reading ui file '" << QFileInfo(opt.inputFile).fileName() << "'\n"; + out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n"; out << "**\n"; - out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; + out << "** Created\n"; out << "** " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); out << "**\n"; - out << "** WARNING! All changes made in this file will be lost when recompiling ui file!\n"; ---- tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp.orig + out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n"; +--- tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp +++ tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp -@@ -525,9 +525,11 @@ static void writeProxy(const QString &fi +@@ -525,9 +525,11 @@ } else { includeGuard = QLatin1String("QDBUSXML2CPP_PROXY"); } -+/* ++#if 0 includeGuard = QString(QLatin1String("%1_%2")) .arg(includeGuard) .arg(QDateTime::currentDateTime().toTime_t()); -+*/ ++#endif hs << "#ifndef " << includeGuard << endl << "#define " << includeGuard << endl << endl; -@@ -834,9 +836,11 @@ static void writeAdaptor(const QString & +@@ -831,9 +833,11 @@ } else { includeGuard = QLatin1String("QDBUSXML2CPP_ADAPTOR"); } -+/* ++#if 0 includeGuard = QString(QLatin1String("%1_%2")) .arg(includeGuard) .arg(QDateTime::currentDateTime().toTime_t()); -+*/ ++#endif hs << "#ifndef " << includeGuard << endl << "#define " << includeGuard << endl << endl; ---- src/tools/rcc/rcc.cpp -+++ src/tools/rcc/rcc.cpp -@@ -710,10 +710,7 @@ - if (m_format == C_Code) { - writeString("/****************************************************************************\n"); - writeString("** Resource object code\n"); -- writeString("**\n"); -- writeString("** Created: "); -- writeByteArray(QDateTime::currentDateTime().toString().toLatin1()); -- writeString("\n** by: The Resource Compiler for Qt version "); -+ writeString("** Created by: The Resource Compiler for Qt version "); - writeByteArray(QT_VERSION_STR); - writeString("\n**\n"); - writeString("** WARNING! All changes made in this file will be lost!\n"); ++++++ plastik-default.diff ++++++ --- /var/tmp/diff_new_pack.MJKLd7/_old 2009-12-17 16:45:27.000000000 +0100 +++ /var/tmp/diff_new_pack.MJKLd7/_new 2009-12-17 16:45:27.000000000 +0100 @@ -1,22 +1,14 @@ -Index: src/gui/kernel/qapplication_x11.cpp -=================================================================== ---- src/gui/kernel/qapplication_x11.cpp.orig -+++ src/gui/kernel/qapplication_x11.cpp -@@ -2591,6 +2591,7 @@ void QApplicationPrivate::x11_initialize - return; - - switch(X11->desktopEnvironment) { -+ default: - case DE_KDE: - if (X11->use_xrender) - QApplicationPrivate::app_style = QStyleFactory::create(QLatin1String("plastique")); -@@ -2606,9 +2607,6 @@ void QApplicationPrivate::x11_initialize - case DE_CDE: - QApplicationPrivate::app_style = QStyleFactory::create(QLatin1String("cde")); - break; -- default: -- // Don't do anything -- break; +--- src/gui/kernel/qguiplatformplugin.cpp ++++ src/gui/kernel/qguiplatformplugin.cpp +@@ -180,7 +180,10 @@ + stylename = QLatin1String("cde"); + break; + default: +- // Don't do anything ++ if (X11->use_xrender) ++ stylename = QLatin1String("plastique"); ++ else ++ stylename = QLatin1String("windows"); + break; } - } - + return stylename; ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.MJKLd7/_old 2009-12-17 16:45:27.000000000 +0100 +++ /var/tmp/diff_new_pack.MJKLd7/_new 2009-12-17 16:45:27.000000000 +0100 @@ -3,10 +3,13 @@ ln -f libqt4.changes libqt4-sql-plugins.changes ln -f libqt4.changes libqt4-devel-doc-data.changes -ln -f libqt4.changes libQtWebKit-devel.changes +ln -f libqt4.changes libqt4-devel-doc.changes -for spec in libqt4-sql-plugins.spec libqt4-devel-doc-data.spec libQtWebKit-devel.spec; do -{ sed -n -e '1,/COMMON-BEGIN/p' $spec.in +for spec in libqt4-sql-plugins.spec libqt4-devel-doc-data.spec libqt4-devel-doc.spec; do +{ sed -n -e '1,/COMMON-VERSION-BEGIN/p' $spec.in + sed -n -e '/COMMON-VERSION-BEGIN/,/COMMON-VERSION-END/p' libqt4.spec + sed -n -e '/COMMON-VERSION-END/,/COMMON-BEGIN/p' $spec.in sed -n -e '/COMMON-BEGIN/,/COMMON-END/p' libqt4.spec - sed -n -e '/COMMON-END/,$p' $spec.in; } > $spec.tmp && mv $spec.tmp $spec + sed -n -e '/COMMON-END/,$p' $spec.in; + } > $spec.tmp && mv $spec.tmp $spec done ++++++ qfatal-noreturn.diff ++++++ --- /var/tmp/diff_new_pack.MJKLd7/_old 2009-12-17 16:45:27.000000000 +0100 +++ /var/tmp/diff_new_pack.MJKLd7/_new 2009-12-17 16:45:27.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- src/corelib/global/qglobal.h.orig +++ src/corelib/global/qglobal.h -@@ -1453,6 +1453,7 @@ Q_CORE_EXPORT void qCritical(const char +@@ -1609,6 +1609,7 @@ Q_CORE_EXPORT void qCritical(const char Q_CORE_EXPORT void qFatal(const char *, ...) /* print fatal message and exit */ #if defined(Q_CC_GNU) && !defined(__INSURE__) __attribute__ ((format (printf, 1, 2))) ++++++ qt-debug-timer.diff ++++++ --- /var/tmp/diff_new_pack.MJKLd7/_old 2009-12-17 16:45:27.000000000 +0100 +++ /var/tmp/diff_new_pack.MJKLd7/_new 2009-12-17 16:45:27.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- src/corelib/kernel/qeventdispatcher_unix.cpp.orig +++ src/corelib/kernel/qeventdispatcher_unix.cpp -@@ -551,6 +551,20 @@ int QTimerInfoList::activateTimers() +@@ -574,6 +574,20 @@ int QTimerInfoList::activateTimers() if (!firstTimerInfo) { firstTimerInfo = currentTimerInfo; ++++++ qt-never-strip.diff ++++++ --- /var/tmp/diff_new_pack.MJKLd7/_old 2009-12-17 16:45:27.000000000 +0100 +++ /var/tmp/diff_new_pack.MJKLd7/_new 2009-12-17 16:45:27.000000000 +0100 @@ -10,7 +10,7 @@ QMAKE_CONFIG= QTCONFIG_CONFIG= QT_CONFIG= -@@ -1263,7 +1262,7 @@ while [ "$#" -gt 0 ]; do +@@ -1324,7 +1323,7 @@ while [ "$#" -gt 0 ]; do QMakeVar add QMAKE_CFLAGS -pg QMakeVar add QMAKE_CXXFLAGS -pg QMakeVar add QMAKE_LFLAGS -pg @@ -19,7 +19,7 @@ else UNKNOWN_OPT=yes fi -@@ -2699,6 +2698,8 @@ if [ "$OPT_VERBOSE" = "yes" ]; then +@@ -2823,6 +2822,8 @@ if [ "$OPT_VERBOSE" = "yes" ]; then fi fi ++++++ use-freetype-default.diff ++++++ --- /var/tmp/diff_new_pack.MJKLd7/_old 2009-12-17 16:45:27.000000000 +0100 +++ /var/tmp/diff_new_pack.MJKLd7/_new 2009-12-17 16:45:27.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- src/gui/text/qfontengine_x11.cpp.orig +++ src/gui/text/qfontengine_x11.cpp -@@ -976,6 +976,26 @@ Q_GUI_EXPORT void qt_x11ft_convert_patte +@@ -978,6 +978,26 @@ Q_GUI_EXPORT void qt_x11ft_convert_patte *antialias = b; } @@ -29,7 +29,7 @@ QFontEngineX11FT::QFontEngineX11FT(FcPattern *pattern, const QFontDef &fd, int screen) : QFontEngineFT(fd) -@@ -993,7 +1013,7 @@ QFontEngineX11FT::QFontEngineX11FT(FcPat +@@ -995,7 +1015,7 @@ QFontEngineX11FT::QFontEngineX11FT(FcPat canUploadGlyphsToServer = qApp->thread() == QThread::currentThread(); subpixelType = Subpixel_None; ++++++ webkit-ia64_s390x.patch ++++++ --- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h @@ -317,6 +317,16 @@ #define WTF_PLATFORM_X86_64 1 #endif +/* PLATFORM(IA64) */ +#if defined(__ia64__) +#define WTF_PLATFORM_IA64 1 +#endif + +/* PLATFORM(S390X) */ +#if defined(__s390x__) +#define WTF_PLATFORM_S390X 1 +#endif + /* PLATFORM(SH4) */ #if defined(__SH4__) #define WTF_PLATFORM_SH4 1 @@ -708,7 +718,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)) +#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(SOLARIS) || PLATFORM(HPUX)) || PLATFORM(IA64) || PLATFORM(S390X) #define WTF_USE_JSVALUE64 1 #elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64) #define WTF_USE_JSVALUE64 1 --- src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h +++ src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h @@ -347,6 +347,16 @@ #define WTF_PLATFORM_X86_64 1 #endif +/* PLATFORM(IA64) */ +#if defined(__ia64__) +#define WTF_PLATFORM_IA64 1 +#endif + +/* PLATFORM(S390X) */ +#if defined(__s390x__) +#define WTF_PLATFORM_S390X 1 +#endif + /* PLATFORM(SH4) */ #if defined(__SH4__) #define WTF_PLATFORM_SH4 1 @@ -709,7 +719,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(WIN_OS)) +#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(WIN_OS)) || PLATFORM(IA64) || PLATFORM(S390X) #define WTF_USE_JSVALUE64 1 #elif PLATFORM(ARM) || PLATFORM(PPC64) #define WTF_USE_JSVALUE32 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org