Mailinglist Archive: opensuse-commit (1194 mails)
| < Previous | Next > |
commit qt3
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Mon, 10 Mar 2008 18:53:13 +0100
- Message-id: <20080310175313.571BA678168@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package qt3
checked in at Mon Mar 10 18:53:13 CET 2008.
--------
--- KDE/qt3/qt3.changes 2008-02-07 17:51:48.000000000 +0100
+++ /mounts/work_src_done/STABLE/qt3/qt3.changes 2008-03-10
16:48:44.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Mar 10 16:48:36 CET 2008 - dmueller@xxxxxxx
+
+- fix build with updated x.org
+
+-------------------------------------------------------------------
qt3-devel-doc.changes: same change
qt3-extensions.changes: same change
qt3-static.changes: same change
New:
----
fix-xinput-clash.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt3-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.o13949/_old 2008-03-10 18:52:40.000000000 +0100
+++ /var/tmp/diff_new_pack.o13949/_new 2008-03-10 18:52:40.000000000 +0100
@@ -10,6 +10,7 @@
# norootforbuild
+
Name: qt3-devel-doc
BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++
libjpeg-devel libmng-devel libpng-devel pkgconfig qt3-devel update-desktop-files
Url: http://www.trolltech.com/
@@ -18,7 +19,7 @@
Summary: Documentation for the Qt 3 Development Kit
Group: Documentation/HTML
Version: 3.3.8b
-Release: 8
+Release: 20
PreReq: /bin/grep
BuildArch: noarch
Provides: qt3-devel-tutorial
@@ -92,6 +93,7 @@
Patch129: 0080-net-wm-sync-request.patch
Patch132: revert-qt-3.3.8-khmer-fix.diff
Patch133: 0085-fix-buildkey.diff
+Patch134: fix-xinput-clash.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -167,6 +169,7 @@
%patch129
%patch132
%patch133
+%patch134
# copy qt kde integration files
cp %SOURCE100 %SOURCE101 src/kernel/
cp %SOURCE101 include/private/
@@ -238,6 +241,8 @@
/usr/share/pixmaps/assistant3.png
%changelog
+* Mon Mar 10 2008 dmueller@xxxxxxx
+- fix build with updated x.org
* Thu Feb 07 2008 dmueller@xxxxxxx
- fix memory corruption when removing CRTc's dynamically
* Sat Jan 19 2008 stbinner@xxxxxxx
++++++ qt3-extensions.spec ++++++
--- /var/tmp/diff_new_pack.o13949/_old 2008-03-10 18:52:40.000000000 +0100
+++ /var/tmp/diff_new_pack.o13949/_new 2008-03-10 18:52:40.000000000 +0100
@@ -10,6 +10,7 @@
# norootforbuild
+
Name: qt3-extensions
BuildRequires: cups-devel krb5-devel libjpeg-devel mysql-devel
postgresql-devel qt3-devel sqlite2-devel unixODBC-devel update-desktop-files
%if %suse_version > 1020
@@ -17,7 +18,7 @@
%endif
License: GPL v2 only; GPL v3 only; THE Q PUBLIC LICENSE (QPL)
Version: 3.3.8b
-Release: 8
+Release: 20
AutoReqProv: on
Requires: qt3 = %version
Group: Development/Tools/Other
@@ -90,6 +91,7 @@
Patch129: 0080-net-wm-sync-request.patch
Patch132: revert-qt-3.3.8-khmer-fix.diff
Patch133: 0085-fix-buildkey.diff
+Patch134: fix-xinput-clash.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -163,6 +165,7 @@
%patch129
%patch132
%patch133
+%patch134
# copy qt kde integration files
cp %SOURCE100 %SOURCE101 src/kernel/
cp %SOURCE101 include/private/
@@ -478,6 +481,8 @@
%{_mandir}/man*/*
%changelog
+* Mon Mar 10 2008 dmueller@xxxxxxx
+- fix build with updated x.org
* Thu Feb 07 2008 dmueller@xxxxxxx
- fix memory corruption when removing CRTc's dynamically
* Sat Jan 19 2008 stbinner@xxxxxxx
++++++ qt3.spec ++++++
--- /var/tmp/diff_new_pack.o13949/_old 2008-03-10 18:52:40.000000000 +0100
+++ /var/tmp/diff_new_pack.o13949/_new 2008-03-10 18:52:40.000000000 +0100
@@ -10,6 +10,7 @@
# norootforbuild
+
Name: qt3
#Remember also to modify Requires in -devel package
BuildRequires: Mesa-devel c++_compiler cups-devel freetype2-devel
libjpeg-devel libmng-devel libpng-devel pkgconfig update-desktop-files
xorg-x11-devel
@@ -19,7 +20,7 @@
AutoReqProv: on
Summary: A library for developing applications with graphical user
interfaces
Version: 3.3.8b
-Release: 8
+Release: 20
Provides: qt_library_%version
PreReq: /bin/grep
%define x11_free -x11-free-
@@ -89,6 +90,7 @@
Patch129: 0080-net-wm-sync-request.patch
Patch132: revert-qt-3.3.8-khmer-fix.diff
Patch133: 0085-fix-buildkey.diff
+Patch134: fix-xinput-clash.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -171,6 +173,7 @@
%patch129
%patch132
%patch133
+%patch134
# copy qt kde integration files
cp %SOURCE100 %SOURCE101 src/kernel/
cp %SOURCE101 include/private/
@@ -375,6 +378,8 @@
/etc/profile.d/qt3.*
%changelog
+* Mon Mar 10 2008 dmueller@xxxxxxx
+- fix build with updated x.org
* Thu Feb 07 2008 dmueller@xxxxxxx
- fix memory corruption when removing CRTc's dynamically
* Sat Jan 19 2008 stbinner@xxxxxxx
++++++ qt3-static.spec ++++++
--- /var/tmp/diff_new_pack.o13949/_old 2008-03-10 18:52:40.000000000 +0100
+++ /var/tmp/diff_new_pack.o13949/_new 2008-03-10 18:52:40.000000000 +0100
@@ -10,6 +10,7 @@
# norootforbuild
+
Name: qt3-static
BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++ libdrm-devel
libjpeg-devel libmng-devel libpng-devel
License: GPL v2 only; GPL v3 only; THE Q PUBLIC LICENSE (QPL)
@@ -17,7 +18,7 @@
AutoReqProv: on
Summary: Static library for developing GUI applications
Version: 3.3.8b
-Release: 8
+Release: 20
%define x11_free -x11-free-
%define rversion %version
# COMMON-BEGIN
@@ -86,6 +87,7 @@
Patch129: 0080-net-wm-sync-request.patch
Patch132: revert-qt-3.3.8-khmer-fix.diff
Patch133: 0085-fix-buildkey.diff
+Patch134: fix-xinput-clash.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -170,6 +172,7 @@
%patch129
%patch132
%patch133
+%patch134
# copy qt kde integration files
cp %SOURCE100 %SOURCE101 src/kernel/
cp %SOURCE101 include/private/
@@ -228,6 +231,8 @@
/usr/lib/qt3/%{_lib}/libqt-mt.a
%changelog
+* Mon Mar 10 2008 dmueller@xxxxxxx
+- fix build with updated x.org
* Thu Feb 07 2008 dmueller@xxxxxxx
- fix memory corruption when removing CRTc's dynamically
* Sat Jan 19 2008 stbinner@xxxxxxx
++++++ fix-xinput-clash.diff ++++++
--- include/private/qt_x11_p.h
+++ include/private/qt_x11_p.h
@@ -86,7 +86,7 @@
// the wacom tablet (currently just the IRIX version)
-#if defined (QT_TABLET_SUPPORT)
+#if defined (QT_TABLET_SUPPORT) && defined (QT_CLEAN_NAMESPACE)
# include <X11/extensions/XInput.h>
#if defined (Q_OS_IRIX)
# include <wacom.h> // wacom driver defines for IRIX (quite handy)
--- src/kernel/qtaddons_x11.cpp
+++ src/kernel/qtaddons_x11.cpp
@@ -22,6 +22,10 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifndef QT_CLEAN_NAMESPACE
+#define QT_CLEAN_NAMESPACE
+#endif
+
#include "qt_x11_p.h"
#if !defined(QT_NO_XFTFREETYPE) && !defined(QT_XFT2)
--- src/kernel/qt_x11_p.h
+++ src/kernel/qt_x11_p.h
@@ -86,7 +86,7 @@
// the wacom tablet (currently just the IRIX version)
-#if defined (QT_TABLET_SUPPORT)
+#if defined (QT_TABLET_SUPPORT) && defined (QT_CLEAN_NAMESPACE)
# include <X11/extensions/XInput.h>
#if defined (Q_OS_IRIX)
# include <wacom.h> // wacom driver defines for IRIX (quite handy)
--- src/kernel/qwidget_x11.cpp
+++ src/kernel/qwidget_x11.cpp
@@ -38,6 +38,10 @@
**
**********************************************************************/
+#ifndef QT_CLEAN_NAMESPACE
+#define QT_CLEAN_NAMESPACE
+#endif
+
#include "qapplication.h"
#include "qapplication_p.h"
#include "qnamespace.h"
++++++ qtkdeintegration_x11.cpp ++++++
--- KDE/qt3/qtkdeintegration_x11.cpp 2007-10-01 06:56:40.000000000 +0200
+++ /mounts/work_src_done/STABLE/qt3/qtkdeintegration_x11.cpp 2008-03-10
14:07:49.000000000 +0100
@@ -1,3 +1,4 @@
+#define QT_CLEAN_NAMESPACE
#include "qtkdeintegration_x11_p.h"
#include <qcolordialog.h>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |