Hello community, here is the log from the commit of package qt3 for openSUSE:Factory checked in at Fri Sep 23 10:33:25 CEST 2011.
-------- --- qt3/qt3-devel-doc.changes 2010-11-20 02:26:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/qt3/qt3-devel-doc.changes 2011-09-22 17:33:03.000000000 +0200 @@ -1,0 +2,31 @@ +Fri Apr 22 18:31:12 UTC 2011 - [email protected] + +- changed compression to .tar.bz2 + +------------------------------------------------------------------- +Thu Apr 21 11:40:38 CEST 2011 - [email protected] + +- Don't try to patch in the version twice in qt-3.3.8c.diff. +- Resync those patches that don't apply without offset. +- Mark scriptlets in profile.d as being configuration files. +- Remove the calls to run_ldconfig. + +------------------------------------------------------------------- +Mon Apr 18 18:46:34 UTC 2011 - [email protected] + +- a fix to the 3.3.8c patch + +------------------------------------------------------------------- +Thu Mar 31 18:15:29 UTC 2011 - [email protected] + +- another gcc 4.6 fix + +------------------------------------------------------------------- +Mon Jan 31 21:23:51 UTC 2011 - [email protected] + +- Update to version 3.3.8c, by the Trinity Project +- pre_checkin.sh was not run as this caused too many unneccesary + changes to occur. +- The translations tarball was left at version 3.3.8b. + +------------------------------------------------------------------- qt3-extensions.changes: same change qt3.changes: same change calling whatdependson for head-i586 New: ---- qt-3.3.8c.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.i2uOoZ/_old 2011-09-23 10:33:16.000000000 +0200 +++ /var/tmp/diff_new_pack.i2uOoZ/_new 2011-09-23 10:33:16.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package qt3-devel-doc (Version 3.3.8b) +# spec file for package qt3-devel-doc # -# Copyright (c) 2010 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 @@ -30,8 +30,8 @@ AutoReqProv: on Summary: Documentation for the Qt 3 Development Kit Group: Documentation/HTML -Version: 3.3.8b -Release: 108 +Version: 3.3.8c +Release: 1 PreReq: /bin/grep BuildArch: noarch Provides: qt3-devel-tutorial @@ -41,6 +41,8 @@ %define rversion %version # COMMON-BEGIN # COMMON-BEGIN +%define x11_free -x11-free- +%define rversion 3.3.8b Source0: qt%{x11_free}%rversion.tar.bz2 Source1: build_script.sh Source2: qtconfig3.desktop @@ -53,10 +55,13 @@ Source5: linguist.png Source10: qt3.sh Source11: qt3.csh -Source12: qt3-%version-translations.tar.bz2 +# Translations did not change at 3.3.8c +Source12: qt3-3.3.8b-translations.tar.bz2 Source100: qtkdeintegration_x11.cpp Source101: qtkdeintegration_x11_p.h Source102: baselibs.conf +Source200: attributes +Source201: update_spec.pl Patch1: aliasing.diff Patch2: head.diff Patch4: qt3-never-strip.diff @@ -88,7 +93,7 @@ Patch41: 0060-qpopup_ignore_mousepos.patch Patch42: add_qexport_visibility.patch Patch43: 0056-khotkeys_input_84434.patch -Patch50: enable-designer-plugins.diff +Source250: enable-designer-plugins.diff Patch53: fix-xinerama-dialog-placement.diff Patch54: kmenu-search-fix.diff Patch55: qt3-fix-cast.diff @@ -112,6 +117,10 @@ Patch137: popen-leak-fix.diff Patch138: qt3-libpng14.diff Patch139: gcc46.diff + +# TQt integration +Patch200: qt-3.3.8c.diff + BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -194,6 +203,7 @@ %patch138 -p1 %endif %patch139 +%patch200 # copy qt kde integration files cp %SOURCE100 %SOURCE101 src/kernel/ cp %SOURCE101 include/private/ ++++++ qt3-extensions.spec ++++++ --- /var/tmp/diff_new_pack.i2uOoZ/_old 2011-09-23 10:33:16.000000000 +0200 +++ /var/tmp/diff_new_pack.i2uOoZ/_new 2011-09-23 10:33:16.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package qt3-extensions (Version 3.3.8b) +# spec file for package qt3-extensions # -# Copyright (c) 2010 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 @@ -24,8 +24,8 @@ BuildRequires: fdupes %endif License: GPL, QPL -Version: 3.3.8b -Release: 108 +Version: 3.3.8c +Release: 1 AutoReqProv: on Requires: qt3 = %version Group: Development/Tools/Other @@ -34,6 +34,8 @@ %define rversion %version # COMMON-BEGIN # COMMON-BEGIN +%define x11_free -x11-free- +%define rversion 3.3.8b Source0: qt%{x11_free}%rversion.tar.bz2 Source1: build_script.sh Source2: qtconfig3.desktop @@ -46,10 +48,13 @@ Source5: linguist.png Source10: qt3.sh Source11: qt3.csh -Source12: qt3-%version-translations.tar.bz2 +# Translations did not change at 3.3.8c +Source12: qt3-3.3.8b-translations.tar.bz2 Source100: qtkdeintegration_x11.cpp Source101: qtkdeintegration_x11_p.h Source102: baselibs.conf +Source200: attributes +Source201: update_spec.pl Patch1: aliasing.diff Patch2: head.diff Patch4: qt3-never-strip.diff @@ -81,7 +86,7 @@ Patch41: 0060-qpopup_ignore_mousepos.patch Patch42: add_qexport_visibility.patch Patch43: 0056-khotkeys_input_84434.patch -Patch50: enable-designer-plugins.diff +Source250: enable-designer-plugins.diff Patch53: fix-xinerama-dialog-placement.diff Patch54: kmenu-search-fix.diff Patch55: qt3-fix-cast.diff @@ -105,6 +110,10 @@ Patch137: popen-leak-fix.diff Patch138: qt3-libpng14.diff Patch139: gcc46.diff + +# TQt integration +Patch200: qt-3.3.8c.diff + BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -183,6 +192,7 @@ %patch138 -p1 %endif %patch139 +%patch200 # copy qt kde integration files cp %SOURCE100 %SOURCE101 src/kernel/ cp %SOURCE101 include/private/ @@ -201,7 +211,6 @@ Netscape plug-in modules. %package -n qt3-devel-examples -License: GPL, QPL Summary: Programming Examples for Qt 3 AutoReqProv: on Group: Development/Sources @@ -215,7 +224,6 @@ Have a look in /usr/share/doc/packages/qt3/examples/. %package -n qt3-mysql -License: GPL, QPL Summary: MySQL Plug-In for Qt Provides: qt3_database_plugin Group: Productivity/Databases/Clients @@ -225,7 +233,6 @@ interface. %package -n qt3-unixODBC -License: GPL, QPL Summary: A UnixODBC Plug-In for Qt Provides: qt3_database_plugin Group: Productivity/Databases/Clients @@ -235,7 +242,6 @@ database interface. %package -n qt3-postgresql -License: GPL, QPL Summary: A PostgreSQL Plug-In for Qt Provides: qt3_database_plugin Group: Productivity/Databases/Clients @@ -245,7 +251,6 @@ database interface. %package -n qt3-sqlite -License: GPL, QPL Summary: SQLite Database Plug-In for Qt Provides: qt3_database_plugin Group: Development/Tools/Other @@ -255,7 +260,6 @@ running daemon is required.) %package -n qt3-devel-tools -License: GPL, QPL Summary: User Interface Builder and other tools (designer, assistant, linguist) AutoReqProv: on Requires: qt3-devel = %version @@ -269,7 +273,6 @@ browser) and the Qt Linguist (for translations). %package -n qt3-man -License: GPL, QPL Summary: Qt 3 Man Pages AutoReqProv: on Requires: qt3-devel = %version ++++++ qt3.spec ++++++ --- /var/tmp/diff_new_pack.i2uOoZ/_old 2011-09-23 10:33:16.000000000 +0200 +++ /var/tmp/diff_new_pack.i2uOoZ/_new 2011-09-23 10:33:16.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package qt3 (Version 3.3.8b) +# spec file for package qt3 # -# Copyright (c) 2010 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 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: qt3 @@ -29,21 +28,20 @@ BuildRequires: libpng-devel %endif Group: System/Libraries -AutoReqProv: on # bug437293 %ifarch ppc64 Obsoletes: qt3-64bit %endif # Summary: A library for developing applications with graphical user interfaces -Version: 3.3.8b -Release: 108 +Version: 3.3.8c +Release: 110 Provides: qt_library_%version Recommends: kdelibs3-default-style PreReq: /bin/grep -%define x11_free -x11-free- -%define rversion %version # COMMON-BEGIN +%define x11_free -x11-free- +%define rversion 3.3.8b Source0: qt%{x11_free}%rversion.tar.bz2 Source1: build_script.sh Source2: qtconfig3.desktop @@ -56,10 +54,13 @@ Source5: linguist.png Source10: qt3.sh Source11: qt3.csh -Source12: qt3-%version-translations.tar.bz2 +# Translations did not change at 3.3.8c +Source12: qt3-3.3.8b-translations.tar.bz2 Source100: qtkdeintegration_x11.cpp Source101: qtkdeintegration_x11_p.h Source102: baselibs.conf +Source200: attributes +Source201: update_spec.pl Patch1: aliasing.diff Patch2: head.diff Patch4: qt3-never-strip.diff @@ -91,7 +92,7 @@ Patch41: 0060-qpopup_ignore_mousepos.patch Patch42: add_qexport_visibility.patch Patch43: 0056-khotkeys_input_84434.patch -Patch50: enable-designer-plugins.diff +Source250: enable-designer-plugins.diff Patch53: fix-xinerama-dialog-placement.diff Patch54: kmenu-search-fix.diff Patch55: qt3-fix-cast.diff @@ -115,6 +116,10 @@ Patch137: popen-leak-fix.diff Patch138: qt3-libpng14.diff Patch139: gcc46.diff + +# TQt integration +Patch200: qt-3.3.8c.diff + BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -199,6 +204,7 @@ %patch138 -p1 %endif %patch139 +%patch200 # copy qt kde integration files cp %SOURCE100 %SOURCE101 src/kernel/ cp %SOURCE101 include/private/ @@ -241,12 +247,6 @@ You need a license for using Qt with a non-GPL application. A license can be acquired at [email protected]. - - -Authors: --------- - Troll Tech AS, Norway - %build export VERSION=%suse_version source %SOURCE1 %{version} @@ -321,8 +321,7 @@ [ "lib" != "%{_lib}" ] && \ ln -sf ../lib/qt3 ${RPM_BUILD_ROOT}/%{_libdir}/qt3 mkdir -p ${RPM_BUILD_ROOT}/etc/profile.d -cp -a %SOURCE10 ${RPM_BUILD_ROOT}/etc/profile.d -cp -a %SOURCE11 ${RPM_BUILD_ROOT}/etc/profile.d +install -m 644 %SOURCE10 %SOURCE11 ${RPM_BUILD_ROOT}/etc/profile.d # # default qt settings # @@ -345,23 +344,20 @@ rm usr/lib/qt3 fi -%clean -rm -rf ${RPM_BUILD_ROOT} - %post -%run_ldconfig +/sbin/ldconfig if ! grep -q '^\[3.3\]' etc/X11/qtrc ; then echo "" >> etc/X11/qtrc echo "[3.3]" >> etc/X11/qtrc echo "libraryPath=/opt/kde3/lib64/kde3/plugins/:/opt/kde3/lib/kde3/plugins/" >> etc/X11/qtrc fi -%postun -%run_ldconfig +%postun -p /sbin/ldconfig %files %defattr(-,root,root,755) -%doc changes-%{version} README* LICENSE* MANIFEST FAQ +# FIXME provide new changelog if kb9vqf will give one +%doc changes-3.3.8b README* LICENSE* MANIFEST FAQ %dir /usr/lib/qt3/translations %dir /usr/lib/qt3 %dir /usr/lib/qt3/bin @@ -400,7 +396,8 @@ %files devel %defattr(-,root,root,755) -%doc changes-%{version} +# FIXME provide new changelog if kb9vqf will give one +%doc changes-3.3.8b /usr/lib/qt3/bin/moc /usr/lib/qt3/bin/qmake /usr/lib/qt3/bin/uic @@ -413,6 +410,6 @@ /usr/lib/qt3/mkspecs /%_libdir/pkgconfig/qt-mt.pc /usr/lib/qt3/%_lib/libqassistantclient.* -/etc/profile.d/qt3.* +%config /etc/profile.d/qt3.* %changelog ++++++ gcc46.diff ++++++ --- /var/tmp/diff_new_pack.i2uOoZ/_old 2011-09-23 10:33:16.000000000 +0200 +++ /var/tmp/diff_new_pack.i2uOoZ/_new 2011-09-23 10:33:16.000000000 +0200 @@ -1,5 +1,7 @@ ---- src/tools/qvaluelist.h -+++ src/tools/qvaluelist.h +Index: src/tools/qvaluelist.h +=================================================================== +--- src/tools/qvaluelist.h.orig 2011-03-31 20:14:47.200973928 +0200 ++++ src/tools/qvaluelist.h 2011-03-31 20:14:55.352615654 +0200 @@ -50,6 +50,7 @@ #ifndef QT_NO_STL #include <iterator> @@ -8,3 +10,47 @@ #endif //#define QT_CHECK_VALUELIST_RANGE +Index: src/tools/qvaluevector.h +=================================================================== +--- src/tools/qvaluevector.h.orig 2008-01-15 20:09:13.000000000 +0100 ++++ src/tools/qvaluevector.h 2011-03-31 20:15:15.904712567 +0200 +@@ -244,7 +244,7 @@ public: + typedef const value_type& const_reference; + typedef size_t size_type; + #ifndef QT_NO_STL +- typedef ptrdiff_t difference_type; ++ typedef std::ptrdiff_t difference_type; + #else + typedef int difference_type; + #endif +Index: src/tools/qmap.h +=================================================================== +--- src/tools/qmap.h.orig 2008-01-15 20:09:13.000000000 +0100 ++++ src/tools/qmap.h 2011-03-31 20:24:35.802101605 +0200 +@@ -107,7 +107,7 @@ class QMapIterator + #endif + typedef T value_type; + #ifndef QT_NO_STL +- typedef ptrdiff_t difference_type; ++ typedef std::ptrdiff_t difference_type; + #else + typedef int difference_type; + #endif +@@ -223,7 +223,7 @@ class QMapConstIterator + #endif + typedef T value_type; + #ifndef QT_NO_STL +- typedef ptrdiff_t difference_type; ++ typedef std::ptrdiff_t difference_type; + #else + typedef int difference_type; + #endif +@@ -604,7 +604,7 @@ public: + typedef value_type& reference; + typedef const value_type& const_reference; + #ifndef QT_NO_STL +- typedef ptrdiff_t difference_type; ++ typedef std::ptrdiff_t difference_type; + #else + typedef int difference_type; + #endif ++++++ qt-3.3.8c.diff ++++++ --- src/kernel/qobject.cpp +++ src/kernel/qobject.cpp @@ -360,6 +360,30 @@ } } +/*! \internal + TQt compatibility function +*/ +QObjectList QObject::childrenListObject() { + if (children()) return *(children()); + else return QObjectList(); +} + +/*! \internal + TQt compatibility function +*/ +const QObjectList QObject::childrenListObject() const { + if (children()) return *(children()); + else return QObjectList(); +} + +/*! \internal + TQt compatibility function +*/ +const QObjectList QObject::objectTreesListObject() { + if (objectTrees()) return *(objectTrees()); + else return QObjectList(); +} + /***************************************************************************** QObject member functions --- src/kernel/qobject.h +++ src/kernel/qobject.h @@ -101,8 +101,11 @@ QObject *child( const char *objName, const char *inheritsClass = 0, bool recursiveSearch = TRUE ); //### const in 4.0 const QObjectList *children() const { return childObjects; } + QObjectList childrenListObject(); + const QObjectList childrenListObject() const; static const QObjectList *objectTrees(); + static const QObjectList objectTreesListObject(); QObjectList *queryList( const char *inheritsClass = 0, const char *objName = 0, --- src/tools/qglobal.h +++ src/tools/qglobal.h @@ -41,7 +41,7 @@ #ifndef QGLOBAL_H #define QGLOBAL_H -#define QT_VERSION_STR "3.3.8b" +#define QT_VERSION_STR "3.3.8c" /* QT_VERSION is (major << 16) + (minor << 8) + patch. */ ++++++ qt3-devel-doc.spec.in ++++++ --- /var/tmp/diff_new_pack.i2uOoZ/_old 2011-09-23 10:33:17.000000000 +0200 +++ /var/tmp/diff_new_pack.i2uOoZ/_new 2011-09-23 10:33:17.000000000 +0200 @@ -22,7 +22,7 @@ Autoreqprov: on Summary: Qt 3 Development Kit Group: Documentation/HTML -Version: 3.3.8b +Version: 3.3.8c Release: 1 PreReq: /bin/grep BuildArch: noarch ++++++ qt3-extensions.spec.in ++++++ --- /var/tmp/diff_new_pack.i2uOoZ/_old 2011-09-23 10:33:17.000000000 +0200 +++ /var/tmp/diff_new_pack.i2uOoZ/_new 2011-09-23 10:33:17.000000000 +0200 @@ -16,7 +16,7 @@ BuildRequires: fdupes %endif License: GPL, QPL -Version: 3.3.8b +Version: 3.3.8c Release: 1 Autoreqprov: on Requires: qt3 = %version ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
