rpms/qt3/F-10 qt-x11-free-3.3.7-arm.patch, NONE, 1.1 qt-x11-free-3.3.8-odbc.patch, NONE, 1.1 qt.csh, 1.2, 1.3 qt.sh, 1.2, 1.3 qt3.spec, 1.8, 1.9

Fri May 15 16:31:14 UTC 2009

Author: rdieter

Update of /cvs/pkgs/rpms/qt3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19939

Modified Files:
	qt.csh qt.sh qt3.spec 
Added Files:
	qt-x11-free-3.3.7-arm.patch qt-x11-free-3.3.8-odbc.patch 
Log Message:
* Fri May 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.3.8b-26
- arm patch


qt-x11-free-3.3.7-arm.patch:

--- NEW FILE qt-x11-free-3.3.7-arm.patch ---
>From 587c3ab16750be27b461299257406ffacde676ee Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars at marvell.com>
Date: Mon, 5 Jan 2009 10:55:52 +0530
Subject: [PATCH] Fix build problem on QT3

Signed-off-by: Lennert Buytenhek <buytenh at marvell.com>
Signed-off-by: Kedar Sovani <kedars at marvell.com>
---
 qt-x11-free-3.3.7-arm.patch |   25 +++++++++++++++++++++++++
 qt3.spec                    |    8 +++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
 create mode 100644 qt-x11-free-3.3.7-arm.patch

diff --git a/qt-x11-free-3.3.7-arm.patch b/qt-x11-free-3.3.7-arm.patch
new file mode 100644
index 0000000..0c93c41
--- /dev/null
+++ b/qt-x11-free-3.3.7-arm.patch
@@ -0,0 +1,25 @@
+--- qt-x11-free-3.3.7/src/tools/qglobal.h.orig	2007-04-24 09:02:36.000000000 -0400
++++ qt-x11-free-3.3.7/src/tools/qglobal.h	2007-04-24 09:03:02.000000000 -0400
+@@ -315,9 +315,9 @@
+    QString bloat. However, gcc 3.4 doesn't allow us to create references to
+    members of a packed struct. (Pointers are OK, because then you
+    supposedly know what you are doing.) */
+-#  if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP)
++#  if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) && !defined(__ARM_EABI__)
+ #    define Q_PACKED __attribute__ ((packed))
+-#    if __GNUC__ == 3 && __GNUC_MINOR__ >= 4
++#    if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+ #      define Q_NO_PACKED_REFERENCE
+ #    endif
+ #  endif
+--- qt-x11-free-3.3.7/src/tools/qstring.h.orig	2007-04-24 09:03:11.000000000 -0400
++++ qt-x11-free-3.3.7/src/tools/qstring.h	2007-04-24 09:03:27.000000000 -0400
+@@ -194,7 +194,7 @@
+     char latin1() const { return ucs > 0xff ? 0 : (char) ucs; }
+     ushort unicode() const { return ucs; }
+ #ifdef Q_NO_PACKED_REFERENCE
+-    ushort &unicode() { return *(&ucs); }
++    ushort &unicode() { return *((ushort *)&ucs); }
+ #else
+     ushort &unicode() { return ucs; }
+ #endif

qt-x11-free-3.3.8-odbc.patch:

--- NEW FILE qt-x11-free-3.3.8-odbc.patch ---
diff -up qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp
--- qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig	2009-02-24 11:32:27.000000000 +0100
+++ qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp	2009-02-24 11:33:43.000000000 +0100
@@ -57,13 +57,13 @@
 #endif
 
 // newer platform SDKs use SQLLEN instead of SQLINTEGER
-#ifdef SQLLEN
+#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
 # define QSQLLEN SQLLEN
 #else
 # define QSQLLEN SQLINTEGER
 #endif
 
-#ifdef SQLULEN
+#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
 # define QSQLULEN SQLULEN
 #else
 # define QSQLULEN SQLUINTEGER


Index: qt.csh
===================================================================
RCS file: /cvs/pkgs/rpms/qt3/F-10/qt.csh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qt.csh	7 Jul 2008 19:44:46 -0000	1.2
+++ qt.csh	15 May 2009 16:30:44 -0000	1.3
@@ -13,7 +13,7 @@ endif
 switch (`uname -m`)
    case x86_64:
    case ia64:
-   case s390:
+   case s390x:
       set QTPREFIXES = "/usr/lib64/qt-3.3 /usr/lib/qt-3.3"
       breaksw
    case *:


Index: qt.sh
===================================================================
RCS file: /cvs/pkgs/rpms/qt3/F-10/qt.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qt.sh	7 Jul 2008 19:44:46 -0000	1.2
+++ qt.sh	15 May 2009 16:30:44 -0000	1.3
@@ -9,7 +9,7 @@
 if [ -z "${QTDIR}" ]; then
 
 case `uname -m` in
-   x86_64 | ia64 | s390 )
+   x86_64 | ia64 | s390x )
       QT_PREFIXES="/usr/lib64/qt-3.3 /usr/lib/qt-3.3" ;;
    * )
       QT_PREFIXES="/usr/lib/qt-3.3 /usr/lib64/qt-3.3" ;;


Index: qt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt3/F-10/qt3.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- qt3.spec	8 Oct 2008 13:06:14 -0000	1.8
+++ qt3.spec	15 May 2009 16:30:44 -0000	1.9
@@ -2,7 +2,7 @@
 
 Summary: The shared library for the Qt 3 GUI toolkit
 Version: 3.3.8b
-Release: 17%{?dist}
+Release: 26%{?dist}
 %if 0%{?fedora} > 8
 Name: qt3
 Obsoletes: qt < 1:%{version}-%{release}
@@ -47,6 +47,8 @@ Patch33: qt-3.3.8-fontrendering-#214570.
 Patch34: qt-3.3.6-fontrendering-ml_IN-209974.patch
 Patch35: qt-3.3.6-fontrendering-ml_IN-217657.patch
 Patch37: qt-3.3.6-fontrendering-gu-228452.patch
+Patch38: qt-x11-free-3.3.8-odbc.patch
+Patch39: qt-x11-free-3.3.7-arm.patch
 
 # immodule patches
 Patch50: qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2
@@ -345,6 +347,8 @@ for the Qt 3 toolkit.
 %patch34 -p1 -b .fontrendering-#209974
 %patch35 -p1 -b .fontrendering-ml_IN-217657
 %patch37 -p1 -b .fontrendering-gu-228452
+%patch38 -p1 -b .odbc
+%patch39 -p1 -b .arm
 
 # immodule patches
 %if %{immodule}
@@ -519,7 +523,7 @@ for a in */*/Makefile ; do
 done
 
 mkdir -p %{buildroot}/etc/profile.d
-install -m 755 %{SOURCE2} %{SOURCE3} %{buildroot}/etc/profile.d/
+install -m 644 %{SOURCE2} %{SOURCE3} %{buildroot}/etc/profile.d/
 
 # Add desktop files
 mkdir -p %{buildroot}%{_datadir}/applications
@@ -562,12 +566,14 @@ rm -rf %{buildroot}
 %dir %{qtdir}/bin
 %dir %{qtdir}/lib
 %dir %{qtdir}/plugins
+%dir %{qtdir}/plugins/sqldrivers
 %dir %{qtdir}/plugins/styles
 %{qtdir}/translations
+%{qtdir}/plugins/designer/
 %if %{immodule}
 %{qtdir}/plugins/inputmethods
 %endif
-%attr(0755,root,root) %config /etc/profile.d/*
+%config /etc/profile.d/*
 /etc/ld.so.conf.d/*
 %{qtdir}/lib/libqui.so.*
 %{qtdir}/lib/libqt*.so.*
@@ -580,6 +586,7 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root,-)
+%{qt_docdir}/
 %{qtdir}/bin/moc
 %{qtdir}/bin/uic
 %{qtdir}/bin/findtr
@@ -606,7 +613,6 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*assistant*.desktop
 %{_datadir}/pixmaps/linguist3.png
 %{_datadir}/pixmaps/assistant3.png
-%doc %{qt_docdir}/html
 
 %files devel-docs
 %defattr(-,root,root,-)
@@ -632,15 +638,40 @@ rm -rf %{buildroot}
 
 %files designer
 %defattr(-,root,root,-)
-%dir %{qtdir}/plugins/designer
 %{qtdir}/templates
-%{qtdir}/plugins/designer/*
 %{qtdir}/bin/designer
 %{_datadir}/applications/*designer*.desktop
 %{_datadir}/pixmaps/designer3.png
 
 
 %changelog
+* Fri May 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.3.8b-26
+- arm patch
+
+* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.3.8b-25
+- move designer plugins to runtime (#487622)
+
+* Fri Apr 10 2009 Than Ngo <than at redhat.com> - 3.3.8b-24
+- unneeded executable permissions for profile.d scripts 
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.8b-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Feb 24 2009 Than Ngo <than at redhat.com> - 3.3.8b-22
+- fix build problem against new unixODBC
+
+* Wed Feb 04 2009 Rex Dieter <rdieter at fedoraproject.org> 3.3.8b-21
+- unowned %%qt_docdir (#483441)
+
+* Mon Feb 02 2009 Rex Dieter <rdieter at fedoraproject.org> 3.3.8b-20
+- unowned dirs (#483441)
+
+* Sat Jan 31 2009 Karsten Hopp <karsten at redhat.com> 3.3.8b-19
+- s390x is 64bit, s390 is 32bit. Fixed in /etc/profile.d/qt.*
+
+* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> 3.3.8b-18
+- respin (mysql)
+
 * Wed Oct 08 2008 Than Ngo <than at redhat.com> 3.3.8b-17
 - update qt-x11-immodule-unified-qt3 patch
 


