rpms/kdebindings/devel kdebindings-4.0.2-qt434.patch, 1.1, 1.2 kdebindings.spec, 1.87, 1.88
Kevin Kofler (kkofler)
fedora-extras-commits at redhat.com
Sat Mar 1 20:27:01 UTC 2008
- Previous message (by thread): rpms/kdebindings/devel kdebindings-4.0.2-qt434.patch, NONE, 1.1 kdebindings.spec, 1.86, 1.87
- Next message (by thread): rpms/haproxy/devel haproxy-gcc43-compat.patch, NONE, 1.1 haproxy.init, 1.1, 1.2 haproxy.spec, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kkofler
Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27104/devel
Modified Files:
kdebindings-4.0.2-qt434.patch kdebindings.spec
Log Message:
Try build fixes from Dirk Müller instead of my incomplete ones:
* Sat Mar 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-3
- apply upstream build fixes for Qt 4.3.4 (rev 780996)
kdebindings-4.0.2-qt434.patch:
Index: kdebindings-4.0.2-qt434.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings-4.0.2-qt434.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebindings-4.0.2-qt434.patch 1 Mar 2008 19:51:13 -0000 1.1
+++ kdebindings-4.0.2-qt434.patch 1 Mar 2008 20:26:50 -0000 1.2
@@ -1,11 +1,64 @@
-diff -ur kdebindings-4.0.2/kalyptus/kalyptus kdebindings-4.0.2-qt434/kalyptus/kalyptus
---- kdebindings-4.0.2/kalyptus/kalyptus 2008-01-05 00:53:01.000000000 +0100
-+++ kdebindings-4.0.2-qt434/kalyptus/kalyptus 2008-03-01 20:45:53.000000000 +0100
-@@ -574,6 +574,7 @@
+Index: kalyptus/kalyptusCxxToSmoke.pm
+===================================================================
+--- kalyptus/kalyptusCxxToSmoke.pm (revision 780995)
++++ kalyptus/kalyptusCxxToSmoke.pm (revision 780996)
+@@ -443,6 +443,8 @@
+ || $name eq 'qWarning'
+ || $name eq 'qCritical'
+ || $name eq 'qDebug'
++ || $name eq 'qFindString'
++ || $name eq 'qFindStringBoyerMoore'
+ # qHash() gives problems with building the Qwt lib
+ || $name eq 'qHash'
+ || ($classNode->{astNodeName} eq 'TextEvent' and $name eq 'data')
+@@ -544,6 +546,7 @@
+ } elsif( $m->{NodeType} eq 'var' ) {
+ if ( ($classNode->{astNodeName} eq 'QUuid' and $name eq 'data4')
+ || ($name eq 'd')
++ || ($classNode->{astNodeName} eq 'Tab' and $name eq 'type')
+ || ($classNode->{astNodeName} eq 'QObject' and $name eq 'staticMetaObject')
+ || ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'mIncomingMetaData')
+ || ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'mOutgoingMetaData') )
+Index: kalyptus/kalyptus
+===================================================================
+--- kalyptus/kalyptus (revision 780995)
++++ kalyptus/kalyptus (revision 780996)
+@@ -446,7 +446,7 @@
+ }
+ }
+
+- if ( $p =~ /^\s*Q_OBJECT/ ) {
++ if ( $p =~ /^\s*Q_OBJECT/ && $cNode->{astNodeName} ne 'Qt') {
+ if ($qt_embedded) {
+ push @inputqueue, @qte_codeqobject;
+ } elsif ($qt4) {
+@@ -457,11 +457,14 @@
+ next;
+ }
+ # Hack, waiting for real handling of preprocessor defines
++ $p =~ s/Q_OBJECT//;
+ $p =~ s/Q_REQUIRED_RESULT//;
+ $p =~ s/QT_FASTCALL//;
+ $p =~ s/QT_ASCII_CAST_WARN//;
+ $p =~ s/QT_BEGIN_HEADER//;
+ $p =~ s/QT_END_HEADER//;
++ $p =~ s/QT_BEGIN_NAMESPACE//;
++ $p =~ s/QT_END_NAMESPACE//;
+ $p =~ s/QT_MODULE\(\w+\)//;
+ $p =~ s/QT_WEAK_SYMBOL//;
+ $p =~ s/QT_MOC_COMPAT//;
+@@ -574,11 +577,14 @@
$p =~ m/^#\s*ifdef\s+QT_COMPAT/ or
$p =~ m/^#\s*if\s+defined\s*\(?QT_COMPAT/ or
$p =~ m/^#\s*ifdef\s+CONTAINER_CUSTOM_WIDGETS/ or
++ $p =~ m/^#\s*ifdef\s+Q_COMPILER_MANGLES_RETURN_TYPE/ or
+ $p =~ m/^#\s*ifdef\s+Q_MAC_COMPAT_GL_FUNCTIONS/ or
$p =~ m/^#\s*ifdef\s+QT3_SUPPORT/ or
$p =~ m/^#\s*ifdef\s+KDE3_SUPPORT/ or
$p =~ m/^#\s*ifdef\s+Q_WS_WIN/ or
+ $p =~ m/^#if\s*!?defined\(Q_WS_WIN\)/ or
+ $p =~ m/^#if\s*!?defined\(Q_OS_WIN32\)/ or
++ $p =~ m/^#\s*ifdef\s+Q_OS_WINCE/ or
+ $p =~ m/^#\s*ifdef\s+Q_OS_UNIX/ or
+ $p =~ m/^#\s*ifdef\s+Q_MOC_RUN/ or
+ $p =~ m/^#\s*if\s+defined\s*\(QT3_SUPPORT/ or
Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- kdebindings.spec 1 Mar 2008 19:51:13 -0000 1.87
+++ kdebindings.spec 1 Mar 2008 20:26:50 -0000 1.88
@@ -14,8 +14,7 @@
License: GPLv2
URL: http://developer.kde.org/language-bindings/
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-# one line from http://websvn.kde.org/?view=rev&revision=776653 (Qt 4.4 fixes)
-# fixes QMacCompatGL*-related errors with Qt 4.3.4
+# http://websvn.kde.org/?view=rev&revision=780996 (build fixes for Qt 4.3.4)
Patch0: kdebindings-4.0.2-qt434.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -62,7 +61,7 @@
%prep
%setup -q
-%patch0 -p1 -b .qt434
+%patch0 -p0 -b .qt434
%build
@@ -118,7 +117,7 @@
%changelog
* Sat Mar 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-3
-- backport 1 line of rev 776653 from trunk to fix build with Qt 4.3.4
+- apply upstream build fixes for Qt 4.3.4 (rev 780996)
* Fri Feb 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-2
- drop lib64 patches (fixed upstream)
- Previous message (by thread): rpms/kdebindings/devel kdebindings-4.0.2-qt434.patch, NONE, 1.1 kdebindings.spec, 1.86, 1.87
- Next message (by thread): rpms/haproxy/devel haproxy-gcc43-compat.patch, NONE, 1.1 haproxy.init, 1.1, 1.2 haproxy.spec, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list