diff options
Diffstat (limited to 'opensuse/core/qt3')
| -rw-r--r-- | opensuse/core/qt3/.project | 12 | ||||
| -rw-r--r-- | opensuse/core/qt3/_service | 3 | ||||
| -rw-r--r-- | opensuse/core/qt3/add_qexport_visibility.patch | 63 | ||||
| -rw-r--r-- | opensuse/core/qt3/enable-designer-plugins.diff | 11 | ||||
| -rw-r--r-- | opensuse/core/qt3/popen-leak-fix.diff | 10 | ||||
| -rwxr-xr-x[-rw-r--r--] | opensuse/core/qt3/pre_checkin.sh | 0 | ||||
| -rw-r--r-- | opensuse/core/qt3/qcstring-format-warnings.diff | 15 | ||||
| -rw-r--r-- | opensuse/core/qt3/qt-transparency.patch | 22 | ||||
| -rw-r--r-- | opensuse/core/qt3/qt3-devel-doc.changes | 10 | ||||
| -rw-r--r-- | opensuse/core/qt3/qt3-devel-doc.spec | 18 | ||||
| -rw-r--r-- | opensuse/core/qt3/qt3-devel-doc.spec.in | 35 | ||||
| -rw-r--r-- | opensuse/core/qt3/qt3-extensions.changes | 10 | ||||
| -rw-r--r-- | opensuse/core/qt3/qt3-extensions.spec | 18 | ||||
| -rw-r--r-- | opensuse/core/qt3/qt3-extensions.spec.in | 127 | ||||
| -rw-r--r-- | opensuse/core/qt3/qt3-warnings.diff | 13 | ||||
| -rw-r--r-- | opensuse/core/qt3/qt3.changes | 10 | ||||
| -rw-r--r-- | opensuse/core/qt3/qt3.spec | 20 | ||||
| -rw-r--r-- | opensuse/core/qt3/revert-qt-3.3.8-khmer-fix.diff | 36 |
18 files changed, 115 insertions, 318 deletions
diff --git a/opensuse/core/qt3/.project b/opensuse/core/qt3/.project deleted file mode 100644 index c1be4d5ba..000000000 --- a/opensuse/core/qt3/.project +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>qt3</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - </buildSpec> - <natures> - <nature>org.eclipse.linuxtools.rpm.core.rpmnature</nature> - </natures> -</projectDescription> diff --git a/opensuse/core/qt3/_service b/opensuse/core/qt3/_service deleted file mode 100644 index 538a11b38..000000000 --- a/opensuse/core/qt3/_service +++ /dev/null @@ -1,3 +0,0 @@ -<services> - <service name="download_files"><param name="recompress">yes</param></service> -</services>
\ No newline at end of file diff --git a/opensuse/core/qt3/add_qexport_visibility.patch b/opensuse/core/qt3/add_qexport_visibility.patch deleted file mode 100644 index 26399a498..000000000 --- a/opensuse/core/qt3/add_qexport_visibility.patch +++ /dev/null @@ -1,63 +0,0 @@ -Index: src/kernel/qgplugin.h -================================================================================ ---- src/kernel/qgplugin.h -+++ src/kernel/qgplugin.h -@@ -93,35 +93,19 @@ - return i->iface(); \ - } - --# ifdef Q_WS_WIN --# ifdef Q_CC_BOR --# define Q_EXPORT_PLUGIN(PLUGIN) \ -- Q_PLUGIN_VERIFICATION_DATA \ -- Q_EXTERN_C __declspec(dllexport) \ -- const char * __stdcall qt_ucm_query_verification_data() \ -- { return qt_ucm_verification_data; } \ -- Q_EXTERN_C __declspec(dllexport) QUnknownInterface* \ -- __stdcall ucm_instantiate() \ -- Q_PLUGIN_INSTANTIATE( PLUGIN ) --# else --# define Q_EXPORT_PLUGIN(PLUGIN) \ -- Q_PLUGIN_VERIFICATION_DATA \ -- Q_EXTERN_C __declspec(dllexport) \ -- const char *qt_ucm_query_verification_data() \ -- { return qt_ucm_verification_data; } \ -- Q_EXTERN_C __declspec(dllexport) QUnknownInterface* ucm_instantiate() \ -- Q_PLUGIN_INSTANTIATE( PLUGIN ) --# endif --# else --# define Q_EXPORT_PLUGIN(PLUGIN) \ -+#if defined(Q_WS_WIN) && defined(Q_CC_BOR) -+# define Q_STDCALL __stdcall -+#else -+# define Q_STDCALL -+#endif -+ -+#define Q_EXPORT_PLUGIN(PLUGIN) \ - Q_PLUGIN_VERIFICATION_DATA \ -- Q_EXTERN_C \ -- const char *qt_ucm_query_verification_data() \ -+ Q_EXTERN_C Q_EXPORT \ -+ const char * Q_STDCALL qt_ucm_query_verification_data() \ - { return qt_ucm_verification_data; } \ -- Q_EXTERN_C QUnknownInterface* ucm_instantiate() \ -+ Q_EXTERN_C Q_EXPORT QUnknownInterface* Q_STDCALL ucm_instantiate() \ - Q_PLUGIN_INSTANTIATE( PLUGIN ) --# endif -- - #endif - - struct QUnknownInterface; ---- src/tools/qglobal.h -+++ src/tools/qglobal.h -@@ -885,6 +885,10 @@ - # define Q_TEMPLATE_EXTERN - # undef Q_DISABLE_COPY /* avoid unresolved externals */ - # endif -+#elif defined(Q_CC_GNU) && __GNUC__ - 0 >= 4 -+# define Q_EXPORT __attribute__((visibility("default"))) -+# undef QT_MAKEDLL /* ignore these for other platforms */ -+# undef QT_DLL - #else - # undef QT_MAKEDLL /* ignore these for other platforms */ - # undef QT_DLL diff --git a/opensuse/core/qt3/enable-designer-plugins.diff b/opensuse/core/qt3/enable-designer-plugins.diff deleted file mode 100644 index 41147984d..000000000 --- a/opensuse/core/qt3/enable-designer-plugins.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- tools/designer/plugins/plugins.pro -+++ tools/designer/plugins/plugins.pro -@@ -4,6 +4,7 @@ - dlg \ - glade \ - rc \ -- kdevdlg -+ kdevdlg \ -+ glade - shared:SUBDIRS *= $$PLUGIN_DIRS - dll:SUBDIRS *= $$PLUGIN_DIRS diff --git a/opensuse/core/qt3/popen-leak-fix.diff b/opensuse/core/qt3/popen-leak-fix.diff deleted file mode 100644 index a00ab02a5..000000000 --- a/opensuse/core/qt3/popen-leak-fix.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- tools/linguist/shared/proparser.cpp -+++ tools/linguist/shared/proparser.cpp -@@ -207,6 +207,7 @@ QMap<QString, QString> proFileTagMap( const QString& text ) - buff[read_in] = '\0'; - after += buff; - } -+ pclose( proc ); - (*it).replace( i, callToSystem.matchedLength(), after ); - i += after.length(); - } diff --git a/opensuse/core/qt3/pre_checkin.sh b/opensuse/core/qt3/pre_checkin.sh index fd6f089b5..fd6f089b5 100644..100755 --- a/opensuse/core/qt3/pre_checkin.sh +++ b/opensuse/core/qt3/pre_checkin.sh diff --git a/opensuse/core/qt3/qcstring-format-warnings.diff b/opensuse/core/qt3/qcstring-format-warnings.diff deleted file mode 100644 index cac735dbb..000000000 --- a/opensuse/core/qt3/qcstring-format-warnings.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- src/tools/qcstring.h (revision 658213) -+++ src/tools/qcstring.h (working copy) -@@ -164,7 +164,11 @@ public: - - QCString copy() const; - -- QCString &sprintf( const char *format, ... ); -+ QCString &sprintf( const char *format, ... ) -+#if defined(Q_CC_GNU) && !defined(__INSURE__) -+ __attribute__ ((format (printf, 2, 3))) -+#endif -+ ; - - int find( char c, int index=0, bool cs=TRUE ) const; - int find( const char *str, int index=0, bool cs=TRUE ) const; diff --git a/opensuse/core/qt3/qt-transparency.patch b/opensuse/core/qt3/qt-transparency.patch index b7bfa7b8a..10d6ed7fc 100644 --- a/opensuse/core/qt3/qt-transparency.patch +++ b/opensuse/core/qt3/qt-transparency.patch @@ -1,6 +1,8 @@ ---- src/kernel/qapplication.cpp +Index: src/kernel/qapplication.cpp +=================================================================== +--- src/kernel/qapplication.cpp.orig +++ src/kernel/qapplication.cpp -@@ -320,6 +320,7 @@ +@@ -320,6 +320,7 @@ void qt_init( int *, char **, QApplicati void qt_cleanup(); #if defined(Q_WS_X11) void qt_init( Display* dpy, Qt::HANDLE, Qt::HANDLE ); @@ -8,7 +10,7 @@ #endif Q_EXPORT bool qt_tryModalHelper( QWidget *widget, QWidget **rettop ); -@@ -908,7 +909,7 @@ +@@ -908,7 +909,7 @@ QApplication::QApplication(Display *dpy, qt_init( &argc, argv, GuiClient ); } else { @@ -17,9 +19,11 @@ } process_cmdline( &argc, argv ); ---- src/kernel/qapplication_x11.cpp +Index: src/kernel/qapplication_x11.cpp +=================================================================== +--- src/kernel/qapplication_x11.cpp.orig +++ src/kernel/qapplication_x11.cpp -@@ -201,6 +201,7 @@ +@@ -201,6 +201,7 @@ static bool mwIconic = FALSE; // main wi static Display *appDpy = 0; // X11 application display static char *appDpyName = 0; // X11 display name static bool appForeignDpy = FALSE; // we didn't create display @@ -27,16 +31,16 @@ static bool appSync = FALSE; // X11 synchronization #if defined(QT_DEBUG) static bool appNoGrab = FALSE; // X11 grabbing enabled -@@ -1632,7 +1633,7 @@ - setlocale( LC_ALL, "" ); // use correct char set mapping - setlocale( LC_NUMERIC, "C" ); // make sprintf()/scanf() work +@@ -1651,7 +1652,7 @@ void qt_init_internal( int *argcptr, cha + } + #endif - if ( display ) { + if ( display && ! qt_no_foreign_hack ) { // Qt part of other application appForeignDpy = TRUE; -@@ -2432,6 +2433,10 @@ +@@ -2464,6 +2465,10 @@ void qt_init( Display *display, Qt::HAND qt_init_internal( 0, 0, display, visual, colormap ); } diff --git a/opensuse/core/qt3/qt3-devel-doc.changes b/opensuse/core/qt3/qt3-devel-doc.changes index bffb1fdc2..ff9ca26ed 100644 --- a/opensuse/core/qt3/qt3-devel-doc.changes +++ b/opensuse/core/qt3/qt3-devel-doc.changes @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Thu Feb 2 01:16:04 UTC 2012 - robxu9@gmail.com + +- Remove obsolete patches, update .in files, feel accomplished + +------------------------------------------------------------------- +Wed Feb 1 23:15:48 UTC 2012 - robxu9@gmail.com + +- Update to 3.4.0, which includes a breaking ABI change + +------------------------------------------------------------------- Sat Nov 19 23:23:57 UTC 2011 - andrea@nucleus.it - Removed all the patches already applied in the 3.3.8d tree. diff --git a/opensuse/core/qt3/qt3-devel-doc.spec b/opensuse/core/qt3/qt3-devel-doc.spec index aa2dbcfa9..c43f17414 100644 --- a/opensuse/core/qt3/qt3-devel-doc.spec +++ b/opensuse/core/qt3/qt3-devel-doc.spec @@ -1,7 +1,7 @@ # # spec file for package qt3-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 @@ -30,7 +30,7 @@ License: GPL, QPL AutoReqProv: on Summary: Documentation for the Qt 3 Development Kit Group: Documentation/HTML -Version: 3.3.8d +Version: 3.4.0 Release: 1 PreReq: /bin/grep BuildArch: noarch @@ -39,7 +39,7 @@ Obsoletes: qt3-devel-tutorial Requires: qt3-devel # COMMON-BEGIN # COMMON-BEGIN -Source0: http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/qt3-3.3.8.d.tar.gz +Source0: qt3-%{version}.tar.bz2 Source1: build_script.sh Source2: qtconfig3.desktop Source3: qtrc @@ -51,7 +51,7 @@ Source9: linguist.desktop Source5: linguist.png Source10: qt3.sh Source11: qt3.csh -# Translations did not change at 3.3.8d +# Translations did not change Source12: qt3-3.3.8b-translations.tar.bz2 Source102: baselibs.conf Source200: attributes @@ -70,17 +70,13 @@ Patch31: limit-image-size.diff Patch35: qt-transparency.patch Patch37: 0055-qtextedit_zoom.patch Patch39: fix-qtranslator-crash.diff -Patch42: add_qexport_visibility.patch Patch54: kmenu-search-fix.diff Patch113: fix-assistant-path.patch Patch117: qtimer-debug.diff -Patch121: qt3-warnings.diff -Patch125: qcstring-format-warnings.diff Patch127: mng-reading-fix.patch Patch134: fix-xinput-clash.diff Patch135: parseFontName.diff Patch136: qt3-no-date.diff -Patch137: popen-leak-fix.diff Patch139: gcc46.diff Patch140: revert-iodbc-to-uodbc.diff @@ -100,7 +96,7 @@ getting started with Qt in /usr/lib/qt3/doc. %define build_sub_dirs src plugins/src tools/designer/uilib/ tools/designer/uic tools/qtconfig tools/assistant/lib tools/assistant tutorial %prep -%setup -q -n qt3 +%setup -q %patch1 %patch2 %patch4 @@ -117,22 +113,18 @@ fi %patch35 %patch37 %patch39 -%patch42 %patch54 %patch113 %patch117 -%patch121 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/ ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/ ln -sf $PWD/src/kernel/qinputcontext.h include/ ln -sf $PWD/src/kernel/qinputcontextinterface_p.h include/private/ ln -sf $PWD/src/kernel/qximinputcontext_p.h include/private/ -%patch125 %patch127 %patch134 %patch135 %patch136 -%patch137 %patch139 %patch140 cd translations diff --git a/opensuse/core/qt3/qt3-devel-doc.spec.in b/opensuse/core/qt3/qt3-devel-doc.spec.in index 090675643..91a409995 100644 --- a/opensuse/core/qt3/qt3-devel-doc.spec.in +++ b/opensuse/core/qt3/qt3-devel-doc.spec.in @@ -1,15 +1,23 @@ # -# spec file for package qt3 (Version 3.3.8d) +# spec file for package qt3-devel-doc # -# 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. +# 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 +# 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 + Name: qt3-devel-doc BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++ pkgconfig update-desktop-files qt3-devel %if %suse_version < 1130 @@ -20,9 +28,9 @@ BuildRequires: libpng14-devel URL: http://www.trolltech.com/ License: GPL, QPL Autoreqprov: on -Summary: Qt 3 Development Kit +Summary: Documentation for the Qt 3 Development Kit Group: Documentation/HTML -Version: 3.3.8d +Version: 3.4.0 Release: 1 PreReq: /bin/grep BuildArch: noarch @@ -33,10 +41,15 @@ Requires: qt3-devel # COMMON-END %description -You need this package if you want to compile programs with Qt 3. It -contains the "Qt Crossplatform Development Kit 2". You will find -include files, documentation, precompiled examples, and a tutorial for -getting started with Qt in /usr/lib/qt3. +This package contains the documentation for the Qt 3 Development Kit. + +You will find documentation, precompiled examples, and a tutorial for +getting started with Qt in /usr/lib/qt3/doc. + +This package contains the documentation for the Qt 3 Development Kit. + +You will find documentation, precompiled examples, and a tutorial for +getting started with Qt in /usr/lib/qt3/doc. %build export VERSION=%suse_version @@ -88,4 +101,4 @@ rm -rf ${RPM_BUILD_ROOT} /usr/share/applications/assistant3.desktop /usr/share/pixmaps/assistant3.png -%changelog -n qt3 +%changelog diff --git a/opensuse/core/qt3/qt3-extensions.changes b/opensuse/core/qt3/qt3-extensions.changes index bffb1fdc2..ff9ca26ed 100644 --- a/opensuse/core/qt3/qt3-extensions.changes +++ b/opensuse/core/qt3/qt3-extensions.changes @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Thu Feb 2 01:16:04 UTC 2012 - robxu9@gmail.com + +- Remove obsolete patches, update .in files, feel accomplished + +------------------------------------------------------------------- +Wed Feb 1 23:15:48 UTC 2012 - robxu9@gmail.com + +- Update to 3.4.0, which includes a breaking ABI change + +------------------------------------------------------------------- Sat Nov 19 23:23:57 UTC 2011 - andrea@nucleus.it - Removed all the patches already applied in the 3.3.8d tree. diff --git a/opensuse/core/qt3/qt3-extensions.spec b/opensuse/core/qt3/qt3-extensions.spec index d44f8c188..15366559e 100644 --- a/opensuse/core/qt3/qt3-extensions.spec +++ b/opensuse/core/qt3/qt3-extensions.spec @@ -1,7 +1,7 @@ # # spec file for package qt3-extensions # -# 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 @@ -24,7 +24,7 @@ BuildRequires: cups-devel krb5-devel mysql-devel postgresql-devel qt3-devel sql BuildRequires: fdupes %endif License: GPL, QPL -Version: 3.3.8d +Version: 3.4.0 Release: 1 AutoReqProv: on Requires: qt3 = %version @@ -32,7 +32,7 @@ Group: Development/Tools/Other Summary: Qt3 Extensions # COMMON-BEGIN # COMMON-BEGIN -Source0: http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/qt3-3.3.8.d.tar.gz +Source0: qt3-%{version}.tar.bz2 Source1: build_script.sh Source2: qtconfig3.desktop Source3: qtrc @@ -44,7 +44,7 @@ Source9: linguist.desktop Source5: linguist.png Source10: qt3.sh Source11: qt3.csh -# Translations did not change at 3.3.8d +# Translations did not change Source12: qt3-3.3.8b-translations.tar.bz2 Source102: baselibs.conf Source200: attributes @@ -63,17 +63,13 @@ Patch31: limit-image-size.diff Patch35: qt-transparency.patch Patch37: 0055-qtextedit_zoom.patch Patch39: fix-qtranslator-crash.diff -Patch42: add_qexport_visibility.patch Patch54: kmenu-search-fix.diff Patch113: fix-assistant-path.patch Patch117: qtimer-debug.diff -Patch121: qt3-warnings.diff -Patch125: qcstring-format-warnings.diff Patch127: mng-reading-fix.patch Patch134: fix-xinput-clash.diff Patch135: parseFontName.diff Patch136: qt3-no-date.diff -Patch137: popen-leak-fix.diff Patch139: gcc46.diff Patch140: revert-iodbc-to-uodbc.diff @@ -89,7 +85,7 @@ Netscape plug-in modules. %define build_sub_dirs src plugins/src tools/designer/uilib/ tools/designer/uic tools/qtconfig tools/assistant/lib tools/assistant tutorial %prep -%setup -q -n qt3 +%setup -q %patch1 %patch2 %patch4 @@ -106,22 +102,18 @@ fi %patch35 %patch37 %patch39 -%patch42 %patch54 %patch113 %patch117 -%patch121 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/ ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/ ln -sf $PWD/src/kernel/qinputcontext.h include/ ln -sf $PWD/src/kernel/qinputcontextinterface_p.h include/private/ ln -sf $PWD/src/kernel/qximinputcontext_p.h include/private/ -%patch125 %patch127 %patch134 %patch135 %patch136 -%patch137 %patch139 %patch140 cd translations diff --git a/opensuse/core/qt3/qt3-extensions.spec.in b/opensuse/core/qt3/qt3-extensions.spec.in index 736f1ae2b..ef53bf234 100644 --- a/opensuse/core/qt3/qt3-extensions.spec.in +++ b/opensuse/core/qt3/qt3-extensions.spec.in @@ -1,22 +1,30 @@ # -# spec file for package qt3-extensions (Version 3.3.8d) +# spec file for package qt3-extensions # -# Copyright (c) 2005 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. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# 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 + Name: qt3-extensions BuildRequires: cups-devel krb5-devel mysql-devel postgresql-devel qt3-devel sqlite2-devel unixODBC-devel update-desktop-files %if %suse_version > 1020 BuildRequires: fdupes %endif License: GPL, QPL -Version: 3.3.8d +Version: 3.4.0 Release: 1 Autoreqprov: on Requires: qt3 = %version @@ -26,17 +34,8 @@ Summary: Qt3 Extensions # COMMON-END %description -Qt is a program library for developing applications with graphical user -interfaces. It allows you to rapidly develop professional programs. The -Qt library is available not only for Linux but for a great number of -Unices and even for Windows. Thus it is possible to write programs that -may be easily ported to those platforms. - -You need a license for using Qt with a non-GPL application, which can -be acquired from sales@trolltech.com. - -See /usr/share/doc/packages/qt3 for details about the new features of -the current Qt library! +This package contains extension libraries for Qt 3, such as the +Netscape plug-in modules. %package -n qt3-devel-examples Summary: Programming Examples for Qt 3 @@ -46,17 +45,10 @@ Provides: qt3-examples Obsoletes: qt3-examples %description -n qt3-devel-examples -Qt is a program library for developing applications with graphical user -interfaces. It allows you to rapidly develop professional programs. The -Qt library is available not only for Linux but for a great number of -Unices and even for Windows. Thus it is possible to write programs that -may be easily ported to those platforms. +This package contains small executables with code to demonstrate Qt +programming. -You need a license for using Qt with a non-GPL application, which can -be acquired from sales@trolltech.com. - -See /usr/share/doc/packages/qt3 for details about the new features of -the current Qt library! +Have a look in /usr/share/doc/packages/qt3/examples/. %package -n qt3-mysql Summary: MySQL Plug-In for Qt @@ -64,17 +56,8 @@ Provides: qt3_database_plugin Group: Productivity/Databases/Clients %description -n qt3-mysql -Qt is a program library for developing applications with graphical user -interfaces. It allows you to rapidly develop professional programs. The -Qt library is available not only for Linux but for a great number of -Unices and even for Windows. Thus it is possible to write programs that -may be easily ported to those platforms. - -You need a license for using Qt with a non-GPL application, which can -be acquired from sales@trolltech.com. - -See /usr/share/doc/packages/qt3 for details about the new features of -the current Qt library! +Plug-in for using the MySQL database with the generic Qt database +interface. %package -n qt3-unixODBC Summary: A UnixODBC Plug-In for Qt @@ -82,17 +65,8 @@ Provides: qt3_database_plugin Group: Productivity/Databases/Clients %description -n qt3-unixODBC -Qt is a program library for developing applications with graphical user -interfaces. It allows you to rapidly develop professional programs. The -Qt library is available not only for Linux but for a great number of -Unices and even for Windows. Thus it is possible to write programs that -may be easily ported to those platforms. - -You need a license for using Qt with a non-GPL application, which can -be acquired from sales@trolltech.com. - -See /usr/share/doc/packages/qt3 for details about the new features of -the current Qt library! +A plug-in for using UnixODBC supported databases with the generic Qt +database interface. %package -n qt3-postgresql Summary: A PostgreSQL Plug-In for Qt @@ -100,17 +74,8 @@ Provides: qt3_database_plugin Group: Productivity/Databases/Clients %description -n qt3-postgresql -Qt is a program library for developing applications with graphical user -interfaces. It allows you to rapidly develop professional programs. The -Qt library is available not only for Linux but for a great number of -Unices and even for Windows. Thus it is possible to write programs that -may be easily ported to those platforms. - -You need a license for using Qt with a non-GPL application, which can -be acquired from sales@trolltech.com. - -See /usr/share/doc/packages/qt3 for details about the new features of -the current Qt library! +A Plug-in for using the PostgreSQL database with the generic Qt +database interface. %package -n qt3-sqlite Summary: SQLite Database Plug-In for Qt @@ -118,17 +83,8 @@ Provides: qt3_database_plugin Group: Development/Tools/Other %description -n qt3-sqlite -Qt is a program library for developing applications with graphical user -interfaces. It allows you to rapidly develop professional programs. The -Qt library is available not only for Linux but for a great number of -Unices and even for Windows. Thus it is possible to write programs that -may be easily ported to those platforms. - -You need a license for using Qt with a non-GPL application, which can -be acquired from sales@trolltech.com. - -See /usr/share/doc/packages/qt3 for details about the new features of -the current Qt library! +The Qt database supports SQLite with this plug-in. (No configured and +running daemon is required.) %package -n qt3-devel-tools Summary: User Interface Builder and other tools (designer, assistant, linguist) @@ -139,17 +95,9 @@ Obsoletes: qt3-designer Group: Development/Tools/GUI Builders %description -n qt3-devel-tools -Qt is a program library for developing applications with graphical user -interfaces. It allows you to rapidly develop professional programs. The -Qt library is available not only for Linux but for a great number of -Unices and even for Windows. Thus it is possible to write programs that -may be easily ported to those platforms. - -You need a license for using Qt with a non-GPL application, which can -be acquired from sales@trolltech.com. - -See /usr/share/doc/packages/qt3 for details about the new features of -the current Qt library! +The designer creates .ui files. The uic generates C++ code from these +files. The package also contains the Qt Assistant (Qt documentation +browser) and the Qt Linguist (for translations). %package -n qt3-man Summary: Qt 3 Man Pages @@ -159,18 +107,7 @@ Conflicts: qtman qt-man Group: Documentation/Man %description -n qt3-man -Qt is a program library for developing applications with graphical user -interfaces. It allows you to rapidly develop professional programs. The -Qt library is available not only for Linux but for a great number of -Unices and even for Windows. Thus it is possible to write programs that -may be easily ported to those platforms. - -You need a license for using Qt with a non-GPL application, which can -be acquired from sales@trolltech.com. - -See /usr/share/doc/packages/qt3 for details about the new features of -the current Qt library! - +This package contains all the man pages for all the Qt 3 classes. %build export QTDIR=/usr/lib/qt3/ export WLIB=%_lib @@ -357,4 +294,4 @@ rm -rf ${RPM_BUILD_ROOT} %defattr(-,root,root) %{_mandir}/man*/* -%changelog -n qt3-extensions +%changelog diff --git a/opensuse/core/qt3/qt3-warnings.diff b/opensuse/core/qt3/qt3-warnings.diff deleted file mode 100644 index a67293de3..000000000 --- a/opensuse/core/qt3/qt3-warnings.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: src/kernel/qimage.h -=================================================================== ---- src/kernel/qimage.h (revision 594273) -+++ src/kernel/qimage.h (working copy) -@@ -58,7 +58,7 @@ public: - QCString lang; - - bool operator< (const QImageTextKeyLang& other) const -- { return key < other.key || key==other.key && lang < other.lang; } -+ { return key < other.key || (key==other.key && lang < other.lang); } - bool operator== (const QImageTextKeyLang& other) const - { return key==other.key && lang==other.lang; } - }; diff --git a/opensuse/core/qt3/qt3.changes b/opensuse/core/qt3/qt3.changes index bffb1fdc2..ff9ca26ed 100644 --- a/opensuse/core/qt3/qt3.changes +++ b/opensuse/core/qt3/qt3.changes @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Thu Feb 2 01:16:04 UTC 2012 - robxu9@gmail.com + +- Remove obsolete patches, update .in files, feel accomplished + +------------------------------------------------------------------- +Wed Feb 1 23:15:48 UTC 2012 - robxu9@gmail.com + +- Update to 3.4.0, which includes a breaking ABI change + +------------------------------------------------------------------- Sat Nov 19 23:23:57 UTC 2011 - andrea@nucleus.it - Removed all the patches already applied in the 3.3.8d tree. diff --git a/opensuse/core/qt3/qt3.spec b/opensuse/core/qt3/qt3.spec index ffc2a9e61..0424f372c 100644 --- a/opensuse/core/qt3/qt3.spec +++ b/opensuse/core/qt3/qt3.spec @@ -1,7 +1,7 @@ # # spec file for package qt3 # -# 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,13 +34,13 @@ Obsoletes: qt3-64bit %endif # Summary: A library for developing applications with graphical user interfaces -Version: 3.3.8d -Release: 110 +Version: 3.4.0 +Release: 1 Provides: qt_library_%version Recommends: kdelibs3-default-style PreReq: /bin/grep # COMMON-BEGIN -Source0: http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/qt3-3.3.8.d.tar.gz +Source0: qt3-%{version}.tar.bz2 Source1: build_script.sh Source2: qtconfig3.desktop Source3: qtrc @@ -52,7 +52,7 @@ Source9: linguist.desktop Source5: linguist.png Source10: qt3.sh Source11: qt3.csh -# Translations did not change at 3.3.8d +# Translations did not change Source12: qt3-3.3.8b-translations.tar.bz2 Source102: baselibs.conf Source200: attributes @@ -71,17 +71,13 @@ Patch31: limit-image-size.diff Patch35: qt-transparency.patch Patch37: 0055-qtextedit_zoom.patch Patch39: fix-qtranslator-crash.diff -Patch42: add_qexport_visibility.patch Patch54: kmenu-search-fix.diff Patch113: fix-assistant-path.patch Patch117: qtimer-debug.diff -Patch121: qt3-warnings.diff -Patch125: qcstring-format-warnings.diff Patch127: mng-reading-fix.patch Patch134: fix-xinput-clash.diff Patch135: parseFontName.diff Patch136: qt3-no-date.diff -Patch137: popen-leak-fix.diff Patch139: gcc46.diff Patch140: revert-iodbc-to-uodbc.diff @@ -103,7 +99,7 @@ the current Qt library! %define build_sub_dirs src plugins/src tools/designer/uilib/ tools/designer/uic tools/qtconfig tools/assistant/lib tools/assistant tutorial %prep -%setup -q -n qt3 +%setup -q %patch1 %patch2 %patch4 @@ -120,22 +116,18 @@ fi %patch35 %patch37 %patch39 -%patch42 %patch54 %patch113 %patch117 -%patch121 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/ ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/ ln -sf $PWD/src/kernel/qinputcontext.h include/ ln -sf $PWD/src/kernel/qinputcontextinterface_p.h include/private/ ln -sf $PWD/src/kernel/qximinputcontext_p.h include/private/ -%patch125 %patch127 %patch134 %patch135 %patch136 -%patch137 %patch139 %patch140 cd translations diff --git a/opensuse/core/qt3/revert-qt-3.3.8-khmer-fix.diff b/opensuse/core/qt3/revert-qt-3.3.8-khmer-fix.diff deleted file mode 100644 index 385e6111a..000000000 --- a/opensuse/core/qt3/revert-qt-3.3.8-khmer-fix.diff +++ /dev/null @@ -1,36 +0,0 @@ - -according to bug 345459, this fix for stacking letters from 3.3.8 -made it only a lot worse. revert. - - ---- src/kernel/qfontengine_x11.cpp -+++ src/kernel/qfontengine_x11.cpp -@@ -2672,23 +2655,16 @@ bool QOpenType::positionAndAdd(QShaperIt - // ###### fix the case where we have y advances. How do we handle this in Uniscribe????? - if (positions[i].new_advance) { - item->advances[i] = item->flags & QTextEngine::RightToLeft -- ? -qRound((positions[i].x_advance >> 6)*scale) -+ ? -qRound((positions[i].x_advance >> 6)*scale) - : qRound((positions[i].x_advance >> 6)*scale); - } else { - item->advances[i] += item->flags & QTextEngine::RightToLeft -- ? -qRound((positions[i].x_advance >> 6)*scale) -+ ? -qRound((positions[i].x_advance >> 6)*scale) - : qRound((positions[i].x_advance >> 6)*scale); - } -- int back = 0; -- item->offsets[i].x = qRound((positions[i].x_pos >> 6)*scale); -- item->offsets[i].y = qRound((positions[i].y_pos >> 6)*scale); -- while (positions[i-back].back) { -- back += positions[i - back].back; -- item->offsets[i].x += qRound((positions[i - back].x_pos >> 6)*scale); -- item->offsets[i].y += qRound((positions[i - back].y_pos >> 6)*scale); -- } -- item->offsets[i].y = -item->offsets[i].y; -- back = positions[i].back; -+ item->offsets[i].x = qRound((positions[i].x_pos >> 6)*scale); -+ item->offsets[i].y = -qRound((positions[i].y_pos >> 6)*scale); -+ int back = positions[i].back; - if (item->flags & QTextEngine::RightToLeft) { - while (back--) { - item->offsets[i].x -= item->advances[i-back]; |